Changeset 79 in josm for src/org/openstreetmap/josm/Main.java
- Timestamp:
- 2006-04-03T22:25:02+02:00 (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/org/openstreetmap/josm/Main.java
r78 r79 35 35 import org.openstreetmap.josm.actions.UndoAction; 36 36 import org.openstreetmap.josm.actions.UploadAction; 37 import org.openstreetmap.josm.actions.WmsServerAction; 37 38 import org.openstreetmap.josm.data.Preferences; 38 39 import org.openstreetmap.josm.data.osm.DataSet; 39 import org.openstreetmap.josm.data.projection.Epsg4 263;40 import org.openstreetmap.josm.data.projection.Epsg4326; 40 41 import org.openstreetmap.josm.data.projection.Projection; 41 42 import org.openstreetmap.josm.gui.MapFrame; … … 83 84 84 85 private OpenAction openAction; 85 86 86 private DownloadAction downloadAction; 87 private Action wmsServerAction; 87 88 88 89 /** … … 101 102 downloadAction = new DownloadAction(); 102 103 Action uploadAction = new UploadAction(); 103 openAction = new OpenAction(); 104 wmsServerAction = new WmsServerAction(); 105 openAction = new OpenAction(); 104 106 Action saveAction = new SaveAction(); 105 107 Action gpxExportAction = new GpxExportAction(null); … … 124 126 125 127 126 JMenu connectionMenu = new JMenu("Connection"); 127 connectionMenu.setMnemonic('C'); 128 connectionMenu.add(downloadAction); 129 connectionMenu.add(uploadAction); 130 mainMenu.add(connectionMenu); 128 JMenu layerMenu = new JMenu("Layer"); 129 layerMenu.setMnemonic('L'); 130 layerMenu.add(downloadAction); 131 layerMenu.add(uploadAction); 132 layerMenu.addSeparator(); 133 //layerMenu.add(new JCheckBoxMenuItem(wmsServerAction)); 134 mainMenu.add(layerMenu); 131 135 132 136 JMenu editMenu = new JMenu("Edit"); … … 149 153 toolBar.add(downloadAction); 150 154 toolBar.add(uploadAction); 155 //toolBar.add(new IconToggleButton(wmsServerAction)); 151 156 toolBar.addSeparator(); 152 157 toolBar.add(openAction); … … 242 247 e.printStackTrace(); 243 248 JOptionPane.showMessageDialog(null, "The projection could not be read from preferences. Using EPSG:4263."); 244 proj = new Epsg4 263();249 proj = new Epsg4326(); 245 250 } 246 251 … … 320 325 mapFrame.setVisible(true); 321 326 } 327 //TODO: This is really hacky to unselect the action when the layer gets 328 // deleted. The whole mapView/mapFrame/layer concept needs refactoring! 329 if (mapFrame == null && (Boolean)wmsServerAction.getValue(Action.SELECTED_KEY)) 330 wmsServerAction.putValue(Action.SELECTED_KEY, false); 322 331 } 323 332 /**
Note:
See TracChangeset
for help on using the changeset viewer.