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

Timestamp:

2010-03-26T10:40:01+01:00 (15 years ago)

Author:

guggis

Message:

Basic Editor: Via-List in Basic Editor is now optional. Can be configured in the preferences. Default is not to display/edit the vias in the Basic Editor.
Advanced Editor: added auto completion for relation member roles
Advanced Editor: added "move up" and "move down" for relation members

Location:

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

Files:

• editor/BasicEditorPanel.java (modified) (4 diffs)
• editor/MemberRoleCellEditor.java (added)
• editor/RelationMemberColumnModel.java (modified) (1 diff)
• editor/RelationMemberEditorModel.java (modified) (3 diffs)
• editor/RelationMemberTable.java (modified) (4 diffs)
• editor/TurnRestrictionEditor.java (modified) (2 diffs)
• preferences/PreferenceEditor.java (modified) (3 diffs)
• preferences/PreferenceKeys.java (modified) (1 diff)
• preferences/PreferencesPanel.java (moved) (moved from applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/IconPreferencePanel.java ) (5 diffs)

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

@@ -11 +11 @@
 import javax.swing.JScrollPane;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
@@ -31 +32 @@
         private TurnRestrictionLegEditor toEditor;
         private ViaList lstVias;
+        private JLabel lblVias;
+        private JScrollPane spVias;
         private TurnRestrictionComboBox cbTurnRestrictions;
         private VehicleExceptionEditor vehicleExceptionsEditor;
@@ -78 +81 @@
                 gc.weightx = 0.0;
             gc.insets = new Insets(0,0,5,5);    
-            add(new JLabel("Vias:"), gc);
+            add(lblVias = new JLabel("Vias:"), gc);
             
             gc.gridx = 1;
             gc.weightx = 1.0;
             DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
-            add(new JScrollPane(lstVias = new ViaList(new ViaListModel(model, selectionModel), selectionModel)),gc);
+            add(spVias = new JScrollPane(lstVias = new ViaList(new ViaListModel(model, selectionModel), selectionModel)),gc);
+            if (!Main.pref.getBoolean(PreferenceKeys.SHOW_VIAS_IN_BASIC_EDITOR, false)) {
+                lblVias.setVisible(false);
+                spVias.setVisible(false);
+            }
             
             // the editor for vehicle exceptions
@@ -152 +159 @@
                 cbTurnRestrictions.initIconSetFromPreferences(prefs);
         }
+        
+        /**
+         * Initializes the visibility of the list of via-objects depending
+         * on values in the JOSM preferences
+         * 
+         * @param prefs the JOSM preferences
+         */
+        public void initViasVisibilityFromPreferences(Preferences prefs){
+                boolean value = prefs.getBoolean(PreferenceKeys.SHOW_VIAS_IN_BASIC_EDITOR, false);
+                if (value != lblVias.isVisible()){
+                        lblVias.setVisible(value);
+                        spVias.setVisible(value);
+                }
+        }
 }

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

@@ -21 +21 @@
                  col.setHeaderValue(tr("Role"));
                  col.setResizable(true);
-                 col.setPreferredWidth(100);                             
+                 col.setPreferredWidth(100);    
+                 col.setCellEditor(new MemberRoleCellEditor());
                  addColumn(col);
                  

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

@@ -2 +2 @@
 
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.text.MessageFormat;
-
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22 +23 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 public class RelationMemberEditorModel extends AbstractTableModel{      
@@ -353 +353 @@
         }
         
