Changeset 6889 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-02-27T01:41:49+01:00 (9 years ago)

Author:

Don-vip

Message:

fix some Sonar issues (JLS order)

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• AudioUtil.java (modified) (1 diff)
• Diff.java (modified) (1 diff)
• ImageProvider.java (modified) (1 diff)
• LanguageInfo.java (modified) (6 diffs)
• OsmUrlToBounds.java (modified) (1 diff)
• Shortcut.java (modified) (3 diffs)
• Utils.java (modified) (1 diff)
• WindowGeometry.java (modified) (5 diffs)

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

@@ -28 +28 @@
      * @return the calibrated length of recording in seconds.
      */
-    static public double getCalibratedDuration(File wavFile) {
+    public static double getCalibratedDuration(File wavFile) {
         try {
             AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(

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

@@ -491 +491 @@
 
     /** Standard ScriptBuilders. */
-    public final static ScriptBuilder
+    public static final ScriptBuilder
     forwardScript = new ForwardScript(),
     reverseScript = new ReverseScript();

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

@@ -854 +854 @@
 
     /** 90 degrees in radians units */
-    final static double DEGREE_90 = 90.0 * Math.PI / 180.0;
+    static final double DEGREE_90 = 90.0 * Math.PI / 180.0;
 
     /**

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

@@ -35 +35 @@
      * @since 5915
      */
-    static public String getWikiLanguagePrefix(LocaleType type) {
+    public static String getWikiLanguagePrefix(LocaleType type) {
         if(type == LocaleType.ENGLISH)
           return "";
@@ -60 +60 @@
      * @see #getWikiLanguagePrefix(LocaleType)
      */
-    static public String getWikiLanguagePrefix() {
+    public static String getWikiLanguagePrefix() {
         return getWikiLanguagePrefix(LocaleType.DEFAULT);
     }
@@ -70 +70 @@
      * @see #getJOSMLocaleCode(Locale)
      */
-    static public String getJOSMLocaleCode() {
+    public static String getJOSMLocaleCode() {
         return getJOSMLocaleCode(Locale.getDefault());
     }
@@ -84 +84 @@
      * @return the JOSM code for the given locale
      */
-    static public String getJOSMLocaleCode(Locale locale) {
+    public static String getJOSMLocaleCode(Locale locale) {
         if (locale == null) return "en";
         String full = locale.toString();
@@ -106 +106 @@
      * @return the resulting locale
      */
-    static public Locale getLocale(String localeName) {
+    public static Locale getLocale(String localeName) {
         if (localeName.equals("he")) {
             localeName = "iw_IL";
@@ -123 +123 @@
     }
 
-    static public String getLanguageCodeXML() {
+    public static String getLanguageCodeXML() {
         return getJOSMLocaleCode()+".";
     }
     
-    static public String getLanguageCodeManifest() {
+    public static String getLanguageCodeManifest() {
         return getJOSMLocaleCode()+"_";
     }

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

@@ -250 +250 @@
      * @return matching zoom level for area
      */
-    static public int getZoom(Bounds b) {
+    public static int getZoom(Bounds b) {
         // convert to mercator (for calculation of zoom only)
         double latMin = Math.log(Math.tan(Math.PI/4.0+b.getMinLat()/180.0*Math.PI/2.0))*180.0/Math.PI;

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

@@ -432 +432 @@
      * @return the platform specific key stroke for the  'Copy' command
      */
-    static public KeyStroke getCopyKeyStroke() {
+    public static KeyStroke getCopyKeyStroke() {
         Shortcut sc = shortcuts.get("system:copy");
         if (sc == null) return null;
@@ -445 +445 @@
      * @return the platform specific key stroke for the 'Paste' command
      */
-    static public KeyStroke getPasteKeyStroke() {
+    public static KeyStroke getPasteKeyStroke() {
         Shortcut sc = shortcuts.get("system:paste");
         if (sc == null) return null;
@@ -458 +458 @@
      * @return the platform specific key stroke for the 'Cut' command
      */
-    static public KeyStroke getCutKeyStroke() {
+    public static KeyStroke getCutKeyStroke() {
         Shortcut sc = shortcuts.get("system:cut");
         if (sc == null) return null;

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

@@ -412 +412 @@
     }
 
-    private final static double EPSILON = 1e-11;
+    private static final double EPSILON = 1e-11;
 
     /**

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

@@ -31 +31 @@
      * @return the geometry object
      */
-    static public WindowGeometry centerOnScreen(Dimension extent) {
+    public static WindowGeometry centerOnScreen(Dimension extent) {
         return centerOnScreen(extent, "gui.geometry");
     }
@@ -44 +44 @@
      * @return the geometry object
      */
-    static public WindowGeometry centerOnScreen(Dimension extent, String preferenceKey) {
+    public static WindowGeometry centerOnScreen(Dimension extent, String preferenceKey) {
         Rectangle size = preferenceKey != null ? getScreenInfo(preferenceKey)
             : getFullScreenInfo();
@@ -62 +62 @@
      * @return the geometry object
      */
-    static public WindowGeometry centerInWindow(Component reference, Dimension extent) {
+    public static WindowGeometry centerInWindow(Component reference, Dimension extent) {
         Window parentWindow = null;
         while(reference != null && ! (reference instanceof Window) ) {
@@ -82 +82 @@
      * Exception thrown by the WindowGeometry class if something goes wrong
      */
-    static public class WindowGeometryException extends Exception {
+    public static class WindowGeometryException extends Exception {
         public WindowGeometryException(String message, Throwable cause) {
             super(message, cause);
@@ -178 +178 @@
     }
 
-    static public WindowGeometry mainWindow(String preferenceKey, String arg, boolean maximize) {
+    public static WindowGeometry mainWindow(String preferenceKey, String arg, boolean maximize) {
         Rectangle screenDimension = getScreenInfo("gui.geometry");
         if (arg != null) {