Changeset 1762 in josm

Timestamp:

Jul 11, 2009 9:32:42 AM (4 years ago)

Author:

Gubaer

Message:

added: improved tag editor grid in relation editor (borrowed code from tag editor plugin)
removed: realEqual() on OsmPrimitive, Node, etc.

Location:

trunk/src/org/openstreetmap/josm

Files:

• corrector/ReverseWayTagCorrector.java (modified) (6 diffs)
• data/osm/Node.java (modified) (1 diff)
• data/osm/OsmPrimitive.java (modified) (1 diff)
• data/osm/Relation.java (modified) (1 diff)
• data/osm/Way.java (modified) (1 diff)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (31 diffs)
• gui/dialogs/relation/RelationDialogManager.java (added)
• gui/dialogs/relation/RelationEditor.java (modified) (4 diffs)
• gui/dialogs/relation/RunnableAction.java (added)
• gui/dialogs/relation/TagCellEditor.java (added)
• gui/dialogs/relation/TagCellRenderer.java (added)
• gui/dialogs/relation/TagEditorModel.java (added)
• gui/dialogs/relation/TagFieldEditor.java (added)
• gui/dialogs/relation/TagModel.java (added)
• gui/dialogs/relation/TagTable.java (added)
• gui/dialogs/relation/ac (added)
• gui/dialogs/relation/ac/AutoCompletionCache.java (added)
• gui/dialogs/relation/ac/AutoCompletionItemPritority.java (added)
• gui/dialogs/relation/ac/AutoCompletionList.java (added)
• gui/dialogs/relation/ac/AutoCompletionListItem.java (added)

trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java

@@ -44 +44 @@
         public String apply(String text) {
             Matcher m = startPattern.matcher(text);
-            if (!m.lookingAt())
+            if (!m.lookingAt()) {
                 m = endPattern.matcher(text);
+            }
 
             if (m.lookingAt()) {
@@ -62 +63 @@
 
     private static PrefixSuffixSwitcher[] prefixSuffixSwitchers =
-            new PrefixSuffixSwitcher[] {
-                new PrefixSuffixSwitcher("left", "right"),
-                new PrefixSuffixSwitcher("forward", "backward"),
-                new PrefixSuffixSwitcher("forwards", "backwards")
-            };
+        new PrefixSuffixSwitcher[] {
+        new PrefixSuffixSwitcher("left", "right"),
+        new PrefixSuffixSwitcher("forward", "backward"),
+        new PrefixSuffixSwitcher("forwards", "backwards")
+    };
 
     @Override
     public Collection<Command> execute(Way oldway, Way way) throws UserCancelException {
         Map<OsmPrimitive, List<TagCorrection>> tagCorrectionsMap =
-                new HashMap<OsmPrimitive, List<TagCorrection>>();
+            new HashMap<OsmPrimitive, List<TagCorrection>>();
 
         ArrayList<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
@@ -86 +87 @@
 
                 if (key.equals("oneway")) {
-                    if (value.equals("-1"))
+                    if (value.equals("-1")) {
                         newValue = OsmUtils.trueval;
-                    else {
+                    } else {
                         Boolean boolValue = OsmUtils.getOsmBoolean(value);
                         if (boolValue != null && boolValue.booleanValue()) {
@@ -97 +98 @@
                     for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) {
                         newKey = prefixSuffixSwitcher.apply(key);
-                        if (!key.equals(newKey))
+                        if (!key.equals(newKey)) {
                             break;
+                        }
                     }
                 }
 
-                if (!key.equals(newKey) || !value.equals(newValue))
+                if (!key.equals(newKey) || !value.equals(newValue)) {
                     tagCorrectionsMap.get(primitive).add(
                             new TagCorrection(key, value, newKey, newValue));
+                }
             }
         }
 
         Map<OsmPrimitive, List<RoleCorrection>> roleCorrectionMap =
-                new HashMap<OsmPrimitive, List<RoleCorrection>>();
+            new HashMap<OsmPrimitive, List<RoleCorrection>>();
         roleCorrectionMap.put(way, new ArrayList<RoleCorrection>());
 
@@ -115 +118 @@
             int position = 0;
             for (RelationMember member : relation.members) {
-                if (!member.member.realEqual(oldway, true)
+                if (!member.member.hasEqualSemanticAttributes(oldway)
                         || member.role.length() == 0) {
                     position++;
@@ -131 +134 @@
                 }
 
-                if (found)
+                if (found) {
                     roleCorrectionMap.get(way).add(
                             new RoleCorrection(relation, position, member, newRole));
+                }
 
                 position++;

trunk/src/org/openstreetmap/josm/data/osm/Node.java

@@ -107 +107 @@
     }
 
-    /**
-     * @deprecated
-     * @see #hasEqualSemanticAttributes(OsmPrimitive)
-     * @see #hasEqualTechnicalAttributes(OsmPrimitive)
-     */
-    @Deprecated
-    @Override public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
-        if (osm instanceof Node) {
-            if (super.realEqual(osm, semanticOnly)) {
-                if ((coor == null) && ((Node)osm).coor == null)
-                    return true;
-                if (coor != null)
-                    return coor.equals(((Node)osm).coor);
-            }
-        }
-        return false;
-    }
-
     @Override
     public boolean hasEqualSemanticAttributes(OsmPrimitive other) {

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -284 +284 @@
         clearCached();
         clearErrors();
-    }
-
-    /**
-     * Perform an equality compare for all non-volatile fields not only for the id
-     * but for the whole object (for conflict resolving)
-     * @param semanticOnly if <code>true</code>, modified flag and timestamp are not compared
-     * 
-     * @deprecated
-     * @see #hasEqualSemanticAttributes(OsmPrimitive)
-     * @see #hasEqualTechnicalAttributes(OsmPrimitive)
-     */
-    @Deprecated
-    public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
-        return id == osm.id
-        && incomplete == osm.incomplete
-        && deleted == osm.deleted
-        && (semanticOnly || (
-                modified == osm.modified
-                && timestamp == osm.timestamp
-                && version == osm.version
-                && visible == osm.visible
-                && (user == null ? osm.user==null : user==osm.user))
-        )
-        && (keys == null ? osm.keys==null : keys.equals(osm.keys));
     }
 

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -68 +68 @@
         // adding members in string increases memory usage a lot and overflows for looped relations
         return "{Relation id="+id+" version="+version+"}";
-    }
-
-    @Deprecated
-    @Override public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
-        return osm instanceof Relation ? super.realEqual(osm, semanticOnly) && members.equals(((Relation)osm).members) : false;
     }
 

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -99 +99 @@
         if (incomplete) return "{Way id="+id+" version="+version+" (incomplete)}";
         return "{Way id="+id+" version="+version+" nodes="+Arrays.toString(nodes.toArray())+"}";
