[josm] 01/04: New upstream version 0.0.svn12921+dfsg
Bas Couwenberg
sebastic at debian.org
Tue Oct 3 21:39:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 0395f61081e61415bdb1c194ff147768aa93c39b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Oct 3 23:28:54 2017 +0200
New upstream version 0.0.svn12921+dfsg
---
REVISION | 10 +++++-----
data/defaultpresets.xml | 1 +
data_nodist/trans/ast.lang | Bin 8733 -> 8482 bytes
data_nodist/trans/be.lang | Bin 18299 -> 17844 bytes
data_nodist/trans/bg.lang | Bin 2433 -> 2427 bytes
data_nodist/trans/ca-valencia.lang | Bin 7752 -> 7523 bytes
data_nodist/trans/ca.lang | Bin 10413 -> 10187 bytes
data_nodist/trans/cs.lang | Bin 11579 -> 11281 bytes
data_nodist/trans/da.lang | Bin 10915 -> 10626 bytes
data_nodist/trans/de.lang | Bin 12328 -> 12000 bytes
data_nodist/trans/el.lang | Bin 1435 -> 1167 bytes
data_nodist/trans/en.lang | Bin 10042 -> 9791 bytes
data_nodist/trans/en_AU.lang | Bin 1520 -> 1385 bytes
data_nodist/trans/en_GB.lang | Bin 2112 -> 1977 bytes
data_nodist/trans/es.lang | Bin 12997 -> 12716 bytes
data_nodist/trans/et.lang | Bin 1412 -> 1406 bytes
data_nodist/trans/fi.lang | Bin 3033 -> 3027 bytes
data_nodist/trans/fr.lang | Bin 12638 -> 12344 bytes
data_nodist/trans/gl.lang | Bin 2983 -> 2845 bytes
data_nodist/trans/hu.lang | Bin 13339 -> 13009 bytes
data_nodist/trans/id.lang | Bin 6723 -> 6513 bytes
data_nodist/trans/it.lang | Bin 10308 -> 10046 bytes
data_nodist/trans/ja.lang | Bin 11610 -> 11294 bytes
data_nodist/trans/km.lang | Bin 16577 -> 16350 bytes
data_nodist/trans/lt.lang | Bin 2094 -> 1965 bytes
data_nodist/trans/nb.lang | Bin 1711 -> 1636 bytes
data_nodist/trans/nl.lang | Bin 12773 -> 12451 bytes
data_nodist/trans/pl.lang | Bin 5910 -> 5686 bytes
data_nodist/trans/pt.lang | Bin 13644 -> 13371 bytes
data_nodist/trans/pt_BR.lang | Bin 10116 -> 9842 bytes
data_nodist/trans/ru.lang | Bin 19151 -> 18696 bytes
data_nodist/trans/sk.lang | Bin 10867 -> 10603 bytes
data_nodist/trans/sv.lang | Bin 1334 -> 1328 bytes
data_nodist/trans/uk.lang | Bin 19539 -> 19087 bytes
data_nodist/trans/vi.lang | Bin 10614 -> 10354 bytes
data_nodist/trans/zh_CN.lang | Bin 7531 -> 8278 bytes
data_nodist/trans/zh_TW.lang | Bin 5341 -> 5069 bytes
.../josm/gui/bugreport/JosmUpdatePanel.java | 8 ++++----
.../datatransfer/importers/AbstractTagPaster.java | 3 ++-
.../importers/PrimitiveTagTransferPaster.java | 5 ++++-
src/org/openstreetmap/josm/tools/HttpClient.java | 2 +-
src/org/openstreetmap/josm/tools/PlatformHook.java | 2 +-
42 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/REVISION b/REVISION
index a6a9981..5ae6c40 100644
--- a/REVISION
+++ b/REVISION
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
- revision="12914"
kind="dir"
- path="trunk">
+ path="trunk"
+ revision="12921">
<url>https://josm.openstreetmap.de/svn/trunk</url>
<relative-url>^/trunk</relative-url>
<repository>
@@ -11,9 +11,9 @@
<uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
</repository>
<commit
- revision="12914">
-<author>bastiK</author>
-<date>2017-10-01T17:25:11.610775Z</date>
+ revision="12921">
+<author>Don-vip</author>
+<date>2017-10-03T19:43:00.819794Z</date>
</commit>
</entry>
</info>
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index eaeba11..b94a315 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -10557,6 +10557,7 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=vineyard" />
<space />
<key key="landuse" value="vineyard" />
+ <combo key="crop" text="Crop" values="grape" default="grape" values_context="crop" />
<reference ref="optional_name" />
</item> <!-- Vineyard -->
<item name="Greenhouse Horticulture" icon="presets/landuse/greenhouse_horticulture.svg" type="closedway,multipolygon" preset_name_label="true">
diff --git a/data_nodist/trans/ast.lang b/data_nodist/trans/ast.lang
index 90d3c81..2b4cd1f 100644
Binary files a/data_nodist/trans/ast.lang and b/data_nodist/trans/ast.lang differ
diff --git a/data_nodist/trans/be.lang b/data_nodist/trans/be.lang
index 05c0651..dad8200 100644
Binary files a/data_nodist/trans/be.lang and b/data_nodist/trans/be.lang differ
diff --git a/data_nodist/trans/bg.lang b/data_nodist/trans/bg.lang
index 3ad390a..e23f8a4 100644
Binary files a/data_nodist/trans/bg.lang and b/data_nodist/trans/bg.lang differ
diff --git a/data_nodist/trans/ca-valencia.lang b/data_nodist/trans/ca-valencia.lang
index 9273032..931b5ad 100644
Binary files a/data_nodist/trans/ca-valencia.lang and b/data_nodist/trans/ca-valencia.lang differ
diff --git a/data_nodist/trans/ca.lang b/data_nodist/trans/ca.lang
index d3274ec..6a5f22d 100644
Binary files a/data_nodist/trans/ca.lang and b/data_nodist/trans/ca.lang differ
diff --git a/data_nodist/trans/cs.lang b/data_nodist/trans/cs.lang
index 735a048..e3d9cfd 100644
Binary files a/data_nodist/trans/cs.lang and b/data_nodist/trans/cs.lang differ
diff --git a/data_nodist/trans/da.lang b/data_nodist/trans/da.lang
index 17cf73e..c7a7ff2 100644
Binary files a/data_nodist/trans/da.lang and b/data_nodist/trans/da.lang differ
diff --git a/data_nodist/trans/de.lang b/data_nodist/trans/de.lang
index ea67c4f..7b62d30 100644
Binary files a/data_nodist/trans/de.lang and b/data_nodist/trans/de.lang differ
diff --git a/data_nodist/trans/el.lang b/data_nodist/trans/el.lang
index 9f17df7..6ca1790 100644
Binary files a/data_nodist/trans/el.lang and b/data_nodist/trans/el.lang differ
diff --git a/data_nodist/trans/en.lang b/data_nodist/trans/en.lang
index 01e5734..57d55b4 100644
Binary files a/data_nodist/trans/en.lang and b/data_nodist/trans/en.lang differ
diff --git a/data_nodist/trans/en_AU.lang b/data_nodist/trans/en_AU.lang
index 2e44908..abe070f 100644
Binary files a/data_nodist/trans/en_AU.lang and b/data_nodist/trans/en_AU.lang differ
diff --git a/data_nodist/trans/en_GB.lang b/data_nodist/trans/en_GB.lang
index a3b3e67..9107083 100644
Binary files a/data_nodist/trans/en_GB.lang and b/data_nodist/trans/en_GB.lang differ
diff --git a/data_nodist/trans/es.lang b/data_nodist/trans/es.lang
index 73a8efd..adb8999 100644
Binary files a/data_nodist/trans/es.lang and b/data_nodist/trans/es.lang differ
diff --git a/data_nodist/trans/et.lang b/data_nodist/trans/et.lang
index 059c7fa..f39a903 100644
Binary files a/data_nodist/trans/et.lang and b/data_nodist/trans/et.lang differ
diff --git a/data_nodist/trans/fi.lang b/data_nodist/trans/fi.lang
index d245269..836d722 100644
Binary files a/data_nodist/trans/fi.lang and b/data_nodist/trans/fi.lang differ
diff --git a/data_nodist/trans/fr.lang b/data_nodist/trans/fr.lang
index 984ad89..e92cd05 100644
Binary files a/data_nodist/trans/fr.lang and b/data_nodist/trans/fr.lang differ
diff --git a/data_nodist/trans/gl.lang b/data_nodist/trans/gl.lang
index 26ddb63..c79f273 100644
Binary files a/data_nodist/trans/gl.lang and b/data_nodist/trans/gl.lang differ
diff --git a/data_nodist/trans/hu.lang b/data_nodist/trans/hu.lang
index 4015875..b5c833c 100644
Binary files a/data_nodist/trans/hu.lang and b/data_nodist/trans/hu.lang differ
diff --git a/data_nodist/trans/id.lang b/data_nodist/trans/id.lang
index 54fb264..e34feac 100644
Binary files a/data_nodist/trans/id.lang and b/data_nodist/trans/id.lang differ
diff --git a/data_nodist/trans/it.lang b/data_nodist/trans/it.lang
index 42bca10..bab06ef 100644
Binary files a/data_nodist/trans/it.lang and b/data_nodist/trans/it.lang differ
diff --git a/data_nodist/trans/ja.lang b/data_nodist/trans/ja.lang
index fbaa79e..e7d872d 100644
Binary files a/data_nodist/trans/ja.lang and b/data_nodist/trans/ja.lang differ
diff --git a/data_nodist/trans/km.lang b/data_nodist/trans/km.lang
index ebb95b6..fc5704b 100644
Binary files a/data_nodist/trans/km.lang and b/data_nodist/trans/km.lang differ
diff --git a/data_nodist/trans/lt.lang b/data_nodist/trans/lt.lang
index 7d63130..5c19e31 100644
Binary files a/data_nodist/trans/lt.lang and b/data_nodist/trans/lt.lang differ
diff --git a/data_nodist/trans/nb.lang b/data_nodist/trans/nb.lang
index 7cba002..9ec321c 100644
Binary files a/data_nodist/trans/nb.lang and b/data_nodist/trans/nb.lang differ
diff --git a/data_nodist/trans/nl.lang b/data_nodist/trans/nl.lang
index ed79d86..244f43a 100644
Binary files a/data_nodist/trans/nl.lang and b/data_nodist/trans/nl.lang differ
diff --git a/data_nodist/trans/pl.lang b/data_nodist/trans/pl.lang
index 5845da0..6d415eb 100644
Binary files a/data_nodist/trans/pl.lang and b/data_nodist/trans/pl.lang differ
diff --git a/data_nodist/trans/pt.lang b/data_nodist/trans/pt.lang
index c035ddb..2c5e399 100644
Binary files a/data_nodist/trans/pt.lang and b/data_nodist/trans/pt.lang differ
diff --git a/data_nodist/trans/pt_BR.lang b/data_nodist/trans/pt_BR.lang
index 7dde10c..be86185 100644
Binary files a/data_nodist/trans/pt_BR.lang and b/data_nodist/trans/pt_BR.lang differ
diff --git a/data_nodist/trans/ru.lang b/data_nodist/trans/ru.lang
index 4a71693..4e4c684 100644
Binary files a/data_nodist/trans/ru.lang and b/data_nodist/trans/ru.lang differ
diff --git a/data_nodist/trans/sk.lang b/data_nodist/trans/sk.lang
index 40d3628..3e0da77 100644
Binary files a/data_nodist/trans/sk.lang and b/data_nodist/trans/sk.lang differ
diff --git a/data_nodist/trans/sv.lang b/data_nodist/trans/sv.lang
index 4f25d16..05d51fd 100644
Binary files a/data_nodist/trans/sv.lang and b/data_nodist/trans/sv.lang differ
diff --git a/data_nodist/trans/uk.lang b/data_nodist/trans/uk.lang
index 7c797a7..790368a 100644
Binary files a/data_nodist/trans/uk.lang and b/data_nodist/trans/uk.lang differ
diff --git a/data_nodist/trans/vi.lang b/data_nodist/trans/vi.lang
index 3e74ea6..4aaca29 100644
Binary files a/data_nodist/trans/vi.lang and b/data_nodist/trans/vi.lang differ
diff --git a/data_nodist/trans/zh_CN.lang b/data_nodist/trans/zh_CN.lang
index ef474b0..c5444ea 100644
Binary files a/data_nodist/trans/zh_CN.lang and b/data_nodist/trans/zh_CN.lang differ
diff --git a/data_nodist/trans/zh_TW.lang b/data_nodist/trans/zh_TW.lang
index f336bef..65c4f86 100644
Binary files a/data_nodist/trans/zh_TW.lang and b/data_nodist/trans/zh_TW.lang differ
diff --git a/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java b/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java
index 38aac51..a935f72 100644
--- a/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java
+++ b/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java
@@ -35,7 +35,7 @@ public class JosmUpdatePanel extends JPanel {
super(new GridBagLayout());
josmVersion = Version.getInstance().getVersion();
- add(new JMultilineLabel(tr("Your current version of JOSM is {0}", josmVersion)), GBC.eol().fill(GBC.HORIZONTAL));
+ add(new JMultilineLabel(tr("Your current version of JOSM is {0}", Integer.toString(josmVersion))), GBC.eol().fill(GBC.HORIZONTAL));
testedVersionField = new JMultilineLabel(tr("JOSM is searching for updates..."));
add(testedVersionField, GBC.eol().fill(GBC.HORIZONTAL));
@@ -60,10 +60,10 @@ public class JosmUpdatePanel extends JPanel {
private static int getTestedVersion() {
try {
- String testedString = new WikiReader().read(Main.getJOSMWebsite() + "/wiki/TestedVersion?format=txt");
+ String testedString = new WikiReader().read(Main.getJOSMWebsite() + "/tested");
return Integer.parseInt(testedString.trim());
} catch (NumberFormatException | IOException e) {
- Logging.log(Logging.LEVEL_WARN, "Unable to detect latest version of JOSM:", e);
+ Logging.log(Logging.LEVEL_WARN, "Unable to detect current tested version of JOSM:", e);
return -1;
}
}
@@ -82,7 +82,7 @@ public class JosmUpdatePanel extends JPanel {
private void displayOutOfDate(int testedVersion) {
testedVersionField
- .setText(tr("JOSM is out of date. The current version is {0}. Try updating JOSM.", testedVersion));
+ .setText(tr("JOSM is out of date. The current version is {0}. Try updating JOSM.", Integer.toString(testedVersion)));
showUpdateButton();
}
diff --git a/src/org/openstreetmap/josm/gui/datatransfer/importers/AbstractTagPaster.java b/src/org/openstreetmap/josm/gui/datatransfer/importers/AbstractTagPaster.java
index 317fa18..74ac481 100644
--- a/src/org/openstreetmap/josm/gui/datatransfer/importers/AbstractTagPaster.java
+++ b/src/org/openstreetmap/josm/gui/datatransfer/importers/AbstractTagPaster.java
@@ -13,6 +13,7 @@ import java.util.Map;
import javax.swing.TransferHandler.TransferSupport;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.command.ChangePropertyCommand;
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.command.SequenceCommand;
@@ -47,7 +48,7 @@ public abstract class AbstractTagPaster extends AbstractOsmDataPaster {
@Override
public boolean importTagsOn(TransferSupport support, Collection<? extends OsmPrimitive> selection)
throws UnsupportedFlavorException, IOException {
- ChangePropertyCommand command = new ChangePropertyCommand(selection, getTags(support));
+ ChangePropertyCommand command = new ChangePropertyCommand(Main.main.getEditDataSet(), selection, getTags(support));
commitCommands(selection, Collections.singletonList(command));
return true;
}
diff --git a/src/org/openstreetmap/josm/gui/datatransfer/importers/PrimitiveTagTransferPaster.java b/src/org/openstreetmap/josm/gui/datatransfer/importers/PrimitiveTagTransferPaster.java
index 344d8a2..6ec5d76 100644
--- a/src/org/openstreetmap/josm/gui/datatransfer/importers/PrimitiveTagTransferPaster.java
+++ b/src/org/openstreetmap/josm/gui/datatransfer/importers/PrimitiveTagTransferPaster.java
@@ -7,6 +7,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.EnumMap;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -49,7 +50,9 @@ public class PrimitiveTagTransferPaster extends AbstractTagPaster {
TagPasteSupport tagPaster = new TagPasteSupport(data, selection);
List<Command> commands = new ArrayList<>();
for (Tag tag : tagPaster.execute()) {
- ChangePropertyCommand cmd = new ChangePropertyCommand(selection, tag.getKey(), "".equals(tag.getValue()) ? null : tag.getValue());
+ Map<String, String> tags = new HashMap<>(1);
+ tags.put(tag.getKey(), "".equals(tag.getValue()) ? null : tag.getValue());
+ ChangePropertyCommand cmd = new ChangePropertyCommand(Main.main.getEditDataSet(), selection, tags);
if (cmd.getObjectsNumber() > 0) {
commands.add(cmd);
}
diff --git a/src/org/openstreetmap/josm/tools/HttpClient.java b/src/org/openstreetmap/josm/tools/HttpClient.java
index 1c29e6c..0211d5d 100644
--- a/src/org/openstreetmap/josm/tools/HttpClient.java
+++ b/src/org/openstreetmap/josm/tools/HttpClient.java
@@ -140,7 +140,7 @@ public final class HttpClient {
if (DefaultAuthenticator.getInstance().isEnabled() && connection.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED) {
DefaultAuthenticator.getInstance().addFailedCredentialHost(url.getHost());
}
- } catch (IOException e) {
+ } catch (IOException | IllegalArgumentException e) {
Logging.info("{0} {1} -> !!!", requestMethod, url);
Logging.warn(e);
//noinspection ThrowableResultOfMethodCallIgnored
diff --git a/src/org/openstreetmap/josm/tools/PlatformHook.java b/src/org/openstreetmap/josm/tools/PlatformHook.java
index a6e436c..4b7ec50 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHook.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHook.java
@@ -46,7 +46,7 @@ public interface PlatformHook {
@Override
public PlatformHook visitOsx() {
- return new PlatformHookUnixoid();
+ return new PlatformHookOsx();
}
};
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git
More information about the Pkg-grass-devel
mailing list