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

Timestamp:

2016-08-06T19:21:33+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S00100 - Method names should comply with a naming convention

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Diff.java (modified) (7 diffs)
• I18n.java (modified) (2 diffs)
• Utils.java (modified) (2 diffs)

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

@@ -291 +291 @@
     /** Discard lines from one file that have no matches in the other file.
      */
-    private void discard_confusing_lines() {
-        filevec[0].discard_confusing_lines(filevec[1]);
-        filevec[1].discard_confusing_lines(filevec[0]);
+    private void discardConfusingLines() {
+        filevec[0].discardConfusingLines(filevec[1]);
+        filevec[1].discardConfusingLines(filevec[0]);
     }
 
@@ -299 +299 @@
      * Adjust inserts/deletes of blank lines to join changes as much as possible.
      */
-    private void shift_boundaries() {
-        filevec[0].shift_boundaries(filevec[1]);
-        filevec[1].shift_boundaries(filevec[0]);
+    private void shiftBoundaries() {
+        filevec[0].shiftBoundaries(filevec[1]);
+        filevec[1].shiftBoundaries(filevec[0]);
     }
 
@@ -403 +403 @@
      * @return the differences of two files
      */
-    public final Change diff_2(final boolean reverse) {
+    public final Change diff2(final boolean reverse) {
         return diff(reverse ? reverseScript : forwardScript);
     }
@@ -420 +420 @@
         // Some lines are obviously insertions or deletions because they don't match anything.
         // Detect them now, and avoid even thinking about them in the main comparison algorithm.
-        discard_confusing_lines();
+        discardConfusingLines();
 
         // Now do the main comparison algorithm, considering just the undiscarded lines.
@@ -438 +438 @@
 
         // Modify the results slightly to make them prettier in cases where that can validly be done.
-        shift_boundaries();
+        shiftBoundaries();
 
         // Get the results of comparison in the form of a chain of `struct change's -- an edit script.
@@ -547 +547 @@
          * @param f the other file
          */
-        void discard_confusing_lines(FileData f) {
+        void discardConfusingLines(FileData f) {
             clear();
             // Set up table of which lines are going to be discarded.
@@ -749 +749 @@
         }
 
-        /** Adjust inserts/deletes of blank lines to join changes
-       as much as possible.
-
-       We do something when a run of changed lines include a blank
-       line at one end and have an excluded blank line at the other.
-       We are free to choose which blank line is included.
-       `compareseq' always chooses the one at the beginning,
-       but usually it is cleaner to consider the following blank line
-       to be the "change".  The only exception is if the preceding blank line
-       would join this change to other changes.
-      @param f the file being compared against
+        /**
+         * Adjust inserts/deletes of blank lines to join changes as much as possible.
+         *
+         * We do something when a run of changed lines include a blank line at one end and have an excluded blank line at the other.
+         * We are free to choose which blank line is included.
+         * `compareseq' always chooses the one at the beginning, but usually it is cleaner to consider the following blank line
+         * to be the "change". The only exception is if the preceding blank line would join this change to other changes.
+         * @param f the file being compared against
          */
-        void shift_boundaries(FileData f) {
+        void shiftBoundaries(FileData f) {
             final boolean[] changed = changedFlag;
             final boolean[] otherChanged = f.changedFlag;

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

@@ -232 +232 @@
     }
 
-    public static String trc_lazy(String context, String text) {
+    public static String trcLazy(String context, String text) {
         if (context == null)
             return tr(text);
         if (text == null)
             return null;
-        return MessageFormat.format(gettext_lazy(text, context), (Object) null);
+        return MessageFormat.format(gettextLazy(text, context), (Object) null);
     }
 
@@ -337 +337 @@
 
     /* try without context, when context try fails */
-    private static String gettext_lazy(String text, String ctx) {
+    private static String gettextLazy(String text, String ctx) {
         return gettext(text, ctx, true);
     }

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

@@ -309 +309 @@
      *         range 0...1. If val is outside that range, return 255
      */
-    public static Integer color_float2int(Float val) {
+    public static Integer colorFloat2int(Float val) {
         if (val == null)
             return null;
@@ -323 +323 @@
      * @return corresponding float value in range 0 <= x <= 1
      */
-    public static Float color_int2float(Integer val) {
+    public static Float colorInt2float(Integer val) {
         if (val == null)
             return null;