Ignore:
Timestamp:
2014-04-16T02:29:53+02:00 (6 years ago)
Author:
Don-vip
Message:

sonar - fix some more issues

Location:
trunk/src/org/openstreetmap/josm/actions
Files:
4 edited

Legend:

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

    r6643 r6987  
    4545    }
    4646   
    47     protected static void addToDownload(Area a, Rectangle2D r, Collection<Rectangle2D> results, double max_area) {
     47    protected static void addToDownload(Area a, Rectangle2D r, Collection<Rectangle2D> results, double maxArea) {
    4848        Area tmp = new Area(r);
    4949        // intersect with sought-after area
     
    5353        }
    5454        Rectangle2D bounds = tmp.getBounds2D();
    55         if (bounds.getWidth() * bounds.getHeight() > max_area) {
     55        if (bounds.getWidth() * bounds.getHeight() > maxArea) {
    5656            // the rectangle gets too large; split it and make recursive call.
    5757            Rectangle2D r1;
     
    6868                        bounds.getHeight() / 2);
    6969            }
    70             addToDownload(a, r1, results, max_area);
    71             addToDownload(a, r2, results, max_area);
     70            addToDownload(a, r1, results, maxArea);
     71            addToDownload(a, r2, results, maxArea);
    7272        } else {
    7373            results.add(bounds);
     
    9292     * the areas if applicable.
    9393     */
    94     protected static void confirmAndDownloadAreas(Area a, double max_area, boolean osmDownload, boolean gpxDownload, String title, ProgressMonitor progressMonitor) {
     94    protected static void confirmAndDownloadAreas(Area a, double maxArea, boolean osmDownload, boolean gpxDownload, String title, ProgressMonitor progressMonitor) {
    9595        List<Rectangle2D> toDownload = new ArrayList<Rectangle2D>();
    96         addToDownload(a, a.getBounds(), toDownload, max_area);
     96        addToDownload(a, a.getBounds(), toDownload, maxArea);
    9797        if (toDownload.isEmpty()) {
    9898            return;
  • trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

    r6977 r6987  
    112112        public boolean insideToTheRight;
    113113
    114         public WayInPolygon(Way _way, boolean _insideRight) {
    115             this.way = _way;
    116             this.insideToTheRight = _insideRight;
     114        public WayInPolygon(Way way, boolean insideRight) {
     115            this.way = way;
     116            this.insideToTheRight = insideRight;
    117117        }
    118118
     
    289289        public final AssembledMultipolygon pol;
    290290
    291         public PolygonLevel(AssembledMultipolygon _pol, int _level) {
    292             pol = _pol;
    293             level = _level;
     291        public PolygonLevel(AssembledMultipolygon pol, int level) {
     292            this.pol = pol;
     293            this.level = level;
    294294        }
    295295    }
  • trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

    r6986 r6987  
    518518     * Class contains some auxiliary functions
    519519     */
    520     private static class EN {
     520    private static final class EN {
    521521        private EN() {
    522522            // Hide implicit public constructor for utility class
  • trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java

    r6822 r6987  
    1111
    1212public class CyclicUploadDependencyException extends Exception {
    13     private Stack<Relation> cycle;
     13    private final Stack<Relation> cycle;
    1414
    1515    public CyclicUploadDependencyException(Stack<Relation> cycle) {
    16         super();
    1716        this.cycle = cycle;
    1817    }
Note: See TracChangeset for help on using the changeset viewer.