Changeset 4223 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2011-07-10T22:46:41+02:00 (14 years ago)

Author:

stoecker

Message:

fix #6570 (revert change in r4215, see #6547), i18n update, fix typo in function names

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• conflict/tags/MultiValueResolutionDecision.java (modified) (1 diff)
• dialogs/FilterDialog.java (modified) (1 diff)
• dialogs/RelationListDialog.java (modified) (1 diff)
• dialogs/SelectionListDialog.java (modified) (1 diff)
• dialogs/changeset/ChangesetsInActiveDataLayerListModel.java (modified) (2 diffs)
• dialogs/relation/GenericRelationEditor.java (modified) (2 diffs)
• dialogs/relation/MemberTableModel.java (modified) (1 diff)
• history/HistoryBrowserModel.java (modified) (2 diffs)
• tagging/ac/AutoCompletionManager.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java

@@ -223 +223 @@
      * Applies this resolution to a collection of primitives
      *
-     * @param primtives the collection of primitives
-     * @throws IllegalStateException thrown if this resolution is not resolved yet
-     */
-    public void applyTo(Collection<? extends OsmPrimitive> primtives) throws IllegalStateException {
-        if (primtives == null) return;
-        for (OsmPrimitive primitive: primtives) {
+     * @param primitives the collection of primitives
+     * @throws IllegalStateException thrown if this resolution is not resolved yet
+     */
+    public void applyTo(Collection<? extends OsmPrimitive> primitives) throws IllegalStateException {
+        if (primitives == null) return;
+        for (OsmPrimitive primitive: primitives) {
             if (primitive == null) {
                 continue;

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

@@ -275 +275 @@
     }
 
-    public void primtivesAdded(PrimitivesAddedEvent event) {
+    public void primitivesAdded(PrimitivesAddedEvent event) {
         filterModel.executeFilters(event.getPrimitives());
     }
 
-    public void primtivesRemoved(PrimitivesRemovedEvent event) {
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {
         filterModel.executeFilters();
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -831 +831 @@
     public void wayNodesChanged(WayNodesChangedEvent event) {/* irrelevant in this context */}
 
-    public void primtivesAdded(final PrimitivesAddedEvent event) {
+    public void primitivesAdded(final PrimitivesAddedEvent event) {
         model.addRelations(event.getPrimitives());
         model.updateTitle();
     }
 
-    public void primtivesRemoved(final PrimitivesRemovedEvent event) {
+    public void primitivesRemoved(final PrimitivesRemovedEvent event) {
         model.removeRelations(event.getPrimitives());
         model.updateTitle();

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -739 +739 @@
         }
 
-        public void primtivesAdded(PrimitivesAddedEvent event) {/* ignored - handled by SelectionChangeListener */}
-        public void primtivesRemoved(PrimitivesRemovedEvent event) {/* ignored - handled by SelectionChangeListener*/}
+        public void primitivesAdded(PrimitivesAddedEvent event) {/* ignored - handled by SelectionChangeListener */}
+        public void primitivesRemoved(PrimitivesRemovedEvent event) {/* ignored - handled by SelectionChangeListener*/}
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java

@@ -36 +36 @@
     }
 
-    public void primtivesAdded(PrimitivesAddedEvent event) {
+    public void primitivesAdded(PrimitivesAddedEvent event) {
         for (OsmPrimitive primitive:event.getPrimitives()) {
             addChangeset(new Changeset(primitive.getChangesetId()));
@@ -42 +42 @@
     }
 
-    public void primtivesRemoved(PrimitivesRemovedEvent event) {
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {
         for (OsmPrimitive primitive:event.getPrimitives()) {
             removeChangeset(new Changeset(primitive.getChangesetId()));

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

@@ -279 +279 @@
         memberTable.addMouseListener(new MemberTableDblClickAdapter());
         memberTableModel.addMemberModelListener(memberTable);
-        // setup a cell editor with a small border
-        final JTextField cellEditorTextField = new JTextField();
-        cellEditorTextField.setBorder(BorderFactory.createEmptyBorder(1,1,1,1));
-        cellEditorTextField.addFocusListener(
-                new FocusAdapter() {
-                    @Override public void focusGained(FocusEvent e) {
-                        cellEditorTextField.selectAll();
-                    }
-                }
-        );
-        DefaultCellEditor cellEditor = new DefaultCellEditor(cellEditorTextField);
-        cellEditor.setClickCountToStart(1);
-        memberTable.getColumnModel().getColumn(0).setCellEditor(cellEditor);
-        memberTable.setRowHeight(cellEditorTextField.getPreferredSize().height);
 
         final JScrollPane scrollPane = new JScrollPane(memberTable);
@@ -361 +347 @@
         );
         tfRole.setEnabled(memberTable.getSelectedRowCount() > 0);
+        memberTable.setRowHeight(tfRole.getPreferredSize().height);
         SideButton btnApply = new SideButton(setRoleAction);
         btnApply.setPreferredSize(new Dimension(20,20));

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

@@ -107 +107 @@
 
     public void nodeMoved(NodeMovedEvent event) {/* ignore */}
-    public void primtivesAdded(PrimitivesAddedEvent event) {/* ignore */}
-
-    public void primtivesRemoved(PrimitivesRemovedEvent event) {
+    public void primitivesAdded(PrimitivesAddedEvent event) {/* ignore */}
+
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {
         // ignore - the relation in the editor might become out of sync with the relation
         // in the dataset. We will deal with it when the relation editor is closed or

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

@@ -780 +780 @@
     }
 
-    public void primtivesAdded(PrimitivesAddedEvent event) {
+    public void primitivesAdded(PrimitivesAddedEvent event) {
         for (OsmPrimitive p: event.getPrimitives()) {
             if (canShowAsLatest(p)) {
@@ -788 +788 @@
     }
 
-    public void primtivesRemoved(PrimitivesRemovedEvent event) {
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {
         for (OsmPrimitive p: event.getPrimitives()) {
             if (!p.isNew() && p.getId() == history.getId()) {

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

@@ -282 +282 @@
      **/
 
-    public void primtivesAdded(PrimitivesAddedEvent event) {
+    public void primitivesAdded(PrimitivesAddedEvent event) {
         if (dirty)
             return;
@@ -288 +288 @@
     }
 
-    public void primtivesRemoved(PrimitivesRemovedEvent event) {
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {
         dirty = true;
     }