-    }
-
-    @Deprecated
-    @Override public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
-        return osm instanceof Way ? super.realEqual(osm, semanticOnly) && nodes.equals(((Way)osm).nodes) : false;
     }
 

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

@@ -9 +9 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
 import java.awt.event.KeyEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Map.Entry;
 
 import javax.swing.JLabel;
@@ -23 +26 @@
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -44 +48 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
+import org.openstreetmap.josm.gui.dialogs.relation.ac.AutoCompletionCache;
+import org.openstreetmap.josm.gui.dialogs.relation.ac.AutoCompletionList;
 import org.openstreetmap.josm.io.OsmServerObjectReader;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -94 +100 @@
 public class GenericRelationEditor extends RelationEditor {
 
+    // We need this twice, so cache result
+    protected final static String applyChangesText = tr("Apply Changes");
+
     private JLabel status;
-
-    /**
-     * The property data.
-     */
-    private final DefaultTableModel propertyData = new DefaultTableModel() {
-        @Override public boolean isCellEditable(int row, int column) {
-            return true;
-        }
-        @Override public Class<?> getColumnClass(int columnIndex) {
-            return String.class;
-        }
-    };
 
     /**
@@ -123 +120 @@
      * The properties and membership lists.
      */
-    private final JTable propertyTable = new JTable(propertyData);
     private final JTable memberTable = new JTable(memberData);
 
-    // We need this twice, so cache result
-    protected final static String applyChangesText = tr("Apply Changes");
+    /** the tag table and its model */
+    private TagEditorModel tagEditorModel;
+    private TagTable tagTable;
+    private AutoCompletionCache acCache;
+    private AutoCompletionList acList;
+
 
     /**
@@ -141 +141 @@
         // Initalizes ExtendedDialog
         super(relation, selectedMembers);
+        acCache = AutoCompletionCache.getCacheForLayer(Main.map.mapView.getEditLayer());
+        acList = new AutoCompletionList();
 
         JPanel bothTables = setupBasicLayout(selectedMembers);
+        if (relation != null) {
+            this.tagEditorModel.initFromPrimitive(relation);
+        } else {
+            tagEditorModel.clear();
+        }
+        tagEditorModel.ensureOneTag();
+        addWindowListener(
+                new WindowAdapter() {
+                    protected void requestFocusInTopLeftCell() {
+                        SwingUtilities.invokeLater(new Runnable(){
+                            public void run()
+                            {
+                                tagEditorModel.ensureOneTag();
+                                tagTable.requestFocusInCell(0, 0);
+                            }
+                        });
+                    }
+                    @Override public void windowGainedFocus(WindowEvent e) {
+                        requestFocusInTopLeftCell();
+                    }
+                    @Override
+                    public void windowActivated(WindowEvent e) {
+                        requestFocusInTopLeftCell();
+                    }
+                    @Override
+                    public void windowDeiconified(WindowEvent e) {
+                        requestFocusInTopLeftCell();
+                    }
+                    @Override
+                    public void windowOpened(WindowEvent e) {
+                        requestFocusInTopLeftCell();
+                    }
+                }
+        );
 
         JTabbedPane tabPane = new JTabbedPane();
@@ -165 +201 @@
      */
     private JPanel setupBasicLayout(Collection<RelationMember> selectedMembers) {
-        // setting up the properties table
-        propertyData.setColumnIdentifiers(new String[]{tr("Key"),tr("Value")});
-        propertyTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        propertyData.addTableModelListener(new TableModelListener() {
-            public void tableChanged(TableModelEvent tme) {
-                if (tme.getType() == TableModelEvent.UPDATE) {
-                    int row = tme.getFirstRow();
-
-                    if (!(tme.getColumn() == 0 && row == propertyData.getRowCount() -1)) {
-                        clone.entrySet().clear();
-                        for (int i = 0; i < propertyData.getRowCount(); i++) {
-                            String key = propertyData.getValueAt(i, 0).toString();
-                            String value = propertyData.getValueAt(i, 1).toString();
-                            if (key.length() > 0 && value.length() > 0) {
-                                clone.put(key, value);
-                            }
-                        }
-                        refreshTables();
-                    }
-                }
-            }
-        });
-        propertyTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
+        // setting up the tag table
+        //
+        tagEditorModel = new TagEditorModel();
+        tagTable = new TagTable(tagEditorModel);
+        acCache.initFromJOSMDataset();
+        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);
+
 
         // setting up the member table
@@ -198 +223 @@
                 if (tme.getType() == TableModelEvent.UPDATE && tme.getColumn() == 0) {
                     int row = tme.getFirstRow();
-                    clone.members.get(row).role = memberData.getValueAt(row, 0).toString();
+                    getClone().members.get(row).role = memberData.getValueAt(row, 0).toString();
                 }
             }
