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

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

Revision: 4992
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4992&view=rev
Author:   akirschbaum
Date:     2008-08-22 08:24:57 +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:23:31 UTC (rev 4991)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-22 08:24:57 UTC (rev 4992)
@@ -56,7 +56,6 @@
 import net.sf.gridarta.archtype.ArchetypeTypeSet;
 import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gameobject.match.GameObjectMatcher;
-import net.sf.gridarta.gui.LeftPanel;
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapViewManager;
 import net.sf.gridarta.gui.RecentManager;
@@ -138,7 +137,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 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);
         mapActions.updateMenuState();

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 08:23:31 UTC (rev 4991)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 08:24:57 UTC (rev 4992)
@@ -63,7 +63,6 @@
 import net.sf.gridarta.gameobject.match.GameObjectMatcher;
 import net.sf.gridarta.gameobject.match.MutableOrGameObjectMatcher;
 import net.sf.gridarta.gameobject.match.ViewGameObjectMatcherManager;
-import net.sf.gridarta.gui.LeftPanel;
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapViewManager;
 import net.sf.gridarta.gui.RecentManager;
@@ -198,7 +197,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 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");
         ACTION_FACTORY.createAction(true, "collectSpells", this);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 08:23:31 UTC (rev 4991)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 08:24:57 UTC (rev 4992)
@@ -51,6 +51,7 @@
 import net.sf.gridarta.gameobject.scripts.ScriptedEventEditor;
 import net.sf.gridarta.gui.About;
 import net.sf.gridarta.gui.HideFileFilterProxy;
+import net.sf.gridarta.gui.LeftPanel;
 import net.sf.gridarta.gui.MainActions;
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapFileFilter;
@@ -332,6 +333,9 @@
     @NotNull
     protected final ToolPalette<G, A, R, V> toolPalette;
 
+    @NotNull
+    protected final LeftPanel leftPanel;
+    
     /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
@@ -474,6 +478,7 @@
         init2();
         objectChoiceDisplay = new ObjectChoiceDisplay<G, A, R, V>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
         toolPalette = new ToolPalette<G, A, R, V>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
+        leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
     }
 
     @NotNull


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