Commits

Michael Ludwig committed f7ab113

Improve auto-formatting for enum declarations.

  • Participants
  • Parent commits 7129cb9

Comments (0)

Files changed (15)

File ferox-input/src/main/java/com/ferox/input/KeyEvent.java

     public static enum KeyCode {
         UNKNOWN("Unknown"),
 
-        ESCAPE("Esc"), BACK_QUOTE("`"), TAB("Tab"), LEFT_BRACKET("["),
-        RIGHT_BRACKET("]"), BACK_SLASH("\\"), FORWARD_SLASH("/"), RETURN("Return"),
-        SEMICOLON(";"), QUOTE("'"), COMMA(","), PERIOD("."), MINUS("-"), EQUALS("="),
-        BACK_SPACE("Back Space"), DELETE("Delete"), SPACE("Space"), INSERT("Insert"),
-        PAUSE("Pause"), HOME("Home"), END("End"), PAGE_UP("Page Up"),
+        ESCAPE("Esc"),
+        BACK_QUOTE("`"),
+        TAB("Tab"),
+        LEFT_BRACKET("["),
+        RIGHT_BRACKET("]"),
+        BACK_SLASH("\\"),
+        FORWARD_SLASH("/"),
+        RETURN("Return"),
+        SEMICOLON(";"),
+        QUOTE("'"),
+        COMMA(","),
+        PERIOD("."),
+        MINUS("-"),
+        EQUALS("="),
+        BACK_SPACE("Back Space"),
+        DELETE("Delete"),
+        SPACE("Space"),
+        INSERT("Insert"),
+        PAUSE("Pause"),
+        HOME("Home"),
+        END("End"),
+        PAGE_UP("Page Up"),
         PAGE_DOWN("Page Down"),
 
-        UP("Up"), LEFT("Left"), RIGHT("Right"), DOWN("Down"),
+        UP("Up"),
+        LEFT("Left"),
+        RIGHT("Right"),
+        DOWN("Down"),
 
-        F1("F1"), F2("F2"), F3("F3"), F4("F4"), F5("F5"), F6("F6"), F7("F7"), F8("F8"),
-        F9("F9"), F10("F10"), F11("F11"), F12("F12"),
+        F1("F1"),
+        F2("F2"),
+        F3("F3"),
+        F4("F4"),
+        F5("F5"),
+        F6("F6"),
+        F7("F7"),
+        F8("F8"),
+        F9("F9"),
+        F10("F10"),
+        F11("F11"),
+        F12("F12"),
 
-        N1("1"), N2("2"), N3("3"), N4("4"), N5("5"), N6("6"), N7("7"), N8("8"), N9("9"),
+        N1("1"),
+        N2("2"),
+        N3("3"),
+        N4("4"),
+        N5("5"),
+        N6("6"),
+        N7("7"),
+        N8("8"),
+        N9("9"),
         N0("0"),
 
-        A("a"), B("b"), C("c"), D("d"), E("e"), F("f"), G("g"), H("h"), I("i"), J("j"),
-        K("k"), L("l"), M("m"), N("n"), O("o"), P("p"), Q("q"), R("r"), S("s"), T("t"),
-        U("u"), V("v"), W("w"), X("x"), Y("y"), Z("z"),
+        A("a"),
+        B("b"),
+        C("c"),
+        D("d"),
+        E("e"),
+        F("f"),
+        G("g"),
+        H("h"),
+        I("i"),
+        J("j"),
+        K("k"),
+        L("l"),
+        M("m"),
+        N("n"),
+        O("o"),
+        P("p"),
+        Q("q"),
+        R("r"),
+        S("s"),
+        T("t"),
+        U("u"),
+        V("v"),
+        W("w"),
+        X("x"),
+        Y("y"),
+        Z("z"),
 
-        NUM_LOCK("Num Lock"), SCROLL_LOCK("Scroll Lock"), CAPS_LOCK("Caps Lock"),
+        NUM_LOCK("Num Lock"),
+        SCROLL_LOCK("Scroll Lock"),
+        CAPS_LOCK("Caps Lock"),
 
-        NUMPAD_0("Numpad 0"), NUMPAD_1("Numpad 1"), NUMPAD_2("Numpad 2"),
-        NUMPAD_3("Numpad 3"), NUMPAD_4("Numpad 4"), NUMPAD_5("Numpad 5"),
-        NUMPAD_6("Numpad 6"), NUMPAD_7("Numpad 7"), NUMPAD_8("Numpad 8"),
-        NUMPAD_9("Numpad 9"), NUMPAD_ADD("Numpad +"), NUMPAD_SUBTRACT("Numpad -"),
-        NUMPAD_DECIMAL("Numpad ."), NUMPAD_DIVIDE("Numpad /"),
+        NUMPAD_0("Numpad 0"),
+        NUMPAD_1("Numpad 1"),
+        NUMPAD_2("Numpad 2"),
+        NUMPAD_3("Numpad 3"),
+        NUMPAD_4("Numpad 4"),
+        NUMPAD_5("Numpad 5"),
+        NUMPAD_6("Numpad 6"),
+        NUMPAD_7("Numpad 7"),
+        NUMPAD_8("Numpad 8"),
+        NUMPAD_9("Numpad 9"),
+        NUMPAD_ADD("Numpad +"),
+        NUMPAD_SUBTRACT("Numpad -"),
+        NUMPAD_DECIMAL("Numpad ."),
+        NUMPAD_DIVIDE("Numpad /"),
         NUMPAD_MULTIPLY("NUMPAD *"),
 
-        RIGHT_ALT("Right Alt"), LEFT_ALT("Left Alt"), RIGHT_CONTROL("Right Control"),
-        LEFT_CONTROL("Left Control"), RIGHT_SHIFT("Right Shift"),
-        LEFT_SHIFT("Left Shift"), RIGHT_META("Right Meta"), LEFT_META("Left Meta");
+        RIGHT_ALT("Right Alt"),
+        LEFT_ALT("Left Alt"),
+        RIGHT_CONTROL("Right Control"),
+        LEFT_CONTROL("Left Control"),
+        RIGHT_SHIFT("Right Shift"),
+        LEFT_SHIFT("Left Shift"),
+        RIGHT_META("Right Meta"),
+        LEFT_META("Left Meta");
 
         private final String descr;
 

File ferox-math/src/main/java/com/ferox/math/bounds/Frustum.java

 
         return result;
     }
-    
+
     /*
      * Update the plane instances returned by getFrustumPlane() to reflect any
      * changes to the frustum's local parameters or orientation. Also update the

File ferox-physics/src/main/java/com/ferox/physics/collision/shape/AxisSweptShape.java

  */
 public abstract class AxisSweptShape extends ConvexShape {
     public static enum Axis {
-        X, Y, Z
+        X,
+        Y,
+        Z
     }
 
     protected final Vector3 inertiaTensorPartial;

File ferox-renderer/ferox-renderer-api/src/main/java/com/ferox/renderer/FixedFunctionRenderer.java

      * </p>
      */
     public static enum CombineSource {
-        CURR_TEX, PREV_TEX, CONST_COLOR, VERTEX_COLOR, TEX0, TEX1, TEX2, TEX3, TEX4,
-        TEX5, TEX6, TEX7, TEX8, TEX9, TEX10, TEX11, TEX12, TEX13, TEX14, TEX15, TEX16,
-        TEX17, TEX18, TEX19, TEX20, TEX21, TEX22, TEX23, TEX24, TEX25, TEX26, TEX27,
-        TEX28, TEX29, TEX30, TEX31
+        CURR_TEX,
+        PREV_TEX,
+        CONST_COLOR,
+        VERTEX_COLOR,
+        TEX0,
+        TEX1,
+        TEX2,
+        TEX3,
+        TEX4,
+        TEX5,
+        TEX6,
+        TEX7,
+        TEX8,
+        TEX9,
+        TEX10,
+        TEX11,
+        TEX12,
+        TEX13,
+        TEX14,
+        TEX15,
+        TEX16,
+        TEX17,
+        TEX18,
+        TEX19,
+        TEX20,
+        TEX21,
+        TEX22,
+        TEX23,
+        TEX24,
+        TEX25,
+        TEX26,
+        TEX27,
+        TEX28,
+        TEX29,
+        TEX30,
+        TEX31
     }
 
     /**

File ferox-renderer/ferox-renderer-api/src/main/java/com/ferox/resource/GlslShader.java

         // FIXME are there more?
         // should I really limit it to an enum, I could just have
         // it be an integer that is parsed that is probably safer
-        V1_20, V1_30, V1_40, V1_50, V3_30, V4_00
+        V1_20,
+        V1_30,
+        V1_40,
+        V1_50,
+        V3_30,
+        V4_00
     }
 
     public static enum AttributeType {
-        FLOAT(1, 1), FLOAT_VEC2(2, 1), FLOAT_VEC3(3, 1), FLOAT_VEC4(4, 1), FLOAT_MAT2(2,
-                                                                                      2),
-        FLOAT_MAT3(3, 3), FLOAT_MAT4(4, 4), UNSUPPORTED(0, 0);
+        FLOAT(1, 1),
+        FLOAT_VEC2(2, 1),
+        FLOAT_VEC3(3, 1),
+        FLOAT_VEC4(4, 1),
+        FLOAT_MAT2(2, 2),
+        FLOAT_MAT3(3, 3),
+        FLOAT_MAT4(4, 4),
+        UNSUPPORTED(0, 0);
 
         private final int row;
         private final int col;
     }
 
     public static enum ShaderType {
-        GEOMETRY, VERTEX, FRAGMENT
+        GEOMETRY,
+        VERTEX,
+        FRAGMENT
     }
 
     private Version version;

File ferox-renderer/ferox-renderer-api/src/main/java/com/ferox/resource/GlslUniform.java

  */
 public class GlslUniform {
     public static enum UniformType {
-        FLOAT(1), FLOAT_VEC2(2), FLOAT_VEC3(3), FLOAT_VEC4(4), FLOAT_MAT2(4),
-        FLOAT_MAT3(9), FLOAT_MAT4(16),
+        FLOAT(1),
+        FLOAT_VEC2(2),
+        FLOAT_VEC3(3),
+        FLOAT_VEC4(4),
+        FLOAT_MAT2(4),
+        FLOAT_MAT3(9),
+        FLOAT_MAT4(16),
 
-        INT(1), INT_VEC2(2), INT_VEC3(3), INT_VEC4(4),
+        INT(1),
+        INT_VEC2(2),
+        INT_VEC3(3),
+        INT_VEC4(4),
 
-        TEXTURE_1D(1), TEXTURE_2D(1), TEXTURE_3D(1), TEXTURE_CUBEMAP(1), SHADOW_MAP(1),
+        TEXTURE_1D(1),
+        TEXTURE_2D(1),
+        TEXTURE_3D(1),
+        TEXTURE_CUBEMAP(1),
+        SHADOW_MAP(1),
 
-        BOOL(1), UNSUPPORTED(0);
+        BOOL(1),
+        UNSUPPORTED(0);
 
         private final int primCount;
 

File ferox-renderer/ferox-renderer-api/src/main/java/com/ferox/resource/Texture.java

      * describes both minification and magnification.
      */
     public static enum Filter {
-        NEAREST, LINEAR, MIPMAP_NEAREST, MIPMAP_LINEAR
+        NEAREST,
+        LINEAR,
+        MIPMAP_NEAREST,
+        MIPMAP_LINEAR
     }
 
     /**

File ferox-renderer/ferox-renderer-api/src/main/java/com/ferox/resource/TextureFormat.java

  * @author Michael Ludwig
  */
 public enum TextureFormat {
-    RGBA(null, 4, 4, true), RGBA_4444(DataType.SHORT, 1, 4, true, true),
+    RGBA(null, 4, 4, true),
+    RGBA_4444(DataType.SHORT, 1, 4, true, true),
     RGBA_8888(DataType.INT, 1, 4, true, true),
-    RGBA_5551(DataType.SHORT, 1, 4, true, true), RGBA_FLOAT(DataType.FLOAT, 4, 4, true),
+    RGBA_5551(DataType.SHORT, 1, 4, true, true),
+    RGBA_FLOAT(DataType.FLOAT, 4, 4, true),
 
-    RGBA_DXT1(DataType.BYTE, -1, 4, true), RGBA_DXT3(DataType.BYTE, -1, 4, true),
+    RGBA_DXT1(DataType.BYTE, -1, 4, true),
+    RGBA_DXT3(DataType.BYTE, -1, 4, true),
     RGBA_DXT5(DataType.BYTE, -1, 4, true),
 
-    BGRA(null, 4, 4, true), BGRA_4444(DataType.SHORT, 1, 4, true, true),
+    BGRA(null, 4, 4, true),
+    BGRA_4444(DataType.SHORT, 1, 4, true, true),
     BGRA_8888(DataType.INT, 1, 4, true, true),
     BGRA_5551(DataType.SHORT, 1, 4, true, true),
 
-    ARGB_4444(DataType.SHORT, 1, 4, true, true), ARGB_1555(DataType.SHORT, 1, 4, true,
-                                                           true), ARGB_8888(DataType.INT,
-                                                                            1, 4, true,
-                                                                            true),
+    ARGB_4444(DataType.SHORT, 1, 4, true, true),
+    ARGB_1555(DataType.SHORT, 1, 4, true, true),
+    ARGB_8888(DataType.INT, 1, 4, true, true),
 
-    ABGR_4444(DataType.SHORT, 1, 4, true, true), ABGR_1555(DataType.SHORT, 1, 4, true,
-                                                           true), ABGR_8888(DataType.INT,
-                                                                            1, 4, true,
-                                                                            true),
+    ABGR_4444(DataType.SHORT, 1, 4, true, true),
+    ABGR_1555(DataType.SHORT, 1, 4, true, true),
+    ABGR_8888(DataType.INT, 1, 4, true, true),
 
-    RGB(null, 3, 3, false), RGB_565(DataType.SHORT, 1, 3, false, true),
-    RGB_FLOAT(DataType.FLOAT, 3, 3, false), RGB_DXT1(DataType.BYTE, -1, 3, false),
+    RGB(null, 3, 3, false),
+    RGB_565(DataType.SHORT, 1, 3, false, true),
+    RGB_FLOAT(DataType.FLOAT, 3, 3, false),
+    RGB_DXT1(DataType.BYTE, -1, 3, false),
 
-    BGR(null, 3, 3, false), BGR_565(DataType.SHORT, 1, 3, false, true),
+    BGR(null, 3, 3, false),
+    BGR_565(DataType.SHORT, 1, 3, false, true),
 
-    R(null, 1, 1, false), R_FLOAT(DataType.FLOAT, 1, 1, false), RG(null, 2, 2, false),
+    R(null, 1, 1, false),
+    R_FLOAT(DataType.FLOAT, 1, 1, false),
+    RG(null, 2, 2, false),
     RG_FLOAT(DataType.FLOAT, 2, 2, false),
 
-    DEPTH(DataType.INT, 1, 1, false), DEPTH_FLOAT(DataType.FLOAT, 1, 1, false),
+    DEPTH(DataType.INT, 1, 1, false),
+    DEPTH_FLOAT(DataType.FLOAT, 1, 1, false),
     DEPTH_STENCIL(DataType.INT, 1, 1, false);
 
     private DataType type;

File ferox-renderer/ferox-renderer-impl/src/main/java/com/ferox/renderer/impl/FixedFunctionState.java

      * in OpenGL.
      */
     public static enum FogMode {
-        LINEAR, EXP, EXP_SQUARED
+        LINEAR,
+        EXP,
+        EXP_SQUARED
     }
 
     /**
      * EMISSIVE enum is unused, since it's only available for material colors.
      */
     public static enum LightColor {
-        AMBIENT, DIFFUSE, SPECULAR, EMISSIVE
+        AMBIENT,
+        DIFFUSE,
+        SPECULAR,
+        EMISSIVE
     }
 
     /**
      * matrix types, you must set the current mode.
      */
     public static enum MatrixMode {
-        MODELVIEW, PROJECTION, TEXTURE
+        MODELVIEW,
+        PROJECTION,
+        TEXTURE
     }
 
     public static enum VertexTarget {
-        VERTICES, NORMALS, TEXCOORDS, COLORS
+        VERTICES,
+        NORMALS,
+        TEXCOORDS,
+        COLORS
     }
 
     // cached defaults

File ferox-renderer/ferox-renderer-impl/src/main/java/com/ferox/renderer/impl/LifeCycleManager.java

      * states.
      */
     public static enum Status {
-        WAITING_INIT, STARTING, ACTIVE, STOPPING, WAITING_ON_CHILDREN, STOPPED
+        WAITING_INIT,
+        STARTING,
+        ACTIVE,
+        STOPPING,
+        WAITING_ON_CHILDREN,
+        STOPPED
     }
 
     private final ReentrantReadWriteLock lock;

File ferox-scene/src/main/java/com/ferox/scene/AmbientLight.java

  */
 package com.ferox.scene;
 
-
 /**
  * AmbientLight represents a source of ambient light in a scene. Ambient lights
  * contribute an equal amount of light intensity to every rendered object,

File ferox-scene/src/main/java/com/ferox/scene/DiffuseColor.java

  */
 package com.ferox.scene;
 
-
 /**
  * <p>
  * DiffuseColor specifies the color of the diffuse reflection of a material. The

File ferox-scene/src/main/java/com/ferox/scene/EmittedColor.java

  */
 package com.ferox.scene;
 
-
 /**
  * <p>
  * EmittedColor causes the Entity to emit a local light. This can be used for

File ferox-scene/src/main/java/com/ferox/scene/PointLight.java

  */
 package com.ferox.scene;
 
-
 /**
  * <p>
  * A PointLight is a type of light where light is emitted equally in all

File ferox-scene/src/main/java/com/ferox/scene/SpecularColor.java

  */
 package com.ferox.scene;
 
-
 /**
  * <p>
  * SpecularColor adds specular lighting to the material used to render an