Changeset 478 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2007-12-01T13:58:58+01:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
r464 r478 251 251 buttonPanel.add(deleteButton); 252 252 253 mergeButton.setToolTipText(tr("Merge the selected layer into the layer directly below."));253 mergeButton.setToolTipText(tr("Merge the layer directly below into the selected layer.")); 254 254 mergeButton.addActionListener(new ActionListener(){ 255 255 public void actionPerformed(ActionEvent e) { 256 Layer l From= (Layer)instance.getSelectedValue();257 Layer l To= (Layer)model.get(instance.getSelectedIndex()+1);256 Layer lTo = (Layer)instance.getSelectedValue(); 257 Layer lFrom = (Layer)model.get(instance.getSelectedIndex()+1); 258 258 lTo.mergeFrom(lFrom); 259 instance.setSelectedValue(lTo, true);260 259 mapView.removeLayer(lFrom); 260 updateButtonEnabled(); 261 mapView.repaint(); 261 262 } 262 263 }); … … 277 278 boolean enable = model.getSize() > 1; 278 279 enable = enable && sel < model.getSize()-1; 279 enable = enable && l.isMergable((Layer)model.get(sel+1));280 enable = enable && ((Layer)model.get(sel+1)).isMergable(l); 280 281 mergeButton.setEnabled(enable); 281 282 upButton.setEnabled(sel > 0);
Note:
See TracChangeset
for help on using the changeset viewer.