Style update part 2 - basic style fixes

Mumfrey
1 parent 43cb3bc4
Showing 23 changed files with 104 additions and 41 deletions
src/client/java/com/mumfrey/liteloader/client/LiteLoaderPanelManager.java
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelConfigContainer.java
src/client/java/com/mumfrey/liteloader/client/gui/startup/LoadingBar.java
src/client/java/com/mumfrey/liteloader/gl/GL.java
src/client/java/com/mumfrey/liteloader/util/ModUtilities.java
src/debug/java/com/mumfrey/liteloader/debug/LoginManager.java
src/debug/java/com/mumfrey/liteloader/debug/LoginPanel.java
src/main/java/com/mumfrey/liteloader/api/EnumeratorPlugin.java
src/main/java/com/mumfrey/liteloader/core/EnabledModsList.java
src/main/java/com/mumfrey/liteloader/core/PacketEvents.java
src/main/java/com/mumfrey/liteloader/core/event/HandlerList.java
src/main/java/com/mumfrey/liteloader/core/event/ProfilingHandlerList.java
src/main/java/com/mumfrey/liteloader/launch/ClassPathUtilities.java
src/main/java/com/mumfrey/liteloader/modconfig/ConfigPanelHost.java
src/main/java/com/mumfrey/liteloader/transformers/ByteCodeUtilities.java
src/main/java/com/mumfrey/liteloader/transformers/event/InjectionPoint.java
src/main/java/com/mumfrey/liteloader/transformers/event/ReturnEventInfo.java
src/main/java/com/mumfrey/liteloader/transformers/event/json/JsonInjection.java
src/main/java/com/mumfrey/liteloader/util/ChatUtilities.java
src/main/java/com/mumfrey/liteloader/util/log/LiteLoaderLogger.java
@@ -278,10 +278,6 @@ public class LiteLoaderPanelManager implements PanelManager&lt;GuiScreen&gt;
     private boolean isPanelSupportedOnScreen(GuiScreen guiScreen)
     {
-        return (
-                guiScreen instanceof GuiMainMenu ||
-                guiScreen instanceof GuiIngameMenu ||
-                guiScreen instanceof GuiOptions
-                );
+        return (guiScreen instanceof GuiMainMenu || guiScreen instanceof GuiIngameMenu || guiScreen instanceof GuiOptions);
     }
 }
@@ -65,9 +65,9 @@ class GuiPanelConfigContainer extends GuiPanel implements ConfigPanelHost
      */
     @SuppressWarnings("unchecked")
     @Override
-    public <ModClass extends LiteMod> ModClass getMod()
+    public <TModClass extends LiteMod> TModClass getMod()
     {
-        return (ModClass)this.mod;
+        return (TModClass)this.mod;
     }
     /* (non-Javadoc)
@@ -37,8 +37,8 @@ public class LoadingBar extends LoadingProgress
 {
     private static LoadingBar instance;
-    private final String LOADING_MESSAGE_1 = "Starting Game...";
-    private final String LOADING_MESSAGE_2 = "Initialising...";
+    private static final String LOADING_MESSAGE_1 = "Starting Game...";
+    private static final String LOADING_MESSAGE_2 = "Initialising...";
     private int minecraftProgress = 0;
     private int totalMinecraftProgress = 606;
@@ -50,7 +50,7 @@ public class LoadingBar extends LoadingProgress
     private ResourceLocation textureLocation = new ResourceLocation("textures/gui/title/mojang.png");
-    private String minecraftMessage = this.LOADING_MESSAGE_1;
+    private String minecraftMessage = LoadingBar.LOADING_MESSAGE_1;
     private String message = "";
     private Minecraft minecraft;
@@ -118,7 +118,7 @@ public class LoadingBar extends LoadingProgress
     protected void _initTextures()
     {
-        this.minecraftMessage = this.LOADING_MESSAGE_2;		
+        this.minecraftMessage = LoadingBar.LOADING_MESSAGE_2;		
     }
     @Override
@@ -1178,9 +1178,9 @@ public class GL
         return GL11.glGetBoolean(pname);
     }
-    public static void gluProject(float objx, float objy, float objz, FloatBuffer modelMatrix, FloatBuffer projMatrix, IntBuffer viewport, FloatBuffer win_pos)
+    public static void gluProject(float objx, float objy, float objz, FloatBuffer modelMatrix, FloatBuffer projMatrix, IntBuffer viewport, FloatBuffer winPos)
     {
-        GLU.gluProject(objx, objy, objz, modelMatrix, projMatrix, viewport, win_pos);
+        GLU.gluProject(objx, objy, objz, modelMatrix, projMatrix, viewport, winPos);
     }
     public static void gluPerspective(float fovy, float aspect, float zNear, float zFar)
@@ -141,7 +141,10 @@ public abstract class ModUtilities
                     }
                 }
             }
-            catch (Exception ex) { ex.printStackTrace(); }
+            catch (Exception ex)
+            {
+                ex.printStackTrace();
+            }
         }
     }
@@ -162,14 +162,20 @@ public class LoginManager
                 AuthData authData = new AuthData(this.authService, this.authentication, this.offline, this.defaultUsername, this.defaultDisplayName);
                 LoginManager.gson.toJson(authData, fileWriter);
             }
-            catch (IOException ex) { ex.printStackTrace(); }
+            catch (IOException ex)
+            {
+                ex.printStackTrace();
+            }
             finally
             {
                 try
                 {
                     if (fileWriter != null) fileWriter.close();
                 }
-                catch (IOException ex) { ex.printStackTrace(); }
+                catch (IOException ex)
+                {
+                    ex.printStackTrace();
+                }
             }
         }
     }
@@ -116,14 +116,16 @@ public class LoginPanel extends JPanel
         this.btnLogin = new JButton("Log in");
         this.btnLogin.addActionListener(new ActionListener() {
-            @Override public void actionPerformed(ActionEvent e) {
+            @Override public void actionPerformed(ActionEvent e)
+            {
                 LoginPanel.this.onLoginClick();
             }
         });
         this.btnCancel = new JButton("Cancel");
         this.btnCancel.addActionListener(new ActionListener() {
-            @Override public void actionPerformed(ActionEvent e) {
+            @Override public void actionPerformed(ActionEvent e)
+            {
                 LoginPanel.this.onCancelClick();
             }
         });
@@ -23,8 +23,7 @@ public interface EnumeratorPlugin
      * 
      * @param container Container to inspect
      * @param classloader ClassLoader for this container
-     * @param superClass Superclass the class must implement
-     * @param supportedPrefixes Registered class prefixes
+     * @param validator Mod class validator
      * @return
      */
     public abstract <T> List<Class<? extends T>> getClasses(LoadableMod<?> container, ClassLoader classloader, ModClassValidator validator);
