Changeset 8511 in josm
- Timestamp:
- 2015-06-21T00:16:09+02:00 (10 years ago)
- Location:
- trunk
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/SplashScreen.java
r8510 r8511 124 124 * A task (of a {@link ProgressMonitor}). 125 125 */ 126 private static abstractclass Task {126 private abstract static class Task { 127 127 128 128 /** -
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java
r8510 r8511 70 70 } 71 71 72 static public void main(String args[]) {72 public static void main(String args[]) { 73 73 NodeListMergerTest test = new NodeListMergerTest(); 74 74 test.setSize(600, 600); -
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java
r8510 r8511 45 45 } 46 46 47 static public void main(String args[]) {47 public static void main(String args[]) { 48 48 PropertiesMergerTest app = new PropertiesMergerTest(); 49 49 app.setSize(600, 400); -
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java
r8510 r8511 49 49 } 50 50 51 static public void main(String args[]) {51 public static void main(String args[]) { 52 52 RelationMemberMergerTest test = new RelationMemberMergerTest(); 53 53 test.setSize(600, 600); -
trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java
r8510 r8511 44 44 } 45 45 46 static public void main(String args[]) {46 public static void main(String args[]) { 47 47 ConflictResolutionDialogTest test = new ConflictResolutionDialogTest(); 48 48 test.setVisible(true); -
trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java
r7937 r8511 2 2 package org.openstreetmap.josm.gui.dialogs.changeset; 3 3 4 import javax.swing.JFrame; 5 4 6 import org.junit.Ignore; 5 6 import javax.swing.JFrame;7 7 8 8 @Ignore … … 16 16 } 17 17 18 static public void main(String args[]) {18 public static void main(String args[]) { 19 19 new ChangesetCacheManagerTest().start(); 20 20 } -
trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java
r7937 r8511 2 2 package org.openstreetmap.josm.gui.dialogs.changeset.query; 3 3 4 import javax.swing.JFrame; 5 4 6 import org.junit.Ignore; 5 6 import javax.swing.JFrame;7 7 8 8 @Ignore … … 17 17 } 18 18 19 static public void main(String args[]) {19 public static void main(String args[]) { 20 20 new ChangesetQueryDialogTest().start(); 21 21 } -
trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java
r8510 r8511 22 22 23 23 @BeforeClass 24 static public void init() {24 public static void init() { 25 25 JOSMFixture.createFunctionalTestFixture().init(); 26 26 } … … 59 59 } 60 60 61 static public void main(String args[]) {61 public static void main(String args[]) { 62 62 HistoryBrowserTest.init(); 63 63 new HistoryBrowserTest().setVisible(true); -
trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
r8510 r8511 46 46 */ 47 47 public class OsmServerBackreferenceReaderTest { 48 static privatefinal Logger logger = Logger.getLogger(OsmServerBackreferenceReader.class.getName());48 private static final Logger logger = Logger.getLogger(OsmServerBackreferenceReader.class.getName()); 49 49 50 50 protected static Node lookupNode(DataSet ds, int i) { … … 131 131 * @throws OsmTransferException if something goes wrong 132 132 */ 133 static public void createDataSetOnServer(APIDataSet ds) throws OsmTransferException, CyclicUploadDependencyException {133 public static void createDataSetOnServer(APIDataSet ds) throws OsmTransferException, CyclicUploadDependencyException { 134 134 logger.info("creating data set on the server ..."); 135 135 ds.adjustRelationUploadOrder(); -
trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java
r8510 r8511 23 23 * @return A new test fixture for unit tests 24 24 */ 25 static public JOSMFixture createUnitTestFixture() {25 public static JOSMFixture createUnitTestFixture() { 26 26 return new JOSMFixture("test/config/unit-josm.home"); 27 27 } … … 31 31 * @return A new test fixture for functional tests 32 32 */ 33 static public JOSMFixture createFunctionalTestFixture() {33 public static JOSMFixture createFunctionalTestFixture() { 34 34 return new JOSMFixture("test/config/functional-josm.home"); 35 35 } … … 39 39 * @return A new test fixture for performance tests 40 40 */ 41 static public JOSMFixture createPerformanceTestFixture() {41 public static JOSMFixture createPerformanceTestFixture() { 42 42 return new JOSMFixture("test/config/performance-josm.home"); 43 43 } -
trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java
r8510 r8511 25 25 public class PropertiesMergeModelTest { 26 26 27 public static abstractclass TestObserver implements Observer {27 public abstract static class TestObserver implements Observer { 28 28 public int numInvocations; 29 29 -
trunk/test/unit/org/openstreetmap/josm/gui/tagging/PresetClassificationsTest.java
r8509 r8511 23 23 public class PresetClassificationsTest { 24 24 25 final staticTaggingPresetSelector.PresetClassifications classifications = new TaggingPresetSelector.PresetClassifications();25 static final TaggingPresetSelector.PresetClassifications classifications = new TaggingPresetSelector.PresetClassifications(); 26 26 27 27 /** -
trunk/tools/checkstyle/josm_checks.xml
r8510 r8511 73 73 <property name="allowMultipleEmptyLines" value="false"/> 74 74 </module> 75 <module name="ModifierOrder"/> 75 76 </module> 76 77 <module name="Header">
Note:
See TracChangeset
for help on using the changeset viewer.