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

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

Revision: 4991
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4991&view=rev
Author:   akirschbaum
Date:     2008-08-22 08:23:31 +0000 (Fri, 22 Aug 2008)

Log Message:
-----------
Move code 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-08-22 08:21:30 UTC (rev 4990)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-22 08:23:31 UTC (rev 4991)
@@ -65,7 +65,6 @@
 import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
 import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
 import net.sf.gridarta.gui.map.MapView;
-import net.sf.gridarta.gui.map.tools.ToolPalette;
 import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
 import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
 import net.sf.gridarta.gui.objectchooser.ObjectChooser;
@@ -139,7 +138,6 @@
      */
     public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
         super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, });
-        final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
         final LeftPanel leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
         ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod");
         mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 08:21:30 UTC (rev 4990)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 08:23:31 UTC (rev 4991)
@@ -72,7 +72,6 @@
 import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
 import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
 import net.sf.gridarta.gui.map.MapView;
-import net.sf.gridarta.gui.map.tools.ToolPalette;
 import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
 import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
 import net.sf.gridarta.gui.objectchooser.ObjectChooser;
@@ -199,7 +198,6 @@
      */
     public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
         super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, });
-        final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
         final LeftPanel leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
         ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "zoom", "gc", "onlineHelp", "tod");
         ACTION_FACTORY.createToggles(true, this, "drawDouble");

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 08:21:30 UTC (rev 4990)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 08:23:31 UTC (rev 4991)
@@ -72,6 +72,7 @@
 import net.sf.gridarta.gui.map.MapViewBasic;
 import net.sf.gridarta.gui.map.RendererFactory;
 import net.sf.gridarta.gui.map.tools.DeletionTool;
+import net.sf.gridarta.gui.map.tools.ToolPalette;
 import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
 import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
 import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
@@ -328,6 +329,9 @@
     @NotNull
     protected final ObjectChoiceDisplay<G, A, R, V> objectChoiceDisplay;
 
+    @NotNull
+    protected final ToolPalette<G, A, R, V> toolPalette;
+
     /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
@@ -469,6 +473,7 @@
         gameObjectAttributesControl = newGameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
         init2();
         objectChoiceDisplay = new ObjectChoiceDisplay<G, A, R, V>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
+        toolPalette = new ToolPalette<G, A, R, V>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
     }
 
     @NotNull


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