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

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

Revision: 4708
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4708&view=rev
Author:   akirschbaum
Date:     2008-08-02 08:34:42 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Remove MainControl.getMainActions().

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/src/app/net/sf/gridarta/MainControl.java
    trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-02 08:34:00 UTC (rev 4707)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-02 08:34:42 UTC (rev 4708)
@@ -776,12 +776,6 @@
         return objectChooser;
     }
 
-    /** {@inheritDoc} */
-    @NotNull
-    public MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic> getMainActions() {
-        return mainActions;
-    }
-
     public void processFile(final String filelist) throws IOException {
         try {
             final BufferedReader reader = new BufferedReader(new FileReader(filelist));

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-02 08:34:00 UTC (rev 4707)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-02 08:34:42 UTC (rev 4708)
@@ -968,12 +968,6 @@
         return objectChooser;
     }
 
-    /** {@inheritDoc} */
-    @NotNull
-    public MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic> getMainActions() {
-        return mainActions;
-    }
-
     /**
      * Run in batch png mode.
      * @param args the argument strings that were not parsed away by {@link

Modified: trunk/src/app/net/sf/gridarta/MainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/MainControl.java	2008-08-02 08:34:00 UTC (rev 4707)
+++ trunk/src/app/net/sf/gridarta/MainControl.java	2008-08-02 08:34:42 UTC (rev 4708)
@@ -22,7 +22,6 @@
 import java.io.File;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.GameObject;
-import net.sf.gridarta.gui.MainActions;
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.ObjectChooser;
 import net.sf.gridarta.gui.map.MapView;
@@ -123,13 +122,6 @@
     ObjectChooser<G, A, R> getObjectChooser();
 
     /**
-     * Returns the main actions.
-     * @return the main actions
-     */
-    @NotNull
-    MainActions<G, A, R, V> getMainActions();
-
-    /**
      * Returns a guess for a script directory to use.
      * @return the directory
      */

Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-02 08:34:00 UTC (rev 4707)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-02 08:34:42 UTC (rev 4708)
@@ -476,12 +476,6 @@
         public ObjectChooser<TestGameObject, TestMapArchObject, TestArchetype> getObjectChooser() {
             throw new AssertionError();
         }
-
-        /** {@inheritDoc} */
-        @NotNull
-        public MainActions<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> getMainActions() {
-            throw new AssertionError();
-        }
     }
 
     /**


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