Changeset 32632 in osm

Timestamp:

2016-07-11T18:05:24+02:00 (8 years ago)

Author:

darya

Message:

fix #13123

Location:

applications/editors/josm/plugins/pt_assistant

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java (modified) (8 diffs)

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

@@ -12 +12 @@
   <property name="plugin.icon" value="..."/>
   <property name="plugin.link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/PT_Assistant"/>
+  <property name="plugin.canloadatruntime" value="true"/>
   
   <!-- ** include targets that all plugins have in common ** -->

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java

@@ -30 +30 @@
          */
         public static boolean isTwoDirectionRoute(Relation r) {
+                
+                if (r == null) {
+                        return false;
+                }
+                
                 if (!r.hasKey("route") || !r.hasTag("public_transport:version", "2")) {
                         return false;

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.plugins.pt_assistant.actions.DownloadReferrersThread;
 import org.openstreetmap.josm.plugins.pt_assistant.actions.FixTask;
 import org.openstreetmap.josm.plugins.pt_assistant.actions.IncompleteMembersDownloadThread;
-import org.openstreetmap.josm.plugins.pt_assistant.gui.DownloadReferrersDialog;
 import org.openstreetmap.josm.plugins.pt_assistant.gui.IncompleteMembersDownloadDialog;
 import org.openstreetmap.josm.plugins.pt_assistant.gui.PTAssistantLayer;
@@ -40 +38 @@
 
         private PTAssistantLayer layer;
-        private static boolean nodeReferrersDownloaded;
-        @SuppressWarnings("unused")
-        private static boolean incompleteRelationsDowloaded;
 
 
@@ -51 +46 @@
                 layer = new PTAssistantLayer();
                 DataSet.addSelectionListener(layer);
-                nodeReferrersDownloaded = false;
-                incompleteRelationsDowloaded = false;
 
         }
@@ -61 +54 @@
                 if (n.isIncomplete()) {
                         return;
-                }
-
-                if (!nodeReferrersDownloaded) {
-                        this.downloadReferrers(n);
-                        nodeReferrersDownloaded = true;
                 }
 
@@ -76 +64 @@
 
                 // check that platforms are not part of any way:
-                if (n.hasTag("highway", "bus_stop") || n.hasTag("public_transport", "platform")
-                                || n.hasTag("highway", "platform") || n.hasTag("railway", "platform")) {
+                if (n.hasTag("public_transport", "platform")) {
                         nodeChecker.performPlatformPartOfWayTest();
                 }
@@ -85 +72 @@
         }
         
-
-        /**
-         * Downloads incomplete relation members in an extra thread (user input
-         * required)
-         * 
-         * @return true if successful, false if not successful
-         */
-        private boolean downloadReferrers(Node n) {
-
-                final int[] userSelection = { 0 };
-
-                try {
-
-                        if (SwingUtilities.isEventDispatchThread()) {
-
-                                userSelection[0] = showDownloadReferrersDialog();
-
-                        } else {
-
-                                SwingUtilities.invokeAndWait(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                                try {
-                                                        userSelection[0] = showDownloadReferrersDialog();
-                                                } catch (InterruptedException e) {
-                                                        e.printStackTrace();
-                                                }
-
-                                        }
-                                });
-
-                        }
-
-                } catch (InterruptedException | InvocationTargetException e) {
-                        return false;
-                }
-
-                if (userSelection[0] == JOptionPane.YES_OPTION) {
-
-                        Thread t = new DownloadReferrersThread(n);
-                        t.start();
-                        synchronized (t) {
-                                try {
-                                        t.wait();
-                                } catch (InterruptedException e) {
-                                        return false;
-                                }
-                        }
-
-                }
-
-                return true;
-
-        }
-
-        /**
-         * Shows the dialog asking the user about an incomplete member download
-         * 
-         * @return user's selection
-         * @throws InterruptedException
-         */
-        private int showDownloadReferrersDialog() throws InterruptedException {
-
-                DownloadReferrersDialog downloadReferrersDialog = new DownloadReferrersDialog();
-                return downloadReferrersDialog.getUserSelection();
-
-        }
 
         @Override
@@ -168 +88 @@
                                 return;
                         }
-                        incompleteRelationsDowloaded = true;
-
                 }
 
@@ -471 +389 @@
         }
         
-    public void endTest() {
-        super.endTest();
-        nodeReferrersDownloaded = false;
-        incompleteRelationsDowloaded = false;
-    }
-
 }