Changeset 24125 in osm for applications/editors/josm/plugins/turnrestrictions/src/org

Timestamp:

2010-11-07T18:57:46+01:00 (14 years ago)

Author:

guggis

Message:

'Fixing #5614 - JOSM Plugin turn Restrictions'

Location:

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

Files:

• TurnRestrictionBuilder.java (modified) (1 diff)
• editor/TurnRestrictionEditor.java (modified) (5 diffs)
• editor/TurnRestrictionEditorModel.java (modified) (1 diff)

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionBuilder.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.turnrestrictions;
-
-import static org.openstreetmap.josm.plugins.turnrestrictions.TurnRestrictionBuilder.determineWayJoinOrientation;
-import static org.openstreetmap.josm.plugins.turnrestrictions.TurnRestrictionBuilder.isEndNode;
-import static org.openstreetmap.josm.plugins.turnrestrictions.TurnRestrictionBuilder.isStartNode;
 
 import java.util.ArrayList;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java

@@ -87 +87 @@
     private JosmSelectionPanel pnlJosmSelection;
     private BasicEditorPanel pnlBasicEditor;
-    private AdvancedEditorPanel pnlAdvancedEditor;
-    private IssuesView pnlIssuesView;
     private TurnRestrictionEditorModel editorModel;
     private JTabbedPane tpEditors;
@@ -102 +100 @@
         pnl.setLayout(new FlowLayout(FlowLayout.CENTER));
 
-        pnl.add(new SideButton(new OKAction()));
-        pnl.add(new SideButton(new CancelAction()));
-        
-        pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Plugins/turnrestrictions#TurnRestrictionEditor"))));
+        SideButton b;
+        pnl.add(b = new SideButton(new OKAction()));
+        b.setName("btnOK");
+        pnl.add(b = new SideButton(new CancelAction()));
+        b.setName("btnCancel");
+        pnl.add(b = new SideButton(new ContextSensitiveHelpAction(ht("/Plugins/turnrestrictions#TurnRestrictionEditor"))));
+        b.setName("btnHelp");
         return pnl;
     }
@@ -134 +135 @@
         tpEditors.setToolTipTextAt(0, tr("Edit basic attributes of a turn restriction"));
         
-        tpEditors.add(pnlAdvancedEditor = new AdvancedEditorPanel(editorModel));
+        tpEditors.add(new AdvancedEditorPanel(editorModel));
         tpEditors.setTitleAt(1, tr("Advanced"));
         tpEditors.setToolTipTextAt(1, tr("Edit the raw tags and members of this turn restriction"));
         
-        tpEditors.add(pnlIssuesView = new IssuesView(editorModel.getIssuesModel()));
+        tpEditors.add(new IssuesView(editorModel.getIssuesModel()));
         tpEditors.setTitleAt(2, tr("Errors/Warnings"));
         tpEditors.setToolTipTextAt(2, tr("Show errors and warnings related to this turn restriction"));
@@ -650 +651 @@
                 return;
             }
-            if (getTurnRestriction() == null) {
+            if (getTurnRestriction() == null || getTurnRestriction().getDataSet() == null) {
                 applyNewTurnRestriction();
                 return;
@@ -693 +694 @@
                 return;
             }
-            if (getTurnRestriction() == null) {
+            if (getTurnRestriction() == null || getTurnRestriction().getDataSet() == null) {
                 // it's a new turn restriction. Try to save it and close the dialog
                 if (applyNewTurnRestriction()) {

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorModel.java

@@ -220 +220 @@
         CheckParameterUtil.ensureParameterNotNull(turnRestriction, "turnRestriction");      
         TagCollection tags = tagEditorModel.getTagCollection();
-        logger.info(tags.toString());
         turnRestriction.removeAll();
         tags.applyTo(turnRestriction);