+        protected List<Integer> getSelectedIndices() {
+                ArrayList<Integer> ret = new ArrayList<Integer>();
+                for(int i =0; i < members.size(); i++){
+                        if (rowSelectionModel.isSelectedIndex(i)) 
+                                ret.add(i);
+                }
+                return ret;
+        }
+        
+        public boolean canMoveUp() {
+                List<Integer> sel = getSelectedIndices();
+                if (sel.isEmpty()) return false;
+                return sel.get(0) > 0;
+        }
+        
+        public boolean canMoveDown() {
+                List<Integer> sel = getSelectedIndices();
+                if (sel.isEmpty()) return false;
+                return sel.get(sel.size()-1) < members.size()-1;
+        }
+        
+        public void moveUpSelected() {
+                if (!canMoveUp()) return;
+                List<Integer> sel = getSelectedIndices();
+                for (int idx: sel){
+                        RelationMemberModel m = members.remove(idx);
+                        members.add(idx-1, m);
+                }
+                fireTableDataChanged();
+                rowSelectionModel.clearSelection();
+                colSelectionModel.setSelectionInterval(0, 1);
+                for (int idx: sel){
+                        rowSelectionModel.addSelectionInterval(idx-1, idx-1);
+                }
+        }
+        
+        public void moveDownSelected() {
+                if (!canMoveDown()) return;
+                List<Integer> sel = getSelectedIndices();
+                for (int i = sel.size()-1; i>=0;i--){
+                        int idx = sel.get(i);
+                        RelationMemberModel m = members.remove(idx);
+                        members.add(idx+1, m);
+                }
+                fireTableDataChanged();
+                rowSelectionModel.clearSelection();
+                colSelectionModel.setSelectionInterval(0, 1);
+                for (int idx: sel){
+                        rowSelectionModel.addSelectionInterval(idx+1, idx+1);
+                }
+        }
+        
         /**
          * Inserts a list of new relation members with the empty role for the primitives

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

@@ -51 +51 @@
         private DeleteAction actDelete;
         private PasteAction actPaste;
+        private MoveUpAction actMoveUp;
+        private MoveDownAction actMoveDown;
         private TransferHandler transferHandler;
         
@@ -81 +83 @@
                 // the standard paste action for transfer handling) 
                 actPaste = new PasteAction();
+                
+                actMoveUp = new MoveUpAction();
+                model.getRelationMemberEditorModel().getRowSelectionModel().addListSelectionListener(actMoveUp);
+                registerKeyboardAction(actMoveUp,actMoveUp.getKeyStroke(), WHEN_FOCUSED);
+                
+                actMoveDown = new MoveDownAction();
+                model.getRelationMemberEditorModel().getRowSelectionModel().addListSelectionListener(actMoveDown);
+                registerKeyboardAction(actMoveDown, actMoveDown.getKeyStroke(), WHEN_FOCUSED);
         }
 
@@ -150 +160 @@
                 }
         }       
+
+        class MoveDownAction extends AbstractAction implements ListSelectionListener{   
+                private KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, KeyEvent.ALT_DOWN_MASK);
+                public MoveDownAction(){
+                        putValue(NAME, tr("Move down"));
+                        putValue(SHORT_DESCRIPTION, tr("Move the selected relation members down by one position"));
+                        putValue(ACCELERATOR_KEY,keyStroke);
+                        putValue(SMALL_ICON, ImageProvider.get("dialogs", "movedown"));
+                        updateEnabledState();
+                }
+                
+                public void actionPerformed(ActionEvent e) {
+                        model.getRelationMemberEditorModel().moveDownSelected();
+                }
+
+                public void updateEnabledState(){
+                        setEnabled(model.getRelationMemberEditorModel().canMoveDown());
+                }
+                
+                public void valueChanged(ListSelectionEvent e) {
+                        updateEnabledState();                   
+                }
+                public KeyStroke getKeyStroke() {
+                        return keyStroke;
+                }
+        }
+        
+        class MoveUpAction extends AbstractAction implements ListSelectionListener{
+                private KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_UP, KeyEvent.ALT_DOWN_MASK);
+
+                public MoveUpAction() {
+                        putValue(NAME, tr("Move up"));
+                        putValue(SHORT_DESCRIPTION, tr("Move the selected relation members up by one position"));
+                        putValue(ACCELERATOR_KEY,keyStroke);
+                        putValue(SMALL_ICON, ImageProvider.get("dialogs", "moveup"));
+                        updateEnabledState();
+                }
+                
+                public void actionPerformed(ActionEvent e) {
+                        model.getRelationMemberEditorModel().moveUpSelected();
+                }
+
+                public void updateEnabledState(){
+                        setEnabled(model.getRelationMemberEditorModel().canMoveUp());
+                }
+                
+                public void valueChanged(ListSelectionEvent e) {
+                        updateEnabledState();                   
+                }
+                public KeyStroke getKeyStroke() {
+                        return keyStroke;
+                }
+        }
         
         class TablePopupLauncher extends PopupMenuLauncher {
@@ -170 +233 @@
                         addSeparator();
                         add(actDelete);
+                        addSeparator();
+                        add(actMoveUp);
+                        add(actMoveDown);
                 }
         }

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

@@ -866 +866 @@
     
     /**
-     * Listens the changes of the preference {@see PreferenceKeys#ROAD_SIGNS}
-     * and refreshes the set of road icons 
+     * Listens to changes of the preference {@see PreferenceKeys#ROAD_SIGNS}
+     * and refreshes the set of road icons.
+     * 
+     * Listens to changes of the preference {@see PreferenceKeys#SHOW_VIAS_IN_BASIC_EDITOR}
+     * and toggles the visibility af the list of via-objects in the Basic
+     * Editor. 
      *
      */
@@ -876 +880 @@
         
                 public void preferenceChanged(PreferenceChangeEvent evt) {                      
-                        if (!evt.getKey().equals(PreferenceKeys.ROAD_SIGNS)) return;
-                        refreshIconSet();
+                        if (evt.getKey().equals(PreferenceKeys.ROAD_SIGNS)){
+                                refreshIconSet();
+                        } else if (evt.getKey().equals(PreferenceKeys.SHOW_VIAS_IN_BASIC_EDITOR)) {
+                                pnlBasicEditor.initViasVisibilityFromPreferences(Main.pref);
+                        }                       
                 }
     }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java

