Context Navigation

conflict

Timestamp:

2015-12-02T00:05:09+01:00 (8 years ago)

Author:

Don-vip

Message:

sonar - Immutable Field

Location:

trunk/src/org/openstreetmap/josm/gui/conflict

Files:

r8840	r9078
23	23	*/
24	24	public class RelationMemberTableCellRenderer extends JLabel implements TableCellRenderer {
25		private transient Border rowNumberBorder;
	25	private final transient Border rowNumberBorder;
26	26
27	27	/**

-              r8840
+              r9078
 public class TagMergeItem {
     private String key;
     private String myTagValue;
     private String theirTagValue;
+    private final String key;
+    private final String myTagValue;
+    private final String theirTagValue;
     private MergeDecisionType mergeDecision = MergeDecisionType.UNDECIDED;

-              r9059
+              r9078
     /** the combo box used as editor */
     private JosmComboBox<Object> editor;
     private DefaultComboBoxModel<Object> editorModel;
     private CopyOnWriteArrayList<NavigationListener> listeners;
+    private final JosmComboBox<Object> editor;
+    private final DefaultComboBoxModel<Object> editorModel;
+    private final CopyOnWriteArrayList<NavigationListener> listeners;
     /**

-              r8510
+              r9078
 public class MultiValueCellRenderer extends JLabel implements TableCellRenderer {
     private ImageIcon iconDecided;
     private ImageIcon iconUndecided;
     private DefaultComboBoxModel<Object> model;
     private JosmComboBox<Object> cbDecisionRenderer;
+    private final ImageIcon iconDecided;
+    private final ImageIcon iconUndecided;
+    private final DefaultComboBoxModel<Object> model;
+    private final JosmComboBox<Object> cbDecisionRenderer;
     /**

r8510	r9078
26	26	private MultiValueDecisionType type;
27	27	/** the collection of tags for which a decision is needed */
28		private TagCollection tags;
	28	private final TagCollection tags;
29	29	/** the selected value if {@link #type} is {@link MultiValueDecisionType#KEEP_ONE} */
30	30	private String value;

r8849	r9078
402	402	private static final class StatisticsTableModel extends DefaultTableModel {
403	403	private static final String[] HEADERS = new String[] {tr("Paste ..."), tr("From ..."), tr("To ...") };
404		private transient List<StatisticsInfo> data;
	404	private final transient List<StatisticsInfo> data;
405	405
406	406	private StatisticsTableModel() {

-              r8880
+              r9078
 public class RelationMemberConflictDecision {
     private Relation relation;
     private int pos;
     private OsmPrimitive originalPrimitive;
+    private final Relation relation;
+    private final int pos;
+    private final OsmPrimitive originalPrimitive;
     private String role;
     private RelationMemberConflictDecisionType decision;

r8510	r9078
17	17	implements TableCellRenderer, ListCellRenderer<RelationMemberConflictDecisionType> {
18	18
19		private JosmComboBox<RelationMemberConflictDecisionType> cbDecisionTypes;
	19	private final JosmComboBox<RelationMemberConflictDecisionType> cbDecisionTypes;
20	20
21	21	protected void resetTableRenderer() {

r8510	r9078
27	27
28	28	/** the model for the tag conflict resolver */
29		private TagConflictResolverModel model;
	29	private final TagConflictResolverModel model;
30	30	/** selects whether only tags with conflicts are displayed */
31	31	private JCheckBox cbShowTagsWithConflictsOnly;

r8840	r9078
27	27	private transient Map<String, MultiValueResolutionDecision> decisions;
28	28	private int numConflicts;
29		private PropertyChangeSupport support;
	29	private final PropertyChangeSupport support;
30	30	private boolean showTagsWithConflictsOnly;
31	31	private boolean showTagsWithMultiValuesOnly;

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