Changeset 1146 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2008-12-19T14:43:36+01:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/MainApplet.java
r1084 r1146 108 108 m.remove(m.fileMenu); 109 109 m.editMenu.add(new UploadPreferencesAction()); 110 m.open .setEnabled(false);110 m.openFile.setEnabled(false); 111 111 m.exit.setEnabled(false); 112 112 m.save.setEnabled(false); -
trunk/src/org/openstreetmap/josm/gui/MainMenu.java
r1130 r1146 20 20 import org.openstreetmap.josm.actions.AlignInCircleAction; 21 21 import org.openstreetmap.josm.actions.AlignInLineAction; 22 import org.openstreetmap.josm.actions.OpenLocationAction; 22 23 import org.openstreetmap.josm.actions.OrthogonalizeAction; 23 24 import org.openstreetmap.josm.actions.AutoScaleAction; … … 36 37 import org.openstreetmap.josm.actions.MergeNodesAction; 37 38 import org.openstreetmap.josm.actions.NewAction; 38 import org.openstreetmap.josm.actions.Open Action;39 import org.openstreetmap.josm.actions.OpenFileAction; 39 40 import org.openstreetmap.josm.actions.PasteAction; 40 41 import org.openstreetmap.josm.actions.PasteTagsAction; … … 76 77 /* File menu */ 77 78 public final NewAction newAction = new NewAction(); 78 public final OpenAction open = new OpenAction(); 79 public final OpenFileAction openFile = new OpenFileAction(); 80 public final OpenLocationAction openLocation = new OpenLocationAction(); 79 81 public final JosmAction save = new SaveAction(null); 80 82 public final JosmAction saveAs = new SaveAsAction(null); … … 167 169 168 170 add(fileMenu, newAction); 169 add(fileMenu, open); 171 add(fileMenu, openFile); 172 add(fileMenu, openLocation); 170 173 fileMenu.addSeparator(); 171 174 add(fileMenu, save); -
trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java
r1113 r1146 539 539 } 540 540 if (download) { 541 OsmServerObjectReader reader = new OsmServerObjectReader( );541 OsmServerObjectReader reader = new OsmServerObjectReader(clone.id, OsmServerObjectReader.TYPE_REL, true); 542 542 try { 543 DataSet dataSet = reader.parseOsm(clone.id, 544 OsmServerObjectReader.TYPE_REL, true); 543 DataSet dataSet = reader.parseOsm(); 545 544 if (dataSet != null) { 546 545 final MergeVisitor visitor = new MergeVisitor(Main.main
Note:
See TracChangeset
for help on using the changeset viewer.