Changeset 9073 in josm


Ignore:
Timestamp:
2015-11-30T23:14:56+01:00 (4 years ago)
Author:
Don-vip
Message:

checkstyle - Comments Indentation

Location:
trunk/src/org/openstreetmap/josm
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

    r8846 r9073  
    114114                    if (param[0].toLowerCase(Locale.ENGLISH).startsWith("-dproxy")) {
    115115                        it.set(param[0]+"=xxx");
    116                     // Shorten some parameters for readability concerns
    117116                    } else {
     117                        // Shorten some parameters for readability concerns
    118118                        shortenParam(it, param, envJavaHome, envJavaHomeAlt);
    119119                        shortenParam(it, param, propJavaHome, propJavaHomeAlt);
  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r9067 r9073  
    384384    }
    385385
    386      /**
     386    /**
    387387     * Look, whether any object is selected. If not, select the nearest node.
    388388     * If there are no nodes in the dataset, do nothing.
     
    11061106                return cycleList;
    11071107            }
    1108 //          updateKeyModifiers(e); // already called before !
     1108            // updateKeyModifiers() already called before!
    11091109
    11101110            DataSet ds = getCurrentDataSet();
  • trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

    r8510 r9073  
    230230    }
    231231
    232      /**
     232    /**
    233233     * Makes a WayPoint at the projection of point P onto the track providing P is less than
    234234     * tolerance away from the track
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

    r9065 r9073  
    793793                                (int) (repeat - pos), 0,
    794794                                (int) (repeat - pos + segmentLength), imgHeight, null);
    795                     // rest of the image fits fully on the current segment
    796795                    } else {
     796                        // rest of the image fits fully on the current segment
    797797                        g.drawImage(pattern.getImage(disabled), 0, dy1, (int) (pos - spacing), dy2,
    798798                                (int) (repeat - pos), 0, imgWidth, imgHeight, null);
  • trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java

    r8419 r9073  
    183183
    184184        return new double[] {
    185                 /* Calculate latitude */
     185                        /* Calculate latitude */
    186186                        phif + x2frac * x2poly * (x * x)
    187187                        + x4frac * x4poly * pow(x, 4.0)
  • trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

    r8906 r9073  
    991991    }
    992992
    993      /**
     993    /**
    994994     * The *result* depends on the current map selection state IF use_selected is true.
    995995     *
  • trunk/src/org/openstreetmap/josm/gui/NotificationManager.java

    r8840 r9073  
    5757    private Timer hideTimer; // started when message is shown, responsible for hiding the message
    5858    private Timer pauseTimer; // makes sure, there is a small pause between two consecutive messages
    59     private Timer unfreezeDelayTimer; // tiny delay before resuming the timer when mouse cursor
    60                                       // is moved off the panel
     59    private Timer unfreezeDelayTimer; // tiny delay before resuming the timer when mouse cursor is moved off the panel
    6160    private boolean running;
    6261
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r9059 r9073  
    545545    }
    546546
    547      /**
     547    /**
    548548     * This simply fires up an {@link RelationEditor} for the relation shown; everything else
    549549     * is the editor's business.
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

    r9059 r9073  
    11211121            putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "reverse"));
    11221122            putValue(NAME, tr("Reverse"));
    1123         //  Shortcut.register Shortcut("relationeditor:reverse", tr("Relation Editor: Reverse"),
    1124         //      KeyEvent.VK_END, Shortcut.ALT)
     1123        //  Shortcut.register Shortcut("relationeditor:reverse", tr("Relation Editor: Reverse"), KeyEvent.VK_END, Shortcut.ALT)
    11251124            updateEnabledState();
    11261125        }
     
    15701569            putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincompleteselected"));
    15711570            putValue(NAME, tr("Download Members"));
    1572         //  Shortcut.register Shortcut("relationeditor:downloadincomplete", tr("Relation Editor: Download Members"),
    1573         //      KeyEvent.VK_K, Shortcut.ALT)
     1571        //  Shortcut.register Shortcut("relationeditor:downloadincomplete", tr("Relation Editor: Download Members"), KeyEvent.VK_K, Shortcut.ALT)
    15741572            updateEnabledState();
    15751573        }
  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

    r8840 r9073  
    302302                    continue;
    303303                }
    304                  // now we are sure some color will be assigned
     304                // now we are sure some color will be assigned
    305305                Color color = null;
    306306
  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

    r8958 r9073  
    116116        /** The value needs to end with the reference string. */
    117117        ENDS_WITH,
    118          /** The value needs to contain the reference string. */
     118        /** The value needs to contain the reference string. */
    119119        CONTAINS;
    120120
  • trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

    r9006 r9073  
    411411            @Override
    412412            public void actionPerformed(ActionEvent e) {
    413                                 Collection<String> t = new LinkedList<>(getToolString());
    414                                 ActionParser parser = new ActionParser(null);
    415                                 // get text definition of current action
     413                Collection<String> t = new LinkedList<>(getToolString());
     414                ActionParser parser = new ActionParser(null);
     415                // get text definition of current action
    416416                String res = parser.saveAction(act);
    417                                 // remove the button from toolbar preferences
    418                                 t.remove(res);
    419                                 Main.pref.putCollection("toolbar", t);
    420                                 Main.toolbar.refreshToolbarControl();
    421                             }
    422                 });
     417                // remove the button from toolbar preferences
     418                t.remove(res);
     419                Main.pref.putCollection("toolbar", t);
     420                Main.toolbar.refreshToolbarControl();
     421            }
     422        });
    423423
    424424        private JMenuItem configure = new JMenuItem(new AbstractAction(tr("Configure toolbar")) {
  • trunk/src/org/openstreetmap/josm/gui/preferences/server/FeaturesPanel.java

    r8510 r9073  
    9999                MessageNotifier.start();
    100100            }
    101         // Even if they have not changed,
    102101        } else {
    103             // notifier should be stopped if user is no more identified enough
     102            // Even if they have not changed, notifier should be stopped if user is no more identified enough
    104103            if (!MessageNotifier.isUserEnoughIdentified()) {
    105104                MessageNotifier.stop();
    106             // or restarted if user is again identified and notifier was enabled in preferences
    107105            } else if (enabled && !MessageNotifier.isRunning()) {
     106                // or restarted if user is again identified and notifier was enabled in preferences
    108107                MessageNotifier.start();
    109108            }
  • trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

    r9059 r9073  
    339339                model.updateTags(tagPaster.execute());
    340340            } else {
    341                 // Paste tags from arbitrary text
     341                 // Paste tags from arbitrary text
    342342                 Map<String, String> tags = TextTagParser.readTagsFromText(buf);
    343343                 if (tags == null || tags.isEmpty()) {
  • trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

    r8923 r9073  
    347347    public Collection<FontEntry> getAdditionalFonts() {
    348348        Collection<FontEntry> def = new ArrayList<>();
    349         def.add(new FontEntry("devanagari", "", "")); // just include in fallback list
    350                                                       // font already defined in template
     349        def.add(new FontEntry("devanagari", "", "")); // just include in fallback list font already defined in template
    351350
    352351        // Windows scripts: https://msdn.microsoft.com/en-us/goglobal/bb688099.aspx
  • trunk/src/org/openstreetmap/josm/tools/TextTagParser.java

    r8928 r9073  
    215215        // tag1\tval1\ntag2\tval2\n
    216216        tags = readTagsByRegexp(buf, "[\\r\\n]+", ".*?([a-zA-Z0-9:_]+).*\\t(.*?)", false);
    217                 // try "tag\tvalue\n" format
     217        // try "tag\tvalue\n" format
    218218        if (tags != null) return tags;
    219219
     
    224224        // a = b=c  - this method of parsing fails intentionally
    225225        tags = readTagsByRegexp(buf, "[\\n\\t\\r]+", "(.*?)=(.*?)", true);
    226                 // try format  t1=v1\n t2=v2\n ...
     226        // try format  t1=v1\n t2=v2\n ...
    227227        if (tags != null) return tags;
    228228
Note: See TracChangeset for help on using the changeset viewer.