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

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

Revision: 4985
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4985&view=rev
Author:   akirschbaum
Date:     2008-08-22 07:57:04 +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 07:55:30 UTC (rev 4984)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-22 07:57:04 UTC (rev 4985)
@@ -58,7 +58,6 @@
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.RecentManager;
 import net.sf.gridarta.gui.SystemIcons;
-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;
@@ -133,7 +132,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 GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel = new GameObjectAttributesModel<GameObject, MapArchObject, Archetype>();
         gameObjectAttributesControl = new GameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
         PluginParameterFactory.init(archetypeSet, gameObjectAttributesModel, objectChooser, mapManager);
         final NamedFilterList defaultNamedFilterList = new NamedFilterList(gameObjectMatchers.getFilters());

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 07:55:30 UTC (rev 4984)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 07:57:04 UTC (rev 4985)
@@ -65,7 +65,6 @@
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.RecentManager;
 import net.sf.gridarta.gui.SystemIcons;
-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;
@@ -195,7 +194,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 GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel = new GameObjectAttributesModel<GameObject, MapArchObject, Archetype>();
         gameObjectAttributesControl = new GameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
         final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
         final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 07:55:30 UTC (rev 4984)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 07:57:04 UTC (rev 4985)
@@ -64,6 +64,7 @@
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
 import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
+import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
 import net.sf.gridarta.gui.map.MapCursorControl;
 import net.sf.gridarta.gui.map.MapPreviewAccessory;
 import net.sf.gridarta.gui.map.MapView;
@@ -315,6 +316,9 @@
 
     @NotNull
     protected final LockedItemsControl<G, A, R, V> lockedItemsControl;
+
+    @NotNull
+    protected final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel;
     
     /**
      * Creates a new instance.
@@ -453,6 +457,7 @@
         }
         AbstractScriptArchEditor.initEventTypeBoxes(scriptExtension, scriptName, createEventTypeBox(), scriptFileFilter, globalSettings, mapManager);
         lockedItemsControl = new LockedItemsControl<G, A, R, V>(mapManager, mapViewManager, lockedItemsTypeNumbers);
+        gameObjectAttributesModel = new GameObjectAttributesModel<G, A, R>();
     }
 
     @NotNull


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