[Truffle] Tidy up a couple of minor things in the OM DSL's generated …

…code.
jruby · Jul 24, 2015 · e4ea16a · e4ea16a
1 parent 280a401
commit e4ea16a
Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayNodes.java
@@ -62,7 +62,7 @@
 public abstract class ArrayNodes {
 
     @Layout
-    public static interface ArrayLayout {
+    public interface ArrayLayout {
 
         DynamicObject createArray(Object store, int size);
 

diff --git a/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/LayoutGenerator.java b/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/LayoutGenerator.java
@@ -25,16 +25,16 @@ public LayoutGenerator(LayoutModel layout) {
     public void generate(PrintStream stream) {
         stream.printf("package %s;\n", layout.getPackageName());
         stream.println();
+        stream.println("import java.util.EnumSet;");
         stream.println("import com.oracle.truffle.api.object.*;");
         stream.println("import org.jruby.truffle.om.dsl.api.UnexpectedLayoutRefusalException;");
-        stream.println("import java.util.EnumSet;");
         stream.printf("import %s;\n", layout.getInterfaceFullName());
         stream.println();
         stream.printf("public class %sLayoutImpl implements %sLayout {\n", layout.getName(), layout.getName());
         stream.println("    ");
         stream.printf("    public static final %sLayout INSTANCE = new %sLayoutImpl();\n", layout.getName(), layout.getName());
         stream.println("    ");
-        stream.printf("    public static class %sType extends ObjectType {\n", layout.getName());
+        stream.printf("    private static class %sType extends ObjectType {\n", layout.getName());
         stream.println("        ");
         stream.println("    }");
         stream.println("    ");