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

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

Revision: 3875
          http://gridarta.svn.sourceforge.net/gridarta/?rev=3875&view=rev
Author:   akirschbaum
Date:     2008-04-11 10:50:16 -0700 (Fri, 11 Apr 2008)

Log Message:
-----------
Remove calls to AbstractMainControl.getInstance().

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/crossfire/src/cfeditor/gameobject/face/FaceObjects.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java

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

--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-04-09 23:23:28 UTC (rev 3874)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-04-11 17:50:16 UTC (rev 3875)
@@ -299,7 +299,7 @@
         scriptControl.getView().setMenu((JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "plugins"));
         archetypeParser = new ArchetypeParser(this, objectChooser.getArchetypeChooserControl());
         animationObjects = new AnimationObjects();
-        faceObjects = new FaceObjects();
+        faceObjects = new FaceObjects(this);
         archetypeSet.loadArchetypes(archetypeParser);
 
         if (autoPopupDocu) {

Modified: trunk/crossfire/src/cfeditor/gameobject/face/FaceObjects.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/face/FaceObjects.java	2008-04-09 23:23:28 UTC (rev 3874)
+++ trunk/crossfire/src/cfeditor/gameobject/face/FaceObjects.java	2008-04-11 17:50:16 UTC (rev 3875)
@@ -32,7 +32,7 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.util.Iterator;
-import net.sf.gridarta.AbstractMainControl;
+import net.sf.gridarta.MainControl;
 import net.sf.gridarta.gameobject.face.AbstractFaceObjects;
 import net.sf.gridarta.gameobject.face.DuplicateFaceException;
 import net.sf.japi.swing.ActionFactory;
@@ -49,6 +49,17 @@
     /** Size of the image buffer. */
     private static final int IMAGE_BUFFER_SIZE = 50 * 1024;
 
+    /** The main control. */
+    @NotNull private final MainControl<?, ?, ?, ?, ?> mainControl;
+
+    /**
+     * Creates a new instance.
+     * @param mainControl the main control
+     */
+    public FaceObjects(@NotNull final MainControl<?, ?, ?, ?, ?> mainControl) {
+	this.mainControl = mainControl;
+    }
+
     /** Reloads all providers provided by this FaceObjects. */
     public static void reloadAll() {
         // TODO
@@ -83,7 +94,7 @@
         DataOutputStream binFile = null;
         try {
             final File dfile = new File(dir, IGUIConstants.PNG_FILE);
-            AbstractMainControl.getInstance().getMainView().setStatusText("Collect Archfile: write images");
+            mainControl.getMainView().setStatusText("Collect Archfile: write images");
 
             binFile = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(dfile)));
 
@@ -212,7 +223,7 @@
             pname1 = faceObject.getPath().substring(tmp).replace('\\', '/').replace('.', '%');
         } else {
             // hope nobody renames his arch-dir and ends up in here
-            pname1 = "arch" + faceObject.getPath().substring(AbstractMainControl.getInstance().getArchDefaultFolder().length()).replace('\\', '/');
+            pname1 = "arch" + faceObject.getPath().substring(mainControl.getArchDefaultFolder().length()).replace('\\', '/');
         }
         return "./" + pname1.substring(0, pname1.lastIndexOf("/") + 1);
     }

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-04-09 23:23:28 UTC (rev 3874)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-04-11 17:50:16 UTC (rev 3875)
@@ -353,7 +353,7 @@
         mapActions.updateMenuState();
         archetypeParser = new ArchetypeParser(this, objectChooser.getArchetypeChooserControl());
         animationObjects = new AnimationObjects();
-        faceObjects = new FaceObjects();
+        faceObjects = new FaceObjects(this);
         archetypeSet.loadArchetypes(archetypeParser);
 
         if (autoPopupDocu) {

Modified: trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java	2008-04-09 23:23:28 UTC (rev 3874)
+++ trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java	2008-04-11 17:50:16 UTC (rev 3875)
@@ -36,7 +36,7 @@
 import java.io.PrintStream;
 import java.nio.channels.FileChannel;
 import javax.swing.GrayFilter;
-import net.sf.gridarta.AbstractMainControl;
+import net.sf.gridarta.MainControl;
 import net.sf.gridarta.gameobject.face.AbstractFaceObjects;
 import net.sf.gridarta.gameobject.face.DuplicateFaceException;
 import net.sf.japi.swing.ActionFactory;
@@ -154,6 +154,17 @@
     /** The FaceProvider for grid faces. */
     public static final FaceProvider GRID = new FilterFaceProvider(GRID_FILTER);
 
+    /** The main control. */
+    @NotNull private final MainControl<?, ?, ?, ?, ?> mainControl;
+
+    /**
+     * Creates a new instance.
+     * @param mainControl the main control
+     */
+    public FaceObjects(@NotNull final MainControl<?, ?, ?, ?, ?> mainControl) {
+	this.mainControl = mainControl;
+    }
+
     /** Reloads all providers provided by this FaceObjects. */
     public static void reloadAll() {
         for (final FaceProvider faceProvider : new FaceProvider[]{normal, GRAY, RED, GREEN, BLUE, ALPHA, GRID}) {
@@ -241,7 +252,7 @@
             //noinspection IOResourceOpenedButNotSafelyClosed
             treeIn = new BufferedReader(new InputStreamReader(new FileInputStream(treeFile), "us-ascii"));
         } catch (final FileNotFoundException e) {
-            ACTION_FACTORY.showMessageDialog(AbstractMainControl.getInstance().getMainView(), "errCantLoadFaceTree");
+            ACTION_FACTORY.showMessageDialog(mainControl.getMainView(), "errCantLoadFaceTree");
         }
         final byte[] tag = "IMAGE ".getBytes(); // this is the starting string for a new png
         final StringBuilder faceB = new StringBuilder();  // face name of png


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: [3875] trunk (Page 55)

gridarta-commit