infos = loadLocallyAvailableModuleInformation(null);
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java (revision 30562)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java (revision 30563)
@@ -34,5 +34,5 @@
* without the need of loading any class from the module jar file.
*/
-public class ModuleInformation implements OdConstants {
+public class ModuleInformation {
public File file = null;
public String name = null;
@@ -218,5 +218,5 @@
sb.append(" ").append(tr("More info...")).append("");
}
- if (downloadlink != null && !downloadlink.startsWith(OSM_SITE+"dist/")) {
+ if (downloadlink != null && !downloadlink.startsWith(OdConstants.OSM_SITE+"dist/")) {
sb.append("
"+tr("Module provided by an external source: {0}", downloadlink)+"
");
}
@@ -347,5 +347,5 @@
public ImageIcon getScaledIcon() {
if (icon == null)
- return OdUtils.getImageIcon(ICON_EMPTY_24);
+ return OdUtils.getImageIcon(OdConstants.ICON_EMPTY_24);
return new ImageIcon(icon.getImage().getScaledInstance(24, 24, Image.SCALE_SMOOTH));
}
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ReadRemoteModuleInformationTask.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ReadRemoteModuleInformationTask.java (revision 30562)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ReadRemoteModuleInformationTask.java (revision 30563)
@@ -31,5 +31,4 @@
import org.openstreetmap.josm.io.OsmTransferException;
import org.openstreetmap.josm.plugins.opendata.OdPlugin;
-import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
import org.openstreetmap.josm.tools.ImageProvider;
import org.xml.sax.SAXException;
@@ -39,5 +38,5 @@
*
*/
-public class ReadRemoteModuleInformationTask extends PleaseWaitRunnable implements OdConstants {
+public class ReadRemoteModuleInformationTask extends PleaseWaitRunnable {
private Collection sites;
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/util/NamesFrUtils.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/util/NamesFrUtils.java (revision 30562)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/util/NamesFrUtils.java (revision 30563)
@@ -15,5 +15,5 @@
import org.openstreetmap.josm.plugins.opendata.core.datasets.SimpleDataSetHandler;
-public abstract class NamesFrUtils implements OdConstants {
+public abstract class NamesFrUtils {
private static Map dictionary = initDictionary();
@@ -34,5 +34,5 @@
try {
BufferedReader reader = new BufferedReader(new InputStreamReader(
- SimpleDataSetHandler.class.getResourceAsStream(DICTIONARY_FR), UTF8));
+ SimpleDataSetHandler.class.getResourceAsStream(OdConstants.DICTIONARY_FR), OdConstants.UTF8));
String line = reader.readLine(); // Skip first line
while ((line = reader.readLine()) != null) {
Index: /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test.cpg
===================================================================
--- /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test.cpg (revision 30563)
+++ /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test.cpg (revision 30563)
@@ -0,0 +1,1 @@
+UTF-8
Index: /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test.csv
===================================================================
--- /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test.csv (revision 30563)
+++ /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test.csv (revision 30563)
@@ -0,0 +1,6 @@
+X,Y,id,some_text
+13.605861338605969,45.804139637452899,1,à as italian località
+13.605861338605969,45.760093009107536,5,ù
+13.605183698169887,45.771612896520935,4,ò
+13.605183698169887,45.783132783934342,3,ì
+13.605861338605969,45.79397503091166,2,è
Index: /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test.kml
===================================================================
--- /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test.kml (revision 30563)
+++ /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test.kml (revision 30563)
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+utf8_test
+
+
+ 1
+ à as italian località
+
+ 13.605861338605969,45.804139637452899
+
+
+
+ 5
+ ù
+
+ 13.605861338605969,45.760093009107536
+
+
+
+ 4
+ ò
+
+ 13.605183698169887,45.771612896520935
+
+
+
+ 3
+ ì
+
+ 13.605183698169887,45.783132783934342
+
+
+
+ 2
+ è
+
+ 13.605861338605969,45.79397503091166
+
+
+
Index: /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test.prj
===================================================================
--- /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test.prj (revision 30563)
+++ /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test.prj (revision 30563)
@@ -0,0 +1,1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
Index: /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test.qpj
===================================================================
--- /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test.qpj (revision 30563)
+++ /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test.qpj (revision 30563)
@@ -0,0 +1,1 @@
+GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]
Index: /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test_qgis_24.qgs
===================================================================
--- /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test_qgis_24.qgs (revision 30563)
+++ /applications/editors/josm/plugins/opendata/test/data/regress/10214/utf8_test_qgis_24.qgs (revision 30563)
@@ -0,0 +1,332 @@
+
+
+
+
+
+
+
+
+
+
+
+ degrees
+
+ 13.57621456952735706
+ 45.72434747610418526
+ 13.75375636378098854
+ 45.83158407511425025
+
+ 1
+
+
+ +proj=longlat +datum=WGS84 +no_defs
+ 3452
+ 4326
+ EPSG:4326
+ WGS 84
+ longlat
+ WGS84
+ true
+
+
+
+
+
+
+
+
+
+
+ - utf8_test20140701014950994
+
+
+
+
+
+ utf8_test20140701014950994
+ ./utf8_test.shp
+
+
+
+
+
+ utf8_test
+
+
+ +proj=longlat +datum=WGS84 +no_defs
+ 3452
+ 4326
+ EPSG:4326
+ WGS 84
+ longlat
+ WGS84
+ true
+
+
+ ogr
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 0
+ id
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+ generatedlayout
+
+
+
+
+
+
+
+ +proj=longlat +datum=WGS84 +no_defs
+ EPSG:4326
+ 3452
+ 1
+
+
+ false
+
+
+ 0
+ 255
+ 255
+ 255
+ 255
+ 255
+ 255
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ true
+
+
+
Index: /applications/editors/josm/plugins/opendata/test/data/regress/7714/doc.kml
===================================================================
--- /applications/editors/josm/plugins/opendata/test/data/regress/7714/doc.kml (revision 30563)
+++ /applications/editors/josm/plugins/opendata/test/data/regress/7714/doc.kml (revision 30563)
@@ -0,0 +1,38 @@
+
+
+
+ Query Sites
+
+
+ Query Sites
+
+
+ MUNŢII ŢARCU
+
+ | Field Name | Field Value |
|---|
| SITENAME | MUNŢII ŢARCU |