underscore in type variable name

forge · Apr 3, 2014 · 1b04c5f · 1b04c5f
1 parent b9ae609
commit 1b04c5f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
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
@@ -822,7 +822,7 @@ public JavaSource<?> getNestedType(String name)
    }
 
    @Override
-   public <NESTEDTYPE extends JavaSource<?>> NESTEDTYPE addNestedType(NESTEDTYPE type)
+   public <NESTED_TYPE extends JavaSource<?>> NESTED_TYPE addNestedType(NESTED_TYPE type)
    {
       if (type instanceof AbstractJavaSource)
       {
@@ -834,7 +834,7 @@ public <NESTEDTYPE extends JavaSource<?>> NESTEDTYPE addNestedType(NESTEDTYPE ty
       {
          throw new IllegalArgumentException("type must be an AbstractJavaSource instance");
       }
-      return (NESTEDTYPE) getNestedType(type.getName());
+      return (NESTED_TYPE) getNestedType(type.getName());
    }
 
    @Override
@@ -850,17 +850,17 @@ public O removeNestedType(JavaSource<?> type)
    }
 
    @Override
-   public <NESTEDTYPE extends JavaSource<?>> NESTEDTYPE addNestedType(Class<NESTEDTYPE> type)
+   public <NESTED_TYPE extends JavaSource<?>> NESTED_TYPE addNestedType(Class<NESTED_TYPE> type)
    {
       JavaSource<?> nestedType = Roaster.create(type);
-      return (NESTEDTYPE) addNestedType(nestedType);
+      return (NESTED_TYPE) addNestedType(nestedType);
    }
 
    @Override
-   public <NESTEDTYPE extends JavaSource<?>> NESTEDTYPE addNestedType(String declaration)
+   public <NESTED_TYPE extends JavaSource<?>> NESTED_TYPE addNestedType(String declaration)
    {
       JavaSource<?> nestedType = Roaster.parse(JavaSource.class, declaration);
-      return (NESTEDTYPE) addNestedType(nestedType);
+      return (NESTED_TYPE) addNestedType(nestedType);
    }
 
    @Override

diff --git a/impl/src/main/java/org/jboss/forge/roaster/model/impl/EnumConstantBodyImpl.java b/impl/src/main/java/org/jboss/forge/roaster/model/impl/EnumConstantBodyImpl.java
@@ -823,26 +823,26 @@ public boolean hasNestedType(Class<?> type)
    }
 
    @Override
-   public <NESTEDTYPE extends JavaSource<?>> NESTEDTYPE addNestedType(Class<NESTEDTYPE> type)
+   public <NESTED_TYPE extends JavaSource<?>> NESTED_TYPE addNestedType(Class<NESTED_TYPE> type)
    {
       if (type != JavaClassSource.class)
       {
          throw new IllegalArgumentException("Enum constants body allow only classes to be added ");
       }
       JavaSource<?> nestedType = Roaster.create(type);
-      return (NESTEDTYPE) addNestedType(nestedType);
+      return (NESTED_TYPE) addNestedType(nestedType);
    }
 
    @Override
-   public <NESTEDTYPE extends JavaSource<?>> NESTEDTYPE addNestedType(String declaration)
+   public <NESTED_TYPE extends JavaSource<?>> NESTED_TYPE addNestedType(String declaration)
    {
       JavaType<?> source = Roaster.parse(declaration);
       if (!source.isClass())
       {
          throw new IllegalArgumentException("Enum constants body allow only classes to be added ");
       }
       JavaSource<?> nestedType = Roaster.parse(JavaSource.class, declaration);
-      return (NESTEDTYPE) addNestedType(nestedType);
+      return (NESTED_TYPE) addNestedType(nestedType);
    }
 
    @Override
@@ -858,7 +858,7 @@ public Body removeNestedType(JavaSource<?> type)
    }
 
    @Override
-   public <NESTEDTYPE extends JavaSource<?>> NESTEDTYPE addNestedType(NESTEDTYPE type)
+   public <NESTED_TYPE extends JavaSource<?>> NESTED_TYPE addNestedType(NESTED_TYPE type)
    {
       if (!type.isClass())
       {
@@ -874,7 +874,7 @@ public <NESTEDTYPE extends JavaSource<?>> NESTEDTYPE addNestedType(NESTEDTYPE ty
       {
          throw new IllegalArgumentException("type must be an AbstractJavaSource instance");
       }
-      return (NESTEDTYPE) getNestedType(type.getName());
+      return (NESTED_TYPE) getNestedType(type.getName());
    }
 
    @Override