Changeset 6890 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2014-02-27T02:50:12+01:00 (10 years ago)

Author:

Don-vip

Message:

fix some Sonar issues (Constructor Calls Overridable Method)

Location:

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

Files:

• pair/ConflictResolver.java (modified) (2 diffs)
• pair/ListMergeModel.java (modified) (2 diffs)
• pair/ListMerger.java (modified) (1 diff)
• pair/nodes/NodeListColumnModel.java (modified) (1 diff)
• pair/properties/PropertiesMerger.java (modified) (2 diffs)
• pair/relation/RelationMemberListColumnModel.java (modified) (1 diff)
• pair/tags/TagMergeColumnModel.java (modified) (1 diff)
• pair/tags/TagMerger.java (modified) (1 diff)
• tags/CombinePrimitiveResolverDialog.java (modified) (2 diffs)
• tags/MultiValueResolutionDecision.java (modified) (1 diff)
• tags/PasteTagsConflictResolverDialog.java (modified) (1 diff)
• tags/RelationMemberConflictResolver.java (modified) (1 diff)
• tags/RelationMemberConflictResolverTable.java (modified) (1 diff)
• tags/TagConflictResolver.java (modified) (1 diff)
• tags/TagConflictResolverColumnModel.java (modified) (1 diff)
• tags/TagConflictResolverTable.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

@@ -86 +86 @@
      * loads the required icons
      */
-    protected void loadIcons() {
+    protected final void loadIcons() {
         mergeComplete = ImageProvider.get("dialogs", "valid.png" );
         mergeIncomplete = ImageProvider.get("dialogs/conflict", "mergeincomplete.png" );
@@ -94 +94 @@
      * builds the UI
      */
-    protected void build() {
+    protected final void build() {
         tabbedPane = new JTabbedPane();
 

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

@@ -227 +227 @@
     }
 
-    public void setFrozen(boolean isFrozen) {
+    public final void setFrozen(boolean isFrozen) {
         boolean oldValue = this.isFrozen;
         this.isFrozen = isFrozen;
@@ -233 +233 @@
     }
 
-    public boolean isFrozen() {
+    public final boolean isFrozen() {
         return isFrozen;
     }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

@@ -260 +260 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
         GridBagConstraints gc = new GridBagConstraints();

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java

@@ -10 +10 @@
 public class NodeListColumnModel extends DefaultTableColumnModel {
 
-    protected void createColumns(TableCellRenderer renderer) {
+    protected final void createColumns(TableCellRenderer renderer) {
 
         TableColumn col = null;

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

@@ -269 +269 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
         buildHeaderRow();
@@ -277 +277 @@
     }
 
+    /**
+     * Constructs a new {@code PropertiesMerger}.
+     */
     public PropertiesMerger() {
         model = new PropertiesMergeModel();

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java

@@ -9 +9 @@
 public class RelationMemberListColumnModel extends DefaultTableColumnModel{
 
-    protected void createColumns() {
+    protected final void createColumns() {
         TableColumn col = null;
         RelationMemberTableCellRenderer renderer = new RelationMemberTableCellRenderer();

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java

@@ -10 +10 @@
 public class TagMergeColumnModel extends DefaultTableColumnModel {
 
-    protected void createColumns(TableCellRenderer renderer) {
+    protected final void createColumns(TableCellRenderer renderer) {
 
         TableColumn col = null;

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java

@@ -108 +108 @@
      * build the user interface
      */
-    protected void build() {
+    protected final void build() {
         GridBagConstraints gc = new GridBagConstraints();
         setLayout(new GridBagLayout());

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -166 +166 @@
     }
 
-    protected void build() {
+    protected final void build() {
         getContentPane().setLayout(new BorderLayout());
         updateTitle();
@@ -412 +412 @@
         }
 
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             setEnabled(pnlTagConflictResolver.getModel().getNumConflicts() == 0
                     && pnlRelationMemberConflictResolver.getModel().getNumConflicts() == 0);

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java

@@ -61 +61 @@
      * Tries to find the best decision based on the current values.
      */
-    protected void autoDecide() {
+    protected final void autoDecide() {
         this.type = MultiValueDecisionType.UNDECIDED;
         // exactly one empty value ? -> delete the tag

trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java

@@ -75 +75 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setTitle(tr("Conflicts in pasted tags"));
         allPrimitivesResolver = new TagConflictResolver();

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java

@@ -48 +48 @@
     private JMultilineLabel lblHeader;
 
-    protected void build() {
+    protected final void build() {
         setLayout(new GridBagLayout());
         JPanel pnl = new JPanel();

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java

@@ -23 +23 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
         setSelectionMode(ListSelectionModel.SINGLE_SELECTION);

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java

@@ -86 +86 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setLayout(new BorderLayout());
         add(buildInfoPanel(), BorderLayout.NORTH);

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java

@@ -9 +9 @@
 public class TagConflictResolverColumnModel extends DefaultTableColumnModel{
 
-    protected void createColumns() {
+    protected final void createColumns() {
         TableColumn col = null;
         MultiValueCellRenderer renderer = new MultiValueCellRenderer();

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java

@@ -23 +23 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
         setSelectionMode(ListSelectionModel.SINGLE_SELECTION);