gridarta-commit Mailing List for gridarta (Page 337)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1084
          http://svn.sourceforge.net/gridarta/?rev=1084&view=rev
Author:   akirschbaum
Date:     2006-12-15 14:18:14 -0800 (Fri, 15 Dec 2006)

Log Message:
-----------
Unify use of ActionFactory in ScriptArchData.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/ScriptArchData.java
    trunk/crossfire/src/cfeditor/messages.properties
    trunk/crossfire/src/cfeditor/messages_de.properties
    trunk/daimonin/src/daieditor/ScriptArchData.java
    trunk/daimonin/src/daieditor/messages.properties

Modified: trunk/crossfire/src/cfeditor/ScriptArchData.java
===================================================================

--- trunk/crossfire/src/cfeditor/ScriptArchData.java	2006-12-15 22:01:25 UTC (rev 1083)
+++ trunk/crossfire/src/cfeditor/ScriptArchData.java	2006-12-15 22:18:14 UTC (rev 1084)
@@ -49,6 +49,7 @@
 import javax.swing.WindowConstants;
 import static javax.swing.WindowConstants.HIDE_ON_CLOSE;
 import net.sf.gridarta.textedit.scripteditor.ScriptEditControl;
+import net.sf.japi.swing.ActionFactory;
 import net.sf.japi.util.Arrays2;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
@@ -71,6 +72,9 @@
 
     public static final int EDATA_EVENT_OPTIONS = 2;
 
+    /** Action Factory. */
+    private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("cfeditor");
+
     // popup frame to edit script paths:
     private static JDialog pathFrame;
 
@@ -526,8 +530,7 @@
             } else {
                 // if map dir doesn't exist, this is not going to work
                 frame.setVisible(false);
-                mainControl.showMessage("Invalid Map Directory", "The map directory '" + mapDir + "' does not exist!\n" +
-                        "Please select menu 'File->Options...' and correct that.", JOptionPane.ERROR_MESSAGE);
+                ACTION_FACTORY.showMessageDialog(frame, "mapDirDoesntExist", mapDir);
                 return;
             }
         } else {
@@ -712,8 +715,7 @@
                 ScriptEditControl.getInstance().openScriptFile(scriptFile.getAbsolutePath());
             } else {
                 // file does not exist!
-                mainControl.showMessage("Script file not found",
-                        "The file '" + path + "' does not exist.\nPlease correct the path.", JOptionPane.ERROR_MESSAGE);
+                ACTION_FACTORY.showMessageDialog(mainControl.getMainView(), "openScriptNotFound", path);
             }
         }
 

Modified: trunk/crossfire/src/cfeditor/messages.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages.properties	2006-12-15 22:01:25 UTC (rev 1083)
+++ trunk/crossfire/src/cfeditor/messages.properties	2006-12-15 22:18:14 UTC (rev 1084)
@@ -11,6 +11,9 @@
 collectArchesNotReady.title=Arches still loading
 collectArchesNotReady.message=You have to wait for all arches to be loaded\nbefore you can collect them.
 
+mapDirDoesntExist.title=Invalid map directory
+mapDirDoesntExist.message=The map directory "{0}" doesn''t exist.\nPlease select menu ''File->Options...'' and correct that.
+
 openFileWantedNoArches.title=Cannot open map
 openFileWantedNoArches.message=There are currently no arches avaliable!\nYou need to have arches loaded before opening a map.
 openFileWantedNotReady.title=Cannot open map
@@ -25,6 +28,9 @@
 enterExitNotSaved.title=Map not saved
 enterExitNotSaved.message=You must save the map first to follow a relative path.
 
+openScriptNotFound.title=Script file not found
+openScriptNotFound.message=The file ''{0}'' does not exist.\nPlease correct the path.
+
 # Map Properties
 mapParametersTabTitle=Parameters
 mapShopTabTitle=Shop

Modified: trunk/crossfire/src/cfeditor/messages_de.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_de.properties	2006-12-15 22:01:25 UTC (rev 1083)
+++ trunk/crossfire/src/cfeditor/messages_de.properties	2006-12-15 22:18:14 UTC (rev 1084)
@@ -6,6 +6,9 @@
 collectArchesNotReady.title=Archetypen noch nicht geladen
 collectArchesNotReady.message=Sie m\xFCssen warten bis die Archetypen geladen\nsind, bevor Sie sie neu sammeln k\xF6nnen.
 
+mapDirDoesntExist.title=Ung\xFCltiges Verzeichnis
+mapDirDoesntExist.message=Das Verzeichnis f\xFCr Karten "{0}" existiert nicht.\nBitte legen sie es unter ''Datei->Optionen...'' fest.
+
 closePickmapNotLoaded.title=Kann Pickmap nicht schlie\xDFen
 closePickmapNotLoaded.message=Es sind keine Pickmaps geladen.\nEntweder existieren keine Pickmaps oder\nsie sind noch nicht vollst\xE4ndig geladen.
 closePickmapHidden.title=Kann Pickmap nicht schlie\xDFen
@@ -63,6 +66,9 @@
 enterExitNotSaved.title=Karte nicht gesichert
 enterExitNotSaved.message=Der Ausgang verwendet einen relativen Dateinamen. Um ihm zu folgen m\xFCssen Sie die Karte vorher sichern.
 
+openScriptNotFound.title=Script-Datei nicht gefunden
+openScriptNotFound.message=Die Datei ''{0}'' existiert nicht.\nBitte geben sie einen g\xFCltigen Dateinamen an.
+
 enterTileNoTile.title=Ziel ung\xFCltig
 enterTileNoTile.message=In die angegebene Richtung existiert kein Verbindungspfad.
 

Modified: trunk/daimonin/src/daieditor/ScriptArchData.java
===================================================================
--- trunk/daimonin/src/daieditor/ScriptArchData.java	2006-12-15 22:01:25 UTC (rev 1083)
+++ trunk/daimonin/src/daieditor/ScriptArchData.java	2006-12-15 22:18:14 UTC (rev 1084)
@@ -485,7 +485,7 @@
             if (!mapDir.exists()) {
                 // if map dir doesn't exist, this is not going to work
                 frame.setVisible(false);
-                ACTION_FACTORY.showMessageDialog(frame, "mapDirDoesntExist");
+                ACTION_FACTORY.showMessageDialog(frame, "mapDirDoesntExist", mapDir);
                 return false;
             } else {
                 absScriptPath = mapDir.getAbsolutePath() + scriptPath;

Modified: trunk/daimonin/src/daieditor/messages.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages.properties	2006-12-15 22:01:25 UTC (rev 1083)
+++ trunk/daimonin/src/daieditor/messages.properties	2006-12-15 22:18:14 UTC (rev 1084)
@@ -57,7 +57,7 @@
 mapUnsaved.title=Map Not Saved
 mapUnsaved.message=Please save this map first.
 
-mapDirDoesntExist.title=Invalid Map Directory
+mapDirDoesntExist.title=Invalid map directory
 mapDirDoesntExist.message=The map directory "{0}" doesn''t exist.\nPlease select menu ''File->Options...'' and correct that.
 
 openFileWantedNoArches.title=Cannot open map


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




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)

gridarta-commit Mailing List for gridarta (Page 337)

gridarta-commit — svn commit digest list (high traffic)