Changeset 9074 in josm
- Timestamp:
- 2015-11-30T23:30:47+01:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/Main.java
r9059 r9074 1617 1617 */ 1618 1618 public static boolean addMapFrameListener(MapFrameListener listener, boolean fireWhenMapViewPresent) { 1619 boolean changed = listener != null ?mapFrameListeners.add(listener): false;1619 boolean changed = listener != null && mapFrameListeners.add(listener); 1620 1620 if (fireWhenMapViewPresent && changed && map != null) { 1621 1621 listener.mapFrameInitialized(null, map); … … 1641 1641 */ 1642 1642 public static boolean removeMapFrameListener(MapFrameListener listener) { 1643 return listener != null ?mapFrameListeners.remove(listener): false;1643 return listener != null && mapFrameListeners.remove(listener); 1644 1644 } 1645 1645 -
trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
r9067 r9074 1548 1548 nearestAngle = getNearestAngle(angle); 1549 1549 if (getAngleDelta(nearestAngle, angle) < snapAngleTolerance) { 1550 active = (customBaseHeading >= 0) ? true :Math.abs(nearestAngle - 180) > 1e-3;1550 active = customBaseHeading >= 0 || Math.abs(nearestAngle - 180) > 1e-3; 1551 1551 // if angle is to previous segment, exclude 180 degrees 1552 1552 lastAngle = nearestAngle; -
trunk/src/org/openstreetmap/josm/data/Preferences.java
r9070 r9074 788 788 public synchronized boolean getBoolean(final String key) { 789 789 String s = get(key, null); 790 return s == null? false :Boolean.parseBoolean(s);790 return s != null && Boolean.parseBoolean(s); 791 791 } 792 792 -
trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
r9059 r9074 102 102 103 103 private boolean addChangeListener(ChangeListener listener) { 104 return listener != null ?listeners.add(listener): false;104 return listener != null && listeners.add(listener); 105 105 } 106 106 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
r8958 r9074 762 762 protected void setIsDocked(boolean val) { 763 763 if (buttonsPanel != null) { 764 buttonsPanel.setVisible( val ?buttonHiding != ButtonHidingType.ALWAYS_HIDDEN: true);764 buttonsPanel.setVisible(!val || buttonHiding != ButtonHidingType.ALWAYS_HIDDEN); 765 765 } 766 766 isDocked = val; -
trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
r8958 r9074 792 792 793 793 if (canEnable) { 794 cbActive = new JCheckBox(tr("active"), e != null?e.active : true);794 cbActive = new JCheckBox(tr("active"), e == null || e.active); 795 795 p.add(cbActive, GBC.eol().insets(15, 0, 5, 0)); 796 796 } -
trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
r8870 r9074 1115 1115 public final boolean isVertical() { 1116 1116 Split parent = parent_get(); 1117 return (parent != null) ?parent.isRowLayout(): false;1117 return parent != null && parent.isRowLayout(); 1118 1118 } 1119 1119 -
trunk/src/org/openstreetmap/josm/tools/MultiMap.java
r8846 r9074 148 148 public boolean contains(A key, B value) { 149 149 Set<B> values = get(key); 150 return (values== null) ? false :values.contains(value);150 return values != null && values.contains(value); 151 151 } 152 152
Note:
See TracChangeset
for help on using the changeset viewer.