Various findbugs related fixes.

Author: immortius

config/findbugs/findbugs-exclude.xml

@@ -18,4 +18,7 @@
         <!-- Ignore this, as it is reported incorrectly from try-with-resources (will be fixed in future versions of findbugs -->
         <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE"/>
     </Match>
+    <Match>
+        <Package name="~org\.terasology\.protobuf.*" />
+    </Match>
 </FindBugsFilter>

engine/src/dev/java/org/terasology/benchmark/BenchmarkResult.java

@@ -43,11 +43,12 @@ public static enum Alignment {
         LEFT {
             @Override
             public String pad(String value, int size) {
-                String result = (value == null ? "" : value);
-                while (result.length() < size) {
-                    result = result + " ";
+                StringBuilder builder = new StringBuilder();
+                builder.append(value == null ? "" : value);
+                while (builder.length() < size) {
+                    builder.append(" ");
                 }
-                return result;
+                return builder.toString();
             }
         },
 

engine/src/main/java/org/terasology/engine/GameThread.java

@@ -34,7 +34,7 @@
  */
 public final class GameThread {
 
-    private static Thread gameThread;
+    private static volatile Thread gameThread;
     private static BlockingDeque<Runnable> pendingRunnables = Queues.newLinkedBlockingDeque();
 
     private GameThread() {

engine/src/main/java/org/terasology/engine/module/ModuleManagerImpl.java

@@ -244,6 +244,7 @@ public boolean accept(Path entry) throws IOException {
                 logger.error("Failed to cloase allModuleClassLoader", e);
             }
         }
+
         allModuleClassLoader = new ModuleClassLoader(urls.toArray(new URL[urls.size()]), getClass().getClassLoader(), moduleSecurityManager);
         for (ExtensionModule module : getExtensionModules()) {
             module.setInactiveClassLoader(allModuleClassLoader);

engine/src/main/java/org/terasology/entitySystem/event/internal/EventSystemImpl.java

@@ -392,7 +392,7 @@ private interface EventHandlerInfo {
         Object getHandler();
     }
 
-    private class ReflectedEventHandlerInfo implements EventHandlerInfo {
+    private static class ReflectedEventHandlerInfo implements EventHandlerInfo {
         private ComponentSystem handler;
         private Method method;
         private ImmutableList<Class<? extends Component>> filterComponents;
@@ -448,7 +448,7 @@ public ComponentSystem getHandler() {
         }
     }
 
-    private class ReceiverEventHandlerInfo<T extends Event> implements EventHandlerInfo {
+    private static class ReceiverEventHandlerInfo<T extends Event> implements EventHandlerInfo {
         private EventReceiver<T> receiver;
         private Class<? extends Component>[] components;
         private int priority;

engine/src/main/java/org/terasology/logic/characters/KinematicCharacterMover.java

@@ -726,7 +726,7 @@ private void walk(final CharacterMovementComponent movementComp, final Character
     /**
      * Holds the result of movement.
      */
-    public class MoveResult {
+    public static class MoveResult {
 
         private Vector3f finalPosition;
         private boolean horizontalHit;

engine/src/main/java/org/terasology/logic/console/ui/ConsoleTabCompletionEngine.java

@@ -56,15 +56,15 @@ public String apply(CommandInfo input) {
         } else if (matches.size() > 1) {
             //multiple matches found
             //add list of available commands
-            String commandMatches = "";
+            StringBuilder commandMatches = new StringBuilder();
             for (String cmd : matches) {
-                if (!commandMatches.isEmpty()) {
-                    commandMatches += " ";
+                if (commandMatches.length() != 0) {
+                    commandMatches.append(" ");
                 }
 
-                commandMatches += cmd;
+                commandMatches.append(cmd);
             }
-            console.addMessage(commandMatches);
+            console.addMessage(commandMatches.toString());
         }
         return text;
     }

engine/src/main/java/org/terasology/logic/delay/DelayedActionSystem.java

@@ -95,7 +95,7 @@ public void addDelayedAction(AddDelayedActionEvent event, EntityRef entity) {
         entity.saveComponent(delayedComponent);
     }
 
-    private final class DelayedOperation {
+    private static final class DelayedOperation {
         private String operationId;
         private EntityRef entityRef;
 

engine/src/main/java/org/terasology/math/TeraMath.java

@@ -164,7 +164,7 @@ public static int clamp(int value, int min, int max) {
      * @return
      */
     public static boolean isFinite(float value) {
-        return value != Float.NaN && value != Float.NEGATIVE_INFINITY && value != Float.POSITIVE_INFINITY;
+        return !Float.isNaN(value) && !Float.isInfinite(value);
     }
 
     /**
@@ -174,7 +174,7 @@ public static boolean isFinite(float value) {
      * @return
      */
     public static boolean isFinite(double value) {
-        return value != Double.NaN && value != Double.NEGATIVE_INFINITY && value != Double.POSITIVE_INFINITY;
+        return !Double.isNaN(value) && !Double.isInfinite(value);
     }
 
     /**

engine/src/main/java/org/terasology/persistence/internal/GlobalStoreLoader.java

@@ -126,7 +126,7 @@ private void loadMissingPrefabs(EntityData.GlobalStore globalStore) {
     private Prefab loadPrefab(EntityData.Prefab prefabData, Map<String, EntityData.Prefab> pendingPrefabs) {
         Prefab result = Assets.getPrefab(prefabData.getName());
         if (result == null) {
-            if (prefabData.hasParentName() && pendingPrefabs.containsKey(pendingPrefabs.get(prefabData.getParentName()))) {
+            if (prefabData.hasParentName() && pendingPrefabs.containsKey(prefabData.getParentName())) {
                 loadPrefab(pendingPrefabs.get(prefabData.getParentName()), pendingPrefabs);
             }
             Module module = moduleManager.getActiveModule(new SimpleUri(prefabData.getName()).getNormalisedModuleName());