Changeset 9849 in josm for trunk

Timestamp:

2016-02-22T00:54:12+01:00 (9 years ago)

Author:

Don-vip

Message:

add more unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (modified) (7 diffs)
• test/unit/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialogTest.java (added)
• test/unit/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialogTest.java (added)

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

@@ -44 +44 @@
 
 public class PasteTagsConflictResolverDialog extends JDialog  implements PropertyChangeListener {
-    private static final Map<OsmPrimitiveType, String> PANE_TITLES;
+    static final Map<OsmPrimitiveType, String> PANE_TITLES;
     static {
         PANE_TITLES = new EnumMap<>(OsmPrimitiveType.class);
@@ -52 +52 @@
     }
 
-    private enum Mode {
+    enum Mode {
         RESOLVING_ONE_TAGCOLLECTION_ONLY,
         RESOLVING_TYPED_TAGCOLLECTIONS
@@ -356 +356 @@
     }
 
-    private static final class StatisticsInfo {
+    static final class StatisticsInfo {
         public int numTags;
         public final Map<OsmPrimitiveType, Integer> sourceInfo;
         public final Map<OsmPrimitiveType, Integer> targetInfo;
 
-        private StatisticsInfo() {
+        StatisticsInfo() {
             sourceInfo = new EnumMap<>(OsmPrimitiveType.class);
             targetInfo = new EnumMap<>(OsmPrimitiveType.class);
@@ -367 +367 @@
     }
 
-    private static final class StatisticsTableModel extends DefaultTableModel {
+    static final class StatisticsTableModel extends DefaultTableModel {
         private static final String[] HEADERS = new String[] {tr("Paste ..."), tr("From ..."), tr("To ...") };
-        private final transient List<StatisticsInfo> data;
-
-        private StatisticsTableModel() {
-            data = new ArrayList<>();
-        }
+        private final transient List<StatisticsInfo> data = new ArrayList<>();
 
         @Override
@@ -392 +388 @@
         @Override
         public int getRowCount() {
-            if (data == null) return 1;
-            return data.size() + 1;
+            return data == null ? 1 : data.size() + 1;
         }
 
@@ -406 +401 @@
     }
 
-    private static class StatisticsInfoRenderer extends JLabel implements TableCellRenderer {
+    static final class StatisticsInfoRenderer extends JLabel implements TableCellRenderer {
         protected void reset() {
             setIcon(null);
@@ -478 +473 @@
     }
 
-    private static final class StatisticsInfoTable extends JPanel {
-
-        private StatisticsInfoTable(StatisticsTableModel model) {
+    static final class StatisticsInfoTable extends JPanel {
+
+        StatisticsInfoTable(StatisticsTableModel model) {
             JTable infoTable = new JTable(model,
                     new TagTableColumnModelBuilder(new StatisticsInfoRenderer(), tr("Paste ..."), tr("From ..."), tr("To ...")).build());