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

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

Revision: 5125
          http://gridarta.svn.sourceforge.net/gridarta/?rev=5125&view=rev
Author:   akirschbaum
Date:     2008-09-13 15:30:58 +0000 (Sat, 13 Sep 2008)

Log Message:
-----------
Remove some accesses to AbstractMainControl.globalSettings.

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

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-09-13 15:22:27 UTC (rev 5124)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-09-13 15:30:58 UTC (rev 5125)
@@ -170,7 +170,7 @@
     /** {@inheritDoc} */
     @NotNull
     @Override
-    protected CFTreasureListTree<GameObject, MapArchObject, Archetype> createTreasureListTree() {
+    protected CFTreasureListTree<GameObject, MapArchObject, Archetype> createTreasureListTree(@NotNull final GlobalSettings globalSettings) {
         return new CFTreasureListTree<GameObject, MapArchObject, Archetype>(getMainView(), archetypeSet, specialTreasureLists,
                 new TreasureLocation(getCollectedDirectory(), IGUIConstants.TREASURES_FILE)
         );
@@ -179,14 +179,14 @@
     /** {@inheritDoc} */
     @NotNull
     @Override
-    protected MapActions init1(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
+    protected MapActions init1(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings) {
         archetypeTypeSet.getListTable().put("event", ScriptArchUtils.getEventTypes());
         return new MapActions(getMainView(), getMainView(), gridartaObjectsFactory, globalSettings, mapManager, mapViewManager, exitMatcher, mapFileFilter, selectedSquareView);
     }
 
     /** {@inheritDoc} */
     @Override
-    protected void init2(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
+    protected void init2(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings) {
         PluginParameterFactory.init(archetypeSet, gameObjectAttributesModel, getObjectChooser(), mapManager);
         final NamedFilterList defaultNamedFilterList = new NamedFilterList(gameObjectMatchers.getFilters());
         filterControl = new CFilterControl(null, mapManager, defaultNamedFilterList);
@@ -203,13 +203,13 @@
 
     /** {@inheritDoc} */
     @Override
-    protected void init4(@NotNull final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser, @NotNull final AbstractArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final net.sf.gridarta.gameobject.face.FaceObjects faceObjects, @NotNull final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView) {
+    protected void init4(@NotNull final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser, @NotNull final AbstractArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final net.sf.gridarta.gameobject.face.FaceObjects faceObjects, @NotNull final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView, @NotNull final GlobalSettings globalSettings) {
         new ArchetypeSetLoader(globalSettings, gameObjectParser, getCollectedDirectory(), getConfigurationDirectory(), archetypeSet, archetypeParser, editTypes, faceObjects, animationObjects).loadArchetypes(mainView);
     }
 
     /** {@inheritDoc} */
     @Override
-    protected void init5() {
+    protected void init5(@NotNull final GlobalSettings globalSettings) {
         final JMenu menuAnalyze = (JMenu) ACTION_FACTORY.find(getMainView().getJMenuBar(), "analyze");
         if (menuAnalyze != null) {
             filterControl.createMenuEntries(menuAnalyze);
@@ -225,7 +225,7 @@
     /** {@inheritDoc} */
     @NotNull
     @Override
-    protected DelegatingMapValidator<GameObject, MapArchObject, Archetype> createMapValidators() {
+    protected DelegatingMapValidator<GameObject, MapArchObject, Archetype> createMapValidators(@NotNull final GlobalSettings globalSettings) {
         final DelegatingMapValidator<GameObject, MapArchObject, Archetype> mapValidators = new DelegatingMapValidator<GameObject, MapArchObject, Archetype>();
         final AttributeRangeChecker<GameObject, MapArchObject, Archetype> attributeRangeChecker = new AttributeRangeChecker<GameObject, MapArchObject, Archetype>();
         // make sure sustenance is [-20..20]; amulet of Sustenance is +15 so +20 should be safe
@@ -291,7 +291,7 @@
     /** {@inheritDoc} */
     @NotNull
     @Override
-    public PreferencesGroup createPreferencesGroup() {
+    public PreferencesGroup createPreferencesGroup(@NotNull final GlobalSettings globalSettings) {
         return new PreferencesGroup(
             "Gridarta for Crossfire",
             new ResPrefs((GlobalSettingsImpl) globalSettings),

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-09-13 15:22:27 UTC (rev 5124)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-09-13 15:30:58 UTC (rev 5125)
@@ -232,7 +232,7 @@
     /** {@inheritDoc} */
     @NotNull
     @Override
-    protected CFTreasureListTree<GameObject, MapArchObject, Archetype> createTreasureListTree() {
+    protected CFTreasureListTree<GameObject, MapArchObject, Archetype> createTreasureListTree(@NotNull final GlobalSettings globalSettings) {
         return new CFTreasureListTree<GameObject, MapArchObject, Archetype>(getMainView(), archetypeSet, specialTreasureLists,
                 new TreasureLocation(getCollectedDirectory(), IGUIConstants.TREASURES_FILE),
                 new TreasureLocation(globalSettings.getMapDefaultFolder(), null)
@@ -242,13 +242,13 @@
     /** {@inheritDoc} */
     @NotNull
     @Override
-    protected MapActions init1(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
+    protected MapActions init1(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings) {
         return new MapActions(getMainView(), getMainView(), gridartaObjectsFactory, globalSettings, mapManager, mapViewManager, exitMatcher, mapFileFilter, selectedSquareView);
     }
 
     /** {@inheritDoc} */
     @Override
-    protected void init2(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
+    protected void init2(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings) {
     }
 
     /** {@inheritDoc} */
@@ -258,14 +258,14 @@
 
     /** {@inheritDoc} */
     @Override
-    protected void init4(@NotNull final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser, @NotNull final AbstractArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final net.sf.gridarta.gameobject.face.FaceObjects faceObjects, @NotNull final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView) {
+    protected void init4(@NotNull final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser, @NotNull final AbstractArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final net.sf.gridarta.gameobject.face.FaceObjects faceObjects, @NotNull final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView, @NotNull final GlobalSettings globalSettings) {
         MultiPositionData.init(getConfigurationDirectory());
         new ArchetypeSetLoader(globalSettings, gameObjectParser, getCollectedDirectory(), getConfigurationDirectory(), archetypeSet, archetypeParser, editTypes, faceObjects, animationObjects, this).loadArchetypes(mainView);
     }
 
     /** {@inheritDoc} */
     @Override
-    protected void init5() {
+    protected void init5(@NotNull final GlobalSettings globalSettings) {
     }
 
     /** {@inheritDoc} */
@@ -299,7 +299,7 @@
     /** {@inheritDoc} */
     @NotNull
     @Override
-    protected DelegatingMapValidator<GameObject, MapArchObject, Archetype> createMapValidators() {
+    protected DelegatingMapValidator<GameObject, MapArchObject, Archetype> createMapValidators(@NotNull final GlobalSettings globalSettings) {
         final DelegatingMapValidator<GameObject, MapArchObject, Archetype> mapValidators = new DelegatingMapValidator<GameObject, MapArchObject, Archetype>();
         final CustomTypeChecker<GameObject, MapArchObject, Archetype> customTypeChecker = new CustomTypeChecker<GameObject, MapArchObject, Archetype>();
         customTypeChecker.addIgnore(Archetype.TYPE_MOB, Archetype.TYPE_SPAWN_POINT_MOB, Archetype.TYPE_SPAWN_POINT);
@@ -463,7 +463,7 @@
     /** {@inheritDoc} */
     @NotNull
     @Override
-    public PreferencesGroup createPreferencesGroup() {
+    public PreferencesGroup createPreferencesGroup(@NotNull final GlobalSettings globalSettings) {
         return new PreferencesGroup(
             "Gridarta for Daimonin",
             new ResPrefs((GlobalSettingsImpl) globalSettings),

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-09-13 15:22:27 UTC (rev 5124)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-09-13 15:30:58 UTC (rev 5125)
@@ -347,7 +347,7 @@
         selectedSquareView = selectedSquareControl.getSelectedSquareView();
         new MapCursorControl<G, A, R, V>(key, gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);
         replaceDialogManager.setObjectChooser(objectChooser);
-        validators = createMapValidators();
+        validators = createMapValidators(globalSettings);
         mainActions = new MainActions<G, A, R, V>(replaceDialogManager, this, validators, editTypes, archetypeSet, copyBuffer, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager, mapViewManager);
         gameObjectAttributesDialogFactory.setParent(mainView);
         new About(key, mainView);
@@ -395,7 +395,7 @@
             log.fatal("GameObjectMatcher 'exit' does not exist");
             throw new MissingResourceException("GameObjectMatcher 'exit' does not exist", null, null);
         }
-        final MapActions mapActions = init1(gridartaObjectsFactory);
+        final MapActions mapActions = init1(gridartaObjectsFactory, globalSettings);
         try {
             final Document specialTreasureListsDocument = xmlHelper.getDocumentBuilder().parse(IOUtils.getResourceURLAsString(getConfigurationDirectory(), "TreasureLists.xml"));
             specialTreasureLists = TreasureListsParser.parseTreasureLists(specialTreasureListsDocument);
@@ -406,7 +406,7 @@
             log.warn("Cannot read TreasureLists.xml: " + ex.getMessage());
             specialTreasureLists = Collections.emptyMap();
         }
-        final CFTreasureListTree<G, A, R> treasureListTree = createTreasureListTree();
+        final CFTreasureListTree<G, A, R> treasureListTree = createTreasureListTree(globalSettings);
         final ArchetypeAttributeParser<G, A, R> archetypeAttributeParser = new ArchetypeAttributeParser<G, A, R>(typeNoEventConnector, includeFaceText, globalSettings, mapFileFilter, scriptFileFilter, faceObjects, animationObjects, numberSpells, gameObjectSpells, undefinedSpellIndex, archetypeTypeSet, treasureListTree);
         final ArchetypeTypeParser<G, A, R> archetypeTypeParser = new ArchetypeTypeParser<G, A, R>(archetypeAttributeParser);
         final ArchetypeTypeSetParser<G, A, R> archetypeTypeSetParser = new ArchetypeTypeSetParser<G, A, R>(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath(), archetypeTypeSet, archetypeTypeParser);
@@ -420,7 +420,7 @@
         final LockedItemsControl<G, A, R, V> lockedItemsControl = new LockedItemsControl<G, A, R, V>(mapManager, mapViewManager, lockedItemsTypeNumbers);
         gameObjectAttributesModel = new GameObjectAttributesModel<G, A, R>();
         gameObjectAttributesControl = newGameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
-        init2(gridartaObjectsFactory);
+        init2(gridartaObjectsFactory, globalSettings);
         final ObjectChoiceDisplay<G, A, R, V> objectChoiceDisplay = new ObjectChoiceDisplay<G, A, R, V>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
         final ToolPalette<G, A, R, V> toolPalette = new ToolPalette<G, A, R, V>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
         final LeftPanel leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
@@ -435,7 +435,7 @@
         gridartaObjectsFactory.init(faceObjects, selectedSquareView, this, mainView, editTypes, mapImageCache, archetypeSet, toolPalette);
         mapControlFactory.init(gridartaObjectsFactory, gameObjectParser, rendererFactory, mapActions, archetypeChooserModel, mapImageCache, autojoinLists, exitMatcher);
         GameObject.initialize(archetypeSet, archetypeTypeSet, gameObjectMatchers, animationObjects, SystemIcons.getNofaceTileIcon());
-        init4(gameObjectParser, archetypeParser, editTypes, faceObjects, animationObjects, mainView);
+        init4(gameObjectParser, archetypeParser, editTypes, faceObjects, animationObjects, mainView, globalSettings);
 
         if (globalSettings.isAutoPopupDocu()) {
             // do an automated help popup because the docu version has increased
@@ -449,7 +449,7 @@
         deleteLibraries();
         final RecentManager recentManager = new RecentManager(mapManager, (JMenu) actionFactory.find(mainView.getJMenuBar(), "recent"), globalSettings, mapPreviewAccessory);
         mapManager.setRecentManager(recentManager);
-        init5();
+        init5(globalSettings);
         archetypeChooserControl.getArchetypeChooserView().finishBuildProcess();
         autojoinLists.loadList(archetypeSet, getConfigurationDirectory());
         if (archetypeSet.getLoadStatus() == ArchetypeSet.LoadStatus.EMPTY) {
@@ -482,27 +482,28 @@
     protected abstract JComboBox createEventTypeBox();
 
     @NotNull
-    protected abstract CFTreasureListTree<G, A, R> createTreasureListTree();
+    protected abstract CFTreasureListTree<G, A, R> createTreasureListTree(@NotNull final GlobalSettings globalSettings);
 
     @NotNull
-    protected abstract MapActions init1(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory);
+    protected abstract MapActions init1(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings);
 
-    protected abstract void init2(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory);
+    protected abstract void init2(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings);
 
     protected abstract void init3();
 
-    protected abstract void init4(@NotNull final GameObjectParser<G, A, R> gameObjectParser, @NotNull final AbstractArchetypeParser<G, A, R> archetypeParser, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final FaceObjects faceObjects, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, final MainView<G, A, R, V> mainView);
+    protected abstract void init4(@NotNull final GameObjectParser<G, A, R> gameObjectParser, @NotNull final AbstractArchetypeParser<G, A, R> archetypeParser, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final FaceObjects faceObjects, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, final MainView<G, A, R, V> mainView, @NotNull final GlobalSettings globalSettings);
 
     protected abstract void deleteLibraries();
 
-    protected abstract void init5();
+    protected abstract void init5(@NotNull final GlobalSettings globalSettings);
 
     /**
      * Initializes the map validators.
+     * @param globalSettings the global settings instance
      * @return A MapValidator that delegates to other map validators.
      */
     @NotNull
-    protected abstract DelegatingMapValidator<G, A, R> createMapValidators();
+    protected abstract DelegatingMapValidator<G, A, R> createMapValidators(@NotNull final GlobalSettings globalSettings);
 
     /**
      * Creates a new {@link NewMapDialogFactory} instance.
@@ -675,13 +676,13 @@
 
     public void options() {
         if (prefsGroup == null) {
-            prefsGroup = createPreferencesGroup();
+            prefsGroup = createPreferencesGroup(globalSettings);
         }
         PreferencesPane.showPreferencesDialog(mainView, prefsGroup, false);
     }
 
     @NotNull
-    protected abstract PreferencesGroup createPreferencesGroup();
+    protected abstract PreferencesGroup createPreferencesGroup(@NotNull final GlobalSettings globalSettings);
 
     /** Invoked when user wants to exit from the program. */
     public void exit() {

Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-09-13 15:22:27 UTC (rev 5124)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-09-13 15:30:58 UTC (rev 5125)
@@ -481,7 +481,7 @@
         /** {@inheritDoc} */
         @NotNull
         @Override
-        protected PreferencesGroup createPreferencesGroup() {
+        protected PreferencesGroup createPreferencesGroup(@NotNull final GlobalSettings globalSettings) {
             throw new AssertionError();
         }
 
@@ -513,7 +513,7 @@
         /** {@inheritDoc} */
         @NotNull
         @Override
-        protected CFTreasureListTree<TestGameObject, TestMapArchObject, TestArchetype> createTreasureListTree() {
+        protected CFTreasureListTree<TestGameObject, TestMapArchObject, TestArchetype> createTreasureListTree(@NotNull final GlobalSettings globalSettings) {
             throw new AssertionError();
         }
 
@@ -533,7 +533,7 @@
 
         /** {@inheritDoc} */
         @Override
-        protected void init2(@NotNull final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory) {
+        protected void init2(@NotNull final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings) {
             throw new AssertionError();
         }
 
@@ -545,13 +545,13 @@
 
         /** {@inheritDoc} */
         @Override
-        protected void init4(@NotNull final GameObjectParser<TestGameObject, TestMapArchObject, TestArchetype> gameObjectParser, @NotNull final AbstractArchetypeParser<TestGameObject, TestMapArchObject, TestArchetype> archetypeParser, @NotNull final EditTypes<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> editTypes, @NotNull final FaceObjects faceObjects, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final MainView<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mainView) {
+        protected void init4(@NotNull final GameObjectParser<TestGameObject, TestMapArchObject, TestArchetype> gameObjectParser, @NotNull final AbstractArchetypeParser<TestGameObject, TestMapArchObject, TestArchetype> archetypeParser, @NotNull final EditTypes<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> editTypes, @NotNull final FaceObjects faceObjects, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final MainView<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mainView, @NotNull final GlobalSettings globalSettings) {
             throw new AssertionError();
         }
 
         /** {@inheritDoc} */
         @Override
-        protected void init5() {
+        protected void init5(@NotNull final GlobalSettings globalSettings) {
         }
 
         /** {@inheritDoc} */
@@ -563,14 +563,14 @@
         /** {@inheritDoc} */
         @NotNull
         @Override
-        protected MapActions init1(@NotNull final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory) {
+        protected MapActions init1(@NotNull final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings) {
             throw new AssertionError();
         }
 
         /** {@inheritDoc} */
         @NotNull
         @Override
-        protected DelegatingMapValidator<TestGameObject, TestMapArchObject, TestArchetype> createMapValidators() {
+        protected DelegatingMapValidator<TestGameObject, TestMapArchObject, TestArchetype> createMapValidators(@NotNull final GlobalSettings globalSettings) {
             throw new AssertionError();
         }
 


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