Changeset 20489 in osm for applications/editors/josm/plugins/turnrestrictions/src

Timestamp:

2010-03-15T12:48:23+01:00 (16 years ago)

Author:

guggis

Message:

Second version of the turn restrictions plugin

Location:

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

Files:

• TurnRestrictionsPlugin.java (modified) (1 diff)
• dnd (added)
• dnd/PrimitiveIdListProvider.java (added)
• dnd/PrimitiveIdListTransferHandler.java (added)
• dnd/PrimitiveIdTransferable.java (added)
• editor (added)
• editor/BasicEditorPanel.java (added)
• editor/JosmSelectionListModel.java (added)
• editor/JosmSelectionPanel.java (added)
• editor/TurnRestrictionComboBox.java (added)
• editor/TurnRestrictionComboBoxModel.java (added)
• editor/TurnRestrictionEditor.java (added)
• editor/TurnRestrictionEditorManager.java (added)
• editor/TurnRestrictionEditorModel.java (added)
• editor/TurnRestrictionLegEditor.java (added)
• editor/TurnRestrictionLegRole.java (added)
• editor/TurnRestrictionType.java (added)
• editor/TurnRestrictionTypeRenderer.java (added)
• editor/ViaList.java (added)
• editor/ViaListModel.java (added)
• list (added)
• list/AbstractTurnRestrictionsListView.java (moved) (moved from applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/AbstractTurnRestrictionsListView.java ) (1 diff)
• list/TurnRestrictionListCellRenderer.java (moved) (moved from applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionListCellRenderer.java ) (1 diff)
• list/TurnRestrictionsInDatasetListModel.java (moved) (moved from applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsInDatasetListModel.java ) (1 diff)
• list/TurnRestrictionsInDatasetView.java (moved) (moved from applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsInDatasetView.java ) (1 diff)
• list/TurnRestrictionsInSelectionListModel.java (moved) (moved from applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsInSelectionListModel.java ) (1 diff)
• list/TurnRestrictionsInSelectionView.java (moved) (moved from applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsInSelectionView.java ) (1 diff)
• list/TurnRestrictionsListDialog.java (moved) (moved from applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsListDialog.java ) (6 diffs)
• list/TurnRestrictionsListModel.java (moved) (moved from applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsListModel.java ) (1 diff)

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

@@ -5 +5 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.plugins.turnrestrictions.list.TurnRestrictionsListDialog;
 import org.openstreetmap.josm.plugins.turnrestrictions.preferences.PreferenceEditor;
 

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/AbstractTurnRestrictionsListView.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.turnrestrictions;
+package org.openstreetmap.josm.plugins.turnrestrictions.list;
 
 import javax.swing.JList;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionListCellRenderer.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.turnrestrictions;
+package org.openstreetmap.josm.plugins.turnrestrictions.list;
 
 import static org.openstreetmap.josm.tools.I18n.tr;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInDatasetListModel.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.turnrestrictions;
+package org.openstreetmap.josm.plugins.turnrestrictions.list;
 
 import java.util.Collection;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInDatasetView.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.turnrestrictions;
+package org.openstreetmap.josm.plugins.turnrestrictions.list;
 
 import java.awt.BorderLayout;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInSelectionListModel.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.turnrestrictions;
+package org.openstreetmap.josm.plugins.turnrestrictions.list;
 
 import java.util.Collection;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInSelectionView.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.turnrestrictions;
+package org.openstreetmap.josm.plugins.turnrestrictions.list;
 
 import java.awt.BorderLayout;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.turnrestrictions;
+package org.openstreetmap.josm.plugins.turnrestrictions.list;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -12 +12 @@
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import javax.swing.AbstractAction;
-import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JList;
@@ -35 +33 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
+import org.openstreetmap.josm.plugins.turnrestrictions.editor.TurnRestrictionEditor;
+import org.openstreetmap.josm.plugins.turnrestrictions.editor.TurnRestrictionEditorManager;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -216 +216 @@
         }
 
-        public void launchEditor(Relation toEdit) {
-            if (toEdit == null)
-                return;
-            RelationEditor.getEditor(Main.map.mapView.getEditLayer(),toEdit, getMembersForCurrentSelection(toEdit)).setVisible(true);
-        }
+                public void launchEditor(Relation toEdit) {
+                        if (toEdit == null)
+                                return;
+                        OsmDataLayer layer = Main.main.getEditLayer();
+                        TurnRestrictionEditorManager manager = TurnRestrictionEditorManager.getInstance();
+                        TurnRestrictionEditor editor = manager.getEditorForRelation(layer, toEdit);
+                        if (editor != null) {
+                                editor.setVisible(true);
+                                editor.toFront();
+                        } else {
+                                editor = new TurnRestrictionEditor(
+                                                TurnRestrictionsListDialog.this, layer,toEdit);
+                                manager.positionOnScreen(editor);
+                                manager.register(layer, toEdit,editor);
+                                editor.setVisible(true);
+                        }
+                }
 
         public void actionPerformed(ActionEvent e) {
@@ -283 +295 @@
      *
      */
-    static class NewAction extends AbstractAction implements EditLayerChangeListener{
+     class NewAction extends AbstractAction implements EditLayerChangeListener{
         public NewAction() {
             putValue(SHORT_DESCRIPTION,tr("Create a new turn restriction"));
@@ -292 +304 @@
 
         public void run() {
-            RelationEditor.getEditor(Main.main.getEditLayer(),null, null).setVisible(true);
+                 Relation tr = new Relation();
+                 OsmDataLayer layer =  Main.main.getEditLayer();
+                 if (layer == null) return;
+                 TurnRestrictionEditor editor = new TurnRestrictionEditor(TurnRestrictionsListDialog.this, layer);
+             TurnRestrictionEditorManager.getInstance().positionOnScreen(editor);             
+             TurnRestrictionEditorManager.getInstance().register(layer, tr, editor);
+             editor.setVisible(true);
         }
 

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListModel.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.turnrestrictions;
+package org.openstreetmap.josm.plugins.turnrestrictions.list;
 
 import java.util.ArrayList;