Index: /trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- /trunk/src/org/openstreetmap/josm/Main.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/Main.java (revision 6296) @@ -672,5 +672,4 @@ // try { - //CoordinateFormat format = CoordinateFormat.valueOf(Main.pref.get("coordinates")); CoordinateFormat.setCoordinateFormat(CoordinateFormat.valueOf(Main.pref.get("coordinates"))); } catch (IllegalArgumentException iae) { Index: /trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (revision 6296) @@ -42,4 +42,7 @@ public final class CreateCircleAction extends JosmAction { + /** + * Constructs a new {@code CreateCircleAction}. + */ public CreateCircleAction() { super(tr("Create Circle"), "createcircle", tr("Create a circle from three selected nodes."), @@ -179,7 +182,4 @@ cmds.add(new DeleteCommand(n1)); } - - // or insert it - // wayToAdd.nodes.add((numberOfNodesInCircle - 1) / 2, n1); } Index: /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 6296) @@ -36,5 +36,5 @@ public static final ArrayList exporters; - // add some file types only if the relevant classes are there; + // add some file types only if the relevant classes are there. // this gives us the option to painlessly drop them from the .jar // and build JOSM versions without support for these formats Index: /trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (revision 6296) @@ -94,6 +94,4 @@ private static void pruneSuccsAndReverse(List is) { - //if (is.size() < 2) return; - HashSet is2 = new HashSet(); for (int i : is) { Index: /trunk/src/org/openstreetmap/josm/actions/MoveAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/MoveAction.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/actions/MoveAction.java (revision 6296) @@ -40,5 +40,5 @@ } else if (dir == Direction.LEFT) { directiontext = tr("left"); - } else { //dir == Direction.RIGHT) { + } else { directiontext = tr("right"); } Index: /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 6296) @@ -383,5 +383,4 @@ // rotate back and log the change final Collection commands = new LinkedList(); - // OrthogonalizeAction.rememberMovements.clear(); for (Node n: allNodes) { EastNorth tmp = new EastNorth(nX.get(n), nY.get(n)); @@ -448,7 +447,5 @@ // sum up segments EastNorth h = new EastNorth(0.,0.); - //double lh = EN.abs(h); EastNorth v = new EastNorth(0.,0.); - //double lv = EN.abs(v); for (int i = 0; i < nSeg; ++i) { EastNorth segment = EN.diff(en[i+1], en[i]); Index: /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 6296) @@ -228,5 +228,4 @@ // Segment cannot be simplified - try shorter segments buildSimplifiedNodeList(wnew, from, imax,threshold,simplifiedNodes); - //simplifiedNodes.add(wnew.get(imax)); buildSimplifiedNodeList(wnew, imax, to, threshold,simplifiedNodes); } else { Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 6296) @@ -1613,6 +1613,4 @@ hdg-=360; } - //fixed=true; - //absoluteFix=true; customBaseHeading=hdg; } Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 6296) @@ -207,5 +207,4 @@ protected void updateEnabledState() { setEnabled(getEditLayer() != null); - // setEnabled(Main.main.getActiveLayer() instanceof OsmDataLayer); } Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 6296) @@ -944,7 +944,4 @@ osm = nearest; - // Point p = e.getPoint(); -// updateKeyModifiers(e); // cycleSetup called only after updateModifiers ! - if (!(alt || multipleMatchesParameter)) { // no real cycling, just one element in cycle list Index: /trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (revision 6296) @@ -30,5 +30,5 @@ // The old role private String oldRole; - // Old value of modified; + // Old value of modified private Boolean oldModified; Index: /trunk/src/org/openstreetmap/josm/command/ScaleCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/ScaleCommand.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/command/ScaleCommand.java (revision 6296) @@ -69,5 +69,4 @@ @Override protected void transformNodes() { - // scalingFactor = 2.0; for (Node n : nodes) { EastNorth oldEastNorth = oldStates.get(n).eastNorth; Index: /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 6296) @@ -484,5 +484,4 @@ if (item.getNodeType() != Node.ELEMENT_NODE) continue; String elementName = item.getNodeName(); - //if (monitor!=null) monitor.indeterminateSubTask(elementName); Element elem = (Element) item; @@ -684,5 +683,5 @@ /** - * subsititute ${expression} = expression evaluated by JavaScript + * substitute ${expression} = expression evaluated by JavaScript */ private String evalVars(String s) { @@ -691,11 +690,10 @@ StringBuffer sb = new StringBuffer(); while (mr.find()) { - try { - String result = engine.eval(mr.group(1)).toString(); - mr.appendReplacement(sb, result); - } catch (ScriptException ex) { - log("Error: Can not evaluate expression %s : %s", mr.group(1), ex.getMessage()); - //mr.appendReplacement(sb, mr.group(0)); - } + try { + String result = engine.eval(mr.group(1)).toString(); + mr.appendReplacement(sb, result); + } catch (ScriptException ex) { + log("Error: Can not evaluate expression %s : %s", mr.group(1), ex.getMessage()); + } } mr.appendTail(sb); Index: /trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java (revision 6296) @@ -63,5 +63,4 @@ static long lon2x(double lon) { - //return Math.round((lon + 180.0) * QuadBuckets.WORLD_PARTS / 360.0)-1; long ret = (long)((lon + 180.0) * WORLD_PARTS / 360.0); if (ret == WORLD_PARTS) { @@ -72,5 +71,4 @@ static long lat2y(double lat) { - //return Math.round((lat + 90.0) * QuadBuckets.WORLD_PARTS / 180.0)-1; long ret = (long)((lat + 90.0) * WORLD_PARTS / 180.0); if (ret == WORLD_PARTS) { Index: /trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 6296) @@ -148,5 +148,5 @@ * PN^2 = (Axp + Byp + C)^2 / RS^2 that is the distance from P to the line * - * so if PN^2 is less than PNmin^2 (initialized to tolerance) we can reject the line; + * so if PN^2 is less than PNmin^2 (initialized to tolerance) we can reject the line * otherwise... determine if the projected poijnt lies within the bounds of the line: PR^2 - * PN^2 <= RS^2 and PS^2 - PN^2 <= RS^2 Index: /trunk/src/org/openstreetmap/josm/data/imagery/GeorefImage.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/GeorefImage.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/data/imagery/GeorefImage.java (revision 6296) @@ -148,7 +148,5 @@ } long freeMem = Runtime.getRuntime().maxMemory() - Runtime.getRuntime().totalMemory(); - //Main.debug("Free Memory: "+ (freeMem/1024/1024) +" MB"); // Notice that this value can get negative due to integer overflows - //Main.debug("Img Size: "+ (width*height*3/1024/1024) +" MB"); int multipl = alphaChannel ? 4 : 3; Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 6296) @@ -80,12 +80,8 @@ protected void mergePrimitive(OsmPrimitive source, Collection candidates) { if (!source.isNew() ) { - // try to merge onto a matching primitive with the same - // defined id + // try to merge onto a matching primitive with the same defined id // if (mergeById(source)) return; - //if (!source.isVisible()) - // ignore it - // return; } else { // ignore deleted primitives from source @@ -101,6 +97,5 @@ if (target.hasEqualSemanticAttributes(source)) { mergedMap.put(source.getPrimitiveId(), target.getPrimitiveId()); - // copy the technical attributes from other - // version + // copy the technical attributes from other version target.setVisible(source.isVisible()); target.setUser(source.getUser()); Index: /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 6296) @@ -1127,5 +1127,4 @@ if (!isNew() && id != other.id) return false; - // if (isIncomplete() && ! other.isIncomplete() || !isIncomplete() && other.isIncomplete()) if (isIncomplete() ^ other.isIncomplete()) // exclusive or operator for performance (see #7159) return false; Index: /trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 6296) @@ -506,5 +506,4 @@ QBLevel next; next = q.nextContentNode(); - //if (consistency_testing && (orig == next)) if (orig == next) { abort("got same leaf back leaf: " + q.isLeaf()); Index: /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 6296) @@ -249,7 +249,4 @@ // equal semantics is valid for subclasses like {@link HistoryOsmNode} etc. too. // So, don't enforce equality of class. - // - // if (getClass() != obj.getClass()) - // return false; HistoryOsmPrimitive other = (HistoryOsmPrimitive) obj; if (id != other.id) Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 6296) @@ -498,5 +498,4 @@ } else { TexturePaint texture = new TexturePaint(fillImage.getImage(), - // new Rectangle(polygon.xpoints[0], polygon.ypoints[0], fillImage.getWidth(), fillImage.getHeight())); new Rectangle(0, 0, fillImage.getWidth(), fillImage.getHeight())); g.setPaint(texture); @@ -511,7 +510,5 @@ if (text != null && isShowNames()) { - /* - * abort if we can't compose the label to be rendered - */ + // abort if we can't compose the label to be rendered if (text.labelCompositionStrategy == null) return; String name = text.labelCompositionStrategy.compose(osm); @@ -522,5 +519,4 @@ Rectangle2D nb = fontMetrics.getStringBounds(name, g); // if slow, approximate by strlen()*maxcharbounds(font) - // Point2D c = getCentroid(polygon); // Using the Centroid is Nicer for buildings like: +--------+ // but this needs to be fast. As most houses are | 42 | @@ -528,10 +524,4 @@ // will have to do. ++ // Centroids are not optimal either, just imagine a U-shaped house. - // Point2D c = new Point2D.Double(pb.x + pb.width / 2.0, pb.y + pb.height / 2.0); - // Rectangle2D.Double centeredNBounds = - // new Rectangle2D.Double(c.getX() - nb.getWidth()/2, - // c.getY() - nb.getHeight()/2, - // nb.getWidth(), - // nb.getHeight()); Rectangle centeredNBounds = new Rectangle(pb.x + (int)((pb.width - nb.getWidth())/2.0), Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (revision 6296) @@ -488,6 +488,6 @@ } } - } /* for(i = ... */ - } /* while(joined) */ + } + } if (nodes == null) { @@ -497,5 +497,5 @@ result.add(new JoinedWay(nodes, wayIds, selected)); - } /* while(left != 0) */ + } return result; @@ -575,13 +575,5 @@ return innerWays; } -/* - public List getInnerPolygons() { - return innerPolygons; - } - - public List getOuterPolygons() { - return outerPolygons; - } -*/ + public List getCombinedPolygons() { return combinedPolygons; Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java (revision 6296) @@ -186,9 +186,5 @@ return test(key, value).remove(key); } -/* - DeprecationCheck testAndRemove(String key) { - return test(key).remove(key); - } -*/ + DeprecationCheck alternative(String key, String value) { alternatives.add(new Tag(key, value)); Index: /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 6296) @@ -140,5 +140,4 @@ public void run() { lg.setText(fixImageLinks(content)); - // lg.moveCaretPosition(0); } }); Index: /trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 6296) @@ -199,5 +199,5 @@ setPartiallyIdentified(userName); } else { - // same name in the preferences as JOSM already knows about; + // same name in the preferences as JOSM already knows about. // keep the state, be it partially or fully identified } Index: /trunk/src/org/openstreetmap/josm/gui/MapFrame.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 6296) @@ -598,6 +598,7 @@ } - /* - * Remove panel from top of MapView by class */ + /** + * Remove panel from top of MapView by class + */ public void removeTopPanel(Class type) { int n = leftPanel.getComponentCount(); @@ -607,5 +608,4 @@ leftPanel.remove(i); leftPanel.doLayout(); - // repaint(); return; } Index: /trunk/src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 6296) @@ -322,7 +322,7 @@ oldMousePos = ms.mousePos; } catch (ConcurrentModificationException x) { - //x.printStackTrace(); + Main.warn(x); } catch (NullPointerException x) { - //x.printStackTrace(); + Main.warn(x); } finally { if (ds != null) { Index: /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (revision 6296) @@ -38,5 +38,4 @@ public class MenuScroller { - //private JMenu menu; private JPopupMenu menu; private Component[] menuItems; Index: /trunk/src/org/openstreetmap/josm/gui/MultiSplitLayout.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MultiSplitLayout.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/MultiSplitLayout.java (revision 6296) @@ -19,6 +19,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - -//package org.jdesktop.swingx; package org.openstreetmap.josm.gui; @@ -70,8 +68,7 @@ * is changed, all PropertyChangeListeners are fired. * - * @author Hans Muller + * @author Hans Muller - SwingX * @see MultiSplitPane */ - public class MultiSplitLayout implements LayoutManager { private final Map childMap = new HashMap(); Index: /trunk/src/org/openstreetmap/josm/gui/MultiSplitPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MultiSplitPane.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/MultiSplitPane.java (revision 6296) @@ -19,6 +19,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - -//package org.jdesktop.swingx; package org.openstreetmap.josm.gui; @@ -45,5 +43,5 @@ * is changed, all PropertyChangeListeners are fired. * - * @author Hans Muller + * @author Hans Muller - SwingX */ public class MultiSplitPane extends JPanel { Index: /trunk/src/org/openstreetmap/josm/gui/actionsupport/AlignImageryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/actionsupport/AlignImageryPanel.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/actionsupport/AlignImageryPanel.java (revision 6296) @@ -65,5 +65,4 @@ add(closeButton, GBC.std(3,1).anchor(GBC.EAST)); } -// setBorder(new EmptyBorder(12, 12, 12, 12)); setBorder(new CompoundBorder(new EtchedBorder(EtchedBorder.LOWERED), new EmptyBorder(12, 12, 12, 12))); setBackground(new Color(224, 236, 249)); @@ -79,4 +78,3 @@ } } - } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 6296) @@ -170,8 +170,4 @@ })); - // activate DEL in the list of relations - //displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE,0), "deleteRelation"); - //displaylist.getActionMap().put("deleteRelation", deleteAction); - InputMapUtils.unassignCtrlShiftUpDown(displaylist, JComponent.WHEN_FOCUSED); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (revision 6296) @@ -110,5 +110,5 @@ } - // update the global changeset cache with the downloaded changesets; + // update the global changeset cache with the downloaded changesets. // this will trigger change events which views are listening to. They // will update their views accordingly. Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 6296) @@ -793,5 +793,4 @@ tr("Add all objects selected in the current dataset before the first member")); putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copystartright")); - // putValue(NAME, tr("Add Selected")); refreshEnabled(); } @@ -821,5 +820,4 @@ putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset after the last member")); putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copyendright")); - // putValue(NAME, tr("Add Selected")); refreshEnabled(); } @@ -850,5 +848,4 @@ tr("Add all objects selected in the current dataset before the first selected member")); putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copybeforecurrentright")); - // putValue(NAME, tr("Add Selected")); refreshEnabled(); } @@ -887,5 +884,4 @@ tr("Add all objects selected in the current dataset after the last selected member")); putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copyaftercurrentright")); - // putValue(NAME, tr("Add Selected")); refreshEnabled(); } @@ -922,5 +918,4 @@ putValue(SHORT_DESCRIPTION, tr("Remove all members referring to one of the selected objects")); putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "deletemembers")); - // putValue(NAME, tr("Remove Selected")); updateEnabledState(); } @@ -1068,5 +1063,4 @@ String tooltip = tr("Move the currently selected members up"); putValue(SMALL_ICON, ImageProvider.get("dialogs", "moveup")); - // putValue(NAME, tr("Move Up")); Shortcut sc = Shortcut.registerShortcut("relationeditor:moveup", tr("Relation Editor: Move Up"), KeyEvent.VK_UP, Shortcut.ALT); @@ -1091,5 +1085,4 @@ String tooltip = tr("Move the currently selected members down"); putValue(SMALL_ICON, ImageProvider.get("dialogs", "movedown")); - // putValue(NAME, tr("Move Down")); Shortcut sc = Shortcut.registerShortcut("relationeditor:movedown", tr("Relation Editor: Move Down"), KeyEvent.VK_DOWN, Shortcut.ALT); @@ -1447,5 +1440,4 @@ putValue(SHORT_DESCRIPTION, tr("Add an empty tag")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "add")); - // putValue(NAME, tr("Cancel")); setEnabled(true); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java (revision 6296) @@ -28,5 +28,4 @@ col.setResizable(true); col.setPreferredWidth(300); - // col.setCellRenderer(new OsmPrimitivRenderer()); col.setCellRenderer(new MemberTableMemberCellRenderer()); addColumn(col); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (revision 6296) @@ -34,5 +34,4 @@ this.value = (WayConnectionType) value; renderForeground(isSelected); - //setText(value.toString()); setToolTipText(((WayConnectionType)value).getToolTip()); renderBackground(getModel(table), null, isSelected); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 6296) @@ -660,40 +660,4 @@ /** - * get a node we can link against when sorting members - * @param element the element we want to link against - * @param linked_element already linked against element - * @return the unlinked node if element is a way, the node itself if element is a node, null otherwise - */ - /*private static Node getUnusedNode(RelationMember element, RelationMember linked_element) - { - Node result = null; - - if (element.isWay()) { - Way w = element.getWay(); - if (linked_element.isWay()) { - Way x = linked_element.getWay(); - if ((w.firstNode() == x.firstNode()) || (w.firstNode() == x.lastNode())) { - result = w.lastNode(); - } else { - result = w.firstNode(); - } - } else if (linked_element.isNode()) { - Node m = linked_element.getNode(); - if (w.firstNode() == m) { - result = w.lastNode(); - } else { - result = w.firstNode(); - } - } - } else if (element.isNode()) { - Node n = element.getNode(); - result = n; - } - - return result; - }*/ - - - /** * Sort the selected relation members by the way they are linked. */ @@ -770,14 +734,3 @@ } } - - // private static void unconnectPreviousLink(List con, int beg, boolean backward){ - // int i = beg; - // while(true){ - // WayConnectionType t = con.get(i--); - // t.isOnewayOppositeConnected = false; - // if(backward && t.isOnewayLoopBackwardPart) break; - // if(!backward && t.isOnewayLoopForwardPart) break; - // } - // } - } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java (revision 6296) @@ -100,24 +100,4 @@ remaining.addAll(map.ways.keySet()); - - /* - * Clean up the maps, i.e. remove nodes from roundabouts and dead ends that - * cannot be used in future. (only for performance) - */ - // Iterator>> it = map.nodes.entrySet().iterator(); - // while (it.hasNext()) { - // Map.Entry> nodeLinks = it.next(); - // - // if (nodeLinks.getValue().size() < 2) { - // if (nodeLinks.getValue().size() != 1) throw new AssertionError(); - // - // Integer d_way = nodeLinks.getValue().iterator().next(); - // TreeSet d_way_nodes = map.ways.get(d_way); - // d_way_nodes.remove(nodeLinks.getKey()); - // - // it.remove(); - // continue; - // } - // } } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (revision 6296) @@ -167,9 +167,8 @@ wct.isOnewayLoopForwardPart = true; } - if (dirFW == NONE && dirBW == NONE) { //Not connected to previous - // unconnectPreviousLink(con, i, true); - // unconnectPreviousLink(con, i, false); + // Not connected to previous + if (dirFW == NONE && dirBW == NONE) { wct.linkPrev = false; - if (RelationSortUtils.isOneway(m)){ + if (RelationSortUtils.isOneway(m)) { wct.isOnewayHead = true; lastForwardWay = i-1; Index: /trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 6296) @@ -210,5 +210,4 @@ class RemoveAction extends AbstractAction implements ListSelectionListener{ public RemoveAction() { - //putValue(NAME, tr("Remove")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); putValue(SHORT_DESCRIPTION, tr("Remove the currently selected bookmarks")); @@ -237,5 +236,4 @@ class RenameAction extends AbstractAction implements ListSelectionListener{ public RenameAction() { - //putValue(NAME, tr("Remove")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit")); putValue(SHORT_DESCRIPTION, tr("Rename the currently selected bookmark")); Index: /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 6296) @@ -339,7 +339,4 @@ public static boolean isAutorunEnabled() { - //String autorun=Main.pref.get("download.autorun",null); - //boolean expert=ExpertToggleAction.isExpert(); - //return (autorun==null && !expert) || "true".equals(autorun) ; return Main.pref.getBoolean("download.autorun",false); } @@ -352,6 +349,5 @@ /** - * Replies the currently selected download area. May be null, if no download area is selected - * yet. + * Replies the currently selected download area. May be null, if no download area is selected yet. */ public Bounds getSelectedDownloadArea() { Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 6296) @@ -471,5 +471,4 @@ class ReloadAction extends AbstractAction { public ReloadAction() { - //putValue(NAME, tr("Reload")); putValue(SHORT_DESCRIPTION, tr("Reload the current help page")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh")); @@ -487,5 +486,4 @@ this.history = history; history.addObserver(this); - //putValue(NAME, tr("Back")); putValue(SHORT_DESCRIPTION, tr("Go to the previous page")); putValue(SMALL_ICON, ImageProvider.get("help", "previous")); @@ -508,5 +506,4 @@ this.history = history; history.addObserver(this); - //putValue(NAME, tr("Forward")); putValue(SHORT_DESCRIPTION, tr("Go to the next page")); putValue(SMALL_ICON, ImageProvider.get("help", "next")); @@ -526,5 +523,4 @@ class HomeAction extends AbstractAction { public HomeAction() { - //putValue(NAME, tr("Home")); putValue(SHORT_DESCRIPTION, tr("Go to the JOSM help home page")); putValue(SMALL_ICON, ImageProvider.get("help", "home")); Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java (revision 6296) @@ -119,5 +119,5 @@ if(ret == null) return ret; - ret = "/" + ret + Main.pref.get("help.pathhelp", "/Help").replaceAll("^\\/+", ""); // remove leading /; + ret = "/" + ret + Main.pref.get("help.pathhelp", "/Help").replaceAll("^\\/+", ""); // remove leading / return ret.replaceAll("\\/+", "\\/"); // collapse sequences of // } Index: /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 6296) @@ -302,5 +302,4 @@ class RefreshAction extends AbstractAction { public RefreshAction() { - //putValue(NAME, tr("Reload")); putValue(SHORT_DESCRIPTION, tr("Load the list of your open changesets from the server")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh")); @@ -320,5 +319,4 @@ class CloseChangesetAction extends AbstractAction implements ItemListener{ public CloseChangesetAction() { - //putValue(NAME, tr("Close")); putValue(SMALL_ICON, ImageProvider.get("closechangeset")); putValue(SHORT_DESCRIPTION, tr("Close the currently selected open changeset")); Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 6296) @@ -497,9 +497,4 @@ @Override - public void windowOpened(WindowEvent e) { - //startUserInput(); - } - - @Override public void windowActivated(WindowEvent arg0) { if (tpConfigPanels.getSelectedIndex() == 0) { Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 6296) @@ -383,7 +383,6 @@ Area a = data.getDataSourceArea(); - // copy the merged layer's data source info; - // only add source rectangles if they are not contained in the - // layer already. + // copy the merged layer's data source info. + // only add source rectangles if they are not contained in the layer already. for (DataSource src : from.dataSources) { if (a == null || !a.contains(src.bounds.asRect())) { Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6296) @@ -1,6 +1,3 @@ // License: GPL. See LICENSE file for details. -// Copyright 2007 by Christian Gallioz (aka khris78) -// Parts of code from Geotagged plugin (by Rob Neild) - package org.openstreetmap.josm.gui.layer.geoimage; @@ -81,5 +78,6 @@ import org.xml.sax.SAXException; -/** This class displays the window to select the GPX file and the offset (timezone + delta). +/** + * This class displays the window to select the GPX file and the offset (timezone + delta). * Then it correlates the images of the layer with that GPX file. */ @@ -541,12 +539,4 @@ cbShowThumbs = new JCheckBox(tr("Show Thumbnail images on the map"), ticked); cbShowThumbs.setEnabled(!yLayer.thumbsLoaded); - /*cbShowThumbs.addItemListener(new ItemListener() { - public void itemStateChanged(ItemEvent e) { - if (e.getStateChange() == ItemEvent.SELECTED) { - yLayer.loadThumbs(); - } else { - } - } - });*/ int y=0; @@ -1051,13 +1041,4 @@ timezone = (double)Math.round(tz * 2)/2; // hours, rounded to one decimal place delta = Math.round(diff - timezone*60*60); // seconds - - /*Main.debug("phto " + firstExifDate); - Main.debug("gpx " + firstGPXDate); - Main.debug("diff " + diff); - Main.debug("difh " + diffInH); - Main.debug("days " + dayOffset); - Main.debug("time " + tz); - Main.debug("fix " + timezone); - Main.debug("offt " + delta);*/ tfTimezone.getDocument().removeDocumentListener(statusBarUpdater); Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 6296) @@ -1,6 +1,3 @@ // License: GPL. See LICENSE file for details. -// Copyright 2007 by Christian Gallioz (aka khris78) -// Parts of code from Geotagged plugin (by Rob Neild) -// and the core JOSM source code (by Immanuel Scholz and others) package org.openstreetmap.josm.gui.layer.geoimage; Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 6296) @@ -1,5 +1,3 @@ // License: GPL. See LICENSE file for details. -// Copyright 2007 by Christian Gallioz (aka khris78) - package org.openstreetmap.josm.gui.layer.geoimage; Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (revision 6296) @@ -1,7 +1,3 @@ // License: GPL. See LICENSE file for details. -// Copyright 2007 by Christian Gallioz (aka khris78) -// Parts of code from Geotagged plugin (by Rob Neild) -// and the core JOSM source code (by Immanuel Scholz and others) - package org.openstreetmap.josm.gui.layer.geoimage; @@ -13,8 +9,7 @@ import org.openstreetmap.josm.data.coor.LatLon; -/* +/** * Stores info about each image */ - final public class ImageEntry implements Comparable, Cloneable { private File file; Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 6296) @@ -1,7 +1,3 @@ // License: GPL. See LICENSE file for details. -// Copyright 2007 by Christian Gallioz (aka khris78) -// Parts of code from Geotagged plugin (by Rob Neild) -// and the core JOSM source code (by Immanuel Scholz and others) - package org.openstreetmap.josm.gui.layer.geoimage; @@ -56,5 +52,5 @@ public static ImageViewerDialog getInstance() { if (dialog == null) - throw new AssertionError(); // a new instance needs to be created first + throw new AssertionError("a new instance needs to be created first"); return dialog; } @@ -68,5 +64,5 @@ tr("Tool: {0}", tr("Display geotagged images")), KeyEvent.VK_Y, Shortcut.DIRECT), 200); - /* Don't show a detached dialog right from the start. */ + // Don't show a detached dialog right from the start. if (isShowing && !isDocked) { setIsShowing(false); @@ -219,8 +215,5 @@ public void displayImage(GeoImageLayer layer, ImageEntry entry) { synchronized(this) { - // if (currentLayer == layer && currentEntry == entry) { - // repaint(); - // return; - // } TODO: pop up image dialog but don't load image again + // TODO: pop up image dialog but don't load image again if (centerView && Main.isDisplayingMapView() && entry != null && entry.getPos() != null) { @@ -245,8 +238,4 @@ osd.append(tr("\nDirection {0}\u00b0", Math.round(entry.getExifImgDir()))); } - //if (entry.getPos() != null) { - // osd.append(tr("\nlat: {0}, lon: {1}", Double.toString(entry.getPos().lat()), Double.toString(entry.getPos().lon()))); - //} - //osd.append(tr("\nfile mtime: {0}", Long.toString(entry.getFile().lastModified()))); DateFormat dtf = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT); if (entry.getExifTime() != null) { Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java (revision 6296) @@ -1,12 +1,7 @@ // License: GPL. See LICENSE file for details. -// Copyright 2007 by Christian Gallioz (aka khris78) -// Parts of code from Geotagged plugin (by Rob Neild) -// and the core JOSM source code (by Immanuel Scholz and others) - package org.openstreetmap.josm.gui.layer.geoimage; import static org.openstreetmap.josm.tools.I18n.tr; -//import javax.swing.JFileChooser; import java.io.File; Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 6296) @@ -38,6 +38,4 @@ private Timer timer = null; private double animationInterval = 0.0; // seconds - // private Rectangle audioTracer = null; - // private Icon audioTracerIcon = null; static private PlayHeadMarker playHead = null; private MapMode oldMode = null; Index: /trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (revision 6296) @@ -387,5 +387,4 @@ public TestAccessTokenAction() { putValue(NAME, tr("Test Access Token")); - /* putValue(SHORT_DESCRIPTION, ""); */ putValue(SMALL_ICON, ImageProvider.get("about")); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 6296) @@ -824,6 +824,6 @@ @Override public Dimension preferredLayoutSize(Container parent) { - Dimension l = new Dimension(200, 200); //left.getPreferredSize(); - Dimension r = new Dimension(200, 200); //right.getPreferredSize(); + Dimension l = new Dimension(200, 200); + Dimension r = new Dimension(200, 200); return new Dimension(l.width+r.width+10+buttons.getPreferredSize().width,Math.max(l.height, r.height)); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (revision 6296) @@ -246,5 +246,4 @@ log.append(CustomConfigurator.getLog()); } - //try { Main.pref.save(); } catch (IOException ex) { } log.append(""); String msg = log.toString().replace("\n", "
"); @@ -253,7 +252,4 @@ + "You can reject preferences changes by pressing \"Cancel\" in preferences dialog
" + "To activate some changes JOSM restart may be needed."), msg).showDialog(); - - //JOptionPane.showMessageDialog(Main.parent, - // tr("Installed plugins and some changes in preferences will start to work after JOSM restart"), tr("Warning"), JOptionPane.WARNING_MESSAGE); readPreferences(tmpPrefs); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java (revision 6296) @@ -51,5 +51,4 @@ @Override public void addGui(PreferenceTabbedPane gui) { - //gui.display.setPreferredSize(new Dimension(400,600)); gpxPanel = new GPXSettingsPanel(); gui.addValidationListener(gpxPanel); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 6296) @@ -109,4 +109,7 @@ } + /** + * Constructs a new {@code OsmApiUrlInputPanel}. + */ public OsmApiUrlInputPanel() { build(); @@ -152,5 +155,5 @@ OsmApi.getOsmApi().initialize(null); } catch (Exception x) { - // ignore; + Main.warn(x); } } Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 6296) @@ -368,5 +368,4 @@ protected void init() { setAutoResizeMode(JTable.AUTO_RESIZE_OFF); - //setCellSelectionEnabled(true); setRowSelectionAllowed(true); setColumnSelectionAllowed(true); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 6296) @@ -957,5 +957,5 @@ try { Method method = Class.forName(class_method[0]).getMethod(class_method[1]); - // Check method is public static String[] methodName(); + // Check method is public static String[] methodName() int mod = method.getModifiers(); if (Modifier.isPublic(mod) && Modifier.isStatic(mod) Index: /trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java (revision 6296) @@ -119,9 +119,6 @@ for (Object value : possibleValues) { if (value != null) { - // These two lines work with a "classic" renderer, + // With a "classic" renderer, we could call setPrototypeDisplayValue(value) + getPreferredSize() // but not with TaggingPreset custom renderer that return a dummy height if index is equal to -1 - //setPrototypeDisplayValue(value); - //Dimension dim = getPreferredSize(); - // So we explicitely call the renderer by simulating a correct index for the current value Component c = getRenderer().getListCellRendererComponent(list, value, i, true, true); Index: /trunk/src/org/openstreetmap/josm/io/NmeaReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/NmeaReader.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/io/NmeaReader.java (revision 6296) @@ -239,5 +239,5 @@ // checksum check: - // the bytes between the $ and the * are xored; + // the bytes between the $ and the * are xored // if there is no * or other meanities it will throw // and result in a malformed packet. Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 6296) @@ -168,5 +168,4 @@ private static final long serialVersionUID = 1L; - ///private final DefaultCellEditor textEditor = new DefaultCellEditor( new JTextField() ); @Override @@ -288,5 +287,5 @@ } - /* + /** * parse addtags parameters Example URL (part): * addtags=wikipedia:de%3DResidenzschloss Dresden|name:en%3DDresden Castle Index: /trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java (revision 6296) @@ -65,13 +65,4 @@ String url = null; StringBuilder manifest = new StringBuilder(); - /* - code structure: - for () { - A; - B; - C; - } - B; - */ for (String line = r.readLine(); line != null; line = r.readLine()) { if (line.startsWith("\t")) { Index: /trunk/src/org/openstreetmap/josm/tools/Diff.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 6296) @@ -272,6 +272,6 @@ && yoff + SNAKE_LIMIT <= y && y < ylim) { - /* We have a good enough best diagonal; - now insist that it end with a significant snake. */ + /* We have a good enough best diagonal. + now insist that it end with a significant snake. */ int k; @@ -305,6 +305,6 @@ && yoff < y && y <= ylim - SNAKE_LIMIT) { - /* We have a good enough best diagonal; - now insist that it end with a significant snake. */ + /* We have a good enough best diagonal. + now insist that it end with a significant snake. */ int k; @@ -363,5 +363,4 @@ int d = diag (xoff, xlim, yoff, ylim); int c = cost; - //int f = fdiag[fdiagoff + d]; int b = bdiag[bdiagoff + d]; Index: /trunk/src/org/openstreetmap/josm/tools/Geometry.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 6295) +++ /trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 6296) @@ -498,5 +498,5 @@ } - //order points so p1.lat <= p2.lat; + //order points so p1.lat <= p2.lat if (newPoint.getEastNorth().getY() > oldPoint.getEastNorth().getY()) { p1 = oldPoint;