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

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

Revision: 4891
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4891&view=rev
Author:   akirschbaum
Date:     2008-08-16 12:45:52 +0000 (Sat, 16 Aug 2008)

Log Message:
-----------
Remove unused type parameter.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/src/app/net/sf/gridarta/gui/MainView.java
    trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-16 12:42:31 UTC (rev 4890)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-16 12:45:52 UTC (rev 4891)
@@ -159,7 +159,7 @@
     public static final boolean PREFS_SYSTEM_EXIT_DEFAULT = true;
 
     /** The object chooser. */
-    private final DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser;
+    private final DefaultObjectChooser<GameObject, MapArchObject, Archetype> objectChooser;
 
     /** The pickmap chooser control. */
     private final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl;
@@ -223,7 +223,7 @@
         createMapImageCache(CResourceLoader.getHomeFile("thumbnails"), SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, archetypeSet, faceObjects));
         mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, editTypes, mapManager, mapViewManager, ACTION_FACTORY, mapManagerActions.getCloseAllAction(), statusBar);
         final ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic> replaceDialogManager = new ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic>(mainView, archetypeSet, copyBuffer);
-        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeChooserControl, pickmapChooserControl);
+        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype>(archetypeChooserControl, pickmapChooserControl);
         final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, gameObjectAttributesDialogFactory, objectChooser, mapManager, mapViewManager, editTypes, mapTileListBottom, null, archetypeSet);
         final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView = selectedSquareControl.getSelectedSquareView();
         new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("cfeditor", gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-16 12:42:31 UTC (rev 4890)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-16 12:45:52 UTC (rev 4891)
@@ -200,7 +200,7 @@
     public static final String PREFS_APP_EDITOR_DEFAULT = "vim";
 
     /** The object chooser. */
-    private final DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser;
+    private final DefaultObjectChooser<GameObject, MapArchObject, Archetype> objectChooser;
 
     /** The pickmap chooser control. */
     private final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl;
@@ -279,7 +279,7 @@
         createMapImageCache(null, SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, archetypeSet, faceObjects));
         mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, editTypes, mapManager, mapViewManager, ACTION_FACTORY, mapManagerActions.getCloseAllAction(), statusBar);
         final ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic> replaceDialogManager = new ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic>(mainView, archetypeSet, copyBuffer);
-        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeChooserControl, pickmapChooserControl);
+        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype>(archetypeChooserControl, pickmapChooserControl);
         final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, gameObjectAttributesDialogFactory, objectChooser, mapManager, mapViewManager, editTypes, mapTileListBottom, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), archetypeSet);
         final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView = selectedSquareControl.getSelectedSquareView();
         new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("daieditor", gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);

Modified: trunk/src/app/net/sf/gridarta/gui/MainView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainView.java	2008-08-16 12:42:31 UTC (rev 4890)
+++ trunk/src/app/net/sf/gridarta/gui/MainView.java	2008-08-16 12:45:52 UTC (rev 4891)
@@ -389,7 +389,7 @@
      * @param objectChooser the object chooser
      * @param leftPanel the left panel instance
      */
-    public void init(@NotNull final Component gameObjectAttributesPanel, @NotNull final Component selectedSquareView, final ArchetypeTypeSet<G, A, R> archetypeTypeSet, final boolean mapTileListBottom, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final DefaultObjectChooser<G, A, R, V> objectChooser, @NotNull final Component leftPanel) {
+    public void init(@NotNull final Component gameObjectAttributesPanel, @NotNull final Component selectedSquareView, final ArchetypeTypeSet<G, A, R> archetypeTypeSet, final boolean mapTileListBottom, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final DefaultObjectChooser<G, A, R> objectChooser, @NotNull final Component leftPanel) {
         // calculate some default values in case there is no settings file
         final Rectangle screen = getGraphicsConfiguration().getBounds();
         final int defwidth = (int) (0.9 * screen.getWidth());

Modified: trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java	2008-08-16 12:42:31 UTC (rev 4890)
+++ trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java	2008-08-16 12:45:52 UTC (rev 4891)
@@ -30,7 +30,6 @@
 import javax.swing.event.ChangeListener;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.GameObject;
-import net.sf.gridarta.gui.map.MapViewBasic;
 import net.sf.gridarta.map.InsertionMode;
 import net.sf.gridarta.map.MapArchObject;
 import net.sf.gridarta.map.MapModel;
@@ -41,7 +40,7 @@
  * The object Chooser implementation.
  * @author Andreas Kirschbaum
  */
-public class DefaultObjectChooser<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends JPanel implements ObjectChooser<G, A, R> {
+public class DefaultObjectChooser<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JPanel implements ObjectChooser<G, A, R> {
 
     /** The serial version UID. */
     private static final long serialVersionUID = 1;


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