Changeset 11936 in josm for trunk

Timestamp:

2017-04-16T21:12:01+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1694 - An abstract class should have both abstract and concrete methods

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/projection/proj/LambertConformalConic.java (modified) (3 diffs)
• gui/widgets/MultiSplitLayout.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java

@@ -27 +27 @@
 public class LambertConformalConic extends AbstractProj {
 
+    /** ellipsoid */
     protected Ellipsoid ellps;
 
-    public abstract static class Parameters {
+    /**
+     * Base class of Lambert Conformal Conic parameters.
+     */
+    public static class Parameters {
+        /** latitude of origin */
         public final double latitudeOrigin;
 
-        public Parameters(double latitudeOrigin) {
+        /**
+         * Constructs a new {@code Parameters}.
+         * @param latitudeOrigin latitude of origin
+         */
+        protected Parameters(double latitudeOrigin) {
             this.latitudeOrigin = latitudeOrigin;
         }
     }
 
+    /**
+     * Parameters with a single standard parallel.
+     */
     public static class Parameters1SP extends Parameters {
+        /**
+         * Constructs a new {@code Parameters1SP}.
+         * @param latitudeOrigin latitude of origin
+         */
         public Parameters1SP(double latitudeOrigin) {
             super(latitudeOrigin);
@@ -43 +59 @@
     }
 
+    /**
+     * Parameters with two standard parallels.
+     */
     public static class Parameters2SP extends Parameters {
+        /** first standard parallel */
         public final double standardParallel1;
+        /** second standard parallel */
         public final double standardParallel2;
 
+        /**
+         * Constructs a new {@code Parameters2SP}.
+         * @param latitudeOrigin latitude of origin
+         * @param standardParallel1 first standard parallel
+         * @param standardParallel2 second standard parallel
+         */
         public Parameters2SP(double latitudeOrigin, double standardParallel1, double standardParallel2) {
             super(latitudeOrigin);
@@ -177 +204 @@
     }
 
+    /**
+     * Returns projection parameters.
+     * @return projection parameters
+     */
     public final Parameters getParameters() {
         return params;

trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java

@@ -831 +831 @@
      * Base class for the nodes that model a MultiSplitLayout.
      */
-    public abstract static class Node {
+    public static class Node {
         private Split parent;
         private Rectangle bounds = new Rectangle();
         private double weight;
+
+        /**
+         * Constructs a new {@code Node}.
+         */
+        protected Node() {
+            // Default constructor for subclasses only
+        }
 
         /**