Thread: [Gridarta-commit] SF.net SVN: gridarta:[5674] trunk (Page 25)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5674
          http://gridarta.svn.sourceforge.net/gridarta/?rev=5674&view=rev
Author:   akirschbaum
Date:     2008-11-07 09:43:51 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
Remove redundant type parameters.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/src/app/net/sf/gridarta/AbstractMainControl.java
    trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
    trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationObjects.java
    trunk/src/app/net/sf/gridarta/gameobject/anim/DefaultAnimationObjects.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================

--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-11-07 09:32:09 UTC (rev 5673)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-11-07 09:43:51 UTC (rev 5674)
@@ -56,7 +56,6 @@
 import net.sf.gridarta.gameobject.ArchetypeFactory;
 import net.sf.gridarta.gameobject.Collectable;
 import net.sf.gridarta.gameobject.GameObjectFactory;
-import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gameobject.anim.AnimationObjects;
 import net.sf.gridarta.gameobject.anim.DefaultAnimationObjects;
 import net.sf.gridarta.gameobject.face.DefaultFaceObjects;
@@ -143,7 +142,7 @@
      * @throws RuntimeException If the controller cannot be initialized.
      */
     public CMainControl() {
-        super("cfeditor", new DefaultAnimationObjects<AnimationObject>(IGUIConstants.ANIMTREE_FILE), new DefaultFaceObjects(IGUIConstants.PNG_FILE, IGUIConstants.FACETREE_FILE, Pattern.compile("^.*\t\\.?(.*)"), "\\%1$05d\t./arch%2$s"), false, ConfigFileUtils.getHomeFile("thumbnails"), null, "CrossfireEditor.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, }, PREFS_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SCRIPTS_DIR);
+        super("cfeditor", new DefaultAnimationObjects(IGUIConstants.ANIMTREE_FILE), new DefaultFaceObjects(IGUIConstants.PNG_FILE, IGUIConstants.FACETREE_FILE, Pattern.compile("^.*\t\\.?(.*)"), "\\%1$05d\t./arch%2$s"), false, ConfigFileUtils.getHomeFile("thumbnails"), null, "CrossfireEditor.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, }, PREFS_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SCRIPTS_DIR);
     }
 
     /** {@inheritDoc} */
@@ -263,7 +262,7 @@
 
     /** {@inheritDoc} */
     @Override
-    protected AbstractArchetypeParser<GameObject, MapArchObject, Archetype> newArchetypeParser(final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser, final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, final AnimationObjects<? extends AnimationObject> animationObjects, final net.sf.gridarta.gameobject.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory) {
+    protected AbstractArchetypeParser<GameObject, MapArchObject, Archetype> newArchetypeParser(final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser, final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, final AnimationObjects animationObjects, final net.sf.gridarta.gameobject.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory) {
         return new ArchetypeParser(gameObjectParser, archetypeChooserControl, animationObjects, archetypeSet, gameObjectFactory, smoothFaces);
     }
 
@@ -307,7 +306,7 @@
 
     /** {@inheritDoc} */
     @Override
-    protected void init4(@NotNull final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser, @NotNull final AbstractArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final EditTypes editTypes, @NotNull final FaceObjects faceObjects, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView, @NotNull final GlobalSettings globalSettings, @NotNull final net.sf.gridarta.gameobject.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet) {
+    protected void init4(@NotNull final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser, @NotNull final AbstractArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final EditTypes editTypes, @NotNull final FaceObjects faceObjects, @NotNull final AnimationObjects animationObjects, @NotNull final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView, @NotNull final GlobalSettings globalSettings, @NotNull final net.sf.gridarta.gameobject.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet) {
         new ArchetypeSetLoader(globalSettings, gameObjectParser, globalSettings.getCollectedDirectory(), archetypeSet, archetypeParser, editTypes, faceObjects, animationObjects, this).loadArchetypes(mainView);
     }
 

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-11-07 09:32:09 UTC (rev 5673)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-11-07 09:43:51 UTC (rev 5674)
@@ -57,7 +57,6 @@
 import net.sf.gridarta.gameobject.ArchetypeFactory;
 import net.sf.gridarta.gameobject.Collectable;
 import net.sf.gridarta.gameobject.GameObjectFactory;
-import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gameobject.anim.AnimationObjects;
 import net.sf.gridarta.gameobject.anim.DefaultAnimationObjects;
 import net.sf.gridarta.gameobject.face.DefaultFaceObjects;
@@ -176,7 +175,7 @@
      * @throws RuntimeException If the controller cannot be initialized.
      */
     public CMainControl() {
-        super("daieditor", new DefaultAnimationObjects<AnimationObject>(IGUIConstants.ANIMTREE_FILE), new DefaultFaceObjects(IGUIConstants.PNG_FILE, IGUIConstants.FACETREE_FILE, Pattern.compile("^(.*)"), "%2$s"), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "DaimoninEditor.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, }, PREFS_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SCRIPTS_DIR);
+        super("daieditor", new DefaultAnimationObjects(IGUIConstants.ANIMTREE_FILE), new DefaultFaceObjects(IGUIConstants.PNG_FILE, IGUIConstants.FACETREE_FILE, Pattern.compile("^(.*)"), "%2$s"), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "DaimoninEditor.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, }, PREFS_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SCRIPTS_DIR);
     }
 
     /** {@inheritDoc} */
@@ -294,7 +293,7 @@
 
     /** {@inheritDoc} */
     @Override
-    protected AbstractArchetypeParser<GameObject, MapArchObject, Archetype> newArchetypeParser(final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser, final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, final AnimationObjects<? extends AnimationObject> animationObjects, final net.sf.gridarta.gameobject.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory) {
+    protected AbstractArchetypeParser<GameObject, MapArchObject, Archetype> newArchetypeParser(final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser, final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, final AnimationObjects animationObjects, final net.sf.gridarta.gameobject.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory) {
         return new ArchetypeParser(archetypeChooserControl, animationObjects, archetypeSet, gameObjectFactory);
     }
 
@@ -340,7 +339,7 @@
 
     /** {@inheritDoc} */
     @Override
-    protected void init4(@NotNull final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser, @NotNull final AbstractArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final EditTypes editTypes, @NotNull final FaceObjects faceObjects, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView, @NotNull final GlobalSettings globalSettings, @NotNull final net.sf.gridarta.gameobject.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet) {
+    protected void init4(@NotNull final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser, @NotNull final AbstractArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final EditTypes editTypes, @NotNull final FaceObjects faceObjects, @NotNull final AnimationObjects animationObjects, @NotNull final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView, @NotNull final GlobalSettings globalSettings, @NotNull final net.sf.gridarta.gameobject.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet) {
         MultiPositionData.init(globalSettings.getConfigurationDirectory());
         new ArchetypeSetLoader(globalSettings, gameObjectParser, globalSettings.getCollectedDirectory(), archetypeSet, archetypeParser, editTypes, faceObjects, animationObjects, this).loadArchetypes(mainView);
     }

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-11-07 09:32:09 UTC (rev 5673)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-11-07 09:43:51 UTC (rev 5674)
@@ -328,7 +328,7 @@
      * default
      * @param scriptsDir the plugin scripts directory
      */
-    protected AbstractMainControl(@NotNull final String key, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, final boolean createDirectionPane, @Nullable final File mapImageCacheDir, @Nullable final ImageIcon compassIcon, @NotNull final String gridartaJarFilename, @NotNull final FileFilter scriptFileFilter, @NotNull final String scriptExtension, @NotNull final String scriptName, final int spellType, @Nullable final String spellFile, final int typeNoEventConnector, final boolean includeFaceText, final int undefinedSpellIndex, @NotNull final int[] lockedItemsTypeNumbers, final boolean autoValidatorDefault, @NotNull final String scriptsDir) {
+    protected AbstractMainControl(@NotNull final String key, @NotNull final AnimationObjects animationObjects, @NotNull final FaceObjects faceObjects, final boolean createDirectionPane, @Nullable final File mapImageCacheDir, @Nullable final ImageIcon compassIcon, @NotNull final String gridartaJarFilename, @NotNull final FileFilter scriptFileFilter, @NotNull final String scriptExtension, @NotNull final String scriptName, final int spellType, @Nullable final String spellFile, final int typeNoEventConnector, final boolean includeFaceText, final int undefinedSpellIndex, @NotNull final int[] lockedItemsTypeNumbers, final boolean autoValidatorDefault, @NotNull final String scriptsDir) {
         this.scriptExtension = scriptExtension;
         appPrefsModel = createAppPrefsModel();
         final MapArchObjectFactory<A> mapArchObjectFactory = newMapArchObjectFactory();
@@ -559,7 +559,7 @@
     @NotNull
     protected abstract GameObjectFactory<G, A, R> newGameObjectFactory();
 
-    protected abstract AbstractArchetypeParser<G, A, R> newArchetypeParser(final GameObjectParser<G, A, R> gameObjectParser, final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, final AnimationObjects<? extends AnimationObject> animationObjects, final ArchetypeSet<G, A, R> archetypeSet, @NotNull final GameObjectFactory<G, A, R> gameObjectFactory);
+    protected abstract AbstractArchetypeParser<G, A, R> newArchetypeParser(final GameObjectParser<G, A, R> gameObjectParser, final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, final AnimationObjects animationObjects, final ArchetypeSet<G, A, R> archetypeSet, @NotNull final GameObjectFactory<G, A, R> gameObjectFactory);
 
     protected abstract void createActions();
 
@@ -569,7 +569,7 @@
     @NotNull
     protected abstract MapActions init1(@NotNull final MapViewSettings mapViewSettings, @NotNull final MapArchObjectParserFactory<A> mapArchObjectParserFactory, @NotNull final MapArchObjectFactory<A> mapArchObjectFactory, @NotNull final GlobalSettings globalSettings, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final MapViewManager<G, A, R, V> mapViewManager, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final GameObjectMatcher exitMatcher);
 
-    protected abstract void init4(@NotNull final GameObjectParser<G, A, R> gameObjectParser, @NotNull final AbstractArchetypeParser<G, A, R> archetypeParser, @NotNull final EditTypes editTypes, @NotNull final FaceObjects faceObjects, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, final MainView<G, A, R, V> mainView, @NotNull final GlobalSettings globalSettings, @NotNull final ArchetypeSet<G, A, R> archetypeSet);
+    protected abstract void init4(@NotNull final GameObjectParser<G, A, R> gameObjectParser, @NotNull final AbstractArchetypeParser<G, A, R> archetypeParser, @NotNull final EditTypes editTypes, @NotNull final FaceObjects faceObjects, @NotNull final AnimationObjects animationObjects, final MainView<G, A, R, V> mainView, @NotNull final GlobalSettings globalSettings, @NotNull final ArchetypeSet<G, A, R> archetypeSet);
 
     protected abstract void deleteLibraries();
 

Modified: trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/GameObject.java	2008-11-07 09:32:09 UTC (rev 5673)
+++ trunk/src/app/net/sf/gridarta/gameobject/GameObject.java	2008-11-07 09:43:51 UTC (rev 5674)
@@ -68,7 +68,7 @@
     private static ScriptArchEditor scriptArchEditor = null;
 
     @Nullable
-    private static AnimationObjects<? extends AnimationObject> animationObjects = null;
+    private static AnimationObjects animationObjects = null;
 
     /**
      * Face name, can be from animation or face. This is determined by taking
@@ -226,7 +226,7 @@
      * @param noFace the image icons for game objects having no face
      * @param scriptArchData the script arch data instance to use
      */
-    public static void initialize(@Nullable final ArchetypeSet<?, ?, ?> archetypeSet, final ArchetypeTypeSet archetypeTypeSet, final GameObjectMatchers gameObjectMatchers, final ScriptArchEditor scriptArchEditor, @Nullable final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final ImageIcon noFace, @NotNull final ScriptArchData<?> scriptArchData) {
+    public static void initialize(@Nullable final ArchetypeSet<?, ?, ?> archetypeSet, final ArchetypeTypeSet archetypeTypeSet, final GameObjectMatchers gameObjectMatchers, final ScriptArchEditor scriptArchEditor, @Nullable final AnimationObjects animationObjects, @NotNull final ImageIcon noFace, @NotNull final ScriptArchData<?> scriptArchData) {
         GameObject.archetypeSet = archetypeSet;
         GameObject.archetypeTypeSet = archetypeTypeSet;
         GameObject.gameObjectMatchers = gameObjectMatchers;

Modified: trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationObjects.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationObjects.java	2008-11-07 09:32:09 UTC (rev 5673)
+++ trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationObjects.java	2008-11-07 09:43:51 UTC (rev 5674)
@@ -32,7 +32,7 @@
  * AnimationObjects is a container for {@link AnimationObject}s.
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
  */
-public interface AnimationObjects<E extends AnimationObject> extends Collectable, NamedObjects<E> {
+public interface AnimationObjects extends Collectable, NamedObjects<AnimationObject> {
 
     /**
      * Add an animation object.

Modified: trunk/src/app/net/sf/gridarta/gameobject/anim/DefaultAnimationObjects.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/anim/DefaultAnimationObjects.java	2008-11-07 09:32:09 UTC (rev 5673)
+++ trunk/src/app/net/sf/gridarta/gameobject/anim/DefaultAnimationObjects.java	2008-11-07 09:43:51 UTC (rev 5674)
@@ -42,7 +42,7 @@
  * Abstract base implementation of {@link AnimationObjects}.
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
  */
-public class DefaultAnimationObjects<E extends AnimationObject> extends AbstractNamedObjects<E> implements AnimationObjects<E> {
+public class DefaultAnimationObjects extends AbstractNamedObjects<AnimationObject> implements AnimationObjects {
 
     /** Action Factory. */
     private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("net.sf.gridarta");
@@ -92,7 +92,7 @@
      * @throws DuplicateAnimationException in case the animation was not unique
      */
     public void addAnimationObject(final String animName, final String list, @Nullable final String path) throws DuplicateAnimationException {
-        final E animationObject;
+        final AnimationObject animationObject;
         if (path == null) {
             final String animPath = animMap.get(animName);
             animationObject = newAnimationObject(animName, list, animPath == null ? "/" + animName : animPath);
@@ -113,8 +113,8 @@
      * @return the anmation object instance
      */
     @NotNull
-    protected E newAnimationObject(@NotNull final String animName, @NotNull final String animList, @Nullable final String path) {
-        return (E) new DefaultAnimationObject(animName, animList, path);
+    private static AnimationObject newAnimationObject(@NotNull final String animName, @NotNull final String animList, @Nullable final String path) {
+        return new DefaultAnimationObject(animName, animList, path);
     }
 
     /** {@inheritDoc} */


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




Thread: [Gridarta-commit] SF.net SVN: gridarta:[5674] trunk (Page 25)

gridarta-commit