@@ -230 +255 @@
         JPanel bothTables = new JPanel();
         bothTables.setLayout(new GridBagLayout());
-        bothTables.add(new JLabel(tr("Tags (empty value deletes tag)")), GBC.eol().fill(GBC.HORIZONTAL));
-        bothTables.add(new JScrollPane(propertyTable), GBC.eop().fill(GBC.BOTH));
+        bothTables.add(new JLabel(tr("Tags")), GBC.eol().fill(GBC.HORIZONTAL));
+        final JScrollPane scrollPane = new JScrollPane(tagTable);
+
+        // this adapters ensures that the width of the tag table columns is adjusted
+        // to the width of the scroll pane viewport. Also tried to overwrite
+        // getPreferredViewportSize() in JTable, but did not work.
+        //
+        scrollPane.addComponentListener(
+                new ComponentAdapter() {
+                    @Override public void componentResized(ComponentEvent e) {
+                        super.componentResized(e);
+                        Dimension d = scrollPane.getViewport().getExtentSize();
+                        tagTable.adjustColumnWidth(d.width);
+                    }
+                }
+        );
+        bothTables.add(scrollPane, GBC.eop().fill(GBC.BOTH));
         bothTables.add(status = new JLabel(tr("Members")), GBC.eol().fill(GBC.HORIZONTAL));
         // this is not exactly pretty but the four buttons simply don't fit in one line.
@@ -310 +350 @@
                     mem.role = memberTable.getValueAt(row, 0).toString();
                     mem.member = (OsmPrimitive) memberTable.getValueAt(row, 1);
-                    clone.members.remove(mem);
+                    getClone().members.remove(mem);
                 }
                 refreshTables();
@@ -337 +377 @@
         // TODO: sort only selected rows
 
-        for (i = 1; i < clone.members.size(); ++i)
+        for (i = 1; i < getClone().members.size(); ++i)
         {
-            RelationMember  m = clone.members.get(i);
+            RelationMember  m = getClone().members.get(i);
             if (m.member.incomplete)
                 // TODO: emit some message that sorting failed
@@ -373 +413 @@
         }
 
