Changeset 4869 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
- Timestamp:
- 2012-01-24T21:52:43+01:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r4773 r4869 171 171 // hook for roadsigns plugin to display a small 172 172 // button in the upper right corner of this dialog 173 public static JPanel pluginHook = new JPanel();173 public static final JPanel pluginHook = new JPanel(); 174 174 175 175 private JPopupMenu propertyMenu; … … 279 279 boolean c1 = m.containsKey(o1.getValue()); 280 280 boolean c2 = m.containsKey(o2.getValue()); 281 if (c1 == c2) {281 if (c1 == c2) 282 282 return String.CASE_INSENSITIVE_ORDER.compare(o1.getValue(), o2.getValue()); 283 } else if (c1) {283 else if (c1) 284 284 return -1; 285 } else {285 else 286 286 return +1; 287 }288 287 } 289 288 }; … … 1051 1050 for (int row : rows) { 1052 1051 String key = propertyData.getValueAt(row, 0).toString(); 1053 if (row == nextKeyIndex + 1) 1052 if (row == nextKeyIndex + 1) { 1054 1053 nextKeyIndex = row; // no gap yet 1054 } 1055 1055 tags.put(key, null); 1056 1056 } … … 1060 1060 int rowCount = propertyData.getRowCount(); 1061 1061 if (rowCount > rows.length) { 1062 if (nextKeyIndex == rows[rows.length-1]) 1062 if (nextKeyIndex == rows[rows.length-1]) { 1063 1063 // no gap found, pick next or previous key in list 1064 1064 nextKeyIndex = (nextKeyIndex + 1 < rowCount ? nextKeyIndex + 1 : rows[0] - 1); 1065 else1065 } else { 1066 1066 // gap found 1067 1067 nextKeyIndex++; 1068 } 1068 1069 nextKey = (String)propertyData.getValueAt(nextKeyIndex, 0); 1069 1070 }
Note:
See TracChangeset
for help on using the changeset viewer.