Menu
▾
▴
gridarta-commit
|
From: <aki...@us...> - 2008-07-10 18:11:44
|
Revision: 4284
http://gridarta.svn.sourceforge.net/gridarta/?rev=4284&view=rev
Author: akirschbaum
Date: 2008-07-10 11:11:51 -0700 (Thu, 10 Jul 2008)
Log Message:
-----------
Rename parameter name.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/ObjectChooser.java
trunk/daimonin/src/daieditor/gui/ObjectChooser.java
Modified: trunk/crossfire/src/cfeditor/gui/ObjectChooser.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/ObjectChooser.java 2008-07-10 18:11:10 UTC (rev 4283)
+++ trunk/crossfire/src/cfeditor/gui/ObjectChooser.java 2008-07-10 18:11:51 UTC (rev 4284)
@@ -94,7 +94,7 @@
}
/** {@inheritDoc} */
- public void displayObjectNamesChanged(final boolean displayObjectNamesChanged) {
+ public void displayObjectNamesChanged(final boolean displayObjectNames) {
// ignore
}
});
Modified: trunk/daimonin/src/daieditor/gui/ObjectChooser.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/ObjectChooser.java 2008-07-10 18:11:10 UTC (rev 4283)
+++ trunk/daimonin/src/daieditor/gui/ObjectChooser.java 2008-07-10 18:11:51 UTC (rev 4284)
@@ -87,7 +87,7 @@
}
/** {@inheritDoc} */
- public void displayObjectNamesChanged(final boolean displayObjectNamesChanged) {
+ public void displayObjectNamesChanged(final boolean displayObjectNames) {
// ignore
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-10 18:14:23
|
Revision: 4286
http://gridarta.svn.sourceforge.net/gridarta/?rev=4286&view=rev
Author: akirschbaum
Date: 2008-07-10 11:14:26 -0700 (Thu, 10 Jul 2008)
Log Message:
-----------
Add @Override annotations.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/ObjectChooser.java
trunk/daimonin/src/daieditor/gui/ObjectChooser.java
Modified: trunk/crossfire/src/cfeditor/gui/ObjectChooser.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/ObjectChooser.java 2008-07-10 18:13:22 UTC (rev 4285)
+++ trunk/crossfire/src/cfeditor/gui/ObjectChooser.java 2008-07-10 18:14:26 UTC (rev 4286)
@@ -136,6 +136,7 @@
}
/** {@inheritDoc} */
+ @Override
public void appExitNotify() {
prefs.putInt(ARCHPANEL_LOCATION_KEY, splitPane.getDividerLocation());
}
@@ -162,6 +163,7 @@
}
/** {@inheritDoc} */
+ @Override
public void setPickmapActive(final boolean pickmapActive) {
super.setPickmapActive(pickmapActive);
pickmapChooserControl.setActive(pickmapActive);
Modified: trunk/daimonin/src/daieditor/gui/ObjectChooser.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/ObjectChooser.java 2008-07-10 18:13:22 UTC (rev 4285)
+++ trunk/daimonin/src/daieditor/gui/ObjectChooser.java 2008-07-10 18:14:26 UTC (rev 4286)
@@ -126,6 +126,7 @@
}
/** {@inheritDoc} */
+ @Override
public void appExitNotify() {
}
@@ -151,6 +152,7 @@
}
/** {@inheritDoc} */
+ @Override
public void setPickmapActive(final boolean pickmapActive) {
super.setPickmapActive(pickmapActive);
pickmapChooserControl.setActive(pickmapActive);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-10 18:28:52
|
Revision: 4288
http://gridarta.svn.sourceforge.net/gridarta/?rev=4288&view=rev
Author: akirschbaum
Date: 2008-07-10 11:29:00 -0700 (Thu, 10 Jul 2008)
Log Message:
-----------
Move ArchNPickChangeListener to correct package.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/ObjectChooser.java
trunk/daimonin/src/daieditor/gui/ObjectChooser.java
Added Paths:
-----------
trunk/src/app/net/sf/gridarta/gui/ArchNPickChangeListener.java
Removed Paths:
-------------
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/ArchNPickChangeListener.java
Modified: trunk/crossfire/src/cfeditor/gui/ObjectChooser.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/ObjectChooser.java 2008-07-10 18:16:14 UTC (rev 4287)
+++ trunk/crossfire/src/cfeditor/gui/ObjectChooser.java 2008-07-10 18:29:00 UTC (rev 4288)
@@ -35,12 +35,12 @@
import javax.swing.SwingConstants;
import net.sf.gridarta.MainControl;
import net.sf.gridarta.gui.AbstractObjectChooser;
+import net.sf.gridarta.gui.ArchNPickChangeListener;
import net.sf.gridarta.gui.GSplitPane;
import net.sf.gridarta.gui.ObjectChoiceDisplay;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserListener;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
-import net.sf.gridarta.gui.pickmapchooser.ArchNPickChangeListener;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.japi.swing.ActionFactory;
import org.jetbrains.annotations.NotNull;
Modified: trunk/daimonin/src/daieditor/gui/ObjectChooser.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/ObjectChooser.java 2008-07-10 18:16:14 UTC (rev 4287)
+++ trunk/daimonin/src/daieditor/gui/ObjectChooser.java 2008-07-10 18:29:00 UTC (rev 4288)
@@ -31,13 +31,13 @@
import javax.swing.JTabbedPane;
import javax.swing.SwingConstants;
import net.sf.gridarta.gui.AbstractObjectChooser;
+import net.sf.gridarta.gui.ArchNPickChangeListener;
import net.sf.gridarta.gui.GSplitPane;
import net.sf.gridarta.gui.ObjectChoiceDisplay;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserListener;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
-import net.sf.gridarta.gui.pickmapchooser.ArchNPickChangeListener;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.japi.swing.ActionFactory;
import org.jetbrains.annotations.NotNull;
Copied: trunk/src/app/net/sf/gridarta/gui/ArchNPickChangeListener.java (from rev 4278, trunk/src/app/net/sf/gridarta/gui/pickmapchooser/ArchNPickChangeListener.java)
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ArchNPickChangeListener.java (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/ArchNPickChangeListener.java 2008-07-10 18:29:00 UTC (rev 4288)
@@ -0,0 +1,61 @@
+/*
+ * 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.gui;
+
+import javax.swing.JTabbedPane;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * In the left-side panel, archlist and pickmaps are exclusive (only the one
+ * being displayed is active). This listener gets to know which of them is
+ * active and keeps the object chooser informed whenever the state changes.
+ * @author Andreas Kirschbaum
+ */
+public final class ArchNPickChangeListener implements ChangeListener {
+
+ /** The Object Chooser to inform about changes. */
+ private final ObjectChooser<?, ?, ?, ?> objectChooser;
+
+ private final JTabbedPane tabpane; // parent pane for archlist & pickmaps
+
+ private int selectedIndex; // current state of selection
+
+ /**
+ * Create an ArchNPickChangeListener.
+ * @param objectChooser The Object Chooser to inform about changes.
+ * @param pane the JTabbedPane containing both archlist and pickmaps
+ */
+ public ArchNPickChangeListener(@NotNull final ObjectChooser<?, ?, ?, ?> objectChooser, @NotNull final JTabbedPane pane) {
+ this.objectChooser = objectChooser;
+ tabpane = pane;
+ selectedIndex = tabpane.getSelectedIndex();
+ }
+
+ public void stateChanged(final ChangeEvent e) {
+ if (tabpane.getSelectedIndex() != selectedIndex) {
+ // the state has changed, user has switched panels
+ objectChooser.setPickmapActive(tabpane.getSelectedIndex() != 0);
+ selectedIndex = tabpane.getSelectedIndex(); // save new state
+ }
+ }
+
+} // class ArchNPickChangeListener
Property changes on: trunk/src/app/net/sf/gridarta/gui/ArchNPickChangeListener.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Deleted: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/ArchNPickChangeListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/ArchNPickChangeListener.java 2008-07-10 18:16:14 UTC (rev 4287)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/ArchNPickChangeListener.java 2008-07-10 18:29:00 UTC (rev 4288)
@@ -1,62 +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.gui.pickmapchooser;
-
-import javax.swing.JTabbedPane;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import net.sf.gridarta.gui.ObjectChooser;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * In the left-side panel, archlist and pickmaps are exclusive (only the one
- * being displayed is active). This listener gets to know which of them is
- * active and keeps the object chooser informed whenever the state changes.
- * @author Andreas Kirschbaum
- */
-public final class ArchNPickChangeListener implements ChangeListener {
-
- /** The Object Chooser to inform about changes. */
- private final ObjectChooser<?, ?, ?, ?> objectChooser;
-
- private final JTabbedPane tabpane; // parent pane for archlist & pickmaps
-
- private int selectedIndex; // current state of selection
-
- /**
- * Create an ArchNPickChangeListener.
- * @param objectChooser The Object Chooser to inform about changes.
- * @param pane the JTabbedPane containing both archlist and pickmaps
- */
- public ArchNPickChangeListener(@NotNull final ObjectChooser<?, ?, ?, ?> objectChooser, @NotNull final JTabbedPane pane) {
- this.objectChooser = objectChooser;
- tabpane = pane;
- selectedIndex = tabpane.getSelectedIndex();
- }
-
- public void stateChanged(final ChangeEvent e) {
- if (tabpane.getSelectedIndex() != selectedIndex) {
- // the state has changed, user has switched panels
- objectChooser.setPickmapActive(tabpane.getSelectedIndex() != 0);
- selectedIndex = tabpane.getSelectedIndex(); // save new state
- }
- }
-
-} // class ArchNPickChangeListener
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-10 18:37:54
|
Revision: 4289
http://gridarta.svn.sourceforge.net/gridarta/?rev=4289&view=rev
Author: akirschbaum
Date: 2008-07-10 11:38:02 -0700 (Thu, 10 Jul 2008)
Log Message:
-----------
Remove dependency PickmapChooserControl to ObjectChooser.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/ObjectChooser.java
trunk/daimonin/src/daieditor/gui/ObjectChooser.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapSelectionListener.java
Added Paths:
-----------
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserListener.java
Modified: trunk/crossfire/src/cfeditor/gui/ObjectChooser.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/ObjectChooser.java 2008-07-10 18:29:00 UTC (rev 4288)
+++ trunk/crossfire/src/cfeditor/gui/ObjectChooser.java 2008-07-10 18:38:02 UTC (rev 4289)
@@ -42,6 +42,7 @@
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserListener;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserListener;
import net.sf.japi.swing.ActionFactory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -79,6 +80,18 @@
private final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl;
/**
+ * The listener attached to {@link #pickmapChooserControl}.
+ */
+ private final PickmapChooserListener pickmapChooserListener = new PickmapChooserListener() {
+
+ /** {@inheritDoc} */
+ public void activePickmapChanged() {
+ showObjectChooserQuickObject(null);
+ }
+
+ };
+
+ /**
* Build Panel.
* @param newMapDialogFactory the factory for creating new pickmaps
* @param mainControl CMainControl
@@ -87,7 +100,7 @@
*/
public ObjectChooser(@NotNull final NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapDialogFactory, final CMainControl mainControl, @NotNull final File pickmapDir, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl) {
super(archetypeChooserControl);
- pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, mainControl, this, pickmapDir);
+ pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, mainControl, pickmapChooserListener, pickmapDir);
archetypeChooserControl.addArchetypeChooserListener(new ArchetypeChooserListener<GameObject, MapArchObject, Archetype>() {
/** {@inheritDoc} */
public void selectedArchetypeChanged(@NotNull final GameObject archetype) {
Modified: trunk/daimonin/src/daieditor/gui/ObjectChooser.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/ObjectChooser.java 2008-07-10 18:29:00 UTC (rev 4288)
+++ trunk/daimonin/src/daieditor/gui/ObjectChooser.java 2008-07-10 18:38:02 UTC (rev 4289)
@@ -39,6 +39,7 @@
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserListener;
import net.sf.japi.swing.ActionFactory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -71,6 +72,18 @@
private final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl;
/**
+ * The listener attached to {@link #pickmapChooserControl}.
+ */
+ private final PickmapChooserListener pickmapChooserListener = new PickmapChooserListener() {
+
+ /** {@inheritDoc} */
+ public void activePickmapChanged() {
+ showObjectChooserQuickObject(null);
+ }
+
+ };
+
+ /**
* Build Panel.
* @param newMapDialogFactory the factory for creating new pickmaps
* @param mainControl CMainControl
@@ -79,7 +92,7 @@
*/
public ObjectChooser(@NotNull final NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapDialogFactory, final CMainControl mainControl, @NotNull final File pickmapDir, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl) {
super(archetypeChooserControl);
- pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, mainControl, this, pickmapDir);
+ pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, mainControl, pickmapChooserListener, pickmapDir);
archetypeChooserControl.addArchetypeChooserListener(new ArchetypeChooserListener<GameObject, MapArchObject, Archetype>() {
/** {@inheritDoc} */
public void selectedArchetypeChanged(@NotNull final GameObject archetype) {
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java 2008-07-10 18:29:00 UTC (rev 4288)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java 2008-07-10 18:38:02 UTC (rev 4289)
@@ -31,7 +31,6 @@
import net.sf.gridarta.MainControl;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
-import net.sf.gridarta.gui.ObjectChooser;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.map.MapArchObject;
@@ -80,17 +79,17 @@
* Create a PickmapChooserControl.
* @param newMapDialogFactory the factory for creating new pickmaps
* @param mainControl the main control
- * @param objectChooser the object chooser
+ * @param pickmapChooserListener the listener to notify
* @param pickmapDir the pickmaps directory
*/
- public PickmapChooserControl(@NotNull final NewMapDialogFactory<G, A, R, V> newMapDialogFactory, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final ObjectChooser<G, A, R, V> objectChooser, @NotNull final File pickmapDir) {
+ public PickmapChooserControl(@NotNull final NewMapDialogFactory<G, A, R, V> newMapDialogFactory, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final PickmapChooserListener pickmapChooserListener, @NotNull final File pickmapDir) {
this.mainControl = mainControl;
model = new Model<G, A, R, V>(pickmapDir);
currentPickmapActions = new CurrentPickmapActions<G, A, R, V>(newMapDialogFactory, this);
folderListActions = new FolderListActions<G, A, R, V>(model, newMapDialogFactory);
view = new PickmapChooserView<G, A, R, V>(model, currentPickmapActions);
currentPickmapActions.init();
- view.addChangeListener(new PickmapSelectionListener<G, A, R, V>(view, currentPickmapActions, objectChooser));
+ view.addChangeListener(new PickmapSelectionListener<G, A, R, V>(view, currentPickmapActions, pickmapChooserListener));
}
/**
Added: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserListener.java (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserListener.java 2008-07-10 18:38:02 UTC (rev 4289)
@@ -0,0 +1,33 @@
+/*
+ * 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.gui.pickmapchooser;
+
+/**
+ * Interface for listeners for pickmap related events.
+ * @author Andreas Kirschbaum
+ */
+public interface PickmapChooserListener {
+
+ /**
+ * Notifies that the active pickmap has changed.
+ */
+ void activePickmapChanged();
+
+} // interface PickmapChooserListener
Property changes on: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserListener.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapSelectionListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapSelectionListener.java 2008-07-10 18:29:00 UTC (rev 4288)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapSelectionListener.java 2008-07-10 18:38:02 UTC (rev 4289)
@@ -23,7 +23,6 @@
import javax.swing.event.ChangeListener;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
-import net.sf.gridarta.gui.ObjectChooser;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
@@ -45,19 +44,19 @@
/** The insertion object chooser this instance if part of. */
@NotNull
- private final ObjectChooser<G, A, R, V> objectChooser;
+ private final PickmapChooserListener pickmapChooserListener;
/**
* Creates a new instance.
* @param view the associated view
* @param currentPickmapActions the actions
- * @param objectChooser the insertion object chooser this instance if part
+ * @param pickmapChooserListener the listener to notify of changes
* of
*/
- public PickmapSelectionListener(@NotNull final PickmapChooserView<G, A, R, V> view, @NotNull final CurrentPickmapActions<G, A, R, V> currentPickmapActions, @NotNull final ObjectChooser<G, A, R, V> objectChooser) {
+ public PickmapSelectionListener(@NotNull final PickmapChooserView<G, A, R, V> view, @NotNull final CurrentPickmapActions<G, A, R, V> currentPickmapActions, @NotNull final PickmapChooserListener pickmapChooserListener) {
this.view = view;
this.currentPickmapActions = currentPickmapActions;
- this.objectChooser = objectChooser;
+ this.pickmapChooserListener = pickmapChooserListener;
}
/** {@inheritDoc} */
@@ -68,7 +67,7 @@
if (mapControl != null) {
mapControl.getMapViewFrame().getView().unHighlight();
}
- objectChooser.showObjectChooserQuickObject(null); // send it to quick view
+ pickmapChooserListener.activePickmapChanged();
}
} // class PickmapSelectionListener
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-10 19:17:26
|
Revision: 4290
http://gridarta.svn.sourceforge.net/gridarta/?rev=4290&view=rev
Author: akirschbaum
Date: 2008-07-10 12:17:30 -0700 (Thu, 10 Jul 2008)
Log Message:
-----------
Remove dependency MapControl to PickmapChooserControl.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/gui/ObjectChooser.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/gui/ObjectChooser.java
trunk/src/app/net/sf/gridarta/AbstractMainControl.java
trunk/src/app/net/sf/gridarta/CurrentMapListener.java
trunk/src/app/net/sf/gridarta/gui/map/MapView.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/CurrentPickmapActions.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java
trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java
trunk/src/app/net/sf/gridarta/map/MapControlListener.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-10 18:38:02 UTC (rev 4289)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-10 19:17:30 UTC (rev 4290)
@@ -235,7 +235,7 @@
globalSettings.readGlobalSettings();
PathManager.setGlobalSettings(globalSettings);
final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, false);
- objectChooser = new ObjectChooser(newMapDialogFactory, this, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR), archetypeChooserControl);
+ objectChooser = new ObjectChooser(newMapDialogFactory, this, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR), archetypeChooserControl, mapManager);
mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, animationObjects, ACTION_FACTORY, faceObjects, objectChooser);
getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl);
mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), faceObjects);
Modified: trunk/crossfire/src/cfeditor/gui/ObjectChooser.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/ObjectChooser.java 2008-07-10 18:38:02 UTC (rev 4289)
+++ trunk/crossfire/src/cfeditor/gui/ObjectChooser.java 2008-07-10 19:17:30 UTC (rev 4290)
@@ -34,6 +34,7 @@
import javax.swing.JTabbedPane;
import javax.swing.SwingConstants;
import net.sf.gridarta.MainControl;
+import net.sf.gridarta.MapManager;
import net.sf.gridarta.gui.AbstractObjectChooser;
import net.sf.gridarta.gui.ArchNPickChangeListener;
import net.sf.gridarta.gui.GSplitPane;
@@ -97,10 +98,11 @@
* @param mainControl CMainControl
* @param pickmapDir the pickmaps directory
* @param archetypeChooserControl the archetype chooser control
+ * @param mapManager the map manager instance
*/
- public ObjectChooser(@NotNull final NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapDialogFactory, final CMainControl mainControl, @NotNull final File pickmapDir, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl) {
+ public ObjectChooser(@NotNull final NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapDialogFactory, final CMainControl mainControl, @NotNull final File pickmapDir, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager) {
super(archetypeChooserControl);
- pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, mainControl, pickmapChooserListener, pickmapDir);
+ pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, mainControl, pickmapChooserListener, pickmapDir, mapManager);
archetypeChooserControl.addArchetypeChooserListener(new ArchetypeChooserListener<GameObject, MapArchObject, Archetype>() {
/** {@inheritDoc} */
public void selectedArchetypeChanged(@NotNull final GameObject archetype) {
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-07-10 18:38:02 UTC (rev 4289)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-07-10 19:17:30 UTC (rev 4290)
@@ -288,7 +288,7 @@
globalSettings.readGlobalSettings();
PathManager.setGlobalSettings(globalSettings);
final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, true);
- objectChooser = new ObjectChooser(newMapDialogFactory, this, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR), archetypeChooserControl);
+ objectChooser = new ObjectChooser(newMapDialogFactory, this, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR), archetypeChooserControl, mapManager);
mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, animationObjects, ACTION_FACTORY, faceObjects, objectChooser);
getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl);
mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), faceObjects);
Modified: trunk/daimonin/src/daieditor/gui/ObjectChooser.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/ObjectChooser.java 2008-07-10 18:38:02 UTC (rev 4289)
+++ trunk/daimonin/src/daieditor/gui/ObjectChooser.java 2008-07-10 19:17:30 UTC (rev 4290)
@@ -30,6 +30,7 @@
import javax.swing.JSplitPane;
import javax.swing.JTabbedPane;
import javax.swing.SwingConstants;
+import net.sf.gridarta.MapManager;
import net.sf.gridarta.gui.AbstractObjectChooser;
import net.sf.gridarta.gui.ArchNPickChangeListener;
import net.sf.gridarta.gui.GSplitPane;
@@ -89,10 +90,11 @@
* @param mainControl CMainControl
* @param pickmapDir the pickmaps directory
* @param archetypeChooserControl the archetype chooser control
+ * @param mapManager the map manager instance
*/
- public ObjectChooser(@NotNull final NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapDialogFactory, final CMainControl mainControl, @NotNull final File pickmapDir, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl) {
+ public ObjectChooser(@NotNull final NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapDialogFactory, final CMainControl mainControl, @NotNull final File pickmapDir, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager) {
super(archetypeChooserControl);
- pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, mainControl, pickmapChooserListener, pickmapDir);
+ pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, mainControl, pickmapChooserListener, pickmapDir, mapManager);
archetypeChooserControl.addArchetypeChooserListener(new ArchetypeChooserListener<GameObject, MapArchObject, Archetype>() {
/** {@inheritDoc} */
public void selectedArchetypeChanged(@NotNull final GameObject archetype) {
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-07-10 18:38:02 UTC (rev 4289)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-07-10 19:17:30 UTC (rev 4290)
@@ -89,7 +89,7 @@
private final AutojoinLists<G, A, R> autojoinLists = new AutojoinLists<G, A, R>();
/** The map manager. */
- private final MapManager<G, A, R, V> mapManager;
+ protected final MapManager<G, A, R, V> mapManager;
/** The updater instance. */
protected UpdaterManager updaterManager = null;
Modified: trunk/src/app/net/sf/gridarta/CurrentMapListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/CurrentMapListener.java 2008-07-10 18:38:02 UTC (rev 4289)
+++ trunk/src/app/net/sf/gridarta/CurrentMapListener.java 2008-07-10 19:17:30 UTC (rev 4290)
@@ -25,6 +25,7 @@
import net.sf.gridarta.gui.map.MapCursorListener;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.MapViewBasic;
+import net.sf.gridarta.map.DefaultMapControl;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapControlListener;
@@ -111,6 +112,11 @@
// ignore
}
+ /** {@inheritDoc} */
+ public void saved(final DefaultMapControl<G, A, R, V> mapControl) {
+ // ignore
+ }
+
};
/**
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapView.java 2008-07-10 18:38:02 UTC (rev 4289)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapView.java 2008-07-10 19:17:30 UTC (rev 4290)
@@ -32,6 +32,7 @@
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.MenuHelper;
import net.sf.gridarta.io.PathManager;
+import net.sf.gridarta.map.DefaultMapControl;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapControlListener;
@@ -130,6 +131,11 @@
updateFrameIcon();
}
+ /** {@inheritDoc} */
+ public void saved(final DefaultMapControl<G, A, R, V> mapControl) {
+ // ignore
+ }
+
};
/**
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/CurrentPickmapActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/CurrentPickmapActions.java 2008-07-10 18:38:02 UTC (rev 4289)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/CurrentPickmapActions.java 2008-07-10 19:17:30 UTC (rev 4290)
@@ -26,6 +26,7 @@
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
+import net.sf.gridarta.map.DefaultMapControl;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapControlListener;
@@ -105,6 +106,11 @@
// ignore
}
+ /** {@inheritDoc} */
+ public void saved(final DefaultMapControl<G, A, R, V> mapControl) {
+ // ignore
+ }
+
};
/**
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java 2008-07-10 18:38:02 UTC (rev 4289)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java 2008-07-10 19:17:30 UTC (rev 4290)
@@ -29,12 +29,17 @@
import javax.swing.JOptionPane;
import javax.swing.JTabbedPane;
import net.sf.gridarta.MainControl;
+import net.sf.gridarta.MapManager;
+import net.sf.gridarta.MapManagerListener;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
+import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
+import net.sf.gridarta.map.DefaultMapControl;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
+import net.sf.gridarta.map.MapControlListener;
import net.sf.japi.swing.ActionFactory;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
@@ -76,13 +81,86 @@
private final FolderListActions<G, A, R, V> folderListActions;
/**
+ * The map control listener attached to all pickmaps.
+ */
+ private final MapControlListener<G, A, R, V> mapControlListener = new MapControlListener<G, A, R, V>() {
+
+ /** {@inheritDoc} */
+ public void modifiedChanged(@NotNull final MapControl<G, A, R, V> mapControl) {
+ // ignore
+ }
+
+ /** {@inheritDoc} */
+ public void mapFileNameChanged(@NotNull final MapControl<G, A, R, V> mapControl) {
+ // ignore
+ }
+
+ /** {@inheritDoc} */
+ public void iconChanged(@NotNull final MapControl<G, A, R, V> mapControl) {
+ // ignore
+ }
+
+ /** {@inheritDoc} */
+ public void saved(final DefaultMapControl<G, A, R, V> mapControl) {
+ /*
+ * If we open a pickmap in the editor, is handled as normal map.
+ * to find out its original a pickmap we check the file name.
+ */
+ reloadPickmap(mapControl.getMapFile());
+ }
+
+ };
+
+ /**
+ * The {@link MapManagerListener} to track existing pickmaps.
+ */
+ private final MapManagerListener<G, A, R, V> mapManagerListener = new MapManagerListener<G, A, R, V>() {
+
+ /** {@inheritDoc} */
+ public void currentMapChanged(@Nullable final MapControl<G, A, R, V> mapControl) {
+ // ignore
+ }
+
+ /** {@inheritDoc} */
+ public void currentMapViewChanged(@Nullable final MapView<G, A, R, V> mapView) {
+ // ignore
+ }
+
+ /** {@inheritDoc} */
+ public void mapCreated(@NotNull final MapControl<G, A, R, V> mapControl) {
+ if (!mapControl.isPickmap()) {
+ mapControl.addMapControlListener(mapControlListener);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public void mapViewCreated(@NotNull final MapView<G, A, R, V> mapView) {
+ // ignore
+ }
+
+ /** {@inheritDoc} */
+ public void mapClosing(@NotNull final MapControl<G, A, R, V> mapControl) {
+ if (!mapControl.isPickmap()) {
+ mapControl.removeMapControlListener(mapControlListener);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public void mapViewClosing(@NotNull final MapView<G, A, R, V> mapView) {
+ // ignore
+ }
+
+ };
+
+ /**
* Create a PickmapChooserControl.
* @param newMapDialogFactory the factory for creating new pickmaps
* @param mainControl the main control
* @param pickmapChooserListener the listener to notify
* @param pickmapDir the pickmaps directory
+ * @param mapManager the map manager instance
*/
- public PickmapChooserControl(@NotNull final NewMapDialogFactory<G, A, R, V> newMapDialogFactory, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final PickmapChooserListener pickmapChooserListener, @NotNull final File pickmapDir) {
+ public PickmapChooserControl(@NotNull final NewMapDialogFactory<G, A, R, V> newMapDialogFactory, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final PickmapChooserListener pickmapChooserListener, @NotNull final File pickmapDir, @NotNull final MapManager<G, A, R, V> mapManager) {
this.mainControl = mainControl;
model = new Model<G, A, R, V>(pickmapDir);
currentPickmapActions = new CurrentPickmapActions<G, A, R, V>(newMapDialogFactory, this);
@@ -90,6 +168,7 @@
view = new PickmapChooserView<G, A, R, V>(model, currentPickmapActions);
currentPickmapActions.init();
view.addChangeListener(new PickmapSelectionListener<G, A, R, V>(view, currentPickmapActions, pickmapChooserListener));
+ mapManager.addMapManagerListener(mapManagerListener);
}
/**
@@ -167,7 +246,7 @@
* Reload a pickmap. Does nothing if the given file is unknown.
* @param file The file of the pickmap.
*/
- public void reloadPickmap(@NotNull final File file) {
+ private void reloadPickmap(@NotNull final File file) {
final Pickmap<G, A, R, V> pickmap = view.getPickmap(file);
if (pickmap != null) {
try {
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java 2008-07-10 18:38:02 UTC (rev 4289)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java 2008-07-10 19:17:30 UTC (rev 4290)
@@ -32,6 +32,7 @@
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.map.MapViewBasic;
+import net.sf.gridarta.map.DefaultMapControl;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapControlListener;
@@ -158,6 +159,11 @@
// ignore
}
+ /** {@inheritDoc} */
+ public void saved(final DefaultMapControl<G, A, R, V> mapControl) {
+ // ignore
+ }
+
};
/**
Modified: trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java 2008-07-10 18:38:02 UTC (rev 4289)
+++ trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java 2008-07-10 19:17:30 UTC (rev 4290)
@@ -226,6 +226,13 @@
}
}
+ /** Fires a saved event. */
+ private void fireSaved() {
+ for (final MapControlListener<G, A, R, V> listener : listenerList.getListeners(MapControlListener.class)) {
+ listener.saved(this);
+ }
+ }
+
/** {@inheritDoc} */
public void insertMapArchToPickmap(@NotNull final Point pos) {
final MapControl<G, A, R, V> currentMap = mainControl.getMapManager().getCurrentMap();
@@ -429,13 +436,8 @@
if (!encodeMapFile(mapFile)) {
return;
}
- /* if we open a pickmap in the editor, is handled as normal map.
- * to find out its original a pickmap we check the file name.
- */
- if (!isPickmap()) {
- mainControl.getObjectChooser().getPickmapChooserControl().reloadPickmap(mapFile);
- }
resetModified();
+ fireSaved();
}
/** {@inheritDoc} */
Modified: trunk/src/app/net/sf/gridarta/map/MapControlListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/MapControlListener.java 2008-07-10 18:38:02 UTC (rev 4289)
+++ trunk/src/app/net/sf/gridarta/map/MapControlListener.java 2008-07-10 19:17:30 UTC (rev 4290)
@@ -50,4 +50,10 @@
*/
void iconChanged(@NotNull MapControl<G, A, R, V> mapControl);
+ /**
+ * The map file has been saved.
+ * @param mapControl the map control that has been saved
+ */
+ void saved(DefaultMapControl<G, A, R, V> mapControl);
+
} // interface MapControlListener
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-10 20:15:44
|
Revision: 4291
http://gridarta.svn.sourceforge.net/gridarta/?rev=4291&view=rev
Author: akirschbaum
Date: 2008-07-10 13:15:46 -0700 (Thu, 10 Jul 2008)
Log Message:
-----------
Remove ObjectChooser.getPickmapChooserControl().
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
trunk/crossfire/src/cfeditor/gui/ObjectChooser.java
trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
trunk/daimonin/src/daieditor/gui/ObjectChooser.java
trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/gui/map/MapUserListener.java
trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java
trunk/src/app/net/sf/gridarta/gui/AbstractObjectChooser.java
trunk/src/app/net/sf/gridarta/gui/MainActions.java
trunk/src/app/net/sf/gridarta/gui/ObjectChooser.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapDialog.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapSelectionListener.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -76,6 +76,7 @@
import net.sf.gridarta.gui.map.MapCursorControl;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
import net.sf.gridarta.gui.prefs.MiscPrefs;
import net.sf.gridarta.gui.prefs.UpdatePrefs;
@@ -156,6 +157,9 @@
/** The object chooser. */
private final ObjectChooser objectChooser;
+ /** The pickmap chooser control. */
+ private final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl;
+
/** The main view. */
private final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView;
@@ -217,7 +221,7 @@
private final CFilterControl filterControl;
/** The factory for creating new maps or pickmaps. */
- private final NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, 0, false, false, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
+ private final NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapDialogFactory;
/**
* Constructs the main controller and its model and view.
@@ -235,9 +239,12 @@
globalSettings.readGlobalSettings();
PathManager.setGlobalSettings(globalSettings);
final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, false);
- objectChooser = new ObjectChooser(newMapDialogFactory, this, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR), archetypeChooserControl, mapManager);
- mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, animationObjects, ACTION_FACTORY, faceObjects, objectChooser);
- getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl);
+ newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, 0, false, false, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
+ pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR), mapManager);
+ newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
+ objectChooser = new ObjectChooser(this, archetypeChooserControl, mapManager, pickmapChooserControl);
+ mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser);
+ getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl, pickmapChooserControl);
mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), faceObjects);
new About("cfeditor", mainView);
undoControl = new UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager());
@@ -350,8 +357,8 @@
log.info("Arch loading took " + (System.currentTimeMillis() - timeStart) / 1000.0 + " Seconds");
}
- objectChooser.getPickmapChooserControl().loadPickmaps();
- if (!objectChooser.getPickmapChooserControl().isEmpty()) {
+ pickmapChooserControl.loadPickmaps();
+ if (!pickmapChooserControl.isEmpty()) {
objectChooser.movePickmapChooserToFront();
}
}
@@ -697,7 +704,7 @@
/** Invoked when user wants to exit from the program. */
public void exit() {
- if (ScriptEditControlInstance.getInstance().closeAllTabs() && getMapManager().closeAll() && objectChooser.getPickmapChooserControl().canExit() && scriptControl.canExit()) {
+ if (ScriptEditControlInstance.getInstance().closeAllTabs() && getMapManager().closeAll() && pickmapChooserControl.canExit() && scriptControl.canExit()) {
doExit();
}
}
Modified: trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
===================================================================
--- trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -42,6 +42,7 @@
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapView;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.io.DefaultMapReader;
import net.sf.gridarta.io.MapReader;
import net.sf.gridarta.map.DefaultMapControl;
@@ -73,6 +74,10 @@
@NotNull
private ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = null;
+ /** The {@link PickmapChooserControl} instance to use. */
+ @NotNull
+ private PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl = null;
+
/** {@inheritDoc} */
@NotNull
public GameObject newGameObject() {
@@ -132,14 +137,15 @@
/** {@inheritDoc} */
@NotNull
public MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapView(@NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point viewPosition, final int viewCounter) {
- return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>((MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic>) (MainControl) AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects, objectChooser), ACTION_FACTORY);
+ return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>((MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic>) (MainControl) AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects, objectChooser, pickmapChooserControl), ACTION_FACTORY);
}
/** {@inheritDoc} */
- public void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl) {
+ public void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl) {
this.faceObjects = faceObjects;
this.objectChooser = objectChooser;
this.archetypeChooserControl = archetypeChooserControl;
+ this.pickmapChooserControl = pickmapChooserControl;
}
} // class CrossfireObjectsFactory
Modified: trunk/crossfire/src/cfeditor/gui/ObjectChooser.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/ObjectChooser.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/crossfire/src/cfeditor/gui/ObjectChooser.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -27,7 +27,6 @@
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.Toolkit;
-import java.io.File;
import java.util.List;
import java.util.prefs.Preferences;
import javax.swing.JSplitPane;
@@ -41,7 +40,6 @@
import net.sf.gridarta.gui.ObjectChoiceDisplay;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserListener;
-import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserListener;
import net.sf.japi.swing.ActionFactory;
@@ -77,9 +75,6 @@
/** The data/view of selected objects in tab panel. */
private final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay;
- /** The pickmap chooser control. */
- private final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl;
-
/**
* The listener attached to {@link #pickmapChooserControl}.
*/
@@ -94,15 +89,13 @@
/**
* Build Panel.
- * @param newMapDialogFactory the factory for creating new pickmaps
* @param mainControl CMainControl
- * @param pickmapDir the pickmaps directory
* @param archetypeChooserControl the archetype chooser control
* @param mapManager the map manager instance
+ * @param pickmapChooserControl the pickmap chooser control
*/
- public ObjectChooser(@NotNull final NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapDialogFactory, final CMainControl mainControl, @NotNull final File pickmapDir, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager) {
- super(archetypeChooserControl);
- pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, mainControl, pickmapChooserListener, pickmapDir, mapManager);
+ public ObjectChooser(final CMainControl mainControl, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl) {
+ super(archetypeChooserControl, pickmapChooserControl);
archetypeChooserControl.addArchetypeChooserListener(new ArchetypeChooserListener<GameObject, MapArchObject, Archetype>() {
/** {@inheritDoc} */
public void selectedArchetypeChanged(@NotNull final GameObject archetype) {
@@ -168,15 +161,6 @@
return isPickmapActive() ? pickmapChooserControl.getSelections() : archetypeChooserControl.getSelections();
}
- /**
- * Return the pickmap chooser control.
- * @return the pickmap chooser control
- */
- @NotNull
- public PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> getPickmapChooserControl() {
- return pickmapChooserControl;
- }
-
/** {@inheritDoc} */
@Override
public void setPickmapActive(final boolean pickmapActive) {
Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -35,6 +35,7 @@
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
import net.sf.gridarta.gui.map.MapViewBasic;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapModel;
import net.sf.gridarta.map.MapModelEvent;
@@ -95,8 +96,9 @@
* corner
* @param faceObjects the FaceObjects instance to use
* @param objectChooser the ObjectChooser instance to use
+ * @param pickmapChooserControl the pickmap chooser control instance to use
*/
- public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser) {
+ public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl) {
super(mapControl);
this.mapControl = mapControl;
mapModel = mapControl.getMapModel();
@@ -120,7 +122,7 @@
getViewport().setViewPosition(initial);
}
- mapUserListener = new MapUserListener(mainControl, mapControl, this, objectChooser, mainControl.getSelectedSquareControl().getSelectedSquareView(), objectChooser.getPickmapChooserControl());
+ mapUserListener = new MapUserListener(mainControl, mapControl, this, objectChooser, mainControl.getSelectedSquareControl().getSelectedSquareView(), pickmapChooserControl);
renderer.addMouseListener(mapUserListener);
renderer.addMouseMotionListener(mapUserListener);
renderer.setErroneousMapSquares(erroneousMapSquares);
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -83,6 +83,7 @@
import net.sf.gridarta.gui.map.MapCursorControl;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
import net.sf.gridarta.gui.prefs.MiscPrefs;
import net.sf.gridarta.gui.prefs.UpdatePrefs;
@@ -192,6 +193,9 @@
/** The object chooser. */
private final ObjectChooser objectChooser;
+ /** The pickmap chooser control. */
+ private final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl;
+
/** The main view. */
private final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView;
@@ -269,7 +273,7 @@
private final AutoValidator<GameObject, MapArchObject, Archetype, CMapViewBasic> autoValidator;
/** The factory for creating new maps or pickmaps. */
- private final NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPDIFFICULTY, true, true, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
+ private final NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapDialogFactory;
/**
* Constructs the main controller and its model and view.
@@ -288,9 +292,12 @@
globalSettings.readGlobalSettings();
PathManager.setGlobalSettings(globalSettings);
final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, true);
- objectChooser = new ObjectChooser(newMapDialogFactory, this, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR), archetypeChooserControl, mapManager);
- mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, animationObjects, ACTION_FACTORY, faceObjects, objectChooser);
- getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl);
+ newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPDIFFICULTY, true, true, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
+ pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR), mapManager);
+ newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
+ objectChooser = new ObjectChooser(this, archetypeChooserControl, mapManager, pickmapChooserControl);
+ mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser);
+ getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl, pickmapChooserControl);
mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), faceObjects);
new About("daieditor", mainView);
undoControl = new UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager());
@@ -420,8 +427,8 @@
log.info("Arch loading took " + (System.currentTimeMillis() - timeStart) / 1000.0 + " Seconds");
}
- objectChooser.getPickmapChooserControl().loadPickmaps();
- if (!objectChooser.getPickmapChooserControl().isEmpty()) {
+ pickmapChooserControl.loadPickmaps();
+ if (!pickmapChooserControl.isEmpty()) {
objectChooser.movePickmapChooserToFront();
}
}
@@ -885,7 +892,7 @@
/** Invoked when user wants to exit from the program. */
public void exit() {
- if (ScriptEditControlInstance.getInstance().closeAllTabs() && getMapManager().closeAll() && objectChooser.getPickmapChooserControl().canExit()) {
+ if (ScriptEditControlInstance.getInstance().closeAllTabs() && getMapManager().closeAll() && pickmapChooserControl.canExit()) {
doExit();
}
}
Modified: trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
===================================================================
--- trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -42,6 +42,7 @@
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapView;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.io.DefaultMapReader;
import net.sf.gridarta.io.MapReader;
import net.sf.gridarta.map.DefaultMapControl;
@@ -73,6 +74,10 @@
@NotNull
private ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = null;
+ /** The {@link PickmapChooserControl} instance to use. */
+ @NotNull
+ private PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl = null;
+
/** {@inheritDoc} */
@NotNull
public GameObject newGameObject() {
@@ -134,14 +139,15 @@
/** {@inheritDoc} */
@NotNull
public MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapView(@NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point viewPosition, final int viewCounter) {
- return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>((MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic>) (MainControl) AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects), ACTION_FACTORY);
+ return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>((MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic>) (MainControl) AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects, pickmapChooserControl), ACTION_FACTORY);
}
/** {@inheritDoc} */
- public void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl) {
+ public void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl) {
this.faceObjects = faceObjects;
this.objectChooser = objectChooser;
this.archetypeChooserControl = archetypeChooserControl;
+ this.pickmapChooserControl = pickmapChooserControl;
}
} // class DaimoninObjectsFactory
Modified: trunk/daimonin/src/daieditor/gui/ObjectChooser.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/ObjectChooser.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/daimonin/src/daieditor/gui/ObjectChooser.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -25,7 +25,6 @@
import daieditor.gui.map.CMapViewBasic;
import daieditor.map.MapArchObject;
import java.awt.BorderLayout;
-import java.io.File;
import java.util.List;
import javax.swing.JSplitPane;
import javax.swing.JTabbedPane;
@@ -38,7 +37,6 @@
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserListener;
import net.sf.gridarta.gui.map.tools.ToolPalette;
-import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserListener;
import net.sf.japi.swing.ActionFactory;
@@ -69,9 +67,6 @@
/** The data/view of selected objects in tab panel. */
private final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay;
- /** The pickmap chooser control. */
- private final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl;
-
/**
* The listener attached to {@link #pickmapChooserControl}.
*/
@@ -86,15 +81,13 @@
/**
* Build Panel.
- * @param newMapDialogFactory the factory for creating new pickmaps
* @param mainControl CMainControl
- * @param pickmapDir the pickmaps directory
* @param archetypeChooserControl the archetype chooser control
* @param mapManager the map manager instance
+ * @param pickmapChooserControl the pickmap chooser control
*/
- public ObjectChooser(@NotNull final NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapDialogFactory, final CMainControl mainControl, @NotNull final File pickmapDir, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager) {
- super(archetypeChooserControl);
- pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, mainControl, pickmapChooserListener, pickmapDir, mapManager);
+ public ObjectChooser(final CMainControl mainControl, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl) {
+ super(archetypeChooserControl, pickmapChooserControl);
archetypeChooserControl.addArchetypeChooserListener(new ArchetypeChooserListener<GameObject, MapArchObject, Archetype>() {
/** {@inheritDoc} */
public void selectedArchetypeChanged(@NotNull final GameObject archetype) {
@@ -157,15 +150,6 @@
return isPickmapActive() ? pickmapChooserControl.getSelections() : archetypeChooserControl.getSelections();
}
- /**
- * Return the pickmap chooser control.
- * @return the pickmap chooser control
- */
- @NotNull
- public PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> getPickmapChooserControl() {
- return pickmapChooserControl;
- }
-
/** {@inheritDoc} */
@Override
public void setPickmapActive(final boolean pickmapActive) {
Modified: trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -35,6 +35,7 @@
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
import net.sf.gridarta.gui.map.MapViewBasic;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapModel;
import net.sf.gridarta.map.MapModelEvent;
@@ -95,7 +96,7 @@
* corner
* @param faceObjects the FaceObjects instance to use
*/
- public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects) {
+ public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl) {
super(mapControl);
this.mapControl = mapControl;
mapModel = mapControl.getMapModel();
@@ -119,7 +120,7 @@
getViewport().setViewPosition(initial);
}
- mapUserListener = new MapUserListener(mainControl, mapControl, this);
+ mapUserListener = new MapUserListener(mainControl, mapControl, this, pickmapChooserControl);
renderer.addMouseListener(mapUserListener);
renderer.addMouseMotionListener(mapUserListener);
renderer.setErroneousMapSquares(erroneousMapSquares);
Modified: trunk/daimonin/src/daieditor/gui/map/MapUserListener.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/MapUserListener.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/daimonin/src/daieditor/gui/map/MapUserListener.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -33,7 +33,9 @@
import net.sf.gridarta.gui.map.event.MouseOpEvent;
import net.sf.gridarta.gui.map.event.MouseOpListener;
import net.sf.gridarta.gui.map.tools.ToolPalette;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.map.MapControl;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
@@ -53,13 +55,17 @@
private final CMainControl mainControl;
+ @NotNull
+ private final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl;
+
private final Point tmpPoint = new Point();
private final MouseOpEvent<GameObject, MapArchObject, Archetype, CMapViewBasic> mouseOpEvent = new MouseOpEvent<GameObject, MapArchObject, Archetype, CMapViewBasic>();
- public MapUserListener(final CMainControl mainControl, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, final CMapViewBasic mapView) {
+ public MapUserListener(final CMainControl mainControl, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, final CMapViewBasic mapView, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl) {
this.mainControl = mainControl;
this.mapControl = mapControl;
+ this.pickmapChooserControl = pickmapChooserControl;
toolPalette = mainControl.getObjectChooser().getToolSelectorPane();
mapCursor = mapView.getMapCursor();
renderer = mapView.getRenderer();
@@ -115,7 +121,7 @@
// XXX: this is the wrong place to check for locked pickmaps
// in "locked pickmaps" mode, pickmaps react only to leftclicks
assert mapControl != null;
- if (mapControl.isPickmap() && mainControl.getObjectChooser().getPickmapChooserControl().isLockAllPickmaps() && !(e.getModifiers() == InputEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown())) {
+ if (mapControl.isPickmap() && pickmapChooserControl.isLockAllPickmaps() && !(e.getModifiers() == InputEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown())) {
return;
}
final MouseOpListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mouseOpListener = getMouseOperation(e);
Modified: trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -32,6 +32,7 @@
import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.MapViewBasic;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.io.GameObjectParser;
import net.sf.gridarta.io.MapArchObjectParser;
import net.sf.gridarta.io.MapReader;
@@ -135,7 +136,8 @@
* @param faceObjects the FaceObjects instance
* @param objectChooser the ObjectChooser instance
* @param archetypeChooserControl the ArchetypeChooserControl instance
+ * @param pickmapChooserControl the pickmap chooser control instance
*/
- void init(@NotNull FaceObjects faceObjects, @NotNull ObjectChooser<G, A, R, V> objectChooser, @NotNull ArchetypeChooserControl<G, A, R, V> archetypeChooserControl);
+ void init(@NotNull FaceObjects faceObjects, @NotNull ObjectChooser<G, A, R, V> objectChooser, @NotNull ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull PickmapChooserControl<G, A, R, V> pickmapChooserControl);
} // interface GridartaObjectsFactory
Modified: trunk/src/app/net/sf/gridarta/gui/AbstractObjectChooser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/AbstractObjectChooser.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/src/app/net/sf/gridarta/gui/AbstractObjectChooser.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -27,6 +27,7 @@
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
import net.sf.gridarta.gui.map.MapViewBasic;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
import org.jetbrains.annotations.NotNull;
@@ -41,6 +42,9 @@
/** The archetype chooser control. */
protected final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl;
+ /** The archetype chooser control. */
+ protected final PickmapChooserControl<G, A, R, V> pickmapChooserControl;
+
/**
* <code>true</code> if the PickmapChooser is active, <code>false</code> if
* the Archetype Chooser is active.
@@ -50,10 +54,12 @@
/**
* Creates a new instance.
* @param archetypeChooserControl the archetype chooser control
+ * @param pickmapChooserControl the pickmap chooser control
*/
- protected AbstractObjectChooser(@NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl) {
+ protected AbstractObjectChooser(@NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, final PickmapChooserControl<G, A, R, V> pickmapChooserControl) {
super(new BorderLayout());
this.archetypeChooserControl = archetypeChooserControl;
+ this.pickmapChooserControl = pickmapChooserControl;
}
/** {@inheritDoc} */
@@ -68,7 +74,7 @@
/** {@inheritDoc} */
public void setPickmapFoldersMenu(@Nullable final JMenu folderMenu) {
- getPickmapChooserControl().setPickmapFoldersMenu(folderMenu);
+ pickmapChooserControl.setPickmapFoldersMenu(folderMenu);
}
/** {@inheritDoc} */
@@ -81,7 +87,7 @@
// this is the arch that would get inserted from pickmap, but it also could
// be a default arch (when pickmap has no selection)
- final MapControl<G, A, R, V> activePickmap = getPickmapChooserControl().getCurrentPickmap();
+ final MapControl<G, A, R, V> activePickmap = pickmapChooserControl.getCurrentPickmap();
final G newarch = activePickmap == null ? null : activePickmap.getMapViewFrame().getSelectedGameObject();
if (pickmapActive && (newarch == null || !newarch.isArchetype())) {
Modified: trunk/src/app/net/sf/gridarta/gui/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainActions.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/src/app/net/sf/gridarta/gui/MainActions.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -42,6 +42,7 @@
import net.sf.gridarta.gui.map.MapGridListener;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.MapViewBasic;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapModel;
@@ -63,6 +64,10 @@
/** The MainControl. */
private final MainControl<G, A, R, V> mainControl;
+ /** The pickmap chooser control instance. */
+ @NotNull
+ private final PickmapChooserControl<G, A, R, V> pickmapChooserControl;
+
/** The animation objects instance to use. */
@NotNull
private final AnimationObjects<?> animationObjects;
@@ -275,12 +280,15 @@
/**
* Create a new instance.
* @param mainControl the MainControl
+ * @param pickmapChooserControl the pickmap chooser control instance to use
+ * @param animationObjects the animation object instance to use
* @param actionFactory The action factory to create actions.
* @param faceObjects the FaceObjects instance to use
* @param objectChooser the animation objects instance to use
*/
- public MainActions(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final AnimationObjects<?> animationObjects, @NotNull final ActionFactory actionFactory, @NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<G, A, R, V> objectChooser) {
+ public MainActions(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final AnimationObjects<?> animationObjects, @NotNull final ActionFactory actionFactory, @NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<G, A, R, V> objectChooser) {
this.mainControl = mainControl;
+ this.pickmapChooserControl = pickmapChooserControl;
this.animationObjects = animationObjects;
this.actionFactory = actionFactory;
this.faceObjects = faceObjects;
@@ -497,7 +505,7 @@
if (arch != null) {
title.append("with arch ").append(arch.getArchetypeName());
} else {
- pickmap = objectChooser.getPickmapChooserControl().getCurrentPickmap();
+ pickmap = pickmapChooserControl.getCurrentPickmap();
if (pickmap != null) {
title.append("with pickmap ").append(pickmap.getMapModel().getMapArchObject().getMapName());
} else { // ok ,we have a problem here: arch == null, pickmap == null...
Modified: trunk/src/app/net/sf/gridarta/gui/ObjectChooser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ObjectChooser.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/src/app/net/sf/gridarta/gui/ObjectChooser.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -25,7 +25,6 @@
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.map.MapViewBasic;
-import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
import org.jetbrains.annotations.NotNull;
@@ -85,13 +84,6 @@
List<G> getObjectChooserSelection();
/**
- * Return the pickmap chooser control.
- * @return the pickmap chooser control
- */
- @NotNull
- PickmapChooserControl<G, A, R, V> getPickmapChooserControl();
-
- /**
* Select an archetype in the archetype chooser. If necessary, activates
* archetype chooser.
* @param archetype The archetype to selected.
Modified: trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -25,6 +25,7 @@
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.pickmapchooser.Folder;
import net.sf.gridarta.gui.pickmapchooser.Model;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.map.MapArchObject;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -60,6 +61,10 @@
/** The default height for new pickmaps. */
private final int defaultPickmapHeight;
+ /** The pickmap chooser control. */
+ @NotNull
+ private PickmapChooserControl<G, A, R, V> pickmapChooserControl = null;
+
/**
* Creates a new instance.
* @param mainControl the main control instance
@@ -82,6 +87,10 @@
this.defaultPickmapHeight = defaultPickmapHeight;
}
+ public void setPickmapChooserControl(@NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl) {
+ this.pickmapChooserControl = pickmapChooserControl;
+ }
+
/**
* Shows a dialog for creating a new map.
* @param filename the filename for the new map; <code>null</code> if
@@ -93,7 +102,7 @@
/** Shows a dialog for creating a new pickmap. */
public void showNewPickmapDialog() {
- new NewPickmapDialog<G, A, R, V>(mainControl, mainControl.getMainView(), defaultPickmapWidth, defaultPickmapHeight);
+ new NewPickmapDialog<G, A, R, V>(mainControl, mainControl.getMainView(), defaultPickmapWidth, defaultPickmapHeight, pickmapChooserControl);
}
/**
Modified: trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapDialog.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapDialog.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -31,6 +31,7 @@
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.pickmapchooser.DuplicatePickmapException;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.map.MapArchObject;
import net.sf.japi.swing.ActionFactory;
@@ -49,6 +50,9 @@
/** The controller of this new level dialog view. */
protected final MainControl<G, A, R, V> mainControl;
+ /** The pickmap chooser control. */
+ private final PickmapChooserControl<G, A, R, V> pickmapChooserControl;
+
/**
* Textfield for the name of the map. The filename of the new map is unset
* and will be specified when the user saves the map for the first time.
@@ -61,10 +65,12 @@
* @param parentComponent the parent component of this dialog
* @param defaultWidth The default width for new maps.
* @param defaultHeight The default height for new maps.
+ * @param pickmapChooserControl the pickmap chooser control
*/
- public NewPickmapDialog(final MainControl<G, A, R, V> mainControl, final Component parentComponent, final int defaultWidth, final int defaultHeight) {
+ public NewPickmapDialog(final MainControl<G, A, R, V> mainControl, final Component parentComponent, final int defaultWidth, final int defaultHeight, final PickmapChooserControl<G, A, R, V> pickmapChooserControl) {
super(false, defaultWidth, defaultHeight);
this.mainControl = mainControl;
+ this.pickmapChooserControl = pickmapChooserControl;
init1(parentComponent, ACTION_FACTORY.getString("newPickmap.title"));
init2();
mapNameField.selectAll();
@@ -109,7 +115,7 @@
mapArchObject.setMapName(pickmapName);
try {
- mainControl.getObjectChooser().getPickmapChooserControl().newPickmap(mapArchObject, pickmapName);
+ pickmapChooserControl.newPickmap(mapArchObject, pickmapName);
} catch (final DuplicatePickmapException ex) {
ACTION_FACTORY.showMessageDialog(this, "pickmapExists", pickmapName);
return false;
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -80,6 +80,10 @@
@NotNull
private final FolderListActions<G, A, R, V> folderListActions;
+ /** The pickmap selection listener instance. */
+ @NotNull
+ private final PickmapSelectionListener<G, A, R, V> pickmapSelectionListener;
+
/**
* The map control listener attached to all pickmaps.
*/
@@ -156,21 +160,25 @@
* Create a PickmapChooserControl.
* @param newMapDialogFactory the factory for creating new pickmaps
* @param mainControl the main control
- * @param pickmapChooserListener the listener to notify
* @param pickmapDir the pickmaps directory
* @param mapManager the map manager instance
*/
- public PickmapChooserControl(@NotNull final NewMapDialogFactory<G, A, R, V> newMapDialogFactory, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final PickmapChooserListener pickmapChooserListener, @NotNull final File pickmapDir, @NotNull final MapManager<G, A, R, V> mapManager) {
+ public PickmapChooserControl(@NotNull final NewMapDialogFactory<G, A, R, V> newMapDialogFactory, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final File pickmapDir, @NotNull final MapManager<G, A, R, V> mapManager) {
this.mainControl = mainControl;
model = new Model<G, A, R, V>(pickmapDir);
currentPickmapActions = new CurrentPickmapActions<G, A, R, V>(newMapDialogFactory, this);
folderListActions = new FolderListActions<G, A, R, V>(model, newMapDialogFactory);
view = new PickmapChooserView<G, A, R, V>(model, currentPickmapActions);
currentPickmapActions.init();
- view.addChangeListener(new PickmapSelectionListener<G, A, R, V>(view, currentPickmapActions, pickmapChooserListener));
+ pickmapSelectionListener = new PickmapSelectionListener<G, A, R, V>(view, currentPickmapActions);
+ view.addChangeListener(pickmapSelectionListener);
mapManager.addMapManagerListener(mapManagerListener);
}
+ public void addPickmapChooserListener(@NotNull final PickmapChooserListener pickmapChooserListener) {
+ pickmapSelectionListener.addPickmapChooserListener(pickmapChooserListener);
+ }
+
/**
* Sets the pickmap folders menu to manage.
* @param folderMenu the pickmap folders menu
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapSelectionListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapSelectionListener.java 2008-07-10 19:17:30 UTC (rev 4290)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapSelectionListener.java 2008-07-10 20:15:46 UTC (rev 4291)
@@ -19,6 +19,8 @@
package net.sf.gridarta.gui.pickmapchooser;
+import java.util.LinkedList;
+import java.util.List;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import net.sf.gridarta.gameobject.Archetype;
@@ -42,21 +44,20 @@
@NotNull
private final CurrentPickmapActions<G, A, R, V> currentPickmapActions;
- /** The insertion object chooser this instance if part of. */
- @NotNull
- private final PickmapChooserListener pickmapChooserListener;
+ /**
+ * The listeners to notify.
+ */
+ private final List<PickmapChooserListener> listeners = new LinkedList<PickmapChooserListener>();
/**
* Creates a new instance.
* @param view the associated view
* @param currentPickmapActions the actions
- * @param pickmapChooserListener the listener to notify of changes
* of
*/
- public PickmapSelectionListener(@NotNull final PickmapChooserView<G, A, R, V> view, @NotNull final CurrentPickmapActions<G, A, R, V> currentPickmapActions, @NotNull final PickmapChooserListener pickmapChooserListener) {
+ public PickmapSelectionListener(@NotNull final PickmapChooserView<G, A, R, V> view, @NotNull final CurrentPickmapActions<G, A, R, V> currentPickmapActions) {
this.view = view;
this.currentPickmapActions = currentPickmapActions;
- this.pickmapChooserListener = pickmapChooserListener;
}
/** {@inheritDoc} */
@@ -67,7 +68,17 @@
if (mapControl != null) {
mapControl.getMapViewFrame().getView().unHighlight();
}
- pickmapChooserListener.activePickmapChanged();
+ for (final PickmapChooserListener listener : listeners) {
+ listener.activePickmapChanged();
+ }
}
+ /**
+ * Adds a {@łink PickmapChooserListener} to be notified.
+ * @param pickmapChooserListener the listener to add
+ */
+ public void addPickmapChooserListener(final PickmapChooserListener pickmapChooserListener) {
+ listeners.add(pickmapChooserListener);
+ }
+
} // class PickmapSelectionListener
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-10 21:07:06
|
Revision: 4293
http://gridarta.svn.sourceforge.net/gridarta/?rev=4293&view=rev
Author: akirschbaum
Date: 2008-07-10 14:07:07 -0700 (Thu, 10 Jul 2008)
Log Message:
-----------
Remove dependency MapUserListener to MainControl.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/gui/ObjectChooser.java
trunk/src/app/net/sf/gridarta/gui/map/tools/InsertionTool.java
trunk/src/app/net/sf/gridarta/gui/map/tools/ToolPalette.java
trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-10 20:37:37 UTC (rev 4292)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-10 21:07:07 UTC (rev 4293)
@@ -242,6 +242,8 @@
newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, 0, false, false, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR), mapManager);
newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
+ final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
+ selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mapTileListBottom, null);
objectChooser = new ObjectChooser(this, archetypeChooserControl, mapManager, pickmapChooserControl);
mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser);
getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl, pickmapChooserControl);
@@ -293,8 +295,6 @@
AbstractScriptArchEditor.initEventTypeBoxes(".py", "Python", ScriptArchUtils.createEventTypeBox());
- final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
- selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mapTileListBottom, null);
// Initialize the main view
final GameObjectMatcher monsterMatcher = gameObjectMatchers.getMatcher("monster");
if (monsterMatcher == null) {
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-07-10 20:37:37 UTC (rev 4292)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-07-10 21:07:07 UTC (rev 4293)
@@ -295,7 +295,9 @@
newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPDIFFICULTY, true, true, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR), mapManager);
newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
- objectChooser = new ObjectChooser(this, archetypeChooserControl, mapManager, pickmapChooserControl);
+ final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
+ selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mapTileListBottom, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH));
+ objectChooser = new ObjectChooser(this, selectedSquareControl.getSelectedSquareView(), archetypeChooserControl, mapManager, pickmapChooserControl);
mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser);
getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl, pickmapChooserControl);
mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), faceObjects);
@@ -348,8 +350,6 @@
AbstractScriptArchEditor.initEventTypeBoxes(".lua", "Lua", ScriptArchUtils.createEventTypeBox());
- final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
- selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mapTileListBottom, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH));
// Initialize the main view
final GameObjectMatcher monsterMatcher = gameObjectMatchers.getMatcher("monster");
if (monsterMatcher == null) {
Modified: trunk/daimonin/src/daieditor/gui/ObjectChooser.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/ObjectChooser.java 2008-07-10 20:37:37 UTC (rev 4292)
+++ trunk/daimonin/src/daieditor/gui/ObjectChooser.java 2008-07-10 21:07:07 UTC (rev 4293)
@@ -39,6 +39,7 @@
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserListener;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.japi.swing.ActionFactory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -82,11 +83,12 @@
/**
* Build Panel.
* @param mainControl CMainControl
+ * @param selectedSquareView the selected square view
* @param archetypeChooserControl the archetype chooser control
* @param mapManager the map manager instance
* @param pickmapChooserControl the pickmap chooser control
*/
- public ObjectChooser(final CMainControl mainControl, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl) {
+ public ObjectChooser(final CMainControl mainControl, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl) {
super(archetypeChooserControl, pickmapChooserControl);
archetypeChooserControl.addArchetypeChooserListener(new ArchetypeChooserListener<GameObject, MapArchObject, Archetype>() {
/** {@inheritDoc} */
@@ -99,7 +101,7 @@
// ignore
}
});
- toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(mainControl, this);
+ toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(mainControl, selectedSquareView, this);
objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(mainControl, this);
Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/InsertionTool.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/InsertionTool.java 2008-07-10 20:37:37 UTC (rev 4292)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/InsertionTool.java 2008-07-10 21:07:07 UTC (rev 4293)
@@ -22,13 +22,13 @@
import java.awt.Component;
import java.awt.Point;
import javax.swing.JPanel;
-import net.sf.gridarta.MainControl;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.ObjectChooser;
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.event.MouseOpEvent;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
import net.sf.japi.swing.ActionFactory;
@@ -53,7 +53,7 @@
/** The main control. */
@NotNull
- private final MainControl<G, A, R, V> mainControl;
+ private final SelectedSquareView<G, A, R, V> selectedSquareView;
/** The ObjectChooser to use. */
@NotNull
@@ -64,12 +64,12 @@
/**
* Create a BasicAbstractTool.
- * @param mainControl The main control.
+ * @param selectedSquareView the selected square view
* @param objectChooser the ObjectChooser to use
*/
- public InsertionTool(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final ObjectChooser<G, A, R, V> objectChooser) {
+ public InsertionTool(@NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final ObjectChooser<G, A, R, V> objectChooser) {
super("insertion");
- this.mainControl = mainControl;
+ this.selectedSquareView = selectedSquareView;
this.objectChooser = objectChooser;
}
@@ -86,7 +86,7 @@
mapCursor.setLocation(p);
}
mapControl.getMapModel().endTransaction();
- mainControl.getSelectedSquareControl().getSelectedSquareView().setSelectedGameObject(insertedObject);
+ selectedSquareView.setSelectedGameObject(insertedObject);
}
}
@@ -100,7 +100,7 @@
mapControl.getMapModel().beginTransaction("Insert Object");
final G insertedObject = objectChooser.insertSelectedObject(mapControl, p, false);
mapControl.getMapModel().endTransaction();
- mainControl.getSelectedSquareControl().getSelectedSquareView().setSelectedGameObject(insertedObject);
+ selectedSquareView.setSelectedGameObject(insertedObject);
}
}
Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/ToolPalette.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/ToolPalette.java 2008-07-10 20:37:37 UTC (rev 4292)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/ToolPalette.java 2008-07-10 21:07:07 UTC (rev 4293)
@@ -31,6 +31,7 @@
import net.sf.gridarta.gui.ObjectChooser;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.event.MouseOpEvent;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.map.MapArchObject;
import net.sf.japi.swing.ActionFactory;
import org.jetbrains.annotations.NotNull;
@@ -65,13 +66,14 @@
* Create a ToolPalette.
* @param mainControl MainControl to use (required for {@link
* net.sf.gridarta.gui.map.tools.InsertionTool}).
+ * @param selectedSquareView the selected square view
* @param objectChooser the object chooser to use
*/
- public ToolPalette(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final ObjectChooser<G, A, R, V> objectChooser) {
+ public ToolPalette(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final ObjectChooser<G, A, R, V> objectChooser) {
super(new BorderLayout());
- lmbSelector = new ToolSelector<G, A, R, V>("selection", mainControl, objectChooser);
- mmbSelector = new ToolSelector<G, A, R, V>("deletion", mainControl, objectChooser);
- rmbSelector = new ToolSelector<G, A, R, V>("insertion", mainControl, objectChooser);
+ lmbSelector = new ToolSelector<G, A, R, V>("selection", mainControl, selectedSquareView, objectChooser);
+ mmbSelector = new ToolSelector<G, A, R, V>("deletion", mainControl, selectedSquareView, objectChooser);
+ rmbSelector = new ToolSelector<G, A, R, V>("insertion", mainControl, selectedSquareView, objectChooser);
add(new JLabel(ACTION_FACTORY.getString("mouse")), BorderLayout.NORTH);
mouseTabs.add(ACTION_FACTORY.getString("left"), lmbSelector);
mouseTabs.add(ACTION_FACTORY.getString("middle"), mmbSelector);
Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java 2008-07-10 20:37:37 UTC (rev 4292)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java 2008-07-10 21:07:07 UTC (rev 4293)
@@ -37,6 +37,7 @@
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.ObjectChooser;
import net.sf.gridarta.gui.map.MapViewBasic;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.map.MapArchObject;
import net.sf.japi.swing.ActionFactory;
import org.jetbrains.annotations.NotNull;
@@ -87,11 +88,12 @@
* @param defaultTool name of the tool that should be selected by default
* @param mainControl MainControl to use (required for {@link
* InsertionTool}).
+ * @param selectedSquareView the selected square view
* @param objectChooser the object chooser to use
*/
- public ToolSelector(@NotNull final String defaultTool, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final ObjectChooser<G, A, R, V> objectChooser) {
+ public ToolSelector(@NotNull final String defaultTool, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final ObjectChooser<G, A, R, V> objectChooser) {
createUI();
- for (final Tool<G, A, R, V> toolToAdd : new Tool[] {new VoidTool<G, A, R, V>(), new SelectionTool<G, A, R, V>(objectChooser), new DeletionTool<G, A, R, V>(mainControl), new InsertionTool<G, A, R, V>(mainControl, objectChooser)}) {
+ for (final Tool<G, A, R, V> toolToAdd : new Tool[] {new VoidTool<G, A, R, V>(), new SelectionTool<G, A, R, V>(objectChooser), new DeletionTool<G, A, R, V>(mainControl), new InsertionTool<G, A, R, V>(selectedSquareView, objectChooser)}) {
add(toolToAdd, toolToAdd.getId().equals(defaultTool));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-13 23:01:17
|
Revision: 4310
http://gridarta.svn.sourceforge.net/gridarta/?rev=4310&view=rev
Author: akirschbaum
Date: 2008-07-13 16:01:20 -0700 (Sun, 13 Jul 2008)
Log Message:
-----------
Move MapUserListener to common code base.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
Added Paths:
-----------
trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java
Removed Paths:
-------------
trunk/crossfire/src/cfeditor/gui/map/MapUserListener.java
trunk/daimonin/src/daieditor/gui/map/MapUserListener.java
Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-13 22:45:57 UTC (rev 4309)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-13 23:01:20 UTC (rev 4310)
@@ -34,6 +34,7 @@
import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
+import net.sf.gridarta.gui.map.MapUserListener;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
@@ -87,7 +88,7 @@
private final Map<GameObject, ValidationError<GameObject, MapArchObject, Archetype>> erroneousArchObjects = new HashMap<GameObject, ValidationError<GameObject, MapArchObject, Archetype>>();
@NotNull
- private final MapUserListener mapUserListener;
+ private final MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mapUserListener;
/**
* Constructs a level view.
@@ -124,7 +125,7 @@
getViewport().setViewPosition(initial);
}
- mapUserListener = new MapUserListener(mapControl, this, pickmapChooserControl, toolPalette);
+ mapUserListener = new MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapControl, this, pickmapChooserControl, toolPalette);
renderer.addMouseListener(mapUserListener);
renderer.addMouseMotionListener(mapUserListener);
renderer.setErroneousMapSquares(erroneousMapSquares);
Deleted: trunk/crossfire/src/cfeditor/gui/map/MapUserListener.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/MapUserListener.java 2008-07-13 22:45:57 UTC (rev 4309)
+++ trunk/crossfire/src/cfeditor/gui/map/MapUserListener.java 2008-07-13 23:01:20 UTC (rev 4310)
@@ -1,161 +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 cfeditor.gui.map;
-
-import cfeditor.gameobject.Archetype;
-import cfeditor.gameobject.GameObject;
-import cfeditor.map.MapArchObject;
-import java.awt.Point;
-import java.awt.event.InputEvent;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
-import net.sf.gridarta.gui.map.LevelRenderer;
-import net.sf.gridarta.gui.map.MapCursor;
-import net.sf.gridarta.gui.map.event.MouseOpEvent;
-import net.sf.gridarta.gui.map.event.MouseOpListener;
-import net.sf.gridarta.gui.map.tools.ToolPalette;
-import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
-import net.sf.gridarta.map.MapControl;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * TODO Description.
- * @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
- */
-public final class MapUserListener implements MouseListener, MouseMotionListener {
-
- /** ToolSelector of ArchPanel. */
- private final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette;
-
- private final MapCursor mapCursor;
-
- private final LevelRenderer renderer;
-
- private final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl;
-
- @NotNull
- private final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl;
-
- private final Point tmpPoint = new Point();
-
- @NotNull
- private final MouseOpEvent<GameObject, MapArchObject, Archetype, CMapViewBasic> mouseOpEvent = new MouseOpEvent<GameObject, MapArchObject, Archetype, CMapViewBasic>();
-
- public MapUserListener(final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, final CMapViewBasic mapView, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette) {
- this.mapControl = mapControl;
- this.pickmapChooserControl = pickmapChooserControl;
- this.toolPalette = toolPalette;
- mapCursor = mapView.getMapCursor();
- renderer = mapView.getRenderer();
- }
-
- /** {@inheritDoc} */
- public void mouseClicked(final MouseEvent e) {
- final MouseOpListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mouseOpListener = getMouseOperation(e);
- if (mouseOpListener != null) {
- mouseOpListener.clicked(mouseOpEvent);
- }
- }
-
- private void initEvent(final MouseEvent event) {
- mouseOpEvent.setButton(event.getButton());
- mouseOpEvent.setId(event.getID());
- mouseOpEvent.setMapLocation(getMapLocation(event));
- mouseOpEvent.setMapCursor(mapCursor);
- mouseOpEvent.setModifiers(event.getModifiersEx());
- mouseOpEvent.setClickCount(event.getClickCount());
- mouseOpEvent.setMapControl(mapControl);
- event.consume();
- }
-
- /** {@inheritDoc} */
- public void mouseEntered(final MouseEvent e) {
- // ignore
- }
-
- /** {@inheritDoc} */
- public void mouseExited(final MouseEvent e) {
- // ignore
- }
-
- /** {@inheritDoc} */
- public void mouseDragged(final MouseEvent e) {
- final MouseOpListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mouseOpListener = getMouseOperation(e);
- if (mouseOpListener != null) {
- mouseOpListener.dragged(mouseOpEvent);
- }
- }
-
- /** {@inheritDoc} */
- public void mouseMoved(final MouseEvent e) {
- final MouseOpListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mouseOpListener = getMouseOperation(e);
- if (mouseOpListener != null) {
- mouseOpListener.moved(mouseOpEvent);
- }
- }
-
- /** {@inheritDoc} */
- public void mousePressed(final MouseEvent e) {
- // XXX: this is the wrong place to check for locked pickmaps
- // in "locked pickmaps" mode, pickmaps react only to leftclicks
- assert mapControl != null;
- if (mapControl.isPickmap() && pickmapChooserControl.isLockAllPickmaps() && !(e.getModifiers() == InputEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown())) {
- return;
- }
- final MouseOpListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mouseOpListener = getMouseOperation(e);
- if (mouseOpListener != null) {
- mouseOpListener.pressed(mouseOpEvent);
- }
- }
-
- /** {@inheritDoc} */
- public void mouseReleased(final MouseEvent e) {
- final MouseOpListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mouseOpListener = getMouseOperation(e);
- if (mouseOpListener != null) {
- mouseOpListener.released(mouseOpEvent);
- }
- }
-
- /**
- * Get the mouse operation for a MouseEvent.
- * @param event MouseEvent to get mouse operation for
- * @return mouse operation for <var>event</var>
- */
- @Nullable
- private MouseOpListener<GameObject, MapArchObject, Archetype, CMapViewBasic> getMouseOperation(final MouseEvent event) {
- initEvent(event);
- return toolPalette.getTool(mouseOpEvent);
- }
-
- /**
- * Get the map location for a MouseEvent.
- * @param event MouseEvent to get map location for
- * @return map location for <var>event</var> or <code>null</code> if outside
- * map
- */
- @Nullable
- private Point getMapLocation(final MouseEvent event) {
- assert renderer != null;
- return renderer.getTileLocationAt(event.getPoint(), tmpPoint);
- }
-
-} // class MapUserListener
Modified: trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-13 22:45:57 UTC (rev 4309)
+++ trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-13 23:01:20 UTC (rev 4310)
@@ -34,6 +34,7 @@
import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
+import net.sf.gridarta.gui.map.MapUserListener;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
@@ -87,7 +88,7 @@
private final Map<GameObject, ValidationError<GameObject, MapArchObject, Archetype>> erroneousArchObjects = new HashMap<GameObject, ValidationError<GameObject, MapArchObject, Archetype>>();
@NotNull
- private final MapUserListener mapUserListener;
+ private final MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mapUserListener;
/**
* Constructs a level view.
@@ -123,7 +124,7 @@
getViewport().setViewPosition(initial);
}
- mapUserListener = new MapUserListener(mapControl, this, pickmapChooserControl, toolPalette);
+ mapUserListener = new MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapControl, this, pickmapChooserControl, toolPalette);
renderer.addMouseListener(mapUserListener);
renderer.addMouseMotionListener(mapUserListener);
renderer.setErroneousMapSquares(erroneousMapSquares);
Deleted: trunk/daimonin/src/daieditor/gui/map/MapUserListener.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/MapUserListener.java 2008-07-13 22:45:57 UTC (rev 4309)
+++ trunk/daimonin/src/daieditor/gui/map/MapUserListener.java 2008-07-13 23:01:20 UTC (rev 4310)
@@ -1,161 +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 daieditor.gui.map;
-
-import daieditor.gameobject.Archetype;
-import daieditor.gameobject.GameObject;
-import daieditor.map.MapArchObject;
-import java.awt.Point;
-import java.awt.event.InputEvent;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
-import net.sf.gridarta.gui.map.LevelRenderer;
-import net.sf.gridarta.gui.map.MapCursor;
-import net.sf.gridarta.gui.map.event.MouseOpEvent;
-import net.sf.gridarta.gui.map.event.MouseOpListener;
-import net.sf.gridarta.gui.map.tools.ToolPalette;
-import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
-import net.sf.gridarta.map.MapControl;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * TODO Description.
- * @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
- */
-public final class MapUserListener implements MouseListener, MouseMotionListener {
-
- /** ToolSelector of ArchPanel. */
- private final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette;
-
- private final MapCursor mapCursor;
-
- private final LevelRenderer renderer;
-
- private final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl;
-
- @NotNull
- private final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl;
-
- private final Point tmpPoint = new Point();
-
- @NotNull
- private final MouseOpEvent<GameObject, MapArchObject, Archetype, CMapViewBasic> mouseOpEvent = new MouseOpEvent<GameObject, MapArchObject, Archetype, CMapViewBasic>();
-
- public MapUserListener(final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, final CMapViewBasic mapView, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette) {
- this.mapControl = mapControl;
- this.pickmapChooserControl = pickmapChooserControl;
- this.toolPalette = toolPalette;
- mapCursor = mapView.getMapCursor();
- renderer = mapView.getRenderer();
- }
-
- /** {@inheritDoc} */
- public void mouseClicked(final MouseEvent e) {
- final MouseOpListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mouseOpListener = getMouseOperation(e);
- if (mouseOpListener != null) {
- mouseOpListener.clicked(mouseOpEvent);
- }
- }
-
- private void initEvent(final MouseEvent event) {
- mouseOpEvent.setButton(event.getButton());
- mouseOpEvent.setId(event.getID());
- mouseOpEvent.setMapLocation(getMapLocation(event));
- mouseOpEvent.setMapCursor(mapCursor);
- mouseOpEvent.setModifiers(event.getModifiersEx());
- mouseOpEvent.setClickCount(event.getClickCount());
- mouseOpEvent.setMapControl(mapControl);
- event.consume();
- }
-
- /** {@inheritDoc} */
- public void mouseEntered(final MouseEvent e) {
- // ignore
- }
-
- /** {@inheritDoc} */
- public void mouseExited(final MouseEvent e) {
- // ignore
- }
-
- /** {@inheritDoc} */
- public void mouseDragged(final MouseEvent e) {
- final MouseOpListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mouseOpListener = getMouseOperation(e);
- if (mouseOpListener != null) {
- mouseOpListener.dragged(mouseOpEvent);
- }
- }
-
- /** {@inheritDoc} */
- public void mouseMoved(final MouseEvent e) {
- final MouseOpListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mouseOpListener = getMouseOperation(e);
- if (mouseOpListener != null) {
- mouseOpListener.moved(mouseOpEvent);
- }
- }
-
- /** {@inheritDoc} */
- public void mousePressed(final MouseEvent e) {
- // XXX: this is the wrong place to check for locked pickmaps
- // in "locked pickmaps" mode, pickmaps react only to leftclicks
- assert mapControl != null;
- if (mapControl.isPickmap() && pickmapChooserControl.isLockAllPickmaps() && !(e.getModifiers() == InputEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown())) {
- return;
- }
- final MouseOpListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mouseOpListener = getMouseOperation(e);
- if (mouseOpListener != null) {
- mouseOpListener.pressed(mouseOpEvent);
- }
- }
-
- /** {@inheritDoc} */
- public void mouseReleased(final MouseEvent e) {
- final MouseOpListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mouseOpListener = getMouseOperation(e);
- if (mouseOpListener != null) {
- mouseOpListener.released(mouseOpEvent);
- }
- }
-
- /**
- * Get the mouse operation for a MouseEvent.
- * @param event MouseEvent to get mouse operation for
- * @return mouse operation for <var>event</var>
- */
- @Nullable
- private MouseOpListener<GameObject, MapArchObject, Archetype, CMapViewBasic> getMouseOperation(final MouseEvent event) {
- initEvent(event);
- return toolPalette.getTool(mouseOpEvent);
- }
-
- /**
- * Get the map location for a MouseEvent.
- * @param event MouseEvent to get map location for
- * @return map location for <var>event</var> or <code>null</code> if outside
- * map
- */
- @Nullable
- private Point getMapLocation(final MouseEvent event) {
- assert renderer != null;
- return renderer.getTileLocationAt(event.getPoint(), tmpPoint);
- }
-
-} // class MapUserListener
Added: trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java 2008-07-13 23:01:20 UTC (rev 4310)
@@ -0,0 +1,159 @@
+/*
+ * 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.gui.map;
+
+import java.awt.Point;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import net.sf.gridarta.gameobject.Archetype;
+import net.sf.gridarta.gameobject.GameObject;
+import net.sf.gridarta.gui.map.event.MouseOpEvent;
+import net.sf.gridarta.gui.map.event.MouseOpListener;
+import net.sf.gridarta.gui.map.tools.ToolPalette;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
+import net.sf.gridarta.map.MapArchObject;
+import net.sf.gridarta.map.MapControl;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * TODO Description.
+ * @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
+ */
+public final class MapUserListener<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> implements MouseListener, MouseMotionListener {
+
+ /** ToolSelector of ArchPanel. */
+ private final ToolPalette<G, A, R, V> toolPalette;
+
+ private final MapCursor mapCursor;
+
+ private final LevelRenderer renderer;
+
+ private final MapControl<G, A, R, V> mapControl;
+
+ @NotNull
+ private final PickmapChooserControl<G, A, R, V> pickmapChooserControl;
+
+ private final Point tmpPoint = new Point();
+
+ @NotNull
+ private final MouseOpEvent<G, A, R, V> mouseOpEvent = new MouseOpEvent<G, A, R, V>();
+
+ public MapUserListener(final MapControl<G, A, R, V> mapControl, final V mapView, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final ToolPalette<G, A, R, V> toolPalette) {
+ this.mapControl = mapControl;
+ this.pickmapChooserControl = pickmapChooserControl;
+ this.toolPalette = toolPalette;
+ mapCursor = mapView.getMapCursor();
+ renderer = mapView.getRenderer();
+ }
+
+ /** {@inheritDoc} */
+ public void mouseClicked(final MouseEvent e) {
+ final MouseOpListener<G, A, R, V> mouseOpListener = getMouseOperation(e);
+ if (mouseOpListener != null) {
+ mouseOpListener.clicked(mouseOpEvent);
+ }
+ }
+
+ private void initEvent(final MouseEvent event) {
+ mouseOpEvent.setButton(event.getButton());
+ mouseOpEvent.setId(event.getID());
+ mouseOpEvent.setMapLocation(getMapLocation(event));
+ mouseOpEvent.setMapCursor(mapCursor);
+ mouseOpEvent.setModifiers(event.getModifiersEx());
+ mouseOpEvent.setClickCount(event.getClickCount());
+ mouseOpEvent.setMapControl(mapControl);
+ event.consume();
+ }
+
+ /** {@inheritDoc} */
+ public void mouseEntered(final MouseEvent e) {
+ // ignore
+ }
+
+ /** {@inheritDoc} */
+ public void mouseExited(final MouseEvent e) {
+ // ignore
+ }
+
+ /** {@inheritDoc} */
+ public void mouseDragged(final MouseEvent e) {
+ final MouseOpListener<G, A, R, V> mouseOpListener = getMouseOperation(e);
+ if (mouseOpListener != null) {
+ mouseOpListener.dragged(mouseOpEvent);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public void mouseMoved(final MouseEvent e) {
+ final MouseOpListener<G, A, R, V> mouseOpListener = getMouseOperation(e);
+ if (mouseOpListener != null) {
+ mouseOpListener.moved(mouseOpEvent);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public void mousePressed(final MouseEvent e) {
+ // XXX: this is the wrong place to check for locked pickmaps
+ // in "locked pickmaps" mode, pickmaps react only to leftclicks
+ assert mapControl != null;
+ if (mapControl.isPickmap() && pickmapChooserControl.isLockAllPickmaps() && !(e.getModifiers() == InputEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown())) {
+ return;
+ }
+ final MouseOpListener<G, A, R, V> mouseOpListener = getMouseOperation(e);
+ if (mouseOpListener != null) {
+ mouseOpListener.pressed(mouseOpEvent);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public void mouseReleased(final MouseEvent e) {
+ final MouseOpListener<G, A, R, V> mouseOpListener = getMouseOperation(e);
+ if (mouseOpListener != null) {
+ mouseOpListener.released(mouseOpEvent);
+ }
+ }
+
+ /**
+ * Get the mouse operation for a MouseEvent.
+ * @param event MouseEvent to get mouse operation for
+ * @return mouse operation for <var>event</var>
+ */
+ @Nullable
+ private MouseOpListener<G, A, R, V> getMouseOperation(final MouseEvent event) {
+ initEvent(event);
+ return toolPalette.getTool(mouseOpEvent);
+ }
+
+ /**
+ * Get the map location for a MouseEvent.
+ * @param event MouseEvent to get map location for
+ * @return map location for <var>event</var> or <code>null</code> if outside
+ * map
+ */
+ @Nullable
+ private Point getMapLocation(final MouseEvent event) {
+ assert renderer != null;
+ return renderer.getTileLocationAt(event.getPoint(), tmpPoint);
+ }
+
+} // class MapUserListener
Property changes on: trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-14 17:38:20
|
Revision: 4312
http://gridarta.svn.sourceforge.net/gridarta/?rev=4312&view=rev
Author: akirschbaum
Date: 2008-07-14 10:38:23 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Unify CMapViewBasic.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
Modified: trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
===================================================================
--- trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java 2008-07-13 23:05:13 UTC (rev 4311)
+++ trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java 2008-07-14 17:38:23 UTC (rev 4312)
@@ -137,7 +137,7 @@
/** {@inheritDoc} */
@NotNull
public MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapView(@NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point viewPosition, final int viewCounter) {
- return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>((MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic>) (MainControl) AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects, pickmapChooserControl, ((cfeditor.gui.ObjectChooser) objectChooser).getToolSelectorPane()), ACTION_FACTORY);
+ return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>((MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic>) (MainControl) AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects, pickmapChooserControl, ((cfeditor.gui.ObjectChooser) objectChooser).getToolSelectorPane(), 32, 32), ACTION_FACTORY);
}
/** {@inheritDoc} */
Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-13 23:05:13 UTC (rev 4311)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 17:38:23 UTC (rev 4312)
@@ -99,8 +99,10 @@
* @param faceObjects the FaceObjects instance to use
* @param pickmapChooserControl the pickmap chooser control
* @param toolPalette the tool palette
+ * @param xScrollDistance the x distance when scrolling
+ * @param yScrollDistance the y distance when scrolling
*/
- public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette) {
+ public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, final int xScrollDistance, final int yScrollDistance) {
super(mapControl);
this.mapControl = mapControl;
mapModel = mapControl.getMapModel();
@@ -117,8 +119,8 @@
mapModel.addMapModelListener(this);
// set the pixel increment scrolling for clicking once on a scrollbar arrow
- getVerticalScrollBar().setUnitIncrement(32);
- getHorizontalScrollBar().setUnitIncrement(32);
+ getVerticalScrollBar().setUnitIncrement(yScrollDistance);
+ getHorizontalScrollBar().setUnitIncrement(xScrollDistance);
if (initial != null) {
getViewport().setViewPosition(initial);
Modified: trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
===================================================================
--- trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java 2008-07-13 23:05:13 UTC (rev 4311)
+++ trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java 2008-07-14 17:38:23 UTC (rev 4312)
@@ -139,7 +139,7 @@
/** {@inheritDoc} */
@NotNull
public MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapView(@NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point viewPosition, final int viewCounter) {
- return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>((MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic>) (MainControl) AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects, pickmapChooserControl, ((daieditor.gui.ObjectChooser) objectChooser).getToolSelectorPane()), ACTION_FACTORY);
+ return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>((MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic>) (MainControl) AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects, pickmapChooserControl, ((daieditor.gui.ObjectChooser) objectChooser).getToolSelectorPane(), IGUIConstants.TILE_ISO_XLEN, IGUIConstants.TILE_ISO_YLEN), ACTION_FACTORY);
}
/** {@inheritDoc} */
Modified: trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-13 23:05:13 UTC (rev 4311)
+++ trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 17:38:23 UTC (rev 4312)
@@ -20,7 +20,6 @@
package daieditor.gui.map;
import daieditor.CMainControl;
-import daieditor.IGUIConstants;
import daieditor.gameobject.Archetype;
import daieditor.gameobject.GameObject;
import daieditor.map.MapArchObject;
@@ -99,8 +98,10 @@
* @param faceObjects the FaceObjects instance to use
* @param pickmapChooserControl the pickmap chooser control
* @param toolPalette the tool palette
+ * @param xScrollDistance the x distance when scrolling
+ * @param yScrollDistance the y distance when scrolling
*/
- public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette) {
+ public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, final int xScrollDistance, final int yScrollDistance) {
super(mapControl);
this.mapControl = mapControl;
mapModel = mapControl.getMapModel();
@@ -117,8 +118,8 @@
mapModel.addMapModelListener(this);
// set the pixel increment scrolling for clicking once on a scrollbar arrow
- getVerticalScrollBar().setUnitIncrement(IGUIConstants.TILE_ISO_YLEN);
- getHorizontalScrollBar().setUnitIncrement(IGUIConstants.TILE_ISO_XLEN);
+ getVerticalScrollBar().setUnitIncrement(yScrollDistance);
+ getHorizontalScrollBar().setUnitIncrement(xScrollDistance);
if (initial != null) {
getViewport().setViewPosition(initial);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-14 17:55:22
|
Revision: 4314
http://gridarta.svn.sourceforge.net/gridarta/?rev=4314&view=rev
Author: akirschbaum
Date: 2008-07-14 10:55:31 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Do not export MapModelListener from MapViewBasic.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 17:39:43 UTC (rev 4313)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 17:55:31 UTC (rev 4314)
@@ -40,6 +40,7 @@
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapModel;
import net.sf.gridarta.map.MapModelEvent;
+import net.sf.gridarta.map.MapModelListener;
import net.sf.gridarta.map.MapSquare;
import net.sf.gridarta.map.validation.ErrorCollector;
import net.sf.gridarta.map.validation.ValidationError;
@@ -63,7 +64,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
*/
-public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> {
+public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> implements MapModelListener<GameObject, MapArchObject, Archetype> {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
Modified: trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 17:39:43 UTC (rev 4313)
+++ trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 17:55:31 UTC (rev 4314)
@@ -40,6 +40,7 @@
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapModel;
import net.sf.gridarta.map.MapModelEvent;
+import net.sf.gridarta.map.MapModelListener;
import net.sf.gridarta.map.MapSquare;
import net.sf.gridarta.map.validation.ErrorCollector;
import net.sf.gridarta.map.validation.ValidationError;
@@ -63,7 +64,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
*/
-public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> {
+public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> implements MapModelListener<GameObject, MapArchObject, Archetype> {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 17:39:43 UTC (rev 4313)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 17:55:31 UTC (rev 4314)
@@ -32,7 +32,6 @@
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapModel;
-import net.sf.gridarta.map.MapModelListener;
import net.sf.gridarta.map.MapSquare;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -42,7 +41,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @todo extending JScrollPane is not a good idea.
*/
-public abstract class MapViewBasic<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JScrollPane implements MapCursorListener, MapModelListener<G, A, R> {
+public abstract class MapViewBasic<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JScrollPane implements MapCursorListener {
/** The MapModel. */
@NotNull
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-14 18:02:28
|
Revision: 4315
http://gridarta.svn.sourceforge.net/gridarta/?rev=4315&view=rev
Author: akirschbaum
Date: 2008-07-14 11:02:36 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Do not export MapModelListener from CMapViewBasic.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 17:55:31 UTC (rev 4314)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 18:02:36 UTC (rev 4315)
@@ -64,7 +64,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
*/
-public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> implements MapModelListener<GameObject, MapArchObject, Archetype> {
+public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
@@ -90,6 +90,35 @@
@NotNull
private final MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mapUserListener;
+ private final MapModelListener<GameObject, MapArchObject, Archetype> mapModelListener = new MapModelListener<GameObject, MapArchObject, Archetype>() {
+
+ /** {@inheritDoc} */
+ public void mapSizeChanged(final MapModelEvent<GameObject, MapArchObject, Archetype> e) {
+ mapGrid.resize(e.getMapModel().getMapSize());
+ }
+
+ /** {@inheritDoc} */
+ public void mapSquaresChanged(final MapModelEvent<GameObject, MapArchObject, Archetype> e) {
+ // ignore
+ }
+
+ /** {@inheritDoc} */
+ public void mapObjectsChanged(final MapModelEvent<GameObject, MapArchObject, Archetype> e) {
+ // ignore
+ }
+
+ /** {@inheritDoc} */
+ public void errorsChanged(@NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel) {
+ CMapViewBasic.this.errorsChanged(mapModel);
+ }
+
+ /** {@inheritDoc} */
+ public void mapMetaChanged(@NotNull final MapArchObject mapArchObject) {
+ // ignore
+ }
+
+ };
+
/**
* Constructs a level view.
* @param mainControl the main controller
@@ -116,7 +145,7 @@
setViewportView(renderer);
getViewport().setScrollMode(JViewport.SIMPLE_SCROLL_MODE);
- mapModel.addMapModelListener(this);
+ mapModel.addMapModelListener(mapModelListener);
// set the pixel increment scrolling for clicking once on a scrollbar arrow
getVerticalScrollBar().setUnitIncrement(yScrollDistance);
@@ -143,38 +172,17 @@
mapCursor.removeMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
}
setViewportView(null);
- mapModel.removeMapModelListener(this);
+ mapModel.removeMapModelListener(mapModelListener);
renderer.removeMouseListener(mapUserListener);
renderer.removeMouseMotionListener(mapUserListener);
}
/** {@inheritDoc} */
- public void mapSizeChanged(final MapModelEvent<GameObject, MapArchObject, Archetype> e) {
- mapGrid.resize(e.getMapModel().getMapSize());
- }
-
- /** {@inheritDoc} */
- public void mapSquaresChanged(final MapModelEvent<GameObject, MapArchObject, Archetype> e) {
- // ignore
- }
-
- /** {@inheritDoc} */
- public void mapObjectsChanged(final MapModelEvent<GameObject, MapArchObject, Archetype> e) {
- // ignore
- }
-
- /** {@inheritDoc} */
- public void mapMetaChanged(@NotNull final MapArchObject mapArchObject) {
- // ignore
- }
-
- /** {@inheritDoc} */
public LevelRenderer getRenderer() {
return renderer;
}
- /** {@inheritDoc} */
- public void errorsChanged(@NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel) {
+ private void errorsChanged(@NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel) {
final ErrorCollector<GameObject, MapArchObject, Archetype> errors = mapModel.getErrors();
erroneousMapSquares.clear();
erroneousArchObjects.clear();
Modified: trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 17:55:31 UTC (rev 4314)
+++ trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 18:02:36 UTC (rev 4315)
@@ -64,7 +64,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
*/
-public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> implements MapModelListener<GameObject, MapArchObject, Archetype> {
+public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
@@ -90,6 +90,37 @@
@NotNull
private final MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mapUserListener;
+ private final MapModelListener<GameObject, MapArchObject, Archetype> mapModelListener = new MapModelListener<GameObject, MapArchObject, Archetype>() {
+
+ /** {@inheritDoc} */
+ public void mapSizeChanged(final MapModelEvent<GameObject, MapArchObject, Archetype> e) {
+ mapGrid.resize(e.getMapModel().getMapSize());
+ }
+
+ /** {@inheritDoc} */
+ public void mapSquaresChanged(final MapModelEvent<GameObject, MapArchObject, Archetype> e) {
+ repaint();
+ // TODO: only repaint a specific region
+ }
+
+ /** {@inheritDoc} */
+ public void mapObjectsChanged(final MapModelEvent<GameObject, MapArchObject, Archetype> e) {
+ repaint();
+ // TODO: only repaint a specific region
+ }
+
+ /** {@inheritDoc} */
+ public void errorsChanged(@NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel) {
+ CMapViewBasic.this.errorsChanged(mapModel);
+ }
+
+ /** {@inheritDoc} */
+ public void mapMetaChanged(@NotNull final MapArchObject mapArchObject) {
+ // ignore
+ }
+
+ };
+
/**
* Constructs a level view.
* @param mainControl the main controller
@@ -116,7 +147,7 @@
setViewportView(renderer);
getViewport().setScrollMode(JViewport.SIMPLE_SCROLL_MODE);
- mapModel.addMapModelListener(this);
+ mapModel.addMapModelListener(mapModelListener);
// set the pixel increment scrolling for clicking once on a scrollbar arrow
getVerticalScrollBar().setUnitIncrement(yScrollDistance);
@@ -143,40 +174,17 @@
mapCursor.removeMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
}
setViewportView(null);
- mapModel.removeMapModelListener(this);
+ mapModel.removeMapModelListener(mapModelListener);
renderer.removeMouseListener(mapUserListener);
renderer.removeMouseMotionListener(mapUserListener);
}
/** {@inheritDoc} */
- public void mapSizeChanged(final MapModelEvent<GameObject, MapArchObject, Archetype> e) {
- mapGrid.resize(e.getMapModel().getMapSize());
- }
-
- /** {@inheritDoc} */
- public void mapSquaresChanged(final MapModelEvent<GameObject, MapArchObject, Archetype> e) {
- repaint();
- // TODO: only repaint a specific region
- }
-
- /** {@inheritDoc} */
- public void mapObjectsChanged(final MapModelEvent<GameObject, MapArchObject, Archetype> e) {
- repaint();
- // TODO: only repaint a specific region
- }
-
- /** {@inheritDoc} */
- public void mapMetaChanged(@NotNull final MapArchObject mapArchObject) {
- // ignore
- }
-
- /** {@inheritDoc} */
public LevelRenderer getRenderer() {
return renderer;
}
- /** {@inheritDoc} */
- public void errorsChanged(@NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel) {
+ private void errorsChanged(@NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel) {
final ErrorCollector<GameObject, MapArchObject, Archetype> errors = mapModel.getErrors();
erroneousMapSquares.clear();
erroneousArchObjects.clear();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-14 18:06:11
|
Revision: 4316
http://gridarta.svn.sourceforge.net/gridarta/?rev=4316&view=rev
Author: akirschbaum
Date: 2008-07-14 11:06:17 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Do not export MapCursorListener from MapViewBasic.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 18:02:36 UTC (rev 4315)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 18:06:17 UTC (rev 4316)
@@ -33,6 +33,7 @@
import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
+import net.sf.gridarta.gui.map.MapCursorListener;
import net.sf.gridarta.gui.map.MapUserListener;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.tools.ToolPalette;
@@ -64,7 +65,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
*/
-public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> {
+public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> implements MapCursorListener {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
Modified: trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 18:02:36 UTC (rev 4315)
+++ trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 18:06:17 UTC (rev 4316)
@@ -33,6 +33,7 @@
import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
+import net.sf.gridarta.gui.map.MapCursorListener;
import net.sf.gridarta.gui.map.MapUserListener;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.tools.ToolPalette;
@@ -64,7 +65,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
*/
-public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> {
+public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> implements MapCursorListener {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 18:02:36 UTC (rev 4315)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 18:06:17 UTC (rev 4316)
@@ -41,7 +41,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @todo extending JScrollPane is not a good idea.
*/
-public abstract class MapViewBasic<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JScrollPane implements MapCursorListener {
+public abstract class MapViewBasic<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JScrollPane {
/** The MapModel. */
@NotNull
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-14 18:10:26
|
Revision: 4317
http://gridarta.svn.sourceforge.net/gridarta/?rev=4317&view=rev
Author: akirschbaum
Date: 2008-07-14 11:10:26 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Do not export MapCursorListener from CMapViewBasic.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 18:06:17 UTC (rev 4316)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 18:10:26 UTC (rev 4317)
@@ -65,7 +65,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
*/
-public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> implements MapCursorListener {
+public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
@@ -120,6 +120,24 @@
};
+ private final MapCursorListener mapCursorListener = new MapCursorListener() {
+
+ /** {@inheritDoc} */
+ public void mapCursorChangedPos(@NotNull final MapCursorEvent e) {
+ final MapCursor mapCursor = e.getSource();
+ if (mapCursor.isActive()) {
+ final Rectangle rec = renderer.getTileBounds(mapCursor.getLocation());
+ renderer.scrollRectToVisible(rec);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public void mapCursorChangedMode(@NotNull final MapCursorEvent e) {
+ // Ignore mode change events
+ }
+
+ };
+
/**
* Constructs a level view.
* @param mainControl the main controller
@@ -136,7 +154,7 @@
super(mapControl);
this.mapControl = mapControl;
mapModel = mapControl.getMapModel();
- mapCursor.addMapCursorListener(this);
+ mapCursor.addMapCursorListener(mapCursorListener);
if (!mapControl.isPickmap()) {
mapCursor.addMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
}
@@ -168,7 +186,7 @@
/** {@inheritDoc} */
public void closeNotify() {
renderer.closeNotify();
- mapCursor.removeMapCursorListener(this);
+ mapCursor.removeMapCursorListener(mapCursorListener);
if (!mapControl.isPickmap()) {
mapCursor.removeMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
}
@@ -204,18 +222,4 @@
renderer.repaint();
}
- /** {@inheritDoc} */
- public void mapCursorChangedPos(@NotNull final MapCursorEvent e) {
- final MapCursor mapCursor = e.getSource();
- if (mapCursor.isActive()) {
- final Rectangle rec = renderer.getTileBounds(mapCursor.getLocation());
- renderer.scrollRectToVisible(rec);
- }
- }
-
- /** {@inheritDoc} */
- public void mapCursorChangedMode(@NotNull final MapCursorEvent e) {
- // Ignore mode change events
- }
-
} // class CMapViewBasic
Modified: trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 18:06:17 UTC (rev 4316)
+++ trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 18:10:26 UTC (rev 4317)
@@ -65,7 +65,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
*/
-public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> implements MapCursorListener {
+public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
@@ -122,6 +122,24 @@
};
+ private final MapCursorListener mapCursorListener = new MapCursorListener() {
+
+ /** {@inheritDoc} */
+ public void mapCursorChangedPos(@NotNull final MapCursorEvent e) {
+ final MapCursor mapCursor = e.getSource();
+ if (mapCursor.isActive()) {
+ final Rectangle rec = renderer.getTileBounds(mapCursor.getLocation());
+ renderer.scrollRectToVisible(rec);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public void mapCursorChangedMode(@NotNull final MapCursorEvent e) {
+ // Ignore mode change events
+ }
+
+ };
+
/**
* Constructs a level view.
* @param mainControl the main controller
@@ -138,7 +156,7 @@
super(mapControl);
this.mapControl = mapControl;
mapModel = mapControl.getMapModel();
- mapCursor.addMapCursorListener(this);
+ mapCursor.addMapCursorListener(mapCursorListener);
if (!mapControl.isPickmap()) {
mapCursor.addMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
}
@@ -170,7 +188,7 @@
/** {@inheritDoc} */
public void closeNotify() {
renderer.closeNotify();
- mapCursor.removeMapCursorListener(this);
+ mapCursor.removeMapCursorListener(mapCursorListener);
if (!mapControl.isPickmap()) {
mapCursor.removeMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
}
@@ -206,18 +224,4 @@
renderer.repaint();
}
- /** {@inheritDoc} */
- public void mapCursorChangedPos(@NotNull final MapCursorEvent e) {
- final MapCursor mapCursor = e.getSource();
- if (mapCursor.isActive()) {
- final Rectangle rec = renderer.getTileBounds(mapCursor.getLocation());
- renderer.scrollRectToVisible(rec);
- }
- }
-
- /** {@inheritDoc} */
- public void mapCursorChangedMode(@NotNull final MapCursorEvent e) {
- // Ignore mode change events
- }
-
} // class CMapViewBasic
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-14 18:36:56
|
Revision: 4318
http://gridarta.svn.sourceforge.net/gridarta/?rev=4318&view=rev
Author: akirschbaum
Date: 2008-07-14 11:36:57 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Move fields of CMapViewBasic to common code base.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
trunk/src/app/net/sf/gridarta/AbstractMainControl.java
trunk/src/app/net/sf/gridarta/CopyBuffer.java
trunk/src/app/net/sf/gridarta/CurrentMapListener.java
trunk/src/app/net/sf/gridarta/DefaultMapManager.java
trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java
trunk/src/app/net/sf/gridarta/MainControl.java
trunk/src/app/net/sf/gridarta/MapImageCache.java
trunk/src/app/net/sf/gridarta/MapManager.java
trunk/src/app/net/sf/gridarta/MapManagerListener.java
trunk/src/app/net/sf/gridarta/gui/AbstractObjectChooser.java
trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java
trunk/src/app/net/sf/gridarta/gui/ErrorListView.java
trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
trunk/src/app/net/sf/gridarta/gui/MainActions.java
trunk/src/app/net/sf/gridarta/gui/MainView.java
trunk/src/app/net/sf/gridarta/gui/MapManagerActions.java
trunk/src/app/net/sf/gridarta/gui/ObjectChoiceDisplay.java
trunk/src/app/net/sf/gridarta/gui/ObjectChooser.java
trunk/src/app/net/sf/gridarta/gui/ReplaceDialog.java
trunk/src/app/net/sf/gridarta/gui/ReplaceDialogManager.java
trunk/src/app/net/sf/gridarta/gui/StatusBar.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserControl.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypePanel.java
trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionControl.java
trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionView.java
trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java
trunk/src/app/net/sf/gridarta/gui/connectionview/LockedItemsControl.java
trunk/src/app/net/sf/gridarta/gui/connectionview/LockedItemsView.java
trunk/src/app/net/sf/gridarta/gui/connectionview/MonsterControl.java
trunk/src/app/net/sf/gridarta/gui/connectionview/MonsterView.java
trunk/src/app/net/sf/gridarta/gui/connectionview/View.java
trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialog.java
trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialog.java
trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialogManager.java
trunk/src/app/net/sf/gridarta/gui/map/MapCursorActions.java
trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java
trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java
trunk/src/app/net/sf/gridarta/gui/map/MapView.java
trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/ShrinkMapSizeDialog.java
trunk/src/app/net/sf/gridarta/gui/map/ShrinkMapSizeDialogManager.java
trunk/src/app/net/sf/gridarta/gui/map/ViewActions.java
trunk/src/app/net/sf/gridarta/gui/map/WindowAction.java
trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpAdapter.java
trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpEvent.java
trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpListener.java
trunk/src/app/net/sf/gridarta/gui/map/tools/AbstractTool.java
trunk/src/app/net/sf/gridarta/gui/map/tools/BasicAbstractTool.java
trunk/src/app/net/sf/gridarta/gui/map/tools/DeletionTool.java
trunk/src/app/net/sf/gridarta/gui/map/tools/InsertionTool.java
trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java
trunk/src/app/net/sf/gridarta/gui/map/tools/Tool.java
trunk/src/app/net/sf/gridarta/gui/map/tools/ToolPalette.java
trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java
trunk/src/app/net/sf/gridarta/gui/map/tools/VoidTool.java
trunk/src/app/net/sf/gridarta/gui/newmap/AbstractMapsizeNewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/AbstractNewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapFolderDialog.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/CurrentPickmapActions.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Folder.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/FolderListAction.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/FolderListActions.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/FolderListener.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Loader.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Model.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/ModelListener.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Pickmap.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapSelectionListener.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/MapTileSelection.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/MapTileSelectionCache.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareView.java
trunk/src/app/net/sf/gridarta/gui/undo/UndoControl.java
trunk/src/app/net/sf/gridarta/map/AutoValidator.java
trunk/src/app/net/sf/gridarta/map/AutoValidatorProcessor.java
trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java
trunk/src/app/net/sf/gridarta/map/MapControl.java
trunk/src/app/net/sf/gridarta/map/MapControlListener.java
Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -25,11 +25,8 @@
import cfeditor.map.MapArchObject;
import java.awt.Point;
import java.awt.Rectangle;
-import java.util.HashMap;
-import java.util.Map;
import javax.swing.JViewport;
import net.sf.gridarta.gameobject.face.FaceObjects;
-import net.sf.gridarta.gui.map.AbstractLevelRenderer;
import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
@@ -65,32 +62,11 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
*/
-public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> {
+public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype, CMapViewBasic> {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
- /** The controller of this view. */
- private final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl;
-
- /** The MapModel. */
- private final MapModel<GameObject, MapArchObject, Archetype> mapModel;
-
- /** The CMainControl. */
- private final CMainControl mainControl;
-
- /** The tile palette renderer. */
- private final AbstractLevelRenderer<GameObject, MapArchObject, Archetype> renderer;
-
- /** The MapSquares that are known to contain errors. */
- private final Map<MapSquare<GameObject, MapArchObject, Archetype>, ValidationError<GameObject, MapArchObject, Archetype>> erroneousMapSquares = new HashMap<MapSquare<GameObject, MapArchObject, Archetype>, ValidationError<GameObject, MapArchObject, Archetype>>();
-
- /** The ArchObjects that are known to contain errors. */
- private final Map<GameObject, ValidationError<GameObject, MapArchObject, Archetype>> erroneousArchObjects = new HashMap<GameObject, ValidationError<GameObject, MapArchObject, Archetype>>();
-
- @NotNull
- private final MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mapUserListener;
-
private final MapModelListener<GameObject, MapArchObject, Archetype> mapModelListener = new MapModelListener<GameObject, MapArchObject, Archetype>() {
/** {@inheritDoc} */
@@ -151,14 +127,11 @@
* @param yScrollDistance the y distance when scrolling
*/
public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, final int xScrollDistance, final int yScrollDistance) {
- super(mapControl);
- this.mapControl = mapControl;
- mapModel = mapControl.getMapModel();
+ super(mapControl, mainControl);
mapCursor.addMapCursorListener(mapCursorListener);
if (!mapControl.isPickmap()) {
mapCursor.addMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
}
- this.mainControl = mainControl;
renderer = mapControl.isPickmap() ? new PickmapRenderer(mainControl, mapControl, mapGrid, faceObjects) : new MapRenderer(mainControl, mapControl, mapGrid, faceObjects);
setViewportView(renderer);
Modified: trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -25,11 +25,8 @@
import daieditor.map.MapArchObject;
import java.awt.Point;
import java.awt.Rectangle;
-import java.util.HashMap;
-import java.util.Map;
import javax.swing.JViewport;
import net.sf.gridarta.gameobject.face.FaceObjects;
-import net.sf.gridarta.gui.map.AbstractLevelRenderer;
import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
@@ -65,32 +62,11 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
*/
-public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype> {
+public final class CMapViewBasic extends MapViewBasic<GameObject, MapArchObject, Archetype, CMapViewBasic> {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
- /** The controller of this view. */
- private final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl;
-
- /** The MapModel. */
- private final MapModel<GameObject, MapArchObject, Archetype> mapModel;
-
- /** The CMainControl. */
- private final CMainControl mainControl;
-
- /** The tile palette renderer. */
- private final AbstractLevelRenderer<GameObject, MapArchObject, Archetype> renderer;
-
- /** The MapSquares that are known to contain errors. */
- private final Map<MapSquare<GameObject, MapArchObject, Archetype>, ValidationError<GameObject, MapArchObject, Archetype>> erroneousMapSquares = new HashMap<MapSquare<GameObject, MapArchObject, Archetype>, ValidationError<GameObject, MapArchObject, Archetype>>();
-
- /** The ArchObjects that are known to contain errors. */
- private final Map<GameObject, ValidationError<GameObject, MapArchObject, Archetype>> erroneousArchObjects = new HashMap<GameObject, ValidationError<GameObject, MapArchObject, Archetype>>();
-
- @NotNull
- private final MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic> mapUserListener;
-
private final MapModelListener<GameObject, MapArchObject, Archetype> mapModelListener = new MapModelListener<GameObject, MapArchObject, Archetype>() {
/** {@inheritDoc} */
@@ -153,14 +129,11 @@
* @param yScrollDistance the y distance when scrolling
*/
public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, final int xScrollDistance, final int yScrollDistance) {
- super(mapControl);
- this.mapControl = mapControl;
- mapModel = mapControl.getMapModel();
+ super(mapControl, mainControl);
mapCursor.addMapCursorListener(mapCursorListener);
if (!mapControl.isPickmap()) {
mapCursor.addMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
}
- this.mainControl = mainControl;
renderer = mapControl.isPickmap() ? new PickmapRenderer(mainControl, mapControl, mapGrid, faceObjects) : new MapRenderer(mainControl, mapControl, mapGrid, faceObjects);
setViewportView(renderer);
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -50,7 +50,7 @@
* structures / collections and global functions.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public abstract class AbstractMainControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> implements MainControl<G, A, R, V> {
+public abstract class AbstractMainControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> implements MainControl<G, A, R, V> {
/** Preferences key for username. */
public static final String PREFS_USERNAME = "username";
Modified: trunk/src/app/net/sf/gridarta/CopyBuffer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/CopyBuffer.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/CopyBuffer.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -45,7 +45,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author Andreas Kirschbaum
*/
-public final class CopyBuffer<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public final class CopyBuffer<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/** Mode for operations. */
protected enum Mode {
Modified: trunk/src/app/net/sf/gridarta/CurrentMapListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/CurrentMapListener.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/CurrentMapListener.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -36,7 +36,7 @@
* Encapsulates common code for listening for current map changes.
* @author Andreas Kirschbaum
*/
-public abstract class CurrentMapListener<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public abstract class CurrentMapListener<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/** The map manager. */
@NotNull
Modified: trunk/src/app/net/sf/gridarta/DefaultMapManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/DefaultMapManager.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/DefaultMapManager.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -45,7 +45,7 @@
* Manages all opened maps.
* @author Andreas Kirschbaum
*/
-public class DefaultMapManager<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> implements MapManager<G, A, R, V> {
+public class DefaultMapManager<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> implements MapManager<G, A, R, V> {
/** Action Factory. */
private final ActionFactory actionFactory;
Modified: trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -46,7 +46,7 @@
* Encapsulates the differences between the different editor types.
* @author Andreas Kirschbaum
*/
-public interface GridartaObjectsFactory<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public interface GridartaObjectsFactory<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/**
* Create a new {@link MapArchObject} instance.
Modified: trunk/src/app/net/sf/gridarta/MainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/MainControl.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/MainControl.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -49,7 +49,7 @@
* while.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public interface MainControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public interface MainControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/** Preferences key for language. */
String PREFS_LANGUAGE = "language";
Modified: trunk/src/app/net/sf/gridarta/MapImageCache.java
===================================================================
--- trunk/src/app/net/sf/gridarta/MapImageCache.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/MapImageCache.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -44,7 +44,7 @@
* @author Andreas Kirschbaum
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public class MapImageCache<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public class MapImageCache<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/** The Logger for printing log messages. */
private static final Logger log = Logger.getLogger(MapImageCache.class);
Modified: trunk/src/app/net/sf/gridarta/MapManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/MapManager.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/MapManager.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -36,7 +36,7 @@
* A MapManager manages all opened maps.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public interface MapManager<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public interface MapManager<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/**
* Calculate a new type for all opened maps.
Modified: trunk/src/app/net/sf/gridarta/MapManagerListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/MapManagerListener.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/MapManagerListener.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -40,7 +40,7 @@
* closed <li>{@link #mapClosing(MapControl)} - the map has been closed </ul>
* @author Andreas Kirschbaum
*/
-public interface MapManagerListener<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends EventListener {
+public interface MapManagerListener<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends EventListener {
/**
* This event handler is called when the current map has changed.
Modified: trunk/src/app/net/sf/gridarta/gui/AbstractObjectChooser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/AbstractObjectChooser.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/AbstractObjectChooser.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -37,7 +37,7 @@
* Abstract base class for the Object Chooser.
* @author Andreas Kirschbaum
*/
-public abstract class AbstractObjectChooser<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends JPanel implements ObjectChooser<G, A, R, V> {
+public abstract class AbstractObjectChooser<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, V> {
/** The archetype chooser control. */
protected final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl;
Modified: trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -36,7 +36,7 @@
* Manages actions in the "archetypes" menu.
* @author Andreas Kirschbaum
*/
-public class ArchetypesActions<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public class ArchetypesActions<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/** Action Factory. */
private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("net.sf.gridarta");
Modified: trunk/src/app/net/sf/gridarta/gui/ErrorListView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ErrorListView.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/ErrorListView.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -55,7 +55,7 @@
* An ErrorPanel displays errors to the user.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public final class ErrorListView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends JPanel {
+public final class ErrorListView<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 {
/** The serial version UID. */
private static final long serialVersionUID = 1;
Modified: trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -75,7 +75,7 @@
* attributes.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public abstract class GameObjectAttributesPanel<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends JPanel {
+public abstract class GameObjectAttributesPanel<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 {
// constants for the 'task' parameter in editScriptWanted()
public static final int SCRIPT_OPEN = 0;
Modified: trunk/src/app/net/sf/gridarta/gui/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainActions.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/MainActions.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -59,7 +59,7 @@
* Encapsulates actions and related functions.
* @author Andreas Kirschbaum
*/
-public final class MainActions<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public final class MainActions<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/** The MainControl. */
private final MainControl<G, A, R, V> mainControl;
Modified: trunk/src/app/net/sf/gridarta/gui/MainView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainView.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/MainView.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -70,7 +70,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @todo shouldn't extend JFrame
*/
-public class MainView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends JFrame {
+public class MainView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends JFrame {
/** The Logger for printing log messages. */
private static final Logger log = Logger.getLogger(MainView.class);
Modified: trunk/src/app/net/sf/gridarta/gui/MapManagerActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MapManagerActions.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/MapManagerActions.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -33,7 +33,7 @@
* Manages actions related to the {@link MapManager} instance.
* @author Andreas Kirschbaum
*/
-public class MapManagerActions<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public class MapManagerActions<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/** Action Factory. */
private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("net.sf.gridarta");
Modified: trunk/src/app/net/sf/gridarta/gui/ObjectChoiceDisplay.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ObjectChoiceDisplay.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/ObjectChoiceDisplay.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -38,7 +38,7 @@
* the Object Chooser.
* @author <a href="mailto:mic...@no...">Michael Toennies</a>
*/
-public final class ObjectChoiceDisplay<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends JPanel {
+public final class ObjectChoiceDisplay<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 {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
Modified: trunk/src/app/net/sf/gridarta/gui/ObjectChooser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ObjectChooser.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/ObjectChooser.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -34,7 +34,7 @@
* Common base interface for ObjectChoosers.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public interface ObjectChooser<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public interface ObjectChooser<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/**
* Return if the Pickmap Chooser is active.
Modified: trunk/src/app/net/sf/gridarta/gui/ReplaceDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ReplaceDialog.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/ReplaceDialog.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -55,7 +55,7 @@
* @author <a href="mailto:and...@gm...">Andreas Vogl</a>
* @author <a href="mailto:ch...@ri...">Christian.Hujer</a>
*/
-public final class ReplaceDialog<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends JOptionPane {
+public final class ReplaceDialog<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends JOptionPane {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
Modified: trunk/src/app/net/sf/gridarta/gui/ReplaceDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ReplaceDialogManager.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/ReplaceDialogManager.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -21,7 +21,7 @@
return instance != null && instance.isBuilt();
}
- public static <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> ReplaceDialog<G, A, R, V> getInstance(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final ObjectChooser<G, A, R, V> objectChooser) {
+ public static <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> ReplaceDialog<G, A, R, V> getInstance(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final ObjectChooser<G, A, R, V> objectChooser) {
if (instance == null) {
instance = new ReplaceDialog<G, A, R, V>(mainControl, objectChooser);
}
Modified: trunk/src/app/net/sf/gridarta/gui/StatusBar.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/StatusBar.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/StatusBar.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -60,7 +60,7 @@
* @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
* @todo Separate labels and methods for mouse coordinates
*/
-public final class StatusBar<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends JPanel implements MouseMotionListener {
+public final class StatusBar<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 MouseMotionListener {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
Modified: trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserControl.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserControl.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -48,7 +48,7 @@
* The base class for the Archetype Chooser.
* @author Andreas Kirschbaum
*/
-public class ArchetypeChooserControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> implements Iterable<R> {
+public class ArchetypeChooserControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> implements Iterable<R> {
/** Preferences. */
private static final Preferences prefs = Preferences.userNodeForPackage(MainControl.class);
Modified: trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypePanel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypePanel.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypePanel.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -52,7 +52,7 @@
* Common base class for the panel for Archetypes.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public class ArchetypePanel<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends JPanel {
+public class ArchetypePanel<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 {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionControl.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionControl.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -30,7 +30,7 @@
* The controller of the connection view control.
* @author Andreas Kirschbaum
*/
-public class ConnectionControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends Control<Integer, G, A, R, V> {
+public class ConnectionControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends Control<Integer, G, A, R, V> {
/**
* Create a new instance.
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionView.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionView.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -32,7 +32,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author Andreas Kirschbaum
*/
-public final class ConnectionView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends View<Integer, G, A, R, V> {
+public final class ConnectionView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends View<Integer, G, A, R, V> {
/** The serial version UID. */
private static final long serialVersionUID = 1;
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -37,7 +37,7 @@
* Abstract controller base class for map view controls.
* @author Andreas Kirschbaum
*/
-public abstract class Control<K, G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public abstract class Control<K, G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/** The view for this controller. */
@NotNull
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/LockedItemsControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/LockedItemsControl.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/LockedItemsControl.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -30,7 +30,7 @@
* The controller of the locked items view control.
* @author Andreas Kirschbaum
*/
-public class LockedItemsControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends Control<String, G, A, R, V> {
+public class LockedItemsControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends Control<String, G, A, R, V> {
/**
* Create a new instance.
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/LockedItemsView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/LockedItemsView.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/LockedItemsView.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -34,7 +34,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author Andreas Kirschbaum
*/
-public final class LockedItemsView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends View<String, G, A, R, V> {
+public final class LockedItemsView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends View<String, G, A, R, V> {
/** The serial version UID. */
private static final long serialVersionUID = 1;
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/MonsterControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/MonsterControl.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/MonsterControl.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -31,7 +31,7 @@
* The controller of the monster view control.
* @author Andreas Kirschbaum
*/
-public class MonsterControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends Control<String, G, A, R, V> {
+public class MonsterControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends Control<String, G, A, R, V> {
/**
* Create a new instance.
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/MonsterView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/MonsterView.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/MonsterView.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -33,7 +33,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author Andreas Kirschbaum
*/
-public final class MonsterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends View<String, G, A, R, V> {
+public final class MonsterView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends View<String, G, A, R, V> {
/** The serial version UID. */
private static final long serialVersionUID = 1;
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/View.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/View.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/View.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -55,7 +55,7 @@
* @todo attach
* @serial exclude
*/
-public abstract class View<K, G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends JPanel {
+public abstract class View<K, 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 {
/** The connections. */
private final Map<K, Connection<K>> connections = new TreeMap<K, Connection<K>>();
Modified: trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialog.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialog.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -59,7 +59,7 @@
* Dialog used to find archetypes.
* @author Andreas Kirschbaum
*/
-public final class FindArchetypesDialog<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public final class FindArchetypesDialog<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/** Do not perform an auto-search until the input name reaches this length. */
private static final int MINIMUM_AUTOSEARCH_LENGTH = 3;
Modified: trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialog.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialog.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -45,7 +45,7 @@
* Dialog used to ask the user for coordinates to move the cursor to.
* @author Andreas Kirschbaum
*/
-public final class GoLocationDialog<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends JOptionPane {
+public final class GoLocationDialog<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends JOptionPane {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
Modified: trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialogManager.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialogManager.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -35,7 +35,7 @@
* for each map view no more than one go location dialog exists.
* @author Andreas Kirschbaum
*/
-public final class GoLocationDialogManager<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public final class GoLocationDialogManager<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/** Dialog for each map view. */
private final Map<MapView<G, A, R, V>, GoLocationDialog<G, A, R, V>> dialogs = new HashMap<MapView<G, A, R, V>, GoLocationDialog<G, A, R, V>>();
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapCursorActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapCursorActions.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapCursorActions.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -36,7 +36,7 @@
* Encapsulates actions used by {@link MapCursorControl}.
* @author Andreas Kirschbaum
*/
-public class MapCursorActions<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public class MapCursorActions<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/** Action Factory to create Actions. */
private final ActionFactory actionFactory;
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -36,7 +36,7 @@
* @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
* @author Andreas Kirschbaum
*/
-public class MapCursorControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public class MapCursorControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/** The MainControl. */
private final MainControl<G, A, R, V> mainControl;
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -36,7 +36,7 @@
* attached to maps.
* @author Andreas Kirschbaum
*/
-public class MapFileActions<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public class MapFileActions<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/** Action Factory to create Actions. */
private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("net.sf.gridarta");
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -39,7 +39,7 @@
* TODO Description.
* @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
*/
-public final class MapUserListener<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> implements MouseListener, MouseMotionListener {
+public final class MapUserListener<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> implements MouseListener, MouseMotionListener {
/** ToolSelector of ArchPanel. */
private final ToolPalette<G, A, R, V> toolPalette;
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapView.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapView.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -49,7 +49,7 @@
* control.
* @author Andreas Kirschbaum
*/
-public class MapView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends JInternalFrame {
+public class MapView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends JInternalFrame {
/** The serial version UID. */
private static final long serialVersionUID = 1;
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -23,9 +23,12 @@
import java.awt.Point;
import java.awt.Rectangle;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.swing.JScrollPane;
import net.sf.gridarta.CommonConstants;
+import net.sf.gridarta.MainControl;
import net.sf.gridarta.Size2D;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
@@ -33,6 +36,7 @@
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapModel;
import net.sf.gridarta.map.MapSquare;
+import net.sf.gridarta.map.validation.ValidationError;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -41,11 +45,11 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @todo extending JScrollPane is not a good idea.
*/
-public abstract class MapViewBasic<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JScrollPane {
+public abstract class MapViewBasic<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends JScrollPane {
/** The MapModel. */
@NotNull
- private final MapModel<G, A, R> mapModel;
+ protected final MapModel<G, A, R> mapModel;
/** The grid to use. */
@NotNull
@@ -55,11 +59,29 @@
@NotNull
protected final MapCursor mapCursor;
+ /** The MapSquares that are known to contain errors. */
+ protected final Map<MapSquare<G, A, R>, ValidationError<G, A, R>> erroneousMapSquares = new HashMap<MapSquare<G, A, R>, ValidationError<G, A, R>>();
+
+ /** The ArchObjects that are known to contain errors. */
+ protected final Map<G, ValidationError<G, A, R>> erroneousArchObjects = new HashMap<G, ValidationError<G, A, R>>();
+
+ /** The controller of this view. */
+ protected final MapControl<G, A, R, V> mapControl;
+
+ /** The CMainControl. */
+ protected final MainControl<G, A, R, V> mainControl;
+
+ /** The tile palette renderer. */
+ protected AbstractLevelRenderer<G, A, R> renderer;
+
+ @NotNull
+ protected MapUserListener<G, A, R, V> mapUserListener;
+
/**
* Creates a MapViewBasic.
* @param mapControl MapControl to use.
*/
- protected MapViewBasic(@NotNull final MapControl<G, A, R, ?> mapControl) {
+ protected MapViewBasic(@NotNull final MapControl<G, A, R, V> mapControl, @NotNull final MainControl<G, A, R, V> mainControl) {
super(VERTICAL_SCROLLBAR_AS_NEEDED, HORIZONTAL_SCROLLBAR_AS_NEEDED);
mapModel = mapControl.getMapModel();
mapGrid = new MapGrid(mapModel.getMapSize());
@@ -67,6 +89,8 @@
if (mapControl.isPickmap()) {
setBackground(CommonConstants.BG_COLOR);
}
+ this.mapControl = mapControl;
+ this.mainControl = mainControl;
}
/**
Modified: trunk/src/app/net/sf/gridarta/gui/map/ShrinkMapSizeDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/ShrinkMapSizeDialog.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/ShrinkMapSizeDialog.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -40,7 +40,7 @@
* Dialog to ask which empty borders to remove from a map.
* @author Andreas Kirschbaum
*/
-public final class ShrinkMapSizeDialog<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends JOptionPane {
+public final class ShrinkMapSizeDialog<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends JOptionPane {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
Modified: trunk/src/app/net/sf/gridarta/gui/map/ShrinkMapSizeDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/ShrinkMapSizeDialogManager.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/ShrinkMapSizeDialogManager.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -35,7 +35,7 @@
* for each map view no more than one shink map size dialog exists.
* @author Andreas Kirschbaum
*/
-public final class ShrinkMapSizeDialogManager<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public final class ShrinkMapSizeDialogManager<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/** Dialog for each map view. */
private final Map<MapView<G, A, R, V>, ShrinkMapSizeDialog<G, A, R, V>> dialogs = new HashMap<MapView<G, A, R, V>, ShrinkMapSizeDialog<G, A, R, V>>();
Modified: trunk/src/app/net/sf/gridarta/gui/map/ViewActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/ViewActions.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/ViewActions.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -43,7 +43,7 @@
* Manages edit type actions in "view" menu.
* @author Andreas Kirschbaum
*/
-public class ViewActions<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public class ViewActions<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/** Action Factory to create Actions. */
private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("net.sf.gridarta");
Modified: trunk/src/app/net/sf/gridarta/gui/map/WindowAction.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/WindowAction.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/WindowAction.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -32,7 +32,7 @@
* Action class for selecting this window.
* @author Andreas Kirschbaum
*/
-public final class WindowAction<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends AbstractAction {
+public final class WindowAction<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends AbstractAction {
/** The serial version UID. */
private static final long serialVersionUID = 1;
Modified: trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpAdapter.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpAdapter.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpAdapter.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -29,7 +29,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
@SuppressWarnings({"NoopMethodInAbstractClass"})
-public abstract class MouseOpAdapter<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> implements MouseOpListener<G, A, R, V> {
+public abstract class MouseOpAdapter<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> implements MouseOpListener<G, A, R, V> {
/** {@inheritDoc} */
public void clicked(final MouseOpEvent<G, A, R, V> e) {
Modified: trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpEvent.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpEvent.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpEvent.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -34,7 +34,7 @@
* MouseOpEvent objects may be reused.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public class MouseOpEvent<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends EventObject {
+public class MouseOpEvent<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends EventObject {
/** The serial version UID. */
private static final long serialVersionUID = 1;
Modified: trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpListener.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpListener.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -28,7 +28,7 @@
* Interface for Mouse Operations.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public interface MouseOpListener<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
+public interface MouseOpListener<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
/**
* Mouse was clicked.
Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/AbstractTool.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/AbstractTool.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/AbstractTool.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -30,7 +30,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
@SuppressWarnings({"AbstractClassWithOnlyOneDirectInheritor"})
-public abstract class AbstractTool<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends MouseOpAdapter<G, A, R, V> implements Tool<G, A, R, V> {
+public abstract class AbstractTool<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends MouseOpAdapter<G, A, R, V> implements Tool<G, A, R, V> {
/** Create an AbstractTool. */
protected AbstractTool() {
Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/BasicAbstractTool.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/BasicAbstractTool.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/BasicAbstractTool.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -31,7 +31,7 @@
* Base class for the default provided tools.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public class BasicAbstractTool<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends AbstractTool<G, A, R, V> {
+public class BasicAbstractTool<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends AbstractTool<G, A, R, V> {
/** The ID of this tool. */
@SuppressWarnings({"InstanceVariableNamingConvention"})
Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/DeletionTool.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/DeletionTool.java 2008-07-14 18:10:26 UTC (rev 4317)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/DeletionTool.java 2008-07-14 18:36:57 UTC (rev 4318)
@@ -40,7 +40,7 @@
* Tool for Deletion.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public class DeletionTool...
[truncated message content] |
|
From: <aki...@us...> - 2008-07-14 18:43:09
|
Revision: 4319
http://gridarta.svn.sourceforge.net/gridarta/?rev=4319&view=rev
Author: akirschbaum
Date: 2008-07-14 11:43:19 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Move some methods of CMapViewBasic to common code base.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 18:36:57 UTC (rev 4318)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 18:43:19 UTC (rev 4319)
@@ -158,7 +158,7 @@
/** {@inheritDoc} */
public void closeNotify() {
- renderer.closeNotify();
+ super.closeNotify();
mapCursor.removeMapCursorListener(mapCursorListener);
if (!mapControl.isPickmap()) {
mapCursor.removeMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
@@ -169,30 +169,4 @@
renderer.removeMouseMotionListener(mapUserListener);
}
- /** {@inheritDoc} */
- public LevelRenderer getRenderer() {
- return renderer;
- }
-
- private void errorsChanged(@NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel) {
- final ErrorCollector<GameObject, MapArchObject, Archetype> errors = mapModel.getErrors();
- erroneousMapSquares.clear();
- erroneousArchObjects.clear();
- mapGrid.clearErrors();
- for (final ValidationError<GameObject, MapArchObject, Archetype> validationError : errors.getErrors()) {
- final MapSquare<GameObject, MapArchObject, Archetype> mapSquare = validationError.getMapSquare();
- final GameObject archObject = validationError.getGameObject();
- if (mapSquare != null) {
- erroneousMapSquares.put(mapSquare, validationError);
- mapGrid.setError(mapSquare.getMapX(), mapSquare.getMapY());
- }
- if (archObject != null) {
- erroneousArchObjects.put(archObject, validationError);
- final GameObject topContainer = archObject.getTopContainer();
- mapGrid.setError(topContainer.getMapX(), topContainer.getMapY());
- }
- }
- renderer.repaint();
- }
-
} // class CMapViewBasic
Modified: trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 18:36:57 UTC (rev 4318)
+++ trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 18:43:19 UTC (rev 4319)
@@ -160,7 +160,7 @@
/** {@inheritDoc} */
public void closeNotify() {
- renderer.closeNotify();
+ super.closeNotify();
mapCursor.removeMapCursorListener(mapCursorListener);
if (!mapControl.isPickmap()) {
mapCursor.removeMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
@@ -171,30 +171,4 @@
renderer.removeMouseMotionListener(mapUserListener);
}
- /** {@inheritDoc} */
- public LevelRenderer getRenderer() {
- return renderer;
- }
-
- private void errorsChanged(@NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel) {
- final ErrorCollector<GameObject, MapArchObject, Archetype> errors = mapModel.getErrors();
- erroneousMapSquares.clear();
- erroneousArchObjects.clear();
- mapGrid.clearErrors();
- for (final ValidationError<GameObject, MapArchObject, Archetype> validationError : errors.getErrors()) {
- final MapSquare<GameObject, MapArchObject, Archetype> mapSquare = validationError.getMapSquare();
- final GameObject archObject = validationError.getGameObject();
- if (mapSquare != null) {
- erroneousMapSquares.put(mapSquare, validationError);
- mapGrid.setError(mapSquare.getMapX(), mapSquare.getMapY());
- }
- if (archObject != null) {
- erroneousArchObjects.put(archObject, validationError);
- final GameObject topContainer = archObject.getTopContainer();
- mapGrid.setError(topContainer.getMapX(), topContainer.getMapY());
- }
- }
- renderer.repaint();
- }
-
} // class CMapViewBasic
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 18:36:57 UTC (rev 4318)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 18:43:19 UTC (rev 4319)
@@ -37,6 +37,7 @@
import net.sf.gridarta.map.MapModel;
import net.sf.gridarta.map.MapSquare;
import net.sf.gridarta.map.validation.ValidationError;
+import net.sf.gridarta.map.validation.ErrorCollector;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -239,7 +240,9 @@
* Must be called when this renderer is not used anymore. It unregisters all
* listeners.
*/
- public abstract void closeNotify();
+ public void closeNotify() {
+ renderer.closeNotify();
+ }
/** Turn the highlight off. */
public void unHighlight() {
@@ -248,6 +251,29 @@
}
}
- public abstract LevelRenderer getRenderer();
+ public LevelRenderer getRenderer() {
+ return renderer;
+ }
+ protected void errorsChanged(@NotNull final MapModel<G, A, R> mapModel) {
+ final ErrorCollector<G, A, R> errors = mapModel.getErrors();
+ erroneousMapSquares.clear();
+ erroneousArchObjects.clear();
+ mapGrid.clearErrors();
+ for (final ValidationError<G, A, R> validationError : errors.getErrors()) {
+ final MapSquare<G, A, R> mapSquare = validationError.getMapSquare();
+ final G archObject = validationError.getGameObject();
+ if (mapSquare != null) {
+ erroneousMapSquares.put(mapSquare, validationError);
+ mapGrid.setError(mapSquare.getMapX(), mapSquare.getMapY());
+ }
+ if (archObject != null) {
+ erroneousArchObjects.put(archObject, validationError);
+ final GameObject topContainer = archObject.getTopContainer();
+ mapGrid.setError(topContainer.getMapX(), topContainer.getMapY());
+ }
+ }
+ renderer.repaint();
+ }
+
} // class MapViewBasic
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-14 18:56:13
|
Revision: 4320
http://gridarta.svn.sourceforge.net/gridarta/?rev=4320&view=rev
Author: akirschbaum
Date: 2008-07-14 11:55:45 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Remove unused import statements.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 18:43:19 UTC (rev 4319)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 18:55:45 UTC (rev 4320)
@@ -27,7 +27,6 @@
import java.awt.Rectangle;
import javax.swing.JViewport;
import net.sf.gridarta.gameobject.face.FaceObjects;
-import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
import net.sf.gridarta.gui.map.MapCursorListener;
@@ -39,9 +38,6 @@
import net.sf.gridarta.map.MapModel;
import net.sf.gridarta.map.MapModelEvent;
import net.sf.gridarta.map.MapModelListener;
-import net.sf.gridarta.map.MapSquare;
-import net.sf.gridarta.map.validation.ErrorCollector;
-import net.sf.gridarta.map.validation.ValidationError;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Modified: trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 18:43:19 UTC (rev 4319)
+++ trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 18:55:45 UTC (rev 4320)
@@ -27,7 +27,6 @@
import java.awt.Rectangle;
import javax.swing.JViewport;
import net.sf.gridarta.gameobject.face.FaceObjects;
-import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
import net.sf.gridarta.gui.map.MapCursorListener;
@@ -39,9 +38,6 @@
import net.sf.gridarta.map.MapModel;
import net.sf.gridarta.map.MapModelEvent;
import net.sf.gridarta.map.MapModelListener;
-import net.sf.gridarta.map.MapSquare;
-import net.sf.gridarta.map.validation.ErrorCollector;
-import net.sf.gridarta.map.validation.ValidationError;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 18:43:19 UTC (rev 4319)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 18:55:45 UTC (rev 4320)
@@ -36,8 +36,8 @@
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapModel;
import net.sf.gridarta.map.MapSquare;
+import net.sf.gridarta.map.validation.ErrorCollector;
import net.sf.gridarta.map.validation.ValidationError;
-import net.sf.gridarta.map.validation.ErrorCollector;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-14 19:01:21
|
Revision: 4321
http://gridarta.svn.sourceforge.net/gridarta/?rev=4321&view=rev
Author: akirschbaum
Date: 2008-07-14 12:00:56 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Move code of CMapViewBasic to common code base.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java
trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 18:55:45 UTC (rev 4320)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 19:00:56 UTC (rev 4321)
@@ -30,7 +30,6 @@
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
import net.sf.gridarta.gui.map.MapCursorListener;
-import net.sf.gridarta.gui.map.MapUserListener;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
@@ -143,13 +142,11 @@
getViewport().setViewPosition(initial);
}
- mapUserListener = new MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapControl, this, pickmapChooserControl, toolPalette);
renderer.addMouseListener(mapUserListener);
renderer.addMouseMotionListener(mapUserListener);
renderer.setErroneousMapSquares(erroneousMapSquares);
renderer.setErroneousArchObjects(erroneousArchObjects);
renderer.setFocusable(true);
- setFocusable(true);
}
/** {@inheritDoc} */
Modified: trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 18:55:45 UTC (rev 4320)
+++ trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 19:00:56 UTC (rev 4321)
@@ -30,7 +30,6 @@
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
import net.sf.gridarta.gui.map.MapCursorListener;
-import net.sf.gridarta.gui.map.MapUserListener;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
@@ -125,7 +124,7 @@
* @param yScrollDistance the y distance when scrolling
*/
public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, final int xScrollDistance, final int yScrollDistance) {
- super(mapControl, mainControl);
+ super(mapControl, mainControl, pickmapChooserControl, toolPalette);
mapCursor.addMapCursorListener(mapCursorListener);
if (!mapControl.isPickmap()) {
mapCursor.addMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
@@ -145,13 +144,11 @@
getViewport().setViewPosition(initial);
}
- mapUserListener = new MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapControl, this, pickmapChooserControl, toolPalette);
renderer.addMouseListener(mapUserListener);
renderer.addMouseMotionListener(mapUserListener);
renderer.setErroneousMapSquares(erroneousMapSquares);
renderer.setErroneousArchObjects(erroneousArchObjects);
renderer.setFocusable(true);
- setFocusable(true);
}
/** {@inheritDoc} */
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java 2008-07-14 18:55:45 UTC (rev 4320)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java 2008-07-14 19:00:56 UTC (rev 4321)
@@ -58,7 +58,7 @@
@NotNull
private final MouseOpEvent<G, A, R, V> mouseOpEvent = new MouseOpEvent<G, A, R, V>();
- public MapUserListener(final MapControl<G, A, R, V> mapControl, final V mapView, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final ToolPalette<G, A, R, V> toolPalette) {
+ public MapUserListener(final MapControl<G, A, R, V> mapControl, final MapViewBasic<G, A, R, V> mapView, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final ToolPalette<G, A, R, V> toolPalette) {
this.mapControl = mapControl;
this.pickmapChooserControl = pickmapChooserControl;
this.toolPalette = toolPalette;
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 18:55:45 UTC (rev 4320)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 19:00:56 UTC (rev 4321)
@@ -32,6 +32,8 @@
import net.sf.gridarta.Size2D;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
+import net.sf.gridarta.gui.map.tools.ToolPalette;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapModel;
@@ -76,13 +78,13 @@
protected AbstractLevelRenderer<G, A, R> renderer;
@NotNull
- protected MapUserListener<G, A, R, V> mapUserListener;
+ protected final MapUserListener<G, A, R, V> mapUserListener;
/**
* Creates a MapViewBasic.
* @param mapControl MapControl to use.
*/
- protected MapViewBasic(@NotNull final MapControl<G, A, R, V> mapControl, @NotNull final MainControl<G, A, R, V> mainControl) {
+ protected MapViewBasic(@NotNull final MapControl<G, A, R, V> mapControl, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final ToolPalette<G, A, R, V> toolPalette) {
super(VERTICAL_SCROLLBAR_AS_NEEDED, HORIZONTAL_SCROLLBAR_AS_NEEDED);
mapModel = mapControl.getMapModel();
mapGrid = new MapGrid(mapModel.getMapSize());
@@ -92,6 +94,8 @@
}
this.mapControl = mapControl;
this.mainControl = mainControl;
+ mapUserListener = new MapUserListener<G, A, R, V>(mapControl, this, pickmapChooserControl, toolPalette);
+ setFocusable(true);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-14 19:30:09
|
Revision: 4323
http://gridarta.svn.sourceforge.net/gridarta/?rev=4323&view=rev
Author: akirschbaum
Date: 2008-07-14 12:30:11 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Revert previous commits since they cause crashes.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java
trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 19:09:53 UTC (rev 4322)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 19:30:11 UTC (rev 4323)
@@ -30,6 +30,7 @@
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
import net.sf.gridarta.gui.map.MapCursorListener;
+import net.sf.gridarta.gui.map.MapUserListener;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
@@ -122,7 +123,7 @@
* @param yScrollDistance the y distance when scrolling
*/
public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, final int xScrollDistance, final int yScrollDistance) {
- super(mapControl, mainControl, pickmapChooserControl, toolPalette);
+ super(mapControl, mainControl);
mapCursor.addMapCursorListener(mapCursorListener);
if (!mapControl.isPickmap()) {
mapCursor.addMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
@@ -142,11 +143,13 @@
getViewport().setViewPosition(initial);
}
+ mapUserListener = new MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapControl, this, pickmapChooserControl, toolPalette);
renderer.addMouseListener(mapUserListener);
renderer.addMouseMotionListener(mapUserListener);
renderer.setErroneousMapSquares(erroneousMapSquares);
renderer.setErroneousArchObjects(erroneousArchObjects);
renderer.setFocusable(true);
+ setFocusable(true);
}
/** {@inheritDoc} */
Modified: trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 19:09:53 UTC (rev 4322)
+++ trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 19:30:11 UTC (rev 4323)
@@ -30,6 +30,7 @@
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
import net.sf.gridarta.gui.map.MapCursorListener;
+import net.sf.gridarta.gui.map.MapUserListener;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
@@ -124,7 +125,7 @@
* @param yScrollDistance the y distance when scrolling
*/
public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, final int xScrollDistance, final int yScrollDistance) {
- super(mapControl, mainControl, pickmapChooserControl, toolPalette);
+ super(mapControl, mainControl);
mapCursor.addMapCursorListener(mapCursorListener);
if (!mapControl.isPickmap()) {
mapCursor.addMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
@@ -144,11 +145,13 @@
getViewport().setViewPosition(initial);
}
+ mapUserListener = new MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapControl, this, pickmapChooserControl, toolPalette);
renderer.addMouseListener(mapUserListener);
renderer.addMouseMotionListener(mapUserListener);
renderer.setErroneousMapSquares(erroneousMapSquares);
renderer.setErroneousArchObjects(erroneousArchObjects);
renderer.setFocusable(true);
+ setFocusable(true);
}
/** {@inheritDoc} */
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java 2008-07-14 19:09:53 UTC (rev 4322)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java 2008-07-14 19:30:11 UTC (rev 4323)
@@ -58,7 +58,7 @@
@NotNull
private final MouseOpEvent<G, A, R, V> mouseOpEvent = new MouseOpEvent<G, A, R, V>();
- public MapUserListener(final MapControl<G, A, R, V> mapControl, final MapViewBasic<G, A, R, V> mapView, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final ToolPalette<G, A, R, V> toolPalette) {
+ public MapUserListener(final MapControl<G, A, R, V> mapControl, final V mapView, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final ToolPalette<G, A, R, V> toolPalette) {
this.mapControl = mapControl;
this.pickmapChooserControl = pickmapChooserControl;
this.toolPalette = toolPalette;
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 19:09:53 UTC (rev 4322)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 19:30:11 UTC (rev 4323)
@@ -32,8 +32,6 @@
import net.sf.gridarta.Size2D;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
-import net.sf.gridarta.gui.map.tools.ToolPalette;
-import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapModel;
@@ -78,13 +76,13 @@
protected AbstractLevelRenderer<G, A, R> renderer;
@NotNull
- protected final MapUserListener<G, A, R, V> mapUserListener;
+ protected MapUserListener<G, A, R, V> mapUserListener;
/**
* Creates a MapViewBasic.
* @param mapControl MapControl to use.
*/
- protected MapViewBasic(@NotNull final MapControl<G, A, R, V> mapControl, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final ToolPalette<G, A, R, V> toolPalette) {
+ protected MapViewBasic(@NotNull final MapControl<G, A, R, V> mapControl, @NotNull final MainControl<G, A, R, V> mainControl) {
super(VERTICAL_SCROLLBAR_AS_NEEDED, HORIZONTAL_SCROLLBAR_AS_NEEDED);
mapModel = mapControl.getMapModel();
mapGrid = new MapGrid(mapModel.getMapSize());
@@ -94,8 +92,6 @@
}
this.mapControl = mapControl;
this.mainControl = mainControl;
- mapUserListener = new MapUserListener<G, A, R, V>(mapControl, this, pickmapChooserControl, toolPalette);
- setFocusable(true);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-14 19:39:10
|
Revision: 4324
http://gridarta.svn.sourceforge.net/gridarta/?rev=4324&view=rev
Author: akirschbaum
Date: 2008-07-14 12:39:16 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Move code to common code base.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 19:30:11 UTC (rev 4323)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 19:39:16 UTC (rev 4324)
@@ -25,7 +25,6 @@
import cfeditor.map.MapArchObject;
import java.awt.Point;
import java.awt.Rectangle;
-import javax.swing.JViewport;
import net.sf.gridarta.gameobject.face.FaceObjects;
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
@@ -123,7 +122,7 @@
* @param yScrollDistance the y distance when scrolling
*/
public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, final int xScrollDistance, final int yScrollDistance) {
- super(mapControl, mainControl);
+ super(mapControl, mainControl, initial, xScrollDistance, yScrollDistance);
mapCursor.addMapCursorListener(mapCursorListener);
if (!mapControl.isPickmap()) {
mapCursor.addMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
@@ -131,18 +130,9 @@
renderer = mapControl.isPickmap() ? new PickmapRenderer(mainControl, mapControl, mapGrid, faceObjects) : new MapRenderer(mainControl, mapControl, mapGrid, faceObjects);
setViewportView(renderer);
- getViewport().setScrollMode(JViewport.SIMPLE_SCROLL_MODE);
mapModel.addMapModelListener(mapModelListener);
- // set the pixel increment scrolling for clicking once on a scrollbar arrow
- getVerticalScrollBar().setUnitIncrement(yScrollDistance);
- getHorizontalScrollBar().setUnitIncrement(xScrollDistance);
-
- if (initial != null) {
- getViewport().setViewPosition(initial);
- }
-
mapUserListener = new MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapControl, this, pickmapChooserControl, toolPalette);
renderer.addMouseListener(mapUserListener);
renderer.addMouseMotionListener(mapUserListener);
Modified: trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 19:30:11 UTC (rev 4323)
+++ trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 19:39:16 UTC (rev 4324)
@@ -25,7 +25,6 @@
import daieditor.map.MapArchObject;
import java.awt.Point;
import java.awt.Rectangle;
-import javax.swing.JViewport;
import net.sf.gridarta.gameobject.face.FaceObjects;
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
@@ -125,7 +124,7 @@
* @param yScrollDistance the y distance when scrolling
*/
public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, final int xScrollDistance, final int yScrollDistance) {
- super(mapControl, mainControl);
+ super(mapControl, mainControl, initial, xScrollDistance, yScrollDistance);
mapCursor.addMapCursorListener(mapCursorListener);
if (!mapControl.isPickmap()) {
mapCursor.addMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
@@ -133,18 +132,9 @@
renderer = mapControl.isPickmap() ? new PickmapRenderer(mainControl, mapControl, mapGrid, faceObjects) : new MapRenderer(mainControl, mapControl, mapGrid, faceObjects);
setViewportView(renderer);
- getViewport().setScrollMode(JViewport.SIMPLE_SCROLL_MODE);
mapModel.addMapModelListener(mapModelListener);
- // set the pixel increment scrolling for clicking once on a scrollbar arrow
- getVerticalScrollBar().setUnitIncrement(yScrollDistance);
- getHorizontalScrollBar().setUnitIncrement(xScrollDistance);
-
- if (initial != null) {
- getViewport().setViewPosition(initial);
- }
-
mapUserListener = new MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapControl, this, pickmapChooserControl, toolPalette);
renderer.addMouseListener(mapUserListener);
renderer.addMouseMotionListener(mapUserListener);
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 19:30:11 UTC (rev 4323)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 19:39:16 UTC (rev 4324)
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.Map;
import javax.swing.JScrollPane;
+import javax.swing.JViewport;
import net.sf.gridarta.CommonConstants;
import net.sf.gridarta.MainControl;
import net.sf.gridarta.Size2D;
@@ -81,8 +82,13 @@
/**
* Creates a MapViewBasic.
* @param mapControl MapControl to use.
+ * @param mainControl the main controller
+ * @param initial the initial view position to show; null=show top left
+ * corner
+ * @param xScrollDistance the x distance when scrolling
+ * @param yScrollDistance the y distance when scrolling
*/
- protected MapViewBasic(@NotNull final MapControl<G, A, R, V> mapControl, @NotNull final MainControl<G, A, R, V> mainControl) {
+ protected MapViewBasic(@NotNull final MapControl<G, A, R, V> mapControl, @NotNull final MainControl<G, A, R, V> mainControl, @Nullable final Point initial, final int xScrollDistance, final int yScrollDistance) {
super(VERTICAL_SCROLLBAR_AS_NEEDED, HORIZONTAL_SCROLLBAR_AS_NEEDED);
mapModel = mapControl.getMapModel();
mapGrid = new MapGrid(mapModel.getMapSize());
@@ -92,6 +98,16 @@
}
this.mapControl = mapControl;
this.mainControl = mainControl;
+
+ // set the pixel increment scrolling for clicking once on a scrollbar arrow
+ getVerticalScrollBar().setUnitIncrement(yScrollDistance);
+ getHorizontalScrollBar().setUnitIncrement(xScrollDistance);
+
+ if (initial != null) {
+ getViewport().setViewPosition(initial);
+ }
+
+ getViewport().setScrollMode(JViewport.SIMPLE_SCROLL_MODE);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-14 19:49:41
|
Revision: 4325
http://gridarta.svn.sourceforge.net/gridarta/?rev=4325&view=rev
Author: akirschbaum
Date: 2008-07-14 12:49:50 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Remove calls to MainControl.getSelectedSquareControl().
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-14 19:39:16 UTC (rev 4324)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-14 19:49:50 UTC (rev 4325)
@@ -246,7 +246,7 @@
selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mapTileListBottom, null);
objectChooser = new ObjectChooser(this, selectedSquareControl.getSelectedSquareView(), archetypeChooserControl, mapManager, pickmapChooserControl);
mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser);
- getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl, pickmapChooserControl);
+ getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl, pickmapChooserControl, selectedSquareControl.getSelectedSquareView());
mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), faceObjects);
new About("cfeditor", mainView);
undoControl = new UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager());
Modified: trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
===================================================================
--- trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java 2008-07-14 19:39:16 UTC (rev 4324)
+++ trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java 2008-07-14 19:49:50 UTC (rev 4325)
@@ -43,6 +43,7 @@
import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.io.DefaultMapReader;
import net.sf.gridarta.io.MapReader;
import net.sf.gridarta.map.DefaultMapControl;
@@ -78,6 +79,10 @@
@NotNull
private PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl = null;
+ /** The {@link SelectedSquareView} instance to use. */
+ @NotNull
+ private SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView = null;
+
/** {@inheritDoc} */
@NotNull
public GameObject newGameObject() {
@@ -137,15 +142,16 @@
/** {@inheritDoc} */
@NotNull
public MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapView(@NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point viewPosition, final int viewCounter) {
- return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>((MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic>) (MainControl) AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects, pickmapChooserControl, ((cfeditor.gui.ObjectChooser) objectChooser).getToolSelectorPane(), 32, 32), ACTION_FACTORY);
+ return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>((MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic>) (MainControl) AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects, pickmapChooserControl, ((cfeditor.gui.ObjectChooser) objectChooser).getToolSelectorPane(), 32, 32, selectedSquareView), ACTION_FACTORY);
}
/** {@inheritDoc} */
- public void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl) {
+ public void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView) {
this.faceObjects = faceObjects;
this.objectChooser = objectChooser;
this.archetypeChooserControl = archetypeChooserControl;
this.pickmapChooserControl = pickmapChooserControl;
+ this.selectedSquareView = selectedSquareView;
}
} // class CrossfireObjectsFactory
Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 19:39:16 UTC (rev 4324)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 19:49:50 UTC (rev 4325)
@@ -33,6 +33,7 @@
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapModel;
import net.sf.gridarta.map.MapModelEvent;
@@ -120,12 +121,13 @@
* @param toolPalette the tool palette
* @param xScrollDistance the x distance when scrolling
* @param yScrollDistance the y distance when scrolling
+ * @param selectedSquareView the selected square view
*/
- public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, final int xScrollDistance, final int yScrollDistance) {
+ public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, final int xScrollDistance, final int yScrollDistance, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView) {
super(mapControl, mainControl, initial, xScrollDistance, yScrollDistance);
mapCursor.addMapCursorListener(mapCursorListener);
if (!mapControl.isPickmap()) {
- mapCursor.addMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
+ mapCursor.addMapCursorListener(selectedSquareView);
}
renderer = mapControl.isPickmap() ? new PickmapRenderer(mainControl, mapControl, mapGrid, faceObjects) : new MapRenderer(mainControl, mapControl, mapGrid, faceObjects);
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-07-14 19:39:16 UTC (rev 4324)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-07-14 19:49:50 UTC (rev 4325)
@@ -299,7 +299,7 @@
selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mapTileListBottom, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH));
objectChooser = new ObjectChooser(this, selectedSquareControl.getSelectedSquareView(), archetypeChooserControl, mapManager, pickmapChooserControl);
mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser);
- getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl, pickmapChooserControl);
+ getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl, pickmapChooserControl, selectedSquareControl.getSelectedSquareView());
mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, objectChooser, getMapManager(), ACTION_FACTORY, mapManagerActions.getCloseAllAction(), faceObjects);
new About("daieditor", mainView);
undoControl = new UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager());
Modified: trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
===================================================================
--- trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java 2008-07-14 19:39:16 UTC (rev 4324)
+++ trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java 2008-07-14 19:49:50 UTC (rev 4325)
@@ -43,6 +43,7 @@
import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.io.DefaultMapReader;
import net.sf.gridarta.io.MapReader;
import net.sf.gridarta.map.DefaultMapControl;
@@ -78,6 +79,10 @@
@NotNull
private PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl = null;
+ /** The {@link SelectedSquareView} instance to use. */
+ @NotNull
+ private SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView = null;
+
/** {@inheritDoc} */
@NotNull
public GameObject newGameObject() {
@@ -139,15 +144,16 @@
/** {@inheritDoc} */
@NotNull
public MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapView(@NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point viewPosition, final int viewCounter) {
- return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>((MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic>) (MainControl) AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects, pickmapChooserControl, ((daieditor.gui.ObjectChooser) objectChooser).getToolSelectorPane(), IGUIConstants.TILE_ISO_XLEN, IGUIConstants.TILE_ISO_YLEN), ACTION_FACTORY);
+ return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>((MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic>) (MainControl) AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects, pickmapChooserControl, ((daieditor.gui.ObjectChooser) objectChooser).getToolSelectorPane(), IGUIConstants.TILE_ISO_XLEN, IGUIConstants.TILE_ISO_YLEN, selectedSquareView), ACTION_FACTORY);
}
/** {@inheritDoc} */
- public void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl) {
+ public void init(@NotNull final FaceObjects faceObjects, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser, @NotNull final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView) {
this.faceObjects = faceObjects;
this.objectChooser = objectChooser;
this.archetypeChooserControl = archetypeChooserControl;
this.pickmapChooserControl = pickmapChooserControl;
+ this.selectedSquareView = selectedSquareView;
}
} // class DaimoninObjectsFactory
Modified: trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 19:39:16 UTC (rev 4324)
+++ trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 19:49:50 UTC (rev 4325)
@@ -33,6 +33,7 @@
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapModel;
import net.sf.gridarta.map.MapModelEvent;
@@ -122,12 +123,13 @@
* @param toolPalette the tool palette
* @param xScrollDistance the x distance when scrolling
* @param yScrollDistance the y distance when scrolling
+ * @param selectedSquareView the selected square view
*/
- public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, final int xScrollDistance, final int yScrollDistance) {
+ public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, final int xScrollDistance, final int yScrollDistance, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView) {
super(mapControl, mainControl, initial, xScrollDistance, yScrollDistance);
mapCursor.addMapCursorListener(mapCursorListener);
if (!mapControl.isPickmap()) {
- mapCursor.addMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
+ mapCursor.addMapCursorListener(selectedSquareView);
}
renderer = mapControl.isPickmap() ? new PickmapRenderer(mainControl, mapControl, mapGrid, faceObjects) : new MapRenderer(mainControl, mapControl, mapGrid, faceObjects);
Modified: trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java 2008-07-14 19:39:16 UTC (rev 4324)
+++ trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java 2008-07-14 19:49:50 UTC (rev 4325)
@@ -33,6 +33,7 @@
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.io.GameObjectParser;
import net.sf.gridarta.io.MapArchObjectParser;
import net.sf.gridarta.io.MapReader;
@@ -137,7 +138,8 @@
* @param objectChooser the ObjectChooser instance
* @param archetypeChooserControl the ArchetypeChooserControl instance
* @param pickmapChooserControl the pickmap chooser control instance
+ * @param selectedSquareView the selected square view instance
*/
- void init(@NotNull FaceObjects faceObjects, @NotNull ObjectChooser<G, A, R, V> objectChooser, @NotNull ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull PickmapChooserControl<G, A, R, V> pickmapChooserControl);
+ void init(@NotNull FaceObjects faceObjects, @NotNull ObjectChooser<G, A, R, V> objectChooser, @NotNull ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView);
} // interface GridartaObjectsFactory
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-14 19:55:58
|
Revision: 4326
http://gridarta.svn.sourceforge.net/gridarta/?rev=4326&view=rev
Author: akirschbaum
Date: 2008-07-14 12:56:06 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Remove calls to MainControl.getSelectedSquareControl().
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/MapActions.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/MapActions.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-14 19:49:50 UTC (rev 4325)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-14 19:56:06 UTC (rev 4326)
@@ -284,7 +284,7 @@
log.fatal("GameObjectMatcher 'exit' does not exist");
throw new MissingResourceException("GameObjectMatcher 'exit' does not exist", null, null);
}
- mapActions = new MapActions(this, getMapManager(), exitMatcher, mapFileFilter);
+ mapActions = new MapActions(this, getMapManager(), exitMatcher, mapFileFilter, selectedSquareControl.getSelectedSquareView());
typeList.getListTable().put("event", getEventTypes());
try {
final String filename = IOUtils.getResourceURLAsString(getConfigurationDirectory(), CommonConstants.TYPEDEF_FILE);
Modified: trunk/crossfire/src/cfeditor/MapActions.java
===================================================================
--- trunk/crossfire/src/cfeditor/MapActions.java 2008-07-14 19:49:50 UTC (rev 4325)
+++ trunk/crossfire/src/cfeditor/MapActions.java 2008-07-14 19:56:06 UTC (rev 4326)
@@ -41,6 +41,7 @@
import net.sf.gridarta.gui.map.MapCursorEvent;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.ShrinkMapSizeDialogManager;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.map.MapControl;
import net.sf.japi.swing.ActionFactory;
import net.sf.japi.swing.ToggleAction;
@@ -111,6 +112,9 @@
/** The Swing file filter to use. */
private final FileFilter mapFileFilter;
+ /** The {@link SelectedSquareView} to use. */
+ private final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView;
+
/** The current map listener used to detect current map/map view changes. */
private final CurrentMapListener<GameObject, MapArchObject, Archetype, CMapViewBasic> currentMapListener;
@@ -123,12 +127,14 @@
* @param mapManager the map manager
* @param exitMatcher the game object matcher selecting exit objects
* @param mapFileFilter the Swing file filter to use
+ * @param selectedSquareView the selected square vuew to use
*/
- public MapActions(final CMainControl mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final GameObjectMatcher exitMatcher, final FileFilter mapFileFilter) {
+ public MapActions(final CMainControl mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final GameObjectMatcher exitMatcher, final FileFilter mapFileFilter, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView) {
this.mainControl = mainControl;
this.mapManager = mapManager;
this.exitMatcher = exitMatcher;
this.mapFileFilter = mapFileFilter;
+ this.selectedSquareView = selectedSquareView;
shrinkMapSizeDialogManager = new ShrinkMapSizeDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
autoJoin = prefs.getBoolean(AUTOJOIN_KEY, false);
@@ -466,7 +472,7 @@
return null;
}
- final GameObject selectedExit = mainControl.getSelectedSquareControl().getSelectedSquareView().getSelectedGameObject();
+ final GameObject selectedExit = selectedSquareView.getSelectedGameObject();
if (selectedExit != null && exitMatcher.isMatching(selectedExit.getHead()) && selectedExit.getHead().getAttributeString("slaying").length() > 0) {
return selectedExit.getHead();
}
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-07-14 19:49:50 UTC (rev 4325)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-07-14 19:56:06 UTC (rev 4326)
@@ -340,7 +340,7 @@
log.fatal("GameObjectMatcher 'exit' does not exist");
throw new MissingResourceException("GameObjectMatcher 'exit' does not exist", null, null);
}
- mapActions = new MapActions(this, getMapManager(), exitMatcher, mapFileFilter);
+ mapActions = new MapActions(this, getMapManager(), exitMatcher, mapFileFilter, selectedSquareControl.getSelectedSquareView());
try {
final String filename = IOUtils.getResourceURLAsString(getConfigurationDirectory(), CommonConstants.TYPEDEF_FILE);
typeList.loadTypesFromXML(filename);
Modified: trunk/daimonin/src/daieditor/MapActions.java
===================================================================
--- trunk/daimonin/src/daieditor/MapActions.java 2008-07-14 19:49:50 UTC (rev 4325)
+++ trunk/daimonin/src/daieditor/MapActions.java 2008-07-14 19:56:06 UTC (rev 4326)
@@ -41,6 +41,7 @@
import net.sf.gridarta.gui.map.MapCursorEvent;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.ShrinkMapSizeDialogManager;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.map.MapControl;
import net.sf.japi.swing.ActionFactory;
import net.sf.japi.swing.ToggleAction;
@@ -107,6 +108,9 @@
/** The Swing file filter to use. */
private final FileFilter mapFileFilter;
+ /** The {@link SelectedSquareView} to use. */
+ private final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView;
+
/** The current map listener used to detect current map/map view changes. */
private final CurrentMapListener<GameObject, MapArchObject, Archetype, CMapViewBasic> currentMapListener;
@@ -119,12 +123,14 @@
* @param mapManager the map manager
* @param exitMatcher the game object matcher selecting exit objects
* @param mapFileFilter the Swing file filter to use
+ * @param selectedSquareView the selected square vuew to use
*/
- public MapActions(final CMainControl mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final GameObjectMatcher exitMatcher, final FileFilter mapFileFilter) {
+ public MapActions(final CMainControl mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final GameObjectMatcher exitMatcher, final FileFilter mapFileFilter, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView) {
this.mainControl = mainControl;
this.mapManager = mapManager;
this.exitMatcher = exitMatcher;
this.mapFileFilter = mapFileFilter;
+ this.selectedSquareView = selectedSquareView;
shrinkMapSizeDialogManager = new ShrinkMapSizeDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
autoJoin = prefs.getBoolean(AUTOJOIN_KEY, false);
@@ -451,7 +457,7 @@
return null;
}
- final GameObject selectedExit = mainControl.getSelectedSquareControl().getSelectedSquareView().getSelectedGameObject();
+ final GameObject selectedExit = selectedSquareView.getSelectedGameObject();
if (selectedExit != null && exitMatcher.isMatching(selectedExit.getHead()) && selectedExit.getHead().getAttributeString("slaying").length() > 0) {
return selectedExit.getHead();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-14 20:01:00
|
Revision: 4327
http://gridarta.svn.sourceforge.net/gridarta/?rev=4327&view=rev
Author: akirschbaum
Date: 2008-07-14 13:01:02 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Remove calls to MainControl.getSelectedSquareControl().
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 19:56:06 UTC (rev 4326)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java 2008-07-14 20:01:02 UTC (rev 4327)
@@ -124,11 +124,8 @@
* @param selectedSquareView the selected square view
*/
public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, final int xScrollDistance, final int yScrollDistance, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView) {
- super(mapControl, mainControl, initial, xScrollDistance, yScrollDistance);
+ super(mapControl, mainControl, initial, xScrollDistance, yScrollDistance, selectedSquareView);
mapCursor.addMapCursorListener(mapCursorListener);
- if (!mapControl.isPickmap()) {
- mapCursor.addMapCursorListener(selectedSquareView);
- }
renderer = mapControl.isPickmap() ? new PickmapRenderer(mainControl, mapControl, mapGrid, faceObjects) : new MapRenderer(mainControl, mapControl, mapGrid, faceObjects);
setViewportView(renderer);
@@ -148,9 +145,6 @@
public void closeNotify() {
super.closeNotify();
mapCursor.removeMapCursorListener(mapCursorListener);
- if (!mapControl.isPickmap()) {
- mapCursor.removeMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
- }
setViewportView(null);
mapModel.removeMapModelListener(mapModelListener);
renderer.removeMouseListener(mapUserListener);
Modified: trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 19:56:06 UTC (rev 4326)
+++ trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java 2008-07-14 20:01:02 UTC (rev 4327)
@@ -126,11 +126,8 @@
* @param selectedSquareView the selected square view
*/
public CMapViewBasic(@NotNull final CMainControl mainControl, @NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point initial, @NotNull final FaceObjects faceObjects, @NotNull final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, final int xScrollDistance, final int yScrollDistance, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView) {
- super(mapControl, mainControl, initial, xScrollDistance, yScrollDistance);
+ super(mapControl, mainControl, initial, xScrollDistance, yScrollDistance, selectedSquareView);
mapCursor.addMapCursorListener(mapCursorListener);
- if (!mapControl.isPickmap()) {
- mapCursor.addMapCursorListener(selectedSquareView);
- }
renderer = mapControl.isPickmap() ? new PickmapRenderer(mainControl, mapControl, mapGrid, faceObjects) : new MapRenderer(mainControl, mapControl, mapGrid, faceObjects);
setViewportView(renderer);
@@ -150,9 +147,6 @@
public void closeNotify() {
super.closeNotify();
mapCursor.removeMapCursorListener(mapCursorListener);
- if (!mapControl.isPickmap()) {
- mapCursor.removeMapCursorListener(mainControl.getSelectedSquareControl().getSelectedSquareView());
- }
setViewportView(null);
mapModel.removeMapModelListener(mapModelListener);
renderer.removeMouseListener(mapUserListener);
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 19:56:06 UTC (rev 4326)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-14 20:01:02 UTC (rev 4327)
@@ -33,6 +33,7 @@
import net.sf.gridarta.Size2D;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapModel;
@@ -79,6 +80,9 @@
@NotNull
protected MapUserListener<G, A, R, V> mapUserListener;
+ @NotNull
+ private final SelectedSquareView<G, A, R, V> selectedSquareView;
+
/**
* Creates a MapViewBasic.
* @param mapControl MapControl to use.
@@ -87,14 +91,18 @@
* corner
* @param xScrollDistance the x distance when scrolling
* @param yScrollDistance the y distance when scrolling
+ * @param selectedSquareView the selected square view
*/
- protected MapViewBasic(@NotNull final MapControl<G, A, R, V> mapControl, @NotNull final MainControl<G, A, R, V> mainControl, @Nullable final Point initial, final int xScrollDistance, final int yScrollDistance) {
+ protected MapViewBasic(@NotNull final MapControl<G, A, R, V> mapControl, @NotNull final MainControl<G, A, R, V> mainControl, @Nullable final Point initial, final int xScrollDistance, final int yScrollDistance, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView) {
super(VERTICAL_SCROLLBAR_AS_NEEDED, HORIZONTAL_SCROLLBAR_AS_NEEDED);
+ this.selectedSquareView = selectedSquareView;
mapModel = mapControl.getMapModel();
mapGrid = new MapGrid(mapModel.getMapSize());
mapCursor = new MapCursor(mapGrid);
if (mapControl.isPickmap()) {
setBackground(CommonConstants.BG_COLOR);
+ } else {
+ mapCursor.addMapCursorListener(selectedSquareView);
}
this.mapControl = mapControl;
this.mainControl = mainControl;
@@ -258,6 +266,9 @@
*/
public void closeNotify() {
renderer.closeNotify();
+ if (!mapControl.isPickmap()) {
+ mapCursor.removeMapCursorListener(selectedSquareView);
+ }
}
/** Turn the highlight off. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-14 20:09:07
|
Revision: 4328
http://gridarta.svn.sourceforge.net/gridarta/?rev=4328&view=rev
Author: akirschbaum
Date: 2008-07-14 13:09:15 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Remove calls to MainControl.getSelectedSquareControl().
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java
trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-14 20:01:02 UTC (rev 4327)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-14 20:09:15 UTC (rev 4328)
@@ -302,7 +302,7 @@
throw new MissingResourceException("GameObjectMatcher 'monster' does not exist", null, null);
}
final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager(), 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);
- final GameObjectAttributesPanel gameObjectAttributesPanel = new GameObjectAttributesPanel(this, getMapManager(), animationObjects, lockedItemsControl, monsterMatcher);
+ final GameObjectAttributesPanel gameObjectAttributesPanel = new GameObjectAttributesPanel(this, getMapManager(), animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareControl.getSelectedSquareView());
mainView.init(gameObjectAttributesPanel, selectedSquareControl.getSelectedSquareView(), typeList, mapTileListBottom, gameObjectMatchers, archetypeChooserControl);
mapActions.updateMenuState();
scriptControl.getView().setMenu((JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "plugins"));
Modified: trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java 2008-07-14 20:01:02 UTC (rev 4327)
+++ trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java 2008-07-14 20:09:15 UTC (rev 4328)
@@ -28,6 +28,8 @@
import net.sf.gridarta.gameobject.anim.AnimationObjects;
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gui.connectionview.LockedItemsControl;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import org.jetbrains.annotations.NotNull;
/**
@@ -43,8 +45,8 @@
private static final long serialVersionUID = 1L;
/* Build Panel */
- public GameObjectAttributesPanel(final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final AnimationObjects<?> animationObjects, final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl, @NotNull final GameObjectMatcher monsterMatcher) {
- super(mainControl, mapManager, animationObjects, lockedItemsControl, monsterMatcher);
+ public GameObjectAttributesPanel(final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final AnimationObjects<?> animationObjects, final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl, @NotNull final GameObjectMatcher monsterMatcher, @NotNull final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView) {
+ super(mainControl, mapManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView);
}
/** {@inheritDoc} */
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-07-14 20:01:02 UTC (rev 4327)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-07-14 20:09:15 UTC (rev 4328)
@@ -357,7 +357,7 @@
throw new MissingResourceException("GameObjectMatcher 'monster' does not exist", null, null);
}
final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager(), 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);
- final GameObjectAttributesPanel gameObjectAttributesPanel = new GameObjectAttributesPanel(this, getMapManager(), animationObjects, lockedItemsControl, monsterMatcher);
+ final GameObjectAttributesPanel gameObjectAttributesPanel = new GameObjectAttributesPanel(this, getMapManager(), animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareControl.getSelectedSquareView());
mainView.init(gameObjectAttributesPanel, selectedSquareControl.getSelectedSquareView(), typeList, mapTileListBottom, gameObjectMatchers, archetypeChooserControl);
mapActions.updateMenuState();
archetypeParser = new ArchetypeParser(this, archetypeChooserControl, animationObjects, archetypeSet);
Modified: trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java 2008-07-14 20:01:02 UTC (rev 4327)
+++ trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java 2008-07-14 20:09:15 UTC (rev 4328)
@@ -28,6 +28,8 @@
import net.sf.gridarta.gameobject.anim.AnimationObjects;
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gui.connectionview.LockedItemsControl;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import org.jetbrains.annotations.NotNull;
/**
@@ -43,8 +45,8 @@
private static final long serialVersionUID = 1L;
/* Build Panel */
- public GameObjectAttributesPanel(final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final AnimationObjects<?> animationObjects, final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl, @NotNull final GameObjectMatcher monsterMatcher) {
- super(mainControl, mapManager, animationObjects, lockedItemsControl, monsterMatcher);
+ public GameObjectAttributesPanel(final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final AnimationObjects<?> animationObjects, final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl, @NotNull final GameObjectMatcher monsterMatcher, @NotNull final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView) {
+ super(mainControl, mapManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView);
}
/** {@inheritDoc} */
Modified: trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java 2008-07-14 20:01:02 UTC (rev 4327)
+++ trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java 2008-07-14 20:09:15 UTC (rev 4328)
@@ -58,7 +58,9 @@
import net.sf.gridarta.gui.gameobjecttexteditor.GameObjectTextEditor;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.MapViewBasic;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
import net.sf.gridarta.gui.selectedsquare.SelectedSquareListener;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapModel;
@@ -114,6 +116,12 @@
@NotNull
private final AnimationObjects<?> animationObjects;
+ @NotNull
+ private final SelectedSquareControl<G, A, R, V> selectedSquareControl;
+
+ @NotNull
+ private final SelectedSquareView<G, A, R, V> selectedSquareView;
+
/** The tabs of this GameObjectAttributesPanel. */
protected final JTabbedPane panelDesktop = new JTabbedPane(SwingConstants.TOP);
@@ -269,12 +277,14 @@
* @param monsterMatcher the <code>GameObjectMatcher</code> for matching
* monster objects
*/
- protected GameObjectAttributesPanel(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final AnimationObjects<?> animationObjects, final LockedItemsControl<G, A, R, V> lockedItemsControl, @NotNull final GameObjectMatcher monsterMatcher) {
+ protected GameObjectAttributesPanel(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final AnimationObjects<?> animationObjects, final LockedItemsControl<G, A, R, V> lockedItemsControl, @NotNull final GameObjectMatcher monsterMatcher, @NotNull final SelectedSquareControl<G, A, R, V> selectedSquareControl, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView) {
super(new BorderLayout());
this.mainControl = mainControl;
this.mapManager = mapManager;
this.animationObjects = animationObjects;
- errorListView = new ErrorListView<G, A, R, V>(mapManager, mainControl.getSelectedSquareControl().getSelectedSquareView());
+ this.selectedSquareControl = selectedSquareControl;
+ this.selectedSquareView = selectedSquareView;
+ errorListView = new ErrorListView<G, A, R, V>(mapManager, selectedSquareView);
gameObjectTextEditor = new GameObjectTextEditor();
@@ -299,7 +309,7 @@
panelDesktop.add(createMonsterPanel(monsterMatcher), "Monster");
panelDesktop.add(errorListView, "Warnings");
- mainControl.getSelectedSquareControl().addSelectedSquareListener(selectedSquareListener);
+ selectedSquareControl.addSelectedSquareListener(selectedSquareListener);
refreshDisplay();
currentMap = mapManager.getCurrentMap();
@@ -588,7 +598,7 @@
/** This method is invoked when the user pressed the "new script" button. */
public void addNewScriptWanted() {
- final G gameObject = mainControl.getSelectedSquareControl().getSelectedSquareView().getSelectedGameObject(); // get selected arch
+ final G gameObject = selectedSquareView.getSelectedGameObject(); // get selected arch
if (gameObject != null) {
final MapSquare<G, A, R> mapSquare = gameObject.getHead().getMapSquare();
assert mapSquare != null;
@@ -606,7 +616,7 @@
* @param task Script type to edit (?).
*/
public void editScriptWanted(final int task) {
- final G gameObject = mainControl.getSelectedSquareControl().getSelectedSquareView().getSelectedGameObject(); // get selected gameObject
+ final G gameObject = selectedSquareView.getSelectedGameObject(); // get selected gameObject
if (gameObject == null) {
return;
}
@@ -637,7 +647,7 @@
/** Action method for applying the changes made in the arch panel. */
@ActionMethod
public void mapArchApply() {
- applyArchPanelChanges(mainControl.getSelectedSquareControl().getSelectedSquareView().getSelectedGameObject());
+ applyArchPanelChanges(selectedSquareView.getSelectedGameObject());
}
/**
@@ -646,7 +656,7 @@
*/
@ActionMethod
public void mapArchAttrib() {
- mainControl.openAttrDialog(mainControl.getSelectedSquareControl().getSelectedSquareView().getSelectedGameObject());
+ mainControl.openAttrDialog(selectedSquareView.getSelectedGameObject());
}
/**
@@ -660,7 +670,7 @@
return;
}
- G inv = mainControl.getSelectedSquareControl().getSelectedSquareView().getSelectedGameObject();
+ G inv = selectedSquareView.getSelectedGameObject();
if (inv == null) {
return;
}
@@ -852,7 +862,7 @@
* @param direction Direction number
*/
private void direction(final int direction) {
- applyDirectionChanges(mainControl.getSelectedSquareControl().getSelectedSquareView().getSelectedGameObject(), direction);
+ applyDirectionChanges(selectedSquareView.getSelectedGameObject(), direction);
}
/** Action method for direction. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-14 20:12:12
|
Revision: 4329
http://gridarta.svn.sourceforge.net/gridarta/?rev=4329&view=rev
Author: akirschbaum
Date: 2008-07-14 13:12:19 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Remove calls to MainControl.getSelectedSquareControl().
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java
Modified: trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
===================================================================
--- trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java 2008-07-14 20:09:15 UTC (rev 4328)
+++ trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java 2008-07-14 20:12:19 UTC (rev 4329)
@@ -124,13 +124,13 @@
/** {@inheritDoc} */
@NotNull
public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject) {
- return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, CMainControl.getInstance(), objects, mapArchObject, false, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl);
+ return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, CMainControl.getInstance(), objects, mapArchObject, false, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, selectedSquareView);
}
/** {@inheritDoc} */
@NotNull
public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newPickmapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject) {
- return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, CMainControl.getInstance(), objects, mapArchObject, true, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl);
+ return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, CMainControl.getInstance(), objects, mapArchObject, true, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, selectedSquareView);
}
/** {@inheritDoc} */
Modified: trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
===================================================================
--- trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java 2008-07-14 20:09:15 UTC (rev 4328)
+++ trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java 2008-07-14 20:12:19 UTC (rev 4329)
@@ -124,13 +124,13 @@
/** {@inheritDoc} */
@NotNull
public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject) {
- return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, CMainControl.getInstance(), objects, mapArchObject, false, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl);
+ return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, CMainControl.getInstance(), objects, mapArchObject, false, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, selectedSquareView);
}
/** {@inheritDoc} */
@NotNull
public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newPickmapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject) {
- final DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl = new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, CMainControl.getInstance(), objects, mapArchObject, true, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl);
+ final DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl = new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, CMainControl.getInstance(), objects, mapArchObject, true, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl, selectedSquareView);
mapArchObject.setDifficulty(1);
return mapControl;
}
Modified: trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java 2008-07-14 20:09:15 UTC (rev 4328)
+++ trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java 2008-07-14 20:12:19 UTC (rev 4329)
@@ -39,6 +39,7 @@
import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.MapViewBasic;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.io.DefaultMapWriter;
import net.sf.gridarta.io.MapWriter;
import net.sf.japi.swing.ActionFactory;
@@ -79,6 +80,9 @@
/** Flag that indicates whether this is a pickmap or not. */
private final boolean isPickmap;
+ /** The selected square view. */
+ private final SelectedSquareView<G, A, R, V> selectedSquareView;
+
/** The map data of this level. */
private final MapModel<G, A, R> mapModel;
@@ -149,11 +153,13 @@
* @param isPickmap true if this is a pickmap
* @param exitTypeGameObjectMatcher the matcher to select exit objects
* @param archetypeChooserControl the archeype chooser control to use
+ * @param selectedSquareView the selected square view
*/
- public DefaultMapControl(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final MainControl<G, A, R, V> mainControl, final List<G> objects, final A mapArchObject, final boolean isPickmap, @Nullable final GameObjectMatcher exitTypeGameObjectMatcher, @NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl) {
+ public DefaultMapControl(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final MainControl<G, A, R, V> mainControl, final List<G> objects, final A mapArchObject, final boolean isPickmap, @Nullable final GameObjectMatcher exitTypeGameObjectMatcher, @NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView) {
this.gridartaObjectsFactory = gridartaObjectsFactory;
this.mainControl = mainControl;
this.isPickmap = isPickmap;
+ this.selectedSquareView = selectedSquareView;
// we create model (= data)
mapModel = new DefaultMapModel<G, A, R>(mainControl, this, objects, mapArchObject, exitTypeGameObjectMatcher, archetypeChooserControl);
mapModel.addMapModelListener(mapModelListener);
@@ -238,7 +244,7 @@
final MapControl<G, A, R, V> currentMap = mainControl.getMapManager().getCurrentMap();
// insertion is only allowed for valid *empty* squares
if (currentMap != null && isPickmap()) {
- final G newarch = mainControl.getSelectedSquareControl().getSelectedSquareView().getSelectedGameObject();
+ final G newarch = selectedSquareView.getSelectedGameObject();
if (newarch != null) {
mapModel.insertMapArchToPickmap(pos, newarch);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-14 20:21:23
|
Revision: 4330
http://gridarta.svn.sourceforge.net/gridarta/?rev=4330&view=rev
Author: akirschbaum
Date: 2008-07-14 13:21:29 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Remove calls to MainControl.getSelectedSquareControl().
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-14 20:12:19 UTC (rev 4329)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-14 20:21:29 UTC (rev 4330)
@@ -233,7 +233,9 @@
animationObjects = new cfeditor.gameobject.anim.AnimationObjects();
archetypeSet = new ArchetypeSet(this, animationObjects, faceObjects);
scriptControl = new ScriptController(this);
- mapCursorControl = new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("cfeditor", this, getMapManager());
+ final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
+ selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mapTileListBottom, null);
+ mapCursorControl = new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("cfeditor", this, getMapManager(), selectedSquareControl, selectedSquareControl.getSelectedSquareView());
ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod", "about");
mapManagerActions = new MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager());
globalSettings.readGlobalSettings();
@@ -242,8 +244,6 @@
newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, 0, false, false, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR), mapManager);
newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
- final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
- selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mapTileListBottom, null);
objectChooser = new ObjectChooser(this, selectedSquareControl.getSelectedSquareView(), archetypeChooserControl, mapManager, pickmapChooserControl);
mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser);
getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl, pickmapChooserControl, selectedSquareControl.getSelectedSquareView());
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-07-14 20:12:19 UTC (rev 4329)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-07-14 20:21:29 UTC (rev 4330)
@@ -284,7 +284,9 @@
instance = this;
animationObjects = new daieditor.gameobject.anim.AnimationObjects();
archetypeSet = new ArchetypeSet(this, animationObjects, faceObjects);
- mapCursorControl = new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("daieditor", this, getMapManager());
+ final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
+ selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mapTileListBottom, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH));
+ mapCursorControl = new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("daieditor", this, getMapManager(), selectedSquareControl, selectedSquareControl.getSelectedSquareView());
ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "zoom", "gc", "onlineHelp", "tod", "about");
ACTION_FACTORY.createToggles(true, this, "drawDouble");
ACTION_FACTORY.createAction(true, "collectSpells", this);
@@ -295,8 +297,6 @@
newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPDIFFICULTY, true, true, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR), mapManager);
newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
- final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
- selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, this, mapTileListBottom, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH));
objectChooser = new ObjectChooser(this, selectedSquareControl.getSelectedSquareView(), archetypeChooserControl, mapManager, pickmapChooserControl);
mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser);
getGridartaObjectsFactory().init(faceObjects, objectChooser, archetypeChooserControl, pickmapChooserControl, selectedSquareControl.getSelectedSquareView());
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java 2008-07-14 20:12:19 UTC (rev 4329)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java 2008-07-14 20:21:29 UTC (rev 4330)
@@ -41,6 +41,12 @@
/** The MainControl. */
private final MainControl<G, A, R, V> mainControl;
+ /** The selected square control. */
+ private final SelectedSquareControl<G, A, R, V> selectedSquareControl;
+
+ /** The selected square view. */
+ private final SelectedSquareView<G, A, R, V> selectedSquareView;
+
@NotNull
private final MapCursorActions<G, A, R, V> actions;
@@ -56,9 +62,13 @@
* @param mainControl MainControl to use (used for getting the current map
* etc.)
* @param mapManager the map manager
+ * @param selectedSquareControl the selected square control
+ * @param selectedSquareView the selected square view
*/
- public MapCursorControl(final String key, final MainControl<G, A, R, V> mainControl, final MapManager<G, A, R, V> mapManager) {
+ public MapCursorControl(final String key, final MainControl<G, A, R, V> mainControl, final MapManager<G, A, R, V> mapManager, @NotNull final SelectedSquareControl<G, A, R, V> selectedSquareControl, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView) {
this.mainControl = mainControl;
+ this.selectedSquareControl = selectedSquareControl;
+ this.selectedSquareView = selectedSquareView;
goLocationDialogManager = new GoLocationDialogManager<G, A, R, V>(mapManager);
actions = new MapCursorActions<G, A, R, V>(key, this, mainControl, mapManager);
}
@@ -100,14 +110,10 @@
}
public void insertArch() {
- final SelectedSquareControl<G, A, R, V> selectedSquareControl = mainControl.getSelectedSquareControl();
- assert selectedSquareControl != null;
selectedSquareControl.insertGameObjectFromObjectChooser();
}
public void deleteArch() {
- final SelectedSquareControl<G, A, R, V> selectedSquareControl = mainControl.getSelectedSquareControl();
- assert selectedSquareControl != null;
selectedSquareControl.deleteSelection();
}
@@ -117,17 +123,11 @@
* below is selected
*/
public void selectArch(final boolean above) {
- final SelectedSquareControl<G, A, R, V> selectedSquareControl = mainControl.getSelectedSquareControl();
- assert selectedSquareControl != null;
- final SelectedSquareView<G, A, R, V> selectedSquareView = selectedSquareControl.getSelectedSquareView();
- assert selectedSquareView != null;
selectedSquareView.selectArch(above);
}
public void archAttributes() {
- final SelectedSquareControl<G, A, R, V> selectedSquareControl = mainControl.getSelectedSquareControl();
- assert selectedSquareControl != null;
- final G arch = selectedSquareControl.getSelectedSquareView().getSelectedGameObject();
+ final G arch = selectedSquareView.getSelectedGameObject();
if (arch != null) {
mainControl.openAttrDialog(arch);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X