Changeset 10659 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2016-07-27T02:48:44+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/MapMover.java
r10433 r10659 194 194 @Override 195 195 public void mouseReleased(MouseEvent e) { 196 if (e.getButton() == MouseEvent.BUTTON3 || Main.isPlatformOsx() && e.getButton() == MouseEvent.BUTTON1) {196 if (e.getButton() == MouseEvent.BUTTON3 || (Main.isPlatformOsx() && e.getButton() == MouseEvent.BUTTON1)) { 197 197 endMovement(); 198 198 } -
trunk/src/org/openstreetmap/josm/gui/SelectionManager.java
r10611 r10659 92 92 @Override 93 93 public void paint(Graphics2D g, MapView mv, Bounds bbox) { 94 if (mousePos == null || mousePosStart == null || mousePos == mousePosStart)94 if (mousePos == null || mousePosStart == null || mousePos.equals(mousePosStart)) 95 95 return; 96 96 Color color = Utils.complement(PaintColors.getBackgroundColor()); … … 279 279 280 280 private boolean isNoSelection() { 281 return mousePos == null || mousePosStart == null || mousePos == mousePosStart;281 return mousePos == null || mousePosStart == null || mousePos.equals(mousePosStart); 282 282 } 283 283 -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r10657 r10659 692 692 int i = 1; 693 693 for (RelationMember m : r.getMembers()) { 694 if ( m.getMember() == primitive) {694 if (primitive.equals(m.getMember())) { 695 695 mi.add(m, i); 696 696 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
r10619 r10659 678 678 for (int i = 0; i < tagData.getRowCount(); ++i) { 679 679 if (item.getValue().equals(tagData.getValueAt(i, 0) /* sic! do not use getDataKey*/)) { 680 if (item ToSelect == item) {680 if (item.equals(itemToSelect)) { 681 681 itemToSelect = null; 682 682 } -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
r10303 r10659 482 482 } 483 483 Color customColoringTransparent = hdopAlpha < 0 ? trkPnt.customColoring : 484 new Color( trkPnt.customColoring.getRGB() & 0x00ffffff | hdopAlpha << 24, true);484 new Color((trkPnt.customColoring.getRGB() & 0x00ffffff) | (hdopAlpha << 24), true); 485 485 g.setColor(customColoringTransparent); 486 486 // hdop circles … … 494 494 if (trkPnt.customColoring != null) { 495 495 Color customColoringTransparent = largePointAlpha < 0 ? trkPnt.customColoring : 496 new Color( trkPnt.customColoring.getRGB() & 0x00ffffff | largePointAlpha << 24, true);496 new Color((trkPnt.customColoring.getRGB() & 0x00ffffff) | (largePointAlpha << 24), true); 497 497 498 498 g.setColor(customColoringTransparent); -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
r10657 r10659 513 513 @Override 514 514 public boolean applies(Environment env) { 515 return env != null && env.getCascade(env.layer) != null && not ^ env.getCascade(env.layer).containsKey(id);515 return env != null && env.getCascade(env.layer) != null && (not ^ env.getCascade(env.layer).containsKey(id)); 516 516 } 517 517 -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
r10657 r10659 189 189 } 190 190 191 private abstract class AbstractFinder extends AbstractVisitor {191 private abstract static class AbstractFinder extends AbstractVisitor { 192 192 protected final Environment e; 193 193 -
trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
r10613 r10659 27 27 import java.util.List; 28 28 import java.util.Map; 29 import java.util.Objects; 29 30 import java.util.concurrent.ConcurrentHashMap; 30 31 … … 659 660 @Override 660 661 public boolean isDataFlavorSupported(DataFlavor flavor) { 661 return flavors[0] == flavor;662 return Objects.equals(flavors[0], flavor); 662 663 } 663 664 }
Note:
See TracChangeset
for help on using the changeset viewer.