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...> - 2011-11-17 06:12:38
|
Revision: 9110
http://gridarta.svn.sourceforge.net/gridarta/?rev=9110&view=rev
Author: akirschbaum
Date: 2011-11-17 06:12:26 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
Update stream from trunk.
Modified Paths:
--------------
streams/gui/atrinik/ChangeLog
streams/gui/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
streams/gui/crossfire/ChangeLog
streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
streams/gui/daimonin/ChangeLog
streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
streams/gui/model/src/app/net/sf/gridarta/model/select/ObjectNameMatchCriteria.java
streams/gui/src/app/net/sf/gridarta/mainactions/MainActions.java
streams/gui/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
streams/gui/src/app/net/sf/gridarta/messages.properties
streams/gui/src/app/net/sf/gridarta/messages_de.properties
streams/gui/src/app/net/sf/gridarta/messages_fr.properties
streams/gui/src/app/net/sf/gridarta/messages_sv.properties
streams/gui/src/app/net/sf/gridarta/updater/UpdaterManager.java
streams/gui/utils/src/app/net/sf/gridarta/utils/ActionBuilderUtils.java
Added Paths:
-----------
streams/gui/model/src/app/net/sf/gridarta/model/select/AttributeOtherValueMatchCriteria.java
streams/gui/model/src/app/net/sf/gridarta/model/select/AttributeValueMatchCriteria.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/find/
streams/gui/src/app/net/sf/gridarta/gui/dialog/find/FindDialog.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/find/FindDialogManager.java
Removed Paths:
-------------
streams/gui/src/app/net/sf/gridarta/gui/dialog/find/FindDialog.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/find/FindDialogManager.java
Property Changed:
----------------
streams/gui/
streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire/
streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin/
streams/gui/daimonin/src/test/net/sf/gridarta/var/daimonin/
streams/gui/lib/bsh-LICENSE
streams/gui/lib/bsh-classgen-2.0b4.jar
streams/gui/lib/bsh-commands-2.0b4.jar
streams/gui/lib/bsh-core-2.0b4.jar
streams/gui/lib/bsh-util-2.0b4.jar
streams/gui/lib/jdom.jar
streams/gui/lib/jdom.jar-LICENSE
streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java
streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java
streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/AttributeBitmask.java
streams/gui/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java
streams/gui/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java
streams/gui/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
streams/gui/resource/icons/CreateImageSmallIcon.gif
streams/gui/resource/icons/Dir1.gif
streams/gui/resource/icons/Dir2.gif
streams/gui/resource/icons/Dir3.gif
streams/gui/resource/icons/Dir4.gif
streams/gui/resource/icons/Dir5.gif
streams/gui/resource/icons/Dir6.gif
streams/gui/resource/icons/Dir7.gif
streams/gui/resource/icons/Dir8.gif
streams/gui/resource/icons/EditPluginSmallIcon.gif
streams/gui/resource/icons/EmptySmallIcon.gif
streams/gui/resource/icons/ImportPluginSmallIcon.gif
streams/gui/resource/icons/SaveMapAsSmallIcon.gif
streams/gui/resource/icons/auto_run_small_icon.gif
streams/gui/resource/icons/close_tab_small_icon.gif
streams/gui/resource/icons/development/Application24.gif
streams/gui/resource/icons/development/Host16.gif
streams/gui/resource/icons/development/Host24.gif
streams/gui/resource/icons/development/Jar16.gif
streams/gui/resource/icons/development/Server16.gif
streams/gui/resource/icons/development/Server24.gif
streams/gui/resource/icons/filter_small_icon.gif
streams/gui/resource/icons/general/About16.gif
streams/gui/resource/icons/general/Copy16.gif
streams/gui/resource/icons/general/Cut16.gif
streams/gui/resource/icons/general/Delete16.gif
streams/gui/resource/icons/general/Edit16.gif
streams/gui/resource/icons/general/Help16.gif
streams/gui/resource/icons/general/History16.gif
streams/gui/resource/icons/general/New16.gif
streams/gui/resource/icons/general/Open16.gif
streams/gui/resource/icons/general/Paste16.gif
streams/gui/resource/icons/general/Preferences16.gif
streams/gui/resource/icons/general/Preferences24.gif
streams/gui/resource/icons/general/Properties16.gif
streams/gui/resource/icons/general/Redo16.gif
streams/gui/resource/icons/general/Refresh16.gif
streams/gui/resource/icons/general/Remove16.gif
streams/gui/resource/icons/general/Replace16.gif
streams/gui/resource/icons/general/Save16.gif
streams/gui/resource/icons/general/Save24.gif
streams/gui/resource/icons/general/SaveAs16.gif
streams/gui/resource/icons/general/Search16.gif
streams/gui/resource/icons/general/TipOfTheDay16.gif
streams/gui/resource/icons/general/Undo16.gif
streams/gui/resource/icons/general/Zoom16.gif
streams/gui/resource/icons/media/
streams/gui/resource/icons/run_plugin_small_icon.gif
streams/gui/resource/log4j.properties
streams/gui/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialogFactory.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/CloseableTabbedPane.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/ClosingIcon.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginController.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManager.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManagerFactory.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginViewPane.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/StackLayout.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxCellRenderer.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxModel.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/FilterParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterCellRenderer.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterComboBoxModel.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterViewFactory.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/prefs/AppPreferences.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/prefs/DevPreferences.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/prefs/GUIPreferences.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/prefs/NetPreferences.java
streams/gui/src/app/net/sf/gridarta/gui/filter/
streams/gui/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/DuplicateMapFolderException.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/DuplicatePickmapException.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/InvalidNameException.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/Loader.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFile.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFileNameComparator.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolder.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderListener.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderNotEmptyException.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTree.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeAction.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeListener.java
streams/gui/src/app/net/sf/gridarta/gui/panel/archetypechooser/DisplayMode.java
streams/gui/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesControl.java
streams/gui/src/app/net/sf/gridarta/gui/panel/objectchoicedisplay/ObjectChoiceDisplay.java
streams/gui/src/app/net/sf/gridarta/gui/panel/objectchooser/DefaultObjectChooser.java
streams/gui/src/app/net/sf/gridarta/gui/panel/objectchooser/ObjectChooser.java
streams/gui/src/app/net/sf/gridarta/gui/utils/MenuUtils.java
streams/gui/utils/src/app/net/sf/gridarta/utils/ConfigFileUtils.java
streams/gui/utils/src/app/net/sf/gridarta/utils/GUIUtils.java
streams/gui/utils/src/app/net/sf/gridarta/utils/IOUtils.java
streams/gui/utils/src/app/net/sf/gridarta/utils/ProcessRunner.java
streams/gui/utils/src/app/net/sf/gridarta/utils/WrappingStringBuilder.java
streams/gui/utils/src/app/net/sf/gridarta/utils/XmlHelper.java
streams/gui/utils/src/test/net/sf/gridarta/utils/WrappingStringBuilderTest.java
Property changes on: streams/gui
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update:5966-5991
/trunk:2-5965,9094-9102
+ /streams/cher-japi-update:5966-5991
/trunk:2-5965,9094-9109
Modified: streams/gui/atrinik/ChangeLog
===================================================================
--- streams/gui/atrinik/ChangeLog 2011-11-17 06:01:12 UTC (rev 9109)
+++ streams/gui/atrinik/ChangeLog 2011-11-17 06:12:26 UTC (rev 9110)
@@ -1,3 +1,28 @@
+2011-11-17 Andreas Kirschbaum
+
+ * Ignore "enable updates" setting for builds without valid update
+ URLs. This prevents possbile errors 'Error while updating:
+ java.net.MalformedURLException: no protocol: Please Update
+ manually.'
+
+2011-11-12 Andreas Kirschbaum
+
+ * Implement Edit|Find... which searches the current map. Relocate
+ CTRL-F (Fill) to ALT-F.
+
+ * Add default keybindings ALT-LEFT/RIGHT to move the selected game
+ object to its environment/into the inventory of the previous game
+ object.
+
+ * Add default keybindings ALT-UP/DOWN to select the previous/next
+ game object within the map square.
+
+ * Add default keybinding ALT-SHIFT-UP/DOWN to move the selected
+ game object UP/DOWN within the map square.
+
+ * Change default keybindings for cursor keys to move the map
+ cursor.
+
2011-11-05 Andreas Kirschbaum
* Replace "Revert Map" with "Reload Map". Now the current map can
Modified: streams/gui/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- streams/gui/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2011-11-17 06:01:12 UTC (rev 9109)
+++ streams/gui/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2011-11-17 06:12:26 UTC (rev 9110)
@@ -26,7 +26,7 @@
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
-edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
+edit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
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
#pickmaps.menu: See gridarta
@@ -41,7 +41,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
mapwindowFile.menu=saveMap saveMapAs createImage - reloadMap - closeMap
-mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
+mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
mapwindowMap.menu=gridVisible - goExit 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: streams/gui/crossfire/ChangeLog
===================================================================
--- streams/gui/crossfire/ChangeLog 2011-11-17 06:01:12 UTC (rev 9109)
+++ streams/gui/crossfire/ChangeLog 2011-11-17 06:12:26 UTC (rev 9110)
@@ -1,3 +1,31 @@
+2011-11-17 Andreas Kirschbaum
+
+ * Ignore "enable updates" setting for builds without valid update
+ URLs. This prevents possbile errors 'Error while updating:
+ java.net.MalformedURLException: no protocol: Please Update
+ manually.'
+
+2011-11-12 Andreas Kirschbaum
+
+ * Implement Edit|Find... which searches the current map. Relocate
+ CTRL-F (Fill) to ALT-F.
+
+ * Add default keybindings ALT-LEFT/RIGHT to move the selected game
+ object to its environment/into the inventory of the previous game
+ object.
+
+ * Add default keybindings ALT-UP/DOWN to select the previous/next
+ game object within the map square.
+
+ * Add default keybinding ALT-SHIFT-UP/DOWN to move the selected
+ game object UP/DOWN within the map square.
+
+ * Change default keybindings for cursor keys to move the map
+ cursor.
+
+ * Add game object matcher 'Messages' that matches game objects
+ having a non-empty msg..endmsg attribute.
+
2011-11-11 Andreas Kirschbaum
* Add game object matcher 'Messages' that matches game objects
Property changes on: streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/crossfire/src/app/net/sf/gridarta/var/crossfire:5966-5991
/trunk/crossfire/src/app/net/sf/gridarta/var/crossfire:9094-9102
+ /streams/cher-japi-update/crossfire/src/app/net/sf/gridarta/var/crossfire:5966-5991
/trunk/crossfire/src/app/net/sf/gridarta/var/crossfire:9094-9109
Modified: streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2011-11-17 06:01:12 UTC (rev 9109)
+++ streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2011-11-17 06:12:26 UTC (rev 9110)
@@ -26,7 +26,7 @@
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
-edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
+edit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
#pickmaps.menu: See gridarta
@@ -41,7 +41,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
mapwindowFile.menu=saveMap saveMapAs createImage - reloadMap - closeMap
-mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
+mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
mapwindowMap.menu=gridVisible smoothing - goExit 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: streams/gui/daimonin/ChangeLog
===================================================================
--- streams/gui/daimonin/ChangeLog 2011-11-17 06:01:12 UTC (rev 9109)
+++ streams/gui/daimonin/ChangeLog 2011-11-17 06:12:26 UTC (rev 9110)
@@ -1,3 +1,28 @@
+2011-11-17 Andreas Kirschbaum
+
+ * Ignore "enable updates" setting for builds without valid update
+ URLs. This prevents possbile errors 'Error while updating:
+ java.net.MalformedURLException: no protocol: Please Update
+ manually.'
+
+2011-11-12 Andreas Kirschbaum
+
+ * Implement Edit|Find... which searches the current map. Relocate
+ CTRL-F (Fill) to ALT-F.
+
+ * Add default keybindings ALT-LEFT/RIGHT to move the selected game
+ object to its environment/into the inventory of the previous game
+ object.
+
+ * Add default keybindings ALT-UP/DOWN to select the previous/next
+ game object within the map square.
+
+ * Add default keybinding ALT-SHIFT-UP/DOWN to move the selected
+ game object UP/DOWN within the map square.
+
+ * Change default keybindings for cursor keys to move the map
+ cursor.
+
2011-11-05 Andreas Kirschbaum
* Replace "Revert Map" with "Reload Map". Now the current map can
Property changes on: streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/daimonin/src/app/net/sf/gridarta/var/daimonin:5966-5991
/trunk/daimonin/src/app/net/sf/gridarta/var/daimonin:9094-9102
+ /streams/cher-japi-update/daimonin/src/app/net/sf/gridarta/var/daimonin:5966-5991
/trunk/daimonin/src/app/net/sf/gridarta/var/daimonin:9094-9109
Modified: streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2011-11-17 06:01:12 UTC (rev 9109)
+++ streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2011-11-17 06:12:26 UTC (rev 9110)
@@ -26,7 +26,7 @@
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
-edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
+edit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
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
#pickmaps.menu: See gridarta
@@ -41,7 +41,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
mapwindowFile.menu=saveMap saveMapAs createImage - reloadMap - closeMap
-mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
+mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
mapwindowMap.menu=gridVisible - goExit 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
Property changes on: streams/gui/daimonin/src/test/net/sf/gridarta/var/daimonin
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/daimonin/src/test/net/sf/gridarta/var/daimonin:5966-5991
/trunk/daimonin/src/test/net/sf/gridarta/var/daimonin:9094-9102
+ /streams/cher-japi-update/daimonin/src/test/net/sf/gridarta/var/daimonin:5966-5991
/trunk/daimonin/src/test/net/sf/gridarta/var/daimonin:9094-9109
Property changes on: streams/gui/lib/bsh-LICENSE
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/bsh-LICENSE:5966-5991
/trunk/lib/bsh-LICENSE:9094-9102
+ /streams/cher-japi-update/lib/bsh-LICENSE:5966-5991
/trunk/lib/bsh-LICENSE:9094-9109
Property changes on: streams/gui/lib/bsh-classgen-2.0b4.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/bsh-classgen-2.0b4.jar:5966-5991
/trunk/lib/bsh-classgen-2.0b4.jar:9094-9102
+ /streams/cher-japi-update/lib/bsh-classgen-2.0b4.jar:5966-5991
/trunk/lib/bsh-classgen-2.0b4.jar:9094-9109
Property changes on: streams/gui/lib/bsh-commands-2.0b4.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/bsh-commands-2.0b4.jar:5966-5991
/trunk/lib/bsh-commands-2.0b4.jar:9094-9102
+ /streams/cher-japi-update/lib/bsh-commands-2.0b4.jar:5966-5991
/trunk/lib/bsh-commands-2.0b4.jar:9094-9109
Property changes on: streams/gui/lib/bsh-core-2.0b4.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/bsh-core-2.0b4.jar:5966-5991
/trunk/lib/bsh-core-2.0b4.jar:9094-9102
+ /streams/cher-japi-update/lib/bsh-core-2.0b4.jar:5966-5991
/trunk/lib/bsh-core-2.0b4.jar:9094-9109
Property changes on: streams/gui/lib/bsh-util-2.0b4.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/bsh-util-2.0b4.jar:5966-5991
/trunk/lib/bsh-util-2.0b4.jar:9094-9102
+ /streams/cher-japi-update/lib/bsh-util-2.0b4.jar:5966-5991
/trunk/lib/bsh-util-2.0b4.jar:9094-9109
Property changes on: streams/gui/lib/jdom.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/jdom.jar:5966-5991
/trunk/lib/jdom.jar:9094-9102
+ /streams/cher-japi-update/lib/jdom.jar:5966-5991
/trunk/lib/jdom.jar:9094-9109
Property changes on: streams/gui/lib/jdom.jar-LICENSE
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/jdom.jar-LICENSE:5966-5991
/trunk/lib/jdom.jar-LICENSE:9094-9102
+ /streams/cher-japi-update/lib/jdom.jar-LICENSE:5966-5991
/trunk/lib/jdom.jar-LICENSE:9094-9109
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeAttribute.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java:9094-9102
+ /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeAttribute.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java:9094-9109
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeType.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java:9094-9102
+ /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeType.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java:9094-9109
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeTypeSet.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java:9094-9102
+ /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeTypeSet.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java:9094-9109
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/AttributeBitmask.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/CAttribBitmask.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/AttributeBitmask.java:9094-9102
+ /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/CAttribBitmask.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/AttributeBitmask.java:9094-9109
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/autojoin/AutojoinList.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java:9094-9102
+ /streams/cher-japi-update/src/app/net/sf/gridarta/autojoin/AutojoinList.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java:9094-9109
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/autojoin/AutojoinLists.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java:9094-9102
+ /streams/cher-japi-update/src/app/net/sf/gridarta/autojoin/AutojoinLists.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java:9094-9109
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gameobject/DefaultGameObject.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java:9094-9102
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gameobject/DefaultGameObject.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java:9094-9109
Copied: streams/gui/model/src/app/net/sf/gridarta/model/select/AttributeOtherValueMatchCriteria.java (from rev 9109, trunk/model/src/app/net/sf/gridarta/model/select/AttributeOtherValueMatchCriteria.java)
===================================================================
--- streams/gui/model/src/app/net/sf/gridarta/model/select/AttributeOtherValueMatchCriteria.java (rev 0)
+++ streams/gui/model/src/app/net/sf/gridarta/model/select/AttributeOtherValueMatchCriteria.java 2011-11-17 06:12:26 UTC (rev 9110)
@@ -0,0 +1,77 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2011 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.model.select;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
+import net.sf.gridarta.utils.StringUtils;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A {@link MatchCriteria} that matches attribute values of all but a set of
+ * attributes.
+ * @author Andreas Kirschbaum
+ */
+public class AttributeOtherValueMatchCriteria<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements MatchCriteria<G, A, R> {
+
+ /**
+ * The attribute names <em>not</em> to check.
+ */
+ @NotNull
+ private final Set<String> attributeNames;
+
+ /**
+ * The attribute value to check.
+ */
+ @NotNull
+ private final String attributeValue;
+
+ /**
+ * Creates a new instance.
+ * @param attributeValue the attribute value to check
+ * @param attributeNames the attribute names <em>not</em> to check
+ */
+ public AttributeOtherValueMatchCriteria(@NotNull final String attributeValue, @NotNull final String... attributeNames) {
+ this.attributeValue = attributeValue;
+ this.attributeNames = new HashSet<String>(Arrays.asList(attributeNames));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean matches(@NotNull final G gameObject) {
+ for (final String attribute : StringUtils.PATTERN_END_OF_LINE.split(gameObject.getObjectText())) {
+ final String[] tmp = StringUtils.PATTERN_SPACES.split(attribute, 2);
+ if (tmp.length == 2 && !attributeNames.contains(tmp[0])) {
+ if (tmp[1].contains(attributeValue)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+}
Copied: streams/gui/model/src/app/net/sf/gridarta/model/select/AttributeValueMatchCriteria.java (from rev 9109, trunk/model/src/app/net/sf/gridarta/model/select/AttributeValueMatchCriteria.java)
===================================================================
--- streams/gui/model/src/app/net/sf/gridarta/model/select/AttributeValueMatchCriteria.java (rev 0)
+++ streams/gui/model/src/app/net/sf/gridarta/model/select/AttributeValueMatchCriteria.java 2011-11-17 06:12:26 UTC (rev 9110)
@@ -0,0 +1,63 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2011 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.model.select;
+
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A {@link MatchCriteria} that matches an attribute value.
+ * @author Andreas Kirschbaum
+ */
+public class AttributeValueMatchCriteria<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements MatchCriteria<G, A, R> {
+
+ /**
+ * The attribute name to check.
+ */
+ @NotNull
+ private final String attributeName;
+
+ /**
+ * The attribute value to check.
+ */
+ @NotNull
+ private final String attributeValue;
+
+ /**
+ * Creates a new instance.
+ * @param attributeName the attribute name to check
+ * @param attributeValue the attribute value to check
+ */
+ public AttributeValueMatchCriteria(@NotNull final String attributeName, @NotNull final String attributeValue) {
+ this.attributeName = attributeName;
+ this.attributeValue = attributeValue;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean matches(@NotNull final G gameObject) {
+ return gameObject.getAttributeString(attributeName).contains(attributeValue);
+ }
+
+}
Modified: streams/gui/model/src/app/net/sf/gridarta/model/select/ObjectNameMatchCriteria.java
===================================================================
--- streams/gui/model/src/app/net/sf/gridarta/model/select/ObjectNameMatchCriteria.java 2011-11-17 06:01:12 UTC (rev 9109)
+++ streams/gui/model/src/app/net/sf/gridarta/model/select/ObjectNameMatchCriteria.java 2011-11-17 06:12:26 UTC (rev 9110)
@@ -51,7 +51,7 @@
*/
@Override
public boolean matches(@NotNull final G gameObject) {
- return objectName.matcher(gameObject.getBestName()).matches();
+ return objectName.matcher(gameObject.getBestName()).find();
}
}
Property changes on: streams/gui/resource/icons/CreateImageSmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/CreateImageSmallIcon.gif:5966-5991
/trunk/resource/icons/CreateImageSmallIcon.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/CreateImageSmallIcon.gif:5966-5991
/trunk/resource/icons/CreateImageSmallIcon.gif:9094-9109
Property changes on: streams/gui/resource/icons/Dir1.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir1.gif:5966-5991
/trunk/resource/icons/Dir1.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/Dir1.gif:5966-5991
/trunk/resource/icons/Dir1.gif:9094-9109
Property changes on: streams/gui/resource/icons/Dir2.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir2.gif:5966-5991
/trunk/resource/icons/Dir2.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/Dir2.gif:5966-5991
/trunk/resource/icons/Dir2.gif:9094-9109
Property changes on: streams/gui/resource/icons/Dir3.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir3.gif:5966-5991
/trunk/resource/icons/Dir3.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/Dir3.gif:5966-5991
/trunk/resource/icons/Dir3.gif:9094-9109
Property changes on: streams/gui/resource/icons/Dir4.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir4.gif:5966-5991
/trunk/resource/icons/Dir4.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/Dir4.gif:5966-5991
/trunk/resource/icons/Dir4.gif:9094-9109
Property changes on: streams/gui/resource/icons/Dir5.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir5.gif:5966-5991
/trunk/resource/icons/Dir5.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/Dir5.gif:5966-5991
/trunk/resource/icons/Dir5.gif:9094-9109
Property changes on: streams/gui/resource/icons/Dir6.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir6.gif:5966-5991
/trunk/resource/icons/Dir6.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/Dir6.gif:5966-5991
/trunk/resource/icons/Dir6.gif:9094-9109
Property changes on: streams/gui/resource/icons/Dir7.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir7.gif:5966-5991
/trunk/resource/icons/Dir7.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/Dir7.gif:5966-5991
/trunk/resource/icons/Dir7.gif:9094-9109
Property changes on: streams/gui/resource/icons/Dir8.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir8.gif:5966-5991
/trunk/resource/icons/Dir8.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/Dir8.gif:5966-5991
/trunk/resource/icons/Dir8.gif:9094-9109
Property changes on: streams/gui/resource/icons/EditPluginSmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/EditPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/EditPluginSmallIcon.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/EditPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/EditPluginSmallIcon.gif:9094-9109
Property changes on: streams/gui/resource/icons/EmptySmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/EmptySmallIcon.gif:5966-5991
/trunk/resource/icons/EmptySmallIcon.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/EmptySmallIcon.gif:5966-5991
/trunk/resource/icons/EmptySmallIcon.gif:9094-9109
Property changes on: streams/gui/resource/icons/ImportPluginSmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/ImportPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/ImportPluginSmallIcon.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/ImportPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/ImportPluginSmallIcon.gif:9094-9109
Property changes on: streams/gui/resource/icons/SaveMapAsSmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/SaveLevelAsSmallIcon.gif:5966-5991
/trunk/resource/icons/SaveMapAsSmallIcon.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/SaveLevelAsSmallIcon.gif:5966-5991
/trunk/resource/icons/SaveMapAsSmallIcon.gif:9094-9109
Property changes on: streams/gui/resource/icons/auto_run_small_icon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/AutorunSmallIcon.gif:5966-5991
/trunk/resource/icons/auto_run_small_icon.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/AutorunSmallIcon.gif:5966-5991
/trunk/resource/icons/auto_run_small_icon.gif:9094-9109
Property changes on: streams/gui/resource/icons/close_tab_small_icon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/CloseTabSmallIcon.gif:5966-5991
/trunk/resource/icons/close_tab_small_icon.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/CloseTabSmallIcon.gif:5966-5991
/trunk/resource/icons/close_tab_small_icon.gif:9094-9109
Property changes on: streams/gui/resource/icons/development/Application24.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Application24.gif:5966-5991
/trunk/resource/icons/development/Application24.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/development/Application24.gif:5966-5991
/trunk/resource/icons/development/Application24.gif:9094-9109
Property changes on: streams/gui/resource/icons/development/Host16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Host16.gif:5966-5991
/trunk/resource/icons/development/Host16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/development/Host16.gif:5966-5991
/trunk/resource/icons/development/Host16.gif:9094-9109
Property changes on: streams/gui/resource/icons/development/Host24.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Host24.gif:5966-5991
/trunk/resource/icons/development/Host24.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/development/Host24.gif:5966-5991
/trunk/resource/icons/development/Host24.gif:9094-9109
Property changes on: streams/gui/resource/icons/development/Jar16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Jar16.gif:5966-5991
/trunk/resource/icons/development/Jar16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/development/Jar16.gif:5966-5991
/trunk/resource/icons/development/Jar16.gif:9094-9109
Property changes on: streams/gui/resource/icons/development/Server16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Server16.gif:5966-5991
/trunk/resource/icons/development/Server16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/development/Server16.gif:5966-5991
/trunk/resource/icons/development/Server16.gif:9094-9109
Property changes on: streams/gui/resource/icons/development/Server24.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Server24.gif:5966-5991
/trunk/resource/icons/development/Server24.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/development/Server24.gif:5966-5991
/trunk/resource/icons/development/Server24.gif:9094-9109
Property changes on: streams/gui/resource/icons/filter_small_icon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/FilterSmallIcon.gif:5966-5991
/trunk/resource/icons/filter_small_icon.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/FilterSmallIcon.gif:5966-5991
/trunk/resource/icons/filter_small_icon.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/About16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/About16.gif:5966-5991
/trunk/resource/icons/general/About16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/About16.gif:5966-5991
/trunk/resource/icons/general/About16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Copy16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Copy16.gif:5966-5991
/trunk/resource/icons/general/Copy16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Copy16.gif:5966-5991
/trunk/resource/icons/general/Copy16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Cut16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Cut16.gif:5966-5991
/trunk/resource/icons/general/Cut16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Cut16.gif:5966-5991
/trunk/resource/icons/general/Cut16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Delete16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Delete16.gif:5966-5991
/trunk/resource/icons/general/Delete16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Delete16.gif:5966-5991
/trunk/resource/icons/general/Delete16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Edit16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Edit16.gif:5966-5991
/trunk/resource/icons/general/Edit16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Edit16.gif:5966-5991
/trunk/resource/icons/general/Edit16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Help16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Help16.gif:5966-5991
/trunk/resource/icons/general/Help16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Help16.gif:5966-5991
/trunk/resource/icons/general/Help16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/History16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/History16.gif:5966-5991
/trunk/resource/icons/general/History16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/History16.gif:5966-5991
/trunk/resource/icons/general/History16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/New16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/New16.gif:5966-5991
/trunk/resource/icons/general/New16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/New16.gif:5966-5991
/trunk/resource/icons/general/New16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Open16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Open16.gif:5966-5991
/trunk/resource/icons/general/Open16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Open16.gif:5966-5991
/trunk/resource/icons/general/Open16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Paste16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Paste16.gif:5966-5991
/trunk/resource/icons/general/Paste16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Paste16.gif:5966-5991
/trunk/resource/icons/general/Paste16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Preferences16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Preferences16.gif:5966-5991
/trunk/resource/icons/general/Preferences16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Preferences16.gif:5966-5991
/trunk/resource/icons/general/Preferences16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Preferences24.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Preferences24.gif:5966-5991
/trunk/resource/icons/general/Preferences24.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Preferences24.gif:5966-5991
/trunk/resource/icons/general/Preferences24.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Properties16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Properties16.gif:5966-5991
/trunk/resource/icons/general/Properties16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Properties16.gif:5966-5991
/trunk/resource/icons/general/Properties16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Redo16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Redo16.gif:5966-5991
/trunk/resource/icons/general/Redo16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Redo16.gif:5966-5991
/trunk/resource/icons/general/Redo16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Refresh16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Refresh16.gif:5966-5991
/trunk/resource/icons/general/Refresh16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Refresh16.gif:5966-5991
/trunk/resource/icons/general/Refresh16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Remove16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Remove16.gif:5966-5991
/trunk/resource/icons/general/Remove16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Remove16.gif:5966-5991
/trunk/resource/icons/general/Remove16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Replace16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Replace16.gif:5966-5991
/trunk/resource/icons/general/Replace16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Replace16.gif:5966-5991
/trunk/resource/icons/general/Replace16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Save16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Save16.gif:5966-5991
/trunk/resource/icons/general/Save16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Save16.gif:5966-5991
/trunk/resource/icons/general/Save16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Save24.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Save24.gif:5966-5991
/trunk/resource/icons/general/Save24.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Save24.gif:5966-5991
/trunk/resource/icons/general/Save24.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/SaveAs16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/SaveAs16.gif:5966-5991
/trunk/resource/icons/general/SaveAs16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/SaveAs16.gif:5966-5991
/trunk/resource/icons/general/SaveAs16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Search16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Search16.gif:5966-5991
/trunk/resource/icons/general/Search16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Search16.gif:5966-5991
/trunk/resource/icons/general/Search16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/TipOfTheDay16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/TipOfTheDay16.gif:5966-5991
/trunk/resource/icons/general/TipOfTheDay16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/TipOfTheDay16.gif:5966-5991
/trunk/resource/icons/general/TipOfTheDay16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Undo16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Undo16.gif:5966-5991
/trunk/resource/icons/general/Undo16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Undo16.gif:5966-5991
/trunk/resource/icons/general/Undo16.gif:9094-9109
Property changes on: streams/gui/resource/icons/general/Zoom16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Zoom16.gif:5966-5991
/trunk/resource/icons/general/Zoom16.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/general/Zoom16.gif:5966-5991
/trunk/resource/icons/general/Zoom16.gif:9094-9109
Property changes on: streams/gui/resource/icons/media
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/media:5966-5991
/trunk/resource/icons/media:9094-9102
+ /streams/cher-japi-update/resource/icons/media:5966-5991
/trunk/resource/icons/media:9094-9109
Property changes on: streams/gui/resource/icons/run_plugin_small_icon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/RunPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/run_plugin_small_icon.gif:9094-9102
+ /streams/cher-japi-update/resource/icons/RunPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/run_plugin_small_icon.gif:9094-9109
Property changes on: streams/gui/resource/log4j.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/crossfire/resource/log4j.properties:5966-5991
/trunk/resource/log4j.properties:9094-9102
+ /streams/cher-japi-update/crossfire/resource/log4j.properties:5966-5991
/trunk/resource/log4j.properties:9094-9109
Deleted: streams/gui/src/app/net/sf/gridarta/gui/dialog/find/FindDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/find/FindDialog.java 2011-11-17 06:01:12 UTC (rev 9109)
+++ streams/gui/src/app/net/sf/gridarta/gui/dialog/find/FindDialog.java 2011-11-17 06:12:26 UTC (rev 9110)
@@ -1,373 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2011 The Gridarta Developers.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package net.sf.gridarta.gui.dialog.find;
-
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.FlowLayout;
-import java.awt.Point;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import javax.swing.AbstractButton;
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.WindowConstants;
-import javax.swing.text.JTextComponent;
-import net.sf.gridarta.gui.map.mapview.MapView;
-import net.sf.gridarta.gui.utils.TextComponentUtils;
-import net.sf.gridarta.model.archetype.Archetype;
-import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.maparchobject.MapArchObject;
-import net.sf.gridarta.model.mapcontrol.MapControl;
-import net.sf.gridarta.model.mapcursor.MapCursor;
-import net.sf.gridarta.model.mapgrid.MapGrid;
-import net.sf.gridarta.model.mapgrid.SelectionMode;
-import net.sf.gridarta.model.mapmodel.MapModel;
-import net.sf.gridarta.model.mapmodel.MapSquare;
-import net.sf.gridarta.model.select.ArchetypeNameMatchCriteria;
-import net.sf.gridarta.model.select.AttributeOtherValueMatchCriteria;
-import net.sf.gridarta.model.select.AttributeValueMatchCriteria;
-import net.sf.gridarta.model.select.MatchCriteria;
-import net.sf.gridarta.model.select.ObjectNameMatchCriteria;
-import net.sf.gridarta.utils.ActionBuilderUtils;
-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;
-
-/**
- * This dialog manages the find action.
- * @author Andreas Kirschbaum
- */
-public class FindDialog<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JOptionPane {
-
- /**
- * Serial Version UID.
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * Action Builder.
- */
- @NotNull
- private static final ActionBuilder ACTION_BUILDE...
[truncated message content] |
|
From: <aki...@us...> - 2011-11-17 06:01:19
|
Revision: 9109
http://gridarta.svn.sourceforge.net/gridarta/?rev=9109&view=rev
Author: akirschbaum
Date: 2011-11-17 06:01:12 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
Ignore "enable updates" setting for builds without valid update URLs.
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/crossfire/ChangeLog
trunk/daimonin/ChangeLog
trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-11-13 08:45:19 UTC (rev 9108)
+++ trunk/atrinik/ChangeLog 2011-11-17 06:01:12 UTC (rev 9109)
@@ -1,3 +1,10 @@
+2011-11-17 Andreas Kirschbaum
+
+ * Ignore "enable updates" setting for builds without valid update
+ URLs. This prevents possbile errors 'Error while updating:
+ java.net.MalformedURLException: no protocol: Please Update
+ manually.'
+
2011-11-12 Andreas Kirschbaum
* Implement Edit|Find... which searches the current map. Relocate
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2011-11-13 08:45:19 UTC (rev 9108)
+++ trunk/crossfire/ChangeLog 2011-11-17 06:01:12 UTC (rev 9109)
@@ -1,3 +1,10 @@
+2011-11-17 Andreas Kirschbaum
+
+ * Ignore "enable updates" setting for builds without valid update
+ URLs. This prevents possbile errors 'Error while updating:
+ java.net.MalformedURLException: no protocol: Please Update
+ manually.'
+
2011-11-12 Andreas Kirschbaum
* Implement Edit|Find... which searches the current map. Relocate
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2011-11-13 08:45:19 UTC (rev 9108)
+++ trunk/daimonin/ChangeLog 2011-11-17 06:01:12 UTC (rev 9109)
@@ -1,3 +1,10 @@
+2011-11-17 Andreas Kirschbaum
+
+ * Ignore "enable updates" setting for builds without valid update
+ URLs. This prevents possbile errors 'Error while updating:
+ java.net.MalformedURLException: no protocol: Please Update
+ manually.'
+
2011-11-12 Andreas Kirschbaum
* Implement Edit|Find... which searches the current map. Relocate
Modified: trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java 2011-11-13 08:45:19 UTC (rev 9108)
+++ trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java 2011-11-17 06:01:12 UTC (rev 9109)
@@ -98,6 +98,11 @@
private final String updateFileName;
/**
+ * Whether an update URL is defined.
+ */
+ private final boolean hasUpdateURL;
+
+ /**
* Creates a new instance.
* @param exiter the exiter for terminating the application
* @param mapManager the map manager to use
@@ -112,14 +117,15 @@
final Action aUpdate = ActionUtils.newAction(ACTION_BUILDER, "Tool", this, "update");
final CharSequence propUrl = ACTION_BUILDER.getString("update.url");
- aUpdate.setEnabled(propUrl != null && propUrl.length() > 0);
+ hasUpdateURL = propUrl != null && propUrl.length() > 0;
+ aUpdate.setEnabled(hasUpdateURL);
}
/**
* Eventually perform an update during startup.
*/
public void startup() {
- if (!preferences.getBoolean(AUTO_CHECK_KEY, AUTO_CHECK_DEFAULT)) {
+ if (!hasUpdateURL || !preferences.getBoolean(AUTO_CHECK_KEY, AUTO_CHECK_DEFAULT)) {
return;
}
final long timeDifference = UPDATE_TIMES[preferences.getInt(INTERVAL_KEY, INTERVAL_DEFAULT)];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-11-13 08:45:25
|
Revision: 9108
http://gridarta.svn.sourceforge.net/gridarta/?rev=9108&view=rev
Author: akirschbaum
Date: 2011-11-13 08:45:19 +0000 (Sun, 13 Nov 2011)
Log Message:
-----------
Whitespace change.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java 2011-11-12 10:52:09 UTC (rev 9107)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java 2011-11-13 08:45:19 UTC (rev 9108)
@@ -228,7 +228,7 @@
internalFrame.setAutoscrolls(true);
internalFrame.setFocusable(true);
for (final Direction direction : Direction.values()) {
- installAccelerator("moveCursor"+direction.getId());
+ installAccelerator("moveCursor" + direction.getId());
}
installAccelerator("moveSquarePrev");
installAccelerator("moveSquareNext");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-11-12 10:52:18
|
Revision: 9107
http://gridarta.svn.sourceforge.net/gridarta/?rev=9107&view=rev
Author: akirschbaum
Date: 2011-11-12 10:52:09 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
Implement Edit|Find... which searches the current map.
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
trunk/crossfire/ChangeLog
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
trunk/daimonin/ChangeLog
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
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
trunk/utils/src/app/net/sf/gridarta/utils/ActionBuilderUtils.java
Added Paths:
-----------
trunk/model/src/app/net/sf/gridarta/model/select/AttributeOtherValueMatchCriteria.java
trunk/model/src/app/net/sf/gridarta/model/select/AttributeValueMatchCriteria.java
trunk/src/app/net/sf/gridarta/gui/dialog/find/
trunk/src/app/net/sf/gridarta/gui/dialog/find/FindDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/find/FindDialogManager.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-11-12 10:49:07 UTC (rev 9106)
+++ trunk/atrinik/ChangeLog 2011-11-12 10:52:09 UTC (rev 9107)
@@ -1,5 +1,8 @@
2011-11-12 Andreas Kirschbaum
+ * Implement Edit|Find... which searches the current map. Relocate
+ CTRL-F (Fill) to ALT-F.
+
* Add default keybindings ALT-LEFT/RIGHT to move the selected game
object to its environment/into the inventory of the previous game
object.
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2011-11-12 10:49:07 UTC (rev 9106)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2011-11-12 10:52:09 UTC (rev 9107)
@@ -26,7 +26,7 @@
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
-edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
+edit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
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
#pickmaps.menu: See gridarta
@@ -41,7 +41,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
mapwindowFile.menu=saveMap saveMapAs createImage - reloadMap - closeMap
-mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
+mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
mapwindowMap.menu=gridVisible - goExit 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/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2011-11-12 10:49:07 UTC (rev 9106)
+++ trunk/crossfire/ChangeLog 2011-11-12 10:52:09 UTC (rev 9107)
@@ -1,5 +1,8 @@
2011-11-12 Andreas Kirschbaum
+ * Implement Edit|Find... which searches the current map. Relocate
+ CTRL-F (Fill) to ALT-F.
+
* Add default keybindings ALT-LEFT/RIGHT to move the selected game
object to its environment/into the inventory of the previous game
object.
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2011-11-12 10:49:07 UTC (rev 9106)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2011-11-12 10:52:09 UTC (rev 9107)
@@ -26,7 +26,7 @@
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
-edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
+edit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
#pickmaps.menu: See gridarta
@@ -41,7 +41,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
mapwindowFile.menu=saveMap saveMapAs createImage - reloadMap - closeMap
-mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
+mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
mapwindowMap.menu=gridVisible smoothing - goExit 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/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2011-11-12 10:49:07 UTC (rev 9106)
+++ trunk/daimonin/ChangeLog 2011-11-12 10:52:09 UTC (rev 9107)
@@ -1,5 +1,8 @@
2011-11-12 Andreas Kirschbaum
+ * Implement Edit|Find... which searches the current map. Relocate
+ CTRL-F (Fill) to ALT-F.
+
* Add default keybindings ALT-LEFT/RIGHT to move the selected game
object to its environment/into the inventory of the previous game
object.
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2011-11-12 10:49:07 UTC (rev 9106)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2011-11-12 10:52:09 UTC (rev 9107)
@@ -26,7 +26,7 @@
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
-edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
+edit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
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
#pickmaps.menu: See gridarta
@@ -41,7 +41,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
mapwindowFile.menu=saveMap saveMapAs createImage - reloadMap - closeMap
-mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
+mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
mapwindowMap.menu=gridVisible - goExit 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
Added: trunk/model/src/app/net/sf/gridarta/model/select/AttributeOtherValueMatchCriteria.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/select/AttributeOtherValueMatchCriteria.java (rev 0)
+++ trunk/model/src/app/net/sf/gridarta/model/select/AttributeOtherValueMatchCriteria.java 2011-11-12 10:52:09 UTC (rev 9107)
@@ -0,0 +1,77 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2011 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.model.select;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
+import net.sf.gridarta.utils.StringUtils;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A {@link MatchCriteria} that matches attribute values of all but a set of
+ * attributes.
+ * @author Andreas Kirschbaum
+ */
+public class AttributeOtherValueMatchCriteria<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements MatchCriteria<G, A, R> {
+
+ /**
+ * The attribute names <em>not</em> to check.
+ */
+ @NotNull
+ private final Set<String> attributeNames;
+
+ /**
+ * The attribute value to check.
+ */
+ @NotNull
+ private final String attributeValue;
+
+ /**
+ * Creates a new instance.
+ * @param attributeValue the attribute value to check
+ * @param attributeNames the attribute names <em>not</em> to check
+ */
+ public AttributeOtherValueMatchCriteria(@NotNull final String attributeValue, @NotNull final String... attributeNames) {
+ this.attributeValue = attributeValue;
+ this.attributeNames = new HashSet<String>(Arrays.asList(attributeNames));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean matches(@NotNull final G gameObject) {
+ for (final String attribute : StringUtils.PATTERN_END_OF_LINE.split(gameObject.getObjectText())) {
+ final String[] tmp = StringUtils.PATTERN_SPACES.split(attribute, 2);
+ if (tmp.length == 2 && !attributeNames.contains(tmp[0])) {
+ if (tmp[1].contains(attributeValue)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+}
Property changes on: trunk/model/src/app/net/sf/gridarta/model/select/AttributeOtherValueMatchCriteria.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: trunk/model/src/app/net/sf/gridarta/model/select/AttributeValueMatchCriteria.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/select/AttributeValueMatchCriteria.java (rev 0)
+++ trunk/model/src/app/net/sf/gridarta/model/select/AttributeValueMatchCriteria.java 2011-11-12 10:52:09 UTC (rev 9107)
@@ -0,0 +1,63 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2011 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.model.select;
+
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A {@link MatchCriteria} that matches an attribute value.
+ * @author Andreas Kirschbaum
+ */
+public class AttributeValueMatchCriteria<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements MatchCriteria<G, A, R> {
+
+ /**
+ * The attribute name to check.
+ */
+ @NotNull
+ private final String attributeName;
+
+ /**
+ * The attribute value to check.
+ */
+ @NotNull
+ private final String attributeValue;
+
+ /**
+ * Creates a new instance.
+ * @param attributeName the attribute name to check
+ * @param attributeValue the attribute value to check
+ */
+ public AttributeValueMatchCriteria(@NotNull final String attributeName, @NotNull final String attributeValue) {
+ this.attributeName = attributeName;
+ this.attributeValue = attributeValue;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean matches(@NotNull final G gameObject) {
+ return gameObject.getAttributeString(attributeName).contains(attributeValue);
+ }
+
+}
Property changes on: trunk/model/src/app/net/sf/gridarta/model/select/AttributeValueMatchCriteria.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: trunk/src/app/net/sf/gridarta/gui/dialog/find/FindDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/find/FindDialog.java (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/find/FindDialog.java 2011-11-12 10:52:09 UTC (rev 9107)
@@ -0,0 +1,373 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2011 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.gui.dialog.find;
+
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.FlowLayout;
+import java.awt.Point;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import javax.swing.AbstractButton;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.WindowConstants;
+import javax.swing.text.JTextComponent;
+import net.sf.gridarta.gui.map.mapview.MapView;
+import net.sf.gridarta.gui.utils.TextComponentUtils;
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
+import net.sf.gridarta.model.mapcontrol.MapControl;
+import net.sf.gridarta.model.mapcursor.MapCursor;
+import net.sf.gridarta.model.mapgrid.MapGrid;
+import net.sf.gridarta.model.mapgrid.SelectionMode;
+import net.sf.gridarta.model.mapmodel.MapModel;
+import net.sf.gridarta.model.mapmodel.MapSquare;
+import net.sf.gridarta.model.select.ArchetypeNameMatchCriteria;
+import net.sf.gridarta.model.select.AttributeOtherValueMatchCriteria;
+import net.sf.gridarta.model.select.AttributeValueMatchCriteria;
+import net.sf.gridarta.model.select.MatchCriteria;
+import net.sf.gridarta.model.select.ObjectNameMatchCriteria;
+import net.sf.gridarta.utils.ActionBuilderUtils;
+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;
+
+/**
+ * This dialog manages the find action.
+ * @author Andreas Kirschbaum
+ */
+public class FindDialog<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JOptionPane {
+
+ /**
+ * Serial Version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Action Builder.
+ */
+ @NotNull
+ private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
+
+ /**
+ * The dialog instance.
+ */
+ @NotNull
+ private final JDialog dialog;
+
+ /**
+ * The parent component for dialogs.
+ */
+ @NotNull
+ private final Component parent;
+
+ /**
+ * Whether this find dialog has been displayed.
+ */
+ private boolean isBuilt = false;
+
+ /**
+ * The {@link MapView} to operate on.
+ */
+ @NotNull
+ private MapView<G, A, R> mapView;
+
+ /**
+ * The text input field for the string to find.
+ */
+ @NotNull
+ private final JTextComponent findInput = new JTextField(20);
+
+ /**
+ * The checkbox for matching 'name' attributes.
+ */
+ @NotNull
+ private final AbstractButton findNameCheckbox = new JCheckBox(ActionBuilderUtils.getString(ACTION_BUILDER, "findWhereName"));
+
+ /**
+ * The checkbox for matching archetype names.
+ */
+ @NotNull
+ private final AbstractButton findArchCheckbox = new JCheckBox(ActionBuilderUtils.getString(ACTION_BUILDER, "findWhereArch"));
+
+ /**
+ * The checkbox for matching 'msg' attributes.
+ */
+ @NotNull
+ private final AbstractButton findMsgCheckbox = new JCheckBox(ActionBuilderUtils.getString(ACTION_BUILDER, "findWhereMsg"));
+
+ /**
+ * The checkbox for matching 'face' or 'animation' attributes.
+ */
+ @NotNull
+ private final AbstractButton findFaceCheckbox = new JCheckBox(ActionBuilderUtils.getString(ACTION_BUILDER, "findWhereFace"));
+
+ /**
+ * The checkbox for matching 'slaying' attributes.
+ */
+ @NotNull
+ private final AbstractButton findSlayingCheckbox = new JCheckBox(ActionBuilderUtils.getString(ACTION_BUILDER, "findWhereSlaying"));
+
+ /**
+ * The checkbox for matching all other attributes.
+ */
+ @NotNull
+ private final AbstractButton findOtherCheckbox = new JCheckBox(ActionBuilderUtils.getString(ACTION_BUILDER, "findWhereOther"));
+
+ /**
+ * Creates a new instance.
+ * @param parent the parent component for dialogs
+ */
+ public FindDialog(@NotNull final Component parent) {
+ dialog = createDialog(parent, "");
+ dialog.setModal(false);
+ dialog.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
+ this.parent = parent;
+
+ TextComponentUtils.setAutoSelectOnFocus(findInput);
+ }
+
+ /**
+ * Replace objects on the map.
+ * @param mapView map view of the active map where the action was invoked
+ */
+ public void display(@NotNull final MapView<G, A, R> mapView) {
+ if (isBuilt) {
+ this.mapView = mapView;
+
+ dialog.pack();
+ dialog.toFront();
+ } else {
+ this.mapView = mapView;
+ final JPanel mainPanel = new JPanel();
+ mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
+ mainPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 2, 5));
+
+ final Container lineFind = new JPanel(new FlowLayout(FlowLayout.LEFT));
+ final JComponent labelFind = ActionBuilderUtils.newLabel(ACTION_BUILDER, "findFind");
+ labelFind.setToolTipText(ActionBuilderUtils.getString(ACTION_BUILDER, "findFind.shortdescription"));
+ lineFind.add(labelFind);
+ lineFind.add(Box.createVerticalStrut(3));
+ lineFind.add(findInput);
+ lineFind.add(Box.createVerticalStrut(3));
+ mainPanel.add(lineFind);
+
+ final Container lineWhere = new JPanel(new FlowLayout(FlowLayout.LEFT));
+ final JComponent labelWhere = ActionBuilderUtils.newLabel(ACTION_BUILDER, "findWhere");
+ labelWhere.setToolTipText(ActionBuilderUtils.getString(ACTION_BUILDER, "findWhere.shortdescription"));
+ lineWhere.add(labelWhere);
+ lineWhere.add(Box.createVerticalStrut(5));
+
+ final JPanel panelWhere = new JPanel();
+ panelWhere.setLayout(new BoxLayout(panelWhere, BoxLayout.Y_AXIS));
+ panelWhere.add(findNameCheckbox);
+ panelWhere.add(findArchCheckbox);
+ panelWhere.add(findMsgCheckbox);
+ panelWhere.add(findFaceCheckbox);
+ panelWhere.add(findSlayingCheckbox);
+ panelWhere.add(findOtherCheckbox);
+ lineWhere.add(panelWhere);
+ mainPanel.add(lineWhere);
+
+ final JButton okButton = new JButton(ACTION_BUILDER.createAction(false, "findOk", this));
+ final JButton cancelButton = new JButton(ACTION_BUILDER.createAction(false, "findCancel", this));
+
+ findNameCheckbox.setSelected(true);
+ findMsgCheckbox.setSelected(true);
+ findSlayingCheckbox.setSelected(true);
+
+ setMessage(mainPanel);
+ setOptions(new Object[] { okButton, cancelButton });
+ dialog.getRootPane().setDefaultButton(okButton);
+ dialog.pack();
+ dialog.setLocationRelativeTo(parent);
+
+ isBuilt = true;
+ }
+ dialog.setTitle(ActionBuilderUtils.format(ACTION_BUILDER, "findTitle", mapView.getMapControl().getMapModel().getMapArchObject().getMapName()));
+ dialog.setVisible(true);
+ findInput.requestFocusInWindow();
+ }
+
+ /**
+ * Re-executes the previous find operation.
+ * @param mapView the map view to operate on
+ * @param forward whether to search forward (<code>true</code>) or backward
+ * (<code>false</code>)
+ * @param performAction whether the action should be performed
+ * @return whether the action was or can be performed
+ */
+ public boolean findAgain(@NotNull final MapView<G, A, R> mapView, final boolean forward, final boolean performAction) {
+ if (this.mapView != mapView) {
+ return false;
+ }
+ if (performAction) {
+ doFind(forward);
+ }
+ return true;
+ }
+
+ /**
+ * Action method for Ok button.
+ */
+ @ActionMethod
+ public void findOk() {
+ if (doFind(true)) {
+ dialog.setVisible(false);
+ }
+ }
+
+ /**
+ * Action method for Cancel button.
+ */
+ @ActionMethod
+ public void findCancel() {
+ dialog.setVisible(false);
+ }
+
+ /**
+ * Executes one find operation.
+ * @param forward whether to search forward (<code>true</code>) or backward
+ * (<code>false</code>)
+ * @return whether the find operation was successful
+ */
+ private boolean doFind(final boolean forward) {
+ final String findString = findInput.getText().trim();
+ final Collection<MatchCriteria<G, A, R>> matchCriterias = new ArrayList<MatchCriteria<G, A, R>>();
+ if (findNameCheckbox.isSelected()) {
+ matchCriterias.add(new ObjectNameMatchCriteria<G, A, R>(findString));
+ }
+ if (findArchCheckbox.isSelected()) {
+ matchCriterias.add(new ArchetypeNameMatchCriteria<G, A, R>(findString));
+ }
+ if (findMsgCheckbox.isSelected()) {
+ matchCriterias.add(new AttributeValueMatchCriteria<G, A, R>("msg", findString));
+ }
+ if (findFaceCheckbox.isSelected()) {
+ matchCriterias.add(new AttributeValueMatchCriteria<G, A, R>("face", findString));
+ matchCriterias.add(new AttributeValueMatchCriteria<G, A, R>("animation", findString));
+ }
+ if (findSlayingCheckbox.isSelected()) {
+ matchCriterias.add(new AttributeValueMatchCriteria<G, A, R>("slaying", findString));
+ }
+ if (findOtherCheckbox.isSelected()) {
+ matchCriterias.add(new AttributeOtherValueMatchCriteria<G, A, R>(findString, "msg", "face", "animation", "slaying"));
+ }
+ return !matchCriterias.isEmpty() && doFind(matchCriterias, forward) > 0;
+ }
+
+ /**
+ * This method performs the actual find action on a map.
+ * @param matchCriterias the matching criterias to find
+ * @param forward whether to search forward (<code>true</code>) or backward
+ * (<code>false</code>)
+ * @return the number of objects found
+ */
+ private int doFind(@NotNull final Iterable<MatchCriteria<G, A, R>> matchCriterias, final boolean forward) {
+ final List<G> matchingGameObjects = new ArrayList<G>();
+ final Collection<MapSquare<G, A, R>> matchingMapSquares = new ArrayList<MapSquare<G, A, R>>();
+ final MapControl<G, A, R> mapControl = mapView.getMapControl();
+ final MapModel<G, A, R> mapModel = mapControl.getMapModel();
+ for (final MapSquare<G, A, R> mapSquare : mapModel) {
+ boolean matchesMapSquare = false;
+ for (final G gameObject : mapSquare.recursive()) {
+ for (final MatchCriteria<G, A, R> matchCriteria : matchCriterias) {
+ if (matchCriteria.matches(gameObject)) {
+ matchingGameObjects.add(gameObject);
+ matchesMapSquare = true;
+ }
+ }
+ }
+ if (matchesMapSquare) {
+ matchingMapSquares.add(mapSquare);
+ }
+ }
+ selectMapSquares(matchingMapSquares);
+ setMapCursor(forward, matchingGameObjects);
+ return matchingGameObjects.size();
+ }
+
+ /**
+ * Selects a set of {@link MapSquare MapSquares} on the map.
+ * @param mapSquares the map squares to select
+ */
+ private void selectMapSquares(@NotNull final Iterable<MapSquare<G, A, R>> mapSquares) {
+ final MapGrid mapGrid = mapView.getMapGrid();
+ mapGrid.unSelect();
+ final Point p = new Point();
+ for (final MapSquare<G, A, R> mapSquare : mapSquares) {
+ p.x = mapSquare.getMapX();
+ p.y = mapSquare.getMapY();
+ mapGrid.select(p, SelectionMode.ADD);
+ }
+ }
+
+ /**
+ * Moves the cursor to the next or previous matching game object.
+ * @param forward whether to move the cursor forward (<code>true</code>) or
+ * backward (<code>false</code>)
+ * @param gameObjects the game objects to consider
+ */
+ private void setMapCursor(final boolean forward, @NotNull final List<G> gameObjects) {
+ if (gameObjects.isEmpty()) {
+ return;
+ }
+
+ final MapCursor<G, A, R> mapCursor = mapView.getMapCursor();
+ final int index;
+ final G selectedGameObject = mapCursor.getGameObject();
+ if (selectedGameObject == null) {
+ index = 0;
+ } else {
+ final int selectedIndex = gameObjects.indexOf(selectedGameObject);
+ if (selectedIndex == -1) {
+ index = 0;
+ } else if (forward) {
+ index = selectedIndex + 1 < gameObjects.size() ? selectedIndex + 1 : 0;
+ } else {
+ index = selectedIndex > 0 ? selectedIndex - 1 : gameObjects.size() - 1;
+ }
+ }
+ mapCursor.setGameObject(gameObjects.get(index));
+ }
+
+ /**
+ * Disposes the find dialog.
+ * @param mapView the map view to dispose the dialog of; do nothing if no
+ */
+ public void dispose(@NotNull final MapView<G, A, R> mapView) {
+ if (mapView == this.mapView) {
+ dialog.setVisible(false);
+ }
+ }
+
+} // class ReplaceDialog
Property changes on: trunk/src/app/net/sf/gridarta/gui/dialog/find/FindDialog.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: trunk/src/app/net/sf/gridarta/gui/dialog/find/FindDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/find/FindDialogManager.java (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/find/FindDialogManager.java 2011-11-12 10:52:09 UTC (rev 9107)
@@ -0,0 +1,124 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2011 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.gui.dialog.find;
+
+import java.awt.Component;
+import net.sf.gridarta.gui.map.mapview.MapView;
+import net.sf.gridarta.gui.map.mapview.MapViewManager;
+import net.sf.gridarta.gui.map.mapview.MapViewManagerListener;
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Creates and displays the find dialog.
+ * @author Andreas Kirschbaum
+ */
+public class FindDialogManager<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
+
+ /**
+ * Singleton Instance.
+ */
+ @Nullable
+ private FindDialog<G, A, R> instance = null;
+
+ /**
+ * The parent component for dialogs.
+ */
+ @NotNull
+ private final Component parent;
+
+ /**
+ * Creates a new instance.
+ * @param parent the parent component for dialogs
+ * @param mapViewManager the map view manager to use
+ */
+ public FindDialogManager(@NotNull final Component parent, @NotNull final MapViewManager<G, A, R> mapViewManager) {
+ this.parent = parent;
+
+ final MapViewManagerListener<G, A, R> mapViewManagerListener = new MapViewManagerListener<G, A, R>() {
+
+ /** {@inheritDoc} */
+ @Override
+ public void activeMapViewChanged(@Nullable final MapView<G, A, R> mapView) {
+ // ignore
+ }
+
+ /** {@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) {
+ disposeDialog(mapView);
+ }
+
+ };
+ mapViewManager.addMapViewManagerListener(mapViewManagerListener);
+ }
+
+ /**
+ * Dispose the replace dialog.
+ * @param mapView the map view to dispose the dialog of; do nothing if no
+ * dialog exists
+ */
+ private void disposeDialog(@NotNull final MapView<G, A, R> mapView) {
+ if (instance != null) {
+ instance.dispose(mapView);
+ }
+ }
+
+ /**
+ * Displays the replace dialog.
+ * @param mapView the map view to operate on
+ */
+ public void showDialog(@NotNull final MapView<G, A, R> mapView) {
+ if (instance == null) {
+ instance = new FindDialog<G, A, R>(parent);
+ }
+ instance.display(mapView);
+ }
+
+ /**
+ * Executes the "find next" action.
+ * @param mapView the map view to operate on
+ * @param performAction whether the action should be performed
+ * @return whether the action was or can be performed
+ */
+ public boolean findNext(@NotNull final MapView<G, A, R> mapView, final boolean performAction) {
+ return instance != null && instance.findAgain(mapView, true, performAction);
+ }
+
+ /**
+ * Executes the "find next" action.
+ * @param mapView the map view to operate on
+ * @param performAction whether the action should be performed
+ * @return whether the action was or can be performed
+ */
+ public boolean findPrev(@NotNull final MapView<G, A, R> mapView, final boolean performAction) {
+ return instance != null && instance.findAgain(mapView, false, performAction);
+ }
+
+} // class ReplaceDialogManager
Property changes on: trunk/src/app/net/sf/gridarta/gui/dialog/find/FindDialogManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2011-11-12 10:49:07 UTC (rev 9106)
+++ trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2011-11-12 10:52:09 UTC (rev 9107)
@@ -31,6 +31,7 @@
import javax.swing.JFrame;
import net.sf.gridarta.commands.Collector;
import net.sf.gridarta.gui.copybuffer.CopyBuffer;
+import net.sf.gridarta.gui.dialog.find.FindDialogManager;
import net.sf.gridarta.gui.dialog.replace.ReplaceDialogManager;
import net.sf.gridarta.gui.map.mapview.MapView;
import net.sf.gridarta.gui.map.mapview.MapViewManager;
@@ -98,6 +99,12 @@
private static final Category log = Logger.getLogger(MainActions.class);
/**
+ * The find dialog manager to use.
+ */
+ @NotNull
+ private final FindDialogManager<G, A, R> findDialogManager;
+
+ /**
* The replace dialog manager to use.
*/
@NotNull
@@ -242,6 +249,24 @@
private final Action aPasteTiled;
/**
+ * Action called for "find".
+ */
+ @NotNull
+ private final Action aFind;
+
+ /**
+ * Action called for "find next".
+ */
+ @NotNull
+ private final Action aFindNext;
+
+ /**
+ * Action called for "find prev".
+ */
+ @NotNull
+ private final Action aFindPrev;
+
+ /**
* Action called for "replace".
*/
@NotNull
@@ -409,6 +434,7 @@
/**
* Create a new instance.
+ * @param findDialogManager the find dialog manager to use
* @param replaceDialogManager the replace dialog manager to use
* @param parent the parent component for dialog windows
* @param globalSettings the global settings instance
@@ -425,7 +451,8 @@
* @param insertionModeSet the insertion mode set to use
* @param exiter the exiter instance
*/
- public MainActions(@NotNull final ReplaceDialogManager<G, A, R> replaceDialogManager, @NotNull final JFrame parent, @NotNull final GlobalSettings globalSettings, @NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final MapViewSettings mapViewSettings, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final CopyBuffer<G, A, R> copyBuffer, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final MapManager<G, A, R> mapManager, @NotNull final MapViewManager<G, A, R> mapViewManager, @NotNull final AbstractResources<G, A, R> resources, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final InsertionModeSet<G, A, R> insertionModeSet, @NotNull final Exiter exiter) {
+ public MainActions(@NotNull final FindDialogManager<G, A, R> findDialogManager, @NotNull final ReplaceDialogManager<G, A, R> replaceDialogManager, @NotNull final JFrame parent, @NotNull final GlobalSettings globalSettings, @NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final MapViewSettings mapViewSettings, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final CopyBuffer<G, A, R> copyBuffer, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final MapManager<G, A, R> mapManager, @NotNull final MapViewManager<G, A, R> mapViewManager, @NotNull final AbstractResources<G, A, R> resources, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final InsertionModeSet<G, A, R> insertionModeSet, @NotNull final Exiter exiter) {
+ this.findDialogManager = findDialogManager;
this.replaceDialogManager = replaceDialogManager;
this.parent = parent;
this.globalSettings = globalSettings;
@@ -450,6 +477,9 @@
aShiftSouthWest = ActionUtils.newAction(ACTION_BUILDER, "Map/Shift", this, "shiftSouthWest");
aShiftWest = ActionUtils.newAction(ACTION_BUILDER, "Map/Shift", this, "shiftWest");
aShiftNorthWest = ActionUtils.newAction(ACTION_BUILDER, "Map/Shift", this, "shiftNorthWest");
+ aFind = ActionUtils.newAction(ACTION_BUILDER, "Map", this, "find");
+ aFindNext = ActionUtils.newAction(ACTION_BUILDER, "Map", this, "findNext");
+ aFindPrev = ActionUtils.newAction(ACTION_BUILDER, "Map", this, "findPrev");
aReplace = ActionUtils.newAction(ACTION_BUILDER, "Map", this, "replace");
aFillAuto = ActionUtils.newAction(ACTION_BUILDER, "Map/Fill", this, "fillAuto");
aFillAbove = ActionUtils.newAction(ACTION_BUILDER, "Map/Fill", this, "fillAbove");
@@ -681,6 +711,9 @@
aShiftSouthWest.setEnabled(doShift(false, Direction.SOUTH_WEST));
aShiftWest.setEnabled(doShift(false, Direction.WEST));
aShiftNorthWest.setEnabled(doShift(false, Direction.NORTH_WEST));
+ aFind.setEnabled(doFind(false));
+ aFindNext.setEnabled(doFindNext(false));
+ aFindPrev.setEnabled(doFindPrev(false));
aReplace.setEnabled(doReplace(false));
aFillAuto.setEnabled(doFillAuto(false));
aFillAbove.setEnabled(doFillAbove(false));
@@ -804,6 +837,30 @@
}
/**
+ * "Find" was selected from the Edit menu.
+ */
+ @ActionMethod
+ public void find() {
+ doFind(true);
+ }
+
+ /**
+ * "Find next" was selected from the Edit menu.
+ */
+ @ActionMethod
+ public void findNext() {
+ doFindNext(true);
+ }
+
+ /**
+ * "Find previous" was selected from the Edit menu.
+ */
+ @ActionMethod
+ public void findPrev() {
+ doFindPrev(true);
+ }
+
+ /**
* "Replace" was selected from the Edit menu.
*/
@ActionMethod
@@ -943,6 +1000,44 @@
}
/**
+ * Executes the "find" action.
+ * @param performAction whether the action should be performed
+ * @return whether the action was or can be performed
+ */
+ private boolean doFind(final boolean performAction) {
+ final MapView<G, A, R> mapView = currentMapView;
+ if (mapView == null) {
+ return false;
+ }
+
+ if (performAction) {
+ findDialogManager.showDialog(mapView);
+ }
+
+ return true;
+ }
+
+ /**
+ * Executes the "find next" action.
+ * @param performAction whether the action should be performed
+ * @return whether the action was or can be performed
+ */
+ private boolean doFindNext(final boolean performAction) {
+ final MapView<G, A, R> mapView = currentMapView;
+ return mapView != null && findDialogManager.findNext(mapView, performAction);
+ }
+
+ /**
+ * Executes the "find prev" action.
+ * @param performAction whether the action should be performed
+ * @return whether the action was or can be performed
+ */
+ private boolean doFindPrev(final boolean performAction) {
+ final MapView<G, A, R> mapView = currentMapView;
+ return mapView != null && findDialogManager.findPrev(mapView, performAction);
+ }
+
+ /**
* Executes the "replace" action.
* @param performAction whether the action should be performed
* @return whether the action was or can be performed
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2011-11-12 10:49:07 UTC (rev 9106)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2011-11-12 10:52:09 UTC (rev 9107)
@@ -39,6 +39,7 @@
import net.sf.gridarta.gui.copybuffer.CopyBuffer;
import net.sf.gridarta.gui.delayedmapmodel.DelayedMapModelListenerManager;
import net.sf.gridarta.gui.dialog.bookmarks.BookmarkActions;
+import net.sf.gridarta.gui.dialog.find.FindDialogManager;
import net.sf.gridarta.gui.dialog.findarchetypes.FindArchetypesDialogManager;
import net.sf.gridarta.gui.dialog.gameobjectattributes.GameObjectAttributesDialogFactory;
import net.sf.gridarta.gui.dialog.goexit.GoExitDialogManager;
@@ -474,6 +475,7 @@
final GameObjectMatcher systemObjectMatcher = gameObjectMatchers.getMatcher("system_system_object");
final InsertionModeSet<G, A, R> insertionModeSet = new InsertionModeSet<G, A, R>(topmostInsertionMode, floorMatcher, wallMatcher, belowFloorMatcher, systemObjectMatcher);
final CopyBuffer<G, A, R> copyBuffer = new CopyBuffer<G, A, R>(mapViewSettings, gameObjectFactory, mapArchObjectFactory, mapModelFactory, insertionModeSet);
+ final FindDialogManager<G, A, R> findDialogManager = new FindDialogManager<G, A, R>(mainViewFrame, mapViewManager);
final ReplaceDialogManager<G, A, R> replaceDialogManager = new ReplaceDialogManager<G, A, R>(mainViewFrame, copyBuffer, objectChooser, mapViewManager, faceObjectProviders, insertionModeSet);
exiter = new DefaultExiter(mainViewFrame);
scriptEditControl = new ScriptEditControl(scriptFileFilter, scriptExtension, mainViewFrame, globalSettings.getMapsDirectory(), preferences, exiter);
@@ -519,7 +521,7 @@
//noinspection ResultOfObjectAllocationIgnored
new MapFileActions<G, A, R>(imageCreator2, mapManager, mapViewsManager, mapViewManager, fileControl, mainViewFrame);
//noinspection ResultOfObjectAllocationIgnored
- new MainActions<G, A, R>(replaceDialogManager, mainViewFrame, globalSettings, validators, mapViewSettings, archetypeSet, copyBuffer, objectChooser, mapManager, mapViewManager, resources, faceObjectProviders, insertionModeSet, exiter);
+ new MainActions<G, A, R>(findDialogManager, replaceDialogManager, mainViewFrame, globalSettings, validators, mapViewSettings, archetypeSet, copyBuffer, objectChooser, mapManager, mapViewManager, resources, faceObjectProviders, insertionModeSet, exiter);
final HelpActions helpActions = new HelpActions(mainViewFrame);
ActionUtils.newActions(ACTION_BUILDER, "Map", newMapDialogFactory, "newMap");
final GoMapDialogManager<G, A, R> goMapDialogManager = new GoMapDialogManager<G, A, R>(mainViewFrame, mapManager, mapViewsManager, globalSettings, exiter);
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2011-11-12 10:49:07 UTC (rev 9106)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2011-11-12 10:52:09 UTC (rev 9107)
@@ -570,6 +570,21 @@
mapOkay.text=Ok
mapCancel.text=Cancel
+#find dialog
+findTitle=Find on {0}
+findFind=Find:
+findFind.shortdescription=<html>Selects the text to find.
+findWhere=Where:
+findWhere.shortdescription=<html>Selects the categories to search.
+findWhereName='name' attribute
+findWhereArch=archetype name
+findWhereMsg='msg' attribute
+findWhereFace='face' or 'animation' attribute
+findWhereSlaying='slaying' attribute
+findWhereOther=any other attribute
+findOk.text=OK
+findCancel.text=Cancel
+
#replace
replaceTitle=Replace
replaceOn=On
@@ -782,16 +797,28 @@
shiftNorthWest.text=Shift Northwest
shiftNorthWest.shortdescription=Shifts the selected squares north west.
+find.text=Find
+find.shortdescription=Opens the find dialog.
+find.accel=ctrl pressed F
+
+findNext.text=Find Next
+findNext.shortdescription=Repeats the previous find operation.
+findNext.accel=pressed F3
+
+findPrev.text=Find Previous
+findPrev.shortdescription=Repeats the previous find operation.
+findPrev.accel=shift pressed F3
+
replace.text=Replace
replace.mnemonic=R
replace.shortdescription=Opens the replace dialog.
replace.accel=ctrl pressed R
fillAuto.text=Fill
-fillAuto.mnemonic=F
+fillAuto.mnemonic=alt pressed F
fillAuto.shortdescription=Fills the selected squares.
fillAuto.longdescription=Fills the selected squares. Existing floor game objects are replaced when filled with other floor game objects.
-fillAuto.accel=ctrl pressed F
+fillAuto.accel=ctrl shift pressed F
fillAbove.text=Fill Above
fillAbove.mnemonic=A
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2011-11-12 10:49:07 UTC (rev 9106)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2011-11-12 10:52:09 UTC (rev 9107)
@@ -545,6 +545,21 @@
mapOkay.text=OK
mapCancel.text=Abbrechen
+#find dialog
+findTitle=Suchen auf {0}
+findFind=Suche:
+findFind.shortdescription=<html>W\u00e4hlt den zu suchenden Text.
+findWhere=Wo:
+findWhere.shortdescription=<html>W\u00e4 die zu durchsuchende Kartegorie.
+findWhereName='name'-Attribut
+findWhereArch=Archetyp-Name
+findWhereMsg='msg'-Attribute
+findWhereFace='face'- oder 'animation'-Attribut
+findWhereSlaying='slaying'-Attribut
+findWhereOther=ein anderes Attribut
+findOk.text=OK
+findCancel.text=Abbrechen
+
#replace
replaceTitle=Ersetze
replaceOn=In
@@ -731,6 +746,15 @@
shiftNorthWest.text=Nach Nordwest verschieben
shiftNorthWest.shortdescription=Verschiebt die ausgew\u00e4hlten Felder nach Nordwest.
+find.text=Suchen
+find.shortdescription=\u00d6ffnet den Dialog zum Suchen von Objekten.
+
+findNext.text=Vorw\u00e4rts suchen
+findNext.shortdescription=Wiederholt den letzten Suchvorgang.
+
+findPrev.text=R\u00cfw\u00e4rts suchen
+findPrev.shortdescription=Wiederholt den letzten Suchvorgang.
+
replace.text=Ersetzen
replace.mnemonic=Z
replace.shortdescription=\u00d6ffnet den Dialog zum Ersetzen von Objekten.
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2011-11-12 10:49:07 UTC (rev 9106)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2011-11-12 10:52:09 UTC (rev 9107)
@@ -543,6 +543,21 @@
#mapOkay.text=
#mapCancel.text=
+#find dialog
+#findTitle=
+#findFind=
+#findFind.shortdescription=
+#findWhere=
+#findWhere.shortdescription=
+#findWhereName=
+#findWhereArch=
+#findWhereMsg=
+#findWhereFace=
+#findWhereSlaying=
+#findWhereOther=
+#findOk.text=
+#findCancel.text=
+
#replace
replaceTitle=Remplacer
replaceOn=Dans
@@ -727,6 +742,15 @@
shiftNorthWest.text=D\u00e9caler vers le nord-ouest
shiftNorthWest.shortdescription=D\u00e9cale la s\u00e9lection vers le nord-ouest.
+#find.text=
+#find.shortdescription=
+
+#findNext.text=
+#findNext.shortdescription=
+
+#findPrev.text=R
+#findPrev.shortdescription=
+
replace.text=Remplacer
replace.mnemonic=M
#replace.shortdescription=
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2011-11-12 10:49:07 UTC (rev 9106)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2011-11-12 10:52:09 UTC (rev 9107)
@@ -542,6 +542,21 @@
mapOkay.text=Ok
mapCancel.text=Avbryt
+#find dialog
+#findTitle=
+#findFind=
+#findFind.shortdescription=
+#findWhere=
+#findWhere.shortdescription=
+#findWhereName=
+#findWhereArch=
+#findWhereMsg=
+#findWhereFace=
+#findWhereSlaying=
+#findWhereOther=
+#findOk.text=
+#findCancel.text=
+
#replace
replaceTitle=Ers\u00e4tt
replaceOn=P\u00e5
@@ -729,6 +744,15 @@
#shiftNorthWest.text=
#shiftNorthWest.shortdescription=
+#find.text=
+#find.shortdescription=
+
+#findNext.text=
+#findNext.shortdescription=
+
+#findPrev.text=R
+#findPrev.shortdescription=
+
replace.text=Ers\u00e4tt
replace.mnemonic=E
#replace.shortdescription=
Modified: trunk/utils/src/app/net/sf/gridarta/utils/ActionBuilderUtils.java
===================================================================
--- trunk/utils/src/app/net/sf/gridarta/utils/ActionBuilderUtils.java 2011-11-12 10:49:07 UTC (rev 9106)
+++ trunk/utils/src/app/net/sf/gridarta/utils/ActionBuilderUtils.java 2011-11-12 10:52:09 UTC (rev 9107)
@@ -93,6 +93,22 @@
}
/**
+ * Returns the value of a key.
+ * @param actionBuilder the action builder to query
+ * @param key the key to query
+ * @param args the arguments to replace in the format string
+ * @return the value
+ */
+ @NotNull
+ public static String format(@NotNull final ActionBuilder actionBuilder, @NotNull final String key, @NotNull final Object... args) {
+ final String value = actionBuilder.format(key, args);
+ if (value == null) {
+ throw new MissingResourceException("missing resource key: " + key, ActionBuilderUtils.class.getName(), key);
+ }
+ return value;
+ }
+
+ /**
* Creates a new {@link JLabel} from a resource key.
* @param actionBuilder the action builder to query
* @param key the resource key
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-11-12 10:49:14
|
Revision: 9106
http://gridarta.svn.sourceforge.net/gridarta/?rev=9106&view=rev
Author: akirschbaum
Date: 2011-11-12 10:49:07 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
Allow partial object name matches in replace dialog.
Modified Paths:
--------------
trunk/model/src/app/net/sf/gridarta/model/select/ObjectNameMatchCriteria.java
Modified: trunk/model/src/app/net/sf/gridarta/model/select/ObjectNameMatchCriteria.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/select/ObjectNameMatchCriteria.java 2011-11-12 06:46:42 UTC (rev 9105)
+++ trunk/model/src/app/net/sf/gridarta/model/select/ObjectNameMatchCriteria.java 2011-11-12 10:49:07 UTC (rev 9106)
@@ -51,7 +51,7 @@
*/
@Override
public boolean matches(@NotNull final G gameObject) {
- return objectName.matcher(gameObject.getBestName()).matches();
+ return objectName.matcher(gameObject.getBestName()).find();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-11-12 06:46:49
|
Revision: 9105
http://gridarta.svn.sourceforge.net/gridarta/?rev=9105&view=rev
Author: akirschbaum
Date: 2011-11-12 06:46:42 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
Change default keybindings for cursor keys.
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties
trunk/crossfire/ChangeLog
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties
trunk/daimonin/ChangeLog
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties
trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java
trunk/src/app/net/sf/gridarta/messages.properties
trunk/utils/src/app/net/sf/gridarta/utils/ActionUtils.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-11-12 06:39:32 UTC (rev 9104)
+++ trunk/atrinik/ChangeLog 2011-11-12 06:46:42 UTC (rev 9105)
@@ -1,3 +1,18 @@
+2011-11-12 Andreas Kirschbaum
+
+ * Add default keybindings ALT-LEFT/RIGHT to move the selected game
+ object to its environment/into the inventory of the previous game
+ object.
+
+ * Add default keybindings ALT-UP/DOWN to select the previous/next
+ game object within the map square.
+
+ * Add default keybinding ALT-SHIFT-UP/DOWN to move the selected
+ game object UP/DOWN within the map square.
+
+ * Change default keybindings for cursor keys to move the map
+ cursor.
+
2011-11-05 Andreas Kirschbaum
* Replace "Revert Map" with "Reload Map". Now the current map can
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2011-11-12 06:39:32 UTC (rev 9104)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2011-11-12 06:46:42 UTC (rev 9105)
@@ -129,12 +129,16 @@
moveCursorNorth.accel=NUMPAD9
moveCursorNorthEast.accel=NUMPAD6
+moveCursorNorthEast.accel2=RIGHT
moveCursorEast.accel=NUMPAD3
moveCursorSouthEast.accel=NUMPAD2
+moveCursorSouthEast.accel2=DOWN
moveCursorSouth.accel=NUMPAD1
moveCursorSouthWest.accel=NUMPAD4
+moveCursorSouthWest.accel2=LEFT
moveCursorWest.accel=NUMPAD7
moveCursorNorthWest.accel=NUMPAD8
+moveCursorNorthWest.accel2=UP
#######
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2011-11-12 06:39:32 UTC (rev 9104)
+++ trunk/crossfire/ChangeLog 2011-11-12 06:46:42 UTC (rev 9105)
@@ -1,5 +1,18 @@
2011-11-12 Andreas Kirschbaum
+ * Add default keybindings ALT-LEFT/RIGHT to move the selected game
+ object to its environment/into the inventory of the previous game
+ object.
+
+ * Add default keybindings ALT-UP/DOWN to select the previous/next
+ game object within the map square.
+
+ * Add default keybinding ALT-SHIFT-UP/DOWN to move the selected
+ game object UP/DOWN within the map square.
+
+ * Change default keybindings for cursor keys to move the map
+ cursor.
+
* Add game object matcher 'Messages' that matches game objects
having a non-empty msg..endmsg attribute.
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties 2011-11-12 06:39:32 UTC (rev 9104)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties 2011-11-12 06:46:42 UTC (rev 9105)
@@ -119,12 +119,16 @@
# Cursor
moveCursorNorth.accel=NUMPAD8
+moveCursorNorth.accel2=UP
moveCursorNorthEast.accel=NUMPAD9
moveCursorEast.accel=NUMPAD6
+moveCursorEast.accel2=RIGHT
moveCursorSouthEast.accel=NUMPAD3
moveCursorSouth.accel=NUMPAD2
+moveCursorSouth.accel2=DOWN
moveCursorSouthWest.accel=NUMPAD1
moveCursorWest.accel=NUMPAD4
+moveCursorWest.accel2=LEFT
moveCursorNorthWest.accel=NUMPAD7
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2011-11-12 06:39:32 UTC (rev 9104)
+++ trunk/daimonin/ChangeLog 2011-11-12 06:46:42 UTC (rev 9105)
@@ -1,3 +1,18 @@
+2011-11-12 Andreas Kirschbaum
+
+ * Add default keybindings ALT-LEFT/RIGHT to move the selected game
+ object to its environment/into the inventory of the previous game
+ object.
+
+ * Add default keybindings ALT-UP/DOWN to select the previous/next
+ game object within the map square.
+
+ * Add default keybinding ALT-SHIFT-UP/DOWN to move the selected
+ game object UP/DOWN within the map square.
+
+ * Change default keybindings for cursor keys to move the map
+ cursor.
+
2011-11-05 Andreas Kirschbaum
* Replace "Revert Map" with "Reload Map". Now the current map can
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties 2011-11-12 06:39:32 UTC (rev 9104)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties 2011-11-12 06:46:42 UTC (rev 9105)
@@ -129,12 +129,16 @@
moveCursorNorth.accel=NUMPAD9
moveCursorNorthEast.accel=NUMPAD6
+moveCursorNorthEast.accel2=RIGHT
moveCursorEast.accel=NUMPAD3
moveCursorSouthEast.accel=NUMPAD2
+moveCursorSouthEast.accel2=DOWN
moveCursorSouth.accel=NUMPAD1
moveCursorSouthWest.accel=NUMPAD4
+moveCursorSouthWest.accel2=LEFT
moveCursorWest.accel=NUMPAD7
moveCursorNorthWest.accel=NUMPAD8
+moveCursorNorthWest.accel2=UP
#######
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java 2011-11-12 06:39:32 UTC (rev 9104)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java 2011-11-12 06:46:42 UTC (rev 9105)
@@ -25,13 +25,17 @@
import java.beans.PropertyVetoException;
import java.io.File;
import java.util.Set;
+import javax.swing.Action;
+import javax.swing.JComponent;
import javax.swing.JInternalFrame;
import javax.swing.JScrollPane;
+import javax.swing.KeyStroke;
import javax.swing.WindowConstants;
import net.sf.gridarta.gui.map.renderer.AbstractMapRenderer;
import net.sf.gridarta.gui.map.renderer.MapRenderer;
import net.sf.gridarta.gui.utils.MenuUtils;
import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.direction.Direction;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.io.PathManager;
import net.sf.gridarta.model.maparchobject.MapArchObject;
@@ -45,7 +49,10 @@
import net.sf.gridarta.model.mapmodel.MapModelListener;
import net.sf.gridarta.model.mapmodel.MapSquare;
import net.sf.gridarta.model.validation.ErrorCollector;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.gridarta.utils.Size2D;
+import net.sf.japi.swing.action.ActionBuilder;
+import net.sf.japi.swing.action.ActionBuilderFactory;
import org.apache.log4j.Category;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
@@ -63,6 +70,12 @@
private static final Category log = Logger.getLogger(DefaultMapView.class);
/**
+ * Action Builder to create Actions.
+ */
+ @NotNull
+ private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
+
+ /**
* The controller of this view.
*/
@NotNull
@@ -213,9 +226,38 @@
internalFrame.getContentPane().add(mapCursorTracker.getScrollPane(), BorderLayout.CENTER);
internalFrame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
internalFrame.setAutoscrolls(true);
+ internalFrame.setFocusable(true);
+ for (final Direction direction : Direction.values()) {
+ installAccelerator("moveCursor"+direction.getId());
+ }
+ installAccelerator("moveSquarePrev");
+ installAccelerator("moveSquareNext");
+ installAccelerator("moveSquareUp");
+ installAccelerator("moveSquareDown");
+ installAccelerator("moveSquareInv");
+ installAccelerator("moveSquareEnv");
}
/**
+ * Installs accelerator keys for an action.
+ * @param key the action's key
+ */
+ private void installAccelerator(@NotNull final String key) {
+ final Action action = ACTION_BUILDER.getAction(key);
+ if (action != null) {
+ final KeyStroke keyStroke1 = ActionUtils.getShortcut(action);
+ if (keyStroke1 != null) {
+ internalFrame.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(keyStroke1, key);
+ }
+ final KeyStroke keyStroke2 = ActionUtils.getAlternativeShortcut(action);
+ if (keyStroke2 != null) {
+ internalFrame.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(keyStroke2, key);
+ }
+ internalFrame.getActionMap().put(key, action);
+ }
+ }
+
+ /**
* {@inheritDoc}
*/
@Override
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2011-11-12 06:39:32 UTC (rev 9104)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2011-11-12 06:46:42 UTC (rev 9105)
@@ -1577,14 +1577,18 @@
moveSquareTop.shortdescription=Moves the selected game object to top of map square.
moveSquareUp.text=
moveSquareUp.shortdescription=Moves the selected game object up in map square.
+moveSquareUp.accel=alt shift pressed UP
moveSquareDown.text=
moveSquareDown.shortdescription=Moves the selected game object down in map square.
+moveSquareDown.accel=alt shift pressed DOWN
moveSquareBottom.text=
moveSquareBottom.shortdescription=Moves the selected game object to bottom of map square.
moveSquareInv.text=
moveSquareInv.shortdescription=Moves the selected game object into the inventory.
+moveSquareInv.accel=alt shift pressed RIGHT
moveSquareEnv.text=
moveSquareEnv.shortdescription=Moves the selected game object to its environment.
+moveSquareEnv.accel=alt shift pressed LEFT
###############
Modified: trunk/utils/src/app/net/sf/gridarta/utils/ActionUtils.java
===================================================================
--- trunk/utils/src/app/net/sf/gridarta/utils/ActionUtils.java 2011-11-12 06:39:32 UTC (rev 9104)
+++ trunk/utils/src/app/net/sf/gridarta/utils/ActionUtils.java 2011-11-12 06:46:42 UTC (rev 9105)
@@ -130,6 +130,16 @@
}
/**
+ * Returns the alternative shortcut of an {@link Action}.
+ * @param action the action
+ * @return the alternative shortcut or <code>null</code>
+ */
+ @Nullable
+ public static KeyStroke getAlternativeShortcut(@NotNull final Action action) {
+ return getShortcut(action, ActionBuilder.ACCELERATOR_KEY_2);
+ }
+
+ /**
* Returns the shortcut of an {@link Action}.
* @param action the action
* @param key the action key to query
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-11-12 06:39:39
|
Revision: 9104
http://gridarta.svn.sourceforge.net/gridarta/?rev=9104&view=rev
Author: akirschbaum
Date: 2011-11-12 06:39:32 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
Add game object matcher 'Messages' that matches game objects having a non-empty msg..endmsg attribute. [Crossfire]
Modified Paths:
--------------
trunk/crossfire/ChangeLog
trunk/crossfire/resource/resource/conf/GameObjectMatchers.xml
trunk/model/src/app/net/sf/gridarta/model/match/StringAttributeGameObjectMatcher.java
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2011-11-12 06:15:34 UTC (rev 9103)
+++ trunk/crossfire/ChangeLog 2011-11-12 06:39:32 UTC (rev 9104)
@@ -1,3 +1,8 @@
+2011-11-12 Andreas Kirschbaum
+
+ * Add game object matcher 'Messages' that matches game objects
+ having a non-empty msg..endmsg attribute.
+
2011-11-05 Andreas Kirschbaum
* Replace "Revert Map" with "Reload Map". Now the current map can
Modified: trunk/crossfire/resource/resource/conf/GameObjectMatchers.xml
===================================================================
--- trunk/crossfire/resource/resource/conf/GameObjectMatchers.xml 2011-11-12 06:15:34 UTC (rev 9103)
+++ trunk/crossfire/resource/resource/conf/GameObjectMatchers.xml 2011-11-12 06:39:32 UTC (rev 9104)
@@ -272,4 +272,13 @@
</And>
</GameObjectMatcher>
+ <!-- Objects having a non-empty msg..endmsg field -->
+ <GameObjectMatcher id="messages">
+ <title xml:lang="en">Messages</title>
+ <title xml:lang="de">Text</title>
+ <And>
+ <Attrib name="msg" op="ne" value=""/>
+ </And>
+ </GameObjectMatcher>
+
</GameObjectMatchers>
Modified: trunk/model/src/app/net/sf/gridarta/model/match/StringAttributeGameObjectMatcher.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/match/StringAttributeGameObjectMatcher.java 2011-11-12 06:15:34 UTC (rev 9103)
+++ trunk/model/src/app/net/sf/gridarta/model/match/StringAttributeGameObjectMatcher.java 2011-11-12 06:39:32 UTC (rev 9104)
@@ -73,7 +73,13 @@
*/
@Override
protected int compareValue(@NotNull final GameObject<?, ?, ?> gameObject) {
- final Comparable<String> actual = gameObject.getAttributeString(name, useDefArch);
+ final Comparable<String> actual;
+ if (name.equals("msg")) {
+ final String tmp = gameObject.getMsgText();
+ actual = tmp == null ? "" : tmp;
+ } else {
+ actual = gameObject.getAttributeString(name, useDefArch);
+ }
return actual.compareTo(value);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-11-12 06:15:45
|
Revision: 9103
http://gridarta.svn.sourceforge.net/gridarta/?rev=9103&view=rev
Author: akirschbaum
Date: 2011-11-12 06:15:34 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
Update stream from trunk.
Modified Paths:
--------------
streams/gui/atrinik/ChangeLog
streams/gui/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
streams/gui/crossfire/ChangeLog
streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
streams/gui/daimonin/ChangeLog
streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
streams/gui/src/app/net/sf/gridarta/action.properties
streams/gui/src/app/net/sf/gridarta/gui/map/MapFileActions.java
streams/gui/src/app/net/sf/gridarta/messages.properties
streams/gui/src/app/net/sf/gridarta/messages_de.properties
streams/gui/src/app/net/sf/gridarta/messages_fr.properties
streams/gui/src/app/net/sf/gridarta/messages_sv.properties
Property Changed:
----------------
streams/gui/
streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire/
streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin/
streams/gui/daimonin/src/test/net/sf/gridarta/var/daimonin/
streams/gui/lib/bsh-LICENSE
streams/gui/lib/bsh-classgen-2.0b4.jar
streams/gui/lib/bsh-commands-2.0b4.jar
streams/gui/lib/bsh-core-2.0b4.jar
streams/gui/lib/bsh-util-2.0b4.jar
streams/gui/lib/jdom.jar
streams/gui/lib/jdom.jar-LICENSE
streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java
streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java
streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/AttributeBitmask.java
streams/gui/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java
streams/gui/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java
streams/gui/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
streams/gui/resource/icons/CreateImageSmallIcon.gif
streams/gui/resource/icons/Dir1.gif
streams/gui/resource/icons/Dir2.gif
streams/gui/resource/icons/Dir3.gif
streams/gui/resource/icons/Dir4.gif
streams/gui/resource/icons/Dir5.gif
streams/gui/resource/icons/Dir6.gif
streams/gui/resource/icons/Dir7.gif
streams/gui/resource/icons/Dir8.gif
streams/gui/resource/icons/EditPluginSmallIcon.gif
streams/gui/resource/icons/EmptySmallIcon.gif
streams/gui/resource/icons/ImportPluginSmallIcon.gif
streams/gui/resource/icons/SaveMapAsSmallIcon.gif
streams/gui/resource/icons/auto_run_small_icon.gif
streams/gui/resource/icons/close_tab_small_icon.gif
streams/gui/resource/icons/development/Application24.gif
streams/gui/resource/icons/development/Host16.gif
streams/gui/resource/icons/development/Host24.gif
streams/gui/resource/icons/development/Jar16.gif
streams/gui/resource/icons/development/Server16.gif
streams/gui/resource/icons/development/Server24.gif
streams/gui/resource/icons/filter_small_icon.gif
streams/gui/resource/icons/general/About16.gif
streams/gui/resource/icons/general/Copy16.gif
streams/gui/resource/icons/general/Cut16.gif
streams/gui/resource/icons/general/Delete16.gif
streams/gui/resource/icons/general/Edit16.gif
streams/gui/resource/icons/general/Help16.gif
streams/gui/resource/icons/general/History16.gif
streams/gui/resource/icons/general/New16.gif
streams/gui/resource/icons/general/Open16.gif
streams/gui/resource/icons/general/Paste16.gif
streams/gui/resource/icons/general/Preferences16.gif
streams/gui/resource/icons/general/Preferences24.gif
streams/gui/resource/icons/general/Properties16.gif
streams/gui/resource/icons/general/Redo16.gif
streams/gui/resource/icons/general/Refresh16.gif
streams/gui/resource/icons/general/Remove16.gif
streams/gui/resource/icons/general/Replace16.gif
streams/gui/resource/icons/general/Save16.gif
streams/gui/resource/icons/general/Save24.gif
streams/gui/resource/icons/general/SaveAs16.gif
streams/gui/resource/icons/general/Search16.gif
streams/gui/resource/icons/general/TipOfTheDay16.gif
streams/gui/resource/icons/general/Undo16.gif
streams/gui/resource/icons/general/Zoom16.gif
streams/gui/resource/icons/media/
streams/gui/resource/icons/run_plugin_small_icon.gif
streams/gui/resource/log4j.properties
streams/gui/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialogFactory.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/CloseableTabbedPane.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/ClosingIcon.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginController.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManager.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManagerFactory.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginViewPane.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/StackLayout.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxCellRenderer.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxModel.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/FilterParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterCellRenderer.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterComboBoxModel.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterViewFactory.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/prefs/AppPreferences.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/prefs/DevPreferences.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/prefs/GUIPreferences.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/prefs/NetPreferences.java
streams/gui/src/app/net/sf/gridarta/gui/filter/
streams/gui/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/DuplicateMapFolderException.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/DuplicatePickmapException.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/InvalidNameException.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/Loader.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFile.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFileNameComparator.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolder.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderListener.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderNotEmptyException.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTree.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeAction.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeListener.java
streams/gui/src/app/net/sf/gridarta/gui/panel/archetypechooser/DisplayMode.java
streams/gui/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesControl.java
streams/gui/src/app/net/sf/gridarta/gui/panel/objectchoicedisplay/ObjectChoiceDisplay.java
streams/gui/src/app/net/sf/gridarta/gui/panel/objectchooser/DefaultObjectChooser.java
streams/gui/src/app/net/sf/gridarta/gui/panel/objectchooser/ObjectChooser.java
streams/gui/src/app/net/sf/gridarta/gui/utils/MenuUtils.java
streams/gui/utils/src/app/net/sf/gridarta/utils/ConfigFileUtils.java
streams/gui/utils/src/app/net/sf/gridarta/utils/GUIUtils.java
streams/gui/utils/src/app/net/sf/gridarta/utils/IOUtils.java
streams/gui/utils/src/app/net/sf/gridarta/utils/ProcessRunner.java
streams/gui/utils/src/app/net/sf/gridarta/utils/WrappingStringBuilder.java
streams/gui/utils/src/app/net/sf/gridarta/utils/XmlHelper.java
streams/gui/utils/src/test/net/sf/gridarta/utils/WrappingStringBuilderTest.java
Property changes on: streams/gui
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update:5966-5991
/trunk:2-5965,9094-9097
+ /streams/cher-japi-update:5966-5991
/trunk:2-5965,9094-9102
Modified: streams/gui/atrinik/ChangeLog
===================================================================
--- streams/gui/atrinik/ChangeLog 2011-11-11 20:33:55 UTC (rev 9102)
+++ streams/gui/atrinik/ChangeLog 2011-11-12 06:15:34 UTC (rev 9103)
@@ -1,3 +1,9 @@
+2011-11-05 Andreas Kirschbaum
+
+ * Replace "Revert Map" with "Reload Map". Now the current map can
+ be reloaded even if it is not modified. This allows to reload the
+ map when it has been changed externally.
+
2011-11-03 Andreas Kirschbaum
* Add default keybindings ALT-LEFT/RIGHT to move the selected game
Modified: streams/gui/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- streams/gui/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2011-11-11 20:33:55 UTC (rev 9102)
+++ streams/gui/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2011-11-12 06:15:34 UTC (rev 9103)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
-file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps revertMap createImage - options shortcuts - exit
+file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
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 - closeMap
+mapwindowFile.menu=saveMap saveMapAs createImage - reloadMap - closeMap
mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
mapwindowMap.menu=gridVisible - goExit 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: streams/gui/crossfire/ChangeLog
===================================================================
--- streams/gui/crossfire/ChangeLog 2011-11-11 20:33:55 UTC (rev 9102)
+++ streams/gui/crossfire/ChangeLog 2011-11-12 06:15:34 UTC (rev 9103)
@@ -3,6 +3,12 @@
* Add game object matcher 'Messages' that matches game objects
having a non-empty msg..endmsg attribute.
+2011-11-05 Andreas Kirschbaum
+
+ * Replace "Revert Map" with "Reload Map". Now the current map can
+ be reloaded even if it is not modified. This allows to reload the
+ map when it has been changed externally.
+
2011-11-03 Andreas Kirschbaum
* Add default keybindings ALT-LEFT/RIGHT to move the selected game
Property changes on: streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/crossfire/src/app/net/sf/gridarta/var/crossfire:5966-5991
/trunk/crossfire/src/app/net/sf/gridarta/var/crossfire:9094-9097
+ /streams/cher-japi-update/crossfire/src/app/net/sf/gridarta/var/crossfire:5966-5991
/trunk/crossfire/src/app/net/sf/gridarta/var/crossfire:9094-9102
Modified: streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2011-11-11 20:33:55 UTC (rev 9102)
+++ streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2011-11-12 06:15:34 UTC (rev 9103)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
-file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps revertMap createImage - options shortcuts - exit
+file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
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 - closeMap
+mapwindowFile.menu=saveMap saveMapAs createImage - reloadMap - closeMap
mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
mapwindowMap.menu=gridVisible smoothing - goExit 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: streams/gui/daimonin/ChangeLog
===================================================================
--- streams/gui/daimonin/ChangeLog 2011-11-11 20:33:55 UTC (rev 9102)
+++ streams/gui/daimonin/ChangeLog 2011-11-12 06:15:34 UTC (rev 9103)
@@ -1,3 +1,9 @@
+2011-11-05 Andreas Kirschbaum
+
+ * Replace "Revert Map" with "Reload Map". Now the current map can
+ be reloaded even if it is not modified. This allows to reload the
+ map when it has been changed externally.
+
2011-11-03 Andreas Kirschbaum
* Add default keybindings ALT-LEFT/RIGHT to move the selected game
Property changes on: streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/daimonin/src/app/net/sf/gridarta/var/daimonin:5966-5991
/trunk/daimonin/src/app/net/sf/gridarta/var/daimonin:9094-9097
+ /streams/cher-japi-update/daimonin/src/app/net/sf/gridarta/var/daimonin:5966-5991
/trunk/daimonin/src/app/net/sf/gridarta/var/daimonin:9094-9102
Modified: streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2011-11-11 20:33:55 UTC (rev 9102)
+++ streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2011-11-12 06:15:34 UTC (rev 9103)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
-file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps revertMap createImage - options shortcuts - exit
+file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
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 - closeMap
+mapwindowFile.menu=saveMap saveMapAs createImage - reloadMap - closeMap
mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
mapwindowMap.menu=gridVisible - goExit 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
Property changes on: streams/gui/daimonin/src/test/net/sf/gridarta/var/daimonin
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/daimonin/src/test/net/sf/gridarta/var/daimonin:5966-5991
/trunk/daimonin/src/test/net/sf/gridarta/var/daimonin:9094-9097
+ /streams/cher-japi-update/daimonin/src/test/net/sf/gridarta/var/daimonin:5966-5991
/trunk/daimonin/src/test/net/sf/gridarta/var/daimonin:9094-9102
Property changes on: streams/gui/lib/bsh-LICENSE
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/bsh-LICENSE:5966-5991
/trunk/lib/bsh-LICENSE:9094-9097
+ /streams/cher-japi-update/lib/bsh-LICENSE:5966-5991
/trunk/lib/bsh-LICENSE:9094-9102
Property changes on: streams/gui/lib/bsh-classgen-2.0b4.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/bsh-classgen-2.0b4.jar:5966-5991
/trunk/lib/bsh-classgen-2.0b4.jar:9094-9097
+ /streams/cher-japi-update/lib/bsh-classgen-2.0b4.jar:5966-5991
/trunk/lib/bsh-classgen-2.0b4.jar:9094-9102
Property changes on: streams/gui/lib/bsh-commands-2.0b4.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/bsh-commands-2.0b4.jar:5966-5991
/trunk/lib/bsh-commands-2.0b4.jar:9094-9097
+ /streams/cher-japi-update/lib/bsh-commands-2.0b4.jar:5966-5991
/trunk/lib/bsh-commands-2.0b4.jar:9094-9102
Property changes on: streams/gui/lib/bsh-core-2.0b4.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/bsh-core-2.0b4.jar:5966-5991
/trunk/lib/bsh-core-2.0b4.jar:9094-9097
+ /streams/cher-japi-update/lib/bsh-core-2.0b4.jar:5966-5991
/trunk/lib/bsh-core-2.0b4.jar:9094-9102
Property changes on: streams/gui/lib/bsh-util-2.0b4.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/bsh-util-2.0b4.jar:5966-5991
/trunk/lib/bsh-util-2.0b4.jar:9094-9097
+ /streams/cher-japi-update/lib/bsh-util-2.0b4.jar:5966-5991
/trunk/lib/bsh-util-2.0b4.jar:9094-9102
Property changes on: streams/gui/lib/jdom.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/jdom.jar:5966-5991
/trunk/lib/jdom.jar:9094-9097
+ /streams/cher-japi-update/lib/jdom.jar:5966-5991
/trunk/lib/jdom.jar:9094-9102
Property changes on: streams/gui/lib/jdom.jar-LICENSE
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/jdom.jar-LICENSE:5966-5991
/trunk/lib/jdom.jar-LICENSE:9094-9097
+ /streams/cher-japi-update/lib/jdom.jar-LICENSE:5966-5991
/trunk/lib/jdom.jar-LICENSE:9094-9102
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeAttribute.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeAttribute.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java:9094-9102
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeType.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeType.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java:9094-9102
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeTypeSet.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeTypeSet.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java:9094-9102
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/AttributeBitmask.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/CAttribBitmask.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/AttributeBitmask.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/CAttribBitmask.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/AttributeBitmask.java:9094-9102
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/autojoin/AutojoinList.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/autojoin/AutojoinList.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java:9094-9102
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/autojoin/AutojoinLists.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/autojoin/AutojoinLists.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java:9094-9102
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gameobject/DefaultGameObject.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gameobject/DefaultGameObject.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java:9094-9102
Property changes on: streams/gui/resource/icons/CreateImageSmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/CreateImageSmallIcon.gif:5966-5991
/trunk/resource/icons/CreateImageSmallIcon.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/CreateImageSmallIcon.gif:5966-5991
/trunk/resource/icons/CreateImageSmallIcon.gif:9094-9102
Property changes on: streams/gui/resource/icons/Dir1.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir1.gif:5966-5991
/trunk/resource/icons/Dir1.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/Dir1.gif:5966-5991
/trunk/resource/icons/Dir1.gif:9094-9102
Property changes on: streams/gui/resource/icons/Dir2.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir2.gif:5966-5991
/trunk/resource/icons/Dir2.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/Dir2.gif:5966-5991
/trunk/resource/icons/Dir2.gif:9094-9102
Property changes on: streams/gui/resource/icons/Dir3.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir3.gif:5966-5991
/trunk/resource/icons/Dir3.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/Dir3.gif:5966-5991
/trunk/resource/icons/Dir3.gif:9094-9102
Property changes on: streams/gui/resource/icons/Dir4.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir4.gif:5966-5991
/trunk/resource/icons/Dir4.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/Dir4.gif:5966-5991
/trunk/resource/icons/Dir4.gif:9094-9102
Property changes on: streams/gui/resource/icons/Dir5.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir5.gif:5966-5991
/trunk/resource/icons/Dir5.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/Dir5.gif:5966-5991
/trunk/resource/icons/Dir5.gif:9094-9102
Property changes on: streams/gui/resource/icons/Dir6.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir6.gif:5966-5991
/trunk/resource/icons/Dir6.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/Dir6.gif:5966-5991
/trunk/resource/icons/Dir6.gif:9094-9102
Property changes on: streams/gui/resource/icons/Dir7.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir7.gif:5966-5991
/trunk/resource/icons/Dir7.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/Dir7.gif:5966-5991
/trunk/resource/icons/Dir7.gif:9094-9102
Property changes on: streams/gui/resource/icons/Dir8.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir8.gif:5966-5991
/trunk/resource/icons/Dir8.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/Dir8.gif:5966-5991
/trunk/resource/icons/Dir8.gif:9094-9102
Property changes on: streams/gui/resource/icons/EditPluginSmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/EditPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/EditPluginSmallIcon.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/EditPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/EditPluginSmallIcon.gif:9094-9102
Property changes on: streams/gui/resource/icons/EmptySmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/EmptySmallIcon.gif:5966-5991
/trunk/resource/icons/EmptySmallIcon.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/EmptySmallIcon.gif:5966-5991
/trunk/resource/icons/EmptySmallIcon.gif:9094-9102
Property changes on: streams/gui/resource/icons/ImportPluginSmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/ImportPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/ImportPluginSmallIcon.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/ImportPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/ImportPluginSmallIcon.gif:9094-9102
Property changes on: streams/gui/resource/icons/SaveMapAsSmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/SaveLevelAsSmallIcon.gif:5966-5991
/trunk/resource/icons/SaveMapAsSmallIcon.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/SaveLevelAsSmallIcon.gif:5966-5991
/trunk/resource/icons/SaveMapAsSmallIcon.gif:9094-9102
Property changes on: streams/gui/resource/icons/auto_run_small_icon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/AutorunSmallIcon.gif:5966-5991
/trunk/resource/icons/auto_run_small_icon.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/AutorunSmallIcon.gif:5966-5991
/trunk/resource/icons/auto_run_small_icon.gif:9094-9102
Property changes on: streams/gui/resource/icons/close_tab_small_icon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/CloseTabSmallIcon.gif:5966-5991
/trunk/resource/icons/close_tab_small_icon.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/CloseTabSmallIcon.gif:5966-5991
/trunk/resource/icons/close_tab_small_icon.gif:9094-9102
Property changes on: streams/gui/resource/icons/development/Application24.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Application24.gif:5966-5991
/trunk/resource/icons/development/Application24.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/development/Application24.gif:5966-5991
/trunk/resource/icons/development/Application24.gif:9094-9102
Property changes on: streams/gui/resource/icons/development/Host16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Host16.gif:5966-5991
/trunk/resource/icons/development/Host16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/development/Host16.gif:5966-5991
/trunk/resource/icons/development/Host16.gif:9094-9102
Property changes on: streams/gui/resource/icons/development/Host24.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Host24.gif:5966-5991
/trunk/resource/icons/development/Host24.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/development/Host24.gif:5966-5991
/trunk/resource/icons/development/Host24.gif:9094-9102
Property changes on: streams/gui/resource/icons/development/Jar16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Jar16.gif:5966-5991
/trunk/resource/icons/development/Jar16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/development/Jar16.gif:5966-5991
/trunk/resource/icons/development/Jar16.gif:9094-9102
Property changes on: streams/gui/resource/icons/development/Server16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Server16.gif:5966-5991
/trunk/resource/icons/development/Server16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/development/Server16.gif:5966-5991
/trunk/resource/icons/development/Server16.gif:9094-9102
Property changes on: streams/gui/resource/icons/development/Server24.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Server24.gif:5966-5991
/trunk/resource/icons/development/Server24.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/development/Server24.gif:5966-5991
/trunk/resource/icons/development/Server24.gif:9094-9102
Property changes on: streams/gui/resource/icons/filter_small_icon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/FilterSmallIcon.gif:5966-5991
/trunk/resource/icons/filter_small_icon.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/FilterSmallIcon.gif:5966-5991
/trunk/resource/icons/filter_small_icon.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/About16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/About16.gif:5966-5991
/trunk/resource/icons/general/About16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/About16.gif:5966-5991
/trunk/resource/icons/general/About16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Copy16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Copy16.gif:5966-5991
/trunk/resource/icons/general/Copy16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Copy16.gif:5966-5991
/trunk/resource/icons/general/Copy16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Cut16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Cut16.gif:5966-5991
/trunk/resource/icons/general/Cut16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Cut16.gif:5966-5991
/trunk/resource/icons/general/Cut16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Delete16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Delete16.gif:5966-5991
/trunk/resource/icons/general/Delete16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Delete16.gif:5966-5991
/trunk/resource/icons/general/Delete16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Edit16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Edit16.gif:5966-5991
/trunk/resource/icons/general/Edit16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Edit16.gif:5966-5991
/trunk/resource/icons/general/Edit16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Help16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Help16.gif:5966-5991
/trunk/resource/icons/general/Help16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Help16.gif:5966-5991
/trunk/resource/icons/general/Help16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/History16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/History16.gif:5966-5991
/trunk/resource/icons/general/History16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/History16.gif:5966-5991
/trunk/resource/icons/general/History16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/New16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/New16.gif:5966-5991
/trunk/resource/icons/general/New16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/New16.gif:5966-5991
/trunk/resource/icons/general/New16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Open16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Open16.gif:5966-5991
/trunk/resource/icons/general/Open16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Open16.gif:5966-5991
/trunk/resource/icons/general/Open16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Paste16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Paste16.gif:5966-5991
/trunk/resource/icons/general/Paste16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Paste16.gif:5966-5991
/trunk/resource/icons/general/Paste16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Preferences16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Preferences16.gif:5966-5991
/trunk/resource/icons/general/Preferences16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Preferences16.gif:5966-5991
/trunk/resource/icons/general/Preferences16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Preferences24.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Preferences24.gif:5966-5991
/trunk/resource/icons/general/Preferences24.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Preferences24.gif:5966-5991
/trunk/resource/icons/general/Preferences24.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Properties16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Properties16.gif:5966-5991
/trunk/resource/icons/general/Properties16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Properties16.gif:5966-5991
/trunk/resource/icons/general/Properties16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Redo16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Redo16.gif:5966-5991
/trunk/resource/icons/general/Redo16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Redo16.gif:5966-5991
/trunk/resource/icons/general/Redo16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Refresh16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Refresh16.gif:5966-5991
/trunk/resource/icons/general/Refresh16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Refresh16.gif:5966-5991
/trunk/resource/icons/general/Refresh16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Remove16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Remove16.gif:5966-5991
/trunk/resource/icons/general/Remove16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Remove16.gif:5966-5991
/trunk/resource/icons/general/Remove16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Replace16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Replace16.gif:5966-5991
/trunk/resource/icons/general/Replace16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Replace16.gif:5966-5991
/trunk/resource/icons/general/Replace16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Save16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Save16.gif:5966-5991
/trunk/resource/icons/general/Save16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Save16.gif:5966-5991
/trunk/resource/icons/general/Save16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Save24.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Save24.gif:5966-5991
/trunk/resource/icons/general/Save24.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Save24.gif:5966-5991
/trunk/resource/icons/general/Save24.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/SaveAs16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/SaveAs16.gif:5966-5991
/trunk/resource/icons/general/SaveAs16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/SaveAs16.gif:5966-5991
/trunk/resource/icons/general/SaveAs16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Search16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Search16.gif:5966-5991
/trunk/resource/icons/general/Search16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Search16.gif:5966-5991
/trunk/resource/icons/general/Search16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/TipOfTheDay16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/TipOfTheDay16.gif:5966-5991
/trunk/resource/icons/general/TipOfTheDay16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/TipOfTheDay16.gif:5966-5991
/trunk/resource/icons/general/TipOfTheDay16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Undo16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Undo16.gif:5966-5991
/trunk/resource/icons/general/Undo16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Undo16.gif:5966-5991
/trunk/resource/icons/general/Undo16.gif:9094-9102
Property changes on: streams/gui/resource/icons/general/Zoom16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Zoom16.gif:5966-5991
/trunk/resource/icons/general/Zoom16.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/general/Zoom16.gif:5966-5991
/trunk/resource/icons/general/Zoom16.gif:9094-9102
Property changes on: streams/gui/resource/icons/media
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/media:5966-5991
/trunk/resource/icons/media:9094-9097
+ /streams/cher-japi-update/resource/icons/media:5966-5991
/trunk/resource/icons/media:9094-9102
Property changes on: streams/gui/resource/icons/run_plugin_small_icon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/RunPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/run_plugin_small_icon.gif:9094-9097
+ /streams/cher-japi-update/resource/icons/RunPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/run_plugin_small_icon.gif:9094-9102
Property changes on: streams/gui/resource/log4j.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/crossfire/resource/log4j.properties:5966-5991
/trunk/resource/log4j.properties:9094-9097
+ /streams/cher-japi-update/crossfire/resource/log4j.properties:5966-5991
/trunk/resource/log4j.properties:9094-9102
Modified: streams/gui/src/app/net/sf/gridarta/action.properties
===================================================================
--- streams/gui/src/app/net/sf/gridarta/action.properties 2011-11-11 20:33:55 UTC (rev 9102)
+++ streams/gui/src/app/net/sf/gridarta/action.properties 2011-11-12 06:15:34 UTC (rev 9103)
@@ -39,7 +39,7 @@
createImage.icon=CreateImageSmallIcon
-revertMap.icon=general/Refresh16
+reloadMap.icon=general/Refresh16
closeMap.icon=EmptySmallIcon
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttribBitmask.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttribBitmask.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialogFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialogFactory.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialogFactory.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/CloseableTabbedPane.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/CloseableTabbedPane.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/CloseableTabbedPane.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/CloseableTabbedPane.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/CloseableTabbedPane.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/ClosingIcon.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ClosingIcon.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/ClosingIcon.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ClosingIcon.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/ClosingIcon.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginController.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/script/ScriptController.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginController.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/script/ScriptController.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginController.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptEditor.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptEditor.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptManager.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManager.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptManager.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManager.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManagerFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManagerFactory.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManagerFactory.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginView.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginView.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginViewPane.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptViewPane.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginViewPane.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptViewPane.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginViewPane.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/StackLayout.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/StackLayout.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/StackLayout.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/StackLayout.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/StackLayout.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBox.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBox.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxCellRenderer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxCellRenderer.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxCellRenderer.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxCellRenderer.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxCellRenderer.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxEditor.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxEditor.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxModel.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxModel.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxModel.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxModel.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxModel.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/BooleanParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/BooleanParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/DoubleParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/DoubleParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/FilterParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/FilterParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/FilterParameterView.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/FilterParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/FilterParameterView.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/IntegerParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/IntegerParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterCellRenderer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/MapParameterCellRenderer.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterCellRenderer.java:9094-9097
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/MapParameterCellRenderer.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterCellRenderer.java:9094-9102
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterComboBoxModel.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/MapParameter...
[truncated message content] |
|
From: <aki...@us...> - 2011-11-11 20:34:01
|
Revision: 9102
http://gridarta.svn.sourceforge.net/gridarta/?rev=9102&view=rev
Author: akirschbaum
Date: 2011-11-11 20:33:55 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
Add game object matcher 'Messages' that matches game objects having a non-empty msg..endmsg attribute. [Crossfire]
Modified Paths:
--------------
streams/gui/crossfire/ChangeLog
streams/gui/crossfire/resource/resource/conf/GameObjectMatchers.xml
streams/gui/model/src/app/net/sf/gridarta/model/match/StringAttributeGameObjectMatcher.java
Modified: streams/gui/crossfire/ChangeLog
===================================================================
--- streams/gui/crossfire/ChangeLog 2011-11-05 15:38:03 UTC (rev 9101)
+++ streams/gui/crossfire/ChangeLog 2011-11-11 20:33:55 UTC (rev 9102)
@@ -1,3 +1,8 @@
+2011-11-11 Andreas Kirschbaum
+
+ * Add game object matcher 'Messages' that matches game objects
+ having a non-empty msg..endmsg attribute.
+
2011-11-03 Andreas Kirschbaum
* Add default keybindings ALT-LEFT/RIGHT to move the selected game
Modified: streams/gui/crossfire/resource/resource/conf/GameObjectMatchers.xml
===================================================================
--- streams/gui/crossfire/resource/resource/conf/GameObjectMatchers.xml 2011-11-05 15:38:03 UTC (rev 9101)
+++ streams/gui/crossfire/resource/resource/conf/GameObjectMatchers.xml 2011-11-11 20:33:55 UTC (rev 9102)
@@ -272,4 +272,13 @@
</And>
</GameObjectMatcher>
+ <!-- Objects having a non-empty msg..endmsg field -->
+ <GameObjectMatcher id="messages">
+ <title xml:lang="en">Messages</title>
+ <title xml:lang="de">Text</title>
+ <And>
+ <Attrib name="msg" op="ne" value=""/>
+ </And>
+ </GameObjectMatcher>
+
</GameObjectMatchers>
Modified: streams/gui/model/src/app/net/sf/gridarta/model/match/StringAttributeGameObjectMatcher.java
===================================================================
--- streams/gui/model/src/app/net/sf/gridarta/model/match/StringAttributeGameObjectMatcher.java 2011-11-05 15:38:03 UTC (rev 9101)
+++ streams/gui/model/src/app/net/sf/gridarta/model/match/StringAttributeGameObjectMatcher.java 2011-11-11 20:33:55 UTC (rev 9102)
@@ -73,7 +73,13 @@
*/
@Override
protected int compareValue(@NotNull final GameObject<?, ?, ?> gameObject) {
- final Comparable<String> actual = gameObject.getAttributeString(name, useDefArch);
+ final Comparable<String> actual;
+ if (name.equals("msg")) {
+ final String tmp = gameObject.getMsgText();
+ actual = tmp == null ? "" : tmp;
+ } else {
+ actual = gameObject.getAttributeString(name, useDefArch);
+ }
return actual.compareTo(value);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-11-05 15:38:10
|
Revision: 9101
http://gridarta.svn.sourceforge.net/gridarta/?rev=9101&view=rev
Author: akirschbaum
Date: 2011-11-05 15:38:03 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
Replace "Revert Map" with "Reload Map".
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
trunk/crossfire/ChangeLog
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
trunk/daimonin/ChangeLog
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/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-11-03 17:52:27 UTC (rev 9100)
+++ trunk/atrinik/ChangeLog 2011-11-05 15:38:03 UTC (rev 9101)
@@ -1,3 +1,9 @@
+2011-11-05 Andreas Kirschbaum
+
+ * Replace "Revert Map" with "Reload Map". Now the current map can
+ be reloaded even if it is not modified. This allows to reload the
+ map when it has been changed externally.
+
2011-10-30 Andreas Kirschbaum
* Set the map cursor and select the affected game object for
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2011-11-03 17:52:27 UTC (rev 9100)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2011-11-05 15:38:03 UTC (rev 9101)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
-file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps revertMap createImage - options shortcuts - exit
+file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
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 - closeMap
+mapwindowFile.menu=saveMap saveMapAs createImage - reloadMap - closeMap
mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
mapwindowMap.menu=gridVisible - goExit 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/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2011-11-03 17:52:27 UTC (rev 9100)
+++ trunk/crossfire/ChangeLog 2011-11-05 15:38:03 UTC (rev 9101)
@@ -1,3 +1,9 @@
+2011-11-05 Andreas Kirschbaum
+
+ * Replace "Revert Map" with "Reload Map". Now the current map can
+ be reloaded even if it is not modified. This allows to reload the
+ map when it has been changed externally.
+
2011-10-30 Andreas Kirschbaum
* Set the map cursor and select the affected game object for
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2011-11-03 17:52:27 UTC (rev 9100)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2011-11-05 15:38:03 UTC (rev 9101)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
-file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps revertMap createImage - options shortcuts - exit
+file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
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 - closeMap
+mapwindowFile.menu=saveMap saveMapAs createImage - reloadMap - closeMap
mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
mapwindowMap.menu=gridVisible smoothing - goExit 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/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2011-11-03 17:52:27 UTC (rev 9100)
+++ trunk/daimonin/ChangeLog 2011-11-05 15:38:03 UTC (rev 9101)
@@ -1,3 +1,9 @@
+2011-11-05 Andreas Kirschbaum
+
+ * Replace "Revert Map" with "Reload Map". Now the current map can
+ be reloaded even if it is not modified. This allows to reload the
+ map when it has been changed externally.
+
2011-10-30 Andreas Kirschbaum
* Set the map cursor and select the affected game object for
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2011-11-03 17:52:27 UTC (rev 9100)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2011-11-05 15:38:03 UTC (rev 9101)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
-file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps revertMap createImage - options shortcuts - exit
+file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
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 - closeMap
+mapwindowFile.menu=saveMap saveMapAs createImage - reloadMap - closeMap
mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
mapwindowMap.menu=gridVisible - goExit 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 2011-11-03 17:52:27 UTC (rev 9100)
+++ trunk/src/app/net/sf/gridarta/action.properties 2011-11-05 15:38:03 UTC (rev 9101)
@@ -39,7 +39,7 @@
createImage.icon=CreateImageSmallIcon
-revertMap.icon=general/Refresh16
+reloadMap.icon=general/Refresh16
closeMap.icon=EmptySmallIcon
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2011-11-03 17:52:27 UTC (rev 9100)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2011-11-05 15:38:03 UTC (rev 9101)
@@ -110,10 +110,10 @@
private final Action aCreateImage = ActionUtils.newAction(ACTION_BUILDER, "Map,Image", this, "createImage");
/**
- * The action for "revert map".
+ * The action for "reload map".
*/
@NotNull
- private final Action aRevertMap = ActionUtils.newAction(ACTION_BUILDER, "Map", this, "revertMap");
+ private final Action aReloadMap = ActionUtils.newAction(ACTION_BUILDER, "Map", this, "reloadMap");
/**
* The action for "close map".
@@ -281,7 +281,7 @@
aSaveMap.setEnabled(doSaveMap(false));
aSaveMapAs.setEnabled(doSaveMapAs(false));
aCreateImage.setEnabled(doCreateImage(false));
- aRevertMap.setEnabled(doRevertMap(false));
+ aReloadMap.setEnabled(doReloadMap(false));
aCloseMap.setEnabled(doCloseMap(false));
}
@@ -310,12 +310,12 @@
}
/**
- * Invoked when the user wants to revert the map to the previously saved
+ * Invoked when the user wants to reload the map to the previously saved
* state.
*/
@ActionMethod
- public void revertMap() {
- doRevertMap(true);
+ public void reloadMap() {
+ doReloadMap(true);
}
/**
@@ -386,22 +386,17 @@
}
/**
- * Executes the "revert map" action.
+ * Executes the "reload map" action.
* @param performAction whether the action should be performed
* @return whether the action was or can be performed
*/
- private boolean doRevertMap(final boolean performAction) {
+ private boolean doReloadMap(final boolean performAction) {
final MapControl<G, A, R> mapControl = currentMapControl;
if (mapControl == null) {
return false;
}
- final MapModel<G, A, R> mapModel = mapControl.getMapModel();
- if (!mapModel.isModified()) {
- return false;
- }
-
- final File mapFile = mapModel.getMapFile();
+ final File mapFile = mapControl.getMapModel().getMapFile();
if (mapFile == null) {
return false;
}
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2011-11-03 17:52:27 UTC (rev 9100)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2011-11-05 15:38:03 UTC (rev 9101)
@@ -684,10 +684,10 @@
createImage.shortdescription=Saves an image of the current map to a file.
createImage.error.text=Error while creating snapshot image
-revertMap.text=Revert Map
-revertMap.mnemonic=R
-revertMap.shortdescription=Reverts the current map from its last saved state.
-revertMap.error.text=Error while reverting map
+reloadMap.text=Reload Map
+reloadMap.mnemonic=R
+reloadMap.shortdescription=Reloads the current map from its last saved state.
+reloadMap.error.text=Error while reloading map
closeMap.text=Close Map
closeMap.mnemonic=C
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2011-11-03 17:52:27 UTC (rev 9100)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2011-11-05 15:38:03 UTC (rev 9101)
@@ -642,10 +642,10 @@
createImage.shortdescription=Speichert ein Bild der aktiven Karte.
createImage.error.text=Fehler beim Bild speichern
-revertMap.text=Karte zur\u00fccksetzen
-revertMap.mnemonic=R
-revertMap.shortdescription=Nimmt alle \u00c4nderungen der aktiven Karte zur\u00fcck und stellt die zuletzt gespeicherte Fassung wieder her.
-revertMap.error.text=Fehler beim Zur\u00fccksetzen
+reloadMap.text=Karte neu laden
+reloadMap.mnemonic=R
+reloadMap.shortdescription=Nimmt alle \u00c4nderungen der aktiven Karte zur\u00fcck und stellt die zuletzt gespeicherte Fassung wieder her.
+rrloadMap.error.text=Fehler beim Neuladen
closeMap.text=Karte schie\u00dfen
closeMap.mnemonic=C
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2011-11-03 17:52:27 UTC (rev 9100)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2011-11-05 15:38:03 UTC (rev 9101)
@@ -640,10 +640,10 @@
createImage.mnemonic=I
createImage.error.text=Erreur lors de la cr\u00e9ation d''une image.
-revertMap.text=Restaurer
-revertMap.shortdescription=Restaure la carte selon la derni\u00e8re version enregistr\u00e9e.
-revertMap.mnemonic=R
-revertMap.error.text=Erreur lors de la restauration de la carte.
+#reloadMap.text=Restaurer
+#reloadMap.shortdescription=Restaure la carte selon la derni\u00e8re version enregistr\u00e9e.
+#reloadMap.mnemonic=R
+#reloadMap.error.text=Erreur lors de la restauration de la carte.
closeMap.text=Fermer
closeMap.shortdescription=Ferme la carte active.
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2011-11-03 17:52:27 UTC (rev 9100)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2011-11-05 15:38:03 UTC (rev 9101)
@@ -642,10 +642,10 @@
createImage.mnemonic=B
createImage.error.text=Kunde inte spara bilden
-revertMap.text=\u00c5terst\u00e4ll
-revertMap.shortdescription=\u00c5terst\u00e4ller kartan till den senast sparade versionen
-revertMap.mnemonic=R
-revertMap.error.text=Kunde inte \u00e5terst\u00e4lla kartan
+#reloadMap.text=\u00c5terst\u00e4ll
+#reloadMap.shortdescription=\u00c5terst\u00e4ller kartan till den senast sparade versionen
+#reloadMap.mnemonic=R
+#reloadMap.error.text=Kunde inte \u00e5terst\u00e4lla kartan
closeMap.text=St\u00e4ng
closeMap.shortdescription=St\u00e4nger den aktuella kartan
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-11-03 17:52:34
|
Revision: 9100
http://gridarta.svn.sourceforge.net/gridarta/?rev=9100&view=rev
Author: akirschbaum
Date: 2011-11-03 17:52:27 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
Add default keybindings ALT-LEFT/RIGHT to move the selected game object to its environment/into the inventory of the previous game object.
Modified Paths:
--------------
streams/gui/atrinik/ChangeLog
streams/gui/crossfire/ChangeLog
streams/gui/daimonin/ChangeLog
streams/gui/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java
streams/gui/src/app/net/sf/gridarta/messages.properties
Modified: streams/gui/atrinik/ChangeLog
===================================================================
--- streams/gui/atrinik/ChangeLog 2011-11-03 17:47:48 UTC (rev 9099)
+++ streams/gui/atrinik/ChangeLog 2011-11-03 17:52:27 UTC (rev 9100)
@@ -1,5 +1,9 @@
2011-11-03 Andreas Kirschbaum
+ * Add default keybindings ALT-LEFT/RIGHT to move the selected game
+ object to its environment/into the inventory of the previous game
+ object.
+
* Add default keybindings ALT-UP/DOWN to select the previous/next
game object within the map square.
Modified: streams/gui/crossfire/ChangeLog
===================================================================
--- streams/gui/crossfire/ChangeLog 2011-11-03 17:47:48 UTC (rev 9099)
+++ streams/gui/crossfire/ChangeLog 2011-11-03 17:52:27 UTC (rev 9100)
@@ -1,5 +1,9 @@
2011-11-03 Andreas Kirschbaum
+ * Add default keybindings ALT-LEFT/RIGHT to move the selected game
+ object to its environment/into the inventory of the previous game
+ object.
+
* Add default keybindings ALT-UP/DOWN to select the previous/next
game object within the map square.
Modified: streams/gui/daimonin/ChangeLog
===================================================================
--- streams/gui/daimonin/ChangeLog 2011-11-03 17:47:48 UTC (rev 9099)
+++ streams/gui/daimonin/ChangeLog 2011-11-03 17:52:27 UTC (rev 9100)
@@ -1,5 +1,9 @@
2011-11-03 Andreas Kirschbaum
+ * Add default keybindings ALT-LEFT/RIGHT to move the selected game
+ object to its environment/into the inventory of the previous game
+ object.
+
* Add default keybindings ALT-UP/DOWN to select the previous/next
game object within the map square.
Modified: streams/gui/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java
===================================================================
--- streams/gui/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java 2011-11-03 17:47:48 UTC (rev 9099)
+++ streams/gui/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java 2011-11-03 17:52:27 UTC (rev 9100)
@@ -234,6 +234,8 @@
installAccelerator("moveSquareNext");
installAccelerator("moveSquareUp");
installAccelerator("moveSquareDown");
+ installAccelerator("moveSquareInv");
+ installAccelerator("moveSquareEnv");
}
/**
Modified: streams/gui/src/app/net/sf/gridarta/messages.properties
===================================================================
--- streams/gui/src/app/net/sf/gridarta/messages.properties 2011-11-03 17:47:48 UTC (rev 9099)
+++ streams/gui/src/app/net/sf/gridarta/messages.properties 2011-11-03 17:52:27 UTC (rev 9100)
@@ -1585,8 +1585,10 @@
moveSquareBottom.shortdescription=Moves the selected game object to bottom of map square.
moveSquareInv.text=
moveSquareInv.shortdescription=Moves the selected game object into the inventory.
+moveSquareInv.accel=alt shift pressed RIGHT
moveSquareEnv.text=
moveSquareEnv.shortdescription=Moves the selected game object to its environment.
+moveSquareEnv.accel=alt shift pressed LEFT
###############
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-11-03 17:47:55
|
Revision: 9099
http://gridarta.svn.sourceforge.net/gridarta/?rev=9099&view=rev
Author: akirschbaum
Date: 2011-11-03 17:47:48 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
Add default keybindings ALT-UP/DOWN to select the previous/next game object within the map square.
Modified Paths:
--------------
streams/gui/atrinik/ChangeLog
streams/gui/crossfire/ChangeLog
streams/gui/daimonin/ChangeLog
streams/gui/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java
Modified: streams/gui/atrinik/ChangeLog
===================================================================
--- streams/gui/atrinik/ChangeLog 2011-11-03 17:42:38 UTC (rev 9098)
+++ streams/gui/atrinik/ChangeLog 2011-11-03 17:47:48 UTC (rev 9099)
@@ -1,5 +1,8 @@
2011-11-03 Andreas Kirschbaum
+ * Add default keybindings ALT-UP/DOWN to select the previous/next
+ game object within the map square.
+
* Add default keybinding ALT-SHIFT-UP/DOWN to move the selected
game object UP/DOWN within the map square.
Modified: streams/gui/crossfire/ChangeLog
===================================================================
--- streams/gui/crossfire/ChangeLog 2011-11-03 17:42:38 UTC (rev 9098)
+++ streams/gui/crossfire/ChangeLog 2011-11-03 17:47:48 UTC (rev 9099)
@@ -1,5 +1,8 @@
2011-11-03 Andreas Kirschbaum
+ * Add default keybindings ALT-UP/DOWN to select the previous/next
+ game object within the map square.
+
* Add default keybinding ALT-SHIFT-UP/DOWN to move the selected
game object UP/DOWN within the map square.
Modified: streams/gui/daimonin/ChangeLog
===================================================================
--- streams/gui/daimonin/ChangeLog 2011-11-03 17:42:38 UTC (rev 9098)
+++ streams/gui/daimonin/ChangeLog 2011-11-03 17:47:48 UTC (rev 9099)
@@ -1,5 +1,8 @@
2011-11-03 Andreas Kirschbaum
+ * Add default keybindings ALT-UP/DOWN to select the previous/next
+ game object within the map square.
+
* Add default keybinding ALT-SHIFT-UP/DOWN to move the selected
game object UP/DOWN within the map square.
Modified: streams/gui/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java
===================================================================
--- streams/gui/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java 2011-11-03 17:42:38 UTC (rev 9098)
+++ streams/gui/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java 2011-11-03 17:47:48 UTC (rev 9099)
@@ -230,6 +230,8 @@
for (final Direction direction : Direction.values()) {
installAccelerator("moveCursor"+direction.getId());
}
+ installAccelerator("moveSquarePrev");
+ installAccelerator("moveSquareNext");
installAccelerator("moveSquareUp");
installAccelerator("moveSquareDown");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-11-03 17:42:51
|
Revision: 9098
http://gridarta.svn.sourceforge.net/gridarta/?rev=9098&view=rev
Author: akirschbaum
Date: 2011-11-03 17:42:38 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
Update stream from trunk.
Modified Paths:
--------------
streams/gui/model/src/app/net/sf/gridarta/model/gameobject/GameObject.java
streams/gui/src/app/net/sf/gridarta/action.properties
streams/gui/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareActions.java
streams/gui/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareView.java
streams/gui/src/app/net/sf/gridarta/messages.properties
streams/gui/src/app/net/sf/gridarta/messages_de.properties
streams/gui/src/app/net/sf/gridarta/messages_fr.properties
streams/gui/src/app/net/sf/gridarta/messages_sv.properties
Property Changed:
----------------
streams/gui/
streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire/
streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin/
streams/gui/daimonin/src/test/net/sf/gridarta/var/daimonin/
streams/gui/lib/bsh-LICENSE
streams/gui/lib/bsh-classgen-2.0b4.jar
streams/gui/lib/bsh-commands-2.0b4.jar
streams/gui/lib/bsh-core-2.0b4.jar
streams/gui/lib/bsh-util-2.0b4.jar
streams/gui/lib/jdom.jar
streams/gui/lib/jdom.jar-LICENSE
streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java
streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java
streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/AttributeBitmask.java
streams/gui/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java
streams/gui/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java
streams/gui/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
streams/gui/resource/icons/CreateImageSmallIcon.gif
streams/gui/resource/icons/Dir1.gif
streams/gui/resource/icons/Dir2.gif
streams/gui/resource/icons/Dir3.gif
streams/gui/resource/icons/Dir4.gif
streams/gui/resource/icons/Dir5.gif
streams/gui/resource/icons/Dir6.gif
streams/gui/resource/icons/Dir7.gif
streams/gui/resource/icons/Dir8.gif
streams/gui/resource/icons/EditPluginSmallIcon.gif
streams/gui/resource/icons/EmptySmallIcon.gif
streams/gui/resource/icons/ImportPluginSmallIcon.gif
streams/gui/resource/icons/SaveMapAsSmallIcon.gif
streams/gui/resource/icons/auto_run_small_icon.gif
streams/gui/resource/icons/close_tab_small_icon.gif
streams/gui/resource/icons/development/Application24.gif
streams/gui/resource/icons/development/Host16.gif
streams/gui/resource/icons/development/Host24.gif
streams/gui/resource/icons/development/Jar16.gif
streams/gui/resource/icons/development/Server16.gif
streams/gui/resource/icons/development/Server24.gif
streams/gui/resource/icons/filter_small_icon.gif
streams/gui/resource/icons/general/About16.gif
streams/gui/resource/icons/general/Copy16.gif
streams/gui/resource/icons/general/Cut16.gif
streams/gui/resource/icons/general/Delete16.gif
streams/gui/resource/icons/general/Edit16.gif
streams/gui/resource/icons/general/Help16.gif
streams/gui/resource/icons/general/History16.gif
streams/gui/resource/icons/general/New16.gif
streams/gui/resource/icons/general/Open16.gif
streams/gui/resource/icons/general/Paste16.gif
streams/gui/resource/icons/general/Preferences16.gif
streams/gui/resource/icons/general/Preferences24.gif
streams/gui/resource/icons/general/Properties16.gif
streams/gui/resource/icons/general/Redo16.gif
streams/gui/resource/icons/general/Refresh16.gif
streams/gui/resource/icons/general/Remove16.gif
streams/gui/resource/icons/general/Replace16.gif
streams/gui/resource/icons/general/Save16.gif
streams/gui/resource/icons/general/Save24.gif
streams/gui/resource/icons/general/SaveAs16.gif
streams/gui/resource/icons/general/Search16.gif
streams/gui/resource/icons/general/TipOfTheDay16.gif
streams/gui/resource/icons/general/Undo16.gif
streams/gui/resource/icons/general/Zoom16.gif
streams/gui/resource/icons/media/
streams/gui/resource/icons/run_plugin_small_icon.gif
streams/gui/resource/log4j.properties
streams/gui/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialogFactory.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/CloseableTabbedPane.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/ClosingIcon.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginController.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManager.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManagerFactory.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginViewPane.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/StackLayout.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxCellRenderer.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxModel.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/FilterParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterCellRenderer.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterComboBoxModel.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterViewFactory.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/prefs/AppPreferences.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/prefs/DevPreferences.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/prefs/GUIPreferences.java
streams/gui/src/app/net/sf/gridarta/gui/dialog/prefs/NetPreferences.java
streams/gui/src/app/net/sf/gridarta/gui/filter/
streams/gui/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/DuplicateMapFolderException.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/DuplicatePickmapException.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/InvalidNameException.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/Loader.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFile.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFileNameComparator.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolder.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderListener.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderNotEmptyException.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTree.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeAction.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java
streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeListener.java
streams/gui/src/app/net/sf/gridarta/gui/panel/archetypechooser/DisplayMode.java
streams/gui/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesControl.java
streams/gui/src/app/net/sf/gridarta/gui/panel/objectchoicedisplay/ObjectChoiceDisplay.java
streams/gui/src/app/net/sf/gridarta/gui/panel/objectchooser/DefaultObjectChooser.java
streams/gui/src/app/net/sf/gridarta/gui/panel/objectchooser/ObjectChooser.java
streams/gui/src/app/net/sf/gridarta/gui/utils/MenuUtils.java
streams/gui/utils/src/app/net/sf/gridarta/utils/ConfigFileUtils.java
streams/gui/utils/src/app/net/sf/gridarta/utils/GUIUtils.java
streams/gui/utils/src/app/net/sf/gridarta/utils/IOUtils.java
streams/gui/utils/src/app/net/sf/gridarta/utils/ProcessRunner.java
streams/gui/utils/src/app/net/sf/gridarta/utils/WrappingStringBuilder.java
streams/gui/utils/src/app/net/sf/gridarta/utils/XmlHelper.java
streams/gui/utils/src/test/net/sf/gridarta/utils/WrappingStringBuilderTest.java
Property changes on: streams/gui
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update:5966-5991
/trunk:2-5965
+ /streams/cher-japi-update:5966-5991
/trunk:2-5965,9094-9097
Property changes on: streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/crossfire/src/app/net/sf/gridarta/var/crossfire:5966-5991
+ /streams/cher-japi-update/crossfire/src/app/net/sf/gridarta/var/crossfire:5966-5991
/trunk/crossfire/src/app/net/sf/gridarta/var/crossfire:9094-9097
Property changes on: streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/daimonin/src/app/net/sf/gridarta/var/daimonin:5966-5991
+ /streams/cher-japi-update/daimonin/src/app/net/sf/gridarta/var/daimonin:5966-5991
/trunk/daimonin/src/app/net/sf/gridarta/var/daimonin:9094-9097
Property changes on: streams/gui/daimonin/src/test/net/sf/gridarta/var/daimonin
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/daimonin/src/test/net/sf/gridarta/var/daimonin:5966-5991
+ /streams/cher-japi-update/daimonin/src/test/net/sf/gridarta/var/daimonin:5966-5991
/trunk/daimonin/src/test/net/sf/gridarta/var/daimonin:9094-9097
Property changes on: streams/gui/lib/bsh-LICENSE
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/bsh-LICENSE:5966-5991
+ /streams/cher-japi-update/lib/bsh-LICENSE:5966-5991
/trunk/lib/bsh-LICENSE:9094-9097
Property changes on: streams/gui/lib/bsh-classgen-2.0b4.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/bsh-classgen-2.0b4.jar:5966-5991
+ /streams/cher-japi-update/lib/bsh-classgen-2.0b4.jar:5966-5991
/trunk/lib/bsh-classgen-2.0b4.jar:9094-9097
Property changes on: streams/gui/lib/bsh-commands-2.0b4.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/bsh-commands-2.0b4.jar:5966-5991
+ /streams/cher-japi-update/lib/bsh-commands-2.0b4.jar:5966-5991
/trunk/lib/bsh-commands-2.0b4.jar:9094-9097
Property changes on: streams/gui/lib/bsh-core-2.0b4.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/bsh-core-2.0b4.jar:5966-5991
+ /streams/cher-japi-update/lib/bsh-core-2.0b4.jar:5966-5991
/trunk/lib/bsh-core-2.0b4.jar:9094-9097
Property changes on: streams/gui/lib/bsh-util-2.0b4.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/bsh-util-2.0b4.jar:5966-5991
+ /streams/cher-japi-update/lib/bsh-util-2.0b4.jar:5966-5991
/trunk/lib/bsh-util-2.0b4.jar:9094-9097
Property changes on: streams/gui/lib/jdom.jar
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/jdom.jar:5966-5991
+ /streams/cher-japi-update/lib/jdom.jar:5966-5991
/trunk/lib/jdom.jar:9094-9097
Property changes on: streams/gui/lib/jdom.jar-LICENSE
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/lib/jdom.jar-LICENSE:5966-5991
+ /streams/cher-japi-update/lib/jdom.jar-LICENSE:5966-5991
/trunk/lib/jdom.jar-LICENSE:9094-9097
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeAttribute.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeAttribute.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java:9094-9097
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeType.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeType.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java:9094-9097
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeTypeSet.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeTypeSet.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java:9094-9097
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/archetypetype/AttributeBitmask.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/CAttribBitmask.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/CAttribBitmask.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/AttributeBitmask.java:9094-9097
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/autojoin/AutojoinList.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/autojoin/AutojoinList.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java:9094-9097
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/autojoin/AutojoinLists.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/autojoin/AutojoinLists.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java:9094-9097
Property changes on: streams/gui/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gameobject/DefaultGameObject.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gameobject/DefaultGameObject.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java:9094-9097
Modified: streams/gui/model/src/app/net/sf/gridarta/model/gameobject/GameObject.java
===================================================================
--- streams/gui/model/src/app/net/sf/gridarta/model/gameobject/GameObject.java 2011-11-03 17:33:08 UTC (rev 9097)
+++ streams/gui/model/src/app/net/sf/gridarta/model/gameobject/GameObject.java 2011-11-03 17:42:38 UTC (rev 9098)
@@ -59,6 +59,14 @@
void addLast(@NotNull G gameObject);
/**
+ * Return the last GameObject contained in this container.
+ * @return first GameObject contained or <code>null</code> if {@link
+ * #isEmpty()} returns <code>true</code>
+ */
+ @Nullable
+ G getLast();
+
+ /**
* Add the given GameObject at the beginning of this Container.
* @param gameObject the free yet unlinked <code>GameObject</code> to be
* placed in the inventory
Property changes on: streams/gui/resource/icons/CreateImageSmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/CreateImageSmallIcon.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/CreateImageSmallIcon.gif:5966-5991
/trunk/resource/icons/CreateImageSmallIcon.gif:9094-9097
Property changes on: streams/gui/resource/icons/Dir1.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir1.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/Dir1.gif:5966-5991
/trunk/resource/icons/Dir1.gif:9094-9097
Property changes on: streams/gui/resource/icons/Dir2.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir2.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/Dir2.gif:5966-5991
/trunk/resource/icons/Dir2.gif:9094-9097
Property changes on: streams/gui/resource/icons/Dir3.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir3.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/Dir3.gif:5966-5991
/trunk/resource/icons/Dir3.gif:9094-9097
Property changes on: streams/gui/resource/icons/Dir4.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir4.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/Dir4.gif:5966-5991
/trunk/resource/icons/Dir4.gif:9094-9097
Property changes on: streams/gui/resource/icons/Dir5.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir5.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/Dir5.gif:5966-5991
/trunk/resource/icons/Dir5.gif:9094-9097
Property changes on: streams/gui/resource/icons/Dir6.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir6.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/Dir6.gif:5966-5991
/trunk/resource/icons/Dir6.gif:9094-9097
Property changes on: streams/gui/resource/icons/Dir7.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir7.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/Dir7.gif:5966-5991
/trunk/resource/icons/Dir7.gif:9094-9097
Property changes on: streams/gui/resource/icons/Dir8.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/Dir8.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/Dir8.gif:5966-5991
/trunk/resource/icons/Dir8.gif:9094-9097
Property changes on: streams/gui/resource/icons/EditPluginSmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/EditPluginSmallIcon.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/EditPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/EditPluginSmallIcon.gif:9094-9097
Property changes on: streams/gui/resource/icons/EmptySmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/EmptySmallIcon.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/EmptySmallIcon.gif:5966-5991
/trunk/resource/icons/EmptySmallIcon.gif:9094-9097
Property changes on: streams/gui/resource/icons/ImportPluginSmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/ImportPluginSmallIcon.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/ImportPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/ImportPluginSmallIcon.gif:9094-9097
Property changes on: streams/gui/resource/icons/SaveMapAsSmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/SaveLevelAsSmallIcon.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/SaveLevelAsSmallIcon.gif:5966-5991
/trunk/resource/icons/SaveMapAsSmallIcon.gif:9094-9097
Property changes on: streams/gui/resource/icons/auto_run_small_icon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/AutorunSmallIcon.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/AutorunSmallIcon.gif:5966-5991
/trunk/resource/icons/auto_run_small_icon.gif:9094-9097
Property changes on: streams/gui/resource/icons/close_tab_small_icon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/CloseTabSmallIcon.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/CloseTabSmallIcon.gif:5966-5991
/trunk/resource/icons/close_tab_small_icon.gif:9094-9097
Property changes on: streams/gui/resource/icons/development/Application24.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Application24.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/development/Application24.gif:5966-5991
/trunk/resource/icons/development/Application24.gif:9094-9097
Property changes on: streams/gui/resource/icons/development/Host16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Host16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/development/Host16.gif:5966-5991
/trunk/resource/icons/development/Host16.gif:9094-9097
Property changes on: streams/gui/resource/icons/development/Host24.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Host24.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/development/Host24.gif:5966-5991
/trunk/resource/icons/development/Host24.gif:9094-9097
Property changes on: streams/gui/resource/icons/development/Jar16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Jar16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/development/Jar16.gif:5966-5991
/trunk/resource/icons/development/Jar16.gif:9094-9097
Property changes on: streams/gui/resource/icons/development/Server16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Server16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/development/Server16.gif:5966-5991
/trunk/resource/icons/development/Server16.gif:9094-9097
Property changes on: streams/gui/resource/icons/development/Server24.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/development/Server24.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/development/Server24.gif:5966-5991
/trunk/resource/icons/development/Server24.gif:9094-9097
Property changes on: streams/gui/resource/icons/filter_small_icon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/FilterSmallIcon.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/FilterSmallIcon.gif:5966-5991
/trunk/resource/icons/filter_small_icon.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/About16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/About16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/About16.gif:5966-5991
/trunk/resource/icons/general/About16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Copy16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Copy16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Copy16.gif:5966-5991
/trunk/resource/icons/general/Copy16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Cut16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Cut16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Cut16.gif:5966-5991
/trunk/resource/icons/general/Cut16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Delete16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Delete16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Delete16.gif:5966-5991
/trunk/resource/icons/general/Delete16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Edit16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Edit16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Edit16.gif:5966-5991
/trunk/resource/icons/general/Edit16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Help16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Help16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Help16.gif:5966-5991
/trunk/resource/icons/general/Help16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/History16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/History16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/History16.gif:5966-5991
/trunk/resource/icons/general/History16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/New16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/New16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/New16.gif:5966-5991
/trunk/resource/icons/general/New16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Open16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Open16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Open16.gif:5966-5991
/trunk/resource/icons/general/Open16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Paste16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Paste16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Paste16.gif:5966-5991
/trunk/resource/icons/general/Paste16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Preferences16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Preferences16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Preferences16.gif:5966-5991
/trunk/resource/icons/general/Preferences16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Preferences24.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Preferences24.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Preferences24.gif:5966-5991
/trunk/resource/icons/general/Preferences24.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Properties16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Properties16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Properties16.gif:5966-5991
/trunk/resource/icons/general/Properties16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Redo16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Redo16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Redo16.gif:5966-5991
/trunk/resource/icons/general/Redo16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Refresh16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Refresh16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Refresh16.gif:5966-5991
/trunk/resource/icons/general/Refresh16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Remove16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Remove16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Remove16.gif:5966-5991
/trunk/resource/icons/general/Remove16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Replace16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Replace16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Replace16.gif:5966-5991
/trunk/resource/icons/general/Replace16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Save16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Save16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Save16.gif:5966-5991
/trunk/resource/icons/general/Save16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Save24.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Save24.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Save24.gif:5966-5991
/trunk/resource/icons/general/Save24.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/SaveAs16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/SaveAs16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/SaveAs16.gif:5966-5991
/trunk/resource/icons/general/SaveAs16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Search16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Search16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Search16.gif:5966-5991
/trunk/resource/icons/general/Search16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/TipOfTheDay16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/TipOfTheDay16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/TipOfTheDay16.gif:5966-5991
/trunk/resource/icons/general/TipOfTheDay16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Undo16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Undo16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Undo16.gif:5966-5991
/trunk/resource/icons/general/Undo16.gif:9094-9097
Property changes on: streams/gui/resource/icons/general/Zoom16.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/general/Zoom16.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/general/Zoom16.gif:5966-5991
/trunk/resource/icons/general/Zoom16.gif:9094-9097
Property changes on: streams/gui/resource/icons/media
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/media:5966-5991
+ /streams/cher-japi-update/resource/icons/media:5966-5991
/trunk/resource/icons/media:9094-9097
Property changes on: streams/gui/resource/icons/run_plugin_small_icon.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/resource/icons/RunPluginSmallIcon.gif:5966-5991
+ /streams/cher-japi-update/resource/icons/RunPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/run_plugin_small_icon.gif:9094-9097
Property changes on: streams/gui/resource/log4j.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/crossfire/resource/log4j.properties:5966-5991
+ /streams/cher-japi-update/crossfire/resource/log4j.properties:5966-5991
/trunk/resource/log4j.properties:9094-9097
Modified: streams/gui/src/app/net/sf/gridarta/action.properties
===================================================================
--- streams/gui/src/app/net/sf/gridarta/action.properties 2011-11-03 17:33:08 UTC (rev 9097)
+++ streams/gui/src/app/net/sf/gridarta/action.properties 2011-11-03 17:42:38 UTC (rev 9098)
@@ -160,6 +160,8 @@
update.icon=general/Search16
+moveSquarePrev.icon=navigation/Up16
+moveSquareNext.icon=navigation/Down16
moveSquareTop.icon=navigation/Top16
moveSquareUp.icon=navigation/Up16
moveSquareDown.icon=navigation/Down16
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttribBitmask.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttribBitmask.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialogFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialogFactory.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/CloseableTabbedPane.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/CloseableTabbedPane.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/CloseableTabbedPane.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/CloseableTabbedPane.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/ClosingIcon.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ClosingIcon.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ClosingIcon.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/ClosingIcon.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginController.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/script/ScriptController.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/script/ScriptController.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginController.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptEditor.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptEditor.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManager.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptManager.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptManager.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManager.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManagerFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManagerFactory.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptView.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginView.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/PluginViewPane.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptViewPane.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptViewPane.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginViewPane.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/StackLayout.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/StackLayout.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/StackLayout.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/StackLayout.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBox.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBox.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxCellRenderer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxCellRenderer.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxCellRenderer.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxCellRenderer.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxEditor.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxEditor.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxModel.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxModel.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxModel.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxModel.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchParameterView.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/BooleanParameterView.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/BooleanParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/DoubleParameterView.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/DoubleParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/FilterParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/FilterParameterView.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/FilterParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/FilterParameterView.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/IntegerParameterView.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/IntegerParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterCellRenderer.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/MapParameterCellRenderer.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/MapParameterCellRenderer.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterCellRenderer.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterComboBoxModel.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/MapParameterComboBoxModel.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/MapParameterComboBoxModel.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterComboBoxModel.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/MapParameterView.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/MapParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ParameterDescriptionEditor.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ParameterDescriptionEditor.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ParameterNameEditor.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ParameterNameEditor.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ParameterTypeEditor.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ParameterTypeEditor.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/PluginParameterView.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/PluginParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterView.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterViewFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/PluginParameterViewFactory.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/PluginParameterViewFactory.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterViewFactory.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/StringParameterView.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/StringParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/prefs/AppPreferences.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/prefs/AppPrefs.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/prefs/AppPrefs.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/prefs/AppPreferences.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/prefs/DevPreferences.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/prefs/DevPrefs.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/prefs/DevPrefs.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/prefs/DevPreferences.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/prefs/GUIPreferences.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/prefs/GUIPrefs.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/prefs/GUIPrefs.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/prefs/GUIPreferences.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/dialog/prefs/NetPreferences.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/prefs/NetPrefs.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/prefs/NetPrefs.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/dialog/prefs/NetPreferences.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/filter
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/filter:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/filter:5966-5991
/trunk/src/app/net/sf/gridarta/gui/filter:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/map/DefaultMapActions.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/map/DefaultMapActions.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/mapfiles/DuplicateMapFolderException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/DuplicateMapFolderException.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/DuplicateMapFolderException.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/mapfiles/DuplicateMapFolderException.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/mapfiles/DuplicatePickmapException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/DuplicatePickmapException.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/DuplicatePickmapException.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/mapfiles/DuplicatePickmapException.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/mapfiles/InvalidNameException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/InvalidNameException.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/InvalidNameException.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/mapfiles/InvalidNameException.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/mapfiles/Loader.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/Loader.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/Loader.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/mapfiles/Loader.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFile.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFile.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFile.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFile.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFileNameComparator.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFileNameComparator.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFileNameComparator.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFileNameComparator.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolder.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolder.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolder.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolder.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderListener.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolderListener.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolderListener.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderListener.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderNotEmptyException.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolderNotEmptyException.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolderNotEmptyException.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderNotEmptyException.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTree.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolderTree.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolderTree.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTree.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeAction.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeAction.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeAction.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeAction.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeListener.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolderTreeListener.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolderTreeListener.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeListener.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/panel/archetypechooser/DisplayMode.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/archetypechooser/DisplayMode.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/archetypechooser/DisplayMode.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/panel/archetypechooser/DisplayMode.java:9094-9097
Property changes on: streams/gui/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesControl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java:5966-5991
+ /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttr...
[truncated message content] |
|
From: <aki...@us...> - 2011-11-03 17:33:16
|
Revision: 9097
http://gridarta.svn.sourceforge.net/gridarta/?rev=9097&view=rev
Author: akirschbaum
Date: 2011-11-03 17:33:08 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
Add actions moveSquarePrev and moveSquareNext for selecting the previous or next game object in the selected square view.
Modified Paths:
--------------
trunk/model/src/app/net/sf/gridarta/model/gameobject/GameObject.java
trunk/src/app/net/sf/gridarta/action.properties
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareActions.java
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareView.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/model/src/app/net/sf/gridarta/model/gameobject/GameObject.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/gameobject/GameObject.java 2011-11-03 16:57:07 UTC (rev 9096)
+++ trunk/model/src/app/net/sf/gridarta/model/gameobject/GameObject.java 2011-11-03 17:33:08 UTC (rev 9097)
@@ -59,6 +59,14 @@
void addLast(@NotNull G gameObject);
/**
+ * Return the last GameObject contained in this container.
+ * @return first GameObject contained or <code>null</code> if {@link
+ * #isEmpty()} returns <code>true</code>
+ */
+ @Nullable
+ G getLast();
+
+ /**
* Add the given GameObject at the beginning of this Container.
* @param gameObject the free yet unlinked <code>GameObject</code> to be
* placed in the inventory
Modified: trunk/src/app/net/sf/gridarta/action.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/action.properties 2011-11-03 16:57:07 UTC (rev 9096)
+++ trunk/src/app/net/sf/gridarta/action.properties 2011-11-03 17:33:08 UTC (rev 9097)
@@ -160,6 +160,8 @@
update.icon=general/Search16
+moveSquarePrev.icon=navigation/Up16
+moveSquareNext.icon=navigation/Down16
moveSquareTop.icon=navigation/Top16
moveSquareUp.icon=navigation/Up16
moveSquareDown.icon=navigation/Down16
Modified: trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareActions.java 2011-11-03 16:57:07 UTC (rev 9096)
+++ trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareActions.java 2011-11-03 17:33:08 UTC (rev 9097)
@@ -49,6 +49,74 @@
}
/**
+ * Executes the "move square prev" action.
+ * @param performAction whether the action should be performed
+ * @return whether the action was or can be performed
+ */
+ public boolean doMoveSquarePrev(final boolean performAction) {
+ final GameObject<G, A, R> gameObject = selectedSquareModel.getSelectedGameObject();
+ if (gameObject == null || !gameObject.isHead()) {
+ return false;
+ }
+
+ G prevGameObject = gameObject.getPrev();
+ if (prevGameObject == null) {
+ prevGameObject = gameObject.getContainerGameObject();
+ if (prevGameObject == null) {
+ return false;
+ }
+ } else if (performAction) {
+ while (true) {
+ final G tmp = prevGameObject.getFirst();
+ if (tmp == null) {
+ break;
+ }
+ prevGameObject = tmp;
+ }
+ }
+
+ if (performAction) {
+ selectedSquareModel.setSelectedGameObject(prevGameObject);
+ }
+
+ return true;
+ }
+
+ /**
+ * Executes the "move square next" action.
+ * @param performAction whether the action should be performed
+ * @return whether the action was or can be performed
+ */
+ public boolean doMoveSquareNext(final boolean performAction) {
+ final G gameObject = selectedSquareModel.getSelectedGameObject();
+ if (gameObject == null || !gameObject.isHead()) {
+ return false;
+ }
+
+ G nextGameObject = gameObject.getLast();
+ if (nextGameObject == null) {
+ nextGameObject = gameObject;
+ while (true) {
+ final G tmp = nextGameObject.getNext();
+ if (tmp != null) {
+ nextGameObject = tmp;
+ break;
+ }
+ nextGameObject = nextGameObject.getContainerGameObject();
+ if (nextGameObject == null) {
+ return false;
+ }
+ }
+ }
+
+ if (performAction) {
+ selectedSquareModel.setSelectedGameObject(nextGameObject);
+ }
+
+ return true;
+ }
+
+ /**
* Executes the "move square top" action.
* @param performAction whether the action should be performed
* @return whether the action was or can be performed
Modified: trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareView.java 2011-11-03 16:57:07 UTC (rev 9096)
+++ trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareView.java 2011-11-03 17:33:08 UTC (rev 9097)
@@ -159,6 +159,18 @@
private MapCursor<G, A, R> mapCursor;
/**
+ * The action for "move square prev".
+ */
+ @NotNull
+ private final Action aMoveSquarePrev = ActionUtils.newAction(ACTION_BUILDER, "Selected Square View", this, "moveSquarePrev");
+
+ /**
+ * The action for "move square next".
+ */
+ @NotNull
+ private final Action aMoveSquareNext = ActionUtils.newAction(ACTION_BUILDER, "Selected Square View", this, "moveSquareNext");
+
+ /**
* The action for "move square top".
*/
@NotNull
@@ -397,7 +409,7 @@
updateArrows(false);
final Collection<Action> actions = new ArrayList<Action>();
- actions.add(aMoveSquareTop);
+ actions.add(aMoveSquareDown);
actions.add(aMoveSquareUp);
actions.add(aMoveSquareDown);
actions.add(aMoveSquareBottom);
@@ -467,6 +479,8 @@
* Updates the enabled state of all actions.
*/
private void updateActions() {
+ aMoveSquarePrev.setEnabled(selectedSquareActions.doMoveSquarePrev(false));
+ aMoveSquareNext.setEnabled(selectedSquareActions.doMoveSquareNext(false));
aMoveSquareTop.setEnabled(selectedSquareActions.doMoveSquareTop(false));
aMoveSquareUp.setEnabled(selectedSquareActions.doMoveSquareUp(false));
aMoveSquareDown.setEnabled(selectedSquareActions.doMoveSquareDown(false));
@@ -552,6 +566,22 @@
}
/**
+ * Action method for selecting the previous game object.
+ */
+ @ActionMethod
+ public void moveSquarePrev() {
+ selectedSquareActions.doMoveSquarePrev(true);
+ }
+
+ /**
+ * Action method for selecting the next game object.
+ */
+ @ActionMethod
+ public void moveSquareNext() {
+ selectedSquareActions.doMoveSquareNext(true);
+ }
+
+ /**
* Action method for moving an arch topmost within its square.
*/
@ActionMethod
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2011-11-03 16:57:07 UTC (rev 9096)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2011-11-03 17:33:08 UTC (rev 9097)
@@ -1567,6 +1567,12 @@
##################
# Selected Square
+moveSquarePrev.text=
+moveSquarePrev.shortdescription=Selects the previous game object in map square.
+moveSquarePrev.accel=alt pressed UP
+moveSquareNext.text=
+moveSquareNext.shortdescription=Selects the next game object in map square.
+moveSquareNext.accel=alt pressed DOWN
moveSquareTop.text=
moveSquareTop.shortdescription=Moves the selected game object to top of map square.
moveSquareUp.text=
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2011-11-03 16:57:07 UTC (rev 9096)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2011-11-03 17:33:08 UTC (rev 9097)
@@ -1332,7 +1332,10 @@
##################
# Selected Square
-
+moveSquarePrev.text=
+moveSquarePrev.shortdescription=Selektiert das n\u00e4chste Objekt.
+moveSquareNext.text=
+moveSquareNext.shortdescription=Selektiert das vorherige Objekt.
moveSquareTop.text=
moveSquareTop.shortdescription=Verschiebt das aktive Objekt an den Anfang.
moveSquareUp.text=
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2011-11-03 16:57:07 UTC (rev 9096)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2011-11-03 17:33:08 UTC (rev 9097)
@@ -1323,7 +1323,10 @@
##################
# Selected Square
-
+moveSquarePrev.text=
+#moveSquarePrev.shortdescription=
+moveSquareNext.text=
+#moveSquareNext.shortdescription=
moveSquareTop.text=
#moveSquareTop.shortdescription=
moveSquareUp.text=
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2011-11-03 16:57:07 UTC (rev 9096)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2011-11-03 17:33:08 UTC (rev 9097)
@@ -1323,6 +1323,10 @@
##################
# Selected Square
+moveSquarePrev.text=
+#moveSquarePrev.shortdescription=
+moveSquareNext.text=
+#moveSquareNext.shortdescription=
moveSquareTop.text=
#moveSquareTop.shortdescription=
moveSquareUp.text=
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-11-03 16:57:18
|
Revision: 9096
http://gridarta.svn.sourceforge.net/gridarta/?rev=9096&view=rev
Author: akirschbaum
Date: 2011-11-03 16:57:07 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
Add default keybinding ALT-SHIFT-UP/DOWN to move the selected game object UP/DOWN within the map square.
Modified Paths:
--------------
streams/gui/atrinik/ChangeLog
streams/gui/crossfire/ChangeLog
streams/gui/daimonin/ChangeLog
streams/gui/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java
streams/gui/src/app/net/sf/gridarta/messages.properties
Modified: streams/gui/atrinik/ChangeLog
===================================================================
--- streams/gui/atrinik/ChangeLog 2011-11-02 20:44:19 UTC (rev 9095)
+++ streams/gui/atrinik/ChangeLog 2011-11-03 16:57:07 UTC (rev 9096)
@@ -1,3 +1,8 @@
+2011-11-03 Andreas Kirschbaum
+
+ * Add default keybinding ALT-SHIFT-UP/DOWN to move the selected
+ game object UP/DOWN within the map square.
+
2011-11-02 Andreas Kirschbaum
* Change default keybindings for cursor keys to move the map
Modified: streams/gui/crossfire/ChangeLog
===================================================================
--- streams/gui/crossfire/ChangeLog 2011-11-02 20:44:19 UTC (rev 9095)
+++ streams/gui/crossfire/ChangeLog 2011-11-03 16:57:07 UTC (rev 9096)
@@ -1,3 +1,8 @@
+2011-11-03 Andreas Kirschbaum
+
+ * Add default keybinding ALT-SHIFT-UP/DOWN to move the selected
+ game object UP/DOWN within the map square.
+
2011-11-02 Andreas Kirschbaum
* Change default keybindings for cursor keys to move the map
Modified: streams/gui/daimonin/ChangeLog
===================================================================
--- streams/gui/daimonin/ChangeLog 2011-11-02 20:44:19 UTC (rev 9095)
+++ streams/gui/daimonin/ChangeLog 2011-11-03 16:57:07 UTC (rev 9096)
@@ -1,3 +1,8 @@
+2011-11-03 Andreas Kirschbaum
+
+ * Add default keybinding ALT-SHIFT-UP/DOWN to move the selected
+ game object UP/DOWN within the map square.
+
2011-11-02 Andreas Kirschbaum
* Change default keybindings for cursor keys to move the map
Modified: streams/gui/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java
===================================================================
--- streams/gui/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java 2011-11-02 20:44:19 UTC (rev 9095)
+++ streams/gui/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java 2011-11-03 16:57:07 UTC (rev 9096)
@@ -228,19 +228,28 @@
internalFrame.setAutoscrolls(true);
internalFrame.setFocusable(true);
for (final Direction direction : Direction.values()) {
- final String key = "moveCursor" + direction.getId();
- final Action action = ACTION_BUILDER.getAction(key);
- if (action != null) {
- final KeyStroke keyStroke1 = ActionUtils.getShortcut(action);
- if (keyStroke1 != null) {
- internalFrame.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(keyStroke1, key);
- }
- final KeyStroke keyStroke2 = ActionUtils.getAlternativeShortcut(action);
- if (keyStroke2 != null) {
- internalFrame.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(keyStroke2, key);
- }
- internalFrame.getActionMap().put(key, action);
+ installAccelerator("moveCursor"+direction.getId());
+ }
+ installAccelerator("moveSquareUp");
+ installAccelerator("moveSquareDown");
+ }
+
+ /**
+ * Installs accelerator keys for an action.
+ * @param key the action's key
+ */
+ private void installAccelerator(@NotNull final String key) {
+ final Action action = ACTION_BUILDER.getAction(key);
+ if (action != null) {
+ final KeyStroke keyStroke1 = ActionUtils.getShortcut(action);
+ if (keyStroke1 != null) {
+ internalFrame.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(keyStroke1, key);
}
+ final KeyStroke keyStroke2 = ActionUtils.getAlternativeShortcut(action);
+ if (keyStroke2 != null) {
+ internalFrame.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(keyStroke2, key);
+ }
+ internalFrame.getActionMap().put(key, action);
}
}
Modified: streams/gui/src/app/net/sf/gridarta/messages.properties
===================================================================
--- streams/gui/src/app/net/sf/gridarta/messages.properties 2011-11-02 20:44:19 UTC (rev 9095)
+++ streams/gui/src/app/net/sf/gridarta/messages.properties 2011-11-03 16:57:07 UTC (rev 9096)
@@ -1571,8 +1571,10 @@
moveSquareTop.shortdescription=Moves the selected game object to top of map square.
moveSquareUp.text=
moveSquareUp.shortdescription=Moves the selected game object up in map square.
+moveSquareUp.accel=alt shift pressed UP
moveSquareDown.text=
moveSquareDown.shortdescription=Moves the selected game object down in map square.
+moveSquareDown.accel=alt shift pressed DOWN
moveSquareBottom.text=
moveSquareBottom.shortdescription=Moves the selected game object to bottom of map square.
moveSquareInv.text=
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-11-02 20:44:26
|
Revision: 9095
http://gridarta.svn.sourceforge.net/gridarta/?rev=9095&view=rev
Author: akirschbaum
Date: 2011-11-02 20:44:19 +0000 (Wed, 02 Nov 2011)
Log Message:
-----------
Change default keybindings for cursor keys to move the map cursor.
Modified Paths:
--------------
streams/gui/atrinik/ChangeLog
streams/gui/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties
streams/gui/crossfire/ChangeLog
streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties
streams/gui/daimonin/ChangeLog
streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties
streams/gui/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java
streams/gui/utils/src/app/net/sf/gridarta/utils/ActionUtils.java
Modified: streams/gui/atrinik/ChangeLog
===================================================================
--- streams/gui/atrinik/ChangeLog 2011-11-02 19:15:00 UTC (rev 9094)
+++ streams/gui/atrinik/ChangeLog 2011-11-02 20:44:19 UTC (rev 9095)
@@ -1,3 +1,8 @@
+2011-11-02 Andreas Kirschbaum
+
+ * Change default keybindings for cursor keys to move the map
+ cursor.
+
2011-10-30 Andreas Kirschbaum
* Set the map cursor and select the affected game object for
Modified: streams/gui/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties
===================================================================
--- streams/gui/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2011-11-02 19:15:00 UTC (rev 9094)
+++ streams/gui/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2011-11-02 20:44:19 UTC (rev 9095)
@@ -129,12 +129,16 @@
moveCursorNorth.accel=NUMPAD9
moveCursorNorthEast.accel=NUMPAD6
+moveCursorNorthEast.accel2=RIGHT
moveCursorEast.accel=NUMPAD3
moveCursorSouthEast.accel=NUMPAD2
+moveCursorSouthEast.accel2=DOWN
moveCursorSouth.accel=NUMPAD1
moveCursorSouthWest.accel=NUMPAD4
+moveCursorSouthWest.accel2=LEFT
moveCursorWest.accel=NUMPAD7
moveCursorNorthWest.accel=NUMPAD8
+moveCursorNorthWest.accel2=UP
#######
Modified: streams/gui/crossfire/ChangeLog
===================================================================
--- streams/gui/crossfire/ChangeLog 2011-11-02 19:15:00 UTC (rev 9094)
+++ streams/gui/crossfire/ChangeLog 2011-11-02 20:44:19 UTC (rev 9095)
@@ -1,3 +1,8 @@
+2011-11-02 Andreas Kirschbaum
+
+ * Change default keybindings for cursor keys to move the map
+ cursor.
+
2011-10-30 Andreas Kirschbaum
* Set the map cursor and select the affected game object for
Modified: streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties
===================================================================
--- streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties 2011-11-02 19:15:00 UTC (rev 9094)
+++ streams/gui/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties 2011-11-02 20:44:19 UTC (rev 9095)
@@ -119,12 +119,16 @@
# Cursor
moveCursorNorth.accel=NUMPAD8
+moveCursorNorth.accel2=UP
moveCursorNorthEast.accel=NUMPAD9
moveCursorEast.accel=NUMPAD6
+moveCursorEast.accel2=RIGHT
moveCursorSouthEast.accel=NUMPAD3
moveCursorSouth.accel=NUMPAD2
+moveCursorSouth.accel2=DOWN
moveCursorSouthWest.accel=NUMPAD1
moveCursorWest.accel=NUMPAD4
+moveCursorWest.accel2=LEFT
moveCursorNorthWest.accel=NUMPAD7
Modified: streams/gui/daimonin/ChangeLog
===================================================================
--- streams/gui/daimonin/ChangeLog 2011-11-02 19:15:00 UTC (rev 9094)
+++ streams/gui/daimonin/ChangeLog 2011-11-02 20:44:19 UTC (rev 9095)
@@ -1,3 +1,8 @@
+2011-11-02 Andreas Kirschbaum
+
+ * Change default keybindings for cursor keys to move the map
+ cursor.
+
2011-10-30 Andreas Kirschbaum
* Set the map cursor and select the affected game object for
Modified: streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties
===================================================================
--- streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties 2011-11-02 19:15:00 UTC (rev 9094)
+++ streams/gui/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties 2011-11-02 20:44:19 UTC (rev 9095)
@@ -129,12 +129,16 @@
moveCursorNorth.accel=NUMPAD9
moveCursorNorthEast.accel=NUMPAD6
+moveCursorNorthEast.accel2=RIGHT
moveCursorEast.accel=NUMPAD3
moveCursorSouthEast.accel=NUMPAD2
+moveCursorSouthEast.accel2=DOWN
moveCursorSouth.accel=NUMPAD1
moveCursorSouthWest.accel=NUMPAD4
+moveCursorSouthWest.accel2=LEFT
moveCursorWest.accel=NUMPAD7
moveCursorNorthWest.accel=NUMPAD8
+moveCursorNorthWest.accel2=UP
#######
Modified: streams/gui/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java
===================================================================
--- streams/gui/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java 2011-11-02 19:15:00 UTC (rev 9094)
+++ streams/gui/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java 2011-11-02 20:44:19 UTC (rev 9095)
@@ -25,13 +25,17 @@
import java.beans.PropertyVetoException;
import java.io.File;
import java.util.Set;
+import javax.swing.Action;
+import javax.swing.JComponent;
import javax.swing.JInternalFrame;
import javax.swing.JScrollPane;
+import javax.swing.KeyStroke;
import javax.swing.WindowConstants;
import net.sf.gridarta.gui.map.renderer.AbstractMapRenderer;
import net.sf.gridarta.gui.map.renderer.MapRenderer;
import net.sf.gridarta.gui.utils.MenuUtils;
import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.direction.Direction;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.io.PathManager;
import net.sf.gridarta.model.maparchobject.MapArchObject;
@@ -45,7 +49,10 @@
import net.sf.gridarta.model.mapmodel.MapModelListener;
import net.sf.gridarta.model.mapmodel.MapSquare;
import net.sf.gridarta.model.validation.ErrorCollector;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.gridarta.utils.Size2D;
+import net.sf.japi.swing.action.ActionBuilder;
+import net.sf.japi.swing.action.ActionBuilderFactory;
import org.apache.log4j.Category;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
@@ -63,6 +70,12 @@
private static final Category log = Logger.getLogger(DefaultMapView.class);
/**
+ * Action Builder to create Actions.
+ */
+ @NotNull
+ private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
+
+ /**
* The controller of this view.
*/
@NotNull
@@ -213,6 +226,22 @@
internalFrame.getContentPane().add(mapCursorTracker.getScrollPane(), BorderLayout.CENTER);
internalFrame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
internalFrame.setAutoscrolls(true);
+ internalFrame.setFocusable(true);
+ for (final Direction direction : Direction.values()) {
+ final String key = "moveCursor" + direction.getId();
+ final Action action = ACTION_BUILDER.getAction(key);
+ if (action != null) {
+ final KeyStroke keyStroke1 = ActionUtils.getShortcut(action);
+ if (keyStroke1 != null) {
+ internalFrame.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(keyStroke1, key);
+ }
+ final KeyStroke keyStroke2 = ActionUtils.getAlternativeShortcut(action);
+ if (keyStroke2 != null) {
+ internalFrame.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(keyStroke2, key);
+ }
+ internalFrame.getActionMap().put(key, action);
+ }
+ }
}
/**
Modified: streams/gui/utils/src/app/net/sf/gridarta/utils/ActionUtils.java
===================================================================
--- streams/gui/utils/src/app/net/sf/gridarta/utils/ActionUtils.java 2011-11-02 19:15:00 UTC (rev 9094)
+++ streams/gui/utils/src/app/net/sf/gridarta/utils/ActionUtils.java 2011-11-02 20:44:19 UTC (rev 9095)
@@ -130,6 +130,16 @@
}
/**
+ * Returns the alternative shortcut of an {@link Action}.
+ * @param action the action
+ * @return the alternative shortcut or <code>null</code>
+ */
+ @Nullable
+ public static KeyStroke getAlternativeShortcut(@NotNull final Action action) {
+ return getShortcut(action, ActionBuilder.ACCELERATOR_KEY_2);
+ }
+
+ /**
* Returns the shortcut of an {@link Action}.
* @param action the action
* @param key the action key to query
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-11-02 19:15:07
|
Revision: 9094
http://gridarta.svn.sourceforge.net/gridarta/?rev=9094&view=rev
Author: akirschbaum
Date: 2011-11-02 19:15:00 +0000 (Wed, 02 Nov 2011)
Log Message:
-----------
Create stream for GUI experiments.
Added Paths:
-----------
streams/gui/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-10-31 22:31:26
|
Revision: 9093
http://gridarta.svn.sourceforge.net/gridarta/?rev=9093&view=rev
Author: akirschbaum
Date: 2011-10-31 22:31:19 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Properly enable or disable 'Move Cursor' menu entries.
Modified Paths:
--------------
trunk/model/src/app/net/sf/gridarta/model/direction/Direction.java
trunk/model/src/app/net/sf/gridarta/model/mapcursor/MapCursor.java
trunk/model/src/test/net/sf/gridarta/model/mapcursor/MapCursorTest.java
trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
Modified: trunk/model/src/app/net/sf/gridarta/model/direction/Direction.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/direction/Direction.java 2011-10-31 22:08:56 UTC (rev 9092)
+++ trunk/model/src/app/net/sf/gridarta/model/direction/Direction.java 2011-10-31 22:31:19 UTC (rev 9093)
@@ -19,6 +19,8 @@
package net.sf.gridarta.model.direction;
+import org.jetbrains.annotations.NotNull;
+
/**
* A direction.
* @author Andreas Kirschbaum
@@ -28,42 +30,42 @@
/**
* North.
*/
- NORTH(0, -1),
+ NORTH(0, -1, "North"),
/**
* East.
*/
- EAST(1, 0),
+ EAST(1, 0, "East"),
/**
* South.
*/
- SOUTH(0, 1),
+ SOUTH(0, 1, "South"),
/**
* West.
*/
- WEST(-1, 0),
+ WEST(-1, 0, "West"),
/**
* North east.
*/
- NORTH_EAST(1, -1),
+ NORTH_EAST(1, -1, "NorthEast"),
/**
* South east.
*/
- SOUTH_EAST(1, 1),
+ SOUTH_EAST(1, 1, "SouthEast"),
/**
* South west.
*/
- SOUTH_WEST(-1, 1),
+ SOUTH_WEST(-1, 1, "SouthWest"),
/**
* North west.
*/
- NORTH_WEST(-1, -1);
+ NORTH_WEST(-1, -1, "NorthWest");
/**
* The relative x direction.
@@ -76,13 +78,21 @@
private final int dy;
/**
+ * The identification string.
+ */
+ @NotNull
+ private final String id;
+
+ /**
* Creates a new instance.
* @param dx the relative x direction
* @param dy the relative y direction
+ * @param id the identification string
*/
- Direction(final int dx, final int dy) {
+ Direction(final int dx, final int dy, @NotNull final String id) {
this.dx = dx;
this.dy = dy;
+ this.id = id;
}
/**
@@ -101,4 +111,13 @@
return dy;
}
+ /**
+ * Returns the identification string.
+ * @return the identification string
+ */
+ @NotNull
+ public String getId() {
+ return id;
+ }
+
} // enum Direction
Modified: trunk/model/src/app/net/sf/gridarta/model/mapcursor/MapCursor.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/mapcursor/MapCursor.java 2011-10-31 22:08:56 UTC (rev 9092)
+++ trunk/model/src/app/net/sf/gridarta/model/mapcursor/MapCursor.java 2011-10-31 22:31:19 UTC (rev 9093)
@@ -385,17 +385,24 @@
/**
* Moves the cursor one square relative to current position.
+ * @param performAction whether the action should be performed
* @param dir the direction
* @return <code>true</code> if cursor really moved
*/
- public boolean goTo(@NotNull final Direction dir) {
+ public boolean goTo(final boolean performAction, @NotNull final Direction dir) {
if (onMap) {
tmpPoint.setLocation(pos.x + dir.getDx(), pos.y + dir.getDy());
- if (dragging) {
- return dragTo(tmpPoint);
- } else {
- return setLocationSafe(tmpPoint);
+ if (!mapRec.contains(tmpPoint)) {
+ return false;
}
+ if (performAction) {
+ if (dragging) {
+ dragTo(tmpPoint);
+ } else {
+ setLocationSafe(tmpPoint);
+ }
+ }
+ return true;
}
return false;
}
Modified: trunk/model/src/test/net/sf/gridarta/model/mapcursor/MapCursorTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/mapcursor/MapCursorTest.java 2011-10-31 22:08:56 UTC (rev 9092)
+++ trunk/model/src/test/net/sf/gridarta/model/mapcursor/MapCursorTest.java 2011-10-31 22:31:19 UTC (rev 9093)
@@ -236,14 +236,14 @@
}
/**
- * Checks {@link MapCursor#goTo(Direction)}.
+ * Checks {@link MapCursor#goTo(boolean, Direction)}.
*/
@Test
public void testGoTo() {
final MapGrid grid = new MapGrid(gridSize);
final MapCursor<TestGameObject, TestMapArchObject, TestArchetype> cursor = createCursor(grid);
for (final Direction dir : Direction.values()) {
- Assert.assertFalse("go(" + dir + ") should return false.", cursor.goTo(dir));
+ Assert.assertFalse("go(" + dir + ") should return false.", cursor.goTo(true, dir));
testEvents(0, 0);
}
final Point pStart = new Point(2, 3);
@@ -251,7 +251,7 @@
cursor.setLocation(p);
testEvents(1, 1);
for (final Direction dir : Direction.values()) {
- Assert.assertTrue("go(" + dir + ") should return true. (Maybe the grid was too small.)", cursor.goTo(dir));
+ Assert.assertTrue("go(" + dir + ") should return true. (Maybe the grid was too small.)", cursor.goTo(true, dir));
testEvents(1, 0);
p.x += dir.getDx();
p.y += dir.getDy();
Modified: trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2011-10-31 22:08:56 UTC (rev 9092)
+++ trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2011-10-31 22:31:19 UTC (rev 9093)
@@ -58,6 +58,12 @@
private final ObjectChooser<G, A, R> objectChooser;
/**
+ * All {@link Direction Directions}.
+ */
+ @NotNull
+ private static final Direction[] directions = Direction.values();
+
+ /**
* Actions for "move cursor".
*/
@NotNull
@@ -186,7 +192,7 @@
/** {@inheritDoc} */
@Override
public void mapCursorChangedPos(@Nullable final Point location) {
- // ignore
+ refreshActions();
}
/** {@inheritDoc} */
@@ -213,11 +219,10 @@
this.objectChooser = objectChooser;
this.gameObjectAttributesDialogFactory = gameObjectAttributesDialogFactory;
goLocationDialogManager = new GoLocationDialogManager<G, A, R>(mapViewManager);
- final String[] moveCursorDirections = { "moveCursorNorth", "moveCursorEast", "moveCursorSouth", "moveCursorWest", "moveCursorNorthEast", "moveCursorSouthEast", "moveCursorSouthWest", "moveCursorNorthWest" };
- aMoveCursor = new Action[moveCursorDirections.length];
+ aMoveCursor = new Action[directions.length];
final ActionBuilder actionBuilder = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
- for (int i = 0; i < moveCursorDirections.length; i++) {
- aMoveCursor[i] = ActionUtils.newAction(actionBuilder, "Map Cursor,Map/Selection", this, moveCursorDirections[i]);
+ for (final Direction direction : directions) {
+ aMoveCursor[direction.ordinal()] = ActionUtils.newAction(actionBuilder, "Map Cursor,Map/Selection", this, "moveCursor" + direction.getId());
}
aGoLocation = ActionUtils.newAction(actionBuilder, "Map Cursor", this, "goLocation");
aSelectSquare = ActionUtils.newAction(actionBuilder, "Map Cursor,Map/Selection", this, "selectSquare");
@@ -414,9 +419,8 @@
* Enable/disable menu entries based on the current cursor state.
*/
private void refreshActions() {
- final boolean goEnabled = doMoveCursor(false, Direction.NORTH);
- for (final Action action : aMoveCursor) {
- action.setEnabled(goEnabled);
+ for (final Direction direction : directions) {
+ aMoveCursor[direction.ordinal()].setEnabled(doMoveCursor(false, direction));
}
aGoLocation.setEnabled(doGoLocation(false));
aSelectSquare.setEnabled(doSelectSquare(false));
@@ -444,15 +448,7 @@
*/
private boolean doMoveCursor(final boolean performAction, @NotNull final Direction direction) {
final MapCursor<G, A, R> mapCursor = getActiveMapCursor();
- if (mapCursor == null) {
- return false;
- }
-
- if (performAction) {
- mapCursor.goTo(direction);
- }
-
- return true;
+ return mapCursor != null && mapCursor.goTo(performAction, direction);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-10-31 22:09:02
|
Revision: 9092
http://gridarta.svn.sourceforge.net/gridarta/?rev=9092&view=rev
Author: akirschbaum
Date: 2011-10-31 22:08:56 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Rename identifiers.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
Modified: trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2011-10-31 22:04:24 UTC (rev 9091)
+++ trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2011-10-31 22:08:56 UTC (rev 9092)
@@ -58,7 +58,7 @@
private final ObjectChooser<G, A, R> objectChooser;
/**
- * Actions for "go".
+ * Actions for "move cursor".
*/
@NotNull
private final Action[] aMoveCursor;
@@ -240,7 +240,7 @@
*/
@ActionMethod
public void moveCursorNorth() {
- doGo(true, Direction.NORTH);
+ doMoveCursor(true, Direction.NORTH);
}
/**
@@ -248,7 +248,7 @@
*/
@ActionMethod
public void moveCursorSouth() {
- doGo(true, Direction.SOUTH);
+ doMoveCursor(true, Direction.SOUTH);
}
/**
@@ -256,7 +256,7 @@
*/
@ActionMethod
public void moveCursorEast() {
- doGo(true, Direction.EAST);
+ doMoveCursor(true, Direction.EAST);
}
/**
@@ -264,7 +264,7 @@
*/
@ActionMethod
public void moveCursorWest() {
- doGo(true, Direction.WEST);
+ doMoveCursor(true, Direction.WEST);
}
/**
@@ -272,7 +272,7 @@
*/
@ActionMethod
public void moveCursorNorthEast() {
- doGo(true, Direction.NORTH_EAST);
+ doMoveCursor(true, Direction.NORTH_EAST);
}
/**
@@ -280,7 +280,7 @@
*/
@ActionMethod
public void moveCursorNorthWest() {
- doGo(true, Direction.NORTH_WEST);
+ doMoveCursor(true, Direction.NORTH_WEST);
}
/**
@@ -288,7 +288,7 @@
*/
@ActionMethod
public void moveCursorSouthEast() {
- doGo(true, Direction.SOUTH_EAST);
+ doMoveCursor(true, Direction.SOUTH_EAST);
}
/**
@@ -296,7 +296,7 @@
*/
@ActionMethod
public void moveCursorSouthWest() {
- doGo(true, Direction.SOUTH_WEST);
+ doMoveCursor(true, Direction.SOUTH_WEST);
}
/**
@@ -414,7 +414,7 @@
* Enable/disable menu entries based on the current cursor state.
*/
private void refreshActions() {
- final boolean goEnabled = doGo(false, Direction.NORTH);
+ final boolean goEnabled = doMoveCursor(false, Direction.NORTH);
for (final Action action : aMoveCursor) {
action.setEnabled(goEnabled);
}
@@ -437,12 +437,12 @@
}
/**
- * Executes the "go" action.
+ * Executes the "move cursor" action.
* @param performAction whether the action should be performed
- * @param direction the direction to go
+ * @param direction the direction to move the cursor
* @return whether the action was or can be performed
*/
- private boolean doGo(final boolean performAction, @NotNull final Direction direction) {
+ private boolean doMoveCursor(final boolean performAction, @NotNull final Direction direction) {
final MapCursor<G, A, R> mapCursor = getActiveMapCursor();
if (mapCursor == null) {
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-10-31 22:04:30
|
Revision: 9091
http://gridarta.svn.sourceforge.net/gridarta/?rev=9091&view=rev
Author: akirschbaum
Date: 2011-10-31 22:04:24 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Rename field name.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
Modified: trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2011-10-31 22:03:49 UTC (rev 9090)
+++ trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2011-10-31 22:04:24 UTC (rev 9091)
@@ -61,7 +61,7 @@
* Actions for "go".
*/
@NotNull
- private final Action[] aGo;
+ private final Action[] aMoveCursor;
/**
* Action for "go location".
@@ -214,10 +214,10 @@
this.gameObjectAttributesDialogFactory = gameObjectAttributesDialogFactory;
goLocationDialogManager = new GoLocationDialogManager<G, A, R>(mapViewManager);
final String[] moveCursorDirections = { "moveCursorNorth", "moveCursorEast", "moveCursorSouth", "moveCursorWest", "moveCursorNorthEast", "moveCursorSouthEast", "moveCursorSouthWest", "moveCursorNorthWest" };
- aGo = new Action[moveCursorDirections.length];
+ aMoveCursor = new Action[moveCursorDirections.length];
final ActionBuilder actionBuilder = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
for (int i = 0; i < moveCursorDirections.length; i++) {
- aGo[i] = ActionUtils.newAction(actionBuilder, "Map Cursor,Map/Selection", this, moveCursorDirections[i]);
+ aMoveCursor[i] = ActionUtils.newAction(actionBuilder, "Map Cursor,Map/Selection", this, moveCursorDirections[i]);
}
aGoLocation = ActionUtils.newAction(actionBuilder, "Map Cursor", this, "goLocation");
aSelectSquare = ActionUtils.newAction(actionBuilder, "Map Cursor,Map/Selection", this, "selectSquare");
@@ -415,7 +415,7 @@
*/
private void refreshActions() {
final boolean goEnabled = doGo(false, Direction.NORTH);
- for (final Action action : aGo) {
+ for (final Action action : aMoveCursor) {
action.setEnabled(goEnabled);
}
aGoLocation.setEnabled(doGoLocation(false));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-10-31 22:03:56
|
Revision: 9090
http://gridarta.svn.sourceforge.net/gridarta/?rev=9090&view=rev
Author: akirschbaum
Date: 2011-10-31 22:03:49 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Rename variable name.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
Modified: trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2011-10-31 21:52:11 UTC (rev 9089)
+++ trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2011-10-31 22:03:49 UTC (rev 9090)
@@ -213,11 +213,11 @@
this.objectChooser = objectChooser;
this.gameObjectAttributesDialogFactory = gameObjectAttributesDialogFactory;
goLocationDialogManager = new GoLocationDialogManager<G, A, R>(mapViewManager);
- final String[] directionsGo = { "moveCursorNorth", "moveCursorEast", "moveCursorSouth", "moveCursorWest", "moveCursorNorthEast", "moveCursorSouthEast", "moveCursorSouthWest", "moveCursorNorthWest" };
- aGo = new Action[directionsGo.length];
+ final String[] moveCursorDirections = { "moveCursorNorth", "moveCursorEast", "moveCursorSouth", "moveCursorWest", "moveCursorNorthEast", "moveCursorSouthEast", "moveCursorSouthWest", "moveCursorNorthWest" };
+ aGo = new Action[moveCursorDirections.length];
final ActionBuilder actionBuilder = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
- for (int i = 0; i < directionsGo.length; i++) {
- aGo[i] = ActionUtils.newAction(actionBuilder, "Map Cursor,Map/Selection", this, directionsGo[i]);
+ for (int i = 0; i < moveCursorDirections.length; i++) {
+ aGo[i] = ActionUtils.newAction(actionBuilder, "Map Cursor,Map/Selection", this, moveCursorDirections[i]);
}
aGoLocation = ActionUtils.newAction(actionBuilder, "Map Cursor", this, "goLocation");
aSelectSquare = ActionUtils.newAction(actionBuilder, "Map Cursor,Map/Selection", this, "selectSquare");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-10-31 21:52:17
|
Revision: 9089
http://gridarta.svn.sourceforge.net/gridarta/?rev=9089&view=rev
Author: akirschbaum
Date: 2011-10-31 21:52:11 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Properly rename action names.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
Modified: trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2011-10-31 19:56:43 UTC (rev 9088)
+++ trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2011-10-31 21:52:11 UTC (rev 9089)
@@ -255,7 +255,7 @@
* Action method for "move cursor east".
*/
@ActionMethod
- public void moveEast() {
+ public void moveCursorEast() {
doGo(true, Direction.EAST);
}
@@ -271,7 +271,7 @@
* Action method for "move cursor north east".
*/
@ActionMethod
- public void moveNorthEast() {
+ public void moveCursorNorthEast() {
doGo(true, Direction.NORTH_EAST);
}
@@ -279,7 +279,7 @@
* Action method for "move cursor north west".
*/
@ActionMethod
- public void moveNorthWest() {
+ public void moveCursorNorthWest() {
doGo(true, Direction.NORTH_WEST);
}
@@ -287,7 +287,7 @@
* Action method for "move cursor south east".
*/
@ActionMethod
- public void moveSouthEast() {
+ public void moveCursorSouthEast() {
doGo(true, Direction.SOUTH_EAST);
}
@@ -295,7 +295,7 @@
* Action method for "move cursor south west".
*/
@ActionMethod
- public void moveSouthWest() {
+ public void moveCursorSouthWest() {
doGo(true, Direction.SOUTH_WEST);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-10-31 19:56:50
|
Revision: 9088
http://gridarta.svn.sourceforge.net/gridarta/?rev=9088&view=rev
Author: akirschbaum
Date: 2011-10-31 19:56:43 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Rename action names.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties
trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.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 2011-10-31 07:54:27 UTC (rev 9087)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2011-10-31 19:56:43 UTC (rev 9088)
@@ -50,7 +50,7 @@
main.toolbar=newMap openFile saveMap saveMapAs - prevWindow nextWindow - undo redo
-moveCursor.menu=goNorth goEast goSouth goWest goNorthEast goSouthEast goSouthWest goNorthWest - goLocation
+moveCursor.menu=moveCursorNorth moveCursorEast moveCursorSouth moveCursorWest moveCursorNorthEast moveCursorSouthEast moveCursorSouthWest moveCursorNorthWest - goLocation
exitConnector.menu=exitCopy exitPaste exitConnect
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2011-10-31 07:54:27 UTC (rev 9087)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2011-10-31 19:56:43 UTC (rev 9088)
@@ -127,14 +127,14 @@
#######
# Cursor
-goNorth.accel=NUMPAD9
-goNorthEast.accel=NUMPAD6
-goEast.accel=NUMPAD3
-goSouthEast.accel=NUMPAD2
-goSouth.accel=NUMPAD1
-goSouthWest.accel=NUMPAD4
-goWest.accel=NUMPAD7
-goNorthWest.accel=NUMPAD8
+moveCursorNorth.accel=NUMPAD9
+moveCursorNorthEast.accel=NUMPAD6
+moveCursorEast.accel=NUMPAD3
+moveCursorSouthEast.accel=NUMPAD2
+moveCursorSouth.accel=NUMPAD1
+moveCursorSouthWest.accel=NUMPAD4
+moveCursorWest.accel=NUMPAD7
+moveCursorNorthWest.accel=NUMPAD8
#######
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2011-10-31 07:54:27 UTC (rev 9087)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2011-10-31 19:56:43 UTC (rev 9088)
@@ -50,7 +50,7 @@
main.toolbar=newMap openFile saveMap saveMapAs - prevWindow nextWindow - undo redo
-moveCursor.menu=goNorth goEast goSouth goWest goNorthEast goSouthEast goSouthWest goNorthWest - goLocation
+moveCursor.menu=moveCursorNorth moveCursorEast moveCursorSouth moveCursorWest moveCursorNorthEast moveCursorSouthEast moveCursorSouthWest moveCursorNorthWest - goLocation
exitConnector.menu=exitCopy exitPaste exitConnect
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties 2011-10-31 07:54:27 UTC (rev 9087)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties 2011-10-31 19:56:43 UTC (rev 9088)
@@ -118,14 +118,14 @@
#######
# Cursor
-goNorth.accel=NUMPAD8
-goNorthEast.accel=NUMPAD9
-goEast.accel=NUMPAD6
-goSouthEast.accel=NUMPAD3
-goSouth.accel=NUMPAD2
-goSouthWest.accel=NUMPAD1
-goWest.accel=NUMPAD4
-goNorthWest.accel=NUMPAD7
+moveCursorNorth.accel=NUMPAD8
+moveCursorNorthEast.accel=NUMPAD9
+moveCursorEast.accel=NUMPAD6
+moveCursorSouthEast.accel=NUMPAD3
+moveCursorSouth.accel=NUMPAD2
+moveCursorSouthWest.accel=NUMPAD1
+moveCursorWest.accel=NUMPAD4
+moveCursorNorthWest.accel=NUMPAD7
about.title=About Gridarta for Crossfire
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2011-10-31 07:54:27 UTC (rev 9087)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2011-10-31 19:56:43 UTC (rev 9088)
@@ -50,7 +50,7 @@
main.toolbar=newMap openFile saveMap saveMapAs - prevWindow nextWindow - undo redo
-moveCursor.menu=goNorth goEast goSouth goWest goNorthEast goSouthEast goSouthWest goNorthWest - goLocation
+moveCursor.menu=moveCursorNorth moveCursorEast moveCursorSouth moveCursorWest moveCursorNorthEast moveCursorSouthEast moveCursorSouthWest moveCursorNorthWest - goLocation
exitConnector.menu=exitCopy exitPaste exitConnect
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties 2011-10-31 07:54:27 UTC (rev 9087)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties 2011-10-31 19:56:43 UTC (rev 9088)
@@ -127,14 +127,14 @@
#######
# Cursor
-goNorth.accel=NUMPAD9
-goNorthEast.accel=NUMPAD6
-goEast.accel=NUMPAD3
-goSouthEast.accel=NUMPAD2
-goSouth.accel=NUMPAD1
-goSouthWest.accel=NUMPAD4
-goWest.accel=NUMPAD7
-goNorthWest.accel=NUMPAD8
+moveCursorNorth.accel=NUMPAD9
+moveCursorNorthEast.accel=NUMPAD6
+moveCursorEast.accel=NUMPAD3
+moveCursorSouthEast.accel=NUMPAD2
+moveCursorSouth.accel=NUMPAD1
+moveCursorSouthWest.accel=NUMPAD4
+moveCursorWest.accel=NUMPAD7
+moveCursorNorthWest.accel=NUMPAD8
#######
Modified: trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2011-10-31 07:54:27 UTC (rev 9087)
+++ trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2011-10-31 19:56:43 UTC (rev 9088)
@@ -213,7 +213,7 @@
this.objectChooser = objectChooser;
this.gameObjectAttributesDialogFactory = gameObjectAttributesDialogFactory;
goLocationDialogManager = new GoLocationDialogManager<G, A, R>(mapViewManager);
- final String[] directionsGo = { "goNorth", "goEast", "goSouth", "goWest", "goNorthEast", "goSouthEast", "goSouthWest", "goNorthWest" };
+ final String[] directionsGo = { "moveCursorNorth", "moveCursorEast", "moveCursorSouth", "moveCursorWest", "moveCursorNorthEast", "moveCursorSouthEast", "moveCursorSouthWest", "moveCursorNorthWest" };
aGo = new Action[directionsGo.length];
final ActionBuilder actionBuilder = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
for (int i = 0; i < directionsGo.length; i++) {
@@ -236,66 +236,66 @@
}
/**
- * Action method for "cursor north".
+ * Action method for "move cursor north".
*/
@ActionMethod
- public void goNorth() {
+ public void moveCursorNorth() {
doGo(true, Direction.NORTH);
}
/**
- * Action method for "cursor south".
+ * Action method for "move cursor south".
*/
@ActionMethod
- public void goSouth() {
+ public void moveCursorSouth() {
doGo(true, Direction.SOUTH);
}
/**
- * Action method for "cursor east".
+ * Action method for "move cursor east".
*/
@ActionMethod
- public void goEast() {
+ public void moveEast() {
doGo(true, Direction.EAST);
}
/**
- * Action method for "cursor west".
+ * Action method for "move cursor west".
*/
@ActionMethod
- public void goWest() {
+ public void moveCursorWest() {
doGo(true, Direction.WEST);
}
/**
- * Action method for "cursor north east".
+ * Action method for "move cursor north east".
*/
@ActionMethod
- public void goNorthEast() {
+ public void moveNorthEast() {
doGo(true, Direction.NORTH_EAST);
}
/**
- * Action method for "cursor north west".
+ * Action method for "move cursor north west".
*/
@ActionMethod
- public void goNorthWest() {
+ public void moveNorthWest() {
doGo(true, Direction.NORTH_WEST);
}
/**
- * Action method for "cursor south east".
+ * Action method for "move cursor south east".
*/
@ActionMethod
- public void goSouthEast() {
+ public void moveSouthEast() {
doGo(true, Direction.SOUTH_EAST);
}
/**
- * Action method for "cursor south west".
+ * Action method for "move cursor south west".
*/
@ActionMethod
- public void goSouthWest() {
+ public void moveSouthWest() {
doGo(true, Direction.SOUTH_WEST);
}
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2011-10-31 07:54:27 UTC (rev 9087)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2011-10-31 19:56:43 UTC (rev 9088)
@@ -43,29 +43,29 @@
moveCursor.text=Move Cursor
moveCursor.shortdescription=Moves the map cursor.
-goNorth.text=Move Cursor North
-goNorth.shortdescription=Moves the map cursor north.
+moveCursorNorth.text=Move Cursor North
+moveCursorNorth.shortdescription=Moves the map cursor north.
-goNorthEast.text=Move Cursor Northeast
-goNorthEast.shortdescription=Moves the map cursor north east.
+moveCursorNorthEast.text=Move Cursor Northeast
+moveCursorNorthEast.shortdescription=Moves the map cursor north east.
-goEast.text=Move Cursor East
-goEast.shortdescription=Moves the map cursor east.
+moveCursorEast.text=Move Cursor East
+moveCursorEast.shortdescription=Moves the map cursor east.
-goSouthEast.text=Move Cursor Southeast
-goSouthEast.shortdescription=Moves the map cursor south east.
+moveCursorSouthEast.text=Move Cursor Southeast
+moveCursorSouthEast.shortdescription=Moves the map cursor south east.
-goSouth.text=Move Cursor South
-goSouth.shortdescription=Moves the map cursor south.
+moveCursorSouth.text=Move Cursor South
+moveCursorSouth.shortdescription=Moves the map cursor south.
-goSouthWest.text=Move Cursor Southwest
-goSouthWest.shortdescription=Moves the map cursor south west.
+moveCursorSouthWest.text=Move Cursor Southwest
+moveCursorSouthWest.shortdescription=Moves the map cursor south west.
-goWest.text=Move Cursor West
-goWest.shortdescription=Moves the map cursor west.
+moveCursorWest.text=Move Cursor West
+moveCursorWest.shortdescription=Moves the map cursor west.
-goNorthWest.text=Move Cursor Northwest
-goNorthWest.shortdescription=Moves the map cursor north west.
+moveCursorNorthWest.text=Move Cursor Northwest
+moveCursorNorthWest.shortdescription=Moves the map cursor north west.
goMap.text=Goto Map...
goMap.mnemonic=M
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2011-10-31 07:54:27 UTC (rev 9087)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2011-10-31 19:56:43 UTC (rev 9088)
@@ -43,29 +43,29 @@
moveCursor.text=Cursor bewegen
moveCursor.shortdescription=Bewegt den Cursor.
-goNorth.text=Cursor nach Nord
-goNorth.shortdescription=Bewegt den Cursor nach Norden.
+moveCursorNorth.text=Cursor nach Nord
+moveCursorNorth.shortdescription=Bewegt den Cursor nach Norden.
-goNorthEast.text=Cursor nach Nordost
-goNorthEast.shortdescription=Bewegt den Cursor nach Nordosten.
+moveCursorNorthEast.text=Cursor nach Nordost
+moveCursorNorthEast.shortdescription=Bewegt den Cursor nach Nordosten.
-goEast.text=Cursor nach Ost
-goEast.shortdescription=Bewegt den Cursor nach Osten.
+moveCursorEast.text=Cursor nach Ost
+moveCursorEast.shortdescription=Bewegt den Cursor nach Osten.
-goSouthEast.text=Cursor nach S\u00fcdost
-goSouthEast.shortdescription=Bewegt den Cursor nach S\u00fcdosten.
+moveCursorSouthEast.text=Cursor nach S\u00fcdost
+moveCursorSouthEast.shortdescription=Bewegt den Cursor nach S\u00fcdosten.
-goSouth.text=Cursor nach S\u00fcd
-goSouth.shortdescription=Bewegt den Cursor nach S\u00fcden.
+moveCursorSouth.text=Cursor nach S\u00fcd
+moveCursorSouth.shortdescription=Bewegt den Cursor nach S\u00fcden.
-goSouthWest.text=Cursor nach S\u00fcdwest
-goSouthWest.shortdescription=Bewegt den Cursor nach S\u00fcdwesten.
+moveCursorSouthWest.text=Cursor nach S\u00fcdwest
+moveCursorSouthWest.shortdescription=Bewegt den Cursor nach S\u00fcdwesten.
-goWest.text=Cursor nach West
-goWest.shortdescription=Bewegt den Cursor nach Westen.
+moveCursorWest.text=Cursor nach West
+moveCursorWest.shortdescription=Bewegt den Cursor nach Westen.
-goNorthWest.text=Cursor nach Nordwest
-goNorthWest.shortdescription=Bewegt den Cursor nach Nordwesten.
+moveCursorNorthWest.text=Cursor nach Nordwest
+moveCursorNorthWest.shortdescription=Bewegt den Cursor nach Nordwesten.
#######
# Map
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2011-10-31 07:54:27 UTC (rev 9087)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2011-10-31 19:56:43 UTC (rev 9088)
@@ -43,29 +43,29 @@
#moveCursor.text=
#moveCursor.shortdescription=
-#goNorth.text=
-#goNorth.shortdescription=
+#moveCursorNorth.text=
+#moveCursorNorth.shortdescription=
-#goNorthEast.text=
-#goNorthEast.shortdescription=
+#moveCursorNorthEast.text=
+#moveCursorNorthEast.shortdescription=
-#goEast.text=
-#goEast.shortdescription=
+#moveCursorEast.text=
+#moveCursorEast.shortdescription=
-#goSouthEast.text=
-#goSouthEast.shortdescription=
+#moveCursorSouthEast.text=
+#moveCursorSouthEast.shortdescription=
-#goSouth.text=
-#goSouth.shortdescription=
+#moveCursorSouth.text=
+#moveCursorSouth.shortdescription=
-#goSouthWest.text=
-#goSouthWest.shortdescription=
+#moveCursorSouthWest.text=
+#moveCursorSouthWest.shortdescription=
-#goWest.text=
-#goWest.shortdescription=
+#moveCursorWest.text=
+#moveCursorWest.shortdescription=
-#goNorthWest.text=
-#goNorthWest.shortdescription=
+#moveCursorNorthWest.text=
+#moveCursorNorthWest.shortdescription=
goMap.text=Aller \u00e0 une carte...
goMap.mnemonic=A
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2011-10-31 07:54:27 UTC (rev 9087)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2011-10-31 19:56:43 UTC (rev 9088)
@@ -43,29 +43,29 @@
moveCursor.text=Flytta mark\u00f6r
#moveCursor.shortdescription=
-goNorth.text=Flytta mark\u00f6r norrut
-#goNorth.shortdescription=
+moveCursorNorth.text=Flytta mark\u00f6r norrut
+#moveCursorNorth.shortdescription=
-goNorthEast.text=Flytta mark\u00f6r nord\u00f6st
-#goNorthEast.shortdescription=
+moveCursorNorthEast.text=Flytta mark\u00f6r nord\u00f6st
+#moveCursorNorthEast.shortdescription=
-goEast.text=Flytta mark\u00f6r \u00f6sterut
-#goEast.shortdescription=
+moveCursorEast.text=Flytta mark\u00f6r \u00f6sterut
+#moveCursorEast.shortdescription=
-goSouthEast.text=Flytta mark\u00f6r syd\u00f6st
-#goSouthEast.shortdescription=
+moveCursorSouthEast.text=Flytta mark\u00f6r syd\u00f6st
+#moveCursorSouthEast.shortdescription=
-goSouth.text=Flytta mark\u00f6r s\u00f6derut
-#goSouth.shortdescription=
+moveCursorSouth.text=Flytta mark\u00f6r s\u00f6derut
+#moveCursorSouth.shortdescription=
-goSouthWest.text=Flytta mark\u00f6r sydv\u00e4st
-#goSouthWest.shortdescription=
+moveCursorSouthWest.text=Flytta mark\u00f6r sydv\u00e4st
+#moveCursorSouthWest.shortdescription=
-goWest.text=Flytta mark\u00f6r v\u00e4sterut
-#goWest.shortdescription=
+moveCursorWest.text=Flytta mark\u00f6r v\u00e4sterut
+#moveCursorWest.shortdescription=
-goNorthWest.text=Flytta mark\u00f6r nordv\u00e4st
-#goNorthWest.shortdescription=
+moveCursorNorthWest.text=Flytta mark\u00f6r nordv\u00e4st
+#moveCursorNorthWest.shortdescription=
#######
# Map
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-10-31 07:54:33
|
Revision: 9087
http://gridarta.svn.sourceforge.net/gridarta/?rev=9087&view=rev
Author: akirschbaum
Date: 2011-10-31 07:54:27 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Remove unused import statement.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/ModelUpdater.java
Modified: trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/ModelUpdater.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/ModelUpdater.java 2011-10-30 23:30:52 UTC (rev 9086)
+++ trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/ModelUpdater.java 2011-10-31 07:54:27 UTC (rev 9087)
@@ -22,14 +22,13 @@
import javax.swing.DefaultListModel;
import net.sf.gridarta.model.baseobject.GameObjectContainer;
import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.mapmodel.MapSquare;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* Updates a {@link DefaultListModel} instance to reflect the contents of a
- * {@link MapSquare} instance.
+ * {@link net.sf.gridarta.model.mapmodel.MapSquare} instance.
* @author <a href="mailto:mic...@no...">Michael Toennies</a>
* @author <a href="mailto:and...@gm...">Andreas Vogl</a>
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -65,7 +64,7 @@
}
/**
- * Updates the model to reflect a {@link MapSquare}.
+ * Updates the model to reflect a {@link net.sf.gridarta.model.mapmodel.MapSquare}.
* @param mapSquare the map square selection
* @param gameObject the selected game object
* @return the list index to select or <code>-1</code> to select nothing
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-10-30 23:30:58
|
Revision: 9086
http://gridarta.svn.sourceforge.net/gridarta/?rev=9086&view=rev
Author: akirschbaum
Date: 2011-10-30 23:30:52 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
Rename function names.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareView.java
Modified: trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareView.java 2011-10-30 23:26:19 UTC (rev 9085)
+++ trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareView.java 2011-10-30 23:30:52 UTC (rev 9086)
@@ -355,9 +355,9 @@
}
}
} else if (isInsert(e)) {
- insertGameObjectFromObjectChooser(getListIndex(e));
+ insertGameObject(getListIndex(e));
} else if (isDelete(e)) {
- deleteIndex(getListIndex(e));
+ deleteGameObject(getListIndex(e));
}
}
@@ -604,7 +604,7 @@
* Deletes a {@link GameObject} with a specific list index.
* @param index the list index of the game object to delete
*/
- private void deleteIndex(final int index) {
+ private void deleteGameObject(final int index) {
final MapCursor<G, A, R> mapCursor = this.mapCursor;
if (mapCursor != null && index < model.getSize()) {
setSelectedIndex(index);
@@ -616,7 +616,7 @@
* Inserts a new game object.
* @param index the list index to insert at
*/
- private void insertGameObjectFromObjectChooser(final int index) {
+ private void insertGameObject(final int index) {
final BaseObject<G, A, R, ?> gameObject = objectChooser.getSelection();
if (gameObject != null) {
final MapCursor<G, A, R> mapCursor = this.mapCursor;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
