Changeset 14341 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2018-10-17T02:57:45+02:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeGpxLayerDialog.java
r14338 r14341 43 43 private final JTable t; 44 44 private final JCheckBox c; 45 private final Component parent;46 45 private final JButton btnUp; 47 46 private final JButton btnDown; … … 55 54 super(parent, tr("Merge GPX layers"), tr("Merge"), tr("Cancel")); 56 55 setButtonIcons("dialogs/mergedown", "cancel"); 57 this.parent = parent;58 56 59 57 JPanel p = new JPanel(new GridBagLayout()); … … 137 135 && (!ConditionalOptionPaneUtil.showConfirmationDialog( 138 136 "gpx_target_change", 139 parent,137 getParent(), 140 138 new JLabel("<html>" + 141 139 tr("This will change the target layer to \"{0}\".<br>Would you like to continue?", … … 185 183 public int getRowCount() { 186 184 return layers.size(); 187 188 } 189 190 public void moveRow(int row, int newRow) { 185 } 186 187 void moveRow(int row, int newRow) { 191 188 Collections.swap(layers, row, newRow); 192 189 } 193 190 194 publicList<GpxLayer> getSortedLayers() {191 List<GpxLayer> getSortedLayers() { 195 192 return layers; 196 193 } … … 210 207 case 2: 211 208 return layers.get(row).data.getTrackSegsCount(); 209 default: 210 throw new IndexOutOfBoundsException(Integer.toString(col)); 212 211 } 213 throw new IndexOutOfBoundsException(Integer.toString(col));214 212 } 215 213 }
Note:
See TracChangeset
for help on using the changeset viewer.