multiple code improvements: squid:S1066, squid:S1155, squid:S1118, sq…

…uid:S2325
forge · Mar 11, 2016 · d420de4 · d420de4
1 parent df1decd
commit d420de4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/dist/src/main/java/org/jboss/forge/roaster/Bootstrap.java b/dist/src/main/java/org/jboss/forge/roaster/Bootstrap.java
@@ -139,7 +139,7 @@ else if (file.getName().endsWith(".java"))
       }
    }
 
-   private String help()
+   private static String help()
    {
       StringBuilder sb = new StringBuilder();
       sb.append("Usage: roaster [OPTION]... FILES ... \n");

diff --git a/impl/src/main/java/org/jboss/forge/roaster/model/ast/AnnotationAccessor.java b/impl/src/main/java/org/jboss/forge/roaster/model/ast/AnnotationAccessor.java
@@ -161,7 +161,7 @@ public void removeAllAnnotations(final SingleVariableDeclaration variableDeclara
       removeAllAnnotations(variableDeclaration.modifiers());
    }
 
-   private void removeAllAnnotations(final List<?> modifiers)
+   private static void removeAllAnnotations(final List<?> modifiers)
    {
       Iterator<?> iterator = modifiers.iterator();
       while (iterator.hasNext())
@@ -244,7 +244,7 @@ private AnnotationSource<O> getAnnotation(final AnnotationTargetSource<O, T> tar
       return null;
    }
 
-   private List<?> getModifiers(final ASTNode body)
+   private static List<?> getModifiers(final ASTNode body)
    {
       if (body instanceof BodyDeclaration)
       {

diff --git a/impl/src/main/java/org/jboss/forge/roaster/model/ast/ModifierAccessor.java b/impl/src/main/java/org/jboss/forge/roaster/model/ast/ModifierAccessor.java
@@ -90,7 +90,7 @@ public void removeModifier(ASTNode body, ModifierKeyword keyword)
    }
 
    @SuppressWarnings("unchecked")
-   private List<Modifier> getInternalModifiers(final ASTNode body)
+   private static List<Modifier> getInternalModifiers(final ASTNode body)
    {
       if (body instanceof BodyDeclaration)
       {

diff --git a/impl/src/main/java/org/jboss/forge/roaster/model/impl/AbstractJavaSource.java b/impl/src/main/java/org/jboss/forge/roaster/model/impl/AbstractJavaSource.java
@@ -368,10 +368,9 @@ public String resolveType(final String type)
       }
 
       // No import matches and no wild-card/on-demand import matches means this class is in the same package.
-      if (Types.isSimpleName(result))
+      if (Types.isSimpleName(result) && getPackage() != null)
       {
-         if (getPackage() != null)
-            result = getPackage() + "." + result;
+         result = getPackage() + "." + result;
       }
 
       return result;
@@ -387,7 +386,7 @@ private List<WildcardImportResolver> getImportResolvers()
             resolvers.add(r);
          }
       }
-      if (resolvers.size() == 0)
+      if (resolvers.isEmpty())
       {
          throw new IllegalStateException("No instances of [" + WildcardImportResolver.class.getName()
                   + "] were found on the classpath.");