Changeset 5925 in josm for trunk/src/org
- Timestamp:
- 2013-05-05T19:03:05+02:00 (12 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java
r5360 r5925 17 17 public class HistoryInfoAction extends JosmAction { 18 18 19 20 21 22 23 24 25 26 27 19 public HistoryInfoAction() { 20 super(tr("History"), "about", 21 tr("Display history information about OSM ways, nodes, or relations."), 22 Shortcut.registerShortcut("core:historyinfo", 23 tr("History"), KeyEvent.VK_H, Shortcut.CTRL), false); 24 putValue("help", ht("/Action/ObjectHistory")); 25 putValue("toolbar", "action/historyinfo"); 26 Main.toolbar.register(this); 27 } 28 28 29 30 31 32 33 34 35 29 @Override 30 public void actionPerformed(ActionEvent ae) { 31 DataSet set = getCurrentDataSet(); 32 if (set != null) { 33 HistoryBrowserDialogManager.getInstance().showHistory(set.getAllSelected()); 34 } 35 } 36 36 37 38 39 40 41 42 43 44 37 @Override 38 public void updateEnabledState() { 39 if (getCurrentDataSet() == null) { 40 setEnabled(false); 41 } else { 42 updateEnabledState(getCurrentDataSet().getAllSelected()); 43 } 44 } 45 45 46 47 48 49 46 @Override 47 protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) { 48 setEnabled(!selection.isEmpty()); 49 } 50 50 } -
trunk/src/org/openstreetmap/josm/actions/InfoAction.java
r5360 r5925 29 29 public void actionPerformed(ActionEvent ae) { 30 30 DataSet set = getCurrentDataSet(); 31 32 33 31 if (set != null) { 32 new InspectPrimitiveDialog(set.getAllSelected(), Main.map.mapView.getEditLayer()).showDialog(); 33 } 34 34 } 35 35 -
trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java
r5460 r5925 62 62 if (selected){ 63 63 MapRendererFactory.getInstance().activate(WireframeMapRenderer.class); 64 65 66 64 } else { 65 MapRendererFactory.getInstance().activate(StyledMapRenderer.class); 66 } 67 67 68 68 notifySelectedState(); -
trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
r5881 r5925 407 407 targetDataSet.beginUpdate(); 408 408 try { 409 409 ArrayList<? extends OsmPrimitive> candidates = new ArrayList<Node>(targetDataSet.getNodes()); 410 410 for (Node node: sourceDataSet.getNodes()) { 411 411 mergePrimitive(node, candidates); -
trunk/src/org/openstreetmap/josm/data/validation/TestError.java
r5911 r5925 132 132 */ 133 133 public Collection<? extends OsmPrimitive> getSelectablePrimitives() { 134 135 136 137 138 139 134 List<OsmPrimitive> selectablePrimitives = new ArrayList<OsmPrimitive>(primitives.size()); 135 for (OsmPrimitive o : primitives) { 136 if (o.isSelectable()) { 137 selectablePrimitives.add(o); 138 } 139 } 140 140 return selectablePrimitives; 141 141 } -
trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
r4866 r5925 151 151 if (e.getButton() == MouseEvent.BUTTON1) { 152 152 153 153 if (isSelecting && e.getClickCount() == 1) { 154 154 iSlippyMapChooser.setSelection(iStartSelectionPoint, e.getPoint()); 155 155 … … 159 159 isSelecting = false; 160 160 161 161 } else { 162 162 int sourceButton = iSourceButton.hit(e.getPoint()); 163 163 … … 173 173 iSlippyMapChooser.toggleMapSource(iSourceButton.hitToTileSource(sourceButton)); 174 174 } 175 175 } 176 176 } 177 177 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
r5886 r5925 79 79 pnl.add(new HtmlPanel( 80 80 tr("Enter the coordinates for the new node.<br/>You can separate longitude and latitude with space, comma or semicolon.<br/>" + 81 82 83 81 "Use positive numbers or N, E characters to indicate North or East cardinal direction.<br/>" + 82 "For South and West cardinal directions you can use either negative numbers or S, W characters.<br/>" + 83 "Coordinate value can be in one of three formats:<ul>" + 84 84 "<li><i>degrees</i><tt>°</tt></li>" + 85 85 "<li><i>degrees</i><tt>°</tt> <i>minutes</i><tt>'</tt></li>" + 86 86 "<li><i>degrees</i><tt>°</tt> <i>minutes</i><tt>'</tt> <i>seconds</i><tt>"</tt></li>" + 87 88 89 87 "</ul>" + 88 "Symbols <tt>°</tt>, <tt>'</tt>, <tt>′</tt>, <tt>"</tt>, <tt>″</tt> are optional.<br/><br/>" + 89 "Some examples:<ul>" + 90 90 "<li>49.29918° 19.24788°</li>" + 91 91 "<li>N 49.29918 E 19.24788</li>" + … … 104 104 "<li>-49 29.4 N -19 24.5 W</li></ul>" + 105 105 "<li>48 deg 42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>" 106 106 )), 107 107 GBC.eol().fill().weight(1.0, 1.0)); 108 108 -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
r5266 r5925 416 416 } 417 417 SwingUtilities.invokeLater(new Runnable() { 418 419 420 421 418 public void run() { 419 Main.map.repaint(); 420 } 421 }); 422 422 } catch (Exception e) { 423 423 if (canceled) {
Note:
See TracChangeset
for help on using the changeset viewer.