Context Navigation

Changeset 10306 in josm for trunk/src

Timestamp:

2016-05-31T00:14:15+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - pmd:ImmutableField + remove unused code

Location:

trunk/src/org/openstreetmap/josm

Files:

-              r10216
+              r10306
     private OsmServerReader reader;
     /** the target layer */
     private OsmDataLayer targetLayer;
+    private final OsmDataLayer targetLayer;
     /** the collection of child primitives */
     private Map<Long, OsmPrimitiveType> children;
+    private final Map<Long, OsmPrimitiveType> children;
     /** the parents */
     private DataSet parents;
+    private final DataSet parents;
     /**

-              r10235
+              r10306
     private XMLStreamReader parser;
     private int version;
     private Reader reader;
     private File file;
+    private final Reader reader;
+    private final File file;
     private final boolean defaults;

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	/**

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<>();

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

-              r8510
+              r10306
  * {@link #populate(Relation)} and {@link #populate(List)} respectively.
+ *
+ *
+ * @since 1828
  */
 public class RelationTreeModel implements TreeModel {
 …
     /** the tree model listeners */
     private CopyOnWriteArrayList<TreeModelListener> listeners;
+    private final CopyOnWriteArrayList<TreeModelListener> listeners;
     /**
 …
     public RelationTreeModel() {
         this.root = null;
-        listeners = new CopyOnWriteArrayList<>();
+    }
-    /**
-     * constructor
-     * @param root the root relation
-     */
-    public RelationTreeModel(Relation root) {
-        this.root = root;
-        listeners = new CopyOnWriteArrayList<>();
+    }
-    /**
-     * constructor
+     *
-     * @param members a list of members
-     */
-    public RelationTreeModel(List<RelationMember> members) {
-        if (members == null) return;
-        Relation root = new Relation();
-        root.setMembers(members);
-        this.root = root;
         listeners = new CopyOnWriteArrayList<>();
+    }

-              r10300
+              r10306
          * Scale factor, same unit as in {@link NavigatableComponent}
          */
         private double scale;
+        private final double scale;
         /**
          * True if this scale is native resolution for data source.
          */
         private boolean isNative;
         private int index;
+        private final boolean isNative;
+        private final int index;
         /**
 …
     /**
+     * List of scales, may include intermediate steps
+     * between native resolutions
+     * List of scales, may include intermediate steps between native resolutions
      */
     class ScaleList  {
+        private List<Scale> scales = new ArrayList<>();
+        protected ScaleList(double[] scales) {
+            for (int i = 0; i < scales.length; i++) {
+                this.scales.add(new Scale(scales[i], i));
+            }
+        }
+        private final List<Scale> scales = new ArrayList<>();
         protected ScaleList() {

-              r10179
+              r10306
     private final JPanel projSubPrefPanelWrapper = new JPanel(new GridBagLayout());
     private JLabel projectionCodeLabel = new JLabel(tr("Projection code"));
     private Component projectionCodeGlue = GBC.glue(5, 0);
+    private final JLabel projectionCodeLabel = new JLabel(tr("Projection code"));
+    private final Component projectionCodeGlue = GBC.glue(5, 0);
     private final JLabel projectionCode = new JLabel();
     private final JLabel projectionNameLabel = new JLabel(tr("Projection name"));

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

r10055	r10306
15	15	*/
16	16	public class DebugTextDisplay extends JScrollPane {
17		private String text;
	17	private final String text;
18	18
19	19	/**

-              r10305
+              r10306
     private static class Section {
         private String sectionName;
         private ArrayList<SectionEntry> entries = new ArrayList<>();
+        private final String sectionName;
+        private final ArrayList<SectionEntry> entries = new ArrayList<>();
         Section(String sectionName) {

Note: See TracChangeset for help on using the changeset viewer.