Changeset 6471 in josm for trunk/test

Timestamp:

2013-12-11T00:51:08+01:00 (11 years ago)

Author:

Don-vip

Message:

Sonar - remove warnings related to the static preferences initialization in instance methods

Location:

trunk/test

Files:

• functional/org/openstreetmap/josm/fixtures/JOSMFixture.java (modified) (1 diff)
• unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/data/osm/FilterTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandling.java (modified) (1 diff)
• unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/data/osm/RelationTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/gui/SystemOfMeasurementTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/tools/TextTagParserTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/tools/UtilsTest.java (modified) (2 diffs)
• unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java (modified) (3 diffs)

trunk/test/functional/org/openstreetmap/josm/fixtures/JOSMFixture.java

@@ -58 +58 @@
         }
         System.setProperty("josm.home", josmHome);
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
         I18n.init();
         // initialize the plaform hook, and

trunk/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java

@@ -13 +13 @@
     @Before
     public void setUp() throws Exception {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

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

@@ -19 +19 @@
     @BeforeClass
     public static void setUp() {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
     

trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java

@@ -19 +19 @@
     @BeforeClass
     public static void init() {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java

@@ -63 +63 @@
     @BeforeClass
     public static void init() {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java

@@ -30 +30 @@
     public static void setUp() {
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandling.java

@@ -19 +19 @@
     @BeforeClass
     public static void init() {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java

@@ -17 +17 @@
     @BeforeClass
     public static void init() {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java

@@ -24 +24 @@
     @BeforeClass
     public static void init() {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java

@@ -17 +17 @@
     public static void setUp() {
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java

@@ -38 +38 @@
     public static void setUp() {
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java

@@ -149 +149 @@
     @BeforeClass
     public static void setUp() {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java

@@ -25 +25 @@
     public static void setUp() {
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java

@@ -22 +22 @@
     @Before
     public void setUp() throws Exception {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
         OPENING_HOUR_TEST.initialize();
     }

trunk/test/unit/org/openstreetmap/josm/gui/SystemOfMeasurementTest.java

@@ -23 +23 @@
     @BeforeClass
     public static void setUp() {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
     

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

@@ -32 +32 @@
     @BeforeClass
     public static void init() {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

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

@@ -48 +48 @@
     public static void init() {
         Main.setProjection(Projections.getProjectionByCode("EPSG:4326"));
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

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

@@ -18 +18 @@
     @BeforeClass
     public static void init() {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

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

@@ -24 +24 @@
     @BeforeClass
     public static void init() {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java

@@ -26 +26 @@
     @BeforeClass
     public static void loadData() throws FileNotFoundException, IllegalDataException {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
         testDataset = OsmReader.parseDataSet(new FileInputStream("data_nodist/relation_sort.osm"), NullProgressMonitor.INSTANCE);

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java

@@ -27 +27 @@
     @BeforeClass
     public static void loadData() throws FileNotFoundException, IllegalDataException {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
         testDataset = OsmReader.parseDataSet(new FileInputStream("data_nodist/relation_sort.osm"), NullProgressMonitor.INSTANCE);

trunk/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java

@@ -23 +23 @@
     @BeforeClass
     public static void setUpClass() {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
         testdataroot = System.getProperty("josm.test.data");
         if (testdataroot == null || testdataroot.isEmpty()) {

trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java

@@ -15 +15 @@
     @BeforeClass
     public static void before() {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java

@@ -74 +74 @@
     @Test
     public void testOpenUrlGzip() throws Exception {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
         final BufferedReader x = Utils.openURLReaderAndDecompress(new URL("http://www.openstreetmap.org/trace/1613906/data"), true);
         Assert.assertTrue(x.readLine().startsWith("<?xml version="));
@@ -82 +82 @@
     @Test
     public void testOpenUrlBzip() throws Exception {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
         final BufferedReader x = Utils.openURLReaderAndDecompress(new URL("http://www.openstreetmap.org/trace/785544/data"), true);
         Assert.assertTrue(x.readLine().startsWith("<?xml version="));

trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.tools.template_engine;
-
 
 import java.util.Arrays;
@@ -12 +11 @@
 import org.openstreetmap.josm.actions.search.SearchCompiler;
 import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.DatasetFactory;
 import org.openstreetmap.josm.data.osm.Node;
@@ -23 +21 @@
     @BeforeClass
     public static void before() {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }