Changeset 2156 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

Timestamp:

2009-09-17T21:52:20+02:00 (17 years ago)

Author:

Gubaer

Message:

fixed #3533: auto-completion in relation editor broken

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (17 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -70 +70 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.tagging.AutoCompletingTextField;
-import org.openstreetmap.josm.gui.tagging.TagCellEditor;
-import org.openstreetmap.josm.gui.tagging.TagEditorModel;
-import org.openstreetmap.josm.gui.tagging.TagTable;
+import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionCache;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
@@ -92 +90 @@
 
     /** the tag table and its model */
-    private TagEditorModel tagEditorModel;
-    private TagTable tagTable;
-    private AutoCompletionCache acCache;
-    private AutoCompletionList acList;
+    private TagEditorPanel tagEditorPanel;
     private ReferringRelationsBrowser referrerBrowser;
     private ReferringRelationsBrowserModel referrerModel;
@@ -124 +119 @@
         // initialize the autocompletion infrastructure
         //
-        acCache = AutoCompletionCache.getCacheForLayer(getLayer());
-        acCache.initFromDataSet();
-        acList = new AutoCompletionList();
+        AutoCompletionCache.getCacheForLayer(getLayer()).initFromDataSet();
 
         // init the various models
         //
-        tagEditorModel = new TagEditorModel();
         memberTableModel = new MemberTableModel(getLayer());
         selectionTableModel = new SelectionTableModel(getLayer());
         referrerModel = new ReferringRelationsBrowserModel(relation);
 
+        tagEditorPanel = new TagEditorPanel();
         // populate the models
         //
         if (relation != null) {
-            this.tagEditorModel.initFromPrimitive(relation);
+            tagEditorPanel.getModel().initFromPrimitive(relation);
+            //this.tagEditorModel.initFromPrimitive(relation);
             this.memberTableModel.populate(relation);
             if (!getLayer().data.relations.contains(relation)) {
@@ -146 +140 @@
             }
         } else {
-            tagEditorModel.clear();
+            tagEditorPanel.getModel().clear();
             this.memberTableModel.populate(null);
         }
-        tagEditorModel.ensureOneTag();
+        tagEditorPanel.getModel().ensureOneTag();
 
         JSplitPane pane = buildSplitPane();
@@ -211 +205 @@
 
     /**
-     * build the panel with the buttons on the left
-     *
-     * @return
+     * builds the panel with the tag editor
+     *
+     * @return the panel with the tag editor
      */
-    protected JPanel buildTagEditorControlPanel() {
+    protected JPanel buildTagEditorPanel() {
         JPanel pnl = new JPanel();
         pnl.setLayout(new GridBagLayout());
@@ -224 +218 @@
         gc.gridheight = 1;
         gc.gridwidth = 1;
-        gc.insets = new Insets(0, 5, 0, 5);
-        gc.fill = GridBagConstraints.HORIZONTAL;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-
-        // -----
-        AddTagAction addTagAction = new AddTagAction();
-        pnl.add(new JButton(addTagAction), gc);
-
-        // -----
-        gc.gridy = 1;
-        DeleteTagAction deleteTagAction = new DeleteTagAction();
-        tagTable.getSelectionModel().addListSelectionListener(deleteTagAction);
-        pnl.add(new JButton(deleteTagAction), gc);
-
-        // ------
-        // just grab the remaining space
-        gc.gridy = 2;
-        gc.weighty = 1.0;
-        gc.fill = GridBagConstraints.BOTH;
-        pnl.add(new JPanel(), gc);
-        return pnl;
-    }
-
-    /**
-     * builds the panel with the tag editor
-     *
-     * @return the panel with the tag editor
-     */
-    protected JPanel buildTagEditorPanel() {
-        JPanel pnl = new JPanel();
-        pnl.setLayout(new GridBagLayout());
-
-        // setting up the tag table
-        //
-        tagTable = new TagTable(tagEditorModel);
-        TagCellEditor editor = ((TagCellEditor) tagTable.getColumnModel().getColumn(0).getCellEditor());
-        editor.setAutoCompletionCache(acCache);
-        editor.setAutoCompletionList(acList);
-        editor = ((TagCellEditor) tagTable.getColumnModel().getColumn(1).getCellEditor());
-        editor.setAutoCompletionCache(acCache);
-        editor.setAutoCompletionList(acList);
-
-        final JScrollPane scrollPane = new JScrollPane(tagTable);
-
-        GridBagConstraints gc = new GridBagConstraints();
-        gc.gridx = 0;
-        gc.gridy = 0;
-        gc.gridheight = 1;
-        gc.gridwidth = 3;
         gc.fill = GridBagConstraints.HORIZONTAL;
         gc.anchor = GridBagConstraints.FIRST_LINE_START;
@@ -283 +226 @@
         gc.gridx = 0;
         gc.gridy = 1;
-        gc.gridheight = 1;
-        gc.gridwidth = 1;
-        gc.fill = GridBagConstraints.VERTICAL;
-        gc.anchor = GridBagConstraints.NORTHWEST;
-        gc.weightx = 0.0;
-        gc.weighty = 1.0;
-        pnl.add(buildTagEditorControlPanel(), gc);
-
-        gc.gridx = 1;
-        gc.gridy = 1;
         gc.fill = GridBagConstraints.BOTH;
         gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.8;
+        gc.weightx = 1.0;
         gc.weighty = 1.0;
-        pnl.add(scrollPane, gc);
+        pnl.add(tagEditorPanel, gc);
         return pnl;
     }
@@ -311 +244 @@
         // setting up the member table
         memberTable = new MemberTable(getLayer(),memberTableModel);
-        MemberRoleCellEditor editor = ((MemberRoleCellEditor) memberTable.getColumnModel().getColumn(0).getCellEditor());
-        editor.setAutoCompletionCache(acCache);
-        editor.setAutoCompletionList(acList);
-
         memberTable.addMouseListener(new MemberTableDblClickAdapter());
         memberTableModel.addMemberModelListener(memberTable);
@@ -587 +516 @@
             }
         });
-        tfRole.setAutoCompletionList(acList);
+        tfRole.setAutoCompletionList(new AutoCompletionList());
         tfRole.addFocusListener(
                 new FocusAdapter() {
                     @Override
                     public void focusGained(FocusEvent e) {
-                        acCache.populateWithMemberRoles(acList);
+                        AutoCompletionList list = tfRole.getAutoCompletionList();
+                        AutoCompletionCache.getCacheForLayer(Main.main.getEditLayer()).populateWithMemberRoles(list);
                     }
                 }
@@ -629 +559 @@
 
     @Override
-    public void setVisible(boolean b) {
-        super.setVisible(b);
-        if (!b) {
+    public void setVisible(boolean visible) {
+        if (visible) {
+            tagEditorPanel.initAutoCompletion(Main.main.getEditLayer());
+        }
+        super.setVisible(visible);
+        if (!visible) {
             dispose();
         }
@@ -1063 +996 @@
             // If the user wanted to create a new relation, but hasn't added any members or
             // tags, don't add an empty relation
-            if (memberTableModel.getRowCount() == 0 && tagEditorModel.getKeys().isEmpty())
+            if (memberTableModel.getRowCount() == 0 && tagEditorPanel.getModel().getKeys().isEmpty())
                 return;
             Relation newRelation = new Relation();
-            tagEditorModel.applyToPrimitive(newRelation);
+            tagEditorPanel.getModel().applyToPrimitive(newRelation);
             memberTableModel.applyToRelation(newRelation);
             Main.main.undoRedo.add(new AddCommand(getLayer(),newRelation));
@@ -1089 +1022 @@
         protected void applyExistingConflictingRelation() {
             Relation editedRelation = new Relation(getRelation());
-            tagEditorModel.applyToPrimitive(editedRelation);
+            tagEditorPanel.getModel().applyToPrimitive(editedRelation);
             memberTableModel.applyToRelation(editedRelation);
             Conflict<Relation> conflict = new Conflict<Relation>(getRelation(), editedRelation);
@@ -1102 +1035 @@
         protected void applyExistingNonConflictingRelation() {
             Relation editedRelation = new Relation(getRelation());
-            tagEditorModel.applyToPrimitive(editedRelation);
+            tagEditorPanel.getModel().applyToPrimitive(editedRelation);
             memberTableModel.applyToRelation(editedRelation);
             Main.main.undoRedo.add(new ChangeCommand(getRelation(), editedRelation));
@@ -1165 +1098 @@
                 applyNewRelation();
             } else if (!memberTableModel.hasSameMembersAs(getRelationSnapshot())
-                    || tagEditorModel.isDirty()) {
+                    || tagEditorPanel.getModel().isDirty()) {
                 if (isDirtyRelation()) {
                     if (confirmClosingBecauseOfDirtyState()) {
@@ -1198 +1131 @@
                 applyNewRelation();
             } else if (!memberTableModel.hasSameMembersAs(getRelationSnapshot())
-                    || tagEditorModel.isDirty()) {
+                    || tagEditorPanel.getModel().isDirty()) {
                 if (isDirtyRelation()) {
                     if (confirmClosingBecauseOfDirtyState()) {
@@ -1246 +1179 @@
 
         public void actionPerformed(ActionEvent e) {
-            tagEditorModel.appendNewTag();
-        }
-    }
-
-    class DeleteTagAction extends AbstractAction implements ListSelectionListener {
-        public DeleteTagAction() {
-            putValue(SHORT_DESCRIPTION, tr("Delete the currently selected tags"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
-            // putValue(NAME, tr("Cancel"));
-            refreshEnabled();
-        }
-
-        public void actionPerformed(ActionEvent e) {
-            run();
-        }
-
-        /**
-         * delete a selection of tag names
-         */
-        protected void deleteTagNames() {
-            int[] rows = tagTable.getSelectedRows();
-            tagEditorModel.deleteTagNames(rows);
-        }
-
-        /**
-         * delete a selection of tag values
-         */
-        protected void deleteTagValues() {
-            int[] rows = tagTable.getSelectedRows();
-            tagEditorModel.deleteTagValues(rows);
-        }
-
-        /**
-         * delete a selection of tags
-         */
-        protected void deleteTags() {
-            tagEditorModel.deleteTags(tagTable.getSelectedRows());
-        }
-
-        public void run() {
-            if (!isEnabled())
-                return;
-            if (tagTable.getSelectedColumnCount() == 1) {
-                if (tagTable.getSelectedColumn() == 0) {
-                    deleteTagNames();
-                } else if (tagTable.getSelectedColumn() == 1) {
-                    deleteTagValues();
-                } else
-                    // should not happen
-                    //
-                    throw new IllegalStateException("unexpected selected clolumn: getSelectedColumn() is "
-                            + tagTable.getSelectedColumn());
-            } else if (tagTable.getSelectedColumnCount() == 2) {
-                deleteTags();
-            }
-            if (tagEditorModel.getRowCount() == 0) {
-                tagEditorModel.ensureOneTag();
-            }
-        }
-
-        protected void refreshEnabled() {
-            setEnabled(tagTable.getSelectedRowCount() > 0 || tagTable.getSelectedColumnCount() > 0);
-        }
-
-        public void valueChanged(ListSelectionEvent e) {
-            refreshEnabled();
+            tagEditorPanel.getModel().appendNewTag();
         }
     }
@@ -1419 +1287 @@
         public void actionPerformed(ActionEvent e) {
             Relation copy = new Relation();
-            tagEditorModel.applyToPrimitive(copy);
+            tagEditorPanel.getModel().applyToPrimitive(copy);
             memberTableModel.applyToRelation(copy);
             RelationEditor editor = RelationEditor.getEditor(getLayer(), copy, memberTableModel.getSelectedMembers());