Changeset 1884 in josm for trunk/src/org

Timestamp:

2009-08-02T19:13:42+02:00 (15 years ago)

Author:

jttt

Message:

Fix ArrayIndexOutOfBoundsException 0:-2 in relation editor when Shift-Tab is pressed in table without selected cell

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• MemberTable.java (modified) (8 diffs)
• TagTable.java (modified) (9 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.dialogs.relation;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -25 +27 @@
 import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
-
 public class MemberTable extends JTable implements IMemberModelListener {
 
@@ -39 +39 @@
     /**
      * constructor
-     * 
+     *
      * @param model
      * @param columnModel
@@ -75 +75 @@
      * adjusts the width of the columns for the tag name and the tag value to the width of the
      * scroll panes viewport.
-     * 
+     *
      * Note: {@see #getPreferredScrollableViewportSize()} did not work as expected
-     * 
+     *
      * @param scrollPaneWidth the width of the scroll panes viewport
      */
@@ -104 +104 @@
      * <li>it jumps over cells in the first column</li> <li>it automatically add a new empty row
      * when the user leaves the last cell in the table</li> <ul>
-     * 
-     * 
+     *
+     *
      */
     class SelectNextColumnCellAction extends AbstractAction {
@@ -132 +132 @@
      * Action to be run when the user navigates to the previous cell in the table, for instance by
      * pressing Shift-TAB
-     * 
+     *
      */
     class SelectPreviousColumnCellAction extends AbstractAction {
@@ -143 +143 @@
             }
 
-            if (col == 0 && row == 0) {
+            if (col <= 0 && row <= 0) {
                 // change nothing
             } else if (row > 0) {
@@ -166 +166 @@
     /**
      * Replies the popup menu for this table
-     * 
+     *
      * @return the popup menu
      */

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

@@ -35 +35 @@
 /**
  * This is the tabular editor component for OSM tags.
- * 
+ *
  */
 @SuppressWarnings("serial")
@@ -48 +48 @@
      * The table has two columns. The first column is used for editing rendering and
      * editing tag keys, the second for rendering and editing tag values.
-     * 
+     *
      */
     static class TagTableColumnModel extends DefaultTableColumnModel {
@@ -83 +83 @@
      *   last cell in the table</li>
      * <ul>
-     * 
+     *
      * @author gubaer
      *
@@ -132 +132 @@
 
 
-            if (col == 0 && row == 0) {
+            if (col <= 0 && row <= 0) {
                 // change nothing
             } else if (col == 1) {
@@ -147 +147 @@
      * Action to be run when the user invokes a delete action on the table, for
      * instance by pressing DEL.
-     * 
+     *
      * Depending on the shape on the current selection the action deletes individual
      * values or entire tags from the model.
-     * 
+     *
      * If the current selection consists of cells in the second column only, the keys of
      * the selected tags are set to the empty string.
-     * 
+     *
      * If the current selection consists of cell in the third column only, the values of the
      * selected tags are set to the empty string.
-     * 
+     *
      *  If the current selection consists of cells in the second and the third column,
      *  the selected tags are removed from the model.
-     * 
+     *
      *  This action listens to the table selection. It becomes enabled when the selection
      *  is non-empty, otherwise it is disabled.
-     * 
+     *
      *
      */
@@ -248 +248 @@
     /**
      * Action to be run when the user adds a new tag.
-     * 
+     *
      *
      */
@@ -274 +274 @@
 
     /**
-     * 
+     *
      * @return the delete action used by this table
      */
@@ -326 +326 @@
     /**
      * constructor
-     * 
+     *
      * @param model
      * @param columnModel
@@ -340 +340 @@
      * adjusts the width of the columns for the tag name and the tag value
      * to the width of the scroll panes viewport.
-     * 
+     *
      * Note: {@see #getPreferredScrollableViewportSize()} did not work as expected
-     * 
+     *
      * @param scrollPaneWidth the width of the scroll panes viewport
      */