@@ -19,7 +19,7 @@ import com.google.gson.GsonBuilder;
 public class EnabledModsList
 {
     @SuppressWarnings("unused")
-    private static transient final long serialVersionUID = -6449451105617763769L;
+    private static final transient long serialVersionUID = -6449451105617763769L;
     /**
      * Gson object for serialisation/deserialisation
@@ -38,7 +38,14 @@ public abstract class PacketEvents implements InterfaceProvider
     class PacketHandlerList extends HandlerList<PacketHandler>
     {
         private static final long serialVersionUID = 1L;
-        PacketHandlerList() { super(PacketHandler.class, ReturnLogicOp.AND_BREAK_ON_FALSE); }
+        
+        /**
+         * ctor
+         */
+        PacketHandlerList()
+        {
+            super(PacketHandler.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
+        }
     }
     /**
@@ -46,7 +53,7 @@ public abstract class PacketEvents implements InterfaceProvider
      */
     protected final LiteLoader loader;
-    private PacketHandlerList packetHandlers[] = new PacketHandlerList[Packets.count()];
+    private PacketHandlerList[] packetHandlers = new PacketHandlerList[Packets.count()];
     private FastIterable<ServerChatFilter> serverChatFilters = new HandlerList<ServerChatFilter>(ServerChatFilter.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
@@ -58,6 +65,9 @@ public abstract class PacketEvents implements InterfaceProvider
     private final int clientPayloadPacketId  = Packets.C17PacketCustomPayload.getIndex();
     private final int clientSettingsPacketId = Packets.C15PacketClientSettings.getIndex();
+    /**
+     * ctor
+     */
     public PacketEvents()
     {
         PacketEvents.instance = this;
@@ -90,6 +100,11 @@ public abstract class PacketEvents implements InterfaceProvider
         this.serverChatFilters.add(serverChatFilter);
     }
+    /**
+     * Register a new packet handler
+     * 
+     * @param handler
+     */
     public void registerPacketHandler(PacketHandler handler)
     {
         List<Class<? extends Packet>> handledPackets = handler.getHandledPackets();
@@ -115,6 +130,12 @@ public abstract class PacketEvents implements InterfaceProvider
         }
     }
+    /**
+     * Event callback
+     * 
+     * @param e
+     * @param netHandler
+     */
     public static void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler)
     {
         PacketEvents.instance.handlePacket(e, netHandler, e.getPacketId());
@@ -546,7 +546,7 @@ public class HandlerList&lt;T&gt; extends LinkedList&lt;T&gt; implements FastIterableDeque&lt;T
      *
      * @param <T>
      */
-    public static abstract class BakedHandlerList<T>
+    public abstract static class BakedHandlerList<T>
     {
         public abstract T get();
@@ -194,7 +194,7 @@ public class ProfilingHandlerList&lt;T extends Listener&gt; extends HandlerList&lt;T&gt;
      *
      * @param <T>
      */
-    public static abstract class BakedList<T> extends HandlerList.BakedHandlerList<T>
+    public abstract static class BakedList<T> extends HandlerList.BakedHandlerList<T>
     {
         private final Profiler profiler;
@@ -287,7 +287,10 @@ public abstract class ClassPathUtilities
                 File targetFile = new File(new URI(jarPath));
                 return returnParent ? targetFile.getParentFile() : targetFile;
             }
-            catch (URISyntaxException ex) { }
+            catch (URISyntaxException ex)
+            {
+                // derp
+            }
         }
         return null;
@@ -12,7 +12,7 @@ public interface ConfigPanelHost
     /**
      * Get the mod instance which owns the panel
      */
-    public abstract <ModClass extends LiteMod> ModClass getMod();
+    public abstract <TModClass extends LiteMod> TModClass getMod();
     /**
      * Get the width of the configuration panel area
@@ -478,9 +478,10 @@ public abstract class ByteCodeUtilities
                 String typeName = type.getClassName();
                 typeName = typeName.substring(typeName.lastIndexOf('.') + 1);
                 return typeName;
+            default:
+                return "Object";
         }
-        return "Object";
     }
     /**
@@ -99,7 +99,7 @@ public abstract class InjectionPoint
      * 
      * @author Adam Mummery-Smith
      */
-    static abstract class CompositeInjectionPoint extends InjectionPoint
+    abstract static class CompositeInjectionPoint extends InjectionPoint
     {
         protected final InjectionPoint[] components;
@@ -100,6 +100,8 @@ public class ReturnEventInfo&lt;S, R&gt; extends EventInfo&lt;S&gt;
     {
         return this.returnValue;
     }
+    
+    // CHECKSTYLE:OFF
     // All of the accessors below are to avoid having to generate unboxing conversions in bytecode
     public byte    getReturnValueB() { if (this.returnValue == null) return 0;     return (Byte)     this.returnValue; }
@@ -111,6 +113,9 @@ public class ReturnEventInfo&lt;S, R&gt; extends EventInfo&lt;S&gt;
     public short   getReturnValueS() { if (this.returnValue == null) return 0;     return (Short)    this.returnValue; }
     public boolean getReturnValueZ() { if (this.returnValue == null) return false; return (Boolean)  this.returnValue; }
+    // CHECKSTYLE:ON
+
+    
     public static String getReturnAccessor(Type returnType)
     {
         if (returnType.getSort() == Type.OBJECT)
@@ -125,10 +125,11 @@ public class JsonInjection implements Serializable
                 catch (Exception ex)
                 {
                     throw new RuntimeException(ex);
-                } 
-        }
+                }
-        throw new InvalidEventJsonException("Could not parse injection type");
+            default:
+                throw new InvalidEventJsonException("Could not parse injection type");
+        }
     }
     private Object getArg(int arg)
