Changeset 6471 in josm for trunk/test/unit/org/openstreetmap/josm/gui

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/test/unit/org/openstreetmap/josm/gui

Files:

• SystemOfMeasurementTest.java (modified) (1 diff)
• conflict/nodes/NodeListMergeModelTest.java (modified) (1 diff)
• conflict/properties/PropertiesMergeModelTest.java (modified) (1 diff)
• conflict/tags/TagMergeItemTest.java (modified) (1 diff)
• conflict/tags/TagMergeModelTest.java (modified) (1 diff)
• dialogs/relation/sort/RelationSorterTest.java (modified) (1 diff)
• dialogs/relation/sort/WayConnectionTypeCalculatorTest.java (modified) (1 diff)
• tagging/TaggingPresetReaderTest.java (modified) (1 diff)

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()) {