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

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

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

Log Message:
-----------
Remove AbstractMainControl.getCopyBuffer().

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-02 07:39:35 UTC (rev 4694)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-02 07:41:31 UTC (rev 4695)
@@ -245,8 +245,8 @@
         pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, gridartaObjectsFactory, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR), mapManager);
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
         archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
-        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, archetypeTypeSet, editTypes, selectedSquareView, archetypeChooserControl, pickmapChooserControl, getCopyBuffer());
-        mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, editTypes, archetypeSet, getCopyBuffer(), pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager);
+        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, archetypeTypeSet, editTypes, selectedSquareView, archetypeChooserControl, pickmapChooserControl, copyBuffer);
+        mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, editTypes, archetypeSet, copyBuffer, pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager);
         SystemIcons.init();
         final StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic> statusBar = new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, archetypeSet, faceObjects);
         createMapImageCache(CResourceLoader.getHomeFile("thumbnails"), SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), statusBar);
@@ -345,7 +345,7 @@
 
         net.sf.gridarta.gameobject.GameObject.initialize(archetypeTypeSet, gameObjectMatchers);
 
-        getCopyBuffer().init(gridartaObjectsFactory.newMapArchObject(false));
+        copyBuffer.init(gridartaObjectsFactory.newMapArchObject(false));
         mainActions.init();
 
         final RecentManager recentManager = new RecentManager(mapManager, (JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "recent"), globalSettings, getMapPreviewAccessory());

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-02 07:39:35 UTC (rev 4694)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-02 07:41:31 UTC (rev 4695)
@@ -305,8 +305,8 @@
         pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, gridartaObjectsFactory, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR), mapManager);
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
         archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
-        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, archetypeTypeSet, editTypes, selectedSquareView, archetypeChooserControl, pickmapChooserControl, getCopyBuffer());
-        mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, editTypes, archetypeSet, getCopyBuffer(), pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager);
+        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, archetypeTypeSet, editTypes, selectedSquareView, archetypeChooserControl, pickmapChooserControl, copyBuffer);
+        mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, editTypes, archetypeSet, copyBuffer, pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager);
         SystemIcons.init();
         final StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic> statusBar = new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, archetypeSet, faceObjects);
         createMapImageCache(null, SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), statusBar);
@@ -405,7 +405,7 @@
 
         net.sf.gridarta.gameobject.GameObject.initialize(archetypeTypeSet, gameObjectMatchers);
 
-        getCopyBuffer().init(gridartaObjectsFactory.newMapArchObject(false));
+        copyBuffer.init(gridartaObjectsFactory.newMapArchObject(false));
         mainActions.init();
 
         // Delete libraries.

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-02 07:39:35 UTC (rev 4694)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-02 07:41:31 UTC (rev 4695)
@@ -80,7 +80,7 @@
     protected final GlobalSettings globalSettings;
 
     /** Buffer managing copy data. */
-    private final CopyBuffer<G, A, R, V> copyBuffer;
+    protected final CopyBuffer<G, A, R, V> copyBuffer;
 
     /** The cache for map images. */
     private MapImageCache<G, A, R, V> mapImageCache = null;
@@ -116,14 +116,6 @@
         this.gridartaObjectsFactory = gridartaObjectsFactory;
     }
 
-    /**
-     * Return the {@link CopyBuffer} instance.
-     * @return The <code>CopyBuffer</code> instance.
-     */
-    protected CopyBuffer<G, A, R, V> getCopyBuffer() {
-        return copyBuffer;
-    }
-
     /** {@inheritDoc} */
     protected MapImageCache<G, A, R, V> getMapImageCache() {
         return mapImageCache;


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