@@ -174,6 +175,9 @@ public class JsonInjection implements Serializable
                 case BEFORE:
                     return InjectionPoint.before(injectionPoint);
+                    
+                default:
+                    return injectionPoint;
             }
         }
@@ -56,6 +56,7 @@ public abstract class ChatUtilities
                 case STRIKETHROUGH: style.setStrikethrough(true); break;
                 case UNDERLINE: style.setUnderlined(true); break;
                 case OBFUSCATED: style.setObfuscated(true); break;
+                default: return style;
             }
         }
@@ -95,9 +95,9 @@ public class LiteLoaderLogger extends AbstractAppender
         while (message.indexOf('\n') > -1)
         {
-            int LF = message.indexOf('\n');
-            this.appendLine(date + message.substring(0, LF));
-            message = message.substring(LF + 1);
+            int lineFeedPos = message.indexOf('\n');
+            this.appendLine(date + message.substring(0, lineFeedPos));
+            message = message.substring(lineFeedPos + 1);
         }
         this.appendLine(date + message);
@@ -151,7 +151,14 @@ public class LiteLoaderLogger extends AbstractAppender
             StringWriter sw = new StringWriter();
             LiteLoaderLogger.lastThrowable.printStackTrace(new PrintWriter(sw));
             lastThrowableWrapped = new Throwable(sw.toString());
-            try { sw.close(); } catch (IOException ex) {}
+            try
+            {
+                sw.close();
+            }
+            catch (IOException ex)
+            {
+                // oh well
+            }
         }
         return lastThrowableWrapped;
@@ -107,7 +107,10 @@ public class LiteLoaderLogUpload extends Thread
                 reader.close();
                 this.response = readString.toString();
             }
-            catch (IOException ex) { ex.printStackTrace(); }
+            catch (IOException ex)
+            {
+                ex.printStackTrace();
+            }
             httpStream.close();
             outputStream.close();
@@ -115,7 +115,10 @@ public class PastebinUpload extends Thread
                     reader.close();
                     this.pasteUrl = readString.toString();
                 }
-                catch (IOException ex) { ex.printStackTrace(); }
+                catch (IOException ex)
+                {
+                    ex.printStackTrace();
+                }
                 httpStream.close();
             }
@@ -108,9 +108,18 @@ public class ReplicatedPermissionsContainer implements Serializable
             ReplicatedPermissionsContainer object = (ReplicatedPermissionsContainer)inputStream.readObject();
             return object;
         }
-        catch (IOException e) { }
-        catch (ClassNotFoundException e) { }
-        catch (ClassCastException e) { }
+        catch (IOException e)
+        {
+            // Don't care
+        }
+        catch (ClassNotFoundException e)
+        {
+            // Don't care
+        }
+        catch (ClassCastException e)
+        {
+            // Don't care
+        }
         return null;
     }