[Gridarta-commit] SF.net SVN: gridarta:[5060] trunk

[<aki...@us...>]

Revision: 5060
          http://gridarta.svn.sourceforge.net/gridarta/?rev=5060&view=rev
Author:   akirschbaum
Date:     2008-09-07 11:21:19 +0000 (Sun, 07 Sep 2008)

Log Message:
-----------
Move MainControl.handleThrowable() to common code base.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/src/app/net/sf/gridarta/AbstractMainControl.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-09-07 11:18:27 UTC (rev 5059)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-09-07 11:21:19 UTC (rev 5060)
@@ -70,7 +70,6 @@
 import net.sf.gridarta.gui.prefs.UpdatePrefs;
 import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
 import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
-import net.sf.gridarta.map.MapControl;
 import net.sf.gridarta.map.validation.DelegatingMapValidator;
 import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
 import net.sf.gridarta.map.validation.checks.ConnectedInsideContainerChecker;
@@ -84,7 +83,6 @@
 import net.sf.gridarta.treasurelist.TreasureLocation;
 import net.sf.japi.swing.ActionFactory;
 import net.sf.japi.swing.prefs.PreferencesGroup;
-import net.sf.japi.util.ThrowableHandler;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 
@@ -96,7 +94,7 @@
  * @author Andreas Kirschbaum
  * @fixme I'm 2200 lines long, therefore I suck.
  */
-public final class CMainControl extends AbstractMainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> implements ThrowableHandler<Throwable> {
+public final class CMainControl extends AbstractMainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> {
 
     /** Action Factory. */
     private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("cfeditor");
@@ -303,11 +301,6 @@
     }
 
     /** {@inheritDoc} */
-    public void handleThrowable(final Throwable t) {
-        getMainView().handleThrowable(t);
-    }
-
-    /** {@inheritDoc} */
     @NotNull
     public String getConfigurationDirectory() {
         return "resource/conf";

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-09-07 11:18:27 UTC (rev 5059)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-09-07 11:21:19 UTC (rev 5060)
@@ -104,7 +104,6 @@
 import net.sf.japi.swing.ActionMethod;
 import net.sf.japi.swing.misc.ConsoleProgress;
 import net.sf.japi.swing.prefs.PreferencesGroup;
-import net.sf.japi.util.ThrowableHandler;
 import net.sf.japi.util.filter.file.Factory;
 import net.sf.japi.util.filter.file.GlobFileFilter;
 import org.apache.log4j.Logger;
@@ -118,7 +117,7 @@
  * @author Andreas Kirschbaum
  * @fixme I'm 2200 lines long, therefore I suck.
  */
-public final class CMainControl extends AbstractMainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> implements ThrowableHandler<Throwable> {
+public final class CMainControl extends AbstractMainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> {
 
     /** Action Factory. */
     private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("daieditor");
@@ -483,11 +482,6 @@
     }
 
     /** {@inheritDoc} */
-    public void handleThrowable(final Throwable t) {
-        getMainView().handleThrowable(t);
-    }
-
-    /** {@inheritDoc} */
     @NotNull
     public String getConfigurationDirectory() {
         return globalSettings.getArchDefaultFolder() + "/dev/editor/conf";

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-09-07 11:18:27 UTC (rev 5059)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-09-07 11:21:19 UTC (rev 5060)
@@ -112,6 +112,7 @@
 import net.sf.japi.swing.prefs.PreferencesGroup;
 import net.sf.japi.swing.prefs.PreferencesPane;
 import net.sf.japi.swing.tod.TipOfTheDayManager;
+import net.sf.japi.util.ThrowableHandler;
 import net.sf.japi.util.filter.file.EndingFileFilter;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
@@ -124,7 +125,7 @@
  * structures / collections and global functions.
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
  */
-public abstract class AbstractMainControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> implements MainControl<G, A, R, V> {
+public abstract class AbstractMainControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> implements MainControl<G, A, R, V>, ThrowableHandler<Throwable> {
 
     /** Preferences key for username. */
     public static final String PREFS_USERNAME = "username";
@@ -771,4 +772,9 @@
         return fileControl.saveLevelAsWanted(mapControl);
     }
 
+    /** {@inheritDoc} */
+    public void handleThrowable(final Throwable t) {
+        mainView.handleThrowable(t);
+    }
+
 } // class AbstractMainControl


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