Author: gmascellani-guest
Date: 2009-07-17 13:56:59 +0000 (Fri, 17 Jul 2009)
New Revision: 2376
Modified:
packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
Log:
Advances to latest upstream revision
Modified: packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
2009-07-17 13:56:31 UTC (rev 2375)
+++ packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
2009-07-17 13:56:59 UTC (rev 2376)
@@ -6,9 +6,21 @@
## DP: * Backport recent code
@DPATCH@
+diff -urNad
trunk~/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java
trunk/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java
+---
trunk~/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java
2009-06-06 22:25:31.000000000 +0200
++++
trunk/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java
2009-07-17 15:55:16.000000000 +0200
+@@ -102,7 +102,7 @@
+ private void openAsData(File file) throws SAXException, IOException,
FileNotFoundException {
+ String fn = file.getName();
+ if (new OsmImporter().acceptFile(file)) {
+- DataSet dataSet = OsmReader.parseDataSet(new
FileInputStream(file), null, Main.pleaseWaitDlg);
++ DataSet dataSet = OsmReader.parseDataSet(new
FileInputStream(file), Main.pleaseWaitDlg);
+ OsmDataLayer layer = new OsmDataLayer(dataSet, fn, file);
+ Main.main.addLayer(layer);
+ }
diff -urNad trunk~/surveyor/build.xml trunk/surveyor/build.xml
---- trunk~/surveyor/build.xml 2009-03-08 14:39:18.000000000 +0100
-+++ trunk/surveyor/build.xml 2009-04-05 01:29:11.000000000 +0200
+--- trunk~/surveyor/build.xml 2009-07-09 14:36:03.000000000 +0200
++++ trunk/surveyor/build.xml 2009-07-17 15:54:41.000000000 +0200
@@ -19,7 +19,7 @@
</classpath>
</javac>
@@ -18,35 +30,3 @@
<copy todir="${plugin.build.dir}/">
<fileset dir="resources">
<include name="*.xml"/>
-diff -urNad
trunk~/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java
trunk/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java
----
trunk~/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java
2009-02-01 21:50:42.000000000 +0100
-+++
trunk/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java
2009-05-21 16:21:51.000000000 +0200
-@@ -7,10 +7,11 @@
- import static org.openstreetmap.josm.tools.I18n.tr;
-
- import java.io.File;
- import java.io.FileOutputStream;
- import java.io.IOException;
-+import java.io.PrintWriter;
- import java.util.TimerTask;
-
- import javax.swing.JOptionPane;
-
- import livegps.LiveGpsLock;
-@@ -51,11 +52,15 @@
-
- // write to temporary file, on success, rename tmp file to target
file:
- File tmpFile = new File(file.getAbsoluteFile()+".tmp");
- System.out.println("AutoSaving osm data to file " +
file.getAbsolutePath());
- synchronized(LiveGpsLock.class) {
-- XmlWriter.output(new FileOutputStream(tmpFile), new
OsmWriter.All(dataset, false));
-+ OsmWriter w = new OsmWriter(new PrintWriter(new
FileOutputStream(tmpFile)), false, dataset.version);
-+ w.header();
-+ w.writeDataSources(dataset);
-+ w.writeContent(dataset);
-+ w.footer();
- }
- tmpFile.renameTo(file);
- System.out.println("AutoSaving finished");
- } catch (IOException x) {
- x.printStackTrace();
Modified: packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
2009-07-17 13:56:31 UTC (rev 2375)
+++ packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
2009-07-17 13:56:59 UTC (rev 2376)
@@ -17,87 +17,3 @@
<copy todir="${plugin.build.dir}/images">
<fileset dir="images"/>
</copy>
-diff -urNad
trunk~/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java
trunk/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java
----
trunk~/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java
2009-02-01 21:50:42.000000000 +0100
-+++
trunk/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java
2009-06-07 15:39:26.000000000 +0200
-@@ -12,7 +12,7 @@
- import org.openstreetmap.josm.data.coor.EastNorth;
- import org.openstreetmap.josm.data.osm.*;
- import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
--import org.openstreetmap.josm.data.osm.visitor.Visitor;
-+import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
- import org.openstreetmap.josm.gui.MapView;
- import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
- import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
-@@ -129,7 +129,7 @@
- /**
- * Visitor that highlights all cells the selected primitives go through
- */
-- class HighlightCellVisitor implements Visitor
-+ class HighlightCellVisitor extends AbstractVisitor
- {
- /** The MapView */
- private final MapView mv;
-diff -urNad
trunk~/validator/src/org/openstreetmap/josm/plugins/validator/Test.java
trunk/validator/src/org/openstreetmap/josm/plugins/validator/Test.java
---- trunk~/validator/src/org/openstreetmap/josm/plugins/validator/Test.java
2009-03-08 14:39:18.000000000 +0100
-+++ trunk/validator/src/org/openstreetmap/josm/plugins/validator/Test.java
2009-06-07 15:39:26.000000000 +0200
-@@ -12,7 +12,7 @@
- import org.openstreetmap.josm.data.osm.OsmPrimitive;
- import org.openstreetmap.josm.data.osm.Relation;
- import org.openstreetmap.josm.data.osm.Way;
--import org.openstreetmap.josm.data.osm.visitor.Visitor;
-+import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
- import org.openstreetmap.josm.tools.GBC;
-
- /**
-@@ -24,7 +24,7 @@
- *
- * @author frsantos
- */
--public class Test implements Visitor
-+public class Test extends AbstractVisitor
- {
- /** Name of the test */
- protected String name;
-diff -urNad
trunk~/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java
trunk/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java
----
trunk~/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java
2009-02-01 21:50:42.000000000 +0100
-+++
trunk/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java
2009-06-07 15:39:26.000000000 +0200
-@@ -14,7 +14,7 @@
- import org.openstreetmap.josm.data.osm.Relation;
- import org.openstreetmap.josm.data.osm.Way;
- import org.openstreetmap.josm.data.osm.WaySegment;
--import org.openstreetmap.josm.data.osm.visitor.Visitor;
-+import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
- import org.openstreetmap.josm.gui.MapView;
-
- /**
-@@ -251,7 +251,7 @@
- * Visitor that highlights the primitives affected by this error
- * @author frsantos
- */
-- class PaintVisitor implements ValidatorVisitor, Visitor {
-+ class PaintVisitor extends AbstractVisitor implements ValidatorVisitor {
- /** The graphics */
- private final Graphics g;
- /** The MapView */
-diff -urNad
trunk~/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java
trunk/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java
----
trunk~/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java
2009-02-01 21:50:42.000000000 +0100
-+++
trunk/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java
2009-06-07 15:39:46.000000000 +0200
-@@ -5,7 +5,7 @@
- import java.util.LinkedList;
-
- import org.openstreetmap.josm.data.osm.*;
--import org.openstreetmap.josm.data.osm.visitor.Visitor;
-+import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
-
- /**
- * A visitor that aggregates all primitives it visits.
-@@ -14,7 +14,7 @@
- *
- * @author frsantos
- */
--public class AgregatePrimitivesVisitor implements Visitor
-+public class AgregatePrimitivesVisitor extends AbstractVisitor
- {
- /** Aggregated data */
- Collection<OsmPrimitive> aggregatedData;
Modified: packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
2009-07-17 13:56:31 UTC (rev 2375)
+++ packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
2009-07-17 13:56:59 UTC (rev 2376)
@@ -6,14 +6,14 @@
@DPATCH@
diff -urNad trunk~/wmsplugin/build.xml trunk/wmsplugin/build.xml
---- trunk~/wmsplugin/build.xml 2009-03-18 15:55:16.000000000 +0100
-+++ trunk/wmsplugin/build.xml 2009-04-05 01:25:39.000000000 +0200
+--- trunk~/wmsplugin/build.xml 2009-07-04 20:28:12.000000000 +0200
++++ trunk/wmsplugin/build.xml 2009-07-17 15:48:28.000000000 +0200
@@ -14,7 +14,7 @@
<compilerarg value="-Xlint:unchecked"/>
</javac>
</target>
- <target name="dist" depends="compile,revision">
+ <target name="dist" depends="compile">
- <copy todir="${plugin.build.dir}/resources">
- <fileset dir="resources"/>
+ <copy todir="${plugin.build.dir}/images">
+ <fileset dir="images"/>
</copy>
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
