Changeset 9547 in josm

Timestamp:

2016-01-20T01:28:07+01:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmImporter.java (modified) (1 diff)
• test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTestFT.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrectorTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModelTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItemTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModelTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

@@ -299 +299 @@
      * @return The constructed filter
      */
-    public static ExtensionFileFilter newFilterWithArchiveExtensions(
-            String extensions, String defaultExtension, String description, AddArchiveExtension addArchiveExtension, List<String> archiveExtensions) {
+    public static ExtensionFileFilter newFilterWithArchiveExtensions(String extensions, String defaultExtension,
+            String description, AddArchiveExtension addArchiveExtension, List<String> archiveExtensions) {
         final Collection<String> extensionsPlusArchive = new LinkedHashSet<>();
         final Collection<String> extensionsForDescription = new LinkedHashSet<>();

trunk/src/org/openstreetmap/josm/io/OsmImporter.java

@@ -26 +26 @@
      */
     public static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions(
-            "osm,xml", "osm", tr("OSM Server Files") + " (*.osm, *.osm.gz, *.osm.bz2, *.osm.zip, *.xml)", ExtensionFileFilter.AddArchiveExtension.NONE, Arrays.asList("gz", "bz", "bz2", "zip"));
+            "osm,xml", "osm", tr("OSM Server Files") + " (*.osm, *.osm.gz, *.osm.bz2, *.osm.zip, *.xml)",
+            ExtensionFileFilter.AddArchiveExtension.NONE, Arrays.asList("gz", "bz", "bz2", "zip"));
 
     /**

trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTestFT.java

@@ -7 +7 @@
 
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;

trunk/test/unit/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrectorTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.corrector;
+
+import static org.junit.Assert.assertEquals;
 
 import org.junit.BeforeClass;
@@ -6 +8 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.osm.Tag;
-
-import static org.junit.Assert.*;
 
 /**

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListMergeModel;
 
 public class NodeListMergeModelTest {

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModelTest.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
-import org.openstreetmap.josm.gui.conflict.pair.properties.PropertiesMergeModel;
 
 public class PropertiesMergeModelTest {

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItemTest.java

@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
-import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeItem;
 
 /**

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModelTest.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
-import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeItem;
-import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeModel;
 
 /**