Changeset 8509 in josm for trunk/test/functional


Ignore:
Timestamp:
2015-06-20T14:36:00+02:00 (4 years ago)
Author:
Don-vip
Message:

fix many checkstyle violations

Location:
trunk/test/functional/org/openstreetmap/josm
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java

    r7937 r8509  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.gui.conflict.pair.tags;
    3 
    4 import org.junit.Ignore;
    53
    64import java.awt.BorderLayout;
    75
    86import javax.swing.JFrame;
     7
     8import org.junit.Ignore;
    99
    1010@Ignore
     
    2727        tagMerger.getModel().addItem(new TagMergeItem("key", "myvalue", null));
    2828        tagMerger.getModel().addItem(new TagMergeItem("key", null, "theirvalue"));
    29         tagMerger.getModel().addItem(new TagMergeItem("a very long key asdfasdf asdfasdf", "a very long value asdfasdf", "a very long value asdfasdf"));
     29        tagMerger.getModel().addItem(new TagMergeItem("a very long key asdfasdf asdfasdf", "a very long value asdfasdf",
     30                "a very long value asdfasdf"));
    3031        for (int i=0; i< 50; i++) {
    3132          tagMerger.getModel().addItem(new TagMergeItem("key", "myvalue", "theirvalue"));
  • trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

    r7937 r8509  
    114114     *
    115115     * @param ds the data set
    116      * @throws OsmTransferException
     116     * @throws OsmTransferException if something goes wrong
    117117     */
    118118    public static void createDataSetOnServer(DataSet ds) throws OsmTransferException {
     
    125125        OsmServerWriter writer = new OsmServerWriter();
    126126        Changeset cs = new Changeset();
    127         writer.uploadOsm(new UploadStrategySpecification().setStrategy(UploadStrategy.SINGLE_REQUEST_STRATEGY), primitives,cs,NullProgressMonitor.INSTANCE);
     127        writer.uploadOsm(new UploadStrategySpecification().setStrategy(UploadStrategy.SINGLE_REQUEST_STRATEGY),
     128                primitives, cs, NullProgressMonitor.INSTANCE);
    128129        OsmApi.getOsmApi().closeChangeset(cs, NullProgressMonitor.INSTANCE);
    129130    }
     
    135136
    136137        // don't use atomic upload, the test API server can't cope with large diff uploads
    137         //
    138138        Main.pref.put("osm-server.atomic-upload", false);
    139139
    140         File dataSetCacheOutputFile = new File(System.getProperty("java.io.tmpdir"), MultiFetchServerObjectReaderTest.class.getName() + ".dataset");
     140        File dataSetCacheOutputFile = new File(System.getProperty("java.io.tmpdir"),
     141                MultiFetchServerObjectReaderTest.class.getName() + ".dataset");
    141142
    142143        String p = System.getProperties().getProperty("useCachedDataset");
     
    146147        }
    147148
    148         logger.info(MessageFormat.format("property ''{0}'' not set to true, creating test dataset on the server. property is ''{1}''", "useCachedDataset", p));
     149        logger.info(MessageFormat.format(
     150                "property ''{0}'' not set to true, creating test dataset on the server. property is ''{1}''", "useCachedDataset", p));
    149151
    150152        // build and upload the test data set
    151         //
    152153        logger.info("creating test data set ....");
    153154        testDataSet = buildTestDataSet();
  • trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

    r7937 r8509  
    129129     *
    130130     * @param ds the data set
    131      * @throws OsmTransferException
     131     * @throws OsmTransferException if something goes wrong
    132132     */
    133133    static public void createDataSetOnServer(APIDataSet ds) throws OsmTransferException, CyclicUploadDependencyException {
     
    164164        }
    165165
    166         logger.info(MessageFormat.format("property ''{0}'' not set to true, creating test dataset on the server. property is ''{1}''", "useCachedDataset", p));
     166        logger.info(MessageFormat.format(
     167                "property ''{0}'' not set to true, creating test dataset on the server. property is ''{1}''", "useCachedDataset", p));
    167168
    168169        // build and upload the test data set
Note: See TracChangeset for help on using the changeset viewer.