Thread: [Gridarta-commit] SF.net SVN: gridarta: [642] trunk (Page 6)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 642
          http://svn.sourceforge.net/gridarta/?rev=642&view=rev
Author:   christianhujer
Date:     2006-11-11 07:18:20 -0800 (Sat, 11 Nov 2006)

Log Message:
-----------
Minor code cleanup:
Improved some naming.
Removed unneccessary invocation indirection.
Moved global rng to common interface.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CArchPanel.java
    trunk/daimonin/src/daieditor/CArchQuickView.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainView.java
    trunk/src/app/net/sf/gridarta/MainControl.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================

--- trunk/crossfire/src/cfeditor/CMainControl.java	2006-11-11 15:04:21 UTC (rev 641)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2006-11-11 15:18:20 UTC (rev 642)
@@ -74,9 +74,6 @@
     /** ActionFactory. */
     private static final ActionFactory ACTION_FACTORY = getFactory("cfeditor");
 
-    /** Serial Version UID. */
-    private static final long serialVersionUID = 1L;
-
     /** Logger. */
     private static final Logger log = Logger.getLogger(CMainControl.class);
 
@@ -155,9 +152,6 @@
 
     private String strCurrentDir;
 
-    /** Global random number generator. */
-    public static final Random rnd = new Random(System.currentTimeMillis() + 19580427);
-
     // resource directories
     private File mapDir;
 

Modified: trunk/daimonin/src/daieditor/CArchPanel.java
===================================================================
--- trunk/daimonin/src/daieditor/CArchPanel.java	2006-11-11 15:04:21 UTC (rev 641)
+++ trunk/daimonin/src/daieditor/CArchPanel.java	2006-11-11 15:18:20 UTC (rev 642)
@@ -136,8 +136,8 @@
         return selectedPanel != null ? selectedPanel.getArchListObject() : null;
     }
 
