Changeset 35027 in osm for applications

Timestamp:

2019-06-03T14:35:47+02:00 (5 years ago)

Author:

rebeccas95

Message:

Fixing #17748 - solves JavaFX problem

Location:

applications/editors/josm/plugins/piclayer

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/autocalibrate/AutoCalibrateHandler.java (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/autocalibrate/AutoCalibratePictureAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/autocalibrate/AutoCalibrator.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/autocalibrate/helper/ObservableArrayList.java (modified) (3 diffs)

applications/editors/josm/plugins/piclayer/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <project name="PicLayer" default="dist" basedir=".">
-
     <property name="commit.message" value="[josm/PicLayer] - #12045 add ability to localize dialog titles"/>
-
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-
-    <property name="plugin.main.version" value="11713"/>
-
-
-
+    <property name="plugin.main.version" value="14153"/>
+        
     <!-- Configure these properties (replace "..." accordingly).
-
          See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
-
     -->
-
-    <property name="plugin.author" value="Tomasz Stelmach, Rebecca Schmidt"/>
-
+    <property name="plugin.author" value="Tomasz Stelmach"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.piclayer.PicLayerPlugin"/>
-
     <property name="plugin.description" value="This plugin allows to display any picture as a background in the editor and align it with the map."/>
-
     <property name="plugin.icon" value="images/layericon.png"/>
-
     <property name="plugin.link" value="https://josm.openstreetmap.de/wiki/Help/Plugin/PicLayer"/>
-
     <property name="plugin.canloadatruntime" value="true"/>
 
-
-
     <!-- ** include targets that all plugins have in common ** -->
-
     <import file="../build-common.xml"/>
 
-
-
 </project>

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/autocalibrate/AutoCalibrateHandler.java

@@ -39 +39 @@
 import org.openstreetmap.josm.plugins.piclayer.gui.autocalibrate.ResultCheckView;
 import org.openstreetmap.josm.plugins.piclayer.layer.PicLayerAbstract;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -115 +116 @@
         *
         */
-        private class HelpButtonListener implements ActionListener {
+        private static class HelpButtonListener implements ActionListener {
                 @Override
                 public void actionPerformed(ActionEvent e) {
@@ -176 +177 @@
                         // calibrate
                         callCalibrator();
-                        mainWindow.setVisible(false);
                         currentPicLayer.clearDrawReferencePoints();
                         currentPicLayer.invalidate();
                         MainApplication.getLayerManager().setActiveLayer(currentPicLayer);
+                        mainWindow.setVisible(false);
                         // let user check calibration
                         ResultCheckView checkView = new ResultCheckView();
@@ -233 +234 @@
             @Override
             public void propertyChange(PropertyChangeEvent event) {
-                String propName = event.getPropertyName();
-                int size = Integer.parseInt(propName.replaceAll("\\D", ""));
+                int size = (int) event.getNewValue();
                 if(currentPicLayer.getTransformer().getLatLonOriginPoints() != null) {
                         originPointList.clear();
@@ -256 +256 @@
             @Override
             public void propertyChange(PropertyChangeEvent event) {
-                String propName = event.getPropertyName();
-                int size = Integer.parseInt(propName.replaceAll("\\D", ""));
+                int size = (int) event.getNewValue();
                 mainWindow.setReferencePoints(referencePointList);
 
@@ -517 +516 @@
                         translatedPoint = currentPicLayer.transformPoint(new Point2D.Double(en.getInViewX(), en.getInViewY()));
                 } catch (NoninvertibleTransformException e) {
-                        e.printStackTrace();
+                        Logging.error(e);
                 }
 

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/autocalibrate/AutoCalibratePictureAction.java

@@ -47 +47 @@
                 currentLayer = (PicLayerAbstract) MainApplication.getLayerManager().getActiveLayer();
 
-                if(currentLayer != null && currentLayer instanceof PicLayerAbstract) {
+                if(currentLayer != null) {
                         calibrationHandler.prepare(currentLayer);
                         calibrationWindow = calibrationHandler.getMainWindow();

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/autocalibrate/AutoCalibrator.java

@@ -13 +13 @@
 import org.openstreetmap.josm.plugins.piclayer.gui.autocalibrate.CalibrationErrorView;
 import org.openstreetmap.josm.plugins.piclayer.layer.PicLayerAbstract;
+import org.openstreetmap.josm.tools.Logging;
 
 
@@ -181 +182 @@
                         translatedPoint = currentLayer.transformPoint(new Point2D.Double(en.getInViewX(), en.getInViewY()));
                 } catch (NoninvertibleTransformException e) {
-                        e.printStackTrace();
+                        Logging.error(e);
                 }
 

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/autocalibrate/helper/ObservableArrayList.java

@@ -5 +5 @@
 import java.util.ArrayList;
 import java.util.Collection;
-
-import javafx.beans.property.SimpleIntegerProperty;
 
 /**
@@ -15 +13 @@
 public class ObservableArrayList<E> extends ArrayList<E>{
 
-    private SimpleIntegerProperty sizeProperty;
-    protected PropertyChangeSupport propertyChangeSupport;
+        private PropertyChangeSupport changes = new PropertyChangeSupport(this);
 
         public ObservableArrayList() {
                 super();
-                propertyChangeSupport = new PropertyChangeSupport(this);
-            sizeProperty = new SimpleIntegerProperty(0);
         }
 
-        public ObservableArrayList(int initialCapacity) {
-                super(initialCapacity);
-                propertyChangeSupport = new PropertyChangeSupport(this);
-            sizeProperty = new SimpleIntegerProperty(0);
+        public ObservableArrayList(int cap) {
+                super(cap);
         }
 
         public ObservableArrayList(Collection<? extends E> c) {
                 super(c);
-                propertyChangeSupport = new PropertyChangeSupport(this);
-            sizeProperty = new SimpleIntegerProperty(0);
         }
 
@@ -39 +30 @@
         @Override
         public boolean add(E e) {
-                boolean returnValue = super.add(e);
-        sizeProperty.set(size());
-        propertyChangeSupport.firePropertyChange(sizeProperty.toString(), false, true);
-        return returnValue;
+                int oldSize = super.size();
+                if(super.add(e)) {
+                        changes.firePropertyChange("size", oldSize, super.size());
+                        return true;
+                };
+                return false;
         }
 
+
     @Override
-    public void add(int index, E element) {
-        super.add(index, element);
-        sizeProperty.set(size());
-        propertyChangeSupport.firePropertyChange(sizeProperty.toString(), false, true);
+        public void add(int index, E element) {
+        int oldSize = super.size();
+        super.add(index, element);
+        changes.firePropertyChange("size", oldSize, super.size());
     }
 
     @Override
-    public E remove(int index) {
-        E returnValue = super.remove(index);
-        sizeProperty.set(size());
-        propertyChangeSupport.firePropertyChange(sizeProperty.toString(), false, true);
-        return returnValue;
+        public boolean addAll(Collection<? extends E> c) {
+        int oldSize = super.size();
+                if(super.addAll(c)) {
+                        changes.firePropertyChange("size", oldSize, super.size());
+                        return true;
+                };
+                return false;
     }
 
     @Override
-        public void clear() {
-        super.clear();
-        sizeProperty.set(size());
-        propertyChangeSupport.firePropertyChange(sizeProperty.toString(), false, true);
+        public E remove(int index) {
+        int oldSize = super.size();
+        E removed = super.remove(index);
+        changes.firePropertyChange("size", oldSize, super.size());
+        return removed;
     }
 
     @Override
-    public boolean remove(Object o) {
-        boolean returnValue = super.remove(o);
-        if(returnValue){
-            sizeProperty.set(size());
-            propertyChangeSupport.firePropertyChange(sizeProperty.toString(), false, true);
-        }
-        return returnValue;
+        public boolean remove(Object o) {
+        int oldSize = super.size();
+        if(super.remove(o)) {
+                changes.firePropertyChange("size", oldSize, super.size());
+                return true;
+        }
+        return false;
+    }
+
+        @Override
+        public void clear() {
+                int oldSize = super.size();
+        super.clear();
+        changes.firePropertyChange("size", oldSize, super.size());
     }
 
         public void addPropertyChangeListener(PropertyChangeListener listener) {
-        propertyChangeSupport.addPropertyChangeListener(listener);
+        changes.addPropertyChangeListener(listener);
     }
 
         public void removePropertyChangeListener(PropertyChangeListener listener) {
-        propertyChangeSupport.removePropertyChangeListener(listener);
+        changes.removePropertyChangeListener(listener);
     }