Changeset 32237 in osm for applications/editors/josm/plugins/pt_assistant

Timestamp:

2016-06-14T17:33:13+02:00 (9 years ago)

Author:

darya

Message:

Clarification

Location:

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant

Files:

• actions/IncompleteMembersDownloadThread.java (modified) (2 diffs)
• utils/RouteUtils.java (modified) (1 diff)
• validation/PTAssitantValidatorTest.java (modified) (4 diffs)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/IncompleteMembersDownloadThread.java

@@ -3 +3 @@
 import java.util.ArrayList;
 
-import org.openstreetmap.josm.actions.DownloadPrimitiveAction;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.io.DownloadPrimitivesWithReferrersTask;
 
 public class IncompleteMembersDownloadThread extends Thread {
@@ -19 +21 @@
         public void run() {
 
-                        synchronized (this) {
+                 try {
+                synchronized (this) {
 
-                                ArrayList<PrimitiveId> list = new ArrayList<>();
-                                list.add(relation);
-                                DownloadPrimitiveAction.processItems(false, list, false, true);
+                        ArrayList<PrimitiveId> list = new ArrayList<>();
+                        for (RelationMember rm : relation.getMembers()) {
+                                list.add(rm);
+                        }
 
-                        
-                                notify();
+                        DownloadPrimitivesWithReferrersTask task = new DownloadPrimitivesWithReferrersTask(false, list, false, true,
+                                        null, null);
+                        Thread t = new Thread(task);
+                        t.start();
+                        t.join();
 
-                        }
+
+                }
+
+                 } catch (InterruptedException e) {
+                 // TODO Auto-generated catch block
+                 e.printStackTrace();
+                
+                 }
 
         }

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

@@ -176 +176 @@
                                 String message = tr("The relation (id=" + r.getId()
                                                 + ") has incomplete members.\nThey need to be downloaded to proceed with validation of this relation.\nDo you want to download incomplete members?");
-                                JCheckBox checkbox = new JCheckBox(tr("Remember my choice and do not ask me again in this session"));
+                                JCheckBox checkbox = new JCheckBox(tr("Remember my choice and don't ask me again in this session"));
                                 Object[] params = { message, checkbox };
                                 String[] options = { tr("Yes"), tr("No") };

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

@@ -28 +28 @@
 
         public PTAssitantValidatorTest() {
-                 super(tr("Public Transport Assistant tests"),
-                 tr("Check if route relations are compatible with public transport version 2"));
+                super(tr("Public Transport Assistant tests"),
+                                tr("Check if route relations are compatible with public transport version 2"));
         }
 
@@ -40 +40 @@
 
                 if (r.hasIncompleteMembers()) {
-                         String message = tr("The relation (id=" + r.getId()
-                         + ") has incomplete members.\nThey need to be downloaded to proceed with validation of this relation.\nDo you want to download incomplete members?");
-                         JCheckBox checkbox = new JCheckBox(tr("Remember my choice and do not ask me again in this session"));
-                         Object[] params = { message, checkbox }; 
-                         String[] options = { tr("Yes"), tr("No") };
-                         int userInput = JOptionPane.showOptionDialog(null, params,
-                         tr("Fetch Request"), JOptionPane.YES_NO_OPTION,
-                         JOptionPane.QUESTION_MESSAGE, null, options, 0);
+
+                        // IncompleteMembersDownloadDialog incompleteDialog = new
+                        // IncompleteMembersDownloadDialog(r.getId());
+                        //
+                        // int userInput = incompleteDialog.getUserSelection();
+
+                        String message = tr("The relation (id=" + r.getId()
+                                        + ") has incomplete members.\nThey need to be downloaded to proceed with validation of this relation.\nDo you want to download incomplete members?");
+                        JCheckBox checkbox = new JCheckBox(tr("Remember my choice and don't ask me again in this session"));
+                        Object[] params = { message, checkbox };
+                        String[] options = { tr("Yes"), tr("No") };
+
+                        int userInput = Integer.MIN_VALUE;
+                        userInput = JOptionPane.showOptionDialog(null, params, tr("Fetch Request"), JOptionPane.YES_NO_OPTION,
+                                        JOptionPane.QUESTION_MESSAGE, null, options, 0);
 
                         if (userInput == 0) {
@@ -61 +68 @@
                                 }
 
-
                         }
-
                 }
 
@@ -108 +113 @@
                         }
                 }
+                
+//              List<Relation> primitives = new ArrayList<>(1);
+//              primitives.add(r);
+//              errors.add(new TestError(this, Severity.WARNING, tr("PT: test warning"), ERROR_CODE_DIRECTION, primitives));
+                
         }