Changeset 32233 in osm for applications/editors/josm/plugins

Timestamp:

2016-06-14T01:38:13+02:00 (9 years ago)

Author:

darya

Message:

Changed to a single validator test; dialog for incomplete members download added

Location:

applications/editors/josm/plugins/pt_assistant

Files:

• build/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.class (modified) ( previous)
• build/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.class (modified) ( previous)
• src/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/pt_assistant/actions (added)
• src/org/openstreetmap/josm/plugins/pt_assistant/actions/IncompleteMembersDownloadThread.java (added)
• src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssitantValidatorTest.java (added)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.java

@@ -9 +9 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.validation.OsmValidator;
+import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.plugins.pt_assistant.validation.DirectionTest;
 import org.openstreetmap.josm.plugins.pt_assistant.validation.GapTest;
+import org.openstreetmap.josm.plugins.pt_assistant.validation.PTAssitantValidatorTest;
 import org.openstreetmap.josm.plugins.pt_assistant.validation.PlatformsFirstTest;
 import org.openstreetmap.josm.plugins.pt_assistant.validation.RoadTypeTest;
@@ -34 +36 @@
                 super(info);
 
-                OsmValidator.addTest(PlatformsFirstTest.class);
-                OsmValidator.addTest(RoadTypeTest.class);
-                OsmValidator.addTest(DirectionTest.class);
-                OsmValidator.addTest(GapTest.class);
+//              OsmValidator.addTest(PlatformsFirstTest.class);
+//              OsmValidator.addTest(RoadTypeTest.class);
+//              OsmValidator.addTest(DirectionTest.class);
+//              OsmValidator.addTest(GapTest.class);
+                
+                OsmValidator.addTest(PTAssitantValidatorTest.class);
+                
 
         }

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

@@ -10 +10 @@
 
 import org.openstreetmap.josm.actions.DownloadPrimitiveAction;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
@@ -161 +162 @@
                                         || (rm.isRelation() && rm.getRelation().isIncomplete())) {
                                 isComplete = false;
+                                
                                 break;
+                                
                         }
                 }
@@ -193 +196 @@
                         // if the user does want to fetch:
                         if (userInput == 0 || askToFetch == ASK_TO_FETCH.DONT_ASK_AND_FETCH) {
-                                List<PrimitiveId> list = new ArrayList<>(1);
-                                list.add(r);
-                                DownloadPrimitiveAction.processItems(false, list, false, true);
+//                              List<PrimitiveId> list = new ArrayList<>(1);
+//                              list.add(r);
+                                List<PrimitiveId> list = new ArrayList<>();
+                                for (OsmPrimitive primitive: r.getIncompleteMembers()) {
+                                        list.add(primitive);
+                                }
+                                
+                                Thread t = new Thread (new IncompleteMembersDownloader(list));
+                                t.run();
+                                try {
+                                        t.join();
+                                } catch (InterruptedException e) {
+                                        // TODO Auto-generated catch block
+                                        e.printStackTrace();
+                                }
+
+                                
+                                
+//                              DownloadPrimitiveAction.processItems(false, list, false, true);
+                                JOptionPane.showMessageDialog(null, "download expected to be finished");
                                 isComplete = true;
                                 lastRelationToFetch = r;
@@ -233 +253 @@
 //              return "don't ask and don't fetch";
 //      }
+        
 
 }
+
+