-    public void showArchPanelQuickObject(final GameObject arch) {
-        archQuickPanel.showArchPanelQuickObject(arch);
+    public void showArchPanelQuickObject(final GameObject gameObject) {
+        archQuickPanel.showArchPanelQuickObject(gameObject);
     }
 
     public int addArchPanelCombo(final String name) {

Modified: trunk/daimonin/src/daieditor/CArchQuickView.java
===================================================================
--- trunk/daimonin/src/daieditor/CArchQuickView.java	2006-11-11 15:04:21 UTC (rev 641)
+++ trunk/daimonin/src/daieditor/CArchQuickView.java	2006-11-11 15:18:20 UTC (rev 642)
@@ -91,11 +91,11 @@
     /**
      * Show quick info for an object.
      *
-     * @param gameObjectPart the object to show; this may be any part of a multi-part
+     * @param gameObject the object to show; this may be any part of a multi-part
      * object
      */
-    void showArchPanelQuickObject(final GameObject gameObjectPart) {
-        if (gameObjectPart == null) {
+    void showArchPanelQuickObject(final GameObject gameObject) {
+        if (gameObject == null) {
             if (mainControl.getMainView().isPickmapActive()) {
                 archObjNameText.setText(" -random pick- ");
                 archObjNameText.setForeground(Color.BLUE);
@@ -106,11 +106,11 @@
             archTypeText.setText(null);
             archTileText.setText(null);
         } else {
-            final GameObject gameObject = gameObjectPart.getHead();
-            String objName = gameObject.getObjName();
+            final GameObject headObject = gameObject.getHead();
+            String objName = headObject.getObjName();
             if (objName == null || objName.length() == 0) {
-                final Archetype<GameObject> archetype = gameObject.getArchetype();
-                if (archetype == null || archetype == gameObject) {
+                final Archetype<GameObject> archetype = headObject.getArchetype();
+                if (archetype == null || archetype == headObject) {
                     objName = null;
                 } else if ((objName = archetype.getObjName()) != null && objName.length() != 0) {
                 } else if ((objName = archetype.getArchetypeName()) != null && objName.length() != 0) {
@@ -126,19 +126,19 @@
             }
             archObjNameText.setText(objName);
 
-            archArchNameText.setText(gameObject.getArchetypeName());
+            archArchNameText.setText(headObject.getArchetypeName());
 
-            archTypeText.setText(mainControl.getTypeList().getArchTypeName(gameObject.getArchTypNr()) + " (" + gameObject.getArchTypNr() + ')');
+            archTypeText.setText(mainControl.getTypeList().getArchTypeName(headObject.getArchTypNr()) + " (" + headObject.getArchTypNr() + ')');
 
-            if (gameObject.isMulti()) {
-                archTileText.setText("<html><span style=\"color:green;\"> multi</span> (" + gameObject.getMultiRefCount() + " parts) (" + gameObject.getSizeX() + ',' + gameObject.getSizeY() + ")</html>");
+            if (headObject.isMulti()) {
+                archTileText.setText("<html><span style=\"color:green;\"> multi</span> (" + headObject.getMultiRefCount() + " parts) (" + headObject.getSizeX() + ',' + headObject.getSizeY() + ")</html>");
             } else {
                 archTileText.setText("single");
             }
 
             // notify ReplaceDialog
             if (ReplaceDialog.isBuilt() && ReplaceDialog.getInstance().isShowing()) {
-                ReplaceDialog.getInstance().updateArchSelection(gameObject, false);
+                ReplaceDialog.getInstance().updateArchSelection(headObject, false);
             }
         }
     }

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2006-11-11 15:04:21 UTC (rev 641)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2006-11-11 15:18:20 UTC (rev 642)
@@ -80,7 +80,6 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import static java.lang.System.currentTimeMillis;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -88,7 +87,6 @@
 import java.util.List;
 import java.util.ListIterator;
 import java.util.MissingResourceException;
-import java.util.Random;
 import static java.util.ResourceBundle.getBundle;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -242,9 +240,6 @@
     /** The current main directory. */
     private File currentDir;
 
-    /** Global random number generator. */
-    public static final Random rnd = new Random(currentTimeMillis() + 19580427);
-
     // resource directories
     private File mapDir;
 
@@ -783,8 +778,8 @@
     }
 
     // setup quick view window
-    public void showArchPanelQuickObject(final GameObject arch) {
-        mainView.showArchPanelQuickObject(arch);
+    public void showArchPanelQuickObject(final GameObject gameObject) {
+        mainView.showArchPanelQuickObject(gameObject);
     }
 
     boolean insertArchToMap(final GameObject newarch, final String archname, final GameObject next, final int mapx, final int mapy) {

Modified: trunk/daimonin/src/daieditor/CMainView.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainView.java	2006-11-11 15:04:21 UTC (rev 641)
+++ trunk/daimonin/src/daieditor/CMainView.java	2006-11-11 15:18:20 UTC (rev 642)
@@ -293,7 +293,7 @@
                     return arch;
                 }
             }
-            mainControl.showArchPanelQuickObject(null);       // send it to quick view
+            showArchPanelQuickObject(null);
             return null;
         }
 
@@ -332,8 +332,8 @@
         return null;
     }
 
-    public void showArchPanelQuickObject(final GameObject arch) {
-        archPanel.showArchPanelQuickObject(arch);
+    public void showArchPanelQuickObject(final GameObject gameObject) {
+        archPanel.showArchPanelQuickObject(gameObject);
     }
 
     /** @return the panel with all pickmaps */

Modified: trunk/src/app/net/sf/gridarta/MainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/MainControl.java	2006-11-11 15:04:21 UTC (rev 641)
+++ trunk/src/app/net/sf/gridarta/MainControl.java	2006-11-11 15:18:20 UTC (rev 642)
@@ -4,6 +4,7 @@
 import net.sf.gridarta.gameobject.ArchetypeParser;
 import net.sf.gridarta.gameobject.ArchetypeSet;
 import org.jetbrains.annotations.NotNull;
+import java.util.Random;
 
 /**
  * This interface is only for unification.
@@ -13,6 +14,11 @@
 public interface MainControl {
 
     /**
+     * Global random number generator.
+     */
+    Random rnd = new Random();
+
+    /**
      * Refresh menus and toolbars.
      * @deprecated This method is bullshit for being a severe violation of MVC and therefore MUST be removed some day. Do not use it for other than unification purposes.
      */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Gridarta-commit] SF.net SVN: gridarta: [642] trunk (Page 6)

gridarta-commit