@@ -32 +32 @@
 public class PreferenceEditor extends JPanel implements PreferenceSetting{
         
-        private IconPreferencePanel pnlIconPreferences;
+        private PreferencesPanel pnlIconPreferences;
 
         /**
@@ -77 +77 @@
                 JPanel pnl = new JPanel(new BorderLayout());
                 
-                pnlIconPreferences = new IconPreferencePanel();
+                pnlIconPreferences = new PreferencesPanel();
                 pnlIconPreferences.initFromPreferences(Main.pref);
                 
@@ -93 +93 @@
                 tp.add(buildIconPreferencePanel());
                 tp.add(buildCreditPanel());             
-                tp.setTitleAt(0, tr("Road Signs"));
-                tp.setToolTipTextAt(0,tr("Configure the set of road sign icons to be used in the turnrestrictions plugin"));
+                tp.setTitleAt(0, tr("Preferences"));
+                tp.setToolTipTextAt(0,tr("Configure the preferences for the turnrestrictions plugin"));
                 tp.setTitleAt(1, tr("Sponsor"));
                 add(tp, BorderLayout.CENTER);

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceKeys.java

@@ -17 +17 @@
          */
         String ROAD_SIGNS = "turnrestrictions.road-signs";
+        
+        /**
+         * Indicates whether the Basic Editor should include a widget for for displaying
+         * and editing the via-objects of a turn restriction.
+         * 
+         * Supported values are:
+         * <ul>
+         *   <li><tt>true</tt> - display the list of vias in the basic editor </li>
+         *    <li><tt>false</tt> - don't display the list of vias in the basic editor </li>
+         * </ul>
+         */
+        String SHOW_VIAS_IN_BASIC_EDITOR = "turnrestrictions.show-vias-in-basic-editor";
 }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java

@@ -12 +12 @@
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
+import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -27 +28 @@
  * 
  */
-public class IconPreferencePanel extends VerticallyScrollablePanel {
-        private static final Logger logger = Logger.getLogger(IconPreferencePanel.class.getName());
+public class PreferencesPanel extends VerticallyScrollablePanel {
+        private static final Logger logger = Logger.getLogger(PreferencesPanel.class.getName());
         private JRadioButton rbSetA;
         private JRadioButton rbSetB;
         private ButtonGroup bgIconSet;
-
+        private JCheckBox cbShowViaListInBasicEditor;
+        
+        protected JPanel buildShowViaListInBasicEditorPanel() {
+                JPanel pnl = new JPanel(new GridBagLayout());
+                GridBagConstraints gc = new GridBagConstraints();
+                gc.anchor = GridBagConstraints.NORTHWEST;
+                gc.fill = GridBagConstraints.HORIZONTAL;
+                gc.weightx = 1.0;
+                gc.gridx = 0;
+                gc.gridy = 0;
+                
+                HtmlPanel msg = new HtmlPanel();
+                msg.setText("<html><body>"
+                                + tr("The Basic Editor can optionally display the list of via-objects "
+                                         + "of a turn restrictions. If enabled, one can also edit them "
+                                         + "in the Basic editor. If disabled, editing of via-objects is only "
+                                         + "possible in the Advanced Editor."
+                                  )
+                                + "</body></html>"
+            );
+                pnl.add(msg, gc);
+                
+                gc.gridy++;
+                pnl.add(cbShowViaListInBasicEditor = new JCheckBox(tr("Display and edit list of via-objects in the Basic Editor")), gc);
+                return pnl;
+        }
+        
         /**
          * Builds the panel for the icon set "set-a"
@@ -125 +152 @@
                 gc.gridy++;
                 add(buildSetBPanel(), gc);
+                gc.gridy++;
+                add(buildShowViaListInBasicEditorPanel(), gc);
                 
                 // filler - just grab remaining space
@@ -157 +186 @@
                         rbSetB.setSelected(true);
                 }
+                
+                boolean b = prefs.getBoolean(PreferenceKeys.SHOW_VIAS_IN_BASIC_EDITOR, false);
+                cbShowViaListInBasicEditor.setSelected(b);
         }
         
@@ -175 +207 @@
                         prefs.put(PreferenceKeys.ROAD_SIGNS, set);
                 }
-        }
-        
-        public IconPreferencePanel() {
+                
+                boolean newValue = cbShowViaListInBasicEditor.isSelected();
+                boolean oldValue = prefs.getBoolean(PreferenceKeys.SHOW_VIAS_IN_BASIC_EDITOR, false);
+                if (newValue != oldValue){
+                        prefs.put(PreferenceKeys.SHOW_VIAS_IN_BASIC_EDITOR, newValue);
+                }               
+        }
+        
+        public PreferencesPanel() {
                 build();
         }