java-decompiler: post-import cleanup (code style issues)

4 files changed, 21 insertions, 21 deletions

diff --git a/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java
index ff731ae..fd213f0 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java
@@ -17,10 +17,10 @@ package org.jetbrains.java.decompiler.struct.gen;
 
 public class FieldDescriptor {
 
-  public static final FieldDescriptor INTEGER_DESCRIPTOR = FieldDescriptor.parseDescriptor("Ljava/lang/Integer;");
-  public static final FieldDescriptor LONG_DESCRIPTOR = FieldDescriptor.parseDescriptor("Ljava/lang/Long;");
-  public static final FieldDescriptor FLOAT_DESCRIPTOR = FieldDescriptor.parseDescriptor("Ljava/lang/Float;");
-  public static final FieldDescriptor DOUBLE_DESCRIPTOR = FieldDescriptor.parseDescriptor("Ljava/lang/Double;");
+  public static final FieldDescriptor INTEGER_DESCRIPTOR = parseDescriptor("Ljava/lang/Integer;");
+  public static final FieldDescriptor LONG_DESCRIPTOR = parseDescriptor("Ljava/lang/Long;");
+  public static final FieldDescriptor FLOAT_DESCRIPTOR = parseDescriptor("Ljava/lang/Float;");
+  public static final FieldDescriptor DOUBLE_DESCRIPTOR = parseDescriptor("Ljava/lang/Double;");
 
   public VarType type;
 
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
index 79e2cbf..1b6ff99 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
@@ -119,7 +119,7 @@ public class VarType {  // TODO: optimize switch
   }
 
   public boolean isFalseBoolean() {
-    return (convinfo & VarType.FALSEBOOLEAN) != 0;
+    return (convinfo & FALSEBOOLEAN) != 0;
   }
 
   public boolean isSuperset(VarType val) {
@@ -189,13 +189,13 @@ public class VarType {  // TODO: optimize switch
         case CodeConstants.TYPE_FAMILY_INTEGER:
           if ((type1.type == CodeConstants.TYPE_CHAR && type2.type == CodeConstants.TYPE_SHORT)
               || (type1.type == CodeConstants.TYPE_SHORT && type2.type == CodeConstants.TYPE_CHAR)) {
-            return VarType.VARTYPE_SHORTCHAR;
+            return VARTYPE_SHORTCHAR;
           }
           else {
-            return VarType.VARTYPE_BYTECHAR;
+            return VARTYPE_BYTECHAR;
           }
         case CodeConstants.TYPE_FAMILY_OBJECT:
-          return VarType.VARTYPE_NULL;
+          return VARTYPE_NULL;
       }
     }
 
@@ -220,13 +220,13 @@ public class VarType {  // TODO: optimize switch
         case CodeConstants.TYPE_FAMILY_INTEGER:
           if ((type1.type == CodeConstants.TYPE_SHORTCHAR && type2.type == CodeConstants.TYPE_BYTE)
               || (type1.type == CodeConstants.TYPE_BYTE && type2.type == CodeConstants.TYPE_SHORTCHAR)) {
-            return VarType.VARTYPE_SHORT;
+            return VARTYPE_SHORT;
           }
           else {
-            return VarType.VARTYPE_INT;
+            return VARTYPE_INT;
           }
         case CodeConstants.TYPE_FAMILY_OBJECT:
-          return VarType.VARTYPE_OBJECT;
+          return VARTYPE_OBJECT;
       }
     }
 
@@ -236,19 +236,19 @@ public class VarType {  // TODO: optimize switch
   public static VarType getMinTypeInFamily(int family) {
     switch (family) {
       case CodeConstants.TYPE_FAMILY_BOOLEAN:
-        return VarType.VARTYPE_BOOLEAN;
+        return VARTYPE_BOOLEAN;
       case CodeConstants.TYPE_FAMILY_INTEGER:
-        return VarType.VARTYPE_BYTECHAR;
+        return VARTYPE_BYTECHAR;
       case CodeConstants.TYPE_FAMILY_OBJECT:
-        return VarType.VARTYPE_NULL;
+        return VARTYPE_NULL;
       case CodeConstants.TYPE_FAMILY_FLOAT:
-        return VarType.VARTYPE_FLOAT;
+        return VARTYPE_FLOAT;
       case CodeConstants.TYPE_FAMILY_LONG:
-        return VarType.VARTYPE_LONG;
+        return VARTYPE_LONG;
       case CodeConstants.TYPE_FAMILY_DOUBLE:
-        return VarType.VARTYPE_DOUBLE;
+        return VARTYPE_DOUBLE;
       case CodeConstants.TYPE_FAMILY_UNKNOWN:
-        return VarType.VARTYPE_UNKNOWN;
+        return VARTYPE_UNKNOWN;
       default:
         throw new RuntimeException("invalid type family!");
     }
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index db7d84b..6a4f52e 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -127,7 +127,7 @@ public class GenericMain {
 
       List<GenericType> lstBounds = new ArrayList<GenericType>();
 
-      for (; ; ) {
+      while (true) {
         if (value.charAt(0) == ':') {
           // empty superclass, skip
           value = value.substring(1);
@@ -199,7 +199,7 @@ public class GenericMain {
 
           GenericType genpar = type.getArguments().get(i);
           if (genpar != null) {
-            buffer.append(GenericMain.getGenericCastTypeName(genpar));
+            buffer.append(getGenericCastTypeName(genpar));
           }
         }
         buffer.append(">");
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
index e2faa4a..61d07a0 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
@@ -70,7 +70,7 @@ public class GenericType {
           type = CodeConstants.TYPE_OBJECT;
           sig = sig.substring(index + 1, sig.length() - 1);
 
-          for (; ; ) {
+          while (true) {
             String cl = getNextClassSignature(sig);
 
             String name = cl;