-        for (i = 0; i < clone.members.size(); ++i)
+        for (i = 0; i < getClone().members.size(); ++i)
         {
-            RelationMember  m = clone.members.get(i);
+            RelationMember  m = getClone().members.get(i);
             Integer         m2 = null;
             Node            searchNode = null;
@@ -410 +450 @@
                 {
                     m2 = points.get(searchNode).first();
-                    if (m.member == clone.members.get(m2).member)
+                    if (m.member == getClone().members.get(m2).member)
                     {
                         m2 = points.get(searchNode).last();
@@ -418 +458 @@
             catch(java.util.NoSuchElementException e) {}
 
-            if ((m2 == null) && ((i+1) < clone.members.size()))
+            if ((m2 == null) && ((i+1) < getClone().members.size()))
             {
                 // TODO: emit some message that sorting failed
@@ -429 +469 @@
                 try
                 {
-                    Way next = (Way)clone.members.get(m2).member;
+                    Way next = (Way)getClone().members.get(m2).member;
                     lastWayStartUsed = searchNode.equals(next.firstNode());
                 }
@@ -436 +476 @@
                 }
 
-                if ((m2 < clone.members.size()) && ((i+1) < clone.members.size()))
-                {
-                    RelationMember  a = clone.members.get(i+1);
-                    RelationMember  b = clone.members.get(m2);
+                if ((m2 < getClone().members.size()) && ((i+1) < getClone().members.size()))
+                {
+                    RelationMember  a = getClone().members.get(i+1);
+                    RelationMember  b = getClone().members.get(m2);
 
                     if (m2 != (i+1))
                     {
-                        clone.members.set(i+1, b);
-                        clone.members.set(m2, a);
+                        getClone().members.set(i+1, b);
+                        getClone().members.set(m2, a);
 
                         try
@@ -499 +539 @@
      */
     private void applyChanges() {
-        if (GenericRelationEditor.this.relation == null) {
+        if (getRelation()== null) {
             // If the user wanted to create a new relation, but hasn't added any members or
             // tags, don't add an empty relation
-            if(clone.members.size() == 0 && !clone.isTagged())
+            if(getClone().members.size() == 0 && tagEditorModel.getKeys().isEmpty())
                 return;
-            Main.main.undoRedo.add(new AddCommand(clone));
+            tagEditorModel.applyToPrimitive(getClone());
+            Main.main.undoRedo.add(new AddCommand(getClone()));
             DataSet.fireSelectionChanged(Main.ds.getSelected());
-        } else if (!GenericRelationEditor.this.relation.realEqual(clone, true)) {
-            Main.main.undoRedo.add(new ChangeCommand(GenericRelationEditor.this.relation, clone));
+        } else if (getRelation().hasEqualSemanticAttributes(getClone())) {
+            tagEditorModel.applyToPrimitive(getClone());
+            Main.main.undoRedo.add(new ChangeCommand(getRelation(), getClone()));
             DataSet.fireSelectionChanged(Main.ds.getSelected());
         }
@@ -532 +574 @@
         int numLinked = 0;
 
-        propertyData.setRowCount(0);
-        for (Entry<String, String> e : clone.entrySet()) {
-            propertyData.addRow(new Object[]{e.getKey(), e.getValue()});
-        }
-        propertyData.addRow(new Object[]{"", ""});
-
         // re-load membership data
 
         memberData.setRowCount(0);
-        for (int i=0; i<clone.members.size(); i++) {
+        for (int i=0; i<getClone().members.size(); i++) {
 
             // this whole section is aimed at finding out whether the
@@ -550 +586 @@
             // it should cache results, so... FIXME ;-)
 
-            RelationMember em = clone.members.get(i);
+            RelationMember em = getClone().members.get(i);
             WayConnectionType link = WayConnectionType.none;
             RelationMember m = em;
@@ -562 +598 @@
                     break;
                 } else if (m.member instanceof Relation) {
-                    if (m.member == this.relation) {
+                    if (m.member == this.getRelation()) {
                         break;
                     }
@@ -572 +608 @@
             }
             if (way1 != null) {
-                int next = (i+1) % clone.members.size();
+                int next = (i+1) % getClone().members.size();
                 while (next != i) {
-                    m = clone.members.get(next);
-                    next = (next + 1) % clone.members.size();
+                    m = getClone().members.get(next);
+                    next = (next + 1) % getClone().members.size();
                     depth = 0;
                     while (m != null && depth < 10) {
@@ -582 +618 @@
                             break;
                         } else if (m.member instanceof Relation) {
-                            if (m.member == this.relation) {
+                            if (m.member == this.getRelation()) {
                                 break;
                             }
@@ -631 +667 @@
             memberData.addRow(new Object[]{em.role, em.member, link});
         }
-        status.setText(tr("Members: {0} (linked: {1})", clone.members.size(), numLinked));
+        status.setText(tr("Members: {0} (linked: {1})", getClone().members.size(), numLinked));
     }
 
@@ -657 +693 @@
             int[] rows = memberTable.getSelectedRows();
             if (rows.length > 0) {
-                clone.members.add(rows[0], em);
+                getClone().members.add(rows[0], em);
             } else {
-                clone.members.add(em);
+                getClone().members.add(em);
             }
         }
@@ -667 +703 @@
     private void deleteSelected() {
         for (OsmPrimitive p : Main.ds.getSelected()) {
-            Relation c = new Relation(clone);
+            Relation c = new Relation(getClone());
             for (RelationMember rm : c.members) {
                 if (rm.member == p)
@@ -674 +710 @@
                     mem.role = rm.role;
                     mem.member = rm.member;
-                    clone.members.remove(mem);
+                    getClone().members.remove(mem);
                 }
             }
@@ -687 +723 @@
         // check if user attempted to move anything beyond the boundary of the list
         if (rows[0] + direction < 0) return;
-        if (rows[rows.length-1] + direction >= clone.members.size()) return;
-
-        RelationMember m[] = new RelationMember[clone.members.size()];
+        if (rows[rows.length-1] + direction >= getClone().members.size()) return;
+
+        RelationMember m[] = new RelationMember[getClone().members.size()];
 
         // first move all selected rows from the member list into a new array,
         // displaced by the move amount
         for (Integer i: rows) {
-            m[i+direction] = clone.members.get(i);
-            clone.members.set(i, null);
+            m[i+direction] = getClone().members.get(i);
+            getClone().members.set(i, null);
         }
 
@@ -701 +737 @@
         // elements.
         int i = 0;
-        for (RelationMember rm : clone.members) {
+        for (RelationMember rm : getClone().members) {
             if (rm != null) {
                 while (m[i] != null) {
@@ -711 +747 @@
 
         // and write the array back into the member list.
-        clone.members.clear();
-        clone.members.addAll(Arrays.asList(m));
+        getClone().members.clear();
+        getClone().members.addAll(Arrays.asList(m));
         refreshTables();
         ListSelectionModel lsm = memberTable.getSelectionModel();
@@ -724 +760 @@
     private void downloadRelationMembers() {
         boolean download = false;
-        for (RelationMember member : clone.members) {
+        for (RelationMember member : getClone().members) {
             if (member.member.incomplete) {
                 download = true;
@@ -731 +767 @@
         }
         if (download) {
-            OsmServerObjectReader reader = new OsmServerObjectReader(clone.id, OsmPrimitiveType.RELATION, true);
+            OsmServerObjectReader reader = new OsmServerObjectReader(getClone().id, OsmPrimitiveType.RELATION, true);
             try {
                 DataSet dataSet = reader.parseOsm();

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

@@ -16 +16 @@
 public abstract class RelationEditor extends ExtendedDialog {
 
+    /** keeps track of open relation editors */
+    static private RelationDialogManager relationDialogManager;
+
+    /**
+     * Replies the singleton {@see RelationDialogManager}
+     * 
+     * @return the singleton {@see RelationDialogManager}
+     */
+    static public RelationDialogManager getRelationDialogManager() {
+        if (relationDialogManager == null) {
+            relationDialogManager = new RelationDialogManager();
+        }
+        return relationDialogManager;
+    }
+
     public static ArrayList<Class<RelationEditor>> editors = new ArrayList<Class<RelationEditor>>();
 
@@ -22 +37 @@
      * editing.
      */
-    protected Relation relation;
-    protected Relation clone;
+    private Relation relation;
+    private Relation clone;
 
     /**
@@ -57 +72 @@
             }
         }
-        return new GenericRelationEditor(r, selectedMembers);
+        if (getRelationDialogManager().isOpenInEditor(r))
+            return getRelationDialogManager().getEditorForRelation(r);
+        else {
+            RelationEditor editor = new GenericRelationEditor(r, selectedMembers);
+            getRelationDialogManager().register(r, editor);
+            return editor;
+        }
     }
 
@@ -84 +105 @@
         }
     }
+
+    protected Relation getRelation() {
+        return relation;
+    }
+
+    protected Relation getClone() {
+        return clone;
+    }
 }