Fix errors in enableModule/enableModuleAndDependencies.

immortius · immortius · commit 540f99ecaadd · 2014-04-29T19:00:29.000+10:00
Checkstyle fixes.
diff --git a/engine/src/main/java/org/terasology/engine/TerasologyEngine.java b/engine/src/main/java/org/terasology/engine/TerasologyEngine.java
@@ -358,7 +358,8 @@ private void initManagers() {
 
     private ModuleManager initModuleManager() {
         ModuleSecurityManager moduleSecurityManager = new ModuleSecurityManager();
-        ModuleManager moduleManager = CoreRegistry.putPermanently(ModuleManager.class, new ModuleManagerImpl(moduleSecurityManager, config.getSystem().isReflectionsCacheEnabled()));
+        ModuleManager moduleManager = CoreRegistry.putPermanently(ModuleManager.class,
+                new ModuleManagerImpl(moduleSecurityManager, config.getSystem().isReflectionsCacheEnabled()));
 
         moduleSecurityManager.addAPIPackage("java.lang");
         moduleSecurityManager.addAPIPackage("java.lang.ref");
diff --git a/engine/src/main/java/org/terasology/engine/module/ModuleManagerImpl.java b/engine/src/main/java/org/terasology/engine/module/ModuleManagerImpl.java
@@ -18,7 +18,15 @@
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Stopwatch;
-import com.google.common.collect.*;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.google.common.collect.Table;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonIOException;
@@ -40,14 +48,26 @@
 import org.terasology.utilities.gson.VersionTypeAdapter;
 import org.terasology.version.TerasologyVersion;
 
-import java.io.*;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.lang.reflect.Modifier;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.nio.file.*;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -182,7 +202,7 @@ public void enableModule(Module module) {
         Module oldModule = activeModules.put(module.getId(), module);
         if (!module.equals(oldModule)) {
             if (oldModule != null && oldModule instanceof ExtensionModule) {
-                CoreRegistry.get(AssetManager.class).removeAssetSource(module.getModuleSource());
+                CoreRegistry.get(AssetManager.class).removeAssetSource(oldModule.getModuleSource());
             }
             if (module instanceof ExtensionModule) {
                 CoreRegistry.get(AssetManager.class).addAssetSource(module.getModuleSource());
@@ -197,15 +217,7 @@ public void enableModuleAndDependencies(Module module) {
                 enableModuleAndDependencies(dependency);
             }
         }
-        Module oldModule = activeModules.put(module.getId(), module);
-        if (!module.equals(oldModule)) {
-            if (oldModule != null && oldModule instanceof ExtensionModule) {
-                CoreRegistry.get(AssetManager.class).removeAssetSource(module.getModuleSource());
-            }
-            if (module instanceof ExtensionModule) {
-                CoreRegistry.get(AssetManager.class).addAssetSource(module.getModuleSource());
-            }
-        }
+        enableModule(module);
     }
 
     @Override
diff --git a/engine/src/main/java/org/terasology/entitySystem/entity/EntityManager.java b/engine/src/main/java/org/terasology/entitySystem/entity/EntityManager.java
@@ -111,6 +111,7 @@ public interface EntityManager {
     /**
      * @param other
      * @return A new entity with a copy of each of the other entity's components
+     * @deprecated Use EntityRef.copy() instead.
      */
     @Deprecated
     EntityRef copy(EntityRef other);
diff --git a/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorEditor.java b/engine/src/main/java/org/terasology/logic/behavior/nui/BehaviorEditor.java
@@ -27,7 +27,12 @@
 import org.terasology.math.Rect2i;
 import org.terasology.math.Vector2i;
 import org.terasology.registry.CoreRegistry;
-import org.terasology.rendering.nui.*;
+import org.terasology.rendering.nui.BaseInteractionListener;
+import org.terasology.rendering.nui.Canvas;
+import org.terasology.rendering.nui.Color;
+import org.terasology.rendering.nui.InteractionListener;
+import org.terasology.rendering.nui.SubRegion;
+import org.terasology.rendering.nui.UIWidget;
 import org.terasology.rendering.nui.databinding.Binding;
 import org.terasology.rendering.nui.layouts.ZoomableLayout;
 
diff --git a/engine/src/main/java/org/terasology/logic/behavior/tree/PlayMusicNode.java b/engine/src/main/java/org/terasology/logic/behavior/tree/PlayMusicNode.java
@@ -17,7 +17,6 @@
 
 import org.terasology.asset.AssetManager;
 import org.terasology.asset.AssetUri;
-import org.terasology.asset.Assets;
 import org.terasology.audio.AudioEndListener;
 import org.terasology.audio.AudioManager;
 import org.terasology.audio.StreamingSound;
diff --git a/engine/src/main/java/org/terasology/logic/characters/CharacterSoundSystem.java b/engine/src/main/java/org/terasology/logic/characters/CharacterSoundSystem.java
@@ -16,7 +16,6 @@
 package org.terasology.logic.characters;
 
 import org.terasology.audio.AudioManager;
-import org.terasology.audio.Sound;
 import org.terasology.audio.StaticSound;
 import org.terasology.audio.events.PlaySoundEvent;
 import org.terasology.engine.Time;
diff --git a/engine/src/main/java/org/terasology/logic/console/ui/MiniChatOverlay.java b/engine/src/main/java/org/terasology/logic/console/ui/MiniChatOverlay.java
@@ -15,8 +15,6 @@
  */
 package org.terasology.logic.console.ui;
 
-import java.util.List;
-
 import org.terasology.logic.console.Console;
 import org.terasology.logic.console.CoreMessageType;
 import org.terasology.logic.console.Message;
@@ -28,32 +26,33 @@
 
 /**
  * The miniaturized chat console widget
+ *
  * @author Martin Steiger
  */
 public class MiniChatOverlay extends CoreScreenLayer {
-    
+
     /**
      * Extra display time per message char
      */
     private static final float TIME_VISIBLE_PER_CHAR = 0.08f;
 
     private static final float TIME_VISIBLE_BASE = 1.0f;
-    
+
     private static final float TIME_FADE = 0.3f;
-    
+
     private enum State {
         FADE_IN,
         VISIBLE,
         FADE_OUT,
         HIDDEN
     }
-    
+
     private float time;
 
     private UILabel message;
-   
+
     private State state = State.HIDDEN;
-    
+
     @In
     private Console console;
 
@@ -65,11 +64,11 @@ public void initialise() {
             public String get() {
                 Iterable<Message> msgs = console.getMessages(CoreMessageType.CHAT, CoreMessageType.NOTIFICATION);
                 String last = "";
-                
+
                 for (Message msg : msgs) {
                     last = msg.getMessage();
                 }
-                
+
                 return last;
             }
         });
@@ -78,95 +77,95 @@ public String get() {
     @Override
     public void setVisible(boolean visible) {
         super.setVisible(visible);
-        
+
         if (isVisible()) {        // depends on the "visible" binding
             refresh();
         } else {
             hideImmediately();
         }
     }
-    
+
     private void refresh() {
         switch (state) {
-        case VISIBLE:
-            time = 0;
-            break;
-            
-        case FADE_IN:
-            break;
-            
-        case FADE_OUT:
-            state = State.FADE_IN;
-            time = TIME_FADE - time;
-            break;
-            
-        case HIDDEN:
-            time = 0;
-            state = State.FADE_IN;
-            break;
+            case VISIBLE:
+                time = 0;
+                break;
+
+            case FADE_IN:
+                break;
+
+            case FADE_OUT:
+                state = State.FADE_IN;
+                time = TIME_FADE - time;
+                break;
+
+            case HIDDEN:
+                time = 0;
+                state = State.FADE_IN;
+                break;
         }
     }
-    
+
     private void hideImmediately() {
         state = State.HIDDEN;
         time = 0;
     }
-    
+
     @Override
     public void onDraw(Canvas canvas) {
         switch (state) {
-        case FADE_IN:
-            canvas.setAlpha(time / TIME_FADE);
-            break;
-            
-        case FADE_OUT:
-            canvas.setAlpha(1.0f - time / TIME_FADE);
-            break;
-            
-        case HIDDEN:
-            return;            // don't draw anything
-        
-        case VISIBLE:
-            break;
+            case FADE_IN:
+                canvas.setAlpha(time / TIME_FADE);
+                break;
+
+            case FADE_OUT:
+                canvas.setAlpha(1.0f - time / TIME_FADE);
+                break;
+
+            case HIDDEN:
+                return;            // don't draw anything
+
+            case VISIBLE:
+                break;
         }
-        
+
         super.onDraw(canvas);
     }
-    
+
     @Override
     public void update(float delta) {
         super.update(delta);
-        
+
         time += delta;
-        
+
         switch (state) {
-        case FADE_IN:
-            if (time > TIME_FADE) {
-                time = 0;
-                state = State.VISIBLE;
-            }
-            break;
-            
-        case FADE_OUT:
-            if (time > TIME_FADE) {
-                time = 0;
-                state = State.HIDDEN;
-            }
-            break;
-            
-        case HIDDEN:
-            break;
-        
-        case VISIBLE:
-            int textLen = message.getText().length();
-            float maxTime = TIME_VISIBLE_BASE + textLen * TIME_VISIBLE_PER_CHAR;
-            
-            // longer text messages are shown for longer periods of time
-            if (time > maxTime) {
-                time = 0;
-                state = State.FADE_OUT;
-            }
-            break;
+            case FADE_IN:
+                if (time > TIME_FADE) {
+                    time = 0;
+                    state = State.VISIBLE;
+                }
+                break;
+
+            case FADE_OUT:
+                if (time > TIME_FADE) {
+                    time = 0;
+                    state = State.HIDDEN;
+                }
+                break;
+
+            case HIDDEN:
+                break;
+
+            case VISIBLE:
+                int textLen = message.getText().length();
+                float maxTime = TIME_VISIBLE_BASE + textLen * TIME_VISIBLE_PER_CHAR;
+
+                // longer text messages are shown for longer periods of time
+                if (time > maxTime) {
+                    time = 0;
+                    state = State.FADE_OUT;
+                }
+                break;
         }
     }
 
diff --git a/engine/src/main/java/org/terasology/network/internal/NetEntityRef.java b/engine/src/main/java/org/terasology/network/internal/NetEntityRef.java
@@ -21,7 +21,6 @@
 import org.terasology.entitySystem.entity.LowLevelEntityManager;
 import org.terasology.entitySystem.entity.internal.BaseEntityRef;
 import org.terasology.network.NetworkComponent;
-import org.terasology.protobuf.EntityData;
 
 import java.util.Map;
 import java.util.Objects;
diff --git a/engine/src/main/java/org/terasology/network/internal/NetworkEntitySystem.java b/engine/src/main/java/org/terasology/network/internal/NetworkEntitySystem.java
@@ -29,7 +29,6 @@
 import org.terasology.network.Client;
 import org.terasology.network.ClientComponent;
 import org.terasology.network.NetworkComponent;
-import org.terasology.network.NetworkMode;
 import org.terasology.network.events.ChangeViewRangeRequest;
 import org.terasology.registry.In;
 import org.terasology.rendering.world.WorldRenderer;
diff --git a/engine/src/main/java/org/terasology/physics/engine/PhysicsSystem.java b/engine/src/main/java/org/terasology/physics/engine/PhysicsSystem.java
@@ -32,7 +32,6 @@
 import org.terasology.logic.location.LocationComponent;
 import org.terasology.monitoring.PerformanceMonitor;
 import org.terasology.network.NetworkComponent;
-import org.terasology.network.NetworkMode;
 import org.terasology.network.NetworkSystem;
 import org.terasology.physics.components.RigidBodyComponent;
 import org.terasology.physics.components.TriggerComponent;
diff --git a/engine/src/main/java/org/terasology/rendering/nui/internal/CanvasImpl.java b/engine/src/main/java/org/terasology/rendering/nui/internal/CanvasImpl.java
@@ -789,7 +789,7 @@ public void close() {
         }
     }
 
-    private class SubRegionFBOImpl implements SubRegion {
+    private final class SubRegionFBOImpl implements SubRegion {
         private FrameBufferObject fbo;
         private CanvasState previousState;
 
diff --git a/engine/src/main/java/org/terasology/world/block/structure/BlockStructuralSupportSystem.java b/engine/src/main/java/org/terasology/world/block/structure/BlockStructuralSupportSystem.java
@@ -47,7 +47,7 @@
  * @author Marcin Sciesinski <marcins78@gmail.com>
  */
 @RegisterSystem
-@Share(value = {BlockStructuralSupportRegistry.class})
+@Share(BlockStructuralSupportRegistry.class)
 public class BlockStructuralSupportSystem extends BaseComponentSystem implements BlockStructuralSupportRegistry {
     public static final int GATHERING_INVENTORY_SLOT_COUNT = 20;
     @In
@@ -142,7 +142,8 @@ private void validateSupportForBlockOnSide(Vector3i replacedBlockPosition, Side
             for (BlockStructuralSupport support : supports) {
                 if (support.shouldBeRemovedDueToChange(blockPosition, sideReverse)) {
                     System.out.println("Removing block due to: " + support.getClass());
-                    blockEntityRegistry.getBlockEntityAt(blockPosition).send(new DestroyEvent(gatheringEntity, EntityRef.NULL, prefabManager.getPrefab("engine:supportRemovedDamage")));
+                    blockEntityRegistry.getBlockEntityAt(blockPosition).send(new DestroyEvent(gatheringEntity,
+                            EntityRef.NULL, prefabManager.getPrefab("engine:supportRemovedDamage")));
                     break;
                 }
             }
diff --git a/engine/src/main/java/org/terasology/world/block/structure/SideBlockSupportRequired.java b/engine/src/main/java/org/terasology/world/block/structure/SideBlockSupportRequired.java
