Overrides and statics

gurkenlabs · Jun 13, 2019 · 25ef97a · 25ef97a
1 parent edd0bfe
commit 25ef97a
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 12 deletions.
diff --git a/utiliti/src/de/gurkenlabs/utiliti/components/Editor.java b/utiliti/src/de/gurkenlabs/utiliti/components/Editor.java
@@ -79,7 +79,6 @@ public class Editor extends Screen {
 
   private final List<Runnable> loadedCallbacks;
 
-  private double padding;
   private MapComponent mapComponent;
   private ResourceBundle gameFile = new ResourceBundle();
   private String projectPath;

diff --git a/utiliti/src/de/gurkenlabs/utiliti/renderers/SelectionRenderer.java b/utiliti/src/de/gurkenlabs/utiliti/renderers/SelectionRenderer.java
@@ -59,7 +59,7 @@ private void updateSelectionColor() {
     this.colorSelectionBorder = Color.getHSBColor(0, 0, this.selectionBorderBrightness);
   }
 
-  private void renderObjectId(Graphics2D g, IMapObject mapObject) {
+  private static void renderObjectId(Graphics2D g, IMapObject mapObject) {
     if (!Editor.preferences().renderMapIds()) {
       return;
     }

diff --git a/utiliti/src/de/gurkenlabs/utiliti/swing/controllers/AssetList.java b/utiliti/src/de/gurkenlabs/utiliti/swing/controllers/AssetList.java
@@ -52,6 +52,7 @@ public AssetTree getAssetTree() {
     return this.assetTree;
   }
 
+  @Override
   public void refresh() {
     this.assetTree.forceUpdate();
   }

diff --git a/utiliti/src/de/gurkenlabs/utiliti/swing/controllers/EntityList.java b/utiliti/src/de/gurkenlabs/utiliti/swing/controllers/EntityList.java
@@ -192,6 +192,7 @@ public void mouseClicked(MouseEvent e) {
     this.add(this.searchPanel, BorderLayout.NORTH);
   }
 
+  @Override
   public void select(final IMapObject mapObject) {
     if (this.isFocussing) {
       return;
@@ -235,6 +236,7 @@ public void select(final IMapObject mapObject) {
     }
   }
 
+  @Override
   public void refresh() {
     this.nodeRoot.setUserObject(new IconTreeListItem((Game.world().environment() == null ? 0 : Game.world().environment().getEntities().size()) + " " + Resources.strings().get("panel_mapselection_entities"), Icons.FOLDER));
     for (DefaultMutableTreeNode node : this.entityNodes) {

diff --git a/utiliti/src/de/gurkenlabs/utiliti/swing/controllers/LayerList.java b/utiliti/src/de/gurkenlabs/utiliti/swing/controllers/LayerList.java
@@ -85,7 +85,7 @@ public LayerList() {
       if (selIndex < 0 || selIndex >= this.layerModel.size()) {
         map.addLayer(layer);
       } else {
-        map.addLayer(this.getAbsoluteIndex(map, this.getCurrentLayerIndex()), layer);
+        map.addLayer(getAbsoluteIndex(map, this.getCurrentLayerIndex()), layer);
       }
 
       this.list.setSelectedIndex(selIndex);
@@ -110,7 +110,7 @@ public LayerList() {
 
     this.buttonDuplicateLayer = createButton(Icons.COPYX16, (map, selectedLayer) -> {
       IMapObjectLayer copiedLayer = new MapObjectLayer((MapObjectLayer) selectedLayer);
-      map.addLayer(this.getAbsoluteIndex(map, this.getCurrentLayerIndex()), copiedLayer);
+      map.addLayer(getAbsoluteIndex(map, this.getCurrentLayerIndex()), copiedLayer);
       this.refresh();
       Editor.instance().getMapComponent().add(copiedLayer);
     });
@@ -152,7 +152,7 @@ public LayerList() {
       }
 
       map.removeLayer(selectedLayer);
-      map.addLayer(this.getAbsoluteIndex(map, selLayerIndex), selectedLayer);
+      map.addLayer(getAbsoluteIndex(map, selLayerIndex), selectedLayer);
       this.list.setSelectedIndex(selLayerIndex + 1);
     });
 
@@ -163,7 +163,7 @@ public LayerList() {
       }
 
       map.removeLayer(selectedLayer);
-      map.addLayer(this.getAbsoluteIndex(map, selLayerIndex - 2), selectedLayer);
+      map.addLayer(getAbsoluteIndex(map, selLayerIndex - 2), selectedLayer);
       this.list.setSelectedIndex(selLayerIndex - 1);
     });
 
@@ -194,6 +194,7 @@ public LayerList() {
     });
   }
 
+  @Override
   public IMapObjectLayer getCurrentLayer() {
     JCheckBox current = this.list.getSelectedValue();
     if (current == null) {
@@ -221,10 +222,12 @@ public void selectLayer(int index) {
     this.list.setSelectedIndex(index);
   }
 
+  @Override
   public void clear() {
     this.selectedLayers.clear();
   }
 
+  @Override
   public void refresh() {
     this.refreshing = true;
     try {
@@ -281,6 +284,7 @@ public void refresh() {
     }
   }
 
+  @Override
   public void onLayersChanged(Consumer<IMap> consumer) {
     this.layerChangedListeners.add(consumer);
   }
@@ -332,7 +336,7 @@ private int getCurrentLayerIndex() {
     return this.list.getModel().getSize() - 1 - this.list.getSelectedIndex();
   }
 
-  private int getAbsoluteIndex(IMap map, int index) {
+  private static int getAbsoluteIndex(IMap map, int index) {
     if (map.getMapObjectLayers().size() <= 1) {
       return 0;
     }

diff --git a/utiliti/src/de/gurkenlabs/utiliti/swing/controllers/MapList.java b/utiliti/src/de/gurkenlabs/utiliti/swing/controllers/MapList.java
@@ -62,10 +62,12 @@ public MapList() {
     UndoManager.onUndoStackChanged(manager -> this.bind(Editor.instance().getMapComponent().getMaps()));
   }
 
+  @Override
   public synchronized void bind(List<TmxMap> maps) {
     this.bind(maps, false);
   }
 
+  @Override
   public synchronized void bind(List<TmxMap> maps, boolean clear) {
     if (clear) {
       this.model.clear();
@@ -100,6 +102,7 @@ public synchronized void bind(List<TmxMap> maps, boolean clear) {
     this.refresh();
   }
 
+  @Override
   public void setSelection(String mapName) {
     if (mapName == null || mapName.isEmpty()) {
       list.clearSelection();
@@ -112,13 +115,15 @@ public void setSelection(String mapName) {
     this.refresh();
   }
 
+  @Override
   public IMap getCurrentMap() {
     if (this.list.getSelectedIndex() == -1) {
       return null;
     }
     return Editor.instance().getMapComponent().getMaps().get(list.getSelectedIndex());
   }
 
+  @Override
   public void refresh() {
     if (list.getSelectedIndex() == -1 && this.model.size() > 0) {
       this.list.setSelectedIndex(0);

diff --git a/utiliti/src/de/gurkenlabs/utiliti/swing/menus/RenderMenu.java b/utiliti/src/de/gurkenlabs/utiliti/swing/menus/RenderMenu.java
@@ -71,7 +71,7 @@ private void updateMenu(List<IMapObject> selectedMapObjects) {
     this.setEnabled(true);
   }
 
-  private void setRenderWithLayer(List<IMapObject> selectedMapObjects) {
+  private static void setRenderWithLayer(List<IMapObject> selectedMapObjects) {
     UndoManager.instance().beginOperation();
     for (IMapObject object : selectedMapObjects) {
       UndoManager.instance().mapObjectChanging(object);
@@ -87,7 +87,7 @@ private void setRenderWithLayer(List<IMapObject> selectedMapObjects) {
     UI.getInspector().bind(Editor.instance().getMapComponent().getFocusedMapObject());
   }
 
-  private void setRenderType(List<IMapObject> selectedMapObjects, RenderType renderType) {
+  private static void setRenderType(List<IMapObject> selectedMapObjects, RenderType renderType) {
     UndoManager.instance().beginOperation();
     for (IMapObject object : selectedMapObjects) {
       UndoManager.instance().mapObjectChanging(object);

diff --git a/utiliti/src/de/gurkenlabs/utiliti/swing/panels/CollisionBoxPanel.java b/utiliti/src/de/gurkenlabs/utiliti/swing/panels/CollisionBoxPanel.java
@@ -36,6 +36,7 @@ protected void clearControls() {
   }
 
 
+  @Override
   protected void setControlValues(IMapObject mapObject) {
     this.comboBoxColl.setSelectedItem(mapObject.getEnumValue(MapObjectProperty.COLLISION_TYPE, Collision.class, Collision.STATIC));
     this.chckbxIsObstructingLights.setSelected(mapObject.getBoolValue(MapObjectProperty.COLLISIONBOX_OBSTRUCTINGLIGHTS));

diff --git a/utiliti/src/de/gurkenlabs/utiliti/swing/panels/MapObjectInspector.java b/utiliti/src/de/gurkenlabs/utiliti/swing/panels/MapObjectInspector.java
@@ -158,6 +158,7 @@ public void updateSpinnerModels() {
     }
   }
 
+  @Override
   public MapObjectType getObjectType() {
     return this.type;
   }
@@ -256,6 +257,7 @@ private void switchPanel() {
     this.tabbedPanel.repaint();
   }
 
+  @Override
   public void setMapObjectType(MapObjectType type) {
     this.type = type;
     switchPanel();
@@ -292,15 +294,15 @@ protected void setControlValues(IMapObject mapObject) {
     this.labelEntityID.setText(Integer.toString(mapObject.getId()));
 
     this.lblLayer.setText("layer: " + mapObject.getLayer().getName());
-    String info = this.getRendering(mapObject);
+    String info = getRendering(mapObject);
     if (info == null) {
       this.lblRendering.setText("");
     } else {
-      this.lblRendering.setText("render: " + this.getRendering(mapObject));
+      this.lblRendering.setText("render: " + getRendering(mapObject));
     }
   }
 
-  private String getRendering(IMapObject mapObject) {
+  private static String getRendering(IMapObject mapObject) {
     switch (MapObjectType.get(mapObject.getType())) {
     case PROP:
     case EMITTER: