[josm-plugins] 01/06: Imported Upstream version 0.0.svn31964+ds
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Jan 7 21:03:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm-plugins.
commit bc2d1e1c18ad5a6e1cd6c1896a937090afb32582
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Jan 7 20:28:21 2016 +0100
Imported Upstream version 0.0.svn31964+ds
---
DirectUpload/build.xml | 6 +++---
.../openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java | 10 ++--------
build-common.xml | 2 +-
editgpx/build.xml | 4 ++--
lakewalker/build.xml | 2 +-
measurement/build.xml | 2 +-
routing/build.xml | 4 ++--
svn-info.xml | 10 +++++-----
8 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/DirectUpload/build.xml b/DirectUpload/build.xml
index 2c291ad..4f91846 100644
--- a/DirectUpload/build.xml
+++ b/DirectUpload/build.xml
@@ -4,16 +4,16 @@
<!-- enter the SVN commit message -->
<property name="commit.message" value="applied JOSM Ticket 4498 (patch by ax) - oauth support for gpx upload (I accidentally committed parts of the path in [24236])"/>
<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
- <property name="plugin.main.version" value="9179"/>
+ <property name="plugin.main.version" value="9314"/>
<!-- Configure these properties (replace "..." accordingly).
- See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
+ See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
-->
<property name="plugin.author" value="Subhodip Biswas"/>
<property name="plugin.class" value="org.openstreetmap.josm.plugins.DirectUpload.UploadDataGuiPlugin"/>
<property name="plugin.description" value="This plugin directly upload GPS Traces from current active layer in JOSM to openstreetmap.org."/>
<property name="plugin.icon" value="images/UploadAction.png"/>
- <property name="plugin.link" value="http://wiki.openstreetmap.org/index.php/User:Subhodip/GSoC_Doc#DirectUpload_Plugin_in_JOSM_:"/>
+ <property name="plugin.link" value="https://wiki.openstreetmap.org/index.php/User:Subhodip/GSoC_Doc#DirectUpload_Plugin_in_JOSM_:"/>
<!--<property name="plugin.early" value="..."/>-->
<!--<property name="plugin.requires" value="..."/>-->
<!--<property name="plugin.stage" value="..."/>-->
diff --git a/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java b/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java
index 331a229..53137ed 100644
--- a/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java
+++ b/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java
@@ -221,9 +221,6 @@ public class UploadDataGui extends ExtendedDialog {
description = description.replaceAll("[&?/\\\\]", " ");
tags = tags.replaceAll("[&?/\\\\.;]", " ");
- // Set progress dialog to indeterminate while connecting
- progressMonitor.indeterminateSubTask(tr("Connecting..."));
-
// Generate data for upload
ByteArrayOutputStream baos = new ByteArrayOutputStream();
writeGpxFile(baos, "file", gpxData);
@@ -234,12 +231,9 @@ public class UploadDataGui extends ExtendedDialog {
HttpClient conn = setupConnection(baos.size());
- progressMonitor.setTicksCount(baos.size());
- progressMonitor.subTask(null);
-
// FIXME previous method allowed to see real % progress (each 10 Kb of data)
//flushToServer(bais, conn.getOutputStream(), progressMonitor);
- Response response = conn.setRequestBody(baos.toByteArray()).connect(progressMonitor);
+ Response response = conn.setRequestBody(baos.toByteArray()).connect(progressMonitor.createSubTaskMonitor(1, false));
if (canceled) {
response.disconnect();
@@ -288,7 +282,7 @@ public class UploadDataGui extends ExtendedDialog {
URL url = new URL(OsmApi.getOsmApi().getBaseUrl() + "gpx/create");
// Set up connection and log in
- HttpClient c = HttpClient.create(url, "POST").setFixedLengthStreamingMode(contentLength).setConnectTimeout(15000);
+ HttpClient c = HttpClient.create(url, "POST").setConnectTimeout(15000);
// unfortunately, addAuth() is protected, so we need to subclass OsmConnection
// XXX make addAuth public.
UploadOsmConnection.getInstance().addAuthHack(c);
diff --git a/build-common.xml b/build-common.xml
index 69ccb99..4278661 100644
--- a/build-common.xml
+++ b/build-common.xml
@@ -14,7 +14,7 @@
<property name="josm" location="../../core/dist/josm-custom.jar"/>
<property name="josm.test.build.dir" location="../../core/test/build"/>
- <property name="groovy.jar" location="../00_core_tools/groovy-all-2.4.5.jar"/>
+ <property name="groovy.jar" location="../00_core_tools/groovy-all-2.4.6-SNAPSHOT.jar"/>
<property name="plugin.build.dir" location="build"/>
<property name="plugin.test.dir" location="test"/>
<property name="plugin.src.dir" location="src"/>
diff --git a/editgpx/build.xml b/editgpx/build.xml
index d09f405..d423eb3 100644
--- a/editgpx/build.xml
+++ b/editgpx/build.xml
@@ -6,13 +6,13 @@
<property name="plugin.main.version" value="7001"/>
<!-- Configure these properties (replace "..." accordingly).
- See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
+ See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
-->
<property name="plugin.author" value="Martin Garbe"/>
<property name="plugin.class" value="org.openstreetmap.josm.plugins.editgpx.EditGpxPlugin"/>
<property name="plugin.description" value="Allows the user to anonymize timestamps and delete parts of huge GPX tracks very fast."/>
<property name="plugin.icon" value="images/mapmode/editgpx_mode.png"/>
- <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/EditGpx"/>
+ <property name="plugin.link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/EditGpx"/>
<!-- ** include targets that all plugins have in common ** -->
<import file="../build-common.xml"/>
diff --git a/lakewalker/build.xml b/lakewalker/build.xml
index acf2f6a..de59fd5 100644
--- a/lakewalker/build.xml
+++ b/lakewalker/build.xml
@@ -7,7 +7,7 @@
<property name="plugin.main.version" value="7001"/>
<!-- Configure these properties (replace "..." accordingly).
- See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
+ See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
-->
<property name="plugin.author" value="Brent Easton, Jason Reid"/>
<property name="plugin.class" value="org.openstreetmap.josm.plugins.lakewalker.LakewalkerPlugin"/>
diff --git a/measurement/build.xml b/measurement/build.xml
index 244d1f8..ff8e034 100644
--- a/measurement/build.xml
+++ b/measurement/build.xml
@@ -7,7 +7,7 @@
<property name="plugin.canloadatruntime" value="true"/>
<!-- Configure these properties (replace "..." accordingly).
- See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
+ See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
-->
<property name="plugin.author" value="Raphael Mack, Reza Mohammadi"/>
<property name="plugin.class" value="org.openstreetmap.josm.plugins.measurement.MeasurementPlugin"/>
diff --git a/routing/build.xml b/routing/build.xml
index 24de079..e8e2ce9 100644
--- a/routing/build.xml
+++ b/routing/build.xml
@@ -53,7 +53,7 @@
************************************************
** configure these properties. Most of them will be copied to the plugins
** manifest file. Property values will also show up in the list available
- ** plugins: http://josm.openstreetmap.de/wiki/Plugins.
+ ** plugins: https://josm.openstreetmap.de/wiki/Plugins.
**
************************************************
-->
@@ -63,7 +63,7 @@
<attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
<attribute name="Plugin-Description" value="Provides routing capabilities."/>
<attribute name="Plugin-Icon" value="images/preferences/routing.png"/>
- <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Routing"/>
+ <attribute name="Plugin-Link" value="https://wiki.openstreetmap.org/index.php/JOSM/Plugins/Routing"/>
<attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
<attribute name="Plugin-Stage" value="50"/>
<attribute name="Plugin-Requires" value="log4j"/>
diff --git a/svn-info.xml b/svn-info.xml
index eb275eb..57b58cc 100644
--- a/svn-info.xml
+++ b/svn-info.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
- revision="31893"
kind="dir"
- path="plugins">
+ path="plugins"
+ revision="31964">
<url>https://svn.openstreetmap.org/applications/editors/josm/plugins</url>
<relative-url>^/applications/editors/josm/plugins</relative-url>
<repository>
@@ -11,9 +11,9 @@
<uuid>b9d5c4c9-76e1-0310-9c85-f3177eceb1e4</uuid>
</repository>
<commit
- revision="31890">
-<author>donvip</author>
-<date>2015-12-30T22:11:38.692650Z</date>
+ revision="31963">
+<author>holgermappt</author>
+<date>2016-01-07T18:34:38.218545Z</date>
</commit>
</entry>
</info>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git
More information about the Pkg-grass-devel
mailing list