Changeset 30053 in osm for applications/editors

Timestamp:

2013-11-17T10:21:17+01:00 (11 years ago)

Author:

belecker

Message:

JOSM/tracer2: Change server version format.

Location:

applications/editors/josm/plugins/tracer2

Files:

• LanguageGen/messages.po (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/tracer2/server/GetVersion.java (modified) (2 diffs)

applications/editors/josm/plugins/tracer2/LanguageGen/messages.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-13 21:53+0100\n"
+"POT-Creation-Date: 2013-11-17 10:17+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -51 +51 @@
 msgid ""
 "The Tracer2Server version isn''t compatible with this plugin. Please "
-"download version {0} from"
+"download version {0} from\n"
+"{1}."
 msgstr ""
 
@@ -65 +66 @@
 #, java-format
 msgid ""
-"New version of Tracer2Server is avalibel. For best results please upgrade to "
-"version {0}."
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
 msgstr ""
 
@@ -74 +75 @@
 
 #: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:248
-msgid "No set of parameter is activ!"
+msgid "No set of parameter is active!"
 msgstr ""
 
@@ -83 +84 @@
 #: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:333
 #, java-format
-msgid "Tracer2 add a Way with {0} points"
+msgid "Tracer2: add a way with {0} points"
 msgstr ""
 
 #: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:335
 #, java-format
-msgid "Tracer2 modified Way to {0} points"
+msgid "Tracer2: modify way to {0} points"
 msgstr ""
 
@@ -194 +195 @@
 
 #: ..\src\org\openstreetmap\josm\plugins\tracer2\server\Request.java:55
-msgid ""
-"Tracer2Server isn''t running. Pleas start the Server.\n"
-"If you don''t have the Server please download it at\n"
-"http://sourceforge.net/projects/tracer2server/."
+#, java-format
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{1}."
 msgstr ""
 
 #: ..\src\org\openstreetmap\josm\plugins\tracer2\server\Request.java:59
-msgid "Tracer2Server has nothing found."
+msgid "Tracer2Server hasn''t found anything."
 msgstr ""
 
 #: ..\src\org\openstreetmap\josm\plugins\tracer2\server\Request.java:73
-msgid "Tracer2Server has an Error detected."
-msgstr ""
+msgid "Tracer2Server has detected an error."
+msgstr ""

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/GetVersion.java

@@ -23 +23 @@
     public int m_nVersionMajor = -1;
     public int m_nVersionMinor = -1;
+    public int m_nVersionBuild = -1;
+    public int m_nVersionRevision = -1;
     
     /**
@@ -46 +48 @@
             
             String[] astrParts = strResponse.split(":");
-            if (astrParts.length != 2) {
+            if (astrParts.length < 2) {
                 return;
             }
-            int nMajor = Integer.parseInt(astrParts[0]);
-            int nMinor = Integer.parseInt(astrParts[1]);
-            m_nVersionMajor = nMajor;
-            m_nVersionMinor = nMinor;
+            if (astrParts.length > 0) m_nVersionMajor = Integer.parseInt(astrParts[0]);
+            if (astrParts.length > 1) m_nVersionMinor = Integer.parseInt(astrParts[1]);
+            if (astrParts.length > 2) m_nVersionBuild = Integer.parseInt(astrParts[2]);
+            if (astrParts.length > 3) m_nVersionMinor = Integer.parseInt(astrParts[3]);
         } catch (Exception e) {
         }