[Gridarta-commit] SF.net SVN: gridarta:[9589] trunk/src

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

Revision: 9589
          http://sourceforge.net/p/gridarta/code/9589
Author:   akirschbaum
Date:     2014-02-20 22:18:44 +0000 (Thu, 20 Feb 2014)
Log Message:
-----------
Remove unused parameters.

Modified Paths:
--------------
    trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterFactory.java
    trunk/src/plugin/src/test/java/net/sf/gridarta/plugin/parameter/PluginParameterCodecTest.java
    trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java

Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterFactory.java
===================================================================
--- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterFactory.java	2014-02-19 21:18:16 UTC (rev 9588)
+++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterFactory.java	2014-02-20 22:18:44 UTC (rev 9589)
@@ -21,7 +21,6 @@
 
 import net.sf.gridarta.model.archetype.Archetype;
 import net.sf.gridarta.model.archetypeset.ArchetypeSet;
-import net.sf.gridarta.model.filter.NamedFilter;
 import net.sf.gridarta.model.gameobject.GameObject;
 import net.sf.gridarta.model.maparchobject.MapArchObject;
 import net.sf.gridarta.model.mapmanager.MapManager;
@@ -42,9 +41,6 @@
     private final MapManager<G, A, R> mapManager;
 
     @NotNull
-    private final NamedFilter defaultFilterList;
-
-    @NotNull
     private final ProjectSettings projectSettings;
 
     /**
@@ -54,10 +50,9 @@
     @NotNull
     private final PluginParameterCodec<G, A, R> codec = new PluginParameterCodec<G, A, R>();
 
-    public PluginParameterFactory(@NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final MapManager<G, A, R> mapManager, @NotNull final NamedFilter defaultFilterList, @NotNull final ProjectSettings projectSettings) {
+    public PluginParameterFactory(@NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final MapManager<G, A, R> mapManager, @NotNull final ProjectSettings projectSettings) {
         this.archetypeSet = archetypeSet;
         this.mapManager = mapManager;
-        this.defaultFilterList = defaultFilterList;
         this.projectSettings = projectSettings;
     }
 

Modified: trunk/src/plugin/src/test/java/net/sf/gridarta/plugin/parameter/PluginParameterCodecTest.java
===================================================================
--- trunk/src/plugin/src/test/java/net/sf/gridarta/plugin/parameter/PluginParameterCodecTest.java	2014-02-19 21:18:16 UTC (rev 9588)
+++ trunk/src/plugin/src/test/java/net/sf/gridarta/plugin/parameter/PluginParameterCodecTest.java	2014-02-20 22:18:44 UTC (rev 9589)
@@ -24,16 +24,13 @@
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.util.Collections;
 import net.sf.gridarta.model.archetype.TestArchetype;
-import net.sf.gridarta.model.filter.NamedFilter;
 import net.sf.gridarta.model.gameobject.TestGameObject;
 import net.sf.gridarta.model.maparchobject.TestMapArchObject;
 import net.sf.gridarta.model.mapcontrol.MapControl;
 import net.sf.gridarta.model.mapcontrol.TestMapControlCreator;
 import net.sf.gridarta.model.mapmodel.MapFile;
 import net.sf.gridarta.model.mapmodel.TestMapModelCreator;
-import net.sf.gridarta.model.match.NamedGameObjectMatcher;
 import net.sf.gridarta.utils.Size2D;
 import org.jdom.Document;
 import org.jdom.Element;
@@ -769,9 +766,7 @@
     private static PluginParameter<TestGameObject, TestMapArchObject, TestArchetype, ?> fromXML(@NotNull final TestMapControlCreator mapControlCreator, @NotNull final String string) throws IOException, JDOMException, NoSuchParameterException {
         final SAXBuilder builder = new SAXBuilder(false);
         final Document document = builder.build(new StringReader(string));
-        final Iterable<NamedGameObjectMatcher> matchers = Collections.emptyList();
-        final NamedFilter filterList = new NamedFilter(matchers);
-        final PluginParameterFactory<TestGameObject, TestMapArchObject, TestArchetype> parameterFactory = new PluginParameterFactory<TestGameObject, TestMapArchObject, TestArchetype>(mapControlCreator.getArchetypeSet(), mapControlCreator.getMapManager(), filterList, mapControlCreator.getProjectSettings());
+        final PluginParameterFactory<TestGameObject, TestMapArchObject, TestArchetype> parameterFactory = new PluginParameterFactory<TestGameObject, TestMapArchObject, TestArchetype>(mapControlCreator.getArchetypeSet(), mapControlCreator.getMapManager(), mapControlCreator.getProjectSettings());
         final Element element = document.getRootElement();
         return parameterFactory.createParameter(element);
     }

Modified: trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java
===================================================================
--- trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java	2014-02-19 21:18:16 UTC (rev 9588)
+++ trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java	2014-02-20 22:18:44 UTC (rev 9589)
@@ -260,7 +260,7 @@
         final Map<String, TreasureTreeNode> specialTreasureLists = loadSpecialTreasureLists(errorView, xmlHelper.getDocumentBuilder(), projectSettings);
         treasureTree = TreasureLoader.parseTreasures(errorView, specialTreasureLists, configSource, projectSettings);
         final NamedFilter defaultFilterList = new NamedFilter(Collections.<NamedGameObjectMatcher>emptyList());
-        final PluginParameterFactory<G, A, R> pluginParameterFactory = new PluginParameterFactory<G, A, R>(archetypeSet, mapManager, defaultFilterList, projectSettings);
+        final PluginParameterFactory<G, A, R> pluginParameterFactory = new PluginParameterFactory<G, A, R>(archetypeSet, mapManager, projectSettings);
         final PluginModelParser<G, A, R> pluginModelParser = new PluginModelParser<G, A, R>(pluginParameterFactory);
         pluginModel = PluginModelLoader.loadPlugins(pluginParameterFactory, pluginModelParser, errorView, scriptsFile);
     }

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