Changeset 10306 in josm
- Timestamp:
- 2016-05-31T00:14:15+02:00 (9 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java
r10216 r10306 45 45 private OsmServerReader reader; 46 46 /** the target layer */ 47 private OsmDataLayer targetLayer; 47 private final OsmDataLayer targetLayer; 48 48 /** the collection of child primitives */ 49 private Map<Long, OsmPrimitiveType> children; 49 private final Map<Long, OsmPrimitiveType> children; 50 50 /** the parents */ 51 private DataSet parents; 51 private final DataSet parents; 52 52 53 53 /** -
trunk/src/org/openstreetmap/josm/data/preferences/PreferencesReader.java
r10235 r10306 42 42 private XMLStreamReader parser; 43 43 private int version; 44 private Reader reader; 45 private File file; 44 private final Reader reader; 45 private final File file; 46 46 47 47 private final boolean defaults; -
trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
r9774 r10306 124 124 private final transient HighlightHelper highlightHelper = new HighlightHelper(); 125 125 private final boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true); 126 private transient RecentRelationsAction recentRelationsAction; 126 private final transient RecentRelationsAction recentRelationsAction; 127 127 128 128 /** -
trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java
r10300 r10306 45 45 private final JPopupMenu popup; 46 46 private SideButton sideButton; 47 private JCheckBox visibilityCheckbox; 47 private final JCheckBox visibilityCheckbox; 48 48 final OpacitySlider opacitySlider = new OpacitySlider(); 49 49 private final ArrayList<FilterSlider<?>> sliders = new ArrayList<>(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
r10300 r10306 656 656 private final List<JosmAction> recentTagsActions = new ArrayList<>(); 657 657 protected final transient FocusAdapter focus; 658 private JPanel mainPanel; 658 private final JPanel mainPanel; 659 659 private JPanel recentTagsPanel; 660 660 -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java
r8510 r10306 20 20 * {@link #populate(Relation)} and {@link #populate(List)} respectively. 21 21 * 22 * 22 * @since 1828 23 23 */ 24 24 public class RelationTreeModel implements TreeModel { … … 27 27 28 28 /** the tree model listeners */ 29 private CopyOnWriteArrayList<TreeModelListener> listeners; 29 private final CopyOnWriteArrayList<TreeModelListener> listeners; 30 30 31 31 /** … … 34 34 public RelationTreeModel() { 35 35 this.root = null; 36 listeners = new CopyOnWriteArrayList<>();37 }38 39 /**40 * constructor41 * @param root the root relation42 */43 public RelationTreeModel(Relation root) {44 this.root = root;45 listeners = new CopyOnWriteArrayList<>();46 }47 48 /**49 * constructor50 *51 * @param members a list of members52 */53 public RelationTreeModel(List<RelationMember> members) {54 if (members == null) return;55 Relation root = new Relation();56 root.setMembers(members);57 this.root = root;58 36 listeners = new CopyOnWriteArrayList<>(); 59 37 } -
trunk/src/org/openstreetmap/josm/gui/layer/NativeScaleLayer.java
r10300 r10306 27 27 * Scale factor, same unit as in {@link NavigatableComponent} 28 28 */ 29 private double scale; 29 private final double scale; 30 30 31 31 /** 32 32 * True if this scale is native resolution for data source. 33 33 */ 34 private boolean isNative; 35 36 private int index; 34 private final boolean isNative; 35 36 private final int index; 37 37 38 38 /** … … 78 78 79 79 /** 80 * List of scales, may include intermediate steps 81 * between native resolutions 80 * List of scales, may include intermediate steps between native resolutions 82 81 */ 83 82 class ScaleList { 84 private List<Scale> scales = new ArrayList<>(); 85 86 protected ScaleList(double[] scales) { 87 for (int i = 0; i < scales.length; i++) { 88 this.scales.add(new Scale(scales[i], i)); 89 } 90 } 83 private final List<Scale> scales = new ArrayList<>(); 91 84 92 85 protected ScaleList() { -
trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
r10179 r10306 300 300 private final JPanel projSubPrefPanelWrapper = new JPanel(new GridBagLayout()); 301 301 302 private JLabel projectionCodeLabel = new JLabel(tr("Projection code")); 303 private Component projectionCodeGlue = GBC.glue(5, 0); 302 private final JLabel projectionCodeLabel = new JLabel(tr("Projection code")); 303 private final Component projectionCodeGlue = GBC.glue(5, 0); 304 304 private final JLabel projectionCode = new JLabel(); 305 305 private final JLabel projectionNameLabel = new JLabel(tr("Projection name")); -
trunk/src/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreference.java
r10196 r10306 37 37 private static final BooleanProperty FOR_MULTI_FETCH = new BooleanProperty("download.overpass.for-multi-fetch", false); 38 38 39 private HistoryComboBox overpassServer = new HistoryComboBox(); 39 private final HistoryComboBox overpassServer = new HistoryComboBox(); 40 40 private final JCheckBox forMultiFetch = new JCheckBox(tr("Use Overpass server for object downloads")); 41 41 -
trunk/src/org/openstreetmap/josm/tools/bugreport/DebugTextDisplay.java
r10055 r10306 15 15 */ 16 16 public class DebugTextDisplay extends JScrollPane { 17 private String text; 17 private final String text; 18 18 19 19 /** -
trunk/src/org/openstreetmap/josm/tools/bugreport/ReportedException.java
r10305 r10306 251 251 private static class Section { 252 252 253 private String sectionName; 254 private ArrayList<SectionEntry> entries = new ArrayList<>(); 253 private final String sectionName; 254 private final ArrayList<SectionEntry> entries = new ArrayList<>(); 255 255 256 256 Section(String sectionName) { -
trunk/test/unit/org/openstreetmap/josm/gui/layer/NativeScaleLayerTest.java
r9883 r10306 29 29 public void testTicket12255() { 30 30 assertNull(new NativeScaleLayer.ScaleList(Collections.<Double>emptyList()).getSnapScale(10, 2, false)); 31 assertNull(new NativeScaleLayer.ScaleList(new double[0]).getSnapScale(10, 2, false));32 31 } 33 32 }
Note:
See TracChangeset
for help on using the changeset viewer.