Changeset 8570 in josm for trunk/src

Timestamp:

2015-07-05T02:25:58+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/WMTSTileSource.java (modified) (16 diffs)
• data/projection/CustomProjection.java (modified) (1 diff)
• gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)
• gui/layer/WMTSLayer.java (modified) (5 diffs)
• gui/preferences/imagery/AddWMTSLayerPanel.java (modified) (1 diff)
• io/CachedFile.java (modified) (1 diff)
• tools/Utils.java (modified) (1 diff)

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

@@ -110 +110 @@
         }
 
-        private final String getTypeString() {
+        private String getTypeString() {
             return typeString;
         }
@@ -124 +124 @@
     }
 
-    private class SelectLayerDialog extends ExtendedDialog {
+    private final class SelectLayerDialog extends ExtendedDialog {
         private Layer[] layers;
         private JList<String> list;
@@ -133 +133 @@
             this.list = new JList<>(getLayerNames(layers));
             this.list.setPreferredSize(new Dimension(400, 400));
-            this.list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION) ;
+            this.list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
             JPanel panel = new JPanel(new GridBagLayout());
             panel.add(this.list, GBC.eol().fill());
@@ -141 +141 @@
         private String[] getLayerNames(Collection<Layer> layers) {
             Collection<String> ret = new ArrayList<>();
-            for(Layer layer: layers) {
+            for (Layer layer: layers) {
                 ret.add(layer.name);
             }
@@ -167 +167 @@
      * Creates a tile source based on imagery info
      * @param info imagery info
-     * @throws IOException
+     * @throws IOException if any I/O error occurs
      */
     public WMTSTileSource(ImageryInfo info) throws IOException {
@@ -189 +189 @@
         initProjection();
     }
-
-
 
     private String handleTemplate(String url) {
@@ -222 +220 @@
             }
             Document document = builder.parse(new ByteArrayInputStream(data));
-            Node getTileOperation = getByXpath(document, "/Capabilities/OperationsMetadata/Operation[@name=\"GetTile\"]/DCP/HTTP/Get").item(0);
+            Node getTileOperation = getByXpath(document,
+                    "/Capabilities/OperationsMetadata/Operation[@name=\"GetTile\"]/DCP/HTTP/Get").item(0);
             this.baseUrl = getStringByXpath(getTileOperation, "@href");
-            this.transferMode = TransferMode.fromString(getStringByXpath(getTileOperation, "Constraint[@name=\"GetEncoding\"]/AllowedValues/Value"));
+            this.transferMode = TransferMode.fromString(getStringByXpath(getTileOperation,
+                    "Constraint[@name=\"GetEncoding\"]/AllowedValues/Value"));
             NodeList layersNodeList = getByXpath(document, "/Capabilities/Contents/Layer");
             Map<String, TileMatrixSet> matrixSetById = parseMatrices(getByXpath(document, "/Capabilities/Contents/TileMatrixSet"));
@@ -231 +231 @@
         } catch (Exception e) {
             Main.error(e);
-            //Main.error(new String(data, "UTF-8"));
         }
         return null;
@@ -242 +241 @@
     }
 
-    private final Collection<Layer> parseLayer(NodeList nodeList, Map<String, TileMatrixSet> matrixSetById) throws XPathExpressionException {
+    private Collection<Layer> parseLayer(NodeList nodeList, Map<String, TileMatrixSet> matrixSetById) throws XPathExpressionException {
         Collection<Layer> ret = new ArrayList<>();
         for (int layerId = 0; layerId < nodeList.getLength(); layerId++) {
@@ -262 +261 @@
     }
 
-    private final Map<String, TileMatrixSet> parseMatrices(NodeList nodeList) throws DOMException, XPathExpressionException {
+    private Map<String, TileMatrixSet> parseMatrices(NodeList nodeList) throws DOMException, XPathExpressionException {
         Map<String, TileMatrixSet> ret = new ConcurrentHashMap<>();
         for (int matrixSetId = 0; matrixSetId < nodeList.getLength(); matrixSetId++) {
@@ -292 +291 @@
 
     private static String crsToCode(String crsIdentifier) {
-        if(crsIdentifier.startsWith("urn:ogc:def:crs:")) {
+        if (crsIdentifier.startsWith("urn:ogc:def:crs:")) {
             return crsIdentifier.replaceFirst("urn:ogc:def:crs:([^:]*):[^:]*:(.*)$", "$1:$2");
         }
         return crsIdentifier;
     }
+
     private static String getStringByXpath(Node document, String xpathQuery) throws XPathExpressionException {
         return (String) getByXpath(document, xpathQuery, XPathConstants.STRING);
@@ -304 +304 @@
         return (NodeList) getByXpath(document, xpathQuery, XPathConstants.NODESET);
     }
-
 
     private static Object getByXpath(Node document, String xpathQuery, QName returnType) throws XPathExpressionException {
@@ -325 +324 @@
     public void initProjection(Projection proj) {
         this.currentTileMatrixSet = currentLayer.tileMatrixSetByCRS.get(proj.toCode());
-        if(this.currentTileMatrixSet == null) {
+        if (this.currentTileMatrixSet == null) {
             Main.warn("Unsupported CRS selected");
             // take first, maybe it will work (if user sets custom projections, codes will not match)
             this.currentTileMatrixSet = currentLayer.tileMatrixSetByCRS.values().iterator().next();
         }
-        this.crsScale = getTileSize() * 0.28e-03 / proj.getMetersPerUnit() ;
+        this.crsScale = getTileSize() * 0.28e-03 / proj.getMetersPerUnit();
     }
 
@@ -381 +380 @@
     /**
      *
-     * @param zoom
+     * @param zoom zoom level
      * @return TileMatrix that's working on this zoom level
      */
@@ -423 +422 @@
         throw new UnsupportedOperationException("Not implemented");
     }
-
 
     @Override
@@ -513 +511 @@
     public Coordinate XYToLatLon(int x, int y, int zoom) {
         TileMatrix matrix = getTileMatrix(zoom);
-        if (matrix == null ){
+        if (matrix == null) {
             return new Coordinate(0, 0);
         }

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

@@ -36 +36 @@
 public class CustomProjection extends AbstractProjection {
 
-    private final static Map<String, Double> UNITS_TO_METERS = getUnitsToMeters();
-    private final static double METER_PER_UNIT_DEGREE = 2 * Math.PI * 6370997 / 360;
+    private static final Map<String, Double> UNITS_TO_METERS = getUnitsToMeters();
+    private static final double METER_PER_UNIT_DEGREE = 2 * Math.PI * 6370997 / 360;
 
     /**

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

@@ -276 +276 @@
 
     private final class ShowTileInfoAction extends AbstractAction {
-        private transient final TileHolder clickedTileHolder;
+        private final transient TileHolder clickedTileHolder;
 
         private ShowTileInfoAction(TileHolder clickedTileHolder) {

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

@@ -88 +88 @@
          LatLon botLeft = mv.getLatLon(0, tileSource.getTileSize());
 
-         return Math.abs((north.getLat() - south.getLat()) / ( topLeft.lat() - botLeft.lat()));
+         return Math.abs((north.getLat() - south.getLat()) / (topLeft.lat() - botLeft.lat()));
     }
 
@@ -95 +95 @@
         if (!Main.isDisplayingMapView()) return 1;
 
-        for(int i=getMinZoomLvl(); i <= getMaxZoomLvl(); i++) {
+        for (int i = getMinZoomLvl(); i <= getMaxZoomLvl(); i++) {
             double ret = getTileToScreenRatio(i);
             if (ret < 1) {
@@ -106 +106 @@
     @Override
     public boolean isProjectionSupported(Projection proj) {
-        return ((WMTSTileSource)tileSource).getSupportedProjections().contains(proj.toCode());
+        return ((WMTSTileSource) tileSource).getSupportedProjections().contains(proj.toCode());
     }
 
@@ -112 +112 @@
     public String nameSupportedProjections() {
         StringBuilder ret = new StringBuilder();
-        for (String e: ((WMTSTileSource)tileSource).getSupportedProjections()) {
+        for (String e: ((WMTSTileSource) tileSource).getSupportedProjections()) {
             ret.append(e).append(", ");
         }
@@ -121 +121 @@
     public void projectionChanged(Projection oldValue, Projection newValue) {
         super.projectionChanged(oldValue, newValue);
-        ((WMTSTileSource)tileSource).initProjection(newValue);
+        ((WMTSTileSource) tileSource).initProjection(newValue);
     }
-
 }

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java

@@ -29 +29 @@
         registerValidableComponent(rawUrl);
     }
+
     @Override
     protected ImageryInfo getImageryInfo() {

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

@@ -500 +500 @@
      * @since TODO
      */
-    public static HttpURLConnection connectFollowingRedirect(URL downloadUrl, String httpAccept, Long ifModifiedSince, Map<String, String> headers)
-            throws MalformedURLException, IOException {
+    public static HttpURLConnection connectFollowingRedirect(URL downloadUrl, String httpAccept, Long ifModifiedSince,
+            Map<String, String> headers) throws MalformedURLException, IOException {
         CheckParameterUtil.ensureParameterNotNull(downloadUrl, "downloadUrl");
         String downloadString = downloadUrl.toExternalForm();

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -1342 +1342 @@
      * Reads the input stream and closes the stream at the end of processing (regardless if an exception was thrown)
      *
-     * @param stream
+     * @param stream input stream
      * @return byte array of data in input stream
-     * @throws IOException
+     * @throws IOException if any I/O error occurs
      */
     public static byte[] readBytesFromStream(InputStream stream) throws IOException {