Menu
▾
▴
gridarta-commit — svn commit digest list (high traffic)
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(103) |
Jun
(121) |
Jul
(16) |
Aug
(67) |
Sep
(126) |
Oct
(161) |
Nov
(164) |
Dec
(588) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(394) |
Feb
(181) |
Mar
(131) |
Apr
(180) |
May
(255) |
Jun
(11) |
Jul
(79) |
Aug
(70) |
Sep
(274) |
Oct
(138) |
Nov
(195) |
Dec
(8) |
| 2008 |
Jan
(3) |
Feb
(142) |
Mar
(162) |
Apr
(124) |
May
(148) |
Jun
(157) |
Jul
(425) |
Aug
(373) |
Sep
(264) |
Oct
(315) |
Nov
(225) |
Dec
(6) |
| 2009 |
Jan
(67) |
Feb
(78) |
Mar
(279) |
Apr
(294) |
May
(92) |
Jun
(65) |
Jul
(134) |
Aug
(41) |
Sep
(138) |
Oct
(125) |
Nov
(126) |
Dec
(122) |
| 2010 |
Jan
(15) |
Feb
(48) |
Mar
(9) |
Apr
(195) |
May
(373) |
Jun
(507) |
Jul
(42) |
Aug
(16) |
Sep
(38) |
Oct
(81) |
Nov
(64) |
Dec
(18) |
| 2011 |
Jan
(13) |
Feb
(12) |
Mar
(39) |
Apr
(1) |
May
(2) |
Jun
(27) |
Jul
(27) |
Aug
(31) |
Sep
(14) |
Oct
(102) |
Nov
(20) |
Dec
(37) |
| 2012 |
Jan
(22) |
Feb
(1) |
Mar
(1) |
Apr
(2) |
May
(2) |
Jun
(18) |
Jul
(6) |
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
(2) |
Mar
(1) |
Apr
(1) |
May
(47) |
Jun
(7) |
Jul
(107) |
Aug
|
Sep
|
Oct
(112) |
Nov
(31) |
Dec
(17) |
| 2014 |
Jan
(29) |
Feb
(111) |
Mar
(34) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(18) |
Dec
(10) |
|
From: <aki...@us...> - 2010-05-17 17:45:05
|
Revision: 7835
http://gridarta.svn.sourceforge.net/gridarta/?rev=7835&view=rev
Author: akirschbaum
Date: 2010-05-17 17:44:58 +0000 (Mon, 17 May 2010)
Log Message:
-----------
Fix incorrect text resource keys.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-17 17:33:21 UTC (rev 7834)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-17 17:44:58 UTC (rev 7835)
@@ -95,9 +95,9 @@
closeAllMaps.mnemonic=L
closeAllMaps.accel=ctrl shift pressed W
-closeAllMaps.text=Save All
-saveAll.shortdescription=Save all maps
-closeAllMaps.longdescription=Saves all opened maps
+saveAllMaps.text=Save All
+saveAllMaps.shortdescription=Save all maps
+saveAllMaps.longdescription=Saves all opened maps
gridVisible.text=Show Grid
gridVisible.mnemonic=G
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-17 17:33:21 UTC (rev 7834)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-17 17:44:58 UTC (rev 7835)
@@ -83,9 +83,9 @@
closeAllMaps.longdescription=Schlie\xDFt alle ge\xF6ffneten Karten.
closeAllMaps.mnemonic=A
-closeAllMaps.text=Alle speichern
-closeAllMaps.shortdescription=Alle Karten speichern
-closeAllMaps.longdescription=Speichert alle ge\xF6ffneten Karten.
+saveAllMaps.text=Alle speichern
+saveAllMaps.shortdescription=Alle Karten speichern
+saveAllMaps.longdescription=Speichert alle ge\xF6ffneten Karten.
gridVisible.text=Gitter anzeigen
gridVisible.mnemonic=G
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-17 17:33:21 UTC (rev 7834)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-17 17:44:58 UTC (rev 7835)
@@ -82,9 +82,9 @@
#closeAllMaps.longdescription=
closeAllMaps.mnemonic=T
-#closeAllMaps.text=
-#closeAllMaps.shortdescription=
-#closeAllMaps.longdescription=
+#saveAllMaps.text=
+#saveAllMaps.shortdescription=
+#saveAllMaps.longdescription=
gridVisible.text=Montrer la grille
gridVisible.mnemonic=G
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-17 17:33:21 UTC (rev 7834)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-17 17:44:58 UTC (rev 7835)
@@ -82,9 +82,9 @@
closeAllMaps.longdescription=St\xE4nger alla \xF6ppnade kartor
closeAllMaps.mnemonic=S
-#closeAllMaps.text=
-#closeAllMaps.shortdescription=
-#closeAllMaps.longdescription=
+#saveAllMaps.text=
+#saveAllMaps.shortdescription=
+#saveAllMaps.longdescription=
gridVisible.text=Visa rutn\xE4t
gridVisible.mnemonic=R
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-17 17:33:27
|
Revision: 7834
http://gridarta.svn.sourceforge.net/gridarta/?rev=7834&view=rev
Author: akirschbaum
Date: 2010-05-17 17:33:21 +0000 (Mon, 17 May 2010)
Log Message:
-----------
Add comment.
Modified Paths:
--------------
trunk/crossfire/resource/conf/GameObjectMatchers.xml
Modified: trunk/crossfire/resource/conf/GameObjectMatchers.xml
===================================================================
--- trunk/crossfire/resource/conf/GameObjectMatchers.xml 2010-05-17 07:10:16 UTC (rev 7833)
+++ trunk/crossfire/resource/conf/GameObjectMatchers.xml 2010-05-17 17:33:21 UTC (rev 7834)
@@ -196,7 +196,8 @@
</And>
</GameObjectMatcher>
- <!-- Objects to be treated as exits by the GUI -->
+ <!-- Objects to be treated as exits by the GUI and in the 'Exit path is not
+ absolute' map validator-->
<GameObjectMatcher id="system_exit" system="true">
<title xml:lang="en">Exit</title>
<title xml:lang="de">Ausgang</title>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-17 07:10:23
|
Revision: 7833
http://gridarta.svn.sourceforge.net/gridarta/?rev=7833&view=rev
Author: akirschbaum
Date: 2010-05-17 07:10:16 +0000 (Mon, 17 May 2010)
Log Message:
-----------
Add @NotNull/@Nullable annotations.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/misc/About.java
Modified: trunk/src/app/net/sf/gridarta/gui/misc/About.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/misc/About.java 2010-05-16 20:11:57 UTC (rev 7832)
+++ trunk/src/app/net/sf/gridarta/gui/misc/About.java 2010-05-17 07:10:16 UTC (rev 7833)
@@ -26,6 +26,7 @@
import net.sf.japi.swing.action.ActionBuilderFactory;
import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* The about dialog.
@@ -36,21 +37,25 @@
/**
* Action Builder to create Actions.
*/
+ @NotNull
private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
/**
* The AboutDialog.
*/
+ @Nullable
private WeakReference<AboutDialog> aboutDialogRef = null;
/**
* The parent component for the about dialog.
*/
+ @NotNull
private final Component parent;
/**
* The synchronization object.
*/
+ @NotNull
private final Object sync = new Object();
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 20:12:05
|
Revision: 7832
http://gridarta.svn.sourceforge.net/gridarta/?rev=7832&view=rev
Author: akirschbaum
Date: 2010-05-16 20:11:57 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Remove incorrect action names.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 20:10:56 UTC (rev 7831)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 20:11:57 UTC (rev 7832)
@@ -469,7 +469,7 @@
final HelpActions helpActions = new HelpActions(mainViewFrame);
ACTION_BUILDER.createActions(true, helpActions, "showHelp", "tipOfTheDay");
ACTION_BUILDER.createActions(true, newMapDialogFactory, "newMap");
- ACTION_BUILDER.createActions(true, this, "cleanCompletelyBlockedSquares", "collectSpells", "controlClient", "controlServer", "gc", "onlineHelp", "options", "tod", "zoom");
+ ACTION_BUILDER.createActions(true, this, "cleanCompletelyBlockedSquares", "collectSpells", "controlClient", "controlServer", "gc", "options", "zoom");
new MapCursorActions<G, A, R>(gameObjectAttributesDialogFactory, mapViewManager, selectedSquareControl, selectedSquareModel);
ACTION_BUILDER.createActions(true, scriptEditControl, "newScript");
ACTION_BUILDER.createActions(true, fileControl, "editScript", "openFile", "saveAllMaps");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 20:11:03
|
Revision: 7831
http://gridarta.svn.sourceforge.net/gridarta/?rev=7831&view=rev
Author: akirschbaum
Date: 2010-05-16 20:10:56 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Add @ActionMethod annotations.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserView.java
trunk/src/app/net/sf/gridarta/gui/exitconnector/ExitConnectorController.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/ArchTab.java
trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursorActions.java
trunk/src/app/net/sf/gridarta/gui/map/mapactions/DefaultMapActions.java
trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewActions.java
trunk/src/app/net/sf/gridarta/gui/mapdesktop/MapDesktop.java
trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
trunk/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java
trunk/src/app/net/sf/gridarta/gui/undo/UndoControl.java
trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/Actions.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditUndoActions.java
trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java
Modified: trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserView.java 2010-05-16 19:13:06 UTC (rev 7830)
+++ trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserView.java 2010-05-16 20:10:56 UTC (rev 7831)
@@ -42,6 +42,7 @@
import net.sf.gridarta.utils.CommonConstants;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -301,6 +302,7 @@
/**
* Sets whether game object names are shown.
*/
+ @ActionMethod
public void displayGameObjectNames() {
setDisplayMode(displayModeGameObjectNames);
}
@@ -308,6 +310,7 @@
/**
* Sets whether archetype names are shown.
*/
+ @ActionMethod
public void displayArchetypeNames() {
setDisplayMode(displayModeArchetypeNames);
}
@@ -315,6 +318,7 @@
/**
* Sets whether icons are shown.
*/
+ @ActionMethod
public void displayIconsOnly() {
setDisplayMode(displayModeIconsOnly);
}
Modified: trunk/src/app/net/sf/gridarta/gui/exitconnector/ExitConnectorController.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/exitconnector/ExitConnectorController.java 2010-05-16 19:13:06 UTC (rev 7830)
+++ trunk/src/app/net/sf/gridarta/gui/exitconnector/ExitConnectorController.java 2010-05-16 20:10:56 UTC (rev 7831)
@@ -37,6 +37,7 @@
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -173,6 +174,7 @@
/**
* Action method for "copy exit".
*/
+ @ActionMethod
public void exitCopy() {
doExitCopy(true);
}
@@ -180,6 +182,7 @@
/**
* Action method for "paste exit".
*/
+ @ActionMethod
public void exitPaste() {
doExitPaste(true);
}
@@ -187,6 +190,7 @@
/**
* Action method for "connect exit".
*/
+ @ActionMethod
public void exitConnect() {
doExitConnect(true);
}
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/ArchTab.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/ArchTab.java 2010-05-16 19:13:06 UTC (rev 7830)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/ArchTab.java 2010-05-16 20:10:56 UTC (rev 7831)
@@ -43,6 +43,7 @@
import net.sf.gridarta.model.map.mapmodel.MapSquare;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -388,6 +389,7 @@
/**
* Action method for direction.
*/
+ @ActionMethod
public void direction0() {
direction(0);
}
@@ -395,6 +397,7 @@
/**
* Action method for direction.
*/
+ @ActionMethod
public void direction1() {
direction(1);
}
@@ -402,6 +405,7 @@
/**
* Action method for direction.
*/
+ @ActionMethod
public void direction2() {
direction(2);
}
@@ -409,6 +413,7 @@
/**
* Action method for direction.
*/
+ @ActionMethod
public void direction3() {
direction(3);
}
@@ -416,6 +421,7 @@
/**
* Action method for direction.
*/
+ @ActionMethod
public void direction4() {
direction(4);
}
@@ -423,6 +429,7 @@
/**
* Action method for direction.
*/
+ @ActionMethod
public void direction5() {
direction(5);
}
@@ -430,6 +437,7 @@
/**
* Action method for direction.
*/
+ @ActionMethod
public void direction6() {
direction(6);
}
@@ -437,6 +445,7 @@
/**
* Action method for direction.
*/
+ @ActionMethod
public void direction7() {
direction(7);
}
@@ -444,6 +453,7 @@
/**
* Action method for direction.
*/
+ @ActionMethod
public void direction8() {
direction(8);
}
Modified: trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursorActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursorActions.java 2010-05-16 19:13:06 UTC (rev 7830)
+++ trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursorActions.java 2010-05-16 20:10:56 UTC (rev 7831)
@@ -37,6 +37,7 @@
import net.sf.gridarta.utils.CommonConstants;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -217,6 +218,7 @@
/**
* Action method for "cursor north".
*/
+ @ActionMethod
public void goNorth() {
final MapCursor mapCursor = getGoEnabled();
if (mapCursor != null) {
@@ -227,6 +229,7 @@
/**
* Action method for "cursor south".
*/
+ @ActionMethod
public void goSouth() {
final MapCursor mapCursor = getGoEnabled();
if (mapCursor != null) {
@@ -237,6 +240,7 @@
/**
* Action method for "cursor east".
*/
+ @ActionMethod
public void goEast() {
final MapCursor mapCursor = getGoEnabled();
if (mapCursor != null) {
@@ -247,6 +251,7 @@
/**
* Action method for "cursor west".
*/
+ @ActionMethod
public void goWest() {
final MapCursor mapCursor = getGoEnabled();
if (mapCursor != null) {
@@ -257,6 +262,7 @@
/**
* Action method for "cursor north east".
*/
+ @ActionMethod
public void goNorthEast() {
final MapCursor mapCursor = getGoEnabled();
if (mapCursor != null) {
@@ -267,6 +273,7 @@
/**
* Action method for "cursor north west".
*/
+ @ActionMethod
public void goNorthWest() {
final MapCursor mapCursor = getGoEnabled();
if (mapCursor != null) {
@@ -277,6 +284,7 @@
/**
* Action method for "cursor south east".
*/
+ @ActionMethod
public void goSouthEast() {
final MapCursor mapCursor = getGoEnabled();
if (mapCursor != null) {
@@ -287,6 +295,7 @@
/**
* Action method for "cursor south west".
*/
+ @ActionMethod
public void goSouthWest() {
final MapCursor mapCursor = getGoEnabled();
if (mapCursor != null) {
@@ -297,6 +306,7 @@
/**
* Action method for "go location".
*/
+ @ActionMethod
public void goLocation() {
final MapView<G, A, R> mapView = getGoLocationEnabled();
if (mapView != null) {
@@ -307,6 +317,7 @@
/**
* Action method for "select square".
*/
+ @ActionMethod
public void selectSquare() {
final MapCursor mapCursor = getSelectSquareEnabled();
if (mapCursor != null) {
@@ -317,6 +328,7 @@
/**
* Action method for "add to selection".
*/
+ @ActionMethod
public void addToSelection() {
final MapCursor mapCursor = getAddToSelectionEnabled();
if (mapCursor != null) {
@@ -327,6 +339,7 @@
/**
* Action method for "remove from selection".
*/
+ @ActionMethod
public void subFromSelection() {
final MapCursor mapCursor = getSubFromSelectionEnabled();
if (mapCursor != null) {
@@ -337,6 +350,7 @@
/**
* Action method for "start stop drag".
*/
+ @ActionMethod
public void startStopDrag() {
final MapCursor mapCursor = getStartStopDragEnabled();
if (mapCursor != null) {
@@ -347,6 +361,7 @@
/**
* Action method for "release drag".
*/
+ @ActionMethod
public void releaseDrag() {
final MapCursor mapCursor = getReleaseDragEnabled();
if (mapCursor != null) {
@@ -357,6 +372,7 @@
/**
* Action method for "insert arch".
*/
+ @ActionMethod
public void insertArch() {
final MapView<G, A, R> mapView = getInsertArchEnabled();
if (mapView != null) {
@@ -367,6 +383,7 @@
/**
* Action method for "delete arch".
*/
+ @ActionMethod
public void deleteArch() {
final MapView<G, A, R> mapView = getDeleteArchEnabled();
if (mapView != null) {
@@ -377,6 +394,7 @@
/**
* Action method for "select arch above".
*/
+ @ActionMethod
public void selectArchAbove() {
final MapCursor mapCursor = getSelectArchAboveEnabled();
if (mapCursor != null) {
@@ -387,6 +405,7 @@
/**
* Action method for "select arch below".
*/
+ @ActionMethod
public void selectArchBelow() {
final MapCursor mapCursor = getSelectArchBelowEnabled();
if (mapCursor != null) {
@@ -397,6 +416,7 @@
/**
* Action method for "arch attributes".
*/
+ @ActionMethod
public void archAttributes() {
final G gameObject = getArchAttributesEnabled();
if (gameObject != null) {
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapactions/DefaultMapActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/DefaultMapActions.java 2010-05-16 19:13:06 UTC (rev 7830)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/DefaultMapActions.java 2010-05-16 20:10:56 UTC (rev 7831)
@@ -62,6 +62,7 @@
import net.sf.gridarta.utils.Size2D;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import net.sf.japi.swing.action.ToggleAction;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -512,6 +513,7 @@
/**
* Action method for "create view".
*/
+ @ActionMethod
public void mapCreateView() {
final MapView<G, A, R> mapView = getCreateViewEnabled();
if (mapView != null) {
@@ -522,6 +524,7 @@
/**
* Action method for "map properties".
*/
+ @ActionMethod
public void mapProperties() {
final MapView<G, A, R> mapView = getMapPropertiesEnabled();
if (mapView != null) {
@@ -532,6 +535,7 @@
/**
* Action method for "shrink map size".
*/
+ @ActionMethod
public void shrinkMapSize() {
final MapView<G, A, R> mapView = getShrinkMapSizeEnabled();
if (mapView != null) {
@@ -544,6 +548,7 @@
* @return <code>true</code> if autojoining is enabled, or
* <code>false</code> if autojoining is disabled
*/
+ @ActionMethod
public boolean isAutoJoin() {
return mapViewSettings.isAutojoin();
}
@@ -552,6 +557,7 @@
* Action method for "autojoin".
* @param autojoin if set, enable autojoining
*/
+ @ActionMethod
public void setAutoJoin(final boolean autojoin) {
if (isAutojoinEnabled()) {
mapViewSettings.setAutojoin(autojoin);
@@ -561,6 +567,7 @@
/**
* Try to load the map where the selected map-exit points to.
*/
+ @ActionMethod
public void enterExit() {
final GameObject<G, A, R> exit = getEnterExitEnabled();
if (exit == null) {
@@ -586,6 +593,7 @@
/**
* Select the next exit.
*/
+ @ActionMethod
public void nextExit() {
final MapView<G, A, R> mapView = getNextExitEnabled();
if (mapView == null) {
@@ -604,6 +612,7 @@
/**
* Select the previous exit.
*/
+ @ActionMethod
public void prevExit() {
final MapView<G, A, R> mapView = getPrevExitEnabled();
if (mapView == null) {
@@ -670,6 +679,7 @@
/**
* Action method for entering the north map.
*/
+ @ActionMethod
public void enterNorthMap() {
enterMap(CommonConstants.NORTH);
}
@@ -677,6 +687,7 @@
/**
* Action method for entering the north east map.
*/
+ @ActionMethod
public void enterNorthEastMap() {
enterMap(CommonConstants.NORTH_EAST);
}
@@ -684,6 +695,7 @@
/**
* Action method for entering the east map.
*/
+ @ActionMethod
public void enterEastMap() {
enterMap(CommonConstants.EAST);
}
@@ -691,6 +703,7 @@
/**
* Action method for entering the south east map.
*/
+ @ActionMethod
public void enterSouthEastMap() {
enterMap(CommonConstants.SOUTH_EAST);
}
@@ -698,6 +711,7 @@
/**
* Action method for entering the south map.
*/
+ @ActionMethod
public void enterSouthMap() {
enterMap(CommonConstants.SOUTH);
}
@@ -705,6 +719,7 @@
/**
* Action method for entering the south west map.
*/
+ @ActionMethod
public void enterSouthWestMap() {
enterMap(CommonConstants.SOUTH_WEST);
}
@@ -712,6 +727,7 @@
/**
* Action method for entering the west map.
*/
+ @ActionMethod
public void enterWestMap() {
enterMap(CommonConstants.WEST);
}
@@ -719,6 +735,7 @@
/**
* Action method for entering the north west map.
*/
+ @ActionMethod
public void enterNorthWestMap() {
enterMap(CommonConstants.NORTH_WEST);
}
@@ -726,6 +743,7 @@
/**
* Deletes all game objects referencing unknown archetypes.
*/
+ @ActionMethod
public void deleteUnknownObjects() {
final MapView<G, A, R> mapView = getDeleteUnknownObjectsEnabled();
if (mapView == null) {
Modified: trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewActions.java 2010-05-16 19:13:06 UTC (rev 7830)
+++ trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewActions.java 2010-05-16 20:10:56 UTC (rev 7831)
@@ -35,6 +35,7 @@
import net.sf.gridarta.model.match.NamedGameObjectMatcher;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -196,6 +197,7 @@
/**
* Action method for "reset view".
*/
+ @ActionMethod
public void resetView() {
// set edit type to zero (-> show all)
mapViewSettings.unsetEditType(~0);
Modified: trunk/src/app/net/sf/gridarta/gui/mapdesktop/MapDesktop.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapdesktop/MapDesktop.java 2010-05-16 19:13:06 UTC (rev 7830)
+++ trunk/src/app/net/sf/gridarta/gui/mapdesktop/MapDesktop.java 2010-05-16 20:10:56 UTC (rev 7831)
@@ -44,6 +44,7 @@
import net.sf.gridarta.model.map.mapcontrol.MapControl;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.apache.log4j.Category;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
@@ -412,6 +413,7 @@
/**
* Gives focus to the next window.
*/
+ @ActionMethod
public void prevWindow() {
if (mapViewManager.prevWindow(true)) {
updateFocus(false);
@@ -421,6 +423,7 @@
/**
* Gives focus to the previous window.
*/
+ @ActionMethod
public void nextWindow() {
if (mapViewManager.nextWindow(true)) {
updateFocus(false);
Modified: trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java 2010-05-16 19:13:06 UTC (rev 7830)
+++ trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java 2010-05-16 20:10:56 UTC (rev 7831)
@@ -33,6 +33,7 @@
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -172,6 +173,7 @@
/**
* Action callback function to create a new pickmap folder.
*/
+ @ActionMethod
public void createPickmapFolder() {
newMapDialogFactory.showNewPickmapFolderDialog(mapFolderTree, activeMapFolder);
}
@@ -179,6 +181,7 @@
/**
* Action callback function to delete the current pickmap folder.
*/
+ @ActionMethod
public void deletePickmapFolder() {
final MapFolder<G, A, R> mapFolder = getDeletePickmapFolderEnabled();
if (mapFolder == null) {
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java 2010-05-16 19:13:06 UTC (rev 7830)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java 2010-05-16 20:10:56 UTC (rev 7831)
@@ -62,6 +62,7 @@
import net.sf.gridarta.utils.Size2D;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.apache.log4j.Category;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
@@ -592,6 +593,7 @@
/**
* Invoked when user wants to open a new pickmap.
*/
+ @ActionMethod
public void addNewPickmap() {
if (isAddNewPickmapEnabled()) {
newMapDialogFactory.showNewPickmapDialog();
@@ -601,6 +603,7 @@
/**
* Open active pickmap as normal map for extensive editing.
*/
+ @ActionMethod
public void openPickmapMap() {
final MapFile<G, A, R> mapFile = getOpenPickmapMap();
if (mapFile != null) {
@@ -616,6 +619,7 @@
/**
* Invoked when the user wants to delete the active pickmap.
*/
+ @ActionMethod
public void deletePickmap() {
final MapFile<G, A, R> mapFile = getDeletePickmap();
if (mapFile != null) {
@@ -630,6 +634,7 @@
/**
* Save current active pickmap.
*/
+ @ActionMethod
public void savePickmap() {
final MapFile<G, A, R> mapFile = getSavePickmap();
if (mapFile != null) {
@@ -645,6 +650,7 @@
* Invoked when user wants to revert the current pickmap to previously saved
* state.
*/
+ @ActionMethod
public void revertPickmap() {
final MapFile<G, A, R> mapFile = getRevertPickmap();
if (mapFile != null) {
Modified: trunk/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java 2010-05-16 19:13:06 UTC (rev 7830)
+++ trunk/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java 2010-05-16 20:10:56 UTC (rev 7831)
@@ -29,6 +29,7 @@
import net.sf.gridarta.utils.SystemIcons;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
public class ScriptManagerFactory<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
@@ -73,6 +74,7 @@
ACTION_BUILDER.createActions(true, this, "editPlugins");
}
+ @ActionMethod
public void editPlugins() {
synchronized (sync) {
if (scriptManager == null) {
Modified: trunk/src/app/net/sf/gridarta/gui/undo/UndoControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/undo/UndoControl.java 2010-05-16 19:13:06 UTC (rev 7830)
+++ trunk/src/app/net/sf/gridarta/gui/undo/UndoControl.java 2010-05-16 20:10:56 UTC (rev 7831)
@@ -37,6 +37,7 @@
import net.sf.gridarta.model.undo.UndoState;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -231,6 +232,7 @@
/**
* "Undo" was selected.
*/
+ @ActionMethod
public void undo() {
final MapModel<G, A, R> localMapModel = mapModel;
if (!isUndoEnabled() || localMapModel == null) {
@@ -265,6 +267,7 @@
/**
* "Redo" was selected.
*/
+ @ActionMethod
public void redo() {
final MapModel<G, A, R> localMapModel = mapModel;
if (!isRedoEnabled() || localMapModel == null) {
Modified: trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-05-16 19:13:06 UTC (rev 7830)
+++ trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-05-16 20:10:56 UTC (rev 7831)
@@ -636,6 +636,7 @@
/**
* "Clear" was selected from the Edit menu.
*/
+ @ActionMethod
public void clear() {
final MapView<G, A, R> mapView = getClearEnabled();
if (mapView != null) {
@@ -646,6 +647,7 @@
/**
* "Cut" was selected from the Edit menu.
*/
+ @ActionMethod
public void cut() {
final MapView<G, A, R> mapView = getCutEnabled();
if (mapView != null) {
@@ -656,6 +658,7 @@
/**
* "Copy" was selected from the Edit menu.
*/
+ @ActionMethod
public void copy() {
final MapView<G, A, R> mapView = getCopyEnabled();
if (mapView != null) {
@@ -666,6 +669,7 @@
/**
* "Paste" was selected from the Edit menu.
*/
+ @ActionMethod
public void paste() {
final MapView<G, A, R> mapView = getPasteEnabled();
if (mapView != null) {
@@ -676,6 +680,7 @@
/**
* "Shift North" was selected from the Edit menu.
*/
+ @ActionMethod
public void shiftNorth() {
shift(0);
}
@@ -683,6 +688,7 @@
/**
* "Shift North East" was selected from the Edit menu.
*/
+ @ActionMethod
public void shiftNorthEast() {
shift(4);
}
@@ -690,6 +696,7 @@
/**
* "Shift East" was selected from the Edit menu.
*/
+ @ActionMethod
public void shiftEast() {
shift(1);
}
@@ -697,6 +704,7 @@
/**
* "Shift South East" was selected from the Edit menu.
*/
+ @ActionMethod
public void shiftSouthEast() {
shift(5);
}
@@ -704,6 +712,7 @@
/**
* "Shift South" was selected from the Edit menu.
*/
+ @ActionMethod
public void shiftSouth() {
shift(2);
}
@@ -711,6 +720,7 @@
/**
* "Shift South West" was selected from the Edit menu.
*/
+ @ActionMethod
public void shiftSouthWest() {
shift(6);
}
@@ -718,6 +728,7 @@
/**
* "Shift West" was selected from the Edit menu.
*/
+ @ActionMethod
public void shiftWest() {
shift(3);
}
@@ -725,6 +736,7 @@
/**
* "Shift North West" was selected from the Edit menu.
*/
+ @ActionMethod
public void shiftNorthWest() {
shift(7);
}
@@ -743,6 +755,7 @@
/**
* "Replace" was selected from the Edit menu.
*/
+ @ActionMethod
public void replace() {
final MapView<G, A, R> mapView = getReplaceEnabled();
if (mapView != null) {
@@ -753,6 +766,7 @@
/**
* "Fill" was selected from the Edit menu.
*/
+ @ActionMethod
public void fillAuto() {
final MapView<G, A, R> mapView = getFillAutoEnabled();
if (mapView != null) {
@@ -763,6 +777,7 @@
/**
* "Fill above" was selected from the Edit menu.
*/
+ @ActionMethod
public void fillAbove() {
final MapView<G, A, R> mapView = getFillAboveEnabled();
if (mapView != null) {
@@ -773,6 +788,7 @@
/**
* "Fill below" was selected from the Edit menu.
*/
+ @ActionMethod
public void fillBelow() {
final MapView<G, A, R> mapView = getFillBelowEnabled();
if (mapView != null) {
@@ -792,6 +808,7 @@
/**
* "Random fill" was selected from the Edit menu.
*/
+ @ActionMethod
public void randFillAuto() {
final MapView<G, A, R> mapView = getRandFillAutoEnabled();
if (mapView != null) {
@@ -802,6 +819,7 @@
/**
* "Random fill above" was selected from the Edit menu.
*/
+ @ActionMethod
public void randFillAbove() {
final MapView<G, A, R> mapView = getRandFillAboveEnabled();
if (mapView != null) {
@@ -812,6 +830,7 @@
/**
* "Random fill below" was selected from the Edit menu.
*/
+ @ActionMethod
public void randFillBelow() {
final MapView<G, A, R> mapView = getRandFillBelowEnabled();
if (mapView != null) {
@@ -861,6 +880,7 @@
/**
* "Floodfill" was selected from the Edit menu.
*/
+ @ActionMethod
public void floodfill() {
final MapView<G, A, R> mapView = getFloodfillEnabled();
if (mapView != null) {
@@ -871,6 +891,7 @@
/**
* Invoked when the user wants to select all squares from a map.
*/
+ @ActionMethod
public void selectAll() {
final MapGrid mapGrid = getSelectAllEnabled();
if (mapGrid != null) {
@@ -931,6 +952,7 @@
/**
* Invoked when the user wants to reload the images.
*/
+ @ActionMethod
public void reloadFaces() {
faceObjectProviders.reloadAll();
}
Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/Actions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/Actions.java 2010-05-16 19:13:06 UTC (rev 7830)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/Actions.java 2010-05-16 20:10:56 UTC (rev 7831)
@@ -31,6 +31,7 @@
import net.sf.gridarta.textedit.textarea.actions.Replace;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
/**
@@ -142,6 +143,7 @@
/**
* Action for "new script".
*/
+ @ActionMethod
public void scriptEditNewScript() {
control.newScript();
}
@@ -149,6 +151,7 @@
/**
* Action for "open".
*/
+ @ActionMethod
public void scriptEditOpen() {
control.openUser();
}
@@ -156,6 +159,7 @@
/**
* Action for "save as".
*/
+ @ActionMethod
public void scriptEditSaveAs() {
control.saveAsActiveTab();
}
@@ -163,6 +167,7 @@
/**
* Action for "save".
*/
+ @ActionMethod
public void scriptEditSave() {
control.saveActiveTab();
}
@@ -170,6 +175,7 @@
/**
* Action for "close".
*/
+ @ActionMethod
public void scriptEditClose() {
control.closeActiveTab();
}
@@ -177,6 +183,7 @@
/**
* Action for "close all".
*/
+ @ActionMethod
public void scriptEditCloseAll() {
control.closeAllTabs();
}
@@ -184,6 +191,7 @@
/**
* Action for "cut".
*/
+ @ActionMethod
public void scriptEditCut() {
executeAction("cut", CUT);
}
@@ -191,6 +199,7 @@
/**
* Action for "copy".
*/
+ @ActionMethod
public void scriptEditCopy() {
executeAction("copy", COPY);
}
@@ -198,6 +207,7 @@
/**
* Action for "paste".
*/
+ @ActionMethod
public void scriptEditPaste() {
executeAction("paste", PASTE);
}
@@ -205,6 +215,7 @@
/**
* Action for "find".
*/
+ @ActionMethod
public void scriptEditFind() {
executeAction("find", FIND);
}
@@ -212,6 +223,7 @@
/**
* Action for "replace".
*/
+ @ActionMethod
public void scriptEditReplace() {
executeAction("replace", REPLACE);
}
@@ -219,6 +231,7 @@
/**
* Action for "find again".
*/
+ @ActionMethod
public void scriptEditFindAgain() {
executeAction("find-again", FIND_AGAIN);
}
Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditUndoActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditUndoActions.java 2010-05-16 19:13:06 UTC (rev 7830)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditUndoActions.java 2010-05-16 20:10:56 UTC (rev 7831)
@@ -31,6 +31,7 @@
import javax.swing.undo.UndoableEdit;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -113,6 +114,7 @@
/**
* Action method for "undo".
*/
+ @ActionMethod
public void scriptEditUndo() {
final UndoManager undoManager = getCurrentUndoManager();
try {
@@ -128,6 +130,7 @@
/**
* Action method for "redo".
*/
+ @ActionMethod
public void scriptEditRedo() {
final UndoManager undoManager = getCurrentUndoManager();
try {
Modified: trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java 2010-05-16 19:13:06 UTC (rev 7830)
+++ trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java 2010-05-16 20:10:56 UTC (rev 7831)
@@ -27,6 +27,7 @@
import net.sf.gridarta.utils.Exiter;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
/**
@@ -130,6 +131,7 @@
/**
* Perform an update.
*/
+ @ActionMethod
public void update() {
if (mapManager.getOpenedMaps().isEmpty()) {
new Thread(new Updater(parentComponent, exiter, updateFileName)).start();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 19:13:12
|
Revision: 7830
http://gridarta.svn.sourceforge.net/gridarta/?rev=7830&view=rev
Author: akirschbaum
Date: 2010-05-16 19:13:06 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Reorder initialization code: separate Action creation from general initialization.
Modified Paths:
--------------
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/maincontrol/GUIMainControl.java
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java 2010-05-16 18:56:15 UTC (rev 7829)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java 2010-05-16 19:13:06 UTC (rev 7830)
@@ -31,6 +31,7 @@
import java.util.prefs.Preferences;
import javax.swing.Action;
import javax.swing.JOptionPane;
+import javax.swing.JPopupMenu;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import net.sf.gridarta.MainControl;
@@ -372,12 +373,20 @@
lockAllPickmaps = prefs.getBoolean(PICKMAPS_LOCKED, false);
ACTION_BUILDER.createToggles(true, this, "lockAllPickmaps");
pickmapChooserModel.addPickmapChooserListener(pickmapChooserModelListener);
- view = new PickmapChooserView<G, A, R>(pickmapChooserModel, mapFolderTree, ACTION_BUILDER.createPopupMenu(true, "pickmaps"));
+ view = new PickmapChooserView<G, A, R>(pickmapChooserModel, mapFolderTree);
refresh();
view.addChangeListener(changeListener);
mapManager.addMapManagerListener(mapManagerListener);
}
+ /**
+ * Sets the popup menu to show.
+ * @param popupMenu the popup menu to use
+ */
+ public void setPopupMenu(@NotNull final JPopupMenu popupMenu) {
+ view.setPopupMenu(popupMenu);
+ }
+
@Deprecated
public void setFileControl(@NotNull final FileControl<G, A, R> fileControl) {
this.fileControl = fileControl;
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java 2010-05-16 18:56:15 UTC (rev 7829)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java 2010-05-16 19:13:06 UTC (rev 7830)
@@ -167,13 +167,11 @@
* Creates a new instance.
* @param pickmapChooserModel the attached pickmap chooser model
* @param mapFolderTree the model to display
- * @param popupMenu the popup menu to use
*/
- public PickmapChooserView(@NotNull final PickmapChooserModel<G, A, R> pickmapChooserModel, @NotNull final MapFolderTree<G, A, R> mapFolderTree, @NotNull final JPopupMenu popupMenu) {
+ public PickmapChooserView(@NotNull final PickmapChooserModel<G, A, R> pickmapChooserModel, @NotNull final MapFolderTree<G, A, R> mapFolderTree) {
this.pickmapChooserModel = pickmapChooserModel;
this.mapFolderTree = mapFolderTree;
pickmapChooserModel.addPickmapChooserListener(pickmapChooserModelListener);
- pickmapPanel.setComponentPopupMenu(popupMenu);
pickmapPanel.setBorder(BorderFactory.createEmptyBorder(CommonConstants.SPACE_PICKARCH_TOP, 0, 0, 0));
mapFolderTree.addModelListener(mapFolderTreeListener);
synchronized (mapFolderTree) {
@@ -182,6 +180,14 @@
}
/**
+ * Sets the popup menu to show.
+ * @param popupMenu the popup menu to use
+ */
+ public void setPopupMenu(@NotNull final JPopupMenu popupMenu) {
+ pickmapPanel.setComponentPopupMenu(popupMenu);
+ }
+
+ /**
* Adds a {@link ChangeListener} to be notified when the selected pickmap
* tab changes.
* @param changeListener the listener to add
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 18:56:15 UTC (rev 7829)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 19:13:06 UTC (rev 7830)
@@ -395,22 +395,15 @@
final ImageCreator2<G, A, R> imageCreator2 = new ImageCreator2<G, A, R>(globalSettings, imageCreator);
spellUtils = spellFile != null ? new SpellsUtils(spellFile) : null;
appPrefsModel = editorFactory.createAppPrefsModel();
- ACTION_BUILDER.createActions(true, this, "onlineHelp", "gc", "zoom", "tod", "options", "controlServer", "controlClient", "collectSpells", "cleanCompletelyBlockedSquares");
- final Action exitAction = ACTION_BUILDER.createAction(true, "exit", this);
final MapViewManager<G, A, R> mapViewManager = new MapViewManager<G, A, R>();
statusBar = new StatusBar<G, A, R>(mapManager, mapViewManager, archetypeSet, faceObjects);
final MapImageCache<G, A, R> mapImageCache = new MapImageCache<G, A, R>(mapManager, systemIcons.getDefaultIcon(), systemIcons.getDefaultPreview(), rendererFactory, cacheFiles);
final MapDesktop<G, A, R> mapDesktop = new MapDesktop<G, A, R>(mapViewManager, mapManager, mapImageCache, mapViewsManager);
- final ViewActions<G, A, R> viewActions = new ViewActions<G, A, R>(mapViewSettings, mapManager);
final MapFolderTree<G, A, R> mapFolderTree = new MapFolderTree<G, A, R>(globalSettings.getPickmapDir());
final ImageIcon icon = systemIcons.getAppIcon();
mainViewFrame = new JFrame(ACTION_BUILDER.format("mainWindow.title", getBuildNumberAsString()));
- final HelpActions helpActions = new HelpActions(mainViewFrame);
- ACTION_BUILDER.createActions(true, helpActions, "showHelp", "tipOfTheDay");
newMapDialogFactory = editorFactory.newNewMapDialogFactory(mapViewsManager, mapArchObjectFactory, mainViewFrame);
- ACTION_BUILDER.createAction(true, "newMap", newMapDialogFactory);
final PickmapChooserModel<G, A, R> pickmapChooserModel = new PickmapChooserModel<G, A, R>();
- final MapFolderTreeActions<G, A, R> mapFolderTreeActions = new MapFolderTreeActions<G, A, R>(mapFolderTree, newMapDialogFactory, "createPickmapFolder", "deletePickmapFolder", "confirmDeletePickmapFolder", "deletePickmapFolderNotEmpty");
pickmapChooserControl = new PickmapChooserControl<G, A, R>(pickmapChooserModel, newMapDialogFactory, mapArchObjectFactory, mapReaderFactory, mapFolderTree, mapManager, mainViewFrame, pickmapManager, mapViewsManager);
newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
final CFTreasureListTree<G, A, R> treasureListTree = new CFTreasureListTree<G, A, R>(treasureTree, mainViewFrame, archetypeSet, faceObjectProviders, systemIcons);
@@ -420,7 +413,6 @@
final SelectedSquareModel<G, A, R> selectedSquareModel = new SelectedSquareModel<G, A, R>();
final SelectedSquareActions<G, A, R> selectedSquareActions = new SelectedSquareActions<G, A, R>(selectedSquareModel);
final SelectedSquareControl<G, A, R> selectedSquareControl = new SelectedSquareControl<G, A, R>(selectedSquareModel, selectedSquareActions, gameObjectAttributesDialogFactory, objectChooser, mapManager, mapViewManager, mapViewSettings, compassIcon, faceObjectProviders, systemIcons.getUnknownSquareIcon());
- new MapCursorActions<G, A, R>(gameObjectAttributesDialogFactory, mapViewManager, selectedSquareControl, selectedSquareModel);
final A mapArchObject = mapArchObjectFactory.newMapArchObject(false);
mapArchObject.setMapName("cb");
final MapModel<G, A, R> copyBufferMapModel = mapControlFactory.newMapModel(mapArchObject);
@@ -430,21 +422,14 @@
new About(mainViewFrame);
exiter = new DefaultExiter(mainViewFrame);
scriptEditControl = new ScriptEditControl(scriptFileFilter, scriptExtension, mainViewFrame, globalSettings.getMapsDirectory(), prefs, exiter);
- ACTION_BUILDER.createAction(true, "newScript", scriptEditControl);
final TextAreaDefaults textAreaDefaults = new TextAreaDefaults(scriptEditControl);
gameObjectAttributesDialogFactory.setTextAreaDefaults(textAreaDefaults);
scriptEditControl.setTextAreaDefaults(textAreaDefaults);
scriptedEventEditor.setScriptEditControl(scriptEditControl);
scriptArchEditor.setScriptEditControl(scriptEditControl);
fileControl = new DefaultFileControl<G, A, R>(globalSettings, archetypeSet, mapImageCache, mapManager, mapViewsManager, mainViewFrame, FileFilters.mapFileFilter, scriptFileFilter, newMapDialogFactory, scriptExtension, scriptEditControl);
- ACTION_BUILDER.createAction(true, "openFile", fileControl);
- ACTION_BUILDER.createAction(true, "editScript", fileControl);
pickmapChooserControl.setFileControl(fileControl);
mapViewsManager.setFileControl(fileControl);
- new MapFileActions<G, A, R>(imageCreator2, mapManager, mapViewsManager, mapViewManager, fileControl, mainViewFrame);
- final Action aCloseAllMaps = ACTION_BUILDER.createAction(true, "closeAllMaps", fileControl);
- ACTION_BUILDER.createAction(true, "saveAllMaps", fileControl);
- new MainActions<G, A, R>(replaceDialogManager, mainViewFrame, globalSettings, validators, mapViewSettings, archetypeSet, copyBuffer, copyBufferMapModel, objectChooser, mapManager, mapViewManager, resources, faceObjectProviders, gameObjectFactory, insertionModeSet, exiter);
final GameObjectMatcher floorMatcher = gameObjectMatchers.getMatcher("system_floor", "floor");
final GameObjectMatcher wallMatcher = gameObjectMatchers.getMatcher("system_wall", "wall");
final ErrorViewCollector gameObjectMatchersErrorViewCollector = new ErrorViewCollector(errorView, new File(globalSettings.getConfigurationDirectory(), "GameObjectMatchers.xml"));
@@ -457,7 +442,6 @@
final ExitMatcher<G, A, R> exitMatcher = new ExitMatcher<G, A, R>(exitGameObjectMatcher);
final MapPathNormalizer mapPathNormalizer = new MapPathNormalizer(globalSettings);
final MapPropertiesDialogFactory<G, A, R> mapPropertiesDialogFactory = editorFactory.newMapPropertiesDialogFactory(globalSettings, mapManager, mapPathNormalizer);
- new DefaultMapActions<G, A, R>(mainViewFrame, mainViewFrame, mapManager, mapViewManager, exitMatcher, FileFilters.mapFileFilter, selectedSquareModel, directionMap, allowRandomMapParameters, mapPropertiesDialogFactory, mapViewSettings, mapPathNormalizer, mapViewsManager, fileControl);
ArchetypeTypeChecks.addChecks(archetypeTypeSet, attributeRangeChecker);
final DelayedMapModelListenerManager<G, A, R> delayedMapModelListenerManager = new DelayedMapModelListenerManager<G, A, R>(mapManager, exiter);
final Control<?, G, A, R> lockedItemsControl = new LockedItemsControl<G, A, R>(mapViewManager, delayedMapModelListenerManager, lockedItemsTypeNumbers);
@@ -476,10 +460,24 @@
final GameObjectAttributesTab<G, A, R> textEditorTab = new TextEditorTab<G, A, R>(gameObjectAttributesModel, archetypeTypeSet);
final GameObjectTab<G, A, R> gameObjectTab = new GameObjectTab<G, A, R>("gameObject", gameObjectAttributesControl, Location.BOTTOM, 0, true);
+ final Action exitAction = ACTION_BUILDER.createAction(true, "exit", this);
+ final MapFolderTreeActions<G, A, R> mapFolderTreeActions = new MapFolderTreeActions<G, A, R>(mapFolderTree, newMapDialogFactory, "createPickmapFolder", "deletePickmapFolder", "confirmDeletePickmapFolder", "deletePickmapFolderNotEmpty");
+ new DefaultMapActions<G, A, R>(mainViewFrame, mainViewFrame, mapManager, mapViewManager, exitMatcher, FileFilters.mapFileFilter, selectedSquareModel, directionMap, allowRandomMapParameters, mapPropertiesDialogFactory, mapViewSettings, mapPathNormalizer, mapViewsManager, fileControl);
+ final ViewActions<G, A, R> viewActions = new ViewActions<G, A, R>(mapViewSettings, mapManager);
+ new MapFileActions<G, A, R>(imageCreator2, mapManager, mapViewsManager, mapViewManager, fileControl, mainViewFrame);
+ new MainActions<G, A, R>(replaceDialogManager, mainViewFrame, globalSettings, validators, mapViewSettings, archetypeSet, copyBuffer, copyBufferMapModel, objectChooser, mapManager, mapViewManager, resources, faceObjectProviders, gameObjectFactory, insertionModeSet, exiter);
+ final HelpActions helpActions = new HelpActions(mainViewFrame);
+ ACTION_BUILDER.createActions(true, helpActions, "showHelp", "tipOfTheDay");
+ ACTION_BUILDER.createActions(true, newMapDialogFactory, "newMap");
+ ACTION_BUILDER.createActions(true, this, "cleanCompletelyBlockedSquares", "collectSpells", "controlClient", "controlServer", "gc", "onlineHelp", "options", "tod", "zoom");
+ new MapCursorActions<G, A, R>(gameObjectAttributesDialogFactory, mapViewManager, selectedSquareControl, selectedSquareModel);
+ ACTION_BUILDER.createActions(true, scriptEditControl, "newScript");
+ ACTION_BUILDER.createActions(true, fileControl, "editScript", "openFile", "saveAllMaps");
+ final Action aCloseAllMaps = ACTION_BUILDER.createAction(true, "closeAllMaps", fileControl);
mainView = new MainView(mainViewFrame, exitAction, mapDesktop, icon, exiter);
- final Object mainViewActions = new MainViewActions<G, A, R>(mainView, gameObjectAttributesControl, gameObjectTab, textEditorTab);
- ACTION_BUILDER.createAction(true, "gameObjectTextEditor", mainViewActions);
+ ACTION_BUILDER.createActions(true, new MainViewActions<G, A, R>(mainView, gameObjectAttributesControl, gameObjectTab, textEditorTab), "gameObjectTextEditor");
+ pickmapChooserControl.setPopupMenu(ACTION_BUILDER.createPopupMenu(true, "pickmaps"));
final JMenuBar menuBar = ACTION_BUILDER.createMenuBar(true, "main");
final MainToolbar mainToolbar = new MainToolbar(globalSettings);
mainViewFrame.setJMenuBar(menuBar);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 18:56:22
|
Revision: 7829
http://gridarta.svn.sourceforge.net/gridarta/?rev=7829&view=rev
Author: akirschbaum
Date: 2010-05-16 18:56:15 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Remove forwarding functions for calling action methods.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java
Removed Paths:
-------------
trunk/src/app/net/sf/gridarta/mapmanager/MapManagerActions.java
Modified: trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java 2010-05-16 18:41:41 UTC (rev 7828)
+++ trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java 2010-05-16 18:56:15 UTC (rev 7829)
@@ -29,6 +29,7 @@
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.gridarta.model.map.maparchobject.MapArchObjectFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -142,6 +143,7 @@
/**
* Shows a dialog for creating a new map.
*/
+ @ActionMethod
public void newMap() {
new NewMapDialog<G, A, R>(mapViewsManager, mapArchObjectFactory, parent, showMapSizeDefault, showMapDifficulty, defaultMapWidth, defaultMapHeight, defaultMapDifficulty);
}
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 18:41:41 UTC (rev 7828)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 18:56:15 UTC (rev 7829)
@@ -118,7 +118,6 @@
import net.sf.gridarta.mapmanager.DefaultFileControl;
import net.sf.gridarta.mapmanager.FileControl;
import net.sf.gridarta.mapmanager.MapManager;
-import net.sf.gridarta.mapmanager.MapManagerActions;
import net.sf.gridarta.model.anim.AnimationObjects;
import net.sf.gridarta.model.anim.AnimationValidator;
import net.sf.gridarta.model.archetype.Archetype;
@@ -396,7 +395,7 @@
final ImageCreator2<G, A, R> imageCreator2 = new ImageCreator2<G, A, R>(globalSettings, imageCreator);
spellUtils = spellFile != null ? new SpellsUtils(spellFile) : null;
appPrefsModel = editorFactory.createAppPrefsModel();
- ACTION_BUILDER.createActions(true, this, "newMap", "onlineHelp", "gc", "newScript", "editScript", "openFile", "zoom", "tod", "options", "controlServer", "controlClient", "collectSpells", "cleanCompletelyBlockedSquares");
+ ACTION_BUILDER.createActions(true, this, "onlineHelp", "gc", "zoom", "tod", "options", "controlServer", "controlClient", "collectSpells", "cleanCompletelyBlockedSquares");
final Action exitAction = ACTION_BUILDER.createAction(true, "exit", this);
final MapViewManager<G, A, R> mapViewManager = new MapViewManager<G, A, R>();
statusBar = new StatusBar<G, A, R>(mapManager, mapViewManager, archetypeSet, faceObjects);
@@ -409,6 +408,7 @@
final HelpActions helpActions = new HelpActions(mainViewFrame);
ACTION_BUILDER.createActions(true, helpActions, "showHelp", "tipOfTheDay");
newMapDialogFactory = editorFactory.newNewMapDialogFactory(mapViewsManager, mapArchObjectFactory, mainViewFrame);
+ ACTION_BUILDER.createAction(true, "newMap", newMapDialogFactory);
final PickmapChooserModel<G, A, R> pickmapChooserModel = new PickmapChooserModel<G, A, R>();
final MapFolderTreeActions<G, A, R> mapFolderTreeActions = new MapFolderTreeActions<G, A, R>(mapFolderTree, newMapDialogFactory, "createPickmapFolder", "deletePickmapFolder", "confirmDeletePickmapFolder", "deletePickmapFolderNotEmpty");
pickmapChooserControl = new PickmapChooserControl<G, A, R>(pickmapChooserModel, newMapDialogFactory, mapArchObjectFactory, mapReaderFactory, mapFolderTree, mapManager, mainViewFrame, pickmapManager, mapViewsManager);
@@ -430,16 +430,20 @@
new About(mainViewFrame);
exiter = new DefaultExiter(mainViewFrame);
scriptEditControl = new ScriptEditControl(scriptFileFilter, scriptExtension, mainViewFrame, globalSettings.getMapsDirectory(), prefs, exiter);
+ ACTION_BUILDER.createAction(true, "newScript", scriptEditControl);
final TextAreaDefaults textAreaDefaults = new TextAreaDefaults(scriptEditControl);
gameObjectAttributesDialogFactory.setTextAreaDefaults(textAreaDefaults);
scriptEditControl.setTextAreaDefaults(textAreaDefaults);
scriptedEventEditor.setScriptEditControl(scriptEditControl);
scriptArchEditor.setScriptEditControl(scriptEditControl);
fileControl = new DefaultFileControl<G, A, R>(globalSettings, archetypeSet, mapImageCache, mapManager, mapViewsManager, mainViewFrame, FileFilters.mapFileFilter, scriptFileFilter, newMapDialogFactory, scriptExtension, scriptEditControl);
+ ACTION_BUILDER.createAction(true, "openFile", fileControl);
+ ACTION_BUILDER.createAction(true, "editScript", fileControl);
pickmapChooserControl.setFileControl(fileControl);
mapViewsManager.setFileControl(fileControl);
new MapFileActions<G, A, R>(imageCreator2, mapManager, mapViewsManager, mapViewManager, fileControl, mainViewFrame);
- final MapManagerActions<G, A, R> mapManagerActions = new MapManagerActions<G, A, R>(fileControl);
+ final Action aCloseAllMaps = ACTION_BUILDER.createAction(true, "closeAllMaps", fileControl);
+ ACTION_BUILDER.createAction(true, "saveAllMaps", fileControl);
new MainActions<G, A, R>(replaceDialogManager, mainViewFrame, globalSettings, validators, mapViewSettings, archetypeSet, copyBuffer, copyBufferMapModel, objectChooser, mapManager, mapViewManager, resources, faceObjectProviders, gameObjectFactory, insertionModeSet, exiter);
final GameObjectMatcher floorMatcher = gameObjectMatchers.getMatcher("system_floor", "floor");
final GameObjectMatcher wallMatcher = gameObjectMatchers.getMatcher("system_wall", "wall");
@@ -492,7 +496,7 @@
if (windowMenu == null) {
log.warn("'main' menu bar does not define 'window' menu.");
} else {
- new WindowMenuManager<G, A, R>(windowMenu, mapViewManager, mapManagerActions.getCloseAllAction(), mapDesktop);
+ new WindowMenuManager<G, A, R>(windowMenu, mapViewManager, aCloseAllMaps, mapDesktop);
}
final JMenu pickmapFoldersMenu = MenuUtils.getMenu(menuBar, "pickmapFolders");
if (pickmapFoldersMenu == null) {
@@ -582,14 +586,6 @@
}
/**
- * Invoked when user wants to begin editing a new (empty) map.
- */
- @ActionMethod
- public void newMap() {
- newMapDialogFactory.newMap();
- }
-
- /**
* Runs the garbage collection.
*/
@ActionMethod
@@ -600,22 +596,6 @@
}
/**
- * Create and open a new script.
- */
- @ActionMethod
- public void newScript() {
- scriptEditControl.newScript();
- }
-
- /**
- * Edit an existing script.
- */
- @ActionMethod
- public void editScript() {
- fileControl.editScript();
- }
-
- /**
* Calls for zooming preview tool.
*/
@ActionMethod
@@ -628,15 +608,7 @@
new MapPreview(rendererFactory.newSimpleMapRenderer(mapControl.getMapModel()).getFullImage());
}
- /**
- * Invoked when user wants to open a file.
- */
@ActionMethod
- public void openFile() {
- fileControl.openFile();
- }
-
- @ActionMethod
public void options() {
if (prefsGroup == null) {
prefsGroup = editorFactory.createPreferencesGroup(globalSettings, validators, appPrefsModel, exitConnectorModel, configSourceFactory);
@@ -683,7 +655,7 @@
// TODO: pass filename
scriptEditControl.newScript();
} else {
- newMap(); // XXX: pass file
+ newMapDialogFactory.newMap(); // XXX: pass file
}
} // If neither branch matches, it's a directory - what to do with directories?
Modified: trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java 2010-05-16 18:41:41 UTC (rev 7828)
+++ trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java 2010-05-16 18:56:15 UTC (rev 7829)
@@ -40,6 +40,7 @@
import net.sf.gridarta.utils.FileChooserUtils;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -168,6 +169,7 @@
/**
* {@inheritDoc}
*/
+ @ActionMethod
@Override
public void editScript() {
openFile(false);
@@ -176,6 +178,7 @@
/**
* {@inheritDoc}
*/
+ @ActionMethod
@Override
public void openFile() {
openFile(true);
@@ -257,6 +260,7 @@
/**
* {@inheritDoc}
*/
+ @ActionMethod
@Override
public void saveAllMaps() {
for (final MapControl<G, A, R> mapControl : mapManager.getOpenedMaps()) {
@@ -269,6 +273,7 @@
/**
* {@inheritDoc}
*/
+ @ActionMethod
@Override
public boolean closeAllMaps() {
for (; ;) {
Deleted: trunk/src/app/net/sf/gridarta/mapmanager/MapManagerActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mapmanager/MapManagerActions.java 2010-05-16 18:41:41 UTC (rev 7828)
+++ trunk/src/app/net/sf/gridarta/mapmanager/MapManagerActions.java 2010-05-16 18:56:15 UTC (rev 7829)
@@ -1,87 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2010 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.mapmanager;
-
-import javax.swing.Action;
-import net.sf.gridarta.model.archetype.Archetype;
-import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.map.maparchobject.MapArchObject;
-import net.sf.japi.swing.action.ActionBuilder;
-import net.sf.japi.swing.action.ActionBuilderFactory;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Manages actions related to the {@link net.sf.gridarta.mapmanager.MapManager}
- * instance.
- * @author Andreas Kirschbaum
- */
-public class MapManagerActions<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
-
- /**
- * Action Builder.
- */
- private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
-
- /**
- * The {@link FileControl} to forward to.
- */
- private final FileControl<G, A, R> fileControl;
-
- /**
- * Action for "close all map windows".
- */
- private final Action aCloseAllMaps = ACTION_BUILDER.createAction(true, "closeAllMaps", this);
-
- /**
- * The action for "save all maps".
- */
- private final Action aSaveAllMaps = ACTION_BUILDER.createAction(true, "saveAllMaps", this);
-
- /**
- * Creates a new instance.
- * @param fileControl the file control to forward to
- */
- public MapManagerActions(@NotNull final FileControl<G, A, R> fileControl) {
- this.fileControl = fileControl;
- }
-
- /**
- * Returns the {@link Action} for "close all map windows".
- * @return the action
- */
- public Action getCloseAllAction() {
- return aCloseAllMaps;
- }
-
- /**
- * Invoked when the user wants to save all map files.
- */
- public void saveAllMaps() {
- fileControl.saveAllMaps();
- }
-
- /**
- * Invoked when the user wants to close all map files.
- */
- public void closeAllMaps() {
- fileControl.closeAllMaps();
- }
-
-} // class MapManagerActions
Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java 2010-05-16 18:41:41 UTC (rev 7828)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java 2010-05-16 18:56:15 UTC (rev 7829)
@@ -36,6 +36,7 @@
import net.sf.gridarta.utils.FileChooserUtils;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.apache.log4j.Category;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
@@ -102,6 +103,7 @@
/**
* Open a new empty script document.
*/
+ @ActionMethod
public void newScript() {
tabs.add("<>"); // this script has no filename assigned yet
view.addTab("<New Script>", null);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 18:41:47
|
Revision: 7828
http://gridarta.svn.sourceforge.net/gridarta/?rev=7828&view=rev
Author: akirschbaum
Date: 2010-05-16 18:41:41 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Unify action names and function names.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java
trunk/src/app/net/sf/gridarta/mapmanager/FileControl.java
trunk/src/app/net/sf/gridarta/mapmanager/MapManagerActions.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/Actions.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java
trunk/src/test/net/sf/gridarta/mapmanager/TestFileControl.java
Modified: trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java 2010-05-16 18:32:19 UTC (rev 7827)
+++ trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java 2010-05-16 18:41:41 UTC (rev 7828)
@@ -142,7 +142,7 @@
/**
* Shows a dialog for creating a new map.
*/
- public void showNewMapDialog() {
+ public void newMap() {
new NewMapDialog<G, A, R>(mapViewsManager, mapArchObjectFactory, parent, showMapSizeDefault, showMapDifficulty, defaultMapWidth, defaultMapHeight, defaultMapDifficulty);
}
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 18:32:19 UTC (rev 7827)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 18:41:41 UTC (rev 7828)
@@ -586,7 +586,7 @@
*/
@ActionMethod
public void newMap() {
- newMapDialogFactory.showNewMapDialog();
+ newMapDialogFactory.newMap();
}
/**
@@ -604,7 +604,7 @@
*/
@ActionMethod
public void newScript() {
- scriptEditControl.openScriptNew();
+ scriptEditControl.newScript();
}
/**
@@ -612,7 +612,7 @@
*/
@ActionMethod
public void editScript() {
- fileControl.openFile(false);
+ fileControl.editScript();
}
/**
@@ -633,7 +633,7 @@
*/
@ActionMethod
public void openFile() {
- fileControl.openFile(true);
+ fileControl.openFile();
}
@ActionMethod
@@ -660,7 +660,7 @@
* @return whether all modified data has been saved
*/
private boolean canExit() {
- return scriptEditControl.closeAllTabs() && fileControl.closeAll() && pickmapChooserControl.canExit() && scriptControl.canExit();
+ return scriptEditControl.closeAllTabs() && fileControl.closeAllMaps() && pickmapChooserControl.canExit() && scriptControl.canExit();
}
/**
@@ -681,7 +681,7 @@
} else if (!file.exists()) {
if (isScriptFile) {
// TODO: pass filename
- scriptEditControl.openScriptNew();
+ scriptEditControl.newScript();
} else {
newMap(); // XXX: pass file
}
Modified: trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java 2010-05-16 18:32:19 UTC (rev 7827)
+++ trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java 2010-05-16 18:41:41 UTC (rev 7828)
@@ -169,7 +169,25 @@
* {@inheritDoc}
*/
@Override
- public void openFile(final boolean mapFilter) {
+ public void editScript() {
+ openFile(false);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void openFile() {
+ openFile(true);
+ }
+
+ /**
+ * The user wants to open a file. The filefilters and preselected filefilter
+ * are set accordingly to <var>mapFilter</var>.
+ * @param mapFilter set to <code>true</code> if the user probably wants to
+ * open a map, <code>false</code> otherwise
+ */
+ private void openFile(final boolean mapFilter) {
if (fileChooser == null) {
createFileChooser();
}
@@ -209,9 +227,9 @@
} else if (!file.exists()) {
if (isScriptFile) {
// TODO: pass filename
- scriptEditControl.openScriptNew();
+ scriptEditControl.newScript();
} else {
- newMapDialogFactory.showNewMapDialog(); // XXX: pass file
+ newMapDialogFactory.newMap(); // XXX: pass file
}
} // If neither branch matches, it's a directory - what to do with directories?
}
@@ -240,7 +258,7 @@
* {@inheritDoc}
*/
@Override
- public void saveAll() {
+ public void saveAllMaps() {
for (final MapControl<G, A, R> mapControl : mapManager.getOpenedMaps()) {
if (mapControl.getMapModel().isModified() && !save(mapControl)) {
return;
@@ -252,7 +270,7 @@
* {@inheritDoc}
*/
@Override
- public boolean closeAll() {
+ public boolean closeAllMaps() {
for (; ;) {
final MapControl<G, A, R> mapControl = mapManager.getOpenMap();
if (mapControl == null) {
Modified: trunk/src/app/net/sf/gridarta/mapmanager/FileControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mapmanager/FileControl.java 2010-05-16 18:32:19 UTC (rev 7827)
+++ trunk/src/app/net/sf/gridarta/mapmanager/FileControl.java 2010-05-16 18:41:41 UTC (rev 7828)
@@ -30,14 +30,16 @@
public interface FileControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
/**
- * The user wants to open a file. The filefilters and preselected filefilter
- * are set accordingly to <var>mapFilter</var>.
- * @param mapFilter set to <code>true</code> if the user probably wants to
- * open a map, <code>false</code> otherwise
+ * The user wants to edit a script file.
*/
- void openFile(boolean mapFilter);
+ void editScript();
/**
+ * The user wants to open a map file.
+ */
+ void openFile();
+
+ /**
* Save one map.
* @param mapControl the map
* @return <code>false</code> if saving failed, <code>true</code> otherwise
@@ -47,14 +49,14 @@
/**
* Saves all maps.
*/
- void saveAll();
+ void saveAllMaps();
/**
* Invoked when the user wants to close all maps.
* @return <code>true</code> if all maps closed, <code>false</code> if user
* cancelled.
*/
- boolean closeAll();
+ boolean closeAllMaps();
/**
* Asks the user for a filename, then saves the map.
Modified: trunk/src/app/net/sf/gridarta/mapmanager/MapManagerActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mapmanager/MapManagerActions.java 2010-05-16 18:32:19 UTC (rev 7827)
+++ trunk/src/app/net/sf/gridarta/mapmanager/MapManagerActions.java 2010-05-16 18:41:41 UTC (rev 7828)
@@ -74,14 +74,14 @@
* Invoked when the user wants to save all map files.
*/
public void saveAllMaps() {
- fileControl.saveAll();
+ fileControl.saveAllMaps();
}
/**
* Invoked when the user wants to close all map files.
*/
public void closeAllMaps() {
- fileControl.closeAll();
+ fileControl.closeAllMaps();
}
} // class MapManagerActions
Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/Actions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/Actions.java 2010-05-16 18:32:19 UTC (rev 7827)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/Actions.java 2010-05-16 18:41:41 UTC (rev 7828)
@@ -143,7 +143,7 @@
* Action for "new script".
*/
public void scriptEditNewScript() {
- control.openScriptNew();
+ control.newScript();
}
/**
Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java 2010-05-16 18:32:19 UTC (rev 7827)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java 2010-05-16 18:41:41 UTC (rev 7828)
@@ -102,7 +102,7 @@
/**
* Open a new empty script document.
*/
- public void openScriptNew() {
+ public void newScript() {
tabs.add("<>"); // this script has no filename assigned yet
view.addTab("<New Script>", null);
}
@@ -164,7 +164,7 @@
openScriptFile(file.getAbsolutePath());
} else {
// user entered a filename which doesn't yet exist -> open new script
- openScriptNew();
+ newScript();
}
}
Modified: trunk/src/test/net/sf/gridarta/mapmanager/TestFileControl.java
===================================================================
--- trunk/src/test/net/sf/gridarta/mapmanager/TestFileControl.java 2010-05-16 18:32:19 UTC (rev 7827)
+++ trunk/src/test/net/sf/gridarta/mapmanager/TestFileControl.java 2010-05-16 18:41:41 UTC (rev 7828)
@@ -43,7 +43,7 @@
* {@inheritDoc}
*/
@Override
- public void openFile(final boolean mapFilter) {
+ public void editScript() {
throw new AssertionError();
}
@@ -51,6 +51,14 @@
* {@inheritDoc}
*/
@Override
+ public void openFile() {
+ throw new AssertionError();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public boolean save(@NotNull final MapControl<TestGameObject, TestMapArchObject, TestArchetype> mapControl) {
throw new AssertionError();
}
@@ -59,7 +67,7 @@
* {@inheritDoc}
*/
@Override
- public void saveAll() {
+ public void saveAllMaps() {
throw new AssertionError();
}
@@ -67,7 +75,7 @@
* {@inheritDoc}
*/
@Override
- public boolean closeAll() {
+ public boolean closeAllMaps() {
throw new AssertionError();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 18:32:25
|
Revision: 7827
http://gridarta.svn.sourceforge.net/gridarta/?rev=7827&view=rev
Author: akirschbaum
Date: 2010-05-16 18:32:19 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Rename action 'saveAll' to 'saveAllMaps'.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
trunk/src/app/net/sf/gridarta/mapmanager/MapManagerActions.java
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-16 18:30:24 UTC (rev 7826)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-16 18:32:19 UTC (rev 7827)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent closeMap - saveMap saveMapAs saveAll revertMap createImage - options - exit
+file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-16 18:30:24 UTC (rev 7826)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-16 18:32:19 UTC (rev 7827)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent closeMap - saveMap saveMapAs saveAll revertMap createImage - options - exit
+file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-16 18:30:24 UTC (rev 7826)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-16 18:32:19 UTC (rev 7827)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent closeMap - saveMap saveMapAs saveAll revertMap createImage - options - exit
+file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
Modified: trunk/src/app/net/sf/gridarta/mapmanager/MapManagerActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mapmanager/MapManagerActions.java 2010-05-16 18:30:24 UTC (rev 7826)
+++ trunk/src/app/net/sf/gridarta/mapmanager/MapManagerActions.java 2010-05-16 18:32:19 UTC (rev 7827)
@@ -50,9 +50,9 @@
private final Action aCloseAllMaps = ACTION_BUILDER.createAction(true, "closeAllMaps", this);
/**
- * The action for "save all".
+ * The action for "save all maps".
*/
- private final Action aSaveAll = ACTION_BUILDER.createAction(true, "saveAll", this);
+ private final Action aSaveAllMaps = ACTION_BUILDER.createAction(true, "saveAllMaps", this);
/**
* Creates a new instance.
@@ -73,7 +73,7 @@
/**
* Invoked when the user wants to save all map files.
*/
- public void saveAll() {
+ public void saveAllMaps() {
fileControl.saveAll();
}
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 18:30:24 UTC (rev 7826)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 18:32:19 UTC (rev 7827)
@@ -95,9 +95,9 @@
closeAllMaps.mnemonic=L
closeAllMaps.accel=ctrl shift pressed W
-saveAll.text=Save All
+closeAllMaps.text=Save All
saveAll.shortdescription=Save all maps
-saveAll.longdescription=Saves all opened maps
+closeAllMaps.longdescription=Saves all opened maps
gridVisible.text=Show Grid
gridVisible.mnemonic=G
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 18:30:24 UTC (rev 7826)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 18:32:19 UTC (rev 7827)
@@ -83,9 +83,9 @@
closeAllMaps.longdescription=Schlie\xDFt alle ge\xF6ffneten Karten.
closeAllMaps.mnemonic=A
-saveAll.text=Alle speichern
-saveAll.shortdescription=Alle Karten speichern
-saveAll.longdescription=Speichert alle ge\xF6ffneten Karten.
+closeAllMaps.text=Alle speichern
+closeAllMaps.shortdescription=Alle Karten speichern
+closeAllMaps.longdescription=Speichert alle ge\xF6ffneten Karten.
gridVisible.text=Gitter anzeigen
gridVisible.mnemonic=G
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 18:30:24 UTC (rev 7826)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 18:32:19 UTC (rev 7827)
@@ -82,9 +82,9 @@
#closeAllMaps.longdescription=
closeAllMaps.mnemonic=T
-#saveAll.text=
-#saveAll.shortdescription=
-#saveAll.longdescription=
+#closeAllMaps.text=
+#closeAllMaps.shortdescription=
+#closeAllMaps.longdescription=
gridVisible.text=Montrer la grille
gridVisible.mnemonic=G
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-16 18:30:24 UTC (rev 7826)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-16 18:32:19 UTC (rev 7827)
@@ -82,9 +82,9 @@
closeAllMaps.longdescription=St\xE4nger alla \xF6ppnade kartor
closeAllMaps.mnemonic=S
-#saveAll.text=
-#saveAll.shortdescription=
-#saveAll.longdescription=
+#closeAllMaps.text=
+#closeAllMaps.shortdescription=
+#closeAllMaps.longdescription=
gridVisible.text=Visa rutn\xE4t
gridVisible.mnemonic=R
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 18:30:30
|
Revision: 7826
http://gridarta.svn.sourceforge.net/gridarta/?rev=7826&view=rev
Author: akirschbaum
Date: 2010-05-16 18:30:24 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Rename action 'closeAll' to 'closeAllMaps'.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
trunk/src/app/net/sf/gridarta/action.properties
trunk/src/app/net/sf/gridarta/mapmanager/MapManagerActions.java
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-16 18:26:52 UTC (rev 7825)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-16 18:30:24 UTC (rev 7826)
@@ -35,7 +35,7 @@
analyze.menu=
view.menu=resetView - gridVisible doubleFaces - prevWindow nextWindow
plugins.menu=- editPlugins - savePlugins importPlugin
-window.menu=closeAll
+window.menu=closeAllMaps
help.menu=showHelp tipOfTheDay about update
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-16 18:26:52 UTC (rev 7825)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-16 18:30:24 UTC (rev 7826)
@@ -35,7 +35,7 @@
analyze.menu=
view.menu=resetView - gridVisible smoothing - prevWindow nextWindow
plugins.menu=- editPlugins - savePlugins importPlugin
-window.menu=closeAll
+window.menu=closeAllMaps
help.menu=showHelp tipOfTheDay about update
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-16 18:26:52 UTC (rev 7825)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-16 18:30:24 UTC (rev 7826)
@@ -35,7 +35,7 @@
analyze.menu=
view.menu=resetView - gridVisible doubleFaces - prevWindow nextWindow
plugins.menu=- editPlugins - savePlugins importPlugin
-window.menu=closeAll
+window.menu=closeAllMaps
help.menu=showHelp tipOfTheDay about update
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
Modified: trunk/src/app/net/sf/gridarta/action.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/action.properties 2010-05-16 18:26:52 UTC (rev 7825)
+++ trunk/src/app/net/sf/gridarta/action.properties 2010-05-16 18:30:24 UTC (rev 7826)
@@ -43,7 +43,7 @@
closeMap.icon=EmptySmallIcon
-closeAll.icon=EmptySmallIcon
+closeAllMaps.icon=EmptySmallIcon
undo.icon=general/Undo16
Modified: trunk/src/app/net/sf/gridarta/mapmanager/MapManagerActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mapmanager/MapManagerActions.java 2010-05-16 18:26:52 UTC (rev 7825)
+++ trunk/src/app/net/sf/gridarta/mapmanager/MapManagerActions.java 2010-05-16 18:30:24 UTC (rev 7826)
@@ -47,7 +47,7 @@
/**
* Action for "close all map windows".
*/
- private final Action aCloseAll = ACTION_BUILDER.createAction(true, "closeAll", this);
+ private final Action aCloseAllMaps = ACTION_BUILDER.createAction(true, "closeAllMaps", this);
/**
* The action for "save all".
@@ -67,7 +67,7 @@
* @return the action
*/
public Action getCloseAllAction() {
- return aCloseAll;
+ return aCloseAllMaps;
}
/**
@@ -80,7 +80,7 @@
/**
* Invoked when the user wants to close all map files.
*/
- public void closeAll() {
+ public void closeAllMaps() {
fileControl.closeAll();
}
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 18:26:52 UTC (rev 7825)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 18:30:24 UTC (rev 7826)
@@ -89,11 +89,11 @@
# Map Manager
-closeAll.text=Close All
-closeAll.shortdescription=Close all maps
-closeAll.longdescription=Closes all opened maps
-closeAll.mnemonic=L
-closeAll.accel=ctrl shift pressed W
+closeAllMaps.text=Close All
+closeAllMaps.shortdescription=Close all maps
+closeAllMaps.longdescription=Closes all opened maps
+closeAllMaps.mnemonic=L
+closeAllMaps.accel=ctrl shift pressed W
saveAll.text=Save All
saveAll.shortdescription=Save all maps
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 18:26:52 UTC (rev 7825)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 18:30:24 UTC (rev 7826)
@@ -78,10 +78,10 @@
# Map Manager
-closeAll.text=Alle schlie\xDFen
-closeAll.shortdescription=Alle Karten schlie\xDFen
-closeAll.longdescription=Schlie\xDFt alle ge\xF6ffneten Karten.
-closeAll.mnemonic=A
+closeAllMaps.text=Alle schlie\xDFen
+closeAllMaps.shortdescription=Alle Karten schlie\xDFen
+closeAllMaps.longdescription=Schlie\xDFt alle ge\xF6ffneten Karten.
+closeAllMaps.mnemonic=A
saveAll.text=Alle speichern
saveAll.shortdescription=Alle Karten speichern
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 18:26:52 UTC (rev 7825)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 18:30:24 UTC (rev 7826)
@@ -77,10 +77,10 @@
# Map Manager
-closeAll.text=Tout fermer
-#closeAll.shortdescription=
-#closeAll.longdescription=
-closeAll.mnemonic=T
+closeAllMaps.text=Tout fermer
+#closeAllMaps.shortdescription=
+#closeAllMaps.longdescription=
+closeAllMaps.mnemonic=T
#saveAll.text=
#saveAll.shortdescription=
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-16 18:26:52 UTC (rev 7825)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-16 18:30:24 UTC (rev 7826)
@@ -77,10 +77,10 @@
# Map Manager
-closeAll.text=St\xE4ng alla
-closeAll.shortdescription=St\xE4ng alla kartor
-closeAll.longdescription=St\xE4nger alla \xF6ppnade kartor
-closeAll.mnemonic=S
+closeAllMaps.text=St\xE4ng alla
+closeAllMaps.shortdescription=St\xE4ng alla kartor
+closeAllMaps.longdescription=St\xE4nger alla \xF6ppnade kartor
+closeAllMaps.mnemonic=S
#saveAll.text=
#saveAll.shortdescription=
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 18:26:59
|
Revision: 7825
http://gridarta.svn.sourceforge.net/gridarta/?rev=7825&view=rev
Author: akirschbaum
Date: 2010-05-16 18:26:52 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Rename action 'close' to 'closeMap'.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
trunk/src/app/net/sf/gridarta/action.properties
trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-16 18:23:06 UTC (rev 7824)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-16 18:26:52 UTC (rev 7825)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent close - saveMap saveMapAs saveAll revertMap createImage - options - exit
+file.menu=newMap openFile recent closeMap - saveMap saveMapAs saveAll revertMap createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -40,7 +40,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
-mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - close
+mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - closeMap
mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
mapwindowMap.menu=gridVisible enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-16 18:23:06 UTC (rev 7824)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-16 18:26:52 UTC (rev 7825)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent close - saveMap saveMapAs saveAll revertMap createImage - options - exit
+file.menu=newMap openFile recent closeMap - saveMap saveMapAs saveAll revertMap createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -40,7 +40,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
-mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - close
+mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - closeMap
mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
mapwindowMap.menu=gridVisible smoothing enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-16 18:23:06 UTC (rev 7824)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-16 18:26:52 UTC (rev 7825)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent close - saveMap saveMapAs saveAll revertMap createImage - options - exit
+file.menu=newMap openFile recent closeMap - saveMap saveMapAs saveAll revertMap createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -40,7 +40,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
-mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - close
+mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - closeMap
mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
mapwindowMap.menu=gridVisible enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
Modified: trunk/src/app/net/sf/gridarta/action.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/action.properties 2010-05-16 18:23:06 UTC (rev 7824)
+++ trunk/src/app/net/sf/gridarta/action.properties 2010-05-16 18:26:52 UTC (rev 7825)
@@ -41,7 +41,7 @@
revertMap.icon=general/Refresh16
-close.icon=EmptySmallIcon
+closeMap.icon=EmptySmallIcon
closeAll.icon=EmptySmallIcon
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-16 18:23:06 UTC (rev 7824)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-16 18:26:52 UTC (rev 7825)
@@ -115,10 +115,10 @@
private final Action aRevertMap = ACTION_BUILDER.createAction(true, "revertMap", this);
/**
- * The action for "close".
+ * The action for "close map".
*/
@NotNull
- private final Action aClose = ACTION_BUILDER.createAction(true, "close", this);
+ private final Action aCloseMap = ACTION_BUILDER.createAction(true, "closeMap", this);
/**
* The currently tracked map, or <code>null</code> if no map is tracked.
@@ -289,7 +289,7 @@
aCreateImage.setEnabled(getCreateImageEnabled() != null);
aRevertMap.setEnabled(getRevertMapEnabled() != null);
//noinspection CallToSimpleGetterFromWithinClass
- aClose.setEnabled(getCloseEnabled() != null);
+ aCloseMap.setEnabled(getCloseMapEnabled() != null);
}
/**
@@ -336,12 +336,12 @@
}
/**
- * Determine whether "close" is enabled.
- * @return the map view for which "close" is enabled, or <code>null</code>
- * if "close" is disabled
+ * Determine whether "close map" is enabled.
+ * @return the map view for which "close map" is enabled, or
+ * <code>null</code> if "close map" is disabled
*/
@Nullable
- private MapView<G, A, R> getCloseEnabled() {
+ private MapView<G, A, R> getCloseMapEnabled() {
return currentMapView;
}
@@ -401,9 +401,9 @@
* Invoked when the user wants to close the map.
*/
@ActionMethod
- public void close() {
+ public void closeMap() {
//noinspection CallToSimpleGetterFromWithinClass
- final MapView<G, A, R> mapView = getCloseEnabled();
+ final MapView<G, A, R> mapView = getCloseMapEnabled();
if (mapView != null) {
mapViewsManager.closeMapView(mapView);
}
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 18:23:06 UTC (rev 7824)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 18:26:52 UTC (rev 7825)
@@ -567,11 +567,11 @@
revertMap.mnemonic=R
revertMap.error.text=Error while reverting map
-close.text=Close
-close.shortdescription=Close map
-close.longdescription=Closes the current map
-close.mnemonic=C
-close.accel=ctrl pressed W
+closeMap.text=Close
+closeMap.shortdescription=Close map
+closeMap.longdescription=Closes the current map
+closeMap.mnemonic=C
+closeMap.accel=ctrl pressed W
recent.text=Recent
recent.shortdescription=Load a recently opened map
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 18:23:06 UTC (rev 7824)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 18:26:52 UTC (rev 7825)
@@ -531,10 +531,10 @@
revertMap.mnemonic=R
revertMap.error.text=Fehler beim Zur\xFCcksetzen
-close.text=Schie\xDFen
-close.shortdescription=Karte schlie\xDFen
-close.longdescription=Schlie\xDFt die aktuelle Karte
-close.mnemonic=C
+closeMap.text=Schie\xDFen
+closeMap.shortdescription=Karte schlie\xDFen
+closeMap.longdescription=Schlie\xDFt die aktuelle Karte
+closeMap.mnemonic=C
recent.text=Zuletzt ge\xF6ffnet
recent.shortdescription=Lade eine k\xFCrzlich ge\xF6ffnete Karte
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 18:23:06 UTC (rev 7824)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 18:26:52 UTC (rev 7825)
@@ -526,10 +526,10 @@
revertMap.mnemonic=R
revertMap.error.text=Erreur lors de la restauration de la carte.
-close.text=Fermer
-close.shortdescription=Fermer la carte
-close.longdescription=Ferme la carte active
-close.mnemonic=F
+closeMap.text=Fermer
+closeMap.shortdescription=Fermer la carte
+closeMap.longdescription=Ferme la carte active
+closeMap.mnemonic=F
#recent.text=
#recent.shortdescription=
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-16 18:23:06 UTC (rev 7824)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-16 18:26:52 UTC (rev 7825)
@@ -530,10 +530,10 @@
revertMap.mnemonic=R
revertMap.error.text=Kunde inte \xE5terst\xE4lla kartan
-close.text=St\xE4ng
-close.shortdescription=St\xE4ng karta
-close.longdescription=St\xE4nger den aktuella kartan
-close.mnemonic=G
+closeMap.text=St\xE4ng
+closeMap.shortdescription=St\xE4ng karta
+closeMap.longdescription=St\xE4nger den aktuella kartan
+closeMap.mnemonic=G
recent.text=Nyligen
recent.shortdescription=Ladda nyligen \xF6ppnad karta
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 18:23:12
|
Revision: 7824
http://gridarta.svn.sourceforge.net/gridarta/?rev=7824&view=rev
Author: akirschbaum
Date: 2010-05-16 18:23:06 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Rename action 'saveAs' to 'saveMapAs'.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
trunk/src/app/net/sf/gridarta/action.properties
trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-16 18:20:29 UTC (rev 7823)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-16 18:23:06 UTC (rev 7824)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent close - saveMap saveAs saveAll revertMap createImage - options - exit
+file.menu=newMap openFile recent close - saveMap saveMapAs saveAll revertMap createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -40,14 +40,14 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
-mapwindowFile.menu=saveMap saveAs createImage - revertMap - close
+mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - close
mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
mapwindowMap.menu=gridVisible enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
##########
# ToolBars
-main.toolbar=newMap openFile saveMap saveAs - prevWindow nextWindow - undo redo
+main.toolbar=newMap openFile saveMap saveMapAs - prevWindow nextWindow - undo redo
oldLibs.okayLibs=.svn CVS README LICENSE-* *-LICENSE japi.jar jlfgr-1_0.jar
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-16 18:20:29 UTC (rev 7823)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-16 18:23:06 UTC (rev 7824)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent close - saveMap saveAs saveAll revertMap createImage - options - exit
+file.menu=newMap openFile recent close - saveMap saveMapAs saveAll revertMap createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -40,14 +40,14 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
-mapwindowFile.menu=saveMap saveAs createImage - revertMap - close
+mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - close
mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
mapwindowMap.menu=gridVisible smoothing enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
##########
# ToolBars
-main.toolbar=newMap openFile saveMap saveAs - prevWindow nextWindow - undo redo
+main.toolbar=newMap openFile saveMap saveMapAs - prevWindow nextWindow - undo redo
moveCursor.menu=goNorth goEast goSouth goWest goNorthEast goSouthEast goSouthWest goNorthWest - goLocation
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-16 18:20:29 UTC (rev 7823)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-16 18:23:06 UTC (rev 7824)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent close - saveMap saveAs saveAll revertMap createImage - options - exit
+file.menu=newMap openFile recent close - saveMap saveMapAs saveAll revertMap createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -40,14 +40,14 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
-mapwindowFile.menu=saveMap saveAs createImage - revertMap - close
+mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - close
mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
mapwindowMap.menu=gridVisible enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
##########
# ToolBars
-main.toolbar=newMap openFile saveMap saveAs - prevWindow nextWindow - undo redo
+main.toolbar=newMap openFile saveMap saveMapAs - prevWindow nextWindow - undo redo
oldLibs.okayLibs=.svn CVS README LICENSE-* *-LICENSE japi.jar jlfgr-1_0.jar
Modified: trunk/src/app/net/sf/gridarta/action.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/action.properties 2010-05-16 18:20:29 UTC (rev 7823)
+++ trunk/src/app/net/sf/gridarta/action.properties 2010-05-16 18:23:06 UTC (rev 7824)
@@ -35,7 +35,7 @@
saveMap.icon=general/Save16
-saveAs.icon=general/SaveAs16
+saveMapAs.icon=general/SaveAs16
createImage.icon=CreateImageSmallIcon
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-16 18:20:29 UTC (rev 7823)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-16 18:23:06 UTC (rev 7824)
@@ -97,10 +97,10 @@
private final Action aSaveMap = ACTION_BUILDER.createAction(true, "saveMap", this);
/**
- * The action for "save as".
+ * The action for "save map as".
*/
@NotNull
- private final Action aSaveAs = ACTION_BUILDER.createAction(true, "saveAs", this);
+ private final Action aSaveMapAs = ACTION_BUILDER.createAction(true, "saveMapAs", this);
/**
* The action for "create image".
@@ -285,7 +285,7 @@
private void updateActions() {
aSaveMap.setEnabled(getSaveMapEnabled() != null);
//noinspection CallToSimpleGetterFromWithinClass
- aSaveAs.setEnabled(getSaveAsEnabled() != null);
+ aSaveMapAs.setEnabled(getSaveAsEnabled() != null);
aCreateImage.setEnabled(getCreateImageEnabled() != null);
aRevertMap.setEnabled(getRevertMapEnabled() != null);
//noinspection CallToSimpleGetterFromWithinClass
@@ -360,7 +360,7 @@
* Invoked when the user wants to save the map to a file.
*/
@ActionMethod
- public void saveAs() {
+ public void saveMapAs() {
//noinspection CallToSimpleGetterFromWithinClass
final MapControl<G, A, R> mapControl = getSaveAsEnabled();
if (mapControl != null) {
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 18:20:29 UTC (rev 7823)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 18:23:06 UTC (rev 7824)
@@ -548,12 +548,12 @@
saveMap.error.text.title=Error while saving
saveMap.error.text=Error while saving:\n{0}
-saveAs.text=Save As...
-saveAs.shortdescription=Save map with new name
-saveAs.longdescription=Saves map with a new filename
-saveAs.mnemonic=A
-saveAs.accel=ctrl shift pressed S
-saveAs.error.text=Error while saving as
+saveMapAs.text=Save As...
+saveMapAs.shortdescription=Save map with new name
+saveMapAs.longdescription=Saves map with a new filename
+saveMapAs.mnemonic=A
+saveMapAs.accel=ctrl shift pressed S
+saveMapAs.error.text=Error while saving as
createImage.text=Create Image
createImage.shortdescription=Creates a snapshot
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 18:20:29 UTC (rev 7823)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 18:23:06 UTC (rev 7824)
@@ -513,11 +513,11 @@
saveMap.error.text.title=Fehler beim Speichern
saveMap.error.text=Fehler beim Speichern
-saveAs.text=Speichern als...
-saveAs.shortdescription=Karte mit neuem Namen speichern
-saveAs.longdescription=Speichert die Karte unter einem neuen Namen
-saveAs.mnemonic=A
-saveAs.error.text=Fehler beim Speichern als
+saveMapAs.text=Speichern als...
+saveMapAs.shortdescription=Karte mit neuem Namen speichern
+saveMapAs.longdescription=Speichert die Karte unter einem neuen Namen
+saveMapAs.mnemonic=A
+saveMapAs.error.text=Fehler beim Speichern als
createImage.text=Bild speichern...
createImage.shortdescription=Bild der Karte speichern
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 18:20:29 UTC (rev 7823)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 18:23:06 UTC (rev 7824)
@@ -508,11 +508,11 @@
#saveMap.error.text.title=
saveMap.error.text=Erreur lors de l''enregistrement.
-saveAs.text=Enregistrer sous...
-saveAs.shortdescription=Enregistrer la carte sous un nouveau nom
-saveAs.longdescription=Enregistre la carte dans un fichier portant un nom diff\xE9rent
-saveAs.mnemonic=S
-saveAs.error.text=Erreur lors de l''enregistrement sous...
+saveMapAs.text=Enregistrer sous...
+saveMapAs.shortdescription=Enregistrer la carte sous un nouveau nom
+saveMapAs.longdescription=Enregistre la carte dans un fichier portant un nom diff\xE9rent
+saveMapAs.mnemonic=S
+saveMapAs.error.text=Erreur lors de l''enregistrement sous...
createImage.text=Cr\xE9er image
createImage.shortdescription=Cr\xE9er une image \xE0 partir de la carte
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-16 18:20:29 UTC (rev 7823)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-16 18:23:06 UTC (rev 7824)
@@ -512,11 +512,11 @@
save.error.text.title=Kunde inte spara
save.error.text=Ett fel intr\xE4ffade:\n{0}
-saveAs.text=Spara som...
-saveAs.shortdescription=Spara karta som ny fil
-saveAs.longdescription=Sparar en karta under ett nytt filnamn
-saveAs.mnemonic=A
-saveAs.error.text=Kunde inte spara som
+saveMapAs.text=Spara som...
+saveMapAs.shortdescription=Spara karta som ny fil
+saveMapAs.longdescription=Sparar en karta under ett nytt filnamn
+saveMapAs.mnemonic=A
+saveMapAs.error.text=Kunde inte spara som
createImage.text=Skapa bild
createImage.shortdescription=Skapa bild av kartan
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 18:20:35
|
Revision: 7823
http://gridarta.svn.sourceforge.net/gridarta/?rev=7823&view=rev
Author: akirschbaum
Date: 2010-05-16 18:20:29 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Rename action 'save' to 'saveMap'.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
trunk/src/app/net/sf/gridarta/action.properties
trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-16 18:16:21 UTC (rev 7822)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-16 18:20:29 UTC (rev 7823)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent close - save saveAs saveAll revertMap createImage - options - exit
+file.menu=newMap openFile recent close - saveMap saveAs saveAll revertMap createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -40,14 +40,14 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
-mapwindowFile.menu=save saveAs createImage - revertMap - close
+mapwindowFile.menu=saveMap saveAs createImage - revertMap - close
mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
mapwindowMap.menu=gridVisible enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
##########
# ToolBars
-main.toolbar=newMap openFile save saveAs - prevWindow nextWindow - undo redo
+main.toolbar=newMap openFile saveMap saveAs - prevWindow nextWindow - undo redo
oldLibs.okayLibs=.svn CVS README LICENSE-* *-LICENSE japi.jar jlfgr-1_0.jar
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-16 18:16:21 UTC (rev 7822)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-16 18:20:29 UTC (rev 7823)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent close - save saveAs saveAll revertMap createImage - options - exit
+file.menu=newMap openFile recent close - saveMap saveAs saveAll revertMap createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -40,14 +40,14 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
-mapwindowFile.menu=save saveAs createImage - revertMap - close
+mapwindowFile.menu=saveMap saveAs createImage - revertMap - close
mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
mapwindowMap.menu=gridVisible smoothing enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
##########
# ToolBars
-main.toolbar=newMap openFile save saveAs - prevWindow nextWindow - undo redo
+main.toolbar=newMap openFile saveMap saveAs - prevWindow nextWindow - undo redo
moveCursor.menu=goNorth goEast goSouth goWest goNorthEast goSouthEast goSouthWest goNorthWest - goLocation
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-16 18:16:21 UTC (rev 7822)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-16 18:20:29 UTC (rev 7823)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent close - save saveAs saveAll revertMap createImage - options - exit
+file.menu=newMap openFile recent close - saveMap saveAs saveAll revertMap createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -40,14 +40,14 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
-mapwindowFile.menu=save saveAs createImage - revertMap - close
+mapwindowFile.menu=saveMap saveAs createImage - revertMap - close
mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
mapwindowMap.menu=gridVisible enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
##########
# ToolBars
-main.toolbar=newMap openFile save saveAs - prevWindow nextWindow - undo redo
+main.toolbar=newMap openFile saveMap saveAs - prevWindow nextWindow - undo redo
oldLibs.okayLibs=.svn CVS README LICENSE-* *-LICENSE japi.jar jlfgr-1_0.jar
Modified: trunk/src/app/net/sf/gridarta/action.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/action.properties 2010-05-16 18:16:21 UTC (rev 7822)
+++ trunk/src/app/net/sf/gridarta/action.properties 2010-05-16 18:20:29 UTC (rev 7823)
@@ -33,7 +33,7 @@
openFile.icon=general/Open16
-save.icon=general/Save16
+saveMap.icon=general/Save16
saveAs.icon=general/SaveAs16
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-16 18:16:21 UTC (rev 7822)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-16 18:20:29 UTC (rev 7823)
@@ -91,10 +91,10 @@
private final MapViewsManager<G, A, R> mapViewsManager;
/**
- * The action for "save".
+ * The action for "save map".
*/
@NotNull
- private final Action aSave = ACTION_BUILDER.createAction(true, "save", this);
+ private final Action aSaveMap = ACTION_BUILDER.createAction(true, "saveMap", this);
/**
* The action for "save as".
@@ -283,7 +283,7 @@
* Update the enabled/disabled state of all actions.
*/
private void updateActions() {
- aSave.setEnabled(getSaveEnabled() != null);
+ aSaveMap.setEnabled(getSaveMapEnabled() != null);
//noinspection CallToSimpleGetterFromWithinClass
aSaveAs.setEnabled(getSaveAsEnabled() != null);
aCreateImage.setEnabled(getCreateImageEnabled() != null);
@@ -293,12 +293,12 @@
}
/**
- * Determine whether "save" is enabled.
- * @return the map control for which "save" is enabled, or <code>null</code>
- * if "save" is disabled
+ * Determine whether "save map" is enabled.
+ * @return the map control for which "save map" is enabled, or
+ * <code>null</code> if "save map" is disabled
*/
@Nullable
- private MapControl<G, A, R> getSaveEnabled() {
+ private MapControl<G, A, R> getSaveMapEnabled() {
final MapControl<G, A, R> mapControl = currentMapControl;
return mapControl != null && mapControl.getMapModel().isModified() ? mapControl : null;
}
@@ -349,8 +349,8 @@
* Invoked when the user wants to save the map.
*/
@ActionMethod
- public void save() {
- final MapControl<G, A, R> mapControl = getSaveEnabled();
+ public void saveMap() {
+ final MapControl<G, A, R> mapControl = getSaveMapEnabled();
if (mapControl != null) {
fileControl.save(mapControl);
}
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 18:16:21 UTC (rev 7822)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 18:20:29 UTC (rev 7823)
@@ -540,13 +540,13 @@
file.text=File
file.mnemonic=F
-save.text=Save
-save.shortdescription=Save map
-save.longdescription=Saves the current map
-save.mnemonic=S
-save.accel=ctrl pressed S
-save.error.text.title=Error while saving
-save.error.text=Error while saving:\n{0}
+saveMap.text=Save
+saveMap.shortdescription=Save map
+saveMap.longdescription=Saves the current map
+saveMap.mnemonic=S
+saveMap.accel=ctrl pressed S
+saveMap.error.text.title=Error while saving
+saveMap.error.text=Error while saving:\n{0}
saveAs.text=Save As...
saveAs.shortdescription=Save map with new name
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 18:16:21 UTC (rev 7822)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 18:20:29 UTC (rev 7823)
@@ -506,12 +506,12 @@
file.text=Datei
file.mnemonic=D
-save.text=Speichern
-save.shortdescription=Karte speichern
-save.longdescription=Speichert die aktuelle Karte
-save.mnemonic=S
-save.error.text.title=Fehler beim Speichern
-save.error.text=Fehler beim Speichern
+saveMap.text=Speichern
+saveMap.shortdescription=Karte speichern
+saveMap.longdescription=Speichert die aktuelle Karte
+saveMap.mnemonic=S
+saveMap.error.text.title=Fehler beim Speichern
+saveMap.error.text=Fehler beim Speichern
saveAs.text=Speichern als...
saveAs.shortdescription=Karte mit neuem Namen speichern
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 18:16:21 UTC (rev 7822)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 18:20:29 UTC (rev 7823)
@@ -501,12 +501,12 @@
file.text=Fichier
file.mnemonic=F
-save.text=Enregistrer
-save.shortdescription=Enregistrer la carte
-save.longdescription=Enregistre la carte active
-save.mnemonic=E
-#save.error.text.title=
-save.error.text=Erreur lors de l''enregistrement.
+saveMap.text=Enregistrer
+saveMap.shortdescription=Enregistrer la carte
+saveMap.longdescription=Enregistre la carte active
+saveMap.mnemonic=E
+#saveMap.error.text.title=
+saveMap.error.text=Erreur lors de l''enregistrement.
saveAs.text=Enregistrer sous...
saveAs.shortdescription=Enregistrer la carte sous un nouveau nom
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 18:16:28
|
Revision: 7822
http://gridarta.svn.sourceforge.net/gridarta/?rev=7822&view=rev
Author: akirschbaum
Date: 2010-05-16 18:16:21 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Rename action 'revert' to 'revertMap'.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
trunk/src/app/net/sf/gridarta/action.properties
trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-16 18:08:47 UTC (rev 7821)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-16 18:16:21 UTC (rev 7822)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent close - save saveAs saveAll revert createImage - options - exit
+file.menu=newMap openFile recent close - save saveAs saveAll revertMap createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -40,7 +40,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
-mapwindowFile.menu=save saveAs createImage - revert - close
+mapwindowFile.menu=save saveAs createImage - revertMap - close
mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
mapwindowMap.menu=gridVisible enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-16 18:08:47 UTC (rev 7821)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-16 18:16:21 UTC (rev 7822)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent close - save saveAs saveAll revert createImage - options - exit
+file.menu=newMap openFile recent close - save saveAs saveAll revertMap createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -40,7 +40,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
-mapwindowFile.menu=save saveAs createImage - revert - close
+mapwindowFile.menu=save saveAs createImage - revertMap - close
mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
mapwindowMap.menu=gridVisible smoothing enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-16 18:08:47 UTC (rev 7821)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-16 18:16:21 UTC (rev 7822)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent close - save saveAs saveAll revert createImage - options - exit
+file.menu=newMap openFile recent close - save saveAs saveAll revertMap createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -40,7 +40,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
-mapwindowFile.menu=save saveAs createImage - revert - close
+mapwindowFile.menu=save saveAs createImage - revertMap - close
mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
mapwindowMap.menu=gridVisible enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
Modified: trunk/src/app/net/sf/gridarta/action.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/action.properties 2010-05-16 18:08:47 UTC (rev 7821)
+++ trunk/src/app/net/sf/gridarta/action.properties 2010-05-16 18:16:21 UTC (rev 7822)
@@ -39,7 +39,7 @@
createImage.icon=CreateImageSmallIcon
-revert.icon=general/Refresh16
+revertMap.icon=general/Refresh16
close.icon=EmptySmallIcon
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-16 18:08:47 UTC (rev 7821)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-16 18:16:21 UTC (rev 7822)
@@ -109,10 +109,10 @@
private final Action aCreateImage = ACTION_BUILDER.createAction(true, "createImage", this);
/**
- * The action for "revert".
+ * The action for "revert map".
*/
@NotNull
- private final Action aRevert = ACTION_BUILDER.createAction(true, "revert", this);
+ private final Action aRevertMap = ACTION_BUILDER.createAction(true, "revertMap", this);
/**
* The action for "close".
@@ -287,7 +287,7 @@
//noinspection CallToSimpleGetterFromWithinClass
aSaveAs.setEnabled(getSaveAsEnabled() != null);
aCreateImage.setEnabled(getCreateImageEnabled() != null);
- aRevert.setEnabled(getRevertEnabled() != null);
+ aRevertMap.setEnabled(getRevertMapEnabled() != null);
//noinspection CallToSimpleGetterFromWithinClass
aClose.setEnabled(getCloseEnabled() != null);
}
@@ -325,12 +325,12 @@
}
/**
- * Determine whether "revert" is enabled.
- * @return the map control for which "revert" is enabled, or
- * <code>null</code> if "revert" is disabled
+ * Determine whether "revert map" is enabled.
+ * @return the map control for which "revert map" is enabled, or
+ * <code>null</code> if "revert map" is disabled
*/
@Nullable
- private MapControl<G, A, R> getRevertEnabled() {
+ private MapControl<G, A, R> getRevertMapEnabled() {
final MapControl<G, A, R> mapControl = currentMapControl;
return mapControl != null && mapControl.getPlainSaveFile() != null && mapControl.getMapModel().isModified() ? mapControl : null;
}
@@ -384,8 +384,8 @@
* state.
*/
@ActionMethod
- public void revert() {
- final MapControl<G, A, R> mapControl = getRevertEnabled();
+ public void revertMap() {
+ final MapControl<G, A, R> mapControl = getRevertMapEnabled();
if (mapControl == null) {
return;
}
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 18:08:47 UTC (rev 7821)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 18:16:21 UTC (rev 7822)
@@ -561,11 +561,11 @@
createImage.mnemonic=I
createImage.error.text=Error while creating snapshot image
-revert.text=Revert
-revert.shortdescription=Reverts map
-revert.longdescription=Reverts the map to the last saved version
-revert.mnemonic=R
-revert.error.text=Error while reverting map
+revertMap.text=Revert
+revertMap.shortdescription=Reverts map
+revertMap.longdescription=Reverts the map to the last saved version
+revertMap.mnemonic=R
+revertMap.error.text=Error while reverting map
close.text=Close
close.shortdescription=Close map
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 18:08:47 UTC (rev 7821)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 18:16:21 UTC (rev 7822)
@@ -525,11 +525,11 @@
createImage.mnemonic=I
createImage.error.text=Fehler beim Bild speichern
-revert.text=Zur\xFCcksetzen
-revert.shortdescription=Zuletzt gespeicherte Fassung
-revert.longdescription=Macht alle \xC4nderungen r\xFCckg\xE4ngig und stellt die zuletzt gespeicherte Fassung wieder her
-revert.mnemonic=R
-revert.error.text=Fehler beim Zur\xFCcksetzen
+revertMap.text=Zur\xFCcksetzen
+revertMap.shortdescription=Zuletzt gespeicherte Fassung
+revertMap.longdescription=Macht alle \xC4nderungen r\xFCckg\xE4ngig und stellt die zuletzt gespeicherte Fassung wieder her
+revertMap.mnemonic=R
+revertMap.error.text=Fehler beim Zur\xFCcksetzen
close.text=Schie\xDFen
close.shortdescription=Karte schlie\xDFen
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 18:08:47 UTC (rev 7821)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 18:16:21 UTC (rev 7822)
@@ -520,11 +520,11 @@
createImage.mnemonic=I
createImage.error.text=Erreur lors de la cr\xE9ation d''une image.
-revert.text=Restaurer
-revert.shortdescription=Restaure la carte
-revert.longdescription=Restaure la carte selon la derni\xE8re version enregistr\xE9e
-revert.mnemonic=R
-revert.error.text=Erreur lors de la restauration de la carte.
+revertMap.text=Restaurer
+revertMap.shortdescription=Restaure la carte
+revertMap.longdescription=Restaure la carte selon la derni\xE8re version enregistr\xE9e
+revertMap.mnemonic=R
+revertMap.error.text=Erreur lors de la restauration de la carte.
close.text=Fermer
close.shortdescription=Fermer la carte
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-16 18:08:47 UTC (rev 7821)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-16 18:16:21 UTC (rev 7822)
@@ -524,11 +524,11 @@
createImage.mnemonic=B
createImage.error.text=Kunde inte spara bilden
-revert.text=\xC5terst\xE4ll
-revert.shortdescription=\xC5terst\xE4ller karta
-revert.longdescription=\xC5terst\xE4ller kartan till den senast sparade versionen
-revert.mnemonic=R
-revert.error.text=Kunde inte \xE5terst\xE4lla kartan
+revertMap.text=\xC5terst\xE4ll
+revertMap.shortdescription=\xC5terst\xE4ller karta
+revertMap.longdescription=\xC5terst\xE4ller kartan till den senast sparade versionen
+revertMap.mnemonic=R
+revertMap.error.text=Kunde inte \xE5terst\xE4lla kartan
close.text=St\xE4ng
close.shortdescription=St\xE4ng karta
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 18:08:54
|
Revision: 7821
http://gridarta.svn.sourceforge.net/gridarta/?rev=7821&view=rev
Author: akirschbaum
Date: 2010-05-16 18:08:47 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Rename action 'open' to 'openFile'.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
trunk/src/app/net/sf/gridarta/action.properties
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-16 18:04:07 UTC (rev 7820)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-16 18:08:47 UTC (rev 7821)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap open recent close - save saveAs saveAll revert createImage - options - exit
+file.menu=newMap openFile recent close - save saveAs saveAll revert createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -47,7 +47,7 @@
##########
# ToolBars
-main.toolbar=newMap open save saveAs - prevWindow nextWindow - undo redo
+main.toolbar=newMap openFile save saveAs - prevWindow nextWindow - undo redo
oldLibs.okayLibs=.svn CVS README LICENSE-* *-LICENSE japi.jar jlfgr-1_0.jar
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-16 18:04:07 UTC (rev 7820)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-16 18:08:47 UTC (rev 7821)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap open recent close - save saveAs saveAll revert createImage - options - exit
+file.menu=newMap openFile recent close - save saveAs saveAll revert createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -47,7 +47,7 @@
##########
# ToolBars
-main.toolbar=newMap open save saveAs - prevWindow nextWindow - undo redo
+main.toolbar=newMap openFile save saveAs - prevWindow nextWindow - undo redo
moveCursor.menu=goNorth goEast goSouth goWest goNorthEast goSouthEast goSouthWest goNorthWest - goLocation
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-16 18:04:07 UTC (rev 7820)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-16 18:08:47 UTC (rev 7821)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap open recent close - save saveAs saveAll revert createImage - options - exit
+file.menu=newMap openFile recent close - save saveAs saveAll revert createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -47,7 +47,7 @@
##########
# ToolBars
-main.toolbar=newMap open save saveAs - prevWindow nextWindow - undo redo
+main.toolbar=newMap openFile save saveAs - prevWindow nextWindow - undo redo
oldLibs.okayLibs=.svn CVS README LICENSE-* *-LICENSE japi.jar jlfgr-1_0.jar
Modified: trunk/src/app/net/sf/gridarta/action.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/action.properties 2010-05-16 18:04:07 UTC (rev 7820)
+++ trunk/src/app/net/sf/gridarta/action.properties 2010-05-16 18:08:47 UTC (rev 7821)
@@ -31,7 +31,7 @@
newMap.icon=general/New16
-open.icon=general/Open16
+openFile.icon=general/Open16
save.icon=general/Save16
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 18:04:07 UTC (rev 7820)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 18:08:47 UTC (rev 7821)
@@ -396,7 +396,7 @@
final ImageCreator2<G, A, R> imageCreator2 = new ImageCreator2<G, A, R>(globalSettings, imageCreator);
spellUtils = spellFile != null ? new SpellsUtils(spellFile) : null;
appPrefsModel = editorFactory.createAppPrefsModel();
- ACTION_BUILDER.createActions(true, this, "newMap", "onlineHelp", "gc", "newScript", "editScript", "open", "zoom", "tod", "options", "controlServer", "controlClient", "collectSpells", "cleanCompletelyBlockedSquares");
+ ACTION_BUILDER.createActions(true, this, "newMap", "onlineHelp", "gc", "newScript", "editScript", "openFile", "zoom", "tod", "options", "controlServer", "controlClient", "collectSpells", "cleanCompletelyBlockedSquares");
final Action exitAction = ACTION_BUILDER.createAction(true, "exit", this);
final MapViewManager<G, A, R> mapViewManager = new MapViewManager<G, A, R>();
statusBar = new StatusBar<G, A, R>(mapManager, mapViewManager, archetypeSet, faceObjects);
@@ -632,7 +632,7 @@
* Invoked when user wants to open a file.
*/
@ActionMethod
- public void open() {
+ public void openFile() {
fileControl.openFile(true);
}
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 18:04:07 UTC (rev 7820)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 18:08:47 UTC (rev 7821)
@@ -584,12 +584,12 @@
newMap.mnemonic=N
newMap.accel=ctrl pressed N
-open.text=Open...
-open.shortdescription=Open a new map
-open.longdescription=Loads a new map from a map file
-open.mnemonic=O
-open.accel=ctrl pressed O
-open.error.text=Error while loading
+openFile.text=Open...
+openFile.shortdescription=Open a new map
+openFile.longdescription=Loads a new map from a map file
+openFile.mnemonic=O
+openFile.accel=ctrl pressed O
+openFile.error.text=Error while loading
options.text=Options...
options.shortdescription=Shows options
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 18:04:07 UTC (rev 7820)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 18:08:47 UTC (rev 7821)
@@ -546,11 +546,11 @@
newMap.longdescription=Erzeugt eine neue Karte
newMap.mnemonic=N
-open.text=\xD6ffnen...
-open.shortdescription=\xD6ffne eine Karte
-open.longdescription=L\xE4dt eine Karte aus einer Datei
-open.mnemonic=F
-open.error.text=Fehler beim Laden
+openFile.text=\xD6ffnen...
+openFile.shortdescription=\xD6ffne eine Karte
+openFile.longdescription=L\xE4dt eine Karte aus einer Datei
+openFile.mnemonic=F
+openFile.error.text=Fehler beim Laden
options.text=Optionen...
options.shortdescription=Optionen zeigen
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 18:04:07 UTC (rev 7820)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 18:08:47 UTC (rev 7821)
@@ -541,11 +541,11 @@
newMap.longdescription=Cr\xE9e une nouvelle carte
newMap.mnemonic=N
-open.text=Ouvrir
-open.shortdescription=Ouvrir une carte
-open.longdescription=Ouvre une carte \xE0 partir d''un fichier
-open.mnemonic=O
-open.error.text=Erreur lors du chargement.
+openFile.text=Ouvrir
+openFile.shortdescription=Ouvrir une carte
+openFile.longdescription=Ouvre une carte \xE0 partir d''un fichier
+openFile.mnemonic=O
+openFile.error.text=Erreur lors du chargement.
options.text=Options...
options.shortdescription=Affiche les options
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-16 18:04:07 UTC (rev 7820)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-16 18:08:47 UTC (rev 7821)
@@ -545,11 +545,11 @@
newMap.longdescription=Skapar en ny karta
newMap.mnemonic=Y
-open.text=\xD6ppna...
-open.shortdescription=\xD6ppna karta
-open.longdescription=\xD6ppnar en karta fr\xE5n fil
-open.mnemonic=P
-#open.error.text=
+openFile.text=\xD6ppna...
+openFile.shortdescription=\xD6ppna karta
+openFile.longdescription=\xD6ppnar en karta fr\xE5n fil
+openFile.mnemonic=P
+#openFile.error.text=
options.text=Inst\xE4llningar...
options.shortdescription=Justera inst\xE4llningar
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 18:04:13
|
Revision: 7820
http://gridarta.svn.sourceforge.net/gridarta/?rev=7820&view=rev
Author: akirschbaum
Date: 2010-05-16 18:04:07 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Fix previous commit.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 18:02:28 UTC (rev 7819)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 18:04:07 UTC (rev 7820)
@@ -586,7 +586,7 @@
*/
@ActionMethod
public void newMap() {
- newMap();
+ newMapDialogFactory.showNewMapDialog();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 18:02:34
|
Revision: 7819
http://gridarta.svn.sourceforge.net/gridarta/?rev=7819&view=rev
Author: akirschbaum
Date: 2010-05-16 18:02:28 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Fix incorrect @NotNull annotation.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 18:01:28 UTC (rev 7818)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 18:02:28 UTC (rev 7819)
@@ -669,7 +669,7 @@
* @return the map view of the loaded file or <code>null</code>
* @throws IOException if an I/O error occurs
*/
- @NotNull
+ @Nullable
public MapView<G, A, R> openFile(@NotNull final File file) throws IOException {
final boolean isScriptFile = file.getName().toLowerCase().endsWith(scriptExtension);
if (file.isFile()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 18:01:34
|
Revision: 7818
http://gridarta.svn.sourceforge.net/gridarta/?rev=7818&view=rev
Author: akirschbaum
Date: 2010-05-16 18:01:28 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Merge redundant functions GUIMainControl.newMap() and GUIMainControl.createNew().
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
trunk/src/app/net/sf/gridarta/action.properties
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-16 17:56:04 UTC (rev 7817)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-16 18:01:28 UTC (rev 7818)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=createNew open recent close - save saveAs saveAll revert createImage - options - exit
+file.menu=newMap open recent close - save saveAs saveAll revert createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -47,7 +47,7 @@
##########
# ToolBars
-main.toolbar=createNew open save saveAs - prevWindow nextWindow - undo redo
+main.toolbar=newMap open save saveAs - prevWindow nextWindow - undo redo
oldLibs.okayLibs=.svn CVS README LICENSE-* *-LICENSE japi.jar jlfgr-1_0.jar
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-16 17:56:04 UTC (rev 7817)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-16 18:01:28 UTC (rev 7818)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=createNew open recent close - save saveAs saveAll revert createImage - options - exit
+file.menu=newMap open recent close - save saveAs saveAll revert createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -47,7 +47,7 @@
##########
# ToolBars
-main.toolbar=createNew open save saveAs - prevWindow nextWindow - undo redo
+main.toolbar=newMap open save saveAs - prevWindow nextWindow - undo redo
moveCursor.menu=goNorth goEast goSouth goWest goNorthEast goSouthEast goSouthWest goNorthWest - goLocation
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-16 17:56:04 UTC (rev 7817)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-16 18:01:28 UTC (rev 7818)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=createNew open recent close - save saveAs saveAll revert createImage - options - exit
+file.menu=newMap open recent close - save saveAs saveAll revert createImage - options - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
@@ -47,7 +47,7 @@
##########
# ToolBars
-main.toolbar=createNew open save saveAs - prevWindow nextWindow - undo redo
+main.toolbar=newMap open save saveAs - prevWindow nextWindow - undo redo
oldLibs.okayLibs=.svn CVS README LICENSE-* *-LICENSE japi.jar jlfgr-1_0.jar
Modified: trunk/src/app/net/sf/gridarta/action.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/action.properties 2010-05-16 17:56:04 UTC (rev 7817)
+++ trunk/src/app/net/sf/gridarta/action.properties 2010-05-16 18:01:28 UTC (rev 7818)
@@ -29,7 +29,7 @@
#this is empty but yet must be here.
recent.menu=
-createNew.icon=general/New16
+newMap.icon=general/New16
open.icon=general/Open16
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 17:56:04 UTC (rev 7817)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 18:01:28 UTC (rev 7818)
@@ -396,7 +396,7 @@
final ImageCreator2<G, A, R> imageCreator2 = new ImageCreator2<G, A, R>(globalSettings, imageCreator);
spellUtils = spellFile != null ? new SpellsUtils(spellFile) : null;
appPrefsModel = editorFactory.createAppPrefsModel();
- ACTION_BUILDER.createActions(true, this, "createNew", "onlineHelp", "gc", "newScript", "editScript", "open", "zoom", "tod", "options", "controlServer", "controlClient", "collectSpells", "cleanCompletelyBlockedSquares");
+ ACTION_BUILDER.createActions(true, this, "newMap", "onlineHelp", "gc", "newScript", "editScript", "open", "zoom", "tod", "options", "controlServer", "controlClient", "collectSpells", "cleanCompletelyBlockedSquares");
final Action exitAction = ACTION_BUILDER.createAction(true, "exit", this);
final MapViewManager<G, A, R> mapViewManager = new MapViewManager<G, A, R>();
statusBar = new StatusBar<G, A, R>(mapManager, mapViewManager, archetypeSet, faceObjects);
@@ -586,14 +586,6 @@
*/
@ActionMethod
public void newMap() {
- newMapDialogFactory.showNewMapDialog();
- }
-
- /**
- * Invoked when user wants to begin editing a new (empty) map.
- */
- @ActionMethod
- public void createNew() {
newMap();
}
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 17:56:04 UTC (rev 7817)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 18:01:28 UTC (rev 7818)
@@ -578,11 +578,11 @@
recent.mnemonic=T
recentItem.shortdescriptionformat=Opens map {0} ({1})
-createNew.text=New...
-createNew.shortdescription=Create new map
-createNew.longdescription=Creates a new map
-createNew.mnemonic=N
-createNew.accel=ctrl pressed N
+newMap.text=New...
+newMap.shortdescription=Create new map
+newMap.longdescription=Creates a new map
+newMap.mnemonic=N
+newMap.accel=ctrl pressed N
open.text=Open...
open.shortdescription=Open a new map
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 17:56:04 UTC (rev 7817)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 18:01:28 UTC (rev 7818)
@@ -541,10 +541,10 @@
recent.mnemonic=Z
recentItem.shortdescriptionformat=\xD6ffne Karte {0} ({1})
-createNew.text=Neu...
-createNew.shortdescription=Erzeuge neue Karte
-createNew.longdescription=Erzeugt eine neue Karte
-createNew.mnemonic=N
+newMap.text=Neu...
+newMap.shortdescription=Erzeuge neue Karte
+newMap.longdescription=Erzeugt eine neue Karte
+newMap.mnemonic=N
open.text=\xD6ffnen...
open.shortdescription=\xD6ffne eine Karte
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 17:56:04 UTC (rev 7817)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 18:01:28 UTC (rev 7818)
@@ -536,10 +536,10 @@
#recent.mnemonic=
#recentItem.shortdescriptionformat=
-createNew.text=Nouveau
-createNew.shortdescription=Cr\xE9er une nouvelle carte
-createNew.longdescription=Cr\xE9e une nouvelle carte
-createNew.mnemonic=N
+newMap.text=Nouveau
+newMap.shortdescription=Cr\xE9er une nouvelle carte
+newMap.longdescription=Cr\xE9e une nouvelle carte
+newMap.mnemonic=N
open.text=Ouvrir
open.shortdescription=Ouvrir une carte
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-16 17:56:04 UTC (rev 7817)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-16 18:01:28 UTC (rev 7818)
@@ -540,10 +540,10 @@
recent.mnemonic=L
recentItem.shortdescriptionformat=\xD6ppnar karta {0} ({1})
-createNew.text=Ny
-createNew.shortdescription=Ny karta
-createNew.longdescription=Skapar en ny karta
-createNew.mnemonic=Y
+newMap.text=Ny
+newMap.shortdescription=Ny karta
+newMap.longdescription=Skapar en ny karta
+newMap.mnemonic=Y
open.text=\xD6ppna...
open.shortdescription=\xD6ppna karta
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 17:56:10
|
Revision: 7817
http://gridarta.svn.sourceforge.net/gridarta/?rev=7817&view=rev
Author: akirschbaum
Date: 2010-05-16 17:56:04 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Add @ActionMethod annotations.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 17:54:37 UTC (rev 7816)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 17:56:04 UTC (rev 7817)
@@ -584,6 +584,7 @@
/**
* Invoked when user wants to begin editing a new (empty) map.
*/
+ @ActionMethod
public void newMap() {
newMapDialogFactory.showNewMapDialog();
}
@@ -591,6 +592,7 @@
/**
* Invoked when user wants to begin editing a new (empty) map.
*/
+ @ActionMethod
public void createNew() {
newMap();
}
@@ -624,6 +626,7 @@
/**
* Calls for zooming preview tool.
*/
+ @ActionMethod
public void zoom() {
final MapControl<G, A, R> mapControl = mapManager.getCurrentMap();
if (mapControl == null) {
@@ -636,10 +639,12 @@
/**
* Invoked when user wants to open a file.
*/
+ @ActionMethod
public void open() {
fileControl.openFile(true);
}
+ @ActionMethod
public void options() {
if (prefsGroup == null) {
prefsGroup = editorFactory.createPreferencesGroup(globalSettings, validators, appPrefsModel, exitConnectorModel, configSourceFactory);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 17:54:44
|
Revision: 7816
http://gridarta.svn.sourceforge.net/gridarta/?rev=7816&view=rev
Author: akirschbaum
Date: 2010-05-16 17:54:37 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Remove statically checkable assert statement.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java 2010-05-16 17:53:18 UTC (rev 7815)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java 2010-05-16 17:54:37 UTC (rev 7816)
@@ -528,7 +528,6 @@
@Override
public void run() {
guiMainControl[0].run(args);
- assert splashScreen != null;
splashScreen.hide();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 17:53:25
|
Revision: 7815
http://gridarta.svn.sourceforge.net/gridarta/?rev=7815&view=rev
Author: akirschbaum
Date: 2010-05-16 17:53:18 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Remove unused parameters.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java
trunk/src/app/net/sf/gridarta/maincontrol/DefaultMainControl.java
trunk/src/app/net/sf/gridarta/maincontrol/EditorFactory.java
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2010-05-16 17:44:07 UTC (rev 7814)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2010-05-16 17:53:18 UTC (rev 7815)
@@ -67,7 +67,6 @@
import net.sf.gridarta.model.face.DefaultFaceObjects;
import net.sf.gridarta.model.face.FaceObjectProviders;
import net.sf.gridarta.model.face.FaceObjects;
-import net.sf.gridarta.model.filter.NamedFilter;
import net.sf.gridarta.model.gameobject.GameObjectFactory;
import net.sf.gridarta.model.gameobject.IsoMapSquareInfo;
import net.sf.gridarta.model.gameobject.MultiPositionData;
@@ -538,8 +537,8 @@
*/
@NotNull
@Override
- public GUIMainControl<GameObject, MapArchObject, Archetype> createGUIMainControl(@NotNull final DefaultMainControl<GameObject, MapArchObject, Archetype> mainControl, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final FilterControl<GameObject, MapArchObject, Archetype> filterControl, @NotNull final ScriptExecutor<GameObject, MapArchObject, Archetype> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapManager<GameObject, MapArchObject, Archetype> pickmapManager, @NotNull final MapControlFactory<GameObject, MapArchObject, Archetype> mapControlFactory, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final FaceObjects faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<GameObject, MapArchObject, Archetype> topmostInsertionMode, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet, @NotNull final MapArchObjectFactory<MapArchObject> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<GameObject, MapArchObject, Archetype> mapReaderFactory, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ScriptModel<GameObject, MapArchObject, Archetype> scriptModel, @NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final NamedFilter defaultFilterList, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final AttributeRangeChecker<GameObject, MapArchObject, Archetype> attributeRangeChecker, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory) {
- return mainControl.createGUIMainControl(FileFilters.pythonFileFilter, ".py", true, mapManager, pickmapManager, archetypeSet, mapControlFactory, guiUtils.getResourceIcon(IGUIConstants.TILE_NORTH), "AtrinikEditor.jar", new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, }, PREFS_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SPELL_FILE, this, errorView, new SubdirectoryCacheFiles(".dedit"), configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, -1, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, IGUIConstants.SCRIPTS_DIR, scriptModel, animationObjects, archetypeChooserModel, false, scriptedEventEditor, new int[] { CommonConstants.NORTH_EAST, CommonConstants.SOUTH_EAST, CommonConstants.SOUTH_WEST, CommonConstants.NORTH_WEST, CommonConstants.EAST, CommonConstants.SOUTH, CommonConstants.WEST, CommonConstants.NORTH, }, defaultFilterList, resources, gameObjectSpells, numberSpells, attributeRangeChecker, pluginParameterFactory);
+ public GUIMainControl<GameObject, MapArchObject, Archetype> createGUIMainControl(@NotNull final DefaultMainControl<GameObject, MapArchObject, Archetype> mainControl, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final FilterControl<GameObject, MapArchObject, Archetype> filterControl, @NotNull final ScriptExecutor<GameObject, MapArchObject, Archetype> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapManager<GameObject, MapArchObject, Archetype> pickmapManager, @NotNull final MapControlFactory<GameObject, MapArchObject, Archetype> mapControlFactory, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final FaceObjects faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<GameObject, MapArchObject, Archetype> topmostInsertionMode, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet, @NotNull final MapArchObjectFactory<MapArchObject> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<GameObject, MapArchObject, Archetype> mapReaderFactory, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ScriptModel<GameObject, MapArchObject, Archetype> scriptModel, @NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final AttributeRangeChecker<GameObject, MapArchObject, Archetype> attributeRangeChecker, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory) {
+ return mainControl.createGUIMainControl(FileFilters.pythonFileFilter, ".py", true, mapManager, pickmapManager, archetypeSet, mapControlFactory, guiUtils.getResourceIcon(IGUIConstants.TILE_NORTH), "AtrinikEditor.jar", new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, }, PREFS_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SPELL_FILE, this, errorView, new SubdirectoryCacheFiles(".dedit"), configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, -1, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, IGUIConstants.SCRIPTS_DIR, scriptModel, animationObjects, archetypeChooserModel, false, scriptedEventEditor, new int[] { CommonConstants.NORTH_EAST, CommonConstants.SOUTH_EAST, CommonConstants.SOUTH_WEST, CommonConstants.NORTH_WEST, CommonConstants.EAST, CommonConstants.SOUTH, CommonConstants.WEST, CommonConstants.NORTH, }, resources, gameObjectSpells, numberSpells, attributeRangeChecker, pluginParameterFactory);
}
/**
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2010-05-16 17:44:07 UTC (rev 7814)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2010-05-16 17:53:18 UTC (rev 7815)
@@ -61,7 +61,6 @@
import net.sf.gridarta.model.face.DefaultFaceObjects;
import net.sf.gridarta.model.face.FaceObjectProviders;
import net.sf.gridarta.model.face.FaceObjects;
-import net.sf.gridarta.model.filter.NamedFilter;
import net.sf.gridarta.model.gameobject.GameObjectFactory;
import net.sf.gridarta.model.io.DefaultMapReaderFactory;
import net.sf.gridarta.model.io.DirectoryCacheFiles;
@@ -405,8 +404,8 @@
*/
@NotNull
@Override
- public GUIMainControl<GameObject, MapArchObject, Archetype> createGUIMainControl(@NotNull final DefaultMainControl<GameObject, MapArchObject, Archetype> mainControl, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final FilterControl<GameObject, MapArchObject, Archetype> filterControl, @NotNull final ScriptExecutor<GameObject, MapArchObject, Archetype> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapManager<GameObject, MapArchObject, Archetype> pickmapManager, @NotNull final MapControlFactory<GameObject, MapArchObject, Archetype> mapControlFactory, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final FaceObjects faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<GameObject, MapArchObject, Archetype> topmostInsertionMode, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet, @NotNull final MapArchObjectFactory<MapArchObject> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<GameObject, MapArchObject, Archetype> mapReaderFactory, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ScriptModel<GameObject, MapArchObject, Archetype> scriptModel, @NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final NamedFilter defaultFilterList, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final AttributeRangeChecker<GameObject, MapArchObject, Archetype> attributeRangeChecker, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory) {
- return mainControl.createGUIMainControl(FileFilters.pythonFileFilter, ".py", false, mapManager, pickmapManager, archetypeSet, mapControlFactory, null, "CrossfireEditor.jar", new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, }, PREFS_VALIDATOR_AUTO_DEFAULT, null, this, errorView, new DirectoryCacheFiles(ConfigFileUtils.getHomeFile("thumbnails"), ".png"), configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, 0, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, IGUIConstants.SCRIPTS_DIR, scriptModel, animationObjects, archetypeChooserModel, true, scriptedEventEditor, new int[] { CommonConstants.NORTH, CommonConstants.EAST, CommonConstants.SOUTH, CommonConstants.WEST, CommonConstants.NORTH_EAST, CommonConstants.SOUTH_EAST, CommonConstants.SOUTH_WEST, CommonConstants.NORTH_WEST, }, defaultFilterList, resources, gameObjectSpells, numberSpells, attributeRangeChecker, pluginParameterFactory);
+ public GUIMainControl<GameObject, MapArchObject, Archetype> createGUIMainControl(@NotNull final DefaultMainControl<GameObject, MapArchObject, Archetype> mainControl, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final FilterControl<GameObject, MapArchObject, Archetype> filterControl, @NotNull final ScriptExecutor<GameObject, MapArchObject, Archetype> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapManager<GameObject, MapArchObject, Archetype> pickmapManager, @NotNull final MapControlFactory<GameObject, MapArchObject, Archetype> mapControlFactory, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final FaceObjects faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<GameObject, MapArchObject, Archetype> topmostInsertionMode, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet, @NotNull final MapArchObjectFactory<MapArchObject> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<GameObject, MapArchObject, Archetype> mapReaderFactory, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ScriptModel<GameObject, MapArchObject, Archetype> scriptModel, @NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final AttributeRangeChecker<GameObject, MapArchObject, Archetype> attributeRangeChecker, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory) {
+ return mainControl.createGUIMainControl(FileFilters.pythonFileFilter, ".py", false, mapManager, pickmapManager, archetypeSet, mapControlFactory, null, "CrossfireEditor.jar", new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, }, PREFS_VALIDATOR_AUTO_DEFAULT, null, this, errorView, new DirectoryCacheFiles(ConfigFileUtils.getHomeFile("thumbnails"), ".png"), configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, 0, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, IGUIConstants.SCRIPTS_DIR, scriptModel, animationObjects, archetypeChooserModel, true, scriptedEventEditor, new int[] { CommonConstants.NORTH, CommonConstants.EAST, CommonConstants.SOUTH, CommonConstants.WEST, CommonConstants.NORTH_EAST, CommonConstants.SOUTH_EAST, CommonConstants.SOUTH_WEST, CommonConstants.NORTH_WEST, }, resources, gameObjectSpells, numberSpells, attributeRangeChecker, pluginParameterFactory);
}
/**
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java 2010-05-16 17:44:07 UTC (rev 7814)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java 2010-05-16 17:53:18 UTC (rev 7815)
@@ -67,7 +67,6 @@
import net.sf.gridarta.model.face.DefaultFaceObjects;
import net.sf.gridarta.model.face.FaceObjectProviders;
import net.sf.gridarta.model.face.FaceObjects;
-import net.sf.gridarta.model.filter.NamedFilter;
import net.sf.gridarta.model.gameobject.GameObjectFactory;
import net.sf.gridarta.model.gameobject.IsoMapSquareInfo;
import net.sf.gridarta.model.gameobject.MultiPositionData;
@@ -539,8 +538,8 @@
*/
@NotNull
@Override
- public GUIMainControl<GameObject, MapArchObject, Archetype> createGUIMainControl(@NotNull final DefaultMainControl<GameObject, MapArchObject, Archetype> mainControl, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final FilterControl<GameObject, MapArchObject, Archetype> filterControl, @NotNull final ScriptExecutor<GameObject, MapArchObject, Archetype> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapManager<GameObject, MapArchObject, Archetype> pickmapManager, @NotNull final MapControlFactory<GameObject, MapArchObject, Archetype> mapControlFactory, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final FaceObjects faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<GameObject, MapArchObject, Archetype> topmostInsertionMode, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet, @NotNull final MapArchObjectFactory<MapArchObject> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<GameObject, MapArchObject, Archetype> mapReaderFactory, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ScriptModel<GameObject, MapArchObject, Archetype> scriptModel, @NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final NamedFilter defaultFilterList, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final AttributeRangeChecker<GameObject, MapArchObject, Archetype> attributeRangeChecker, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory) {
- return mainControl.createGUIMainControl(FileFilters.luaFileFilter, ".lua", true, mapManager, pickmapManager, archetypeSet, mapControlFactory, guiUtils.getResourceIcon(IGUIConstants.TILE_NORTH), "DaimoninEditor.jar", new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, }, PREFS_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SPELL_FILE, this, errorView, new SubdirectoryCacheFiles(".dedit"), configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, -1, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, IGUIConstants.SCRIPTS_DIR, scriptModel, animationObjects, archetypeChooserModel, false, scriptedEventEditor, new int[] { CommonConstants.NORTH_EAST, CommonConstants.SOUTH_EAST, CommonConstants.SOUTH_WEST, CommonConstants.NORTH_WEST, CommonConstants.EAST, CommonConstants.SOUTH, CommonConstants.WEST, CommonConstants.NORTH, }, defaultFilterList, resources, gameObjectSpells, numberSpells, attributeRangeChecker, pluginParameterFactory);
+ public GUIMainControl<GameObject, MapArchObject, Archetype> createGUIMainControl(@NotNull final DefaultMainControl<GameObject, MapArchObject, Archetype> mainControl, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final FilterControl<GameObject, MapArchObject, Archetype> filterControl, @NotNull final ScriptExecutor<GameObject, MapArchObject, Archetype> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapManager<GameObject, MapArchObject, Archetype> pickmapManager, @NotNull final MapControlFactory<GameObject, MapArchObject, Archetype> mapControlFactory, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final FaceObjects faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<GameObject, MapArchObject, Archetype> topmostInsertionMode, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet, @NotNull final MapArchObjectFactory<MapArchObject> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<GameObject, MapArchObject, Archetype> mapReaderFactory, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ScriptModel<GameObject, MapArchObject, Archetype> scriptModel, @NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final AttributeRangeChecker<GameObject, MapArchObject, Archetype> attributeRangeChecker, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory) {
+ return mainControl.createGUIMainControl(FileFilters.luaFileFilter, ".lua", true, mapManager, pickmapManager, archetypeSet, mapControlFactory, guiUtils.getResourceIcon(IGUIConstants.TILE_NORTH), "DaimoninEditor.jar", new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, }, PREFS_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SPELL_FILE, this, errorView, new SubdirectoryCacheFiles(".dedit"), configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, -1, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, IGUIConstants.SCRIPTS_DIR, scriptModel, animationObjects, archetypeChooserModel, false, scriptedEventEditor, new int[] { CommonConstants.NORTH_EAST, CommonConstants.SOUTH_EAST, CommonConstants.SOUTH_WEST, CommonConstants.NORTH_WEST, CommonConstants.EAST, CommonConstants.SOUTH, CommonConstants.WEST, CommonConstants.NORTH, }, resources, gameObjectSpells, numberSpells, attributeRangeChecker, pluginParameterFactory);
}
/**
Modified: trunk/src/app/net/sf/gridarta/maincontrol/DefaultMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/DefaultMainControl.java 2010-05-16 17:44:07 UTC (rev 7814)
+++ trunk/src/app/net/sf/gridarta/maincontrol/DefaultMainControl.java 2010-05-16 17:53:18 UTC (rev 7815)
@@ -58,7 +58,6 @@
import net.sf.gridarta.model.errorview.ErrorViewCollector;
import net.sf.gridarta.model.face.FaceObjectProviders;
import net.sf.gridarta.model.face.FaceObjects;
-import net.sf.gridarta.model.filter.NamedFilter;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.gameobject.GameObjectFactory;
import net.sf.gridarta.model.io.CacheFiles;
@@ -347,7 +346,6 @@
* map parameters
* @param scriptedEventEditor the scripted event editor
* @param directionMap maps relative direction to map window direction
- * @param defaultFilterList the default filter list
* @param resources the resources
* @param gameObjectSpells the game object spells to use
* @param numberSpells the number spells to use
@@ -355,8 +353,8 @@
* @param pluginParameterFactory the plugin parameter factory to use
* @return the new instance
*/
- public GUIMainControl<G, A, R> createGUIMainControl(@NotNull final FileFilter scriptFileFilter, @NotNull final String scriptExtension, final boolean createDirectionPane, @NotNull final AbstractMapManager<G, A, R> mapManager, @NotNull final MapManager<G, A, R> pickmapManager, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final MapControlFactory<G, A, R> mapControlFactory, @Nullable final ImageIcon compassIcon, @NotNull final String gridartaJarFilename, @NotNull final int[] lockedItemsTypeNumbers, final boolean autoValidatorDefault, @Nullable final String spellFile, @NotNull final EditorFactory<G, A, R> editorFactory, @NotNull final ErrorView errorView, @NotNull final CacheFiles cacheFiles, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final FilterControl<G, A, R> filterControl, @NotNull final ScriptExecutor<G, A, R> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final FaceObjects faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<G, A, R> topmostInsertionMode, @NotNull final GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final SystemIcons systemIcons, final int undefinedSpellIndex, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final MapArchObjectFactory<A> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<G, A, R> mapReaderFactory, @NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final String scriptsDir, @NotNull final ScriptModel<G, A, R> scriptModel, @NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeChooserModel<G, A, R> archetypeChooserModel, final boolean allowRandomMapParameters, @NotNull final ScriptedEventEditor<G, A, R> scriptedEventEditor, @NotNull final int[] directionMap, @NotNull final NamedFilter defaultFilterList, @NotNull final AbstractResources<G, A, R> resources, @NotNull final Spells<GameObjectSpell<G, A, R>> gameObjectSpells, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final AttributeRangeChecker<G, A, R> attributeRangeChecker, @NotNull final PluginParameterFactory<G, A, R> pluginParameterFactory) {
- return new GUIMainControl<G, A, R>(createDirectionPane, mapManager, pickmapManager, archetypeSet, faceObjects, globalSettings, mapViewSettings, mapControlFactory, mapReaderFactory, mapArchObjectFactory, treasureTree, archetypeTypeSet, compassIcon, gridartaJarFilename, FileFilters.mapFileFilter, scriptFileFilter, scriptExtension, validators, resources, gameObjectMatchers, errorView, attributeRangeChecker, lockedItemsTypeNumbers, scriptsDir, scriptModel, archetypeChooserModel, animationObjects, scriptArchEditor, scriptedEventEditor, scriptArchData, scriptArchDataUtils, scriptArchUtils, autoValidatorDefault, spellFile, allowRandomMapParameters, directionMap, editorFactory, faceObjectProviders, pluginParameterFactory, defaultFilterList, gameObjectFactory, pathManager, cacheFiles, gameObjectSpells, numberSpells, undefinedSpellIndex, systemIcons, configSourceFactory, topmostInsertionMode, rendererFactory, filterControl, scriptExecutor, scriptParameters);
+ public GUIMainControl<G, A, R> createGUIMainControl(@NotNull final FileFilter scriptFileFilter, @NotNull final String scriptExtension, final boolean createDirectionPane, @NotNull final AbstractMapManager<G, A, R> mapManager, @NotNull final MapManager<G, A, R> pickmapManager, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final MapControlFactory<G, A, R> mapControlFactory, @Nullable final ImageIcon compassIcon, @NotNull final String gridartaJarFilename, @NotNull final int[] lockedItemsTypeNumbers, final boolean autoValidatorDefault, @Nullable final String spellFile, @NotNull final EditorFactory<G, A, R> editorFactory, @NotNull final ErrorView errorView, @NotNull final CacheFiles cacheFiles, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final FilterControl<G, A, R> filterControl, @NotNull final ScriptExecutor<G, A, R> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final FaceObjects faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<G, A, R> topmostInsertionMode, @NotNull final GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final SystemIcons systemIcons, final int undefinedSpellIndex, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final MapArchObjectFactory<A> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<G, A, R> mapReaderFactory, @NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final String scriptsDir, @NotNull final ScriptModel<G, A, R> scriptModel, @NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeChooserModel<G, A, R> archetypeChooserModel, final boolean allowRandomMapParameters, @NotNull final ScriptedEventEditor<G, A, R> scriptedEventEditor, @NotNull final int[] directionMap, @NotNull final AbstractResources<G, A, R> resources, @NotNull final Spells<GameObjectSpell<G, A, R>> gameObjectSpells, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final AttributeRangeChecker<G, A, R> attributeRangeChecker, @NotNull final PluginParameterFactory<G, A, R> pluginParameterFactory) {
+ return new GUIMainControl<G, A, R>(createDirectionPane, mapManager, pickmapManager, archetypeSet, faceObjects, globalSettings, mapViewSettings, mapControlFactory, mapReaderFactory, mapArchObjectFactory, treasureTree, archetypeTypeSet, compassIcon, gridartaJarFilename, FileFilters.mapFileFilter, scriptFileFilter, scriptExtension, validators, resources, gameObjectMatchers, errorView, attributeRangeChecker, lockedItemsTypeNumbers, scriptsDir, scriptModel, archetypeChooserModel, animationObjects, scriptArchEditor, scriptedEventEditor, scriptArchData, scriptArchDataUtils, scriptArchUtils, autoValidatorDefault, spellFile, allowRandomMapParameters, directionMap, editorFactory, faceObjectProviders, pluginParameterFactory, gameObjectFactory, pathManager, cacheFiles, gameObjectSpells, numberSpells, undefinedSpellIndex, systemIcons, configSourceFactory, topmostInsertionMode, rendererFactory, filterControl, scriptExecutor, scriptParameters);
}
} // class DefaultMainControl
Modified: trunk/src/app/net/sf/gridarta/maincontrol/EditorFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/EditorFactory.java 2010-05-16 17:44:07 UTC (rev 7814)
+++ trunk/src/app/net/sf/gridarta/maincontrol/EditorFactory.java 2010-05-16 17:53:18 UTC (rev 7815)
@@ -46,7 +46,6 @@
import net.sf.gridarta.model.face.ArchFaceProvider;
import net.sf.gridarta.model.face.FaceObjectProviders;
import net.sf.gridarta.model.face.FaceObjects;
-import net.sf.gridarta.model.filter.NamedFilter;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.gameobject.GameObjectFactory;
import net.sf.gridarta.model.io.DefaultMapReaderFactory;
@@ -382,7 +381,7 @@
* @return the new instance
*/
@NotNull
- GUIMainControl<G, A, R> createGUIMainControl(@NotNull DefaultMainControl<G, A, R> mainControl, @NotNull ErrorView errorView, @NotNull GUIUtils guiUtils, @NotNull ConfigSourceFactory configSourceFactory, @NotNull RendererFactory<G, A, R> rendererFactory, @NotNull FilterControl<G, A, R> filterControl, @NotNull ScriptExecutor<G, A, R> scriptExecutor, @NotNull ScriptParameters scriptParameters, @NotNull AbstractMapManager<G, A, R> mapManager, @NotNull MapManager<G, A, R> pickmapManager, @NotNull MapControlFactory<G, A, R> mapControlFactory, @NotNull ArchetypeSet<G, A, R> archetypeSet, @NotNull FaceObjects faceObjects, @NotNull GlobalSettings globalSettings, @NotNull MapViewSettings mapViewSettings, @NotNull FaceObjectProviders faceObjectProviders, @NotNull PathManager pathManager, @NotNull InsertionMode<G, A, R> topmostInsertionMode, @NotNull GameObjectFactory<G, A, R> gameObjectFactory, @NotNull SystemIcons systemIcons, @NotNull ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull MapArchObjectFactory<A> mapArchObjectFactory, @NotNull DefaultMapReaderFactory<G, A, R> mapReaderFactory, @NotNull DelegatingMapValidator<G, A, R> validators, @NotNull GameObjectMatchers gameObjectMatchers, @NotNull ScriptModel<G, A, R> scriptModel, @NotNull AnimationObjects animationObjects, @NotNull ArchetypeChooserModel<G, A, R> archetypeChooserModel, @NotNull ScriptedEventEditor<G, A, R> scriptedEventEditor, @NotNull NamedFilter defaultFilterList, @NotNull AbstractResources<G, A, R> resources, @NotNull Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<G, A, R>> gameObjectSpells, @NotNull AttributeRangeChecker<G, A, R> attributeRangeChecker, @NotNull PluginParameterFactory<G, A, R> pluginParameterFactory);
+ GUIMainControl<G, A, R> createGUIMainControl(@NotNull DefaultMainControl<G, A, R> mainControl, @NotNull ErrorView errorView, @NotNull GUIUtils guiUtils, @NotNull ConfigSourceFactory configSourceFactory, @NotNull RendererFactory<G, A, R> rendererFactory, @NotNull FilterControl<G, A, R> filterControl, @NotNull ScriptExecutor<G, A, R> scriptExecutor, @NotNull ScriptParameters scriptParameters, @NotNull AbstractMapManager<G, A, R> mapManager, @NotNull MapManager<G, A, R> pickmapManager, @NotNull MapControlFactory<G, A, R> mapControlFactory, @NotNull ArchetypeSet<G, A, R> archetypeSet, @NotNull FaceObjects faceObjects, @NotNull GlobalSettings globalSettings, @NotNull MapViewSettings mapViewSettings, @NotNull FaceObjectProviders faceObjectProviders, @NotNull PathManager pathManager, @NotNull InsertionMode<G, A, R> topmostInsertionMode, @NotNull GameObjectFactory<G, A, R> gameObjectFactory, @NotNull SystemIcons systemIcons, @NotNull ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull MapArchObjectFactory<A> mapArchObjectFactory, @NotNull DefaultMapReaderFactory<G, A, R> mapReaderFactory, @NotNull DelegatingMapValidator<G, A, R> validators, @NotNull GameObjectMatchers gameObjectMatchers, @NotNull ScriptModel<G, A, R> scriptModel, @NotNull AnimationObjects animationObjects, @NotNull ArchetypeChooserModel<G, A, R> archetypeChooserModel, @NotNull ScriptedEventEditor<G, A, R> scriptedEventEditor, @NotNull AbstractResources<G, A, R> resources, @NotNull Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<G, A, R>> gameObjectSpells, @NotNull AttributeRangeChecker<G, A, R> attributeRangeChecker, @NotNull PluginParameterFactory<G, A, R> pluginParameterFactory);
/**
* Creates a new {@link AbstractResources} instance.
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 17:44:07 UTC (rev 7814)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-16 17:53:18 UTC (rev 7815)
@@ -133,7 +133,6 @@
import net.sf.gridarta.model.exitconnector.ExitMatcher;
import net.sf.gridarta.model.face.FaceObjectProviders;
import net.sf.gridarta.model.face.FaceObjects;
-import net.sf.gridarta.model.filter.NamedFilter;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.gameobject.GameObjectFactory;
import net.sf.gridarta.model.io.CacheFiles;
@@ -381,7 +380,7 @@
* @param scriptExecutor the script executor to use
* @param scriptParameters the script parameters to use
*/
- public GUIMainControl(final boolean createDirectionPane, @NotNull final AbstractMapManager<G, A, R> mapManager, @NotNull final MapManager<G, A, R> pickmapManager, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final FaceObjects faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final MapControlFactory<G, A, R> mapControlFactory, @NotNull final MapReaderFactory<G, A> mapReaderFactory, final MapArchObjectFactory<A> mapArchObjectFactory, @NotNull final TreasureTree treasureTree, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @Nullable final ImageIcon compassIcon, @NotNull final String gridartaJarFilename, @NotNull final FileFilter mapFileFilter, @NotNull final FileFilter scriptFileFilter, @NotNull final String scriptExtension, @NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final AbstractResources<G, A, R> resources, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ErrorView errorView, @NotNull final AttributeRangeChecker<G, A, R> attributeRangeChecker, @NotNull final int[] lockedItemsTypeNumbers, @NotNull final String scriptsDir, @NotNull final ScriptModel<G, A, R> scriptModel, @NotNull final ArchetypeChooserModel<G, A, R> archetypeChooserModel, @NotNull final AnimationObjects animationObjects, @NotNull final ScriptArchEditor<G, A, R> scriptArchEditor, @NotNull final ScriptedEventEditor<G, A, R> scriptedEventEditor, @NotNull final ScriptArchData<G, A, R> scriptArchData, @NotNull final ScriptArchDataUtils<G, A, R> scriptArchDataUtils, @NotNull final ScriptArchUtils scriptArchUtils, final boolean autoValidatorDefault, @Nullable final String spellFile, final boolean allowRandomMapParameters, @NotNull final int[] directionMap, @NotNull final EditorFactory<G, A, R> editorFactory, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PluginParameterFactory<G, A, R> pluginParameterFactory, @NotNull final NamedFilter defaultFilterList, final GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final PathManager pathManager, @NotNull final CacheFiles cacheFiles, @NotNull final Spells<GameObjectSpell<G, A, R>> gameObjectSpells, @NotNull final Spells<NumberSpell> numberSpells, final int undefinedSpellIndex, @NotNull final SystemIcons systemIcons, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final InsertionMode<G, A, R> topmostInsertionMode, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final FilterControl<G, A, R> filterControl, @NotNull final ScriptExecutor<G, A, R> scriptExecutor, @NotNull final ScriptParameters scriptParameters) {
+ public GUIMainControl(final boolean createDirectionPane, @NotNull final AbstractMapManager<G, A, R> mapManager, @NotNull final MapManager<G, A, R> pickmapManager, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final FaceObjects faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final MapControlFactory<G, A, R> mapControlFactory, @NotNull final MapReaderFactory<G, A> mapReaderFactory, final MapArchObjectFactory<A> mapArchObjectFactory, @NotNull final TreasureTree treasureTree, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @Nullable final ImageIcon compassIcon, @NotNull final String gridartaJarFilename, @NotNull final FileFilter mapFileFilter, @NotNull final FileFilter scriptFileFilter, @NotNull final String scriptExtension, @NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final AbstractResources<G, A, R> resources, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ErrorView errorView, @NotNull final AttributeRangeChecker<G, A, R> attributeRangeChecker, @NotNull final int[] lockedItemsTypeNumbers, @NotNull final String scriptsDir, @NotNull final ScriptModel<G, A, R> scriptModel, @NotNull final ArchetypeChooserModel<G, A, R> archetypeChooserModel, @NotNull final AnimationObjects animationObjects, @NotNull final ScriptArchEditor<G, A, R> scriptArchEditor, @NotNull final ScriptedEventEditor<G, A, R> scriptedEventEditor, @NotNull final ScriptArchData<G, A, R> scriptArchData, @NotNull final ScriptArchDataUtils<G, A, R> scriptArchDataUtils, @NotNull final ScriptArchUtils scriptArchUtils, final boolean autoValidatorDefault, @Nullable final String spellFile, final boolean allowRandomMapParameters, @NotNull final int[] directionMap, @NotNull final EditorFactory<G, A, R> editorFactory, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PluginParameterFactory<G, A, R> pluginParameterFactory, final GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final PathManager pathManager, @NotNull final CacheFiles cacheFiles, @NotNull final Spells<GameObjectSpell<G, A, R>> gameObjectSpells, @NotNull final Spells<NumberSpell> numberSpells, final int undefinedSpellIndex, @NotNull final SystemIcons systemIcons, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final InsertionMode<G, A, R> topmostInsertionMode, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final FilterControl<G, A, R> filterControl, @NotNull final ScriptExecutor<G, A, R> scriptExecutor, @NotNull final ScriptParameters scriptParameters) {
this.configSourceFactory = configSourceFactory;
this.rendererFactory = rendererFactory;
this.mapManager = mapManager;
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java 2010-05-16 17:44:07 UTC (rev 7814)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java 2010-05-16 17:53:18 UTC (rev 7815)
@@ -283,13 +283,13 @@
final ScriptExecutor<G, A, R> scriptExecutor = new ScriptExecutor<G, A, R>(scriptModel, scriptParameters);
if (script != null) {
- returnCode = runScript(script, editorFactory, mainControl, errorView, args2, guiUtils, configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, mapManager, pickmapManager, mapControlFactory, archetypeSet, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, scriptModel, animationObjects, archetypeChooserModel, scriptedEventEditor, defaultFilterList, resources, numberSpells, gameObjectSpells, attributeRangeChecker, pluginParameterFactory);
+ returnCode = runScript(script, editorFactory, mainControl, errorView, args2, guiUtils, configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, mapManager, pickmapManager, mapControlFactory, archetypeSet, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, scriptModel, animationObjects, archetypeChooserModel, scriptedEventEditor, resources, numberSpells, gameObjectSpells, attributeRangeChecker, pluginParameterFactory);
} else {
try {
switch (mode) {
case NORMAL:
try {
- returnCode = runNormal(args2, mainControl, editorFactory, splashScreen, errorView, guiUtils, configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, mapManager, pickmapManager, mapControlFactory, archetypeSet, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, scriptModel, animationObjects, archetypeChooserModel, scriptedEventEditor, defaultFilterList, resources, numberSpells, gameObjectSpells, attributeRangeChecker, pluginParameterFactory);
+ returnCode = runNormal(args2, mainControl, editorFactory, splashScreen, errorView, guiUtils, configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, mapManager, pickmapManager, mapControlFactory, archetypeSet, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, scriptModel, animationObjects, archetypeChooserModel, scriptedEventEditor, resources, numberSpells, gameObjectSpells, attributeRangeChecker, pluginParameterFactory);
} catch (final Exception ex) {
log.fatal(ex.getMessage(), ex);
returnCode = 1;
@@ -366,7 +366,6 @@
* @param animationObjects the animation objects
* @param archetypeChooserModel the archetype chooser model
* @param scriptedEventEditor the scripted event editor
- * @param defaultFilterList the default filter list
* @param resources the resources
* @param numberSpells the number spells to use
* @param gameObjectSpells the game object spells to use
@@ -374,14 +373,14 @@
* @param pluginParameterFactory the plugin parameter factory to use
* @return return code suitable for passing to {@link System#exit(int)}
*/
- private int runScript(@NotNull final String script, final EditorFactory<G, A, R> editorFactory, final DefaultMainControl<G, A, R> mainControl, final ErrorView errorView, final List<String> args2, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final FilterControl<G, A, R> filterControl, @NotNull final ScriptExecutor<G, A, R> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final AbstractMapManager<G, A, R> mapManager, @NotNull final MapManager<G, A, R> pickmapManager, @NotNull final MapControlFactory<G, A, R> mapControlFactory, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final FaceObjects faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<G, A, R> topmostInsertionMode, @NotNull final GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final MapArchObjectFactory<A> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<G, A, R> mapReaderFactory, @NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ScriptModel<G, A, R> scriptModel, @NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeChooserModel<G, A, R> archetypeChooserModel, @NotNull final ScriptedEventEditor<G, A, R> scriptedEventEditor, @NotNull final NamedFilter defaultFilterList, @NotNull final AbstractResources<G, A, R> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<G, A, R>> gameObjectSpells, @NotNull final AttributeRangeChecker<G, A, R> attributeRangeChecker, @NotNull final PluginParameterFactory<G, A, R> pluginParameterFactory) {
+ private int runScript(@NotNull final String script, final EditorFactory<G, A, R> editorFactory, final DefaultMainControl<G, A, R> mainControl, final ErrorView errorView, final List<String> args2, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final FilterControl<G, A, R> filterControl, @NotNull final ScriptExecutor<G, A, R> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final AbstractMapManager<G, A, R> mapManager, @NotNull final MapManager<G, A, R> pickmapManager, @NotNull final MapControlFactory<G, A, R> mapControlFactory, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final FaceObjects faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<G, A, R> topmostInsertionMode, @NotNull final GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final MapArchObjectFactory<A> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<G, A, R> mapReaderFactory, @NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ScriptModel<G, A, R> scriptModel, @NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeChooserModel<G, A, R> archetypeChooserModel, @NotNull final ScriptedEventEditor<G, A, R> scriptedEventEditor, @NotNull final AbstractResources<G, A, R> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<G, A, R>> gameObjectSpells, @NotNull final AttributeRangeChecker<G, A, R> attributeRangeChecker, @NotNull final PluginParameterFactory<G, A, R> pluginParameterFactory) {
final GUIMainControl<G, A, R>[] tmp2 = (GUIMainControl<G, A, R>[]) new GUIMainControl<?, ?, ?>[1];
final Runnable runnable2 = new Runnable() {
/** {@inheritDoc} */
@Override
public void run() {
- tmp2[0] = editorFactory.createGUIMainControl(mainControl, errorView, guiUtils, configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, mapManager, pickmapManager, mapControlFactory, archetypeSet, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, scriptModel, animationObjects, archetypeChooserModel, scriptedEventEditor, defaultFilterList, resources, numberSpells, gameObjectSpells, attributeRangeChecker, pluginParameterFactory);
+ tmp2[0] = editorFactory.createGUIMainControl(mainControl, errorView, guiUtils, configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, mapManager, pickmapManager, mapControlFactory, archetypeSet, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, scriptModel, animationObjects, archetypeChooserModel, scriptedEventEditor, resources, numberSpells, gameObjectSpells, attributeRangeChecker, pluginParameterFactory);
}
};
@@ -491,7 +490,6 @@
* @param animationObjects the animation objects
* @param archetypeChooserModel the archetype chooser model
* @param scriptedEventEditor the scripted event editor
- * @param defaultFilterList the default filter list
* @param resources the resources
* @param numberSpells the number spells to use
* @param gameObjectSpells the game object spells to use
@@ -499,14 +497,14 @@
* @param pluginParameterFactory the plugin parameter factory to use
* @return return code suitable for passing to {@link System#exit(int)}
*/
- private int runNormal(@NotNull final Iterable<String> args, @NotNull final DefaultMainControl<G, A, R> mainControl, @NotNull final EditorFactory<G, A, R> editorFactory, @NotNull final SplashScreen splashScreen, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final FilterControl<G, A, R> filterControl, @NotNull final ScriptExecutor<G, A, R> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final AbstractMapManager<G, A, R> mapManager, @NotNull final MapManager<G, A, R> pickmapManager, @NotNull final MapControlFactory<G, A, R> mapControlFactory, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final FaceObjects faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<G, A, R> topmostInsertionMode, @NotNull final GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final MapArchObjectFactory<A> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<G, A, R> mapReaderFactory, @NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ScriptModel<G, A, R> scriptModel, @NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeChooserModel<G, A, R> archetypeChooserModel, @NotNull final ScriptedEventEditor<G, A, R> scriptedEventEditor, @NotNull final NamedFilter defaultFilterList, @NotNull final AbstractResources<G, A, R> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<G, A, R>> gameObjectSpells, @NotNull final AttributeRangeChecker<G, A, R> attributeRangeChecker, @NotNull final PluginParameterFactory<G, A, R> pluginParameterFactory) {
+ private int runNormal(@NotNull final Iterable<String> args, @NotNull final DefaultMainControl<G, A, R> mainControl, @NotNull final EditorFactory<G, A, R> editorFactory, @NotNull final SplashScreen splashScreen, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final FilterControl<G, A, R> filterControl, @NotNull final ScriptExecutor<G, A, R> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final AbstractMapManager<G, A, R> mapManager, @NotNull final MapManager<G, A, R> pickmapManager, @NotNull final MapControlFactory<G, A, R> mapControlFactory, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final FaceObjects faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<G, A, R> topmostInsertionMode, @NotNull final GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final MapArchObjectFactory<A> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<G, A, R> mapReaderFactory, @NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ScriptModel<G, A, R> scriptModel, @NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeChooserModel<G, A, R> archetypeChooserModel, @NotNull final ScriptedEventEditor<G, A, R> scriptedEventEditor, @NotNull final AbstractResources<G, A, R> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<G, A, R>> gameObjectSpells, @NotNull final AttributeRangeChecker<G, A, R> attributeRangeChecker, @NotNull final PluginParameterFactory<G, A, R> pluginParameterFactory) {
final GUIMainControl<G, A, R>[] guiMainControl = (GUIMainControl<G, A, R>[]) new GUIMainControl<?, ?, ?>[1];
final Runnable runnable = new Runnable() {
/** {@inheritDoc} */
@Override
public void run() {
- guiMainControl[0] = editorFactory.createGUIMainControl(mainControl, errorView, guiUtils, configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, mapManager, pickmapManager, mapControlFactory, archetypeSet, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, scriptModel, animationObjects, archetypeChooserModel, scriptedEventEditor, defaultFilterList, resources, numberSpells, gameObjectSpells, attributeRangeChecker, pluginParameterFactory);
+ guiMainControl[0] = editorFactory.createGUIMainControl(mainControl, errorView, guiUtils, configSourceFactory, rendererFactory, filterControl, scriptExecutor, sc...
[truncated message content] |
|
From: <aki...@us...> - 2010-05-16 17:44:13
|
Revision: 7814
http://gridarta.svn.sourceforge.net/gridarta/?rev=7814&view=rev
Author: akirschbaum
Date: 2010-05-16 17:44:07 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Add @ActionMethod annotations.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-16 17:39:51 UTC (rev 7813)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-16 17:44:07 UTC (rev 7814)
@@ -43,6 +43,7 @@
import net.sf.gridarta.utils.Size2D;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -347,6 +348,7 @@
/**
* Invoked when the user wants to save the map.
*/
+ @ActionMethod
public void save() {
final MapControl<G, A, R> mapControl = getSaveEnabled();
if (mapControl != null) {
@@ -357,6 +359,7 @@
/**
* Invoked when the user wants to save the map to a file.
*/
+ @ActionMethod
public void saveAs() {
//noinspection CallToSimpleGetterFromWithinClass
final MapControl<G, A, R> mapControl = getSaveAsEnabled();
@@ -368,6 +371,7 @@
/**
* Invoked when the user wants to create an image file of the map.
*/
+ @ActionMethod
public void createImage() {
final MapModel<G, A, R> mapModel = getCreateImageEnabled();
if (mapModel != null) {
@@ -379,6 +383,7 @@
* Invoked when the user wants to revert the map to the previously saved
* state.
*/
+ @ActionMethod
public void revert() {
final MapControl<G, A, R> mapControl = getRevertEnabled();
if (mapControl == null) {
@@ -395,6 +400,7 @@
/**
* Invoked when the user wants to close the map.
*/
+ @ActionMethod
public void close() {
//noinspection CallToSimpleGetterFromWithinClass
final MapView<G, A, R> mapView = getCloseEnabled();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 17:39:58
|
Revision: 7813
http://gridarta.svn.sourceforge.net/gridarta/?rev=7813&view=rev
Author: akirschbaum
Date: 2010-05-16 17:39:51 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Remove MapFileActions.mapViewManagerListener.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-16 17:32:21 UTC (rev 7812)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-16 17:39:51 UTC (rev 7813)
@@ -224,33 +224,6 @@
};
/**
- * The map view manager listener which is attached to the current map if the
- * current map is tracked. Otherwise it is unused.
- */
- private final MapViewManagerListener<G, A, R> mapViewManagerListener = new MapViewManagerListener<G, A, R>() {
-
- /** {@inheritDoc} */
- @Override
- public void activeMapViewChanged(@Nullable final MapView<G, A, R> mapView) {
- currentMapView = mapView;
- updateActions();
- }
-
- /** {@inheritDoc} */
- @Override
- public void mapViewCreated(@NotNull final MapView<G, A, R> mapView) {
- // ignore
- }
-
- /** {@inheritDoc} */
- @Override
- public void mapViewClosing(@NotNull final MapView<G, A, R> mapView) {
- // ignore
- }
-
- };
-
- /**
* Create a new instance that tracks the map state.
* @param imageCreator2 the image creator to forwards actions to
* @param mapManager the map manager
@@ -270,6 +243,25 @@
if (currentMapControl != null) {
currentMapControl.getMapModel().addMapModelListener(mapModelListener);
}
+ final MapViewManagerListener<G, A, R> mapViewManagerListener = new MapViewManagerListener<G, A, R>() {
+
+ @Override
+ public void activeMapViewChanged(@Nullable final MapView<G, A, R> mapView) {
+ currentMapView = mapView;
+ updateActions();
+ }
+
+ @Override
+ public void mapViewCreated(@NotNull final MapView<G, A, R> mapView) {
+ // ignore
+ }
+
+ @Override
+ public void mapViewClosing(@NotNull final MapView<G, A, R> mapView) {
+ // ignore
+ }
+
+ };
mapViewManager.addMapViewManagerListener(mapViewManagerListener);
currentMapView = mapViewManager.getActiveMapView();
updateActions();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 17:32:29
|
Revision: 7812
http://gridarta.svn.sourceforge.net/gridarta/?rev=7812&view=rev
Author: akirschbaum
Date: 2010-05-16 17:32:21 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Fix possible NullPointerException.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java
trunk/src/app/net/sf/gridarta/mapmanager/FileControl.java
trunk/src/test/net/sf/gridarta/mapmanager/TestFileControl.java
Modified: trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java 2010-05-16 17:31:42 UTC (rev 7811)
+++ trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java 2010-05-16 17:32:21 UTC (rev 7812)
@@ -371,8 +371,8 @@
* {@inheritDoc}
*/
@Override
- public void reportLoadError(@NotNull final File file, @NotNull final String message) {
- ACTION_BUILDER.showMessageDialog(parent, "openFileLoadMap", file, message);
+ public void reportLoadError(@Nullable final File file, @NotNull final String message) {
+ ACTION_BUILDER.showMessageDialog(parent, "openFileLoadMap", file == null ? "<unknown>" : file, message);
}
/**
Modified: trunk/src/app/net/sf/gridarta/mapmanager/FileControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mapmanager/FileControl.java 2010-05-16 17:31:42 UTC (rev 7811)
+++ trunk/src/app/net/sf/gridarta/mapmanager/FileControl.java 2010-05-16 17:32:21 UTC (rev 7812)
@@ -25,6 +25,7 @@
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.gridarta.model.map.mapcontrol.MapControl;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
public interface FileControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
@@ -85,7 +86,7 @@
*/
void reportSaveError(@NotNull File mapFile, @NotNull String message);
- void reportLoadError(@NotNull File file, @NotNull String message);
+ void reportLoadError(@Nullable File file, @NotNull String message);
void reportOutOfMapBoundsDeleted(@NotNull File file, int outOfMapBoundsDeleted, @NotNull StringBuilder outOfMapBoundsObjects);
Modified: trunk/src/test/net/sf/gridarta/mapmanager/TestFileControl.java
===================================================================
--- trunk/src/test/net/sf/gridarta/mapmanager/TestFileControl.java 2010-05-16 17:31:42 UTC (rev 7811)
+++ trunk/src/test/net/sf/gridarta/mapmanager/TestFileControl.java 2010-05-16 17:32:21 UTC (rev 7812)
@@ -25,6 +25,7 @@
import net.sf.gridarta.model.map.maparchobject.TestMapArchObject;
import net.sf.gridarta.model.map.mapcontrol.MapControl;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* A {@link FileControl} implementation for testing purposes.
@@ -110,7 +111,7 @@
* {@inheritDoc}
*/
@Override
- public void reportLoadError(@NotNull final File file, @NotNull final String message) {
+ public void reportLoadError(@Nullable final File file, @NotNull final String message) {
throw new AssertionError();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 17:31:48
|
Revision: 7811
http://gridarta.svn.sourceforge.net/gridarta/?rev=7811&view=rev
Author: akirschbaum
Date: 2010-05-16 17:31:42 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Add @NotNull annotations.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-16 17:06:48 UTC (rev 7810)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-16 17:31:42 UTC (rev 7811)
@@ -56,6 +56,7 @@
/**
* Action Builder to create Actions.
*/
+ @NotNull
private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
/**
@@ -91,26 +92,31 @@
/**
* The action for "save".
*/
+ @NotNull
private final Action aSave = ACTION_BUILDER.createAction(true, "save", this);
/**
* The action for "save as".
*/
+ @NotNull
private final Action aSaveAs = ACTION_BUILDER.createAction(true, "saveAs", this);
/**
* The action for "create image".
*/
+ @NotNull
private final Action aCreateImage = ACTION_BUILDER.createAction(true, "createImage", this);
/**
* The action for "revert".
*/
+ @NotNull
private final Action aRevert = ACTION_BUILDER.createAction(true, "revert", this);
/**
* The action for "close".
*/
+ @NotNull
private final Action aClose = ACTION_BUILDER.createAction(true, "close", this);
/**
@@ -130,6 +136,7 @@
* The {@link MapModelListener} which is attached to {@link
* #currentMapControl}'s map model.
*/
+ @NotNull
private final MapModelListener<G, A, R> mapModelListener = new MapModelListener<G, A, R>() {
/** {@inheritDoc} */
@@ -180,6 +187,7 @@
* The map manager listener which is attached to the current map if the
* current map is tracked. Otherwise it is unused.
*/
+ @NotNull
private final MapManagerListener<G, A, R> mapManagerListener = new MapManagerListener<G, A, R>() {
/** {@inheritDoc} */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
