Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4887] trunk
|
From: <aki...@us...> - 2008-08-16 12:23:37
|
Revision: 4887
http://gridarta.svn.sourceforge.net/gridarta/?rev=4887&view=rev
Author: akirschbaum
Date: 2008-08-16 12:23:45 +0000 (Sat, 16 Aug 2008)
Log Message:
-----------
Remove ObjectChooser.setPickmapFoldersMenu().
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
trunk/src/app/net/sf/gridarta/gui/objectchooser/ObjectChooser.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-16 08:42:06 UTC (rev 4886)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-16 12:23:45 UTC (rev 4887)
@@ -318,7 +318,7 @@
final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
final LeftPanel leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod");
- mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, objectChooser, leftPanel);
+ mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
mapActions.updateMenuState();
scriptControl.getView().setMenu((JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "plugins"));
final ArchetypeParser archetypeParser = new ArchetypeParser(gridartaObjectsFactory, archetypeChooserControl, animationObjects, archetypeSet);
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-16 08:42:06 UTC (rev 4886)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-16 12:23:45 UTC (rev 4887)
@@ -374,7 +374,7 @@
ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "zoom", "gc", "onlineHelp", "tod");
ACTION_FACTORY.createToggles(true, this, "drawDouble");
ACTION_FACTORY.createAction(true, "collectSpells", this);
- mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, objectChooser, leftPanel);
+ mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
mapActions.updateMenuState();
final ArchetypeParser archetypeParser = new ArchetypeParser(archetypeChooserControl, animationObjects, archetypeSet);
gridartaObjectsFactory.init(faceObjects, archetypeChooserModel, selectedSquareView, this, mainView, editTypes, mapImageCache, mapActions, archetypeParser, archetypeSet, toolPalette);
Modified: trunk/src/app/net/sf/gridarta/gui/MainView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainView.java 2008-08-16 08:42:06 UTC (rev 4886)
+++ trunk/src/app/net/sf/gridarta/gui/MainView.java 2008-08-16 12:23:45 UTC (rev 4887)
@@ -54,6 +54,7 @@
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.ViewActions;
import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.gui.utils.GUIUtils;
import net.sf.gridarta.gui.utils.MenuUtils;
import net.sf.gridarta.map.MapArchObject;
@@ -384,10 +385,11 @@
* bottom monster objects
* @param gameObjectMatchers the game object matchers
* @param archetypeChooserControl the archetype chooser control
+ * @param pickmapChooserControl the pickmap chooser control
* @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 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, V> 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());
@@ -402,7 +404,7 @@
archetypesActions = new ArchetypesActions<G, A, R, V>(this, archetypeChooserControl, objectChooser, archetypeTypeSet);
setJMenuBar(actionFactory.createMenuBar(true, "main"));
- objectChooser.setPickmapFoldersMenu((JMenu) actionFactory.find(getJMenuBar(), "pickmapFolders"));
+ pickmapChooserControl.setPickmapFoldersMenu((JMenu) actionFactory.find(getJMenuBar(), "pickmapFolders"));
viewActions.init(gameObjectMatchers);
viewActions.setMenu((JMenu) actionFactory.find(getJMenuBar(), "view"));
Modified: trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java 2008-08-16 08:42:06 UTC (rev 4886)
+++ trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java 2008-08-16 12:23:45 UTC (rev 4887)
@@ -23,7 +23,6 @@
import java.awt.Point;
import java.util.ArrayList;
import java.util.List;
-import javax.swing.JMenu;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.SwingConstants;
@@ -134,11 +133,6 @@
return pickmapActive;
}
- /** {@inheritDoc} */
- public void setPickmapFoldersMenu(@Nullable final JMenu folderMenu) {
- pickmapChooserControl.setPickmapFoldersMenu(folderMenu);
- }
-
/**
* Returns whether a given game object matches the selection.
* @param gameObject the game object to check
Modified: trunk/src/app/net/sf/gridarta/gui/objectchooser/ObjectChooser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/objectchooser/ObjectChooser.java 2008-08-16 08:42:06 UTC (rev 4886)
+++ trunk/src/app/net/sf/gridarta/gui/objectchooser/ObjectChooser.java 2008-08-16 12:23:45 UTC (rev 4887)
@@ -21,7 +21,6 @@
import java.awt.Point;
import java.util.List;
-import javax.swing.JMenu;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.map.InsertionMode;
@@ -90,12 +89,6 @@
G insertSelectedObject(@NotNull final MapModel<G, A, R> mapModel, @NotNull Point pos, boolean allowMany, InsertionMode insertionMode);
/**
- * Sets the pickmap folders menu to manage.
- * @param folderMenu the pickmap folders menu
- */
- void setPickmapFoldersMenu(@Nullable JMenu folderMenu);
-
- /**
* Returns whether the current selection matches a given game object.
* @param gameObject the game object to match
* @return whether the game object matches the selection
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
