Changeset 8540 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2015-06-27T21:43:35+02:00 (9 years ago)

Author:

Don-vip

Message:

fix remaining checkstyle issues

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• BoundingBoxDownloader.java (modified) (4 diffs)
• GpxExporter.java (modified) (2 diffs)
• JpgImporter.java (modified) (1 diff)
• MultiFetchServerObjectReader.java (modified) (2 diffs)
• OsmChangesetContentParser.java (modified) (1 diff)
• OsmReader.java (modified) (3 diffs)
• OsmServerChangesetReader.java (modified) (2 diffs)
• OsmServerUserInfoReader.java (modified) (1 diff)
• remotecontrol/AddTagsDialog.java (modified) (1 diff)
• remotecontrol/RemoteControlHttpsServer.java (modified) (1 diff)
• remotecontrol/handler/AddWayHandler.java (modified) (1 diff)
• session/GeoImageSessionImporter.java (modified) (1 diff)
• session/GpxTracksSessionImporter.java (modified) (1 diff)
• session/OsmDataSessionImporter.java (modified) (1 diff)
• session/SessionReader.java (modified) (1 diff)

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

@@ -126 +126 @@
                 DataSet ds2 = null;
 
-                try (InputStream in = getInputStream(getRequestForBbox(lon1, lat1, 180.0, lat2), progressMonitor.createSubTaskMonitor(9, false))) {
+                try (InputStream in = getInputStream(getRequestForBbox(lon1, lat1, 180.0, lat2),
+                        progressMonitor.createSubTaskMonitor(9, false))) {
                     if (in == null)
                         return null;
@@ -132 +133 @@
                 }
 
-                try (InputStream in = getInputStream(getRequestForBbox(-180.0, lat1, lon2, lat2), progressMonitor.createSubTaskMonitor(9, false))) {
+                try (InputStream in = getInputStream(getRequestForBbox(-180.0, lat1, lon2, lat2),
+                        progressMonitor.createSubTaskMonitor(9, false))) {
                     if (in == null)
                         return null;
@@ -143 +145 @@
             } else {
                 // Simple request
-                try (InputStream in = getInputStream(getRequestForBbox(lon1, lat1, lon2, lat2), progressMonitor.createSubTaskMonitor(9, false))) {
+                try (InputStream in = getInputStream(getRequestForBbox(lon1, lat1, lon2, lat2),
+                        progressMonitor.createSubTaskMonitor(9, false))) {
                     if (in == null)
                         return null;
@@ -161 +164 @@
 
     @Override
-    public List<Note> parseNotes(int noteLimit, int daysClosed, ProgressMonitor progressMonitor) throws OsmTransferException, MoreNotesException {
+    public List<Note> parseNotes(int noteLimit, int daysClosed, ProgressMonitor progressMonitor)
+            throws OsmTransferException, MoreNotesException {
         progressMonitor.beginTask("Downloading notes");
         CheckParameterUtil.ensureThat(noteLimit > 0, "Requested note limit is less than 1.");

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

@@ -230 +230 @@
         }
     }
+
+    // CHECKSTYLE.OFF: ParameterNumber
 
     /**
@@ -248 +250 @@
             final JLabel warning) {
 
+        // CHECKSTYLE.ON: ParameterNumber
         ActionListener authorActionListener = new ActionListener() {
             @Override

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

@@ -88 +88 @@
     }
 
-    private void addRecursiveFiles(List<File> files, Set<String> visitedDirs, List<File> sel, ProgressMonitor progressMonitor) throws IOException {
+    private void addRecursiveFiles(List<File> files, Set<String> visitedDirs, List<File> sel, ProgressMonitor progressMonitor)
+            throws IOException {
 
         if (progressMonitor.isCanceled())

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

@@ -513 +513 @@
          * @throws OsmTransferException if an error occurs while communicating with the API server
          */
-        protected FetchResult multiGetIdPackage(OsmPrimitiveType type, Set<Long> pkg, ProgressMonitor progressMonitor) throws OsmTransferException {
+        protected FetchResult multiGetIdPackage(OsmPrimitiveType type, Set<Long> pkg, ProgressMonitor progressMonitor)
+                throws OsmTransferException {
             String request = buildRequestString(type, pkg);
             FetchResult result = null;
@@ -571 +572 @@
          * @throws OsmTransferException if an error occurs while communicating with the API server
          */
-        protected FetchResult singleGetIdPackage(OsmPrimitiveType type, Set<Long> pkg, ProgressMonitor progressMonitor) throws OsmTransferException {
+        protected FetchResult singleGetIdPackage(OsmPrimitiveType type, Set<Long> pkg, ProgressMonitor progressMonitor)
+                throws OsmTransferException {
             FetchResult result = new FetchResult(new DataSet(), new HashSet<PrimitiveId>());
             String baseUrl = OsmApi.getOsmApi().getBaseUrl();

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

@@ -81 +81 @@
             case "relation":
                 if (currentModificationType == null) {
+                    // CHECKSTYLE.OFF: LineLength
                     throwException(tr("Illegal document structure. Found node, way, or relation outside of ''create'', ''modify'', or ''delete''."));
+                    // CHECKSTYLE.ON: LineLength
                 }
                 data.put(currentPrimitive, currentModificationType);

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

@@ -317 +317 @@
             id = Long.parseLong(value);
         } catch (NumberFormatException e) {
-            throwException(tr("Illegal value for attribute ''ref'' on member in relation {0}. Got {1}", Long.toString(r.getUniqueId()), value), e);
+            throwException(tr("Illegal value for attribute ''ref'' on member in relation {0}. Got {1}", Long.toString(r.getUniqueId()),
+                    value), e);
         }
         value = parser.getAttributeValue(null, "type");
@@ -502 +503 @@
                 if (current.isNew()) {
                     // for a new primitive we just log a warning
-                    Main.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", v, current.getUniqueId()));
+                    Main.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.",
+                            v, current.getUniqueId()));
                     current.setChangesetId(0);
                 } else {
@@ -516 +518 @@
                 if (current.isNew()) {
                     // for a new primitive we just log a warning
-                    Main.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", v, current.getUniqueId()));
+                    Main.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.",
+                            v, current.getUniqueId()));
                     current.setChangesetId(0);
                 } else {

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

@@ -141 +141 @@
      * @since 7704
      */
-    public List<Changeset> readChangesets(Collection<Integer> ids, boolean includeDiscussion, ProgressMonitor monitor) throws OsmTransferException {
+    public List<Changeset> readChangesets(Collection<Integer> ids, boolean includeDiscussion, ProgressMonitor monitor)
+            throws OsmTransferException {
         if (ids == null)
             return Collections.emptyList();
@@ -192 +193 @@
     public ChangesetDataSet downloadChangeset(int id, ProgressMonitor monitor) throws OsmTransferException {
         if (id <= 0)
-            throw new IllegalArgumentException(MessageFormat.format("Expected value of type integer > 0 for parameter ''{0}'', got {1}", "id", id));
+            throw new IllegalArgumentException(
+                    MessageFormat.format("Expected value of type integer > 0 for parameter ''{0}'', got {1}", "id", id));
         if (monitor == null) {
             monitor = NullProgressMonitor.INSTANCE;

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

@@ -125 +125 @@
                     userInfo.setUnreadMessages(Integer.parseInt(v));
                 } catch (NumberFormatException e) {
-                    throw new XmlParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}.", "unread", "received", v), e);
+                    throw new XmlParsingException(
+                            tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}.", "unread", "received", v), e);
                 }
             }

trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

@@ -128 +128 @@
         this.sender = senderName;
 
-        final DefaultTableModel tm = new DefaultTableModel(new String[] {tr("Assume"), tr("Key"), tr("Value"), tr("Existing values")}, tags.length) {
+        final DefaultTableModel tm = new DefaultTableModel(new String[] {tr("Assume"), tr("Key"), tr("Value"), tr("Existing values")},
+                tags.length) {
             private final Class<?>[] types = {Boolean.class, String.class, Object.class, ExistingValues.class};
             @Override

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java

@@ -233 +233 @@
             X509Certificate cert = generateCertificate("CN=localhost, OU=JOSM, O=OpenStreetMap", pair, 1825, "SHA256withRSA",
                     // see #10033#comment:20: All browsers respect "ip" in SAN, except IE which only understands DNS entries:
+                    // CHECKSTYLE.OFF: LineLength
                     // https://connect.microsoft.com/IE/feedback/details/814744/the-ie-doesnt-trust-a-san-certificate-when-connecting-to-ip-address
+                    // CHECKSTYLE.ON: LineLength
                     "dns:localhost,ip:127.0.0.1,dns:127.0.0.1,ip:::1,uri:https://127.0.0.1:"+HTTPS_PORT+",uri:https://::1:"+HTTPS_PORT);
 

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java

@@ -64 +64 @@
     public String[] getUsageExamples() {
         return new String[] {
+            // CHECKSTYLE.OFF: LineLength
             "/add_way?way=53.2,13.3;53.3,13.3;53.3,13.2",
             "/add_way?&addtags=building=yes&way=45.437213,-2.810792;45.437988,-2.455983;45.224080,-2.455036;45.223302,-2.809845;45.437213,-2.810792"
+            // CHECKSTYLE.ON: LineLength
         };
     }

trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java

@@ -25 +25 @@
 
     @Override
-    public Layer load(Element elem, SessionReader.ImportSupport support, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
+    public Layer load(Element elem, SessionReader.ImportSupport support, ProgressMonitor progressMonitor)
+            throws IOException, IllegalDataException {
         String version = elem.getAttribute("version");
         if (!"0.1".equals(version)) {

trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java

@@ -23 +23 @@
 
     @Override
-    public Layer load(Element elem, SessionReader.ImportSupport support, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
+    public Layer load(Element elem, SessionReader.ImportSupport support, ProgressMonitor progressMonitor)
+            throws IOException, IllegalDataException {
         String version = elem.getAttribute("version");
         if (!"0.1".equals(version)) {

trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionImporter.java

@@ -39 +39 @@
             OsmImporter importer = new OsmImporter();
             try (InputStream in = support.getInputStream(fileStr)) {
-                OsmImporter.OsmImporterData importData = importer.loadLayer(in, support.getFile(fileStr), support.getLayerName(), progressMonitor);
+                OsmImporter.OsmImporterData importData = importer.loadLayer(in, support.getFile(fileStr), support.getLayerName(),
+                        progressMonitor);
 
                 support.addPostLayersTask(importData.getPostLayerTask());

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -308 +308 @@
             if (centerEl != null && centerEl.hasAttribute("lat") && centerEl.hasAttribute("lon")) {
                 try {
-                    LatLon centerLL = new LatLon(Double.parseDouble(centerEl.getAttribute("lat")), Double.parseDouble(centerEl.getAttribute("lon")));
+                    LatLon centerLL = new LatLon(Double.parseDouble(centerEl.getAttribute("lat")),
+                            Double.parseDouble(centerEl.getAttribute("lon")));
                     center = Projections.project(centerLL);
                 } catch (NumberFormatException ex) {