Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[6714] trunk/src
|
From: <aki...@us...> - 2009-06-27 16:53:17
|
Revision: 6714
http://gridarta.svn.sourceforge.net/gridarta/?rev=6714&view=rev
Author: akirschbaum
Date: 2009-06-27 16:53:14 +0000 (Sat, 27 Jun 2009)
Log Message:
-----------
Remove singleton FaceObjectProvidersInstance.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/maincontrol/DefaultMainControl.java
trunk/src/test/net/sf/gridarta/exitconnector/ExitConnectorActionsTest.java
trunk/src/test/net/sf/gridarta/map/mapmodel/DefaultMapModelTest.java
Removed Paths:
-------------
trunk/src/app/net/sf/gridarta/gameobject/face/FaceObjectProvidersInstance.java
Deleted: trunk/src/app/net/sf/gridarta/gameobject/face/FaceObjectProvidersInstance.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/face/FaceObjectProvidersInstance.java 2009-06-27 16:38:51 UTC (rev 6713)
+++ trunk/src/app/net/sf/gridarta/gameobject/face/FaceObjectProvidersInstance.java 2009-06-27 16:53:14 UTC (rev 6714)
@@ -1,30 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2007 The Gridarta Developers.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package net.sf.gridarta.gameobject.face;
-
-import org.jetbrains.annotations.NotNull;
-
-@Deprecated
-public class FaceObjectProvidersInstance {
-
- @NotNull
- public static final FaceObjectProviders faceObjectProviders = new FaceObjectProviders();
-
-} // class FaceObjectProvidersInstance
Modified: trunk/src/app/net/sf/gridarta/maincontrol/DefaultMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/DefaultMainControl.java 2009-06-27 16:38:51 UTC (rev 6713)
+++ trunk/src/app/net/sf/gridarta/maincontrol/DefaultMainControl.java 2009-06-27 16:53:14 UTC (rev 6714)
@@ -56,7 +56,7 @@
import net.sf.gridarta.gameobject.anim.AnimationObjects;
import net.sf.gridarta.gameobject.anim.DefaultAnimationObjects;
import net.sf.gridarta.gameobject.face.ArchFaceProvider;
-import net.sf.gridarta.gameobject.face.FaceObjectProvidersInstance;
+import net.sf.gridarta.gameobject.face.FaceObjectProviders;
import net.sf.gridarta.gameobject.face.FaceObjects;
import net.sf.gridarta.gameobject.match.GameObjectMatchers;
import net.sf.gridarta.gameobject.match.NamedGameObjectMatcher;
@@ -259,6 +259,9 @@
@NotNull
private final ScriptArchData<G> scriptArchData;
+ @NotNull
+ private final FaceObjectProviders faceObjectProviders = new FaceObjectProviders();
+
/**
* Creates a new instance.
* @param animationObjectsFilename the filename of the animation objects
@@ -290,7 +293,7 @@
mapArchObjectFactory = editorFactory.newMapArchObjectFactory();
mapArchObjectParserFactory = editorFactory.newMapArchObjectParserFactory();
final GameObjectFactory<G, A, R> gameObjectFactory = editorFactory.newGameObjectFactory();
- final GameObjectParserFactory<G, A, R> gameObjectParserFactory = editorFactory.newGameObjectParserFactory(gameObjectFactory, FaceObjectProvidersInstance.faceObjectProviders);
+ final GameObjectParserFactory<G, A, R> gameObjectParserFactory = editorFactory.newGameObjectParserFactory(gameObjectFactory, faceObjectProviders);
globalSettings = editorFactory.newGlobalSettings();
globalSettings.readGlobalSettings();
final ArchetypeFactory<G, A, R> archetypeFactory = editorFactory.newArchetypeFactory();
@@ -298,8 +301,8 @@
archetypeSet = editorFactory.newArchetypeSet(globalSettings, archetypeFactory, gameObjectParser);
mapReaderFactory = new DefaultMapReaderFactory<G, A, R>(mapArchObjectFactory, mapArchObjectParserFactory, gameObjectParserFactory, archetypeSet, mapViewSettings);
final MapWriter<G, A, R> mapWriter = new DefaultMapWriter<G, A, R>(mapArchObjectParserFactory, gameObjectParser);
- final AutojoinLists<G, A, R> autojoinLists = new AutojoinLists<G, A, R>(FaceObjectProvidersInstance.faceObjectProviders);
- mapControlFactory = editorFactory.newMapControlFactory(archetypeChooserModel, autojoinLists, mapViewSettings, mapWriter, FaceObjectProvidersInstance.faceObjectProviders);
+ final AutojoinLists<G, A, R> autojoinLists = new AutojoinLists<G, A, R>(faceObjectProviders);
+ mapControlFactory = editorFactory.newMapControlFactory(archetypeChooserModel, autojoinLists, mapViewSettings, mapWriter, faceObjectProviders);
mapManager = new DefaultMapManager<G, A, R>(mapReaderFactory, mapControlFactory, globalSettings, mapViewSettings);
pickmapManager = new DefaultPickmapManager<G, A, R>(mapReaderFactory, mapControlFactory, globalSettings, mapViewSettings);
ScriptedEventEditor.setGlobalSettings(globalSettings);
@@ -308,10 +311,10 @@
editorFactory.initGameObject(archetypeTypeSet);
SystemIcons.init();
final ArchFaceProvider archFaceProvider = new ArchFaceProvider();
- faceObjects = editorFactory.createFaceObjects(archFaceProvider, FaceObjectProvidersInstance.faceObjectProviders);
- FaceObjectProvidersInstance.faceObjectProviders.init(doubleFaceOffset, faceObjects);
+ faceObjects = editorFactory.createFaceObjects(archFaceProvider, faceObjectProviders);
+ faceObjectProviders.init(doubleFaceOffset, faceObjects);
collectables.add(archetypeSet);
- animationObjects = new DefaultAnimationObjects(animationObjectsFilename, FaceObjectProvidersInstance.faceObjectProviders);
+ animationObjects = new DefaultAnimationObjects(animationObjectsFilename, faceObjectProviders);
collectables.add(animationObjects);
collectables.add(faceObjects);
editorFactory.addCollectables(collectables, faceObjects);
@@ -359,7 +362,7 @@
} catch (final FileNotFoundException ex) {
typesErrorViewCollector.addWarning(ErrorViewCategory.TYPES_FILE_INVALID, ex.getMessage());
}
- archetypeChooserControl = new ArchetypeChooserControl<G, A, R>(archetypeChooserModel, createDirectionPane, FaceObjectProvidersInstance.faceObjectProviders);
+ archetypeChooserControl = new ArchetypeChooserControl<G, A, R>(archetypeChooserModel, createDirectionPane, faceObjectProviders);
final AbstractArchetypeParser<G, A, R> archetypeParser = editorFactory.newArchetypeParser(gameObjectParser, archetypeChooserControl, animationObjects, archetypeSet, gameObjectFactory, globalSettings);
final ArchetypeTypeList eventTypeSetTmp = archetypeTypeSet.getList("event");
final ArchetypeTypeList eventTypeSet;
@@ -370,14 +373,14 @@
eventTypeSet = eventTypeSetTmp;
}
final ScriptArchUtils scriptArchUtils = editorFactory.newScriptArchUtils(eventTypeSet);
- final ScriptedEventFactory<G> scriptedEventFactory = editorFactory.newScriptedEventFactory(scriptArchUtils, FaceObjectProvidersInstance.faceObjectProviders);
+ final ScriptedEventFactory<G> scriptedEventFactory = editorFactory.newScriptedEventFactory(scriptArchUtils, faceObjectProviders);
scriptArchEditor = editorFactory.newScriptArchEditor(scriptedEventFactory, scriptExtension, scriptName, scriptArchUtils.createEventTypeBox(), scriptFileFilter, globalSettings, mapManager);
scriptArchEditor.initEventTypeBoxes(scriptArchUtils);
scriptArchData = editorFactory.newScriptArchData(scriptedEventFactory, scriptArchUtils, scriptArchEditor);
DefaultGameObject.initialize(gameObjectMatchers, animationObjects, SystemIcons.getNofaceTileIcon(), scriptArchData);
- editorFactory.newArchetypeSetLoader(gameObjectParser, archetypeParser, mapViewSettings, faceObjects, animationObjects, globalSettings, archetypeSet, archFaceProvider, FaceObjectProvidersInstance.faceObjectProviders).loadArchetypes(errorView);
+ editorFactory.newArchetypeSetLoader(gameObjectParser, archetypeParser, mapViewSettings, faceObjects, animationObjects, globalSettings, archetypeSet, archFaceProvider, faceObjectProviders).loadArchetypes(errorView);
if (spellType != 0) {
- new ArchetypeSetSpellLoader<G, A, R>().load(archetypeSet, spellType, gameObjectSpells, FaceObjectProvidersInstance.faceObjectProviders);
+ new ArchetypeSetSpellLoader<G, A, R>().load(archetypeSet, spellType, gameObjectSpells, faceObjectProviders);
gameObjectSpells.sort();
}
if (spellFile != null) {
@@ -409,8 +412,8 @@
public GUIMainControl<G, A, R> createGUIMainControl(@Nullable final File mapImageCacheDir, @Nullable final ImageIcon compassIcon, @NotNull final String gridartaJarFilename, @NotNull final int[] lockedItemsTypeNumbers, final boolean autoValidatorDefault, @Nullable final String spellFile, @NotNull final EditorFactory<G, A, R> editorFactory) {
final NamedFilterList defaultNamedFilterList = new NamedFilterList(gameObjectMatchers.getFilters());
final FilterControl<G, A, R> filterControl = new DefaultFilterControl<G, A, R>(mapManager, defaultNamedFilterList);
- final RendererFactory<G, A, R> rendererFactory = editorFactory.newRendererFactory(mapViewSettings, filterControl, FaceObjectProvidersInstance.faceObjectProviders);
- return new GUIMainControl<G, A, R>(mapManager, pickmapManager, mapViewManager, archetypeSet, faceObjects, mapImageCacheDir, globalSettings, mapViewSettings, mapControlFactory, mapReaderFactory, mapArchObjectFactory, treasureTree, archetypeTypeSet, archetypeChooserControl, compassIcon, gridartaJarFilename, scriptFileFilter, scriptExtension, validators, collectables, gameObjectMatchers, errorView, mapArchObjectParserFactory, attributeRangeChecker, lockedItemsTypeNumbers, scriptsDir, scriptModel, archetypeChooserModel, animationObjects, scriptArchEditor, scriptArchData, autoValidatorDefault, rendererFactory, spellFile, allowRandomMapParameters, directionMap, filterControl, editorFactory, FaceObjectProvidersInstance.faceObjectProviders);
+ final RendererFactory<G, A, R> rendererFactory = editorFactory.newRendererFactory(mapViewSettings, filterControl, faceObjectProviders);
+ return new GUIMainControl<G, A, R>(mapManager, pickmapManager, mapViewManager, archetypeSet, faceObjects, mapImageCacheDir, globalSettings, mapViewSettings, mapControlFactory, mapReaderFactory, mapArchObjectFactory, treasureTree, archetypeTypeSet, archetypeChooserControl, compassIcon, gridartaJarFilename, scriptFileFilter, scriptExtension, validators, collectables, gameObjectMatchers, errorView, mapArchObjectParserFactory, attributeRangeChecker, lockedItemsTypeNumbers, scriptsDir, scriptModel, archetypeChooserModel, animationObjects, scriptArchEditor, scriptArchData, autoValidatorDefault, rendererFactory, spellFile, allowRandomMapParameters, directionMap, filterControl, editorFactory, faceObjectProviders);
}
/** {@inheritDoc} */
@@ -437,7 +440,8 @@
final MapArchObjectFactory<A> mapArchObjectFactory = editorFactory.newMapArchObjectFactory();
final MapArchObjectParserFactory<A> mapArchObjectParserFactory = editorFactory.newMapArchObjectParserFactory();
final GameObjectFactory<G, A, R> gameObjectFactory = editorFactory.newGameObjectFactory();
- final GameObjectParserFactory<G, A, R> gameObjectParserFactory = editorFactory.newGameObjectParserFactory(gameObjectFactory, FaceObjectProvidersInstance.faceObjectProviders);
+ final FaceObjectProviders faceObjectProviders = new FaceObjectProviders();
+ final GameObjectParserFactory<G, A, R> gameObjectParserFactory = editorFactory.newGameObjectParserFactory(gameObjectFactory, faceObjectProviders);
final GlobalSettings globalSettings = editorFactory.newGlobalSettings();
globalSettings.readGlobalSettings();
final ArchetypeFactory<G, A, R> archetypeFactory = editorFactory.newArchetypeFactory();
@@ -446,14 +450,14 @@
final MapViewSettings mapViewSettings = new MapViewSettings();
final MapReaderFactory<G, A> mapReaderFactory = new DefaultMapReaderFactory<G, A, R>(mapArchObjectFactory, mapArchObjectParserFactory, gameObjectParserFactory, archetypeSet, mapViewSettings);
final MapWriter<G, A, R> mapWriter = new DefaultMapWriter<G, A, R>(mapArchObjectParserFactory, gameObjectParser);
- final AutojoinLists<G, A, R> autojoinLists = new AutojoinLists<G, A, R>(FaceObjectProvidersInstance.faceObjectProviders);
+ final AutojoinLists<G, A, R> autojoinLists = new AutojoinLists<G, A, R>(faceObjectProviders);
final ArchetypeChooserModel<G, A, R> archetypeChooserModel = new ArchetypeChooserModel<G, A, R>();
- final MapControlFactory<G, A, R> mapControlFactory = editorFactory.newMapControlFactory(archetypeChooserModel, autojoinLists, mapViewSettings, mapWriter, FaceObjectProvidersInstance.faceObjectProviders);
+ final MapControlFactory<G, A, R> mapControlFactory = editorFactory.newMapControlFactory(archetypeChooserModel, autojoinLists, mapViewSettings, mapWriter, faceObjectProviders);
final MapManager<G, A, R> mapManager = new DefaultMapManager<G, A, R>(mapReaderFactory, mapControlFactory, globalSettings, mapViewSettings);
final Set<NamedGameObjectMatcher> matchers = new HashSet<NamedGameObjectMatcher>();
final NamedFilterList defaultNamedFilterList = new NamedFilterList(matchers);
final FilterControl<G, A, R> filterControl = new DefaultFilterControl<G, A, R>(mapManager, defaultNamedFilterList);
- final RendererFactory<G, A, R> rendererFactory = editorFactory.newRendererFactory(mapViewSettings, filterControl, FaceObjectProvidersInstance.faceObjectProviders);
+ final RendererFactory<G, A, R> rendererFactory = editorFactory.newRendererFactory(mapViewSettings, filterControl, faceObjectProviders);
return new ImageCreator<G, A, R>(mapManager, rendererFactory);
}
Modified: trunk/src/test/net/sf/gridarta/exitconnector/ExitConnectorActionsTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/exitconnector/ExitConnectorActionsTest.java 2009-06-27 16:38:51 UTC (rev 6713)
+++ trunk/src/test/net/sf/gridarta/exitconnector/ExitConnectorActionsTest.java 2009-06-27 16:53:14 UTC (rev 6714)
@@ -31,7 +31,7 @@
import net.sf.gridarta.gameobject.TestArchetypeFactory;
import net.sf.gridarta.gameobject.TestArchetypeSet;
import net.sf.gridarta.gameobject.TestGameObject;
-import net.sf.gridarta.gameobject.face.FaceObjectProvidersInstance;
+import net.sf.gridarta.gameobject.face.FaceObjectProviders;
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gameobject.match.TypeNrsGameObjectMatcher;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
@@ -375,11 +375,12 @@
globalSettings = new TestGlobalSettings();
final MapViewSettings mapViewSettings = new MapViewSettings();
final MapWriter<TestGameObject, TestMapArchObject, TestArchetype> mapWriter = new TestMapWriter();
- final AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype> autojoinLists = new AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype>(FaceObjectProvidersInstance.faceObjectProviders);
+ final FaceObjectProviders faceObjectProviders = new FaceObjectProviders();
+ final AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype> autojoinLists = new AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype>(faceObjectProviders);
final ArchetypeChooserModel<TestGameObject, TestMapArchObject, TestArchetype> archetypeChooserModel = new ArchetypeChooserModel<TestGameObject, TestMapArchObject, TestArchetype>();
final RendererFactory<TestGameObject, TestMapArchObject, TestArchetype> rendererFactory = new TestRendererFactory();
final MapViewFactory<TestGameObject, TestMapArchObject, TestArchetype> mapViewFactory = new TestMapViewFactory(rendererFactory);
- final MapControlFactory<TestGameObject, TestMapArchObject, TestArchetype> mapControlFactory = new TestMapControlFactory(mapViewFactory, mapWriter, autojoinLists, archetypeChooserModel, mapViewSettings, FaceObjectProvidersInstance.faceObjectProviders);
+ final MapControlFactory<TestGameObject, TestMapArchObject, TestArchetype> mapControlFactory = new TestMapControlFactory(mapViewFactory, mapWriter, autojoinLists, archetypeChooserModel, mapViewSettings, faceObjectProviders);
final AbstractMapManager<TestGameObject, TestMapArchObject, TestArchetype> tmpMapManager = new DefaultMapManager<TestGameObject, TestMapArchObject, TestArchetype>(mapReaderFactory, mapControlFactory, globalSettings, mapViewSettings);
tmpMapManager.setFileControl(new TestFileControl());
mapManager = tmpMapManager;
Modified: trunk/src/test/net/sf/gridarta/map/mapmodel/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/mapmodel/DefaultMapModelTest.java 2009-06-27 16:38:51 UTC (rev 6713)
+++ trunk/src/test/net/sf/gridarta/map/mapmodel/DefaultMapModelTest.java 2009-06-27 16:53:14 UTC (rev 6714)
@@ -30,7 +30,7 @@
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gameobject.TestArchetype;
import net.sf.gridarta.gameobject.TestGameObject;
-import net.sf.gridarta.gameobject.face.FaceObjectProvidersInstance;
+import net.sf.gridarta.gameobject.face.FaceObjectProviders;
import net.sf.gridarta.gui.GUIConstants;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
import net.sf.gridarta.gui.map.mapviewsettings.MapViewSettings;
@@ -389,9 +389,10 @@
}
final TestMapArchObject mapArchObject = new TestMapArchObject();
final ArchetypeChooserModel<TestGameObject, TestMapArchObject, TestArchetype> archetypeChooserModel = new ArchetypeChooserModel<TestGameObject, TestMapArchObject, TestArchetype>();
- final AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype> autojoinLists = new AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype>(FaceObjectProvidersInstance.faceObjectProviders);
+ final FaceObjectProviders faceObjectProviders = new FaceObjectProviders();
+ final AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype> autojoinLists = new AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype>(faceObjectProviders);
final MapViewSettings mapViewSettings = new MapViewSettings();
- mapModel = new DefaultMapModel<TestGameObject, TestMapArchObject, TestArchetype>(autojoinLists, null, mapArchObject, archetypeChooserModel, mapViewSettings, 0, FaceObjectProvidersInstance.faceObjectProviders);
+ mapModel = new DefaultMapModel<TestGameObject, TestMapArchObject, TestArchetype>(autojoinLists, null, mapArchObject, archetypeChooserModel, mapViewSettings, 0, faceObjectProviders);
result.setLength(0);
mapModel.addMapModelListener(mapModelListener);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
