Index: /trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- /trunk/src/org/openstreetmap/josm/Main.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/Main.java (revision 10001) @@ -1345,8 +1345,8 @@ panel.add(ho, gbc); panel.add(link, gbc); - final String EXIT = tr("Exit JOSM"); - final String CONTINUE = tr("Continue, try anyway"); + final String exitStr = tr("Exit JOSM"); + final String continueStr = tr("Continue, try anyway"); int ret = JOptionPane.showOptionDialog(null, panel, tr("Error"), JOptionPane.YES_NO_OPTION, - JOptionPane.ERROR_MESSAGE, null, new String[] {EXIT, CONTINUE}, EXIT); + JOptionPane.ERROR_MESSAGE, null, new String[] {exitStr, continueStr}, exitStr); if (ret == 0) { System.exit(0); Index: /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 10001) @@ -267,13 +267,13 @@ /** * Returns oriented angle (N1N2, N1N3) in range [0; 2*Math.PI[ - * @param N1 first node - * @param N2 second node - * @param N3 third node + * @param n1 first node + * @param n2 second node + * @param n3 third node * @return oriented angle (N1N2, N1N3) in range [0; 2*Math.PI[ */ - private static double getAngle(Node N1, Node N2, Node N3) { - EastNorth en1 = N1.getEastNorth(); - EastNorth en2 = N2.getEastNorth(); - EastNorth en3 = N3.getEastNorth(); + private static double getAngle(Node n1, Node n2, Node n3) { + EastNorth en1 = n1.getEastNorth(); + EastNorth en2 = n2.getEastNorth(); + EastNorth en3 = n3.getEastNorth(); double angle = Math.atan2(en3.getY() - en1.getY(), en3.getX() - en1.getX()) - Math.atan2(en2.getY() - en1.getY(), en2.getX() - en1.getX()); Index: /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 10001) @@ -328,18 +328,18 @@ // orthogonalize - final Direction[] HORIZONTAL = {Direction.RIGHT, Direction.LEFT}; - final Direction[] VERTICAL = {Direction.UP, Direction.DOWN}; - final Direction[][] ORIENTATIONS = {HORIZONTAL, VERTICAL}; - for (Direction[] orientation : ORIENTATIONS) { + final Direction[] horizontal = {Direction.RIGHT, Direction.LEFT}; + final Direction[] vertical = {Direction.UP, Direction.DOWN}; + final Direction[][] orientations = {horizontal, vertical}; + for (Direction[] orientation : orientations) { final Set s = new HashSet<>(allNodes); - int s_size = s.size(); - for (int dummy = 0; dummy < s_size; ++dummy) { + int size = s.size(); + for (int dummy = 0; dummy < size; ++dummy) { if (s.isEmpty()) { break; } - final Node dummy_n = s.iterator().next(); // pick arbitrary element of s - - final Set cs = new HashSet<>(); // will contain each node that can be reached from dummy_n - cs.add(dummy_n); // walking only on horizontal / vertical segments + final Node dummyN = s.iterator().next(); // pick arbitrary element of s + + final Set cs = new HashSet<>(); // will contain each node that can be reached from dummyN + cs.add(dummyN); // walking only on horizontal / vertical segments boolean somethingHappened = true; @@ -364,5 +364,5 @@ } - final Map nC = (orientation == HORIZONTAL) ? nY : nX; + final Map nC = (orientation == horizontal) ? nY : nX; double average = 0; @@ -385,5 +385,5 @@ // both heading nodes collapsing to one point, we simply skip this segment string and // don't touch the node coordinates. - if (orientation == VERTICAL && headingNodes.size() == 2 && cs.containsAll(headingNodes)) { + if (orientation == vertical && headingNodes.size() == 2 && cs.containsAll(headingNodes)) { continue; } @@ -404,7 +404,7 @@ final double dy = tmp.north() - n.getEastNorth().north(); if (headingNodes.contains(n)) { // The heading nodes should not have changed - final double EPSILON = 1E-6; - if (Math.abs(dx) > Math.abs(EPSILON * tmp.east()) || - Math.abs(dy) > Math.abs(EPSILON * tmp.east())) + final double epsilon = 1E-6; + if (Math.abs(dx) > Math.abs(epsilon * tmp.east()) || + Math.abs(dy) > Math.abs(epsilon * tmp.east())) throw new AssertionError(); } else { @@ -572,7 +572,7 @@ private static int angleToDirectionChange(double a, double deltaMax) throws RejectedAngleException { a = standard_angle_mPI_to_PI(a); - double d0 = Math.abs(a); - double d90 = Math.abs(a - Math.PI / 2); - double d_m90 = Math.abs(a + Math.PI / 2); + double d0 = Math.abs(a); + double d90 = Math.abs(a - Math.PI / 2); + double dm90 = Math.abs(a + Math.PI / 2); int dirChange; if (d0 < deltaMax) { @@ -580,5 +580,5 @@ } else if (d90 < deltaMax) { dirChange = 1; - } else if (d_m90 < deltaMax) { + } else if (dm90 < deltaMax) { dirChange = -1; } else { Index: /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 10001) @@ -605,5 +605,6 @@ } - int i_c = 0, i_r = 0; + int ic = 0; + int ir = 0; List relationMembers = r.getMembers(); for (RelationMember rm: relationMembers) { @@ -666,7 +667,7 @@ Boolean backwards = null; int k = 1; - while (i_r - k >= 0 || i_r + k < relationMembers.size()) { - if ((i_r - k >= 0) && relationMembers.get(i_r - k).isWay()) { - Way w = relationMembers.get(i_r - k).getWay(); + while (ir - k >= 0 || ir + k < relationMembers.size()) { + if ((ir - k >= 0) && relationMembers.get(ir - k).isWay()) { + Way w = relationMembers.get(ir - k).getWay(); if ((w.lastNode() == way.firstNode()) || w.firstNode() == way.firstNode()) { backwards = Boolean.FALSE; @@ -676,6 +677,6 @@ break; } - if ((i_r + k < relationMembers.size()) && relationMembers.get(i_r + k).isWay()) { - Way w = relationMembers.get(i_r + k).getWay(); + if ((ir + k < relationMembers.size()) && relationMembers.get(ir + k).isWay()) { + Way w = relationMembers.get(ir + k).getWay(); if ((w.lastNode() == way.firstNode()) || w.firstNode() == way.firstNode()) { backwards = Boolean.TRUE; @@ -688,5 +689,5 @@ } - int j = i_c; + int j = ic; final List waysToAddBefore = newWays.subList(0, indexOfWayToKeep); for (Way wayToAdd : waysToAddBefore) { @@ -694,5 +695,5 @@ j++; if (Boolean.TRUE.equals(backwards)) { - c.addMember(i_c + 1, em); + c.addMember(ic + 1, em); } else { c.addMember(j - 1, em); @@ -704,14 +705,14 @@ j++; if (Boolean.TRUE.equals(backwards)) { - c.addMember(i_c, em); + c.addMember(ic, em); } else { c.addMember(j, em); } } - i_c = j; + ic = j; } } - i_c++; - i_r++; + ic++; + ir++; } Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java (revision 10001) @@ -30,11 +30,11 @@ /** * Loads a given URL - * @param new_layer {@code true} if the data should be saved to a new layer + * @param newLayer {@code true} if the data should be saved to a new layer * @param url The URL as String * @param progressMonitor progress monitor for user interaction */ @Override - public Future loadUrl(boolean new_layer, final String url, ProgressMonitor progressMonitor) { - downloadTask = new DownloadTask(new_layer, new OsmServerLocationReader(url), progressMonitor) { + public Future loadUrl(boolean newLayer, final String url, ProgressMonitor progressMonitor) { + downloadTask = new DownloadTask(newLayer, new OsmServerLocationReader(url), progressMonitor) { @Override protected DataSet parseDataSet() throws OsmTransferException { Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java (revision 10001) @@ -68,10 +68,10 @@ @Override - public Future loadUrl(boolean new_layer, String url, ProgressMonitor progressMonitor) { + public Future loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) { final Matcher matcher = Pattern.compile(OSM_WEBSITE_PATTERN).matcher(url); if (matcher.matches()) { url = OsmApi.getOsmApi().getBaseUrl() + "changeset/" + Long.parseLong(matcher.group(2)) + "/download"; } - downloadTask = new DownloadTask(new_layer, new OsmServerLocationReader(url), progressMonitor); + downloadTask = new DownloadTask(newLayer, new OsmServerLocationReader(url), progressMonitor); // Extract .osc filename from URL to set the new layer name extractOsmFilename("https?://.*/(.*\\.osc)", url); Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java (revision 10001) @@ -39,11 +39,11 @@ /** * Loads a given URL - * @param new_layer {@code true} if the data should be saved to a new layer + * @param newLayer {@code true} if the data should be saved to a new layer * @param url The URL as String * @param progressMonitor progress monitor for user interaction */ @Override - public Future loadUrl(boolean new_layer, final String url, ProgressMonitor progressMonitor) { - downloadTask = new DownloadTask(new_layer, new OsmServerLocationReader(url), progressMonitor) { + public Future loadUrl(boolean newLayer, final String url, ProgressMonitor progressMonitor) { + downloadTask = new DownloadTask(newLayer, new OsmServerLocationReader(url), progressMonitor) { @Override protected DataSet parseDataSet() throws OsmTransferException { Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 10001) @@ -999,11 +999,11 @@ Iterator> i = segs.iterator(); Pair seg = i.next(); - EastNorth A = seg.a.getEastNorth(); - EastNorth B = seg.b.getEastNorth(); + EastNorth pA = seg.a.getEastNorth(); + EastNorth pB = seg.b.getEastNorth(); seg = i.next(); - EastNorth C = seg.a.getEastNorth(); - EastNorth D = seg.b.getEastNorth(); - - double u = det(B.east() - A.east(), B.north() - A.north(), C.east() - D.east(), C.north() - D.north()); + EastNorth pC = seg.a.getEastNorth(); + EastNorth pD = seg.b.getEastNorth(); + + double u = det(pB.east() - pA.east(), pB.north() - pA.north(), pC.east() - pD.east(), pC.north() - pD.north()); // Check for parallel segments and do nothing if they are @@ -1017,8 +1017,8 @@ // if the segment is scaled to lenght 1 - double q = det(B.north() - C.north(), B.east() - C.east(), D.north() - C.north(), D.east() - C.east()) / u; + double q = det(pB.north() - pC.north(), pB.east() - pC.east(), pD.north() - pC.north(), pD.east() - pC.east()) / u; EastNorth intersection = new EastNorth( - B.east() + q * (A.east() - B.east()), - B.north() + q * (A.north() - B.north())); + pB.east() + q * (pA.east() - pB.east()), + pB.north() + q * (pA.north() - pB.north())); @@ -1031,13 +1031,13 @@ } default: - EastNorth P = n.getEastNorth(); + EastNorth p = n.getEastNorth(); seg = segs.iterator().next(); - A = seg.a.getEastNorth(); - B = seg.b.getEastNorth(); - double a = P.distanceSq(B); - double b = P.distanceSq(A); - double c = A.distanceSq(B); + pA = seg.a.getEastNorth(); + pB = seg.b.getEastNorth(); + double a = p.distanceSq(pB); + double b = p.distanceSq(pA); + double c = pA.distanceSq(pB); q = (a - b + c) / (2*c); - n.setEastNorth(new EastNorth(B.east() + q * (A.east() - B.east()), B.north() + q * (A.north() - B.north()))); + n.setEastNorth(new EastNorth(pB.east() + q * (pA.east() - pB.east()), pB.north() + q * (pA.north() - pB.north()))); } } Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 10001) @@ -573,7 +573,7 @@ if (ws != null) { Node n = new Node(Main.map.mapView.getLatLon(e.getX(), e.getY())); - EastNorth A = ws.getFirstNode().getEastNorth(); - EastNorth B = ws.getSecondNode().getEastNorth(); - n.setEastNorth(Geometry.closestPointToSegment(A, B, n.getEastNorth())); + EastNorth a = ws.getFirstNode().getEastNorth(); + EastNorth b = ws.getSecondNode().getEastNorth(); + n.setEastNorth(Geometry.closestPointToSegment(a, b, n.getEastNorth())); Way wnew = new Way(ws.way); wnew.addNode(ws.lowerIndex+1, n); Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java (revision 10001) @@ -143,21 +143,21 @@ EastNorth prevB = pts[1].add(normals[0].scale(d)); for (int i = 1; i < nodeCount - 1; i++) { - EastNorth A = pts[i].add(normals[i].scale(d)); - EastNorth B = pts[i + 1].add(normals[i].scale(d)); - if (Geometry.segmentsParallel(A, B, prevA, prevB)) { - ppts[i] = A; + EastNorth a = pts[i].add(normals[i].scale(d)); + EastNorth b = pts[i + 1].add(normals[i].scale(d)); + if (Geometry.segmentsParallel(a, b, prevA, prevB)) { + ppts[i] = a; } else { - ppts[i] = Geometry.getLineLineIntersection(A, B, prevA, prevB); - } - prevA = A; - prevB = B; + ppts[i] = Geometry.getLineLineIntersection(a, b, prevA, prevB); + } + prevA = a; + prevB = b; } if (isClosedPath()) { - EastNorth A = pts[0].add(normals[0].scale(d)); - EastNorth B = pts[1].add(normals[0].scale(d)); - if (Geometry.segmentsParallel(A, B, prevA, prevB)) { - ppts[0] = A; + EastNorth a = pts[0].add(normals[0].scale(d)); + EastNorth b = pts[1].add(normals[0].scale(d)); + if (Geometry.segmentsParallel(a, b, prevA, prevB)) { + ppts[0] = a; } else { - ppts[0] = Geometry.getLineLineIntersection(A, B, prevA, prevB); + ppts[0] = Geometry.getLineLineIntersection(a, b, prevA, prevB); } ppts[nodeCount - 1] = ppts[0]; Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 10001) @@ -260,10 +260,10 @@ JRadioButton add = new JRadioButton(tr("add to selection"), initialValues.mode == SearchMode.add); JRadioButton remove = new JRadioButton(tr("remove from selection"), initialValues.mode == SearchMode.remove); - JRadioButton in_selection = new JRadioButton(tr("find in selection"), initialValues.mode == SearchMode.in_selection); + JRadioButton inSelection = new JRadioButton(tr("find in selection"), initialValues.mode == SearchMode.in_selection); ButtonGroup bg = new ButtonGroup(); bg.add(replace); bg.add(add); bg.add(remove); - bg.add(in_selection); + bg.add(inSelection); final JCheckBox caseSensitive = new JCheckBox(tr("case sensitive"), initialValues.caseSensitive); @@ -286,5 +286,5 @@ left.add(add, GBC.eol()); left.add(remove, GBC.eol()); - left.add(in_selection, GBC.eop()); + left.add(inSelection, GBC.eop()); left.add(caseSensitive, GBC.eol()); if (Main.pref.getBoolean("expert", false)) { Index: /trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java (revision 10001) @@ -23,9 +23,8 @@ public static LatLon tile2LatLon(long quad) { // The world is divided up into X_PARTS,Y_PARTS. - // The question is how far we move for each bit - // being set. In the case of the top level, we - // move half of the world. - double x_unit = X_PARTS/2; - double y_unit = Y_PARTS/2; + // The question is how far we move for each bit being set. + // In the case of the top level, we move half of the world. + double xUnit = X_PARTS/2; + double yUnit = Y_PARTS/2; long shift = (NR_LEVELS*2)-2; @@ -36,11 +35,11 @@ // remember x is the MSB if ((bits & 0x2) != 0) { - x += x_unit; + x += xUnit; } if ((bits & 0x1) != 0) { - y += y_unit; + y += yUnit; } - x_unit /= 2; - y_unit /= 2; + xUnit /= 2; + yUnit /= 2; shift -= 2; } @@ -61,8 +60,4 @@ } return tile; - } - - static long coorToTile(LatLon coor) { - return quadTile(coor); } @@ -89,6 +84,6 @@ public static int index(int level, long quad) { long mask = 0x00000003; - int total_shift = TILES_PER_LEVEL_SHIFT*(NR_LEVELS-level-1); - return (int) (mask & (quad >> total_shift)); + int totalShift = TILES_PER_LEVEL_SHIFT*(NR_LEVELS-level-1); + return (int) (mask & (quad >> totalShift)); } Index: /trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 10001) @@ -240,13 +240,13 @@ /** - * Makes a WayPoint at the projection of point P onto the track providing P is less than + * Makes a WayPoint at the projection of point p onto the track providing p is less than * tolerance away from the track * - * @param P : the point to determine the projection for + * @param p : the point to determine the projection for * @param tolerance : must be no further than this from the track - * @return the closest point on the track to P, which may be the first or last point if off the + * @return the closest point on the track to p, which may be the first or last point if off the * end of a segment, or may be null if nothing close enough */ - public WayPoint nearestPointOnTrack(EastNorth P, double tolerance) { + public WayPoint nearestPointOnTrack(EastNorth p, double tolerance) { /* * assume the coordinates of P are xp,yp, and those of a section of track between two @@ -272,9 +272,9 @@ */ - double PNminsq = tolerance * tolerance; + double pnminsq = tolerance * tolerance; EastNorth bestEN = null; double bestTime = 0.0; - double px = P.east(); - double py = P.north(); + double px = p.east(); + double py = p.north(); double rx = 0.0, ry = 0.0, sx, sy, x, y; if (tracks == null) @@ -282,54 +282,54 @@ for (GpxTrack track : tracks) { for (GpxTrackSegment seg : track.getSegments()) { - WayPoint R = null; + WayPoint r = null; for (WayPoint S : seg.getWayPoints()) { - EastNorth c = S.getEastNorth(); - if (R == null) { - R = S; - rx = c.east(); - ry = c.north(); + EastNorth en = S.getEastNorth(); + if (r == null) { + r = S; + rx = en.east(); + ry = en.north(); x = px - rx; y = py - ry; - double PRsq = x * x + y * y; - if (PRsq < PNminsq) { - PNminsq = PRsq; - bestEN = c; - bestTime = R.time; + double pRsq = x * x + y * y; + if (pRsq < pnminsq) { + pnminsq = pRsq; + bestEN = en; + bestTime = r.time; } } else { - sx = c.east(); - sy = c.north(); - double A = sy - ry; - double B = rx - sx; - double C = -A * rx - B * ry; - double RSsq = A * A + B * B; - if (RSsq == 0) { + sx = en.east(); + sy = en.north(); + double a = sy - ry; + double b = rx - sx; + double c = -a * rx - b * ry; + double rssq = a * a + b * b; + if (rssq == 0) { continue; } - double PNsq = A * px + B * py + C; - PNsq = PNsq * PNsq / RSsq; - if (PNsq < PNminsq) { + double pnsq = a * px + b * py + c; + pnsq = pnsq * pnsq / rssq; + if (pnsq < pnminsq) { x = px - rx; y = py - ry; - double PRsq = x * x + y * y; + double prsq = x * x + y * y; x = px - sx; y = py - sy; - double PSsq = x * x + y * y; - if (PRsq - PNsq <= RSsq && PSsq - PNsq <= RSsq) { - double RNoverRS = Math.sqrt((PRsq - PNsq) / RSsq); - double nx = rx - RNoverRS * B; - double ny = ry + RNoverRS * A; + double pssq = x * x + y * y; + if (prsq - pnsq <= rssq && pssq - pnsq <= rssq) { + double rnoverRS = Math.sqrt((prsq - pnsq) / rssq); + double nx = rx - rnoverRS * b; + double ny = ry + rnoverRS * a; bestEN = new EastNorth(nx, ny); - bestTime = R.time + RNoverRS * (S.time - R.time); - PNminsq = PNsq; + bestTime = r.time + rnoverRS * (S.time - r.time); + pnminsq = pnsq; } } - R = S; + r = S; rx = sx; ry = sy; } } - if (R != null) { - EastNorth c = R.getEastNorth(); + if (r != null) { + EastNorth c = r.getEastNorth(); /* if there is only one point in the seg, it will do this twice, but no matter */ rx = c.east(); @@ -337,9 +337,9 @@ x = px - rx; y = py - ry; - double PRsq = x * x + y * y; - if (PRsq < PNminsq) { - PNminsq = PRsq; + double prsq = x * x + y * y; + if (prsq < pnminsq) { + pnminsq = prsq; bestEN = c; - bestTime = R.time; + bestTime = r.time; } } Index: /trunk/src/org/openstreetmap/josm/data/osm/BBox.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/BBox.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/osm/BBox.java (revision 10001) @@ -52,20 +52,20 @@ } - public BBox(double a_x, double a_y, double b_x, double b_y) { - - if (a_x > b_x) { - xmax = a_x; - xmin = b_x; + public BBox(double ax, double ay, double bx, double by) { + + if (ax > bx) { + xmax = ax; + xmin = bx; } else { - xmax = b_x; - xmin = a_x; - } - - if (a_y > b_y) { - ymax = a_y; - ymin = b_y; + xmax = bx; + xmin = ax; + } + + if (ay > by) { + ymax = ay; + ymin = by; } else { - ymax = b_y; - ymin = a_y; + ymax = by; + ymin = ay; } Index: /trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 10001) @@ -98,8 +98,8 @@ } - QBLevel(QBLevel parent, int parent_index, final QuadBuckets buckets) { + QBLevel(QBLevel parent, int parentIndex, final QuadBuckets buckets) { this.parent = parent; this.level = parent.level + 1; - this.index = parent_index; + this.index = parentIndex; this.buckets = buckets; @@ -111,14 +111,14 @@ mult = 1 << 30; } - long this_quadpart = mult * (parent_index << shift); - this.quad = parent.quad | this_quadpart; + long quadpart = mult * (parentIndex << shift); + this.quad = parent.quad | quadpart; this.bbox = calculateBBox(); // calculateBBox reference quad } private BBox calculateBBox() { - LatLon bottom_left = this.coor(); - double lat = bottom_left.lat() + parent.height() / 2; - double lon = bottom_left.lon() + parent.width() / 2; - return new BBox(bottom_left.lon(), bottom_left.lat(), lon, lat); + LatLon bottomLeft = this.coor(); + double lat = bottomLeft.lat() + parent.height() / 2; + double lon = bottomLeft.lon() + parent.width() / 2; + return new BBox(bottomLeft.lon(), bottomLeft.lat(), lon, lat); } @@ -181,14 +181,14 @@ } - boolean matches(final T o, final BBox search_bbox) { + boolean matches(final T o, final BBox searchBbox) { if (o instanceof Node) { final LatLon latLon = ((Node) o).getCoor(); // node without coords -> bbox[0,0,0,0] - return search_bbox.bounds(latLon != null ? latLon : LatLon.ZERO); - } - return o.getBBox().intersects(search_bbox); - } - - private void search_contents(BBox search_bbox, List result) { + return searchBbox.bounds(latLon != null ? latLon : LatLon.ZERO); + } + return o.getBBox().intersects(searchBbox); + } + + private void search_contents(BBox searchBbox, List result) { /* * It is possible that this was created in a split @@ -199,5 +199,5 @@ for (T o : content) { - if (matches(o, search_bbox)) { + if (matches(o, searchBbox)) { result.add(o); } @@ -299,13 +299,13 @@ } - private void search(BBox search_bbox, List result) { - if (!this.bbox().intersects(search_bbox)) + private void search(BBox searchBbox, List result) { + if (!this.bbox().intersects(searchBbox)) return; - else if (bbox().bounds(search_bbox)) { + else if (bbox().bounds(searchBbox)) { buckets.searchCache = this; } if (this.hasContent()) { - search_contents(search_bbox, result); + search_contents(searchBbox, result); } @@ -313,14 +313,14 @@ if (nw != null) { - nw.search(search_bbox, result); + nw.search(searchBbox, result); } if (ne != null) { - ne.search(search_bbox, result); + ne.search(searchBbox, result); } if (se != null) { - se.search(search_bbox, result); + se.search(searchBbox, result); } if (sw != null) { - sw.search(search_bbox, result); + sw.search(searchBbox, result); } } @@ -330,8 +330,8 @@ } - int index_of(QBLevel find_this) { + int index_of(QBLevel findThis) { QBLevel[] children = getChildren(); for (int i = 0; i < QuadTiling.TILES_PER_LEVEL; i++) { - if (children[i] == find_this) + if (children[i] == findThis) return i; } Index: /trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java (revision 10001) @@ -96,6 +96,6 @@ @Override public LatLon eastNorth2latlon(EastNorth en) { - double[] latlon_rad = proj.invproject((en.east() * toMeter - x0) / ellps.a / k0, (en.north() * toMeter - y0) / ellps.a / k0); - LatLon ll = new LatLon(Math.toDegrees(latlon_rad[0]), LatLon.normalizeLon(Math.toDegrees(latlon_rad[1]) + lon0 + pm)); + double[] latlonRad = proj.invproject((en.east() * toMeter - x0) / ellps.a / k0, (en.north() * toMeter - y0) / ellps.a / k0); + LatLon ll = new LatLon(Math.toDegrees(latlonRad[0]), LatLon.normalizeLon(Math.toDegrees(latlonRad[1]) + lon0 + pm)); return datum.toWGS84(ll); } Index: /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 10001) @@ -615,9 +615,9 @@ s = s.substring(m.end()); } - final String FLOAT = "(\\d+(\\.\\d*)?)"; + final String floatPattern = "(\\d+(\\.\\d*)?)"; boolean dms = false; double deg = 0.0, min = 0.0, sec = 0.0; // degrees - m = Pattern.compile("^"+FLOAT+"d").matcher(s); + m = Pattern.compile("^"+floatPattern+"d").matcher(s); if (m.find()) { s = s.substring(m.end()); @@ -626,5 +626,5 @@ } // minutes - m = Pattern.compile("^"+FLOAT+"'").matcher(s); + m = Pattern.compile("^"+floatPattern+"'").matcher(s); if (m.find()) { s = s.substring(m.end()); @@ -633,5 +633,5 @@ } // seconds - m = Pattern.compile("^"+FLOAT+"\"").matcher(s); + m = Pattern.compile("^"+floatPattern+"\"").matcher(s); if (m.find()) { s = s.substring(m.end()); @@ -643,5 +643,5 @@ value = deg + (min/60.0) + (sec/3600.0); } else { - m = Pattern.compile("^"+FLOAT).matcher(s); + m = Pattern.compile("^"+floatPattern).matcher(s); if (m.find()) { s = s.substring(m.end()); @@ -780,17 +780,17 @@ } - private static EastNorth getPointAlong(int i, int N, ProjectionBounds r) { - double dEast = (r.maxEast - r.minEast) / N; - double dNorth = (r.maxNorth - r.minNorth) / N; - if (i < N) { + private static EastNorth getPointAlong(int i, int n, ProjectionBounds r) { + double dEast = (r.maxEast - r.minEast) / n; + double dNorth = (r.maxNorth - r.minNorth) / n; + if (i < n) { return new EastNorth(r.minEast + i * dEast, r.minNorth); - } else if (i < 2*N) { - i -= N; + } else if (i < 2*n) { + i -= n; return new EastNorth(r.maxEast, r.minNorth + i * dNorth); - } else if (i < 3*N) { - i -= 2*N; + } else if (i < 3*n) { + i -= 2*n; return new EastNorth(r.maxEast - i * dEast, r.maxNorth); - } else if (i < 4*N) { - i -= 3*N; + } else if (i < 4*n) { + i -= 3*n; return new EastNorth(r.minEast, r.maxNorth - i * dNorth); } else { @@ -824,10 +824,10 @@ @Override public Bounds getLatLonBoundsBox(ProjectionBounds r) { - final int N = 10; + final int n = 10; Bounds result = new Bounds(eastNorth2latlon(r.getMin())); result.extend(eastNorth2latlon(r.getMax())); LatLon llPrev = null; - for (int i = 0; i < 4*N; i++) { - LatLon llNow = eastNorth2latlon(getPointAlong(i, N, r)); + for (int i = 0; i < 4*n; i++) { + LatLon llNow = eastNorth2latlon(getPointAlong(i, n, r)); result.extend(llNow); // check if segment crosses 180th meridian and if so, make sure Index: /trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java (revision 10001) @@ -353,9 +353,9 @@ double lambda = Math.toRadians(coord.lon()); - double Rn = a / Math.sqrt(1 - e2 * Math.pow(Math.sin(phi), 2)); + double rn = a / Math.sqrt(1 - e2 * Math.pow(Math.sin(phi), 2)); double[] xyz = new double[3]; - xyz[0] = Rn * Math.cos(phi) * Math.cos(lambda); - xyz[1] = Rn * Math.cos(phi) * Math.sin(lambda); - xyz[2] = Rn * (1 - e2) * Math.sin(phi); + xyz[0] = rn * Math.cos(phi) * Math.cos(lambda); + xyz[1] = rn * Math.cos(phi) * Math.sin(lambda); + xyz[2] = rn * (1 - e2) * Math.sin(phi); return xyz; Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java (revision 10001) @@ -167,5 +167,5 @@ */ public double phi1(final double qs) { - final double tone_es = 1 - e2; + final double toneEs = 1 - e2; double phi = Math.asin(0.5 * qs); if (e < EPSILON) { @@ -178,5 +178,5 @@ final double com = 1.0 - con*con; final double dphi = 0.5 * com*com / cospi * - (qs/tone_es - sinpi / com + 0.5/e * Math.log((1. - con) / (1. + con))); + (qs/toneEs - sinpi / com + 0.5/e * Math.log((1. - con) / (1. + con))); phi += dphi; if (Math.abs(dphi) <= ITERATION_TOLERANCE) { @@ -194,8 +194,8 @@ */ private double qsfn(final double sinphi) { - final double one_es = 1 - e2; + final double oneEs = 1 - e2; if (e >= EPSILON) { final double con = e * sinphi; - return one_es * (sinphi / (1. - con*con) - + return oneEs * (sinphi / (1. - con*con) - (0.5/e) * Math.log((1.-con) / (1.+con))); } else { Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/DoubleStereographic.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/DoubleStereographic.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/DoubleStereographic.java (revision 10001) @@ -58,12 +58,12 @@ } - private void initialize(double lat_0) { - double phi0 = toRadians(lat_0); + private void initialize(double lat0) { + double phi0 = toRadians(lat0); double e2 = ellps.e2; r = sqrt(1-e2) / (1 - e2*pow(sin(phi0), 2)); n = sqrt(1 + ellps.eb2 * pow(cos(phi0), 4)); - double S1 = (1 + sin(phi0)) / (1 - sin(phi0)); - double S2 = (1 - e * sin(phi0)) / (1 + e * sin(phi0)); - double w1 = pow(S1 * pow(S2, e), n); + double s1 = (1 + sin(phi0)) / (1 - sin(phi0)); + double s2 = (1 - e * sin(phi0)) / (1 + e * sin(phi0)); + double w1 = pow(s1 * pow(s2, e), n); double sinchi00 = (w1 - 1) / (w1 + 1); c = (n + sin(phi0)) * (1 - sinchi00) / ((n - sin(phi0)) * (1 + sinchi00)); @@ -74,12 +74,12 @@ @Override public double[] project(double phi, double lambda) { - double Lambda = n * lambda; - double Sa = (1 + sin(phi)) / (1 - sin(phi)); - double Sb = (1 - e * sin(phi)) / (1 + e * sin(phi)); - double w = c * pow(Sa * pow(Sb, e), n); + double nLambda = n * lambda; + double sa = (1 + sin(phi)) / (1 - sin(phi)); + double sb = (1 - e * sin(phi)) / (1 + e * sin(phi)); + double w = c * pow(sa * pow(sb, e), n); double chi = asin((w - 1) / (w + 1)); - double B = 1 + sin(chi) * sin(chi0) + cos(chi) * cos(chi0) * cos(Lambda); - double x = 2 * r * cos(chi) * sin(Lambda) / B; - double y = 2 * r * (sin(chi) * cos(chi0) - cos(chi) * sin(chi0) * cos(Lambda)) / B; + double b = 1 + sin(chi) * sin(chi0) + cos(chi) * cos(chi0) * cos(nLambda); + double x = 2 * r * cos(chi) * sin(nLambda) / b; + double y = 2 * r * (sin(chi) * cos(chi0) - cos(chi) * sin(chi0) * cos(nLambda)) / b; return new double[] {x, y}; } @@ -93,6 +93,5 @@ double j = atan(x/(g - y)) - i; double chi = chi0 + 2 * atan((y - x * tan(j/2)) / (2 * r)); - double Lambda = j + 2*i; - double lambda = Lambda / n; + double lambda = (j + 2*i) / n; double psi = 0.5 * log((1 + sin(chi)) / (c*(1 - sin(chi)))) / n; double phiprev = -1000; Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java (revision 10001) @@ -91,17 +91,17 @@ * Initialize for LCC with 2 standard parallels. * - * @param lat_0 latitude of false origin (in degrees) - * @param lat_1 latitude of first standard parallel (in degrees) - * @param lat_2 latitude of second standard parallel (in degrees) + * @param lat0 latitude of false origin (in degrees) + * @param lat1 latitude of first standard parallel (in degrees) + * @param lat2 latitude of second standard parallel (in degrees) */ - private void initialize2SP(double lat_0, double lat_1, double lat_2) { - this.params = new Parameters2SP(lat_0, lat_1, lat_2); + private void initialize2SP(double lat0, double lat1, double lat2) { + this.params = new Parameters2SP(lat0, lat1, lat2); - final double m1 = m(toRadians(lat_1)); - final double m2 = m(toRadians(lat_2)); + final double m1 = m(toRadians(lat1)); + final double m2 = m(toRadians(lat2)); - final double t1 = t(toRadians(lat_1)); - final double t2 = t(toRadians(lat_2)); - final double tf = t(toRadians(lat_0)); + final double t1 = t(toRadians(lat1)); + final double t2 = t(toRadians(lat2)); + final double tf = t(toRadians(lat0)); n = (log(m1) - log(m2)) / (log(t1) - log(t2)); @@ -113,14 +113,14 @@ * Initialize for LCC with 1 standard parallel. * - * @param lat_0 latitude of natural origin (in degrees) + * @param lat0 latitude of natural origin (in degrees) */ - private void initialize1SP(double lat_0) { - this.params = new Parameters1SP(lat_0); - final double lat_0_rad = toRadians(lat_0); + private void initialize1SP(double lat0) { + this.params = new Parameters1SP(lat0); + final double lat0rad = toRadians(lat0); - final double m0 = m(lat_0_rad); - final double t0 = t(lat_0_rad); + final double m0 = m(lat0rad); + final double t0 = t(lat0rad); - n = sin(lat_0_rad); + n = sin(lat0rad); f = m0 / (n * pow(t0, n)); r0 = f * pow(t0, n); @@ -129,19 +129,19 @@ /** * auxiliary function t - * @param lat_rad latitude in radians + * @param latRad latitude in radians * @return result */ - protected double t(double lat_rad) { - return tan(PI/4 - lat_rad / 2.0) - / pow((1.0 - e * sin(lat_rad)) / (1.0 + e * sin(lat_rad)), e/2); + protected double t(double latRad) { + return tan(PI/4 - latRad / 2.0) + / pow((1.0 - e * sin(latRad)) / (1.0 + e * sin(latRad)), e/2); } /** * auxiliary function m - * @param lat_rad latitude in radians + * @param latRad latitude in radians * @return result */ - protected double m(double lat_rad) { - return cos(lat_rad) / (sqrt(1 - e * e * pow(sin(lat_rad), 2))); + protected double m(double latRad) { + return cos(latRad) / (sqrt(1 - e * e * pow(sin(latRad), 2))); } Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/LonLat.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/LonLat.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/LonLat.java (revision 10001) @@ -30,6 +30,6 @@ @Override - public double[] project(double lat_rad, double lon_rad) { - return new double[] {Math.toDegrees(lon_rad) / a, Math.toDegrees(lat_rad) / a}; + public double[] project(double latRad, double lonRad) { + return new double[] {Math.toDegrees(lonRad) / a, Math.toDegrees(latRad) / a}; } Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java (revision 10001) @@ -379,10 +379,10 @@ double temp = 1.0 / q; double s = 0.5 * (q - temp); - double V = Math.sin(b * x); - double U = (s * singamma0 - V * cosgamma0) / (0.5 * (q + temp)); - if (Math.abs(Math.abs(U) - 1.0) < EPSILON) { + double v2 = Math.sin(b * x); + double u2 = (s * singamma0 - v2 * cosgamma0) / (0.5 * (q + temp)); + if (Math.abs(Math.abs(u2) - 1.0) < EPSILON) { v = 0; // this is actually an error and should be reported to the caller somehow } else { - v = 0.5 * arb * Math.log((1.0 - U) / (1.0 + U)); + v = 0.5 * arb * Math.log((1.0 - u2) / (1.0 + u2)); } temp = Math.cos(b * x); @@ -390,5 +390,5 @@ u = ab * x; } else { - u = arb * Math.atan2(s * cosgamma0 + V * singamma0, temp); + u = arb * Math.atan2(s * cosgamma0 + v2 * singamma0, temp); } } else { Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java (revision 10001) @@ -171,9 +171,9 @@ @Override public Bounds getAlgorithmBounds() { - final double CUT = 60; + final double cut = 60; if (southPole) { - return new Bounds(-90, -180, CUT, 180, false); + return new Bounds(-90, -180, cut, 180, false); } else { - return new Bounds(-CUT, -180, 90, 180, false); + return new Bounds(-cut, -180, 90, 180, false); } } Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/Proj.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/Proj.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/Proj.java (revision 10001) @@ -50,10 +50,10 @@ * Convert lat/lon to east/north. * - * @param lat_rad the latitude in radians - * @param lon_rad the longitude in radians + * @param latRad the latitude in radians + * @param lonRad the longitude in radians * @return array of length 2, containing east and north value in meters, * divided by the semi major axis of the ellipsoid. */ - double[] project(double lat_rad, double lon_rad); + double[] project(double latRad, double lonRad); /** Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java (revision 10001) @@ -56,6 +56,6 @@ } - private void initialize(double lat_0) { - phi0 = toRadians(lat_0); + private void initialize(double lat0) { + phi0 = toRadians(lat0); kR = sqrt(1 - ellps.e2) / (1 - (ellps.e2 * pow(sin(phi0), 2))); alpha = sqrt(1 + (ellps.eb2 * pow(cos(phi0), 4))); @@ -78,7 +78,7 @@ @Override public double[] project(double phi, double lambda) { - double S = alpha * log(tan(PI / 4 + phi / 2)) - alpha * ellps.e / 2 + double s = alpha * log(tan(PI / 4 + phi / 2)) - alpha * ellps.e / 2 * log((1 + ellps.e * sin(phi)) / (1 - ellps.e * sin(phi))) + k; - double b = 2 * (atan(exp(S)) - PI / 4); + double b = 2 * (atan(exp(s)) - PI / 4); double l = alpha * lambda; Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java (revision 10001) @@ -119,6 +119,6 @@ int i; // iterates through s int j; // iterates through t - char s_i; // ith character of s - char t_j; // jth character of t + char si; // ith character of s + char tj; // jth character of t int cost; // cost @@ -143,13 +143,13 @@ for (i = 1; i <= n; i++) { - s_i = s.charAt(i - 1); + si = s.charAt(i - 1); // Step 4 for (j = 1; j <= m; j++) { - t_j = t.charAt(j - 1); + tj = t.charAt(j - 1); // Step 5 - if (s_i == t_j) { + if (si == tj) { cost = 0; } else { Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (revision 10001) @@ -389,8 +389,8 @@ nearbyNodeCache = null; List bounds = this.getBounds(dist); - List found_nodes = endnodesHighway.search(new BBox(bounds.get(0), bounds.get(1))); - found_nodes.addAll(endnodes.search(new BBox(bounds.get(0), bounds.get(1)))); - - for (Node n : found_nodes) { + List foundNodes = endnodesHighway.search(new BBox(bounds.get(0), bounds.get(1))); + foundNodes.addAll(endnodes.search(new BBox(bounds.get(0), bounds.get(1)))); + + for (Node n : foundNodes) { if (!nearby(n, dist) || !n.getCoor().isIn(dsArea)) { continue; Index: /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 10001) @@ -418,7 +418,7 @@ name = tr("relation"); } - String admin_level = relation.get("admin_level"); - if (admin_level != null) { - name += '['+admin_level+']'; + String adminLevel = relation.get("admin_level"); + if (adminLevel != null) { + name += '['+adminLevel+']'; } Index: /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 10001) @@ -320,9 +320,9 @@ for (int i = 0; i < bTexts.length; i++) { - final int final_i = i; + final int finalI = i; Action action = new AbstractAction(bTexts[i]) { @Override public void actionPerformed(ActionEvent evt) { - buttonAction(final_i, evt); + buttonAction(finalI, evt); } }; Index: /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 10001) @@ -553,7 +553,7 @@ LatLon ll2 = getLatLon(width / 2 + 50, height / 2); if (ll1.isValid() && ll2.isValid() && b.contains(ll1) && b.contains(ll2)) { - double d_m = ll1.greatCircleDistance(ll2); - double d_en = 100 * scale; - double scaleMin = 0.01 * d_en / d_m / 100; + double dm = ll1.greatCircleDistance(ll2); + double den = 100 * scale; + double scaleMin = 0.01 * den / dm / 100; if (!Double.isInfinite(scaleMin) && newScale < scaleMin) { newScale = scaleMin; @@ -1026,9 +1026,9 @@ } - Point2D A = getPoint2D(lastN); - Point2D B = getPoint2D(n); - double c = A.distanceSq(B); - double a = p.distanceSq(B); - double b = p.distanceSq(A); + Point2D pA = getPoint2D(lastN); + Point2D pB = getPoint2D(n); + double c = pA.distanceSq(pB); + double a = p.distanceSq(pB); + double b = p.distanceSq(pA); /* perpendicular distance squared @@ -1142,5 +1142,5 @@ * @param p the point for which to search the nearest segment. * @param predicate the returned object has to fulfill certain properties. - * @param use_selected whether selected way segments should be preferred. + * @param useSelected whether selected way segments should be preferred. * @param preferredRefs - prefer segments related to these primitives, may be null * @@ -1153,5 +1153,5 @@ */ public final WaySegment getNearestWaySegment(Point p, Predicate predicate, - boolean use_selected, Collection preferredRefs) { + boolean useSelected, Collection preferredRefs) { WaySegment wayseg = null, ntsel = null, ntref = null; if (preferredRefs != null && preferredRefs.isEmpty()) preferredRefs = null; @@ -1185,5 +1185,5 @@ } } - if (ntsel != null && use_selected) + if (ntsel != null && useSelected) return ntsel; if (ntref != null) @@ -1352,5 +1352,5 @@ * @param p The point on screen. * @param predicate the returned object has to fulfill certain properties. - * @param use_selected whether to prefer primitives that are currently selected or referred by selected primitives + * @param useSelected whether to prefer primitives that are currently selected or referred by selected primitives * * @return A primitive within snap-distance to point p, @@ -1359,24 +1359,24 @@ * @see #getNearestWay(Point, Predicate) */ - public final OsmPrimitive getNearestNodeOrWay(Point p, Predicate predicate, boolean use_selected) { + public final OsmPrimitive getNearestNodeOrWay(Point p, Predicate predicate, boolean useSelected) { Collection sel; DataSet ds = getCurrentDataSet(); - if (use_selected && ds != null) { + if (useSelected && ds != null) { sel = ds.getSelected(); } else { sel = null; } - OsmPrimitive osm = getNearestNode(p, predicate, use_selected, sel); - - if (isPrecedenceNode((Node) osm, p, use_selected)) return osm; + OsmPrimitive osm = getNearestNode(p, predicate, useSelected, sel); + + if (isPrecedenceNode((Node) osm, p, useSelected)) return osm; WaySegment ws; - if (use_selected) { - ws = getNearestWaySegment(p, predicate, use_selected, sel); + if (useSelected) { + ws = getNearestWaySegment(p, predicate, useSelected, sel); } else { - ws = getNearestWaySegment(p, predicate, use_selected); + ws = getNearestWaySegment(p, predicate, useSelected); } if (ws == null) return osm; - if ((ws.way.isSelected() && use_selected) || osm == null) { + if ((ws.way.isSelected() && useSelected) || osm == null) { // either (no _selected_ nearest node found, if desired) or no nearest node was found osm = ws.way; Index: /trunk/src/org/openstreetmap/josm/gui/NotificationManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/NotificationManager.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/NotificationManager.java (revision 10001) @@ -108,5 +108,5 @@ currentNotificationPanel.validate(); - int MARGIN = 5; + int margin = 5; int x, y; JFrame parentWindow = (JFrame) Main.parent; @@ -115,9 +115,9 @@ MapView mv = Main.map.mapView; Point mapViewPos = SwingUtilities.convertPoint(mv.getParent(), mv.getX(), mv.getY(), Main.parent); - x = mapViewPos.x + MARGIN; - y = mapViewPos.y + mv.getHeight() - Main.map.statusLine.getHeight() - size.height - MARGIN; + x = mapViewPos.x + margin; + y = mapViewPos.y + mv.getHeight() - Main.map.statusLine.getHeight() - size.height - margin; } else { - x = MARGIN; - y = parentWindow.getHeight() - Main.toolbar.control.getSize().height - size.height - MARGIN; + x = margin; + y = parentWindow.getHeight() - Main.toolbar.control.getSize().height - size.height - margin; } parentWindow.getLayeredPane().add(currentNotificationPanel, JLayeredPane.POPUP_LAYER, 0); Index: /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 10001) @@ -240,9 +240,9 @@ return; - Point p_max = new Point(Math.max(aEnd.x, aStart.x), Math.max(aEnd.y, aStart.y)); - Point p_min = new Point(Math.min(aEnd.x, aStart.x), Math.min(aEnd.y, aStart.y)); - - iSelectionRectStart = getPosition(p_min); - iSelectionRectEnd = getPosition(p_max); + Point pMax = new Point(Math.max(aEnd.x, aStart.x), Math.max(aEnd.y, aStart.y)); + Point pMin = new Point(Math.min(aEnd.x, aStart.x), Math.min(aEnd.y, aStart.y)); + + iSelectionRectStart = getPosition(pMin); + iSelectionRectEnd = getPosition(pMax); Bounds b = new Bounds( Index: /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 10001) @@ -154,10 +154,7 @@ // calc the screen coordinates for the new selection rectangle - MapMarkerDot xmin_ymin = new MapMarkerDot(bbox.getMinLat(), bbox.getMinLon()); - MapMarkerDot xmax_ymax = new MapMarkerDot(bbox.getMaxLat(), bbox.getMaxLon()); - List marker = new ArrayList<>(2); - marker.add(xmin_ymin); - marker.add(xmax_ymax); + marker.add(new MapMarkerDot(bbox.getMinLat(), bbox.getMinLon())); + marker.add(new MapMarkerDot(bbox.getMaxLat(), bbox.getMaxLon())); mapViewer.setBoundingBox(bbox); mapViewer.setMapMarkerList(marker); @@ -704,16 +701,16 @@ int zoomDiff = MAX_ZOOM - zoom; Point tlc = getTopLeftCoordinates(); - int x_min = (min.x >> zoomDiff) - tlc.x; - int y_min = (min.y >> zoomDiff) - tlc.y; - int x_max = (max.x >> zoomDiff) - tlc.x; - int y_max = (max.y >> zoomDiff) - tlc.y; - - int w = x_max - x_min; - int h = y_max - y_min; + int xMin = (min.x >> zoomDiff) - tlc.x; + int yMin = (min.y >> zoomDiff) - tlc.y; + int xMax = (max.x >> zoomDiff) - tlc.x; + int yMax = (max.y >> zoomDiff) - tlc.y; + + int w = xMax - xMin; + int h = yMax - yMin; g.setColor(new Color(0.9f, 0.7f, 0.7f, 0.6f)); - g.fillRect(x_min, y_min, w, h); + g.fillRect(xMin, yMin, w, h); g.setColor(Color.BLACK); - g.drawRect(x_min, y_min, w, h); + g.drawRect(xMin, yMin, w, h); } catch (Exception e) { Main.error(e); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 10001) @@ -418,11 +418,11 @@ abstract static class CopyAction extends AbstractAction implements ListSelectionListener { - protected CopyAction(String icon_name, String action_name, String short_description) { - ImageIcon icon = ImageProvider.get("dialogs/conflict", icon_name); + protected CopyAction(String iconName, String actionName, String shortDescription) { + ImageIcon icon = ImageProvider.get("dialogs/conflict", iconName); putValue(Action.SMALL_ICON, icon); if (icon == null) { - putValue(Action.NAME, action_name); + putValue(Action.NAME, actionName); } - putValue(Action.SHORT_DESCRIPTION, short_description); + putValue(Action.SHORT_DESCRIPTION, shortDescription); setEnabled(false); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 10001) @@ -107,5 +107,5 @@ public void reconstruct(Action action, ToggleDialog triggeredBy) { - final int N = allDialogs.size(); + final int n = allDialogs.size(); /** @@ -126,11 +126,11 @@ * in the last panel anyway. */ - JPanel p = panels.get(N-1); // current Panel (start with last one) + JPanel p = panels.get(n-1); // current Panel (start with last one) int k = -1; // indicates that current Panel index is N-1, but no default-view-Dialog has been added to this Panel yet. - for (int i = N-1; i >= 0; --i) { + for (int i = n-1; i >= 0; --i) { final ToggleDialog dlg = allDialogs.get(i); if (dlg.isDialogInDefaultView()) { if (k == -1) { - k = N-1; + k = n-1; } else { --k; @@ -146,7 +146,7 @@ if (k == -1) { - k = N-1; - } - final int numPanels = N - k; + k = n-1; + } + final int numPanels = n - k; /** @@ -154,5 +154,5 @@ */ if (action == Action.ELEMENT_SHRINKS) { - for (int i = 0; i < N; ++i) { + for (int i = 0; i < n; ++i) { final ToggleDialog dlg = allDialogs.get(i); if (dlg.isDialogInDefaultView()) { @@ -191,45 +191,45 @@ /** total Height */ - final int H = mSpltPane.getMultiSplitLayout().getModel().getBounds().getSize().height; + final int h = mSpltPane.getMultiSplitLayout().getModel().getBounds().getSize().height; /** space, that is available for dialogs in default view (after the reconfiguration) */ - final int s2 = H - (numPanels - 1) * DIVIDER_SIZE - sumC; - - final int hp_trig = triggeredBy.getPreferredHeight(); - if (hp_trig <= 0) throw new IllegalStateException(); // Must be positive + final int s2 = h - (numPanels - 1) * DIVIDER_SIZE - sumC; + + final int hpTrig = triggeredBy.getPreferredHeight(); + if (hpTrig <= 0) throw new IllegalStateException(); // Must be positive /** The new dialog gets a fair share */ - final int hn_trig = hp_trig * s2 / (hp_trig + sumP); - triggeredBy.setPreferredSize(new Dimension(Integer.MAX_VALUE, hn_trig)); + final int hnTrig = hpTrig * s2 / (hpTrig + sumP); + triggeredBy.setPreferredSize(new Dimension(Integer.MAX_VALUE, hnTrig)); /** This is remainig for the other default view dialogs */ - final int R = s2 - hn_trig; + final int r = s2 - hnTrig; /** * Take space only from dialogs that are relatively large */ - int D_m = 0; // additional space needed by the small dialogs - int D_p = 0; // available space from the large dialogs - for (int i = 0; i < N; ++i) { + int dm = 0; // additional space needed by the small dialogs + int dp = 0; // available space from the large dialogs + for (int i = 0; i < n; ++i) { final ToggleDialog dlg = allDialogs.get(i); if (dlg.isDialogInDefaultView() && dlg != triggeredBy) { final int ha = dlg.getSize().height; // current - final int h0 = ha * R / sumA; // proportional shrinking - final int he = dlg.getPreferredHeight() * s2 / (sumP + hp_trig); // fair share + final int h0 = ha * r / sumA; // proportional shrinking + final int he = dlg.getPreferredHeight() * s2 / (sumP + hpTrig); // fair share if (h0 < he) { // dialog is relatively small int hn = Math.min(ha, he); // shrink less, but do not grow - D_m += hn - h0; + dm += hn - h0; } else { // dialog is relatively large - D_p += h0 - he; + dp += h0 - he; } } } /** adjust, without changing the sum */ - for (int i = 0; i < N; ++i) { + for (int i = 0; i < n; ++i) { final ToggleDialog dlg = allDialogs.get(i); if (dlg.isDialogInDefaultView() && dlg != triggeredBy) { final int ha = dlg.getHeight(); - final int h0 = ha * R / sumA; - final int he = dlg.getPreferredHeight() * s2 / (sumP + hp_trig); + final int h0 = ha * r / sumA; + final int he = dlg.getPreferredHeight() * s2 / (sumP + hpTrig); if (h0 < he) { int hn = Math.min(ha, he); @@ -238,5 +238,5 @@ int d; try { - d = (h0-he) * D_m / D_p; + d = (h0-he) * dm / dp; } catch (ArithmeticException e) { /* D_p may be zero - nothing wrong with that. */ d = 0; @@ -253,5 +253,5 @@ final List ch = new ArrayList<>(); - for (int i = k; i <= N-1; ++i) { + for (int i = k; i <= n-1; ++i) { if (i != k) { ch.add(new Divider()); @@ -279,5 +279,5 @@ * Hide the Panel, if there is nothing to show */ - if (numPanels == 1 && panels.get(N-1).getComponents().length == 0) { + if (numPanels == 1 && panels.get(n-1).getComponents().length == 0) { parent.setDividerSize(0); this.setVisible(false); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (revision 10001) @@ -212,6 +212,6 @@ } - private Direction determineDirection(int ref_i, Direction ref_direction, int k) { - return determineDirection(ref_i, ref_direction, k, false); + private Direction determineDirection(int refI, Direction refDirection, int k) { + return determineDirection(refI, refDirection, k, false); } @@ -225,23 +225,23 @@ * Let the relation be a route of oneway streets, and someone travels them in the given order. * Direction is FORWARD if it is legal and BACKWARD if it is illegal to do so for the given way. - * @param ref_i way key - * @param ref_direction direction of ref_i + * @param refI way key + * @param refDirection direction of ref_i * @param k successor of ref_i * @param reversed if {@code true} determine reverse direction * @return direction of way {@code k} */ - private Direction determineDirection(int ref_i, final Direction ref_direction, int k, boolean reversed) { - if (ref_i < 0 || k < 0 || ref_i >= members.size() || k >= members.size()) + private Direction determineDirection(int refI, final Direction refDirection, int k, boolean reversed) { + if (refI < 0 || k < 0 || refI >= members.size() || k >= members.size()) return NONE; - if (ref_direction == NONE) + if (refDirection == NONE) return NONE; - final RelationMember m_ref = members.get(ref_i); + final RelationMember mRef = members.get(refI); final RelationMember m = members.get(k); - Way way_ref = null; + Way wayRef = null; Way way = null; - if (m_ref.isWay()) { - way_ref = m_ref.getWay(); + if (mRef.isWay()) { + wayRef = mRef.getWay(); } if (m.isWay()) { @@ -249,5 +249,5 @@ } - if (way_ref == null || way == null) + if (wayRef == null || way == null) return NONE; @@ -255,14 +255,14 @@ List refNodes = new ArrayList<>(); - switch (ref_direction) { + switch (refDirection) { case FORWARD: - refNodes.add(way_ref.lastNode()); + refNodes.add(wayRef.lastNode()); break; case BACKWARD: - refNodes.add(way_ref.firstNode()); + refNodes.add(wayRef.firstNode()); break; case ROUNDABOUT_LEFT: case ROUNDABOUT_RIGHT: - refNodes = way_ref.getNodes(); + refNodes = wayRef.getNodes(); break; } Index: /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 10001) @@ -1013,13 +1013,13 @@ // How many pixels into the 'source' rectangle are we drawing? - int screen_x_offset = target.x - source.x; - int screen_y_offset = target.y - source.y; + int screenXoffset = target.x - source.x; + int screenYoffset = target.y - source.y; // And how many pixels into the image itself does that correlate to? - int img_x_offset = (int) (screen_x_offset * imageXScaling + 0.5); - int img_y_offset = (int) (screen_y_offset * imageYScaling + 0.5); + int imgXoffset = (int) (screenXoffset * imageXScaling + 0.5); + int imgYoffset = (int) (screenYoffset * imageYScaling + 0.5); // Now calculate the other corner of the image that we need // by scaling the 'target' rectangle's dimensions. - int img_x_end = img_x_offset + (int) (target.getWidth() * imageXScaling + 0.5); - int img_y_end = img_y_offset + (int) (target.getHeight() * imageYScaling + 0.5); + int imgXend = imgXoffset + (int) (target.getWidth() * imageXScaling + 0.5); + int imgYend = imgYoffset + (int) (target.getHeight() * imageYScaling + 0.5); if (Main.isDebugEnabled()) { @@ -1029,6 +1029,6 @@ target.x, target.y, target.x + target.width, target.y + target.height, - img_x_offset, img_y_offset, - img_x_end, img_y_end, + imgXoffset, imgYoffset, + imgXend, imgYend, this); if (PROP_FADE_AMOUNT.get() != 0) { Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 10001) @@ -840,6 +840,6 @@ return tr("No gpx selected"); - final long offset_ms = ((long) (timezone.getHours() * 3600 * 1000)) + delta.getMilliseconds(); // in milliseconds - lastNumMatched = matchGpxTrack(dateImgLst, selGpx.data, offset_ms); + final long offsetMs = ((long) (timezone.getHours() * 3600 * 1000)) + delta.getMilliseconds(); // in milliseconds + lastNumMatched = matchGpxTrack(dateImgLst, selGpx.data, offsetMs); return trn("Matched {0} of {1} photo to GPX track.", Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 10001) @@ -91,12 +91,12 @@ Shortcut scPrev = Shortcut.registerShortcut( "geoimage:previous", tr("Geoimage: {0}", tr("Show previous Image")), KeyEvent.VK_PAGE_UP, Shortcut.DIRECT); - final String APREVIOUS = "Previous Image"; + final String previousImage = "Previous Image"; Main.registerActionShortcut(prevAction, scPrev); - btnPrevious.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scPrev.getKeyStroke(), APREVIOUS); - btnPrevious.getActionMap().put(APREVIOUS, prevAction); + btnPrevious.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scPrev.getKeyStroke(), previousImage); + btnPrevious.getActionMap().put(previousImage, prevAction); btnPrevious.setEnabled(false); - final String DELETE_TEXT = tr("Remove photo from layer"); - ImageAction delAction = new ImageAction(COMMAND_REMOVE, ImageProvider.get("dialogs", "delete"), DELETE_TEXT); + final String removePhoto = tr("Remove photo from layer"); + ImageAction delAction = new ImageAction(COMMAND_REMOVE, ImageProvider.get("dialogs", "delete"), removePhoto); JButton btnDelete = new JButton(delAction); btnDelete.setPreferredSize(buttonDim); @@ -104,6 +104,6 @@ "geoimage:deleteimagefromlayer", tr("Geoimage: {0}", tr("Remove photo from layer")), KeyEvent.VK_DELETE, Shortcut.SHIFT); Main.registerActionShortcut(delAction, scDelete); - btnDelete.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scDelete.getKeyStroke(), DELETE_TEXT); - btnDelete.getActionMap().put(DELETE_TEXT, delAction); + btnDelete.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scDelete.getKeyStroke(), removePhoto); + btnDelete.getActionMap().put(removePhoto, delAction); ImageAction delFromDiskAction = new ImageAction(COMMAND_REMOVE_FROM_DISK, @@ -113,8 +113,8 @@ Shortcut scDeleteFromDisk = Shortcut.registerShortcut( "geoimage:deletefilefromdisk", tr("Geoimage: {0}", tr("Delete File from disk")), KeyEvent.VK_DELETE, Shortcut.CTRL_SHIFT); - final String ADELFROMDISK = "Delete image file from disk"; + final String deleteImage = "Delete image file from disk"; Main.registerActionShortcut(delFromDiskAction, scDeleteFromDisk); - btnDeleteFromDisk.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scDeleteFromDisk.getKeyStroke(), ADELFROMDISK); - btnDeleteFromDisk.getActionMap().put(ADELFROMDISK, delFromDiskAction); + btnDeleteFromDisk.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scDeleteFromDisk.getKeyStroke(), deleteImage); + btnDeleteFromDisk.getActionMap().put(deleteImage, delFromDiskAction); ImageAction copyPathAction = new ImageAction(COMMAND_COPY_PATH, ImageProvider.get("copy"), tr("Copy image path")); @@ -123,8 +123,8 @@ Shortcut scCopyPath = Shortcut.registerShortcut( "geoimage:copypath", tr("Geoimage: {0}", tr("Copy image path")), KeyEvent.VK_C, Shortcut.ALT_CTRL_SHIFT); - final String ACOPYPATH = "Copy image path"; + final String copyImage = "Copy image path"; Main.registerActionShortcut(copyPathAction, scCopyPath); - btnCopyPath.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scCopyPath.getKeyStroke(), ACOPYPATH); - btnCopyPath.getActionMap().put(ACOPYPATH, copyPathAction); + btnCopyPath.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scCopyPath.getKeyStroke(), copyImage); + btnCopyPath.getActionMap().put(copyImage, copyPathAction); ImageAction nextAction = new ImageAction(COMMAND_NEXT, ImageProvider.get("dialogs", "next"), tr("Next")); @@ -133,8 +133,8 @@ Shortcut scNext = Shortcut.registerShortcut( "geoimage:next", tr("Geoimage: {0}", tr("Show next Image")), KeyEvent.VK_PAGE_DOWN, Shortcut.DIRECT); - final String ANEXT = "Next Image"; + final String nextImage = "Next Image"; Main.registerActionShortcut(nextAction, scNext); - btnNext.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scNext.getKeyStroke(), ANEXT); - btnNext.getActionMap().put(ANEXT, nextAction); + btnNext.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scNext.getKeyStroke(), nextImage); + btnNext.getActionMap().put(nextImage, nextAction); btnNext.setEnabled(false); Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java (revision 10001) @@ -93,11 +93,11 @@ * and then stop because it has more than 50k nodes. */ - final double buffer_dist = panel.getDistance(); - final double max_area = panel.getArea() / 10000.0 / scale; - final double buffer_y = buffer_dist / 100000.0; - final double buffer_x = buffer_y / scale; + final double bufferDist = panel.getDistance(); + final double maxArea = panel.getArea() / 10000.0 / scale; + final double bufferY = bufferDist / 100000.0; + final double bufferX = bufferY / scale; final int totalTicks = latcnt; // guess if a progress bar might be useful. - final boolean displayProgress = totalTicks > 2000 && buffer_y < 0.01; + final boolean displayProgress = totalTicks > 2000 && bufferY < 0.01; class CalculateDownloadArea extends PleaseWaitRunnable { @@ -126,5 +126,5 @@ return; } - confirmAndDownloadAreas(a, max_area, panel.isDownloadOsmData(), panel.isDownloadGpxData(), + confirmAndDownloadAreas(a, maxArea, panel.isDownloadOsmData(), panel.isDownloadGpxData(), tr("Download from OSM along this track"), progressMonitor); } @@ -147,7 +147,7 @@ tick(); LatLon c = p.getCoor(); - if (previous == null || c.greatCircleDistance(previous) > buffer_dist) { + if (previous == null || c.greatCircleDistance(previous) > bufferDist) { // we add a buffer around the point. - r.setRect(c.lon() - buffer_x, c.lat() - buffer_y, 2 * buffer_x, 2 * buffer_y); + r.setRect(c.lon() - bufferX, c.lat() - bufferY, 2 * bufferX, 2 * bufferY); a.add(new Area(r)); return c; Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 10001) @@ -94,6 +94,6 @@ /* calculate time differences in waypoints */ double time = wpt.time; - boolean wpt_has_link = wpt.attr.containsKey(GpxConstants.META_LINKS); - if (firstTime < 0 && wpt_has_link) { + boolean wptHasLink = wpt.attr.containsKey(GpxConstants.META_LINKS); + if (firstTime < 0 && wptHasLink) { firstTime = time; for (GpxLink oneLink : wpt.getCollection(GpxConstants.META_LINKS)) { @@ -102,5 +102,5 @@ } } - if (wpt_has_link) { + if (wptHasLink) { for (GpxLink oneLink : wpt.getCollection(GpxConstants.META_LINKS)) { String uri = oneLink.uri; Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java (revision 10001) @@ -9,5 +9,5 @@ private static final Map CSS_COLORS = new HashMap<>(); static { - Object[][] CSSCOLORS_INIT = new Object[][] { + for (Object[] pair : new Object[][] { {"aliceblue", 0xf0f8ff}, {"antiquewhite", 0xfaebd7}, @@ -157,6 +157,5 @@ {"yellow", 0xffff00}, {"yellowgreen", 0x9acd32} - }; - for (Object[] pair : CSSCOLORS_INIT) { + }) { CSS_COLORS.put((String) pair[0], new Color((Integer) pair[1])); } Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (revision 10001) @@ -149,21 +149,21 @@ } - float test_float; + float testFloat; try { - test_float = Float.parseFloat(testString); + testFloat = Float.parseFloat(testString); } catch (NumberFormatException e) { return false; } - float prototype_float = Float.parseFloat(prototypeString); + float prototypeFloat = Float.parseFloat(prototypeString); switch (this) { case GREATER_OR_EQUAL: - return test_float >= prototype_float; + return testFloat >= prototypeFloat; case GREATER: - return test_float > prototype_float; + return testFloat > prototypeFloat; case LESS_OR_EQUAL: - return test_float <= prototype_float; + return testFloat <= prototypeFloat; case LESS: - return test_float < prototype_float; + return testFloat < prototypeFloat; default: throw new AssertionError(); Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java (revision 10001) @@ -56,13 +56,13 @@ public final float defaultMajorZIndex; - LineType(String prefix, float default_major_z_index) { + LineType(String prefix, float defaultMajorZindex) { this.prefix = prefix; - this.defaultMajorZIndex = default_major_z_index; - } - } - - protected LineElement(Cascade c, float default_major_z_index, BasicStroke line, Color color, BasicStroke dashesLine, + this.defaultMajorZIndex = defaultMajorZindex; + } + } + + protected LineElement(Cascade c, float defaultMajorZindex, BasicStroke line, Color color, BasicStroke dashesLine, Color dashesBackground, float offset, float realWidth, boolean wayDirectionArrows) { - super(c, default_major_z_index); + super(c, defaultMajorZindex); this.line = line; this.color = color; @@ -104,21 +104,21 @@ private static LineElement createImpl(Environment env, LineType type) { Cascade c = env.mc.getCascade(env.layer); - Cascade c_def = env.mc.getCascade("default"); + Cascade cDef = env.mc.getCascade("default"); Float width; switch (type) { case NORMAL: - width = getWidth(c, WIDTH, getWidth(c_def, WIDTH, null)); + width = getWidth(c, WIDTH, getWidth(cDef, WIDTH, null)); break; case CASING: Float casingWidth = c.get(type.prefix + WIDTH, null, Float.class, true); if (casingWidth == null) { - RelativeFloat rel_casingWidth = c.get(type.prefix + WIDTH, null, RelativeFloat.class, true); - if (rel_casingWidth != null) { - casingWidth = rel_casingWidth.val / 2; + RelativeFloat relCasingWidth = c.get(type.prefix + WIDTH, null, RelativeFloat.class, true); + if (relCasingWidth != null) { + casingWidth = relCasingWidth.val / 2; } } if (casingWidth == null) return null; - width = getWidth(c, WIDTH, getWidth(c_def, WIDTH, null)); + width = getWidth(c, WIDTH, getWidth(cDef, WIDTH, null)); if (width == null) { width = 0f; @@ -162,5 +162,5 @@ case LEFT_CASING: case RIGHT_CASING: - Float baseWidthOnDefault = getWidth(c_def, WIDTH, null); + Float baseWidthOnDefault = getWidth(cDef, WIDTH, null); Float baseWidth = getWidth(c, WIDTH, baseWidthOnDefault); if (baseWidth == null || baseWidth < 2f) { Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java (revision 10001) @@ -93,6 +93,6 @@ BoxTextElement.SIMPLE_NODE_TEXT_ELEMSTYLE); - protected NodeElement(Cascade c, MapImage mapImage, Symbol symbol, float default_major_z_index, RotationAngle rotationAngle) { - super(c, default_major_z_index); + protected NodeElement(Cascade c, MapImage mapImage, Symbol symbol, float defaultMajorZindex, RotationAngle rotationAngle) { + super(c, defaultMajorZindex); this.mapImage = mapImage; this.symbol = symbol; @@ -104,5 +104,5 @@ } - private static NodeElement create(Environment env, float default_major_z_index, boolean allowDefault) { + private static NodeElement create(Environment env, float defaultMajorZindex, boolean allowDefault) { Cascade c = env.mc.getCascade(env.layer); @@ -138,5 +138,5 @@ if (!allowDefault && symbol == null && mapImage == null) return null; - return new NodeElement(c, mapImage, symbol, default_major_z_index, rotationAngle); + return new NodeElement(c, mapImage, symbol, defaultMajorZindex, rotationAngle); } @@ -148,7 +148,7 @@ return null; - Cascade c_def = env.mc.getCascade("default"); - - Float widthOnDefault = c_def.get(keys[ICON_WIDTH_IDX], null, Float.class); + Cascade cDef = env.mc.getCascade("default"); + + Float widthOnDefault = cDef.get(keys[ICON_WIDTH_IDX], null, Float.class); if (widthOnDefault != null && widthOnDefault <= 0) { widthOnDefault = null; @@ -156,5 +156,5 @@ Float widthF = getWidth(c, keys[ICON_WIDTH_IDX], widthOnDefault); - Float heightOnDefault = c_def.get(keys[ICON_HEIGHT_IDX], null, Float.class); + Float heightOnDefault = cDef.get(keys[ICON_HEIGHT_IDX], null, Float.class); if (heightOnDefault != null && heightOnDefault <= 0) { heightOnDefault = null; @@ -189,5 +189,5 @@ private static Symbol createSymbol(Environment env) { Cascade c = env.mc.getCascade(env.layer); - Cascade c_def = env.mc.getCascade("default"); + Cascade cDef = env.mc.getCascade("default"); SymbolShape shape; @@ -216,5 +216,5 @@ return null; - Float sizeOnDefault = c_def.get("symbol-size", null, Float.class); + Float sizeOnDefault = cDef.get("symbol-size", null, Float.class); if (sizeOnDefault != null && sizeOnDefault <= 0) { sizeOnDefault = null; @@ -229,5 +229,5 @@ return null; - Float strokeWidthOnDefault = getWidth(c_def, "symbol-stroke-width", null); + Float strokeWidthOnDefault = getWidth(cDef, "symbol-stroke-width", null); Float strokeWidth = getWidth(c, "symbol-stroke-width", strokeWidthOnDefault); Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java (revision 10001) @@ -35,14 +35,14 @@ public boolean defaultSelectedHandling; - public StyleElement(float major_z_index, float z_index, float object_z_index, boolean isModifier, boolean defaultSelectedHandling) { - this.majorZIndex = major_z_index; - this.zIndex = z_index; - this.objectZIndex = object_z_index; + public StyleElement(float majorZindex, float zIndex, float objectZindex, boolean isModifier, boolean defaultSelectedHandling) { + this.majorZIndex = majorZindex; + this.zIndex = zIndex; + this.objectZIndex = objectZindex; this.isModifier = isModifier; this.defaultSelectedHandling = defaultSelectedHandling; } - protected StyleElement(Cascade c, float default_major_z_index) { - majorZIndex = c.get(MAJOR_Z_INDEX, default_major_z_index, Float.class); + protected StyleElement(Cascade c, float defaultMajorZindex) { + majorZIndex = c.get(MAJOR_Z_INDEX, defaultMajorZindex, Float.class); zIndex = c.get(Z_INDEX, 0f, Float.class); objectZIndex = c.get(OBJECT_Z_INDEX, 0f, Float.class); @@ -86,7 +86,7 @@ return (float) MapPaintSettings.INSTANCE.getDefaultSegmentWidth(); if (relativeTo != null) { - RelativeFloat width_rel = c.get(key, null, RelativeFloat.class, true); - if (width_rel != null) - return relativeTo + width_rel.val; + RelativeFloat widthRel = c.get(key, null, RelativeFloat.class, true); + if (widthRel != null) + return relativeTo + widthRel.val; } } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (revision 10001) @@ -96,12 +96,12 @@ // fill model with colors: Map colorKeyList = new TreeMap<>(); - Map colorKeyList_mappaint = new TreeMap<>(); - Map colorKeyList_layer = new TreeMap<>(); + Map colorKeyListMappaint = new TreeMap<>(); + Map colorKeyListLayer = new TreeMap<>(); for (String key : colorMap.keySet()) { if (key.startsWith("layer ")) { - colorKeyList_layer.put(getName(key), key); + colorKeyListLayer.put(getName(key), key); } else if (key.startsWith("mappaint.")) { // use getName(key)+key, as getName() may be ambiguous - colorKeyList_mappaint.put(getName(key)+key, key); + colorKeyListMappaint.put(getName(key)+key, key); } else { colorKeyList.put(getName(key), key); @@ -109,6 +109,6 @@ } addColorRows(colorMap, colorKeyList); - addColorRows(colorMap, colorKeyList_mappaint); - addColorRows(colorMap, colorKeyList_layer); + addColorRows(colorMap, colorKeyListMappaint); + addColorRows(colorMap, colorKeyListLayer); if (this.colors != null) { this.colors.repaint(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (revision 10001) @@ -78,9 +78,9 @@ if (Main.isPlatformOsx()) { try { - Class Cquaqua = Class.forName("ch.randelshofer.quaqua.QuaquaLookAndFeel"); - Object Oquaqua = Cquaqua.getConstructor((Class[]) null).newInstance((Object[]) null); + Class cquaqua = Class.forName("ch.randelshofer.quaqua.QuaquaLookAndFeel"); + Object oquaqua = cquaqua.getConstructor((Class[]) null).newInstance((Object[]) null); // no exception? Then Go! lafCombo.addItem( - new UIManager.LookAndFeelInfo(((LookAndFeel) Oquaqua).getName(), "ch.randelshofer.quaqua.QuaquaLookAndFeel") + new UIManager.LookAndFeelInfo(((LookAndFeel) oquaqua).getName(), "ch.randelshofer.quaqua.QuaquaLookAndFeel") ); } catch (Exception ex) { Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java (revision 10001) @@ -103,9 +103,9 @@ } - protected static String getLocaleText(String text, String text_context, String defaultText) { + protected static String getLocaleText(String text, String textContext, String defaultText) { if (text == null) { return defaultText; - } else if (text_context != null) { - return trc(text_context, fixPresetString(text)); + } else if (textContext != null) { + return trc(textContext, fixPresetString(text)); } else { return tr(fixPresetString(text)); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java (revision 10001) @@ -52,8 +52,8 @@ } - public void setMember_expression(String member_expression) throws SAXException { + public void setMember_expression(String memberExpression) throws SAXException { try { final SearchAction.SearchSetting searchSetting = new SearchAction.SearchSetting(); - searchSetting.text = member_expression; + searchSetting.text = memberExpression; searchSetting.caseSensitive = true; searchSetting.regexSearch = true; Index: /trunk/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java (revision 10001) @@ -99,6 +99,7 @@ public void setFileFilter(final FileFilter cff) { FilenameFilter filter = new FilenameFilter() { - public boolean accept(File Directory, String fileName) { - return cff.accept(new File(Directory.getAbsolutePath() + fileName)); + @Override + public boolean accept(File directory, String fileName) { + return cff.accept(new File(directory.getAbsolutePath() + fileName)); } }; Index: /trunk/src/org/openstreetmap/josm/io/NmeaReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/NmeaReader.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/io/NmeaReader.java (revision 10001) @@ -173,10 +173,10 @@ try (BufferedReader rd = new BufferedReader(new InputStreamReader(source, StandardCharsets.UTF_8))) { StringBuilder sb = new StringBuilder(1024); - int loopstart_char = rd.read(); + int loopstartChar = rd.read(); ps = new NMEAParserState(); - if (loopstart_char == -1) + if (loopstartChar == -1) //TODO tell user about the problem? return; - sb.append((char) loopstart_char); + sb.append((char) loopstartChar); ps.pDate = "010100"; // TODO date problem while (true) { Index: /trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (revision 10001) @@ -119,20 +119,20 @@ // -- min_lon and min_lat - String min_lon = atts.getValue("min_lon"); - String min_lat = atts.getValue("min_lat"); - String max_lon = atts.getValue("max_lon"); - String max_lat = atts.getValue("max_lat"); - if (min_lon != null && min_lat != null && max_lon != null && max_lat != null) { + String minLonStr = atts.getValue("min_lon"); + String minLatStr = atts.getValue("min_lat"); + String maxLonStr = atts.getValue("max_lon"); + String maxLatStr = atts.getValue("max_lat"); + if (minLonStr != null && minLatStr != null && maxLonStr != null && maxLatStr != null) { double minLon = 0; try { - minLon = Double.parseDouble(min_lon); - } catch (NumberFormatException e) { - throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "min_lon", min_lon)); + minLon = Double.parseDouble(minLonStr); + } catch (NumberFormatException e) { + throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "min_lon", minLonStr)); } double minLat = 0; try { - minLat = Double.parseDouble(min_lat); - } catch (NumberFormatException e) { - throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "min_lat", min_lat)); + minLat = Double.parseDouble(minLatStr); + } catch (NumberFormatException e) { + throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "min_lat", minLatStr)); } current.setMin(new LatLon(minLat, minLon)); @@ -142,13 +142,13 @@ double maxLon = 0; try { - maxLon = Double.parseDouble(max_lon); - } catch (NumberFormatException e) { - throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lon", max_lon)); + maxLon = Double.parseDouble(maxLonStr); + } catch (NumberFormatException e) { + throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lon", maxLonStr)); } double maxLat = 0; try { - maxLat = Double.parseDouble(max_lat); - } catch (NumberFormatException e) { - throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lat", max_lat)); + maxLat = Double.parseDouble(maxLatStr); + } catch (NumberFormatException e) { + throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lat", maxLatStr)); } current.setMax(new LatLon(maxLon, maxLat)); Index: /trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 10001) @@ -61,5 +61,5 @@ private long uploadStartTime; - public String timeLeft(int progress, int list_size) { + public String timeLeft(int progress, int listSize) { long now = System.currentTimeMillis(); long elapsed = now - uploadStartTime; @@ -67,14 +67,14 @@ elapsed = 1; } - double uploads_per_ms = (double) progress / elapsed; - double uploads_left = list_size - progress; - long ms_left = (long) (uploads_left / uploads_per_ms); - long minutes_left = ms_left / MSECS_PER_MINUTE; - long seconds_left = (ms_left / MSECS_PER_SECOND) % SECONDS_PER_MINUTE; - StringBuilder time_left_str = new StringBuilder().append(minutes_left).append(':'); - if (seconds_left < 10) { - time_left_str.append('0'); - } - return time_left_str.append(seconds_left).toString(); + double uploadsPerMs = (double) progress / elapsed; + double uploadsLeft = listSize - progress; + long msLeft = (long) (uploadsLeft / uploadsPerMs); + long minutesLeft = msLeft / MSECS_PER_MINUTE; + long secondsLeft = (msLeft / MSECS_PER_SECOND) % SECONDS_PER_MINUTE; + StringBuilder timeLeftStr = new StringBuilder().append(minutesLeft).append(':'); + if (secondsLeft < 10) { + timeLeftStr.append('0'); + } + return timeLeftStr.append(secondsLeft).toString(); } @@ -94,5 +94,5 @@ for (OsmPrimitive osm : primitives) { int progress = progressMonitor.getTicks(); - String time_left_str = timeLeft(progress, primitives.size()); + String timeLeftStr = timeLeft(progress, primitives.size()); String msg = ""; switch(OsmPrimitiveType.from(osm)) { @@ -106,5 +106,5 @@ progress, primitives.size(), - time_left_str, + timeLeftStr, osm.getName() == null ? osm.getId() : osm.getName(), osm.getId())); Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (revision 10001) @@ -177,6 +177,7 @@ Map headers = new HashMap<>(); - int k = 0, MAX_HEADERS = 20; - while (k < MAX_HEADERS) { + int k = 0; + int maxHeaders = 20; + while (k < maxHeaders) { get = in.readLine(); if (get == null) break; Index: /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 10001) @@ -80,49 +80,49 @@ protected static final Collection DEPRECATED_PLUGINS; static { - String IN_CORE = tr("integrated into main program"); + String inCore = tr("integrated into main program"); DEPRECATED_PLUGINS = Arrays.asList(new DeprecatedPlugin[] { - new DeprecatedPlugin("mappaint", IN_CORE), - new DeprecatedPlugin("unglueplugin", IN_CORE), - new DeprecatedPlugin("lang-de", IN_CORE), - new DeprecatedPlugin("lang-en_GB", IN_CORE), - new DeprecatedPlugin("lang-fr", IN_CORE), - new DeprecatedPlugin("lang-it", IN_CORE), - new DeprecatedPlugin("lang-pl", IN_CORE), - new DeprecatedPlugin("lang-ro", IN_CORE), - new DeprecatedPlugin("lang-ru", IN_CORE), - new DeprecatedPlugin("ewmsplugin", IN_CORE), - new DeprecatedPlugin("ywms", IN_CORE), - new DeprecatedPlugin("tways-0.2", IN_CORE), - new DeprecatedPlugin("geotagged", IN_CORE), + new DeprecatedPlugin("mappaint", inCore), + new DeprecatedPlugin("unglueplugin", inCore), + new DeprecatedPlugin("lang-de", inCore), + new DeprecatedPlugin("lang-en_GB", inCore), + new DeprecatedPlugin("lang-fr", inCore), + new DeprecatedPlugin("lang-it", inCore), + new DeprecatedPlugin("lang-pl", inCore), + new DeprecatedPlugin("lang-ro", inCore), + new DeprecatedPlugin("lang-ru", inCore), + new DeprecatedPlugin("ewmsplugin", inCore), + new DeprecatedPlugin("ywms", inCore), + new DeprecatedPlugin("tways-0.2", inCore), + new DeprecatedPlugin("geotagged", inCore), new DeprecatedPlugin("landsat", tr("replaced by new {0} plugin", "lakewalker")), - new DeprecatedPlugin("namefinder", IN_CORE), - new DeprecatedPlugin("waypoints", IN_CORE), - new DeprecatedPlugin("slippy_map_chooser", IN_CORE), + new DeprecatedPlugin("namefinder", inCore), + new DeprecatedPlugin("waypoints", inCore), + new DeprecatedPlugin("slippy_map_chooser", inCore), new DeprecatedPlugin("tcx-support", tr("replaced by new {0} plugin", "dataimport")), - new DeprecatedPlugin("usertools", IN_CORE), - new DeprecatedPlugin("AgPifoJ", IN_CORE), - new DeprecatedPlugin("utilsplugin", IN_CORE), - new DeprecatedPlugin("ghost", IN_CORE), - new DeprecatedPlugin("validator", IN_CORE), - new DeprecatedPlugin("multipoly", IN_CORE), - new DeprecatedPlugin("multipoly-convert", IN_CORE), - new DeprecatedPlugin("remotecontrol", IN_CORE), - new DeprecatedPlugin("imagery", IN_CORE), - new DeprecatedPlugin("slippymap", IN_CORE), - new DeprecatedPlugin("wmsplugin", IN_CORE), - new DeprecatedPlugin("ParallelWay", IN_CORE), + new DeprecatedPlugin("usertools", inCore), + new DeprecatedPlugin("AgPifoJ", inCore), + new DeprecatedPlugin("utilsplugin", inCore), + new DeprecatedPlugin("ghost", inCore), + new DeprecatedPlugin("validator", inCore), + new DeprecatedPlugin("multipoly", inCore), + new DeprecatedPlugin("multipoly-convert", inCore), + new DeprecatedPlugin("remotecontrol", inCore), + new DeprecatedPlugin("imagery", inCore), + new DeprecatedPlugin("slippymap", inCore), + new DeprecatedPlugin("wmsplugin", inCore), + new DeprecatedPlugin("ParallelWay", inCore), new DeprecatedPlugin("dumbutils", tr("replaced by new {0} plugin", "utilsplugin2")), - new DeprecatedPlugin("ImproveWayAccuracy", IN_CORE), + new DeprecatedPlugin("ImproveWayAccuracy", inCore), new DeprecatedPlugin("Curves", tr("replaced by new {0} plugin", "utilsplugin2")), new DeprecatedPlugin("epsg31287", tr("replaced by new {0} plugin", "proj4j")), new DeprecatedPlugin("licensechange", tr("no longer required")), - new DeprecatedPlugin("restart", IN_CORE), - new DeprecatedPlugin("wayselector", IN_CORE), + new DeprecatedPlugin("restart", inCore), + new DeprecatedPlugin("wayselector", inCore), new DeprecatedPlugin("openstreetbugs", tr("replaced by new {0} plugin", "notes")), new DeprecatedPlugin("nearclick", tr("no longer required")), - new DeprecatedPlugin("notes", IN_CORE), - new DeprecatedPlugin("mirrored_download", IN_CORE), - new DeprecatedPlugin("ImageryCache", IN_CORE), + new DeprecatedPlugin("notes", inCore), + new DeprecatedPlugin("mirrored_download", inCore), + new DeprecatedPlugin("ImageryCache", inCore), new DeprecatedPlugin("commons-imaging", tr("replaced by new {0} plugin", "apache-commons")), new DeprecatedPlugin("missingRoads", tr("replaced by new {0} plugin", "ImproveOsm")), Index: /trunk/src/org/openstreetmap/josm/tools/Diff.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 10001) @@ -177,5 +177,5 @@ for (int c = 1;; ++c) { int d; /* Active diagonal. */ - boolean big_snake = false; + boolean bigSnake = false; /* Extend the top-down search by an edit step in each diagonal. */ @@ -204,5 +204,5 @@ } if (x - oldx > SNAKE_LIMIT) { - big_snake = true; + bigSnake = true; } fd[fdiagoff + d] = x; @@ -238,5 +238,5 @@ } if (oldx - x > SNAKE_LIMIT) { - big_snake = true; + bigSnake = true; } bd[bdiagoff + d] = x; @@ -255,5 +255,5 @@ of changes, the algorithm is linear in the file size. */ - if (c > 200 && big_snake && heuristic) { + if (c > 200 && bigSnake && heuristic) { int best = 0; int bestpos = -1; @@ -618,9 +618,9 @@ */ int[] equivCount() { - int[] equiv_count = new int[equivMax]; + int[] equivCount = new int[equivMax]; for (int i = 0; i < bufferedLines; ++i) { - ++equiv_count[equivs[i]]; - } - return equiv_count; + ++equivCount[equivs[i]]; + } + return equivCount; } @@ -853,37 +853,37 @@ void shift_boundaries(FileData f) { final boolean[] changed = changedFlag; - final boolean[] other_changed = f.changedFlag; + final boolean[] otherChanged = f.changedFlag; int i = 0; int j = 0; - int i_end = bufferedLines; + int iEnd = bufferedLines; int preceding = -1; - int other_preceding = -1; + int otherPreceding = -1; for (;;) { - int start, end, other_start; + int start, end, otherStart; /* Scan forwards to find beginning of another run of changes. Also keep track of the corresponding point in the other file. */ - while (i < i_end && !changed[1+i]) { - while (other_changed[1+j++]) { + while (i < iEnd && !changed[1+i]) { + while (otherChanged[1+j++]) { /* Non-corresponding lines in the other file will count as the preceding batch of changes. */ - other_preceding = j; + otherPreceding = j; } i++; } - if (i == i_end) { + if (i == iEnd) { break; } start = i; - other_start = j; + otherStart = j; for (;;) { /* Now find the end of this run of changes. */ - while (i < i_end && changed[1+i]) { + while (i < iEnd && changed[1+i]) { i++; } @@ -899,6 +899,6 @@ Only because the previous run was shifted here. */ - if (end != i_end && equivs[start] == equivs[end] && !other_changed[1+j] - && !((preceding >= 0 && start == preceding) || (other_preceding >= 0 && other_start == other_preceding))) { + if (end != iEnd && equivs[start] == equivs[end] && !otherChanged[1+j] + && !((preceding >= 0 && start == preceding) || (otherPreceding >= 0 && otherStart == otherPreceding))) { changed[1+end++] = true; changed[1+start++] = false; @@ -914,5 +914,5 @@ preceding = i; - other_preceding = j; + otherPreceding = j; } } Index: /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 10000) +++ /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 10001) @@ -753,6 +753,7 @@ extensions = new String[] {".png", ".svg"}; } - final int ARCHIVE = 0, LOCAL = 1; - for (int place : new Integer[] {ARCHIVE, LOCAL}) { + final int typeArchive = 0; + final int typeLocal = 1; + for (int place : new Integer[] {typeArchive, typeLocal}) { for (String ext : extensions) { @@ -777,5 +778,5 @@ switch (place) { - case ARCHIVE: + case typeArchive: if (archive != null) { ir = getIfAvailableZip(fullName, archive, inArchiveDir, type); @@ -786,5 +787,5 @@ } break; - case LOCAL: + case typeLocal: // getImageUrl() does a ton of "stat()" calls and gets expensive // and redundant when you have a whole ton of objects. So, @@ -924,6 +925,6 @@ } } else { - final String fn_md5 = Utils.md5Hex(fn); - url = b + fn_md5.substring(0, 1) + '/' + fn_md5.substring(0, 2) + "/" + fn; + final String fnMD5 = Utils.md5Hex(fn); + url = b + fnMD5.substring(0, 1) + '/' + fnMD5.substring(0, 2) + "/" + fn; } result = getIfAvailableHttp(url, type);