Index: /applications/editors/josm/plugins/czechaddress/build.xml
===================================================================
--- /applications/editors/josm/plugins/czechaddress/build.xml (revision 19049)
+++ /applications/editors/josm/plugins/czechaddress/build.xml (revision 19050)
@@ -52,5 +52,5 @@
-
+
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java (revision 19049)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java (revision 19050)
@@ -53,5 +53,5 @@
public void actionPerformed(ActionEvent e) {
- Collection selectedWays = Main.main.getCurrentDataSet().getSelectedWays();
+ Collection selectedWays = Main.main.getCurrentDataSet().getSelectedWays();
Collection newSelection = Main.main.getCurrentDataSet().getSelected();
Index: /applications/editors/josm/plugins/openlayers/build.xml
===================================================================
--- /applications/editors/josm/plugins/openlayers/build.xml (revision 19049)
+++ /applications/editors/josm/plugins/openlayers/build.xml (revision 19050)
@@ -37,5 +37,5 @@
-
+
Index: /applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersLayer.java
===================================================================
--- /applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersLayer.java (revision 19049)
+++ /applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersLayer.java (revision 19050)
@@ -15,5 +15,4 @@
import org.openstreetmap.josm.actions.RenameLayerAction;
import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -30,6 +29,5 @@
*
*/
-public class OpenLayersLayer extends Layer implements PreferenceChangedListener,
- PropertyChangeListener, MyHtmlBlockPanel.ViewUpdateListener {
+public class OpenLayersLayer extends Layer implements PropertyChangeListener, MyHtmlBlockPanel.ViewUpdateListener {
private Browser browser;
@@ -110,6 +108,4 @@
@Override
public void destroy() {
- Main.pref.listener.remove(this);
-
if( Main.map != null )
Main.map.mapView.removePropertyChangeListener(this);
@@ -117,7 +113,4 @@
OpenLayersPlugin.layer = null;
StorageManager.flush();
- }
-
- public void preferenceChanged(String key, String newValue) {
}
Index: /applications/editors/josm/plugins/openstreetbugs/build.xml
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/build.xml (revision 19049)
+++ /applications/editors/josm/plugins/openstreetbugs/build.xml (revision 19050)
@@ -26,5 +26,5 @@
-
+
Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/DownloadAction.java
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/DownloadAction.java (revision 19049)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/DownloadAction.java (revision 19050)
@@ -37,7 +37,7 @@
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.tools.OsmUrlToBounds;
import org.openstreetmap.josm.plugins.osb.ConfigKeys;
import org.openstreetmap.josm.plugins.osb.api.util.HttpUtils;
+import org.openstreetmap.josm.tools.OsmUrlToBounds;
public class DownloadAction {
@@ -83,7 +83,6 @@
double lon = Double.parseDouble(m.group(2));
LatLon latlon = new LatLon(lat, lon);
- Node osmNode = new Node(Long.parseLong(m.group(1)));
+ Node osmNode = new Node(Long.parseLong(m.group(1)), 1);
osmNode.setCoor(latlon);
- osmNode.setIncomplete(false);
osmNode.put("id", m.group(1));
osmNode.put("note", m.group(4));
Index: /applications/editors/josm/plugins/slippymap/build.xml
===================================================================
--- /applications/editors/josm/plugins/slippymap/build.xml (revision 19049)
+++ /applications/editors/josm/plugins/slippymap/build.xml (revision 19050)
@@ -26,5 +26,5 @@
-
+
Index: /applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java
===================================================================
--- /applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java (revision 19049)
+++ /applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java (revision 19050)
@@ -39,4 +39,5 @@
import org.openstreetmap.josm.actions.RenameLayerAction;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
import org.openstreetmap.josm.data.coor.LatLon;
@@ -212,5 +213,5 @@
// FIXME: currently ran in errors
-
+
tileOptionMenu.add(new JMenuItem(
new AbstractAction(tr("Snap to tile size")) {
@@ -251,13 +252,15 @@
});
- listeners.add(new LayerChangeListener() {
+ addLayerChangeListener(new LayerChangeListener() {
public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+ //
}
public void layerAdded(Layer newLayer) {
+ //
}
public void layerRemoved(Layer oldLayer) {
- Main.pref.listener.remove(SlippyMapLayer.this);
+ Main.pref.addPreferenceChangeListener(SlippyMapLayer.this);
}
});
@@ -265,5 +268,5 @@
});
- Main.pref.listener.add(this);
+ Main.pref.addPreferenceChangeListener(this);
}
@@ -795,15 +798,4 @@
out("queued to load: " + nr_queued + "/" + tiles.size() + " tiles at zoom: " + zoom);
}
- boolean topTile(Tile t) {
- if (t.getYtile() == z12y0 )
- return true;
- return false;
- }
-
- boolean leftTile(Tile t) {
- if (t.getXtile() == z12x0 )
- return true;
- return false;
- }
}
@@ -1032,7 +1024,4 @@
}
- private static int nr_loaded = 0;
- private static int at_zoom = -1;
-
/*
* (non-Javadoc)
@@ -1041,14 +1030,14 @@
* preferenceChanged(java.lang.String, java.lang.String)
*/
- public void preferenceChanged(String key, String newValue) {
- if (key.startsWith(SlippyMapPreferences.PREFERENCE_PREFIX)) {
+ public void preferenceChanged(PreferenceChangeEvent event) {
+ if (event.getKey().startsWith(SlippyMapPreferences.PREFERENCE_PREFIX)) {
// System.err.println(this + ".preferenceChanged('" + key + "', '"
// + newValue + "') called");
// when fade background changed, no need to clear tile storage
// TODO move this code to SlippyMapPreferences class.
- if (!key.equals(SlippyMapPreferences.PREFERENCE_FADE_BACKGROUND)) {
+ if (!event.getKey().equals(SlippyMapPreferences.PREFERENCE_FADE_BACKGROUND)) {
autoZoomPopup.setSelected(SlippyMapPreferences.getAutozoom());
}
- if (key.equals(SlippyMapPreferences.PREFERENCE_TILE_SOURCE)) {
+ if (event.getKey().equals(SlippyMapPreferences.PREFERENCE_TILE_SOURCE)) {
newTileStorage();
}
@@ -1059,5 +1048,5 @@
@Override
public void destroy() {
- Main.pref.listener.remove(SlippyMapLayer.this);
+ Main.pref.removePreferenceChangeListener(SlippyMapLayer.this);
}
}
Index: /applications/editors/josm/plugins/walkingpapers/build.xml
===================================================================
--- /applications/editors/josm/plugins/walkingpapers/build.xml (revision 19049)
+++ /applications/editors/josm/plugins/walkingpapers/build.xml (revision 19050)
@@ -26,5 +26,5 @@
-
+
Index: /applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java
===================================================================
--- /applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java (revision 19049)
+++ /applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java (revision 19050)
@@ -69,5 +69,5 @@
clearTileStorage();
- Layer.listeners.add(new LayerChangeListener() {
+ Layer.addLayerChangeListener(new LayerChangeListener() {
public void activeLayerChange(Layer oldLayer, Layer newLayer) {
// if user changes to a walking papers layer, zoom there just as if
@@ -86,4 +86,5 @@
public void layerRemoved(Layer oldLayer) {
+ //
}
});
@@ -407,9 +408,4 @@
}
- @Override
- public void destroy() {
- Main.pref.listener.remove(WalkingPapersLayer.this);
- }
-
public String getWalkingPapersId() {
return walkingPapersId;