Change BlankReader to the correct location in SmaliLexer for idea

8 files changed, 62 insertions, 62 deletions

diff --git a/dexlib2/src/main/java/org/jf/dexlib2/MethodHandleType.java b/dexlib2/src/main/java/org/jf/dexlib2/MethodHandleType.java
index 72f1f78d..11ee010a 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/MethodHandleType.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/MethodHandleType.java
@@ -69,7 +69,7 @@ public class MethodHandleType {
     }
 
     public static int getMethodHandleType(String methodHandleType) {
-    	Integer ret = methodHandleTypeNames.inverse().get(methodHandleType);
+        Integer ret = methodHandleTypeNames.inverse().get(methodHandleType);
         if (ret == null) {
             throw new ExceptionWithContext("Invalid method handle type: %s", methodHandleType);
         }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/MethodHandleItem.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/MethodHandleItem.java
index 461639e4..eced8e25 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/MethodHandleItem.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/MethodHandleItem.java
@@ -61,21 +61,21 @@ public class MethodHandleItem {
                 int fieldOrMethodId = dexFile.readUshort(out.getCursor());
                 String fieldOrMethodDescriptor;
                 switch (methodHandleType) {
-                	case MethodHandleType.STATIC_PUT:
-                	case MethodHandleType.STATIC_GET:
-                	case MethodHandleType.INSTANCE_PUT:
-                	case MethodHandleType.INSTANCE_GET:
-                		fieldOrMethodDescriptor = FieldIdItem.getReferenceAnnotation(dexFile, fieldOrMethodId);
-                		break;
-                	case MethodHandleType.INVOKE_STATIC:
-                	case MethodHandleType.INVOKE_INSTANCE:
-                	case MethodHandleType.INVOKE_CONSTRUCTOR:
-                	case MethodHandleType.INVOKE_DIRECT:
-                	case MethodHandleType.INVOKE_INTERFACE:
-                		fieldOrMethodDescriptor = MethodIdItem.getReferenceAnnotation(dexFile, fieldOrMethodId);
-                		break;
-                	default:
-                		throw new ExceptionWithContext("Invalid method handle type: %d", methodHandleType);
+                    case MethodHandleType.STATIC_PUT:
+                    case MethodHandleType.STATIC_GET:
+                    case MethodHandleType.INSTANCE_PUT:
+                    case MethodHandleType.INSTANCE_GET:
+                        fieldOrMethodDescriptor = FieldIdItem.getReferenceAnnotation(dexFile, fieldOrMethodId);
+                        break;
+                    case MethodHandleType.INVOKE_STATIC:
+                    case MethodHandleType.INVOKE_INSTANCE:
+                    case MethodHandleType.INVOKE_CONSTRUCTOR:
+                    case MethodHandleType.INVOKE_DIRECT:
+                    case MethodHandleType.INVOKE_INTERFACE:
+                        fieldOrMethodDescriptor = MethodIdItem.getReferenceAnnotation(dexFile, fieldOrMethodId);
+                        break;
+                    default:
+                        throw new ExceptionWithContext("Invalid method handle type: %d", methodHandleType);
                 }
 
                 out.annotate(2, "field_or_method_id = %s", fieldOrMethodDescriptor);
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/reference/DexBackedMethodHandleReference.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/reference/DexBackedMethodHandleReference.java
index 005c39df..11bb33bb 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/reference/DexBackedMethodHandleReference.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/reference/DexBackedMethodHandleReference.java
@@ -61,16 +61,16 @@ public class DexBackedMethodHandleReference extends BaseMethodHandleReference {
     public Reference getMemberReference() {
         int memberIndex = dexFile.readUshort(methodHandleOffset + MethodHandleItem.MEMBER_ID_OFFSET);
         switch (getMethodHandleType()) {
-	    	case MethodHandleType.STATIC_PUT:
-	    	case MethodHandleType.STATIC_GET:
-	    	case MethodHandleType.INSTANCE_PUT:
-	    	case MethodHandleType.INSTANCE_GET:
+            case MethodHandleType.STATIC_PUT:
+            case MethodHandleType.STATIC_GET:
+            case MethodHandleType.INSTANCE_PUT:
+            case MethodHandleType.INSTANCE_GET:
                 return new DexBackedFieldReference(dexFile, memberIndex);
-	    	case MethodHandleType.INVOKE_STATIC:
-	    	case MethodHandleType.INVOKE_INSTANCE:
-	    	case MethodHandleType.INVOKE_CONSTRUCTOR:
-	    	case MethodHandleType.INVOKE_DIRECT:
-	    	case MethodHandleType.INVOKE_INTERFACE:
+            case MethodHandleType.INVOKE_STATIC:
+            case MethodHandleType.INVOKE_INSTANCE:
+            case MethodHandleType.INVOKE_CONSTRUCTOR:
+            case MethodHandleType.INVOKE_DIRECT:
+            case MethodHandleType.INVOKE_INTERFACE:
                 return new DexBackedMethodReference(dexFile, memberIndex);
             default:
                 throw new ExceptionWithContext("Invalid method handle type: %d", getMethodHandleType());
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/immutable/reference/ImmutableMethodHandleReference.java b/dexlib2/src/main/java/org/jf/dexlib2/immutable/reference/ImmutableMethodHandleReference.java
index 9a26e3b3..c35b071a 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/immutable/reference/ImmutableMethodHandleReference.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/immutable/reference/ImmutableMethodHandleReference.java
@@ -64,18 +64,18 @@ public class ImmutableMethodHandleReference extends BaseMethodHandleReference im
         ImmutableReference memberReference;
 
         switch (methodHandleType) {
-	    	case MethodHandleType.STATIC_PUT:
-	    	case MethodHandleType.STATIC_GET:
-	    	case MethodHandleType.INSTANCE_PUT:
-	    	case MethodHandleType.INSTANCE_GET:
+            case MethodHandleType.STATIC_PUT:
+            case MethodHandleType.STATIC_GET:
+            case MethodHandleType.INSTANCE_PUT:
+            case MethodHandleType.INSTANCE_GET:
                 memberReference = ImmutableFieldReference.of(
                         (FieldReference) methodHandleReference.getMemberReference());
                 break;
-        	case MethodHandleType.INVOKE_STATIC:
-        	case MethodHandleType.INVOKE_INSTANCE:
-        	case MethodHandleType.INVOKE_CONSTRUCTOR:
-        	case MethodHandleType.INVOKE_DIRECT:
-        	case MethodHandleType.INVOKE_INTERFACE:
+            case MethodHandleType.INVOKE_STATIC:
+            case MethodHandleType.INVOKE_INSTANCE:
+            case MethodHandleType.INVOKE_CONSTRUCTOR:
+            case MethodHandleType.INVOKE_DIRECT:
+            case MethodHandleType.INVOKE_INTERFACE:
                 memberReference = ImmutableMethodReference.of(
                         (MethodReference) methodHandleReference.getMemberReference());
                 break;
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java b/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
index ab6b37ad..46d60620 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
@@ -609,18 +609,18 @@ public abstract class DexWriter<
             writer.writeUshort(0);
             int memberIndex;
             switch (methodHandleReference.getMethodHandleType()) {
-	        	case MethodHandleType.STATIC_PUT:
-	        	case MethodHandleType.STATIC_GET:
-	        	case MethodHandleType.INSTANCE_PUT:
-	        	case MethodHandleType.INSTANCE_GET:
+                case MethodHandleType.STATIC_PUT:
+                case MethodHandleType.STATIC_GET:
+                case MethodHandleType.INSTANCE_PUT:
+                case MethodHandleType.INSTANCE_GET:
                     memberIndex = fieldSection.getItemIndex(
                             methodHandleSection.getFieldReference(methodHandleReference));
                     break;
-            	case MethodHandleType.INVOKE_STATIC:
-            	case MethodHandleType.INVOKE_INSTANCE:
-            	case MethodHandleType.INVOKE_CONSTRUCTOR:
-            	case MethodHandleType.INVOKE_DIRECT:
-            	case MethodHandleType.INVOKE_INTERFACE:
+                case MethodHandleType.INVOKE_STATIC:
+                case MethodHandleType.INVOKE_INSTANCE:
+                case MethodHandleType.INVOKE_CONSTRUCTOR:
+                case MethodHandleType.INVOKE_DIRECT:
+                case MethodHandleType.INVOKE_INTERFACE:
                     memberIndex = methodSection.getItemIndex(
                             methodHandleSection.getMethodReference(methodHandleReference));
                     break;
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderMethodHandlePool.java b/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderMethodHandlePool.java
index 5b98699c..320344c9 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderMethodHandlePool.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderMethodHandlePool.java
@@ -61,18 +61,18 @@ public class BuilderMethodHandlePool extends BaseBuilderPool
 
         BuilderReference memberReference;
         switch (methodHandleReference.getMethodHandleType()) {
-	    	case MethodHandleType.STATIC_PUT:
-	    	case MethodHandleType.STATIC_GET:
-	    	case MethodHandleType.INSTANCE_PUT:
-	    	case MethodHandleType.INSTANCE_GET:
+            case MethodHandleType.STATIC_PUT:
+            case MethodHandleType.STATIC_GET:
+            case MethodHandleType.INSTANCE_PUT:
+            case MethodHandleType.INSTANCE_GET:
                 memberReference = dexBuilder.internFieldReference(
                         (FieldReference) methodHandleReference.getMemberReference());
                 break;
-	    	case MethodHandleType.INVOKE_STATIC:
-	    	case MethodHandleType.INVOKE_INSTANCE:
-	    	case MethodHandleType.INVOKE_CONSTRUCTOR:
-	    	case MethodHandleType.INVOKE_DIRECT:
-	    	case MethodHandleType.INVOKE_INTERFACE:
+            case MethodHandleType.INVOKE_STATIC:
+            case MethodHandleType.INVOKE_INSTANCE:
+            case MethodHandleType.INVOKE_CONSTRUCTOR:
+            case MethodHandleType.INVOKE_DIRECT:
+            case MethodHandleType.INVOKE_INTERFACE:
                 memberReference = dexBuilder.internMethodReference(
                         (MethodReference) methodHandleReference.getMemberReference());
                 break;
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/MethodHandlePool.java b/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/MethodHandlePool.java
index 8a037d7f..017b74dc 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/MethodHandlePool.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/MethodHandlePool.java
@@ -50,17 +50,17 @@ public class MethodHandlePool extends BaseIndexPool<MethodHandleReference>
         Integer prev = internedItems.put(methodHandleReference, 0);
         if (prev == null) {
             switch (methodHandleReference.getMethodHandleType()) {
-	        	case MethodHandleType.STATIC_PUT:
-	        	case MethodHandleType.STATIC_GET:
-	        	case MethodHandleType.INSTANCE_PUT:
-	        	case MethodHandleType.INSTANCE_GET:
+                case MethodHandleType.STATIC_PUT:
+                case MethodHandleType.STATIC_GET:
+                case MethodHandleType.INSTANCE_PUT:
+                case MethodHandleType.INSTANCE_GET:
                     dexPool.fieldSection.intern((FieldReference) methodHandleReference.getMemberReference());
                     break;
-            	case MethodHandleType.INVOKE_STATIC:
-            	case MethodHandleType.INVOKE_INSTANCE:
-            	case MethodHandleType.INVOKE_CONSTRUCTOR:
-            	case MethodHandleType.INVOKE_DIRECT:
-            	case MethodHandleType.INVOKE_INTERFACE:
+                case MethodHandleType.INVOKE_STATIC:
+                case MethodHandleType.INVOKE_INSTANCE:
+                case MethodHandleType.INVOKE_CONSTRUCTOR:
+                case MethodHandleType.INVOKE_DIRECT:
+                case MethodHandleType.INVOKE_INTERFACE:
                     dexPool.methodSection.intern((MethodReference) methodHandleReference.getMemberReference());
                     break;
                 default:
diff --git a/smalidea/src/main/java/org/jf/smalidea/SmaliLexer.java b/smalidea/src/main/java/org/jf/smalidea/SmaliLexer.java
index 67e5945f..515749fa 100644
--- a/smalidea/src/main/java/org/jf/smalidea/SmaliLexer.java
+++ b/smalidea/src/main/java/org/jf/smalidea/SmaliLexer.java
@@ -38,7 +38,7 @@ import org.antlr.runtime.CommonToken;
 import org.jetbrains.annotations.NotNull;
 import org.jf.smali.smaliFlexLexer;
 import org.jf.smali.smaliParser;
-import org.jf.util.BlankReader;
+import org.jf.smali.util.BlankReader;
 
 public class SmaliLexer extends LexerBase {
     private final smaliFlexLexer lexer = new smaliFlexLexer(BlankReader.INSTANCE);