Revision: 5252
http://sourceforge.net/p/jump-pilot/code/5252
Author: michaudm
Date: 2016-12-10 18:55:50 +0000 (Sat, 10 Dec 2016)
Log Message:
-----------
Sort SRS list in WMS SRS chooser + fix some I18N
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/SRSWizardPanel.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/SelectUrlWithAuthPanel.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/URLWizardPanel.java
core/trunk/src/language/jump.properties
core/trunk/src/language/jump_cz.properties
core/trunk/src/language/jump_de.properties
core/trunk/src/language/jump_es.properties
core/trunk/src/language/jump_fi.properties
core/trunk/src/language/jump_fr.properties
core/trunk/src/language/jump_hu.properties
core/trunk/src/language/jump_it.properties
core/trunk/src/language/jump_ja_JP.properties
core/trunk/src/language/jump_ml.properties
core/trunk/src/language/jump_pt.properties
core/trunk/src/language/jump_pt_BR.properties
core/trunk/src/language/jump_ta_IN.properties
core/trunk/src/language/jump_te.properties
core/trunk/src/language/jump_zh_CN.properties
core/trunk/src/language/jump_zh_HK.properties
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/SRSWizardPanel.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/SRSWizardPanel.java
2016-12-06 22:38:06 UTC (rev 5251)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/SRSWizardPanel.java
2016-12-10 18:55:50 UTC (rev 5252)
@@ -39,9 +39,9 @@
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JComboBox;
@@ -115,10 +115,31 @@
dataMap.put(URLWizardPanel.FORMAT_KEY, formatBox.getSelectedItem());
}
+ private static Pattern NB = Pattern.compile("(\\d+)$");
+
+ private static Comparator<String> cleverStringComparator = new
Comparator<String>() {
+ @Override
+ public int compare(String o1, String o2) {
+ Matcher m1 = NB.matcher(o1);
+ Matcher m2 = NB.matcher(o2);
+ if (m1.find() && m2.find() &&
m1.replaceAll("").equals(m2.replaceAll(""))) {
+ m1 = NB.matcher(o1);
+ m2 = NB.matcher(o2);
+ m1.find(); m2.find();
+ return new Integer(m1.group(1).replaceAll("^0+",""))
+ .compareTo(new
Integer(m2.group(1).replaceAll("^0+","")));
+ }
+ else return o1.compareTo(o2);
+ }
+ };
+
private List getCommonSrsList() {
+ List<String> list = (List<String>)dataMap.get(COMMON_SRS_LIST_KEY);
+ Collections.sort(list, cleverStringComparator);
return (List) dataMap.get(COMMON_SRS_LIST_KEY);
}
+
public void enteredFromLeft(Map dataMap) {
this.dataMap = dataMap;
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/SelectUrlWithAuthPanel.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/SelectUrlWithAuthPanel.java
2016-12-06 22:38:06 UTC (rev 5251)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/SelectUrlWithAuthPanel.java
2016-12-10 18:55:50 UTC (rev 5252)
@@ -52,13 +52,13 @@
public JPanel createUrlPanel() {
urlLabel = new JLabel();
- urlLabel.setText(I18N.get("GenericNames.url"));
+ urlLabel.setText(I18N.get("ui.GenericNames.url"));
userLabel = new JLabel();
- userLabel.setText(I18N.get("GenericNames.user"));
+ userLabel.setText(I18N.get("ui.GenericNames.user"));
passLabel = new JLabel();
- passLabel.setText(I18N.get("GenericNames.password"));
+ passLabel.setText(I18N.get("ui.GenericNames.password"));
JLabel showLabel = new JLabel();
- showLabel.setText(I18N.get("GenericNames.show"));
+ showLabel.setText(I18N.get("ui.GenericNames.show"));
user = new JTextField();
pass = new JPasswordField();
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/URLWizardPanel.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/URLWizardPanel.java
2016-12-06 22:38:06 UTC (rev 5251)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/URLWizardPanel.java
2016-12-10 18:55:50 UTC (rev 5252)
@@ -87,7 +87,7 @@
// [UT]
public static final String VERSION_KEY = "WMS_VERSION";
- public static final String TITLE = I18N.get(I18N_PREFIX + "select-wms-url");
+ public static final String TITLE = I18N.get(I18N_PREFIX +
"select-uniform-resource-locator-url");
// this is a hack, guess why
public static String wmsVersion = WMService.WMS_1_1_1;
@@ -142,7 +142,7 @@
0, 0, 0), 0, 0));
JPanel versionPanel = createVersionPanel();
-
versionPanel.setBorder(BorderFactory.createTitledBorder(I18N.get("GenericNames.version")));
+
versionPanel.setBorder(BorderFactory.createTitledBorder(I18N.get("ui.GenericNames.version")));
keepNorth.add(versionPanel, new GridBagConstraints(0, 1,
1, 1, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL,
new Insets(0, 0, 0, 0), 0, 0));
Modified: core/trunk/src/language/jump.properties
===================================================================
--- core/trunk/src/language/jump.properties 2016-12-06 22:38:06 UTC (rev
5251)
+++ core/trunk/src/language/jump.properties 2016-12-10 18:55:50 UTC (rev
5252)
@@ -1978,14 +1978,19 @@
ui.GenericNames.is-covered-by = is-covered-by
ui.GenericNames.is-within-distance = is within distance
ui.GenericNames.overlaps = overlaps
+ui.GenericNames.password = Password
ui.GenericNames.select-attribute = select attribute
ui.GenericNames.select-layer = select layer
+ui.GenericNames.show = Show
ui.GenericNames.similar = similar (Hausdorff dist)
ui.GenericNames.touches = touches
ui.GenericNames.within = within
ui.GenericNames.Temporal-layer = Temporal layer
ui.GenericNames.Temporal-layers = Temporal layers
ui.GenericNames.Temporal-layers-found = Temporal layers found
+ui.GenericNames.url = URL
+ui.GenericNames.user = User
+ui.GenericNames.version = Version
ui.GeometryEditor.unsupported-geometry-classes-should-be-caught-in-the-GeometryEditorOperation
= Unsupported Geometry classes should be caught in the GeometryEditorOperation.
ui.GeometryInfoTab.attributes = Attributes
ui.GeometryInfoTab.geometries = Geometries
Modified: core/trunk/src/language/jump_cz.properties
===================================================================
--- core/trunk/src/language/jump_cz.properties 2016-12-06 22:38:06 UTC (rev
5251)
+++ core/trunk/src/language/jump_cz.properties 2016-12-10 18:55:50 UTC (rev
5252)
@@ -2753,4 +2753,9 @@
ui.GenericNames.interior-point-intersects=#T:interior point intersects
ui.GenericNames.intersects-interior-point=#T:intersects interior point
org.openjump.core.ui.plugin.queries.Operator.intip=#T:intersects interior point
-org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
\ No newline at end of file
+org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
+ui.GenericNames.password=#T:Password
+ui.GenericNames.show=#T:Show
+ui.GenericNames.user=#T:User
+ui.GenericNames.version=#T:Version
+ui.GenericNames.url=URL
\ No newline at end of file
Modified: core/trunk/src/language/jump_de.properties
===================================================================
--- core/trunk/src/language/jump_de.properties 2016-12-06 22:38:06 UTC (rev
5251)
+++ core/trunk/src/language/jump_de.properties 2016-12-10 18:55:50 UTC (rev
5252)
@@ -2749,4 +2749,9 @@
ui.GenericNames.interior-point-intersects=#T:interior point intersects
ui.GenericNames.intersects-interior-point=#T:intersects interior point
org.openjump.core.ui.plugin.queries.Operator.intip=#T:intersects interior point
-org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
\ No newline at end of file
+org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
+ui.GenericNames.password=#T:Password
+ui.GenericNames.show=#T:Show
+ui.GenericNames.user=#T:User
+ui.GenericNames.version=#T:Version
+ui.GenericNames.url=URL
\ No newline at end of file
Modified: core/trunk/src/language/jump_es.properties
===================================================================
--- core/trunk/src/language/jump_es.properties 2016-12-06 22:38:06 UTC (rev
5251)
+++ core/trunk/src/language/jump_es.properties 2016-12-10 18:55:50 UTC (rev
5252)
@@ -2732,4 +2732,9 @@
ui.GenericNames.interior-point-intersects=#T:interior point intersects
ui.GenericNames.intersects-interior-point=#T:intersects interior point
org.openjump.core.ui.plugin.queries.Operator.intip=#T:intersects interior point
-org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
\ No newline at end of file
+org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
+ui.GenericNames.password=#T:Password
+ui.GenericNames.show=#T:Show
+ui.GenericNames.user=#T:User
+ui.GenericNames.version=#T:Version
+ui.GenericNames.url=URL
\ No newline at end of file
Modified: core/trunk/src/language/jump_fi.properties
===================================================================
--- core/trunk/src/language/jump_fi.properties 2016-12-06 22:38:06 UTC (rev
5251)
+++ core/trunk/src/language/jump_fi.properties 2016-12-10 18:55:50 UTC (rev
5252)
@@ -2726,4 +2726,9 @@
ui.GenericNames.interior-point-intersects=#T:interior point intersects
ui.GenericNames.intersects-interior-point=#T:intersects interior point
org.openjump.core.ui.plugin.queries.Operator.intip=#T:intersects interior point
-org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
\ No newline at end of file
+org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
+ui.GenericNames.password=#T:Password
+ui.GenericNames.show=#T:Show
+ui.GenericNames.user=#T:User
+ui.GenericNames.version=#T:Version
+ui.GenericNames.url=URL
\ No newline at end of file
Modified: core/trunk/src/language/jump_fr.properties
===================================================================
--- core/trunk/src/language/jump_fr.properties 2016-12-06 22:38:06 UTC (rev
5251)
+++ core/trunk/src/language/jump_fr.properties 2016-12-10 18:55:50 UTC (rev
5252)
@@ -2756,4 +2756,9 @@
ui.GenericNames.interior-point-intersects=le point int\xE9rieur intersecte
ui.GenericNames.intersects-interior-point=intersecte le point int\xE9rieur
org.openjump.core.ui.plugin.queries.Operator.intip=intersecte le point
int\xE9rieur
-org.openjump.core.ui.plugin.queries.Operator.ipint=le point int\xE9rieur
intersecte
\ No newline at end of file
+org.openjump.core.ui.plugin.queries.Operator.ipint=le point int\xE9rieur
intersecte
+ui.GenericNames.password=Mot de passe
+ui.GenericNames.show=Montrer
+ui.GenericNames.user=Utilisateur
+ui.GenericNames.version=Version
+ui.GenericNames.url=URL
\ No newline at end of file
Modified: core/trunk/src/language/jump_hu.properties
===================================================================
--- core/trunk/src/language/jump_hu.properties 2016-12-06 22:38:06 UTC (rev
5251)
+++ core/trunk/src/language/jump_hu.properties 2016-12-10 18:55:50 UTC (rev
5252)
@@ -2749,4 +2749,9 @@
ui.GenericNames.interior-point-intersects=#T:interior point intersects
ui.GenericNames.intersects-interior-point=#T:intersects interior point
org.openjump.core.ui.plugin.queries.Operator.intip=#T:intersects interior point
-org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
\ No newline at end of file
+org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
+ui.GenericNames.password=#T:Password
+ui.GenericNames.show=#T:Show
+ui.GenericNames.user=#T:User
+ui.GenericNames.version=#T:Version
+ui.GenericNames.url=URL
\ No newline at end of file
Modified: core/trunk/src/language/jump_it.properties
===================================================================
--- core/trunk/src/language/jump_it.properties 2016-12-06 22:38:06 UTC (rev
5251)
+++ core/trunk/src/language/jump_it.properties 2016-12-10 18:55:50 UTC (rev
5252)
@@ -2733,3 +2733,8 @@
ui.GenericNames.intersects-interior-point=#T:intersects interior point
org.openjump.core.ui.plugin.queries.Operator.intip=#T:intersects interior point
org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
+ui.GenericNames.password=#T:Password
+ui.GenericNames.show=#T:Show
+ui.GenericNames.user=#T:User
+ui.GenericNames.version=#T:Version
+ui.GenericNames.url=URL
Modified: core/trunk/src/language/jump_ja_JP.properties
===================================================================
--- core/trunk/src/language/jump_ja_JP.properties 2016-12-06 22:38:06 UTC
(rev 5251)
+++ core/trunk/src/language/jump_ja_JP.properties 2016-12-10 18:55:50 UTC
(rev 5252)
@@ -2751,4 +2751,9 @@
ui.GenericNames.interior-point-intersects=#T:interior point intersects
ui.GenericNames.intersects-interior-point=#T:intersects interior point
org.openjump.core.ui.plugin.queries.Operator.intip=#T:intersects interior point
-org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
\ No newline at end of file
+org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
+ui.GenericNames.password=#T:Password
+ui.GenericNames.show=#T:Show
+ui.GenericNames.user=#T:User
+ui.GenericNames.version=#T:Version
+ui.GenericNames.url=URL
\ No newline at end of file
Modified: core/trunk/src/language/jump_ml.properties
===================================================================
--- core/trunk/src/language/jump_ml.properties 2016-12-06 22:38:06 UTC (rev
5251)
+++ core/trunk/src/language/jump_ml.properties 2016-12-10 18:55:50 UTC (rev
5252)
@@ -4022,4 +4022,9 @@
ui.GenericNames.interior-point-intersects=#T:interior point intersects
ui.GenericNames.intersects-interior-point=#T:intersects interior point
org.openjump.core.ui.plugin.queries.Operator.intip=#T:intersects interior point
-org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
\ No newline at end of file
+org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
+ui.GenericNames.password=#T:Password
+ui.GenericNames.show=#T:Show
+ui.GenericNames.user=#T:User
+ui.GenericNames.version=#T:Version
+ui.GenericNames.url=URL
\ No newline at end of file
Modified: core/trunk/src/language/jump_pt.properties
===================================================================
--- core/trunk/src/language/jump_pt.properties 2016-12-06 22:38:06 UTC (rev
5251)
+++ core/trunk/src/language/jump_pt.properties 2016-12-10 18:55:50 UTC (rev
5252)
@@ -2747,4 +2747,9 @@
ui.GenericNames.interior-point-intersects=#T:interior point intersects
ui.GenericNames.intersects-interior-point=#T:intersects interior point
org.openjump.core.ui.plugin.queries.Operator.intip=#T:intersects interior point
-org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
\ No newline at end of file
+org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
+ui.GenericNames.password=#T:Password
+ui.GenericNames.show=#T:Show
+ui.GenericNames.user=#T:User
+ui.GenericNames.version=#T:Version
+ui.GenericNames.url=URL
\ No newline at end of file
Modified: core/trunk/src/language/jump_pt_BR.properties
===================================================================
--- core/trunk/src/language/jump_pt_BR.properties 2016-12-06 22:38:06 UTC
(rev 5251)
+++ core/trunk/src/language/jump_pt_BR.properties 2016-12-10 18:55:50 UTC
(rev 5252)
@@ -2748,4 +2748,9 @@
ui.GenericNames.interior-point-intersects=#T:interior point intersects
ui.GenericNames.intersects-interior-point=#T:intersects interior point
org.openjump.core.ui.plugin.queries.Operator.intip=#T:intersects interior point
-org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
\ No newline at end of file
+org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
+ui.GenericNames.password=#T:Password
+ui.GenericNames.show=#T:Show
+ui.GenericNames.user=#T:User
+ui.GenericNames.version=#T:Version
+ui.GenericNames.url=URL
\ No newline at end of file
Modified: core/trunk/src/language/jump_ta_IN.properties
===================================================================
--- core/trunk/src/language/jump_ta_IN.properties 2016-12-06 22:38:06 UTC
(rev 5251)
+++ core/trunk/src/language/jump_ta_IN.properties 2016-12-10 18:55:50 UTC
(rev 5252)
@@ -2750,4 +2750,9 @@
ui.GenericNames.interior-point-intersects=#T:interior point intersects
ui.GenericNames.intersects-interior-point=#T:intersects interior point
org.openjump.core.ui.plugin.queries.Operator.intip=#T:intersects interior point
-org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
\ No newline at end of file
+org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
+ui.GenericNames.password=#T:Password
+ui.GenericNames.show=#T:Show
+ui.GenericNames.user=#T:User
+ui.GenericNames.version=#T:Version
+ui.GenericNames.url=#T:URL
\ No newline at end of file
Modified: core/trunk/src/language/jump_te.properties
===================================================================
--- core/trunk/src/language/jump_te.properties 2016-12-06 22:38:06 UTC (rev
5251)
+++ core/trunk/src/language/jump_te.properties 2016-12-10 18:55:50 UTC (rev
5252)
@@ -3256,4 +3256,9 @@
ui.GenericNames.interior-point-intersects=#T:interior point intersects
ui.GenericNames.intersects-interior-point=#T:intersects interior point
org.openjump.core.ui.plugin.queries.Operator.intip=#T:intersects interior point
-org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
\ No newline at end of file
+org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
+ui.GenericNames.password=#T:Password
+ui.GenericNames.show=#T:Show
+ui.GenericNames.user=#T:User
+ui.GenericNames.version=#T:Version
+ui.GenericNames.url=#T:URL
\ No newline at end of file
Modified: core/trunk/src/language/jump_zh_CN.properties
===================================================================
--- core/trunk/src/language/jump_zh_CN.properties 2016-12-06 22:38:06 UTC
(rev 5251)
+++ core/trunk/src/language/jump_zh_CN.properties 2016-12-10 18:55:50 UTC
(rev 5252)
@@ -2911,4 +2911,9 @@
ui.GenericNames.interior-point-intersects=#T:interior point intersects
ui.GenericNames.intersects-interior-point=#T:intersects interior point
org.openjump.core.ui.plugin.queries.Operator.intip=#T:intersects interior point
-org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
\ No newline at end of file
+org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
+ui.GenericNames.password=#T:Password
+ui.GenericNames.show=#T:Show
+ui.GenericNames.user=#T:User
+ui.GenericNames.version=#T:Version
+ui.GenericNames.url=#T:URL
\ No newline at end of file
Modified: core/trunk/src/language/jump_zh_HK.properties
===================================================================
--- core/trunk/src/language/jump_zh_HK.properties 2016-12-06 22:38:06 UTC
(rev 5251)
+++ core/trunk/src/language/jump_zh_HK.properties 2016-12-10 18:55:50 UTC
(rev 5252)
@@ -2912,4 +2912,9 @@
ui.GenericNames.interior-point-intersects=#T:interior point intersects
ui.GenericNames.intersects-interior-point=
org.openjump.core.ui.plugin.queries.Operator.ipint=#T:interior point intersects
-org.openjump.core.ui.plugin.queries.Operator.intip=#T:intersects interior point
\ No newline at end of file
+org.openjump.core.ui.plugin.queries.Operator.intip=#T:intersects interior point
+ui.GenericNames.password=#T:Password
+ui.GenericNames.show=#T:Show
+ui.GenericNames.user=#T:User
+ui.GenericNames.version=#T:Version
+ui.GenericNames.url=#T:URL
\ No newline at end of file
------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
