Changeset 9135 in josm for trunk

Timestamp:

2015-12-15T23:14:37+01:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryInfo.java (modified) (1 diff)
• data/projection/AbstractProjection.java (modified) (1 diff)
• data/projection/CustomProjection.java (modified) (2 diffs)
• data/projection/Projections.java (modified) (3 diffs)
• gui/layer/AlignImageryPanel.java (modified) (2 diffs)
• gui/layer/WMSLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -202 +202 @@
     private boolean isGeoreferenceValid = false;
     private boolean isEpsg4326To3857Supported = false;
-    // when adding a field, also adapt the ImageryInfo(ImageryInfo) and ImageryInfo(ImageryPreferenceEntry) constructor, equals method, and ImageryPreferenceEntry
+    // when adding a field, also adapt the ImageryInfo(ImageryInfo)
+    // and ImageryInfo(ImageryPreferenceEntry) constructor, equals method, and ImageryPreferenceEntry
 
     /**

trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java

@@ -126 +126 @@
                     double dLon = (b.getMaxLon() - b.getMinLon()) / 1000;
                     double dLat = (b.getMaxLat() - b.getMinLat()) / 1000;
-                    for (double lon=b.getMinLon(); lon<b.getMaxLon(); lon += dLon) {
+                    for (double lon = b.getMinLon(); lon < b.getMaxLon(); lon += dLon) {
                         result.extend(latlon2eastNorth(new LatLon(b.getMinLat(), lon)));
                         result.extend(latlon2eastNorth(new LatLon(b.getMaxLat(), lon)));
                     }
-                    for (double lat=b.getMinLat(); lat<b.getMaxLat(); lat += dLat) {
+                    for (double lat = b.getMinLat(); lat < b.getMaxLat(); lat += dLat) {
                         result.extend(latlon2eastNorth(new LatLon(lat, b.getMinLon())));
                         result.extend(latlon2eastNorth(new LatLon(lat, b.getMaxLon())));

trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

@@ -274 +274 @@
      * @param ignoreUnknownParameter true, if unknown parameter should not raise exception
      * @return parameters map
-     * @throws ProjectionConfigurationException
+     * @throws ProjectionConfigurationException in case of invalid parameter
      */
     public static Map<String, String> parseParameterList(String pref, boolean ignoreUnknownParameter) throws ProjectionConfigurationException {
@@ -324 +324 @@
      * @param ignoreUnknownParameter true, if unknown parameter should not raise exception
      * @return parameters map with +init includes resolved
-     * @throws ProjectionConfigurationException
-     */
-    public static Map<String, String> resolveInits(Map<String, String> parameters , boolean ignoreUnknownParameter) throws ProjectionConfigurationException {
+     * @throws ProjectionConfigurationException in case of invalid parameter
+     */
+    public static Map<String, String> resolveInits(Map<String, String> parameters, boolean ignoreUnknownParameter)
+            throws ProjectionConfigurationException {
         // recursive resolution of +init includes
         String initKey = parameters.get(Param.init.key);

trunk/src/org/openstreetmap/josm/data/projection/Projections.java

@@ -19 +19 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -218 +219 @@
      * @param path the path
      * @return projection definitions
-     * @throws java.io.IOException
+     * @throws IOException in case of I/O error
      */
     public static List<ProjectionDefinition> loadProjectionDefinitions(String path) throws IOException {
@@ -234 +235 @@
      * @param r the reader
      * @return projection definitions
-     * @throws java.io.IOException
+     * @throws IOException in case of I/O error
      */
     public static List<ProjectionDefinition> loadProjectionDefinitions(BufferedReader r) throws IOException {

trunk/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java

@@ -40 +40 @@
     public AlignImageryPanel(boolean oneLine, final BooleanProperty showAgain, ImageryInfo infoToAdd) {
         Font font = getFont().deriveFont(Font.PLAIN, 14.0f);
-        JLabel nagLabel = new JLabel(tr("Aerial imagery \"{0}\" might be misaligned. Please check its offset using GPS tracks!", infoToAdd.getName()));
+        JLabel nagLabel = new JLabel(
+                tr("Aerial imagery \"{0}\" might be misaligned. Please check its offset using GPS tracks!", infoToAdd.getName()));
         UrlLabel detailsList = new UrlLabel(tr("http://wiki.openstreetmap.org/wiki/Using_Imagery"), tr("Details..."));
         nagLabel.setLabelFor(detailsList);
@@ -86 +87 @@
     public static void addNagPanelIfNeeded(ImageryInfo infoToAdd) {
         BooleanProperty showAgain = new BooleanProperty("message.imagery.nagPanel." + infoToAdd.getUrl(), true);
-        if (Main.isDisplayingMapView() && showAgain.get() && !infoToAdd.isGeoreferenceValid() ) {
+        if (Main.isDisplayingMapView() && showAgain.get() && !infoToAdd.isGeoreferenceValid()) {
             if (Main.map.getTopPanel(AlignImageryPanel.class) == null) {
                 double w = Toolkit.getDefaultToolkit().getScreenSize().getWidth();

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -116 +116 @@
     public boolean isProjectionSupported(Projection proj) {
         return supportedProjections == null || supportedProjections.isEmpty() || supportedProjections.contains(proj.toCode()) ||
-                (info.isEpsg4326To3857Supported() && supportedProjections.contains("EPSG:4326") &&  "EPSG:3857".equals(Main.getProjection().toCode()));
+                (info.isEpsg4326To3857Supported() && supportedProjections.contains("EPSG:4326")
+                        &&  "EPSG:3857".equals(Main.getProjection().toCode()));
     }