Changeset 13434 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs
- Timestamp:
- 2018-02-18T05:02:23+01:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/dialogs
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
r12846 r13434 53 53 import org.openstreetmap.josm.gui.help.HelpUtil; 54 54 import org.openstreetmap.josm.gui.io.CloseChangesetTask; 55 import org.openstreetmap.josm.gui.layer.OsmDataLayer;56 55 import org.openstreetmap.josm.gui.util.GuiHelper; 57 56 import org.openstreetmap.josm.gui.widgets.ListPopupMenu; … … 123 122 ChangesetCache.getInstance().addChangesetCacheListener(inActiveDataLayerModel); 124 123 MainApplication.getLayerManager().addActiveLayerChangeListener(inActiveDataLayerModel); 125 OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();126 if ( editLayer!= null) {127 editLayer.data.addDataSetListener(inActiveDataLayerModel);128 inActiveDataLayerModel.initFromDataSet( editLayer.data);129 inSelectionModel.initFromPrimitives( editLayer.data.getAllSelected());124 DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 125 if (ds != null) { 126 ds.addDataSetListener(inActiveDataLayerModel); 127 inActiveDataLayerModel.initFromDataSet(ds); 128 inSelectionModel.initFromPrimitives(ds.getAllSelected()); 130 129 } 131 130 } … … 133 132 protected void unregisterAsListener() { 134 133 // remove the list model for the current edit layer as listener 135 //136 134 ChangesetCache.getInstance().removeChangesetCacheListener(inActiveDataLayerModel); 137 135 MainApplication.getLayerManager().removeActiveLayerChangeListener(inActiveDataLayerModel); 138 OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer(); 139 if (editLayer != null) { 140 editLayer.data.removeDataSetListener(inActiveDataLayerModel); 141 } 142 143 // remove the list model for the changesets in the current selection as 144 // listener 136 DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 137 if (ds != null) { 138 ds.removeDataSetListener(inActiveDataLayerModel); 139 } 140 141 // remove the list model for the changesets in the current selection as listener 145 142 SelectionEventManager.getInstance().removeSelectionListener(inSelectionModel); 146 143 ChangesetCache.getInstance().removeChangesetCacheListener(inSelectionModel); … … 235 232 236 233 protected void initWithCurrentData() { 237 OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();238 if ( editLayer!= null) {239 inSelectionModel.initFromPrimitives( editLayer.data.getAllSelected());240 inActiveDataLayerModel.initFromDataSet( editLayer.data);234 DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 235 if (ds != null) { 236 inSelectionModel.initFromPrimitives(ds.getAllSelected()); 237 inActiveDataLayerModel.initFromDataSet(ds); 241 238 } 242 239 } … … 266 263 if (sel.isEmpty()) 267 264 return; 268 if (MainApplication.getLayerManager().get EditDataSet() == null)269 return; 270 new SelectObjectsAction().selectObjectsByChangesetIds(MainApplication.getLayerManager().get EditDataSet(), sel);265 if (MainApplication.getLayerManager().getActiveDataSet() == null) 266 return; 267 new SelectObjectsAction().selectObjectsByChangesetIds(MainApplication.getLayerManager().getActiveDataSet(), sel); 271 268 } 272 269 … … 314 311 @Override 315 312 public void actionPerformed(ActionEvent e) { 316 if (MainApplication.getLayerManager().getEditLayer() == null) 313 DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 314 if (ds == null) 317 315 return; 318 316 ChangesetListModel model = getCurrentChangesetListModel(); … … 321 319 return; 322 320 323 DataSet ds = MainApplication.getLayerManager().getEditLayer().data;324 321 selectObjectsByChangesetIds(ds, sel); 325 322 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r13367 r13434 160 160 public void hideNotify() { 161 161 MainApplication.getLayerManager().removeActiveLayerChangeListener(this); 162 remove EditLayerListeners(MainApplication.getLayerManager().getEditLayer());162 removeDataLayerListeners(MainApplication.getLayerManager().getEditLayer()); 163 163 } 164 164 … … 269 269 @Override 270 270 public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) { 271 remove EditLayerListeners(e.getPreviousEditLayer());272 add EditLayerListeners(e.getSource().getEditLayer());271 removeDataLayerListeners(e.getPreviousDataLayer()); 272 addDataLayerListeners(e.getSource().getActiveDataLayer()); 273 273 refreshView(); 274 274 } 275 275 276 private void add EditLayerListeners(OsmDataLayer newLayer) {276 private void addDataLayerListeners(OsmDataLayer newLayer) { 277 277 if (newLayer != null) { 278 278 newLayer.getConflicts().addConflictListener(this); … … 281 281 } 282 282 283 private void remove EditLayerListeners(OsmDataLayer oldLayer) {283 private void removeDataLayerListeners(OsmDataLayer oldLayer) { 284 284 if (oldLayer != null) { 285 285 oldLayer.getConflicts().removeConflictListener(this); -
trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
r12678 r13434 114 114 115 115 protected static String buildMapPaintText() { 116 final Collection<OsmPrimitive> sel = MainApplication.getLayerManager().get EditDataSet().getAllSelected();116 final Collection<OsmPrimitive> sel = MainApplication.getLayerManager().getActiveDataSet().getAllSelected(); 117 117 ElemStyles elemstyles = MapPaintStyles.getStyles(); 118 118 NavigatableComponent nc = MainApplication.getMap().mapView; -
trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
r13210 r13434 342 342 343 343 protected void setCurrentRelationAsSelection() { 344 MainApplication.getLayerManager().get EditDataSet().setSelected(displaylist.getSelectedValue());344 MainApplication.getLayerManager().getActiveDataSet().setSelected(displaylist.getSelectedValue()); 345 345 } 346 346 … … 351 351 @Override 352 352 public void mouseClicked(MouseEvent e) { 353 if (MainApplication.getLayerManager().getEditLayer() == null) return;354 if ( isDoubleClick(e)) {355 if (e.isControlDown() ) {353 DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 354 if (ds != null && isDoubleClick(e)) { 355 if (e.isControlDown() && !ds.isReadOnly()) { 356 356 editCurrentRelation(); 357 357 } else { … … 733 733 return; 734 734 // trigger a sort of the relation list because the display name may have changed 735 //736 735 List<Relation> sel = model.getSelectedRelations(); 737 736 model.sort(); … … 742 741 @Override 743 742 public void dataChanged(DataChangedEvent event) { 744 initFromLayer(MainApplication.getLayerManager().get EditLayer());743 initFromLayer(MainApplication.getLayerManager().getActiveDataLayer()); 745 744 } 746 745 -
trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
r13141 r13434 73 73 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent; 74 74 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener; 75 import org.openstreetmap.josm.gui.layer.OsmDataLayer;76 75 import org.openstreetmap.josm.gui.util.GuiHelper; 77 76 import org.openstreetmap.josm.gui.util.HighlightHelper; … … 200 199 if (idx < 0) return; 201 200 if (isDoubleClick(e)) { 202 OsmDataLayer layer = MainApplication.getLayerManager().getEditLayer();203 if ( layer== null) return;201 DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 202 if (ds == null) return; 204 203 OsmPrimitive osm = model.getElementAt(idx); 205 Collection<OsmPrimitive> sel = layer.data.getSelected();204 Collection<OsmPrimitive> sel = ds.getSelected(); 206 205 if (sel.size() != 1 || !sel.iterator().next().equals(osm)) { 207 206 // Select primitive if it's not the whole current selection 208 layer.data.setSelected(Collections.singleton(osm));207 ds.setSelected(Collections.singleton(osm)); 209 208 } else if (osm instanceof Relation) { 210 209 // else open relation editor if applicable … … 296 295 297 296 protected void updateEnabledState() { 298 setEnabled(MainApplication.getLayerManager().get EditLayer() != null);297 setEnabled(MainApplication.getLayerManager().getActiveDataSet() != null); 299 298 } 300 299 … … 321 320 Collection<OsmPrimitive> sel = model.getSelected(); 322 321 if (sel.isEmpty()) return; 323 OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();324 if ( editLayer== null) return;325 editLayer.data.setSelected(sel);322 DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 323 if (ds == null) return; 324 ds.setSelected(sel); 326 325 model.selectionModel.setSelectionInterval(0, sel.size()-1); 327 326 } … … 830 829 @Override 831 830 public void actionPerformed(ActionEvent e) { 832 MainApplication.getLayerManager().get EditDataSet().setSelected(sel);831 MainApplication.getLayerManager().getActiveDataSet().setSelected(sel); 833 832 } 834 833 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
r12636 r13434 32 32 import org.openstreetmap.josm.actions.AbstractInfoAction; 33 33 import org.openstreetmap.josm.data.osm.DataSelectionListener; 34 import org.openstreetmap.josm.data.osm.DataSet; 34 35 import org.openstreetmap.josm.data.osm.OsmPrimitive; 35 36 import org.openstreetmap.josm.data.osm.User; … … 347 348 users.add(data.get(index).user); 348 349 } 349 Collection<OsmPrimitive> selected = MainApplication.getLayerManager().getEditDataSet().getAllSelected(); 350 DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 351 Collection<OsmPrimitive> selected = ds.getAllSelected(); 350 352 Collection<OsmPrimitive> byUser = new LinkedList<>(); 351 353 for (OsmPrimitive p : selected) { … … 354 356 } 355 357 } 356 MainApplication.getLayerManager().getEditDataSet().setSelected(byUser);358 ds.setSelected(byUser); 357 359 } 358 360 -
trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
r13149 r13434 132 132 @Override 133 133 public void actionPerformed(ActionEvent e) { 134 final DataSet ds = MainApplication.getLayerManager().get EditDataSet();134 final DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 135 135 if (ds == null) { 136 136 return; … … 181 181 public void showNotify() { 182 182 DataSet.addSelectionListener(this); 183 DataSet ds = MainApplication.getLayerManager().get EditDataSet();183 DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 184 184 if (ds != null) { 185 185 updateSelection(ds.getAllSelected()); … … 350 350 } 351 351 } 352 DataSet ds = MainApplication.getLayerManager().get EditDataSet();352 DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 353 353 if (ds != null) { 354 354 ds.setSelected(sel); … … 494 494 495 495 if (isDblClick) { 496 DataSet ds = MainApplication.getLayerManager().get EditDataSet();496 DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 497 497 if (ds != null) { 498 498 ds.setSelected(sel); … … 630 630 try { 631 631 monitor.setTicksCount(testErrors.size()); 632 final DataSet ds = MainApplication.getLayerManager().get EditDataSet();632 final DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 633 633 int i = 0; 634 634 SwingUtilities.invokeAndWait(ds::beginUpdate); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
r13130 r13434 36 36 import org.openstreetmap.josm.actions.downloadtasks.ChangesetContentDownloadTask; 37 37 import org.openstreetmap.josm.data.osm.Changeset; 38 import org.openstreetmap.josm.data.osm.DataSet; 38 39 import org.openstreetmap.josm.data.osm.OsmPrimitive; 39 40 import org.openstreetmap.josm.data.osm.PrimitiveId; … … 49 50 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent; 50 51 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener; 51 import org.openstreetmap.josm.gui.layer.OsmDataLayer;52 52 import org.openstreetmap.josm.gui.util.GuiHelper; 53 53 import org.openstreetmap.josm.gui.widgets.JMultilineLabel; … … 279 279 280 280 @Override 281 public void actionPerformed(ActionEvent arg0) {281 public void actionPerformed(ActionEvent e) { 282 282 Set<HistoryOsmPrimitive> selected = model.getSelectedPrimitives(); 283 283 if (selected.isEmpty()) return; … … 301 301 302 302 @Override 303 public void actionPerformed(ActionEvent arg0) {303 public void actionPerformed(ActionEvent e) { 304 304 final List<PrimitiveId> primitiveIds = model.getSelectedPrimitives().stream().map(HistoryOsmPrimitive::getPrimitiveId) 305 305 .collect(Collectors.toList()); … … 323 323 return null; 324 324 } 325 OsmDataLayer layer = MainApplication.getLayerManager().getEditLayer();326 if ( layer== null) {325 DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 326 if (ds == null) { 327 327 return null; 328 328 } 329 329 Set<OsmPrimitive> target = new HashSet<>(); 330 330 for (HistoryOsmPrimitive p : model.getSelectedPrimitives()) { 331 OsmPrimitive op = layer.data.getPrimitiveById(p.getPrimitiveId());331 OsmPrimitive op = ds.getPrimitiveById(p.getPrimitiveId()); 332 332 if (op != null) { 333 333 target.add(op); … … 338 338 339 339 public final void updateEnabledState() { 340 setEnabled(MainApplication.getLayerManager().get EditLayer() != null && model.hasSelectedPrimitives());340 setEnabled(MainApplication.getLayerManager().getActiveDataSet() != null && model.hasSelectedPrimitives()); 341 341 } 342 342 … … 350 350 updateEnabledState(); 351 351 } 352 353 352 } 354 353 … … 363 362 364 363 @Override 365 public void actionPerformed(ActionEvent arg0) {364 public void actionPerformed(ActionEvent e) { 366 365 final Set<OsmPrimitive> target = getTarget(); 367 366 if (target == null) { … … 372 371 return; 373 372 } 374 MainApplication.getLayerManager().get EditLayer().data.setSelected(target);373 MainApplication.getLayerManager().getActiveDataSet().setSelected(target); 375 374 } 376 375 } … … 386 385 387 386 @Override 388 public void actionPerformed(ActionEvent arg0) {387 public void actionPerformed(ActionEvent e) { 389 388 final Set<OsmPrimitive> target = getTarget(); 390 389 if (target == null) { … … 395 394 return; 396 395 } 397 MainApplication.getLayerManager().get EditLayer().data.setSelected(target);396 MainApplication.getLayerManager().getActiveDataSet().setSelected(target); 398 397 AutoScaleAction.zoomToSelection(); 399 398 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
r12871 r13434 35 35 import org.openstreetmap.josm.data.osm.Changeset; 36 36 import org.openstreetmap.josm.data.osm.ChangesetCache; 37 import org.openstreetmap.josm.data.osm.DataSet; 37 38 import org.openstreetmap.josm.data.osm.OsmPrimitive; 38 39 import org.openstreetmap.josm.gui.HelpAwareOptionPane; … … 42 43 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent; 43 44 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener; 44 import org.openstreetmap.josm.gui.layer.OsmDataLayer;45 45 import org.openstreetmap.josm.gui.widgets.JosmTextArea; 46 46 import org.openstreetmap.josm.gui.widgets.JosmTextField; … … 72 72 private final ZoomInCurrentLayerAction actZoomInCurrentLayerAction = new ZoomInCurrentLayerAction(); 73 73 // CHECKSTYLE.ON: SingleSpaceSeparator 74 74 75 75 private JButton btnOpenChangesetPopupMenu; 76 76 … … 374 374 + "edit layer ''{1}''.</html>", 375 375 currentChangeset.getId(), 376 Utils.escapeReservedCharactersHTML(MainApplication.getLayerManager().get EditLayer().getName())376 Utils.escapeReservedCharactersHTML(MainApplication.getLayerManager().getActiveDataSet().getName()) 377 377 ), 378 378 tr("Nothing to select"), … … 383 383 384 384 @Override 385 public void actionPerformed(ActionEvent arg0) {385 public void actionPerformed(ActionEvent e) { 386 386 if (!isEnabled()) 387 387 return; 388 OsmDataLayer layer = MainApplication.getLayerManager().getEditLayer();389 if ( layer== null) {388 DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 389 if (ds == null) { 390 390 return; 391 391 } 392 392 Set<OsmPrimitive> target = new HashSet<>(); 393 for (OsmPrimitive p: layer.data.allPrimitives()) {393 for (OsmPrimitive p: ds.allPrimitives()) { 394 394 if (p.isUsable() && p.getChangesetId() == currentChangeset.getId()) { 395 395 target.add(p); … … 400 400 return; 401 401 } 402 layer.data.setSelected(target);402 ds.setSelected(target); 403 403 } 404 404 405 405 public void updateEnabledState() { 406 setEnabled(MainApplication.getLayerManager().get EditLayer() != null && currentChangeset != null);406 setEnabled(MainApplication.getLayerManager().getActiveDataSet() != null && currentChangeset != null); 407 407 } 408 408 … … 433 433 + "edit layer ''{1}''.</html>", 434 434 currentChangeset.getId(), 435 MainApplication.getLayerManager().get EditLayer().getName()435 MainApplication.getLayerManager().getActiveDataSet().getName() 436 436 ), 437 437 tr("Nothing to zoom to"), … … 442 442 443 443 @Override 444 public void actionPerformed(ActionEvent arg0) {444 public void actionPerformed(ActionEvent e) { 445 445 if (!isEnabled()) 446 446 return; 447 OsmDataLayer layer = MainApplication.getLayerManager().getEditLayer();448 if ( layer== null) {447 DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 448 if (ds == null) { 449 449 return; 450 450 } 451 451 Set<OsmPrimitive> target = new HashSet<>(); 452 for (OsmPrimitive p: layer.data.allPrimitives()) {452 for (OsmPrimitive p: ds.allPrimitives()) { 453 453 if (p.isUsable() && p.getChangesetId() == currentChangeset.getId()) { 454 454 target.add(p); … … 459 459 return; 460 460 } 461 layer.data.setSelected(target);461 ds.setSelected(target); 462 462 AutoScaleAction.zoomToSelection(); 463 463 } 464 464 465 465 public void updateEnabledState() { 466 setEnabled(MainApplication.getLayerManager().get EditLayer() != null && currentChangeset != null);466 setEnabled(MainApplication.getLayerManager().getActiveDataSet() != null && currentChangeset != null); 467 467 } 468 468 -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java
r12372 r13434 4 4 import javax.swing.DefaultListSelectionModel; 5 5 6 import org.openstreetmap.josm.data.osm.DataSet; 6 7 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent; 7 8 import org.openstreetmap.josm.data.osm.event.DataChangedEvent; … … 15 16 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent; 16 17 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener; 17 import org.openstreetmap.josm.gui.layer.OsmDataLayer;18 18 19 19 /** … … 81 81 // just init the model content. Don't register as DataSetListener. The mode 82 82 // is already registered to receive DataChangedEvents from the current edit layer 83 OsmDataLayer editLayer = e.getSource().getEditLayer();84 if ( editLayer!= null) {85 initFromDataSet( editLayer.data);83 DataSet ds = e.getSource().getActiveDataSet(); 84 if (ds != null) { 85 initFromDataSet(ds); 86 86 } else { 87 87 initFromDataSet(null); -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r13130 r13434 64 64 import org.openstreetmap.josm.command.Command; 65 65 import org.openstreetmap.josm.data.SelectionChangedListener; 66 import org.openstreetmap.josm.data.osm.DataSet; 66 67 import org.openstreetmap.josm.data.osm.DefaultNameFormatter; 67 68 import org.openstreetmap.josm.data.osm.IRelation; … … 91 92 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent; 92 93 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener; 94 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 93 95 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset; 94 96 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler; … … 231 233 232 234 private final PreferenceChangedListener preferenceListener = e -> { 233 if (MainApplication.getLayerManager().get EditDataSet() != null) {235 if (MainApplication.getLayerManager().getActiveDataSet() != null) { 234 236 // Re-load data when display preference change 235 237 updateSelection(); … … 487 489 Relation relation = (Relation) membershipData.getValueAt(row, 0); 488 490 MainApplication.getMap().relationListDialog.selectRelation(relation); 489 RelationEditor.getEditor(490 MainApplication.getLayerManager().getEditLayer(),491 relation,492 ((MemberInfo) membershipData.getValueAt(row, 1)).role493 ).setVisible(true);491 OsmDataLayer layer = MainApplication.getLayerManager().getActiveDataLayer(); 492 if (!layer.isReadOnly()) { 493 RelationEditor.getEditor( 494 layer, relation, ((MemberInfo) membershipData.getValueAt(row, 1)).role).setVisible(true); 495 } 494 496 } 495 497 … … 534 536 public void setVisible(boolean b) { 535 537 super.setVisible(b); 536 if (b && MainApplication.getLayerManager().get EditDataSet() != null) {538 if (b && MainApplication.getLayerManager().getActiveDataSet() != null) { 537 539 updateSelection(); 538 540 } … … 644 646 membershipTable.setVisible(membershipData.getRowCount() > 0); 645 647 648 DataSet ds = Main.main.getActiveDataSet(); 649 boolean isReadOnly = ds != null && ds.isReadOnly(); 646 650 boolean hasSelection = !newSel.isEmpty(); 647 651 boolean hasTags = hasSelection && tagData.getRowCount() > 0; 648 652 boolean hasMemberships = hasSelection && membershipData.getRowCount() > 0; 649 addAction.setEnabled( hasSelection);650 editAction.setEnabled( hasTags || hasMemberships);651 deleteAction.setEnabled( hasTags || hasMemberships);653 addAction.setEnabled(!isReadOnly && hasSelection); 654 editAction.setEnabled(!isReadOnly && (hasTags || hasMemberships)); 655 deleteAction.setEnabled(!isReadOnly && (hasTags || hasMemberships)); 652 656 tagTable.setVisible(hasTags); 653 657 tagTable.getTableHeader().setVisible(hasTags); … … 1055 1059 @Override 1056 1060 protected final void updateEnabledState() { 1057 setEnabled( 1058 (tagTable != null && tagTable.getSelectedRowCount() >= 1) 1061 DataSet ds = Main.main.getActiveDataSet(); 1062 setEnabled(ds != null && !ds.isReadOnly() && 1063 ((tagTable != null && tagTable.getSelectedRowCount() >= 1) 1059 1064 || (membershipTable != null && membershipTable.getSelectedRowCount() > 0) 1060 ) ;1065 )); 1061 1066 } 1062 1067 … … 1110 1115 @Override 1111 1116 protected void updateEnabledState() { 1112 setEnabled( 1113 (tagTable != null && tagTable.getSelectedRowCount() == 1) 1117 DataSet ds = Main.main.getActiveDataSet(); 1118 setEnabled(ds != null && !ds.isReadOnly() && 1119 ((tagTable != null && tagTable.getSelectedRowCount() == 1) 1114 1120 ^ (membershipTable != null && membershipTable.getSelectedRowCount() == 1) 1115 ) ;1121 )); 1116 1122 } 1117 1123 -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
r13190 r13434 447 447 mainPanel.add(p, BorderLayout.CENTER); 448 448 449 AutoCompletionManager autocomplete = AutoCompletionManager.of(Main Application.getLayerManager().getEditLayer().data);449 AutoCompletionManager autocomplete = AutoCompletionManager.of(Main.main.getActiveDataSet()); 450 450 List<AutoCompletionItem> keyList = autocomplete.getTagKeys(DEFAULT_AC_ITEM_COMPARATOR); 451 451 … … 564 564 public void setupDialog() { 565 565 super.setupDialog(); 566 buttons.get(0).setEnabled(!Main.main.getActiveDataSet().isReadOnly()); 566 567 final Dimension size = getSize(); 567 568 // Set resizable only in width … … 699 700 700 701 cacheRecentTags(); 701 AutoCompletionManager autocomplete = AutoCompletionManager.of(Main.main.get EditDataSet());702 AutoCompletionManager autocomplete = AutoCompletionManager.of(Main.main.getActiveDataSet()); 702 703 List<AutoCompletionItem> keyList = autocomplete.getTagKeys(DEFAULT_AC_ITEM_COMPARATOR); 703 704 -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
r12657 r13434 114 114 @Override 115 115 public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) { 116 if (MainApplication.getLayerManager().get EditLayer() != this.layer) return;116 if (MainApplication.getLayerManager().getActiveDataLayer() != this.layer) return; 117 117 // just trigger a repaint 118 118 Collection<RelationMember> sel = getSelectedMembers(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java
r12657 r13434 107 107 @Override 108 108 public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) { 109 if (layer == MainApplication.getLayerManager().get EditLayer()) {109 if (layer == MainApplication.getLayerManager().getActiveDataLayer()) { 110 110 cache.clear(); 111 111 cache.addAll(newSelection); -
trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
r12951 r13434 416 416 @Override 417 417 public void destroy() { 418 DataSet ds = MainApplication.getLayerManager().get EditDataSet();418 DataSet ds = MainApplication.getLayerManager().getActiveDataSet(); 419 419 if (ds != null) { 420 420 ds.removeDataSetListener(this);
Note:
See TracChangeset
for help on using the changeset viewer.