Index: trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (revision 5881) @@ -38,5 +38,5 @@ * @param my my relation * @param their their relation - * @param mergedNodeList the list of merged relation members + * @param mergedMembers the list of merged relation members */ public RelationMemberConflictResolverCommand(Relation my, Relation their, List mergedMembers) { Index: trunk/src/org/openstreetmap/josm/data/Version.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Version.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/data/Version.java (revision 5881) @@ -230,5 +230,5 @@ * Returns the full User-Agent string * @return The User-Agent - * @since 5866 + * @since 5868 */ public String getFullAgentString() { Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 5881) @@ -135,5 +135,5 @@ * This method can be used to detect changes in highlight state of primitives. If highlighting was changed * then the method will return different number. - * @return + * @return the current highlight counter */ public int getHighlightUpdateCount() { @@ -149,5 +149,5 @@ * Replies the history of JOSM selections * - * @return + * @return list of history entries */ public LinkedList> getSelectionHistory() { @@ -371,5 +371,5 @@ * primitive are left unchanged. * - * @param primitive the primitive + * @param primitiveId the id of the primitive */ public void removePrimitive(PrimitiveId primitiveId) { @@ -556,5 +556,5 @@ * *WaySegments* to avoid a VirtualNode class that wouldn't have much use * otherwise. - * @param Collection of waySegments + * @param waySegments Collection of way segments */ public void setHighlightedVirtualNodes(Collection waySegments) { @@ -569,5 +569,5 @@ /** * set what virtual ways should be highlighted. - * @param Collection of waySegments + * @param waySegments Collection of way segments */ public void setHighlightedWaySegments(Collection waySegments) { @@ -681,5 +681,5 @@ /** * Remove the selection from every value in the collection. - * @param list The collection to remove the selection from. + * @param osm The collection of ids to remove the selection from. */ public void clearSelection(PrimitiveId... osm) { @@ -950,5 +950,5 @@ /** * Can be called before bigger changes on dataset. Events are disabled until {@link #endUpdate()}. - * {@link DataSetListener#dataChanged()} event is triggered after end of changes + * {@link DataSetListener#dataChanged(DataChangedEvent event)} event is triggered after end of changes *
* Typical usecase should look like this: @@ -1055,6 +1055,5 @@ * * This method can be invoked after the globally configured projection method - * changed. In contrast to {@link DataSet#reproject()} it only invalidates the - * cache and doesn't reproject the coordinates. + * changed. */ public void invalidateEastNorthCache() { Index: trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 5881) @@ -48,7 +48,7 @@ * constructor * - * The visitor will merge theirDataSet onto myDataSet - * - * @param targetDataSet dataset with my primitives. Must not be null. + * The visitor will merge sourceDataSet onto targetDataSet + * + * @param targetDataSet dataset with my primitives. Must not be null. * @param sourceDataSet dataset with their primitives. Ignored, if null. * @throws IllegalArgumentException thrown if myDataSet is null @@ -65,5 +65,5 @@ /** - * Merges a primitive other of type

onto my primitives. + * Merges a primitive onto primitives dataset. * * If other.id != 0 it tries to merge it with an corresponding primitive from @@ -71,10 +71,10 @@ * in {@link #conflicts}. * - * If other.id == 0 it tries to find a primitive in my dataset with id == 0 which + * If other.id == 0 (new primitive) it tries to find a primitive in my dataset with id == 0 which * is semantically equal. If it finds one it merges its technical attributes onto * my primitive. * - * @param

the type of the other primitive - * @param source the other primitive + * @param source the primitive to merge + * @param candidates a set of possible candidates for a new primitive */ protected void mergePrimitive(OsmPrimitive source, Collection candidates) { @@ -385,5 +385,5 @@ /** * Runs the merge operation. Successfully merged {@link OsmPrimitive}s are in - * {@link #getMyDataSet()}. + * {@link #getTargetDataSet()}. * * See {@link #getConflicts()} for a map of conflicts after the merge operation. @@ -395,5 +395,5 @@ /** * Runs the merge operation. Successfully merged {@link OsmPrimitive}s are in - * {@link #getMyDataSet()}. + * {@link #getTargetDataSet()}. * * See {@link #getConflicts()} for a map of conflicts after the merge operation. @@ -443,5 +443,5 @@ * replies my dataset * - * @return + * @return the own (target) data set */ public DataSet getTargetDataSet() { Index: trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (revision 5881) @@ -114,5 +114,5 @@ * @param role Can be null, in this case it's save as "" * @param member Cannot be null - * @throw IllegalArgumentException thrown if member is null + * @throws IllegalArgumentException thrown if member is null */ public RelationMember(String role, OsmPrimitive member) throws IllegalArgumentException{ Index: trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java (revision 5881) @@ -32,5 +32,5 @@ * deleted/invisible primitives were resurrected. * - * @param added A collection of newly-visible primitives + * @param event An event for an collection of newly-visible primitives */ void primitivesAdded(PrimitivesAddedEvent event); @@ -40,5 +40,5 @@ * primitives were marked as deleted. * - * @param removed A collection of newly-invisible primitives + * @param event An event for an collection of newly-invisible primitives */ void primitivesRemoved(PrimitivesRemovedEvent event); @@ -48,5 +48,5 @@ * a tag addition, tag removal or change in tag value. * - * @param prim the primitive, whose tags were affected. + * @param event the event for the primitive, whose tags were affected. */ void tagsChanged(TagsChangedEvent event); @@ -54,5 +54,5 @@ /** * A node's coordinates were modified. - * @param node The node that was moved. + * @param event The event for the node that was moved. */ void nodeMoved(NodeMovedEvent event); @@ -60,5 +60,5 @@ /** * A way's node list was changed. - * @param way The way that was modified. + * @param event The event for the way that was modified. */ void wayNodesChanged(WayNodesChangedEvent event); @@ -66,5 +66,5 @@ /** * A relation's members have changed. - * @param relation The relation that was modified. + * @param event The event for the relation that was modified. */ void relationMembersChanged(RelationMembersChangedEvent event); @@ -73,5 +73,5 @@ * Minor dataset change, currently only changeset id changed is supported, but can * be extended in future. - * @param event + * @param event the event for data modification */ void otherDatasetChange(AbstractDatasetChangedEvent event); @@ -79,5 +79,5 @@ /** * Called after big changes in dataset. Usually other events are stopped using Dataset.beginUpdate() and - * after operation is completed (Dataset.endUpdate()), {@link #dataChanged()} is called. + * after operation is completed (Dataset.endUpdate()), {@link #dataChanged(DataChangedEvent event)} is called. */ void dataChanged(DataChangedEvent event); Index: trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (revision 5881) @@ -22,5 +22,5 @@ * new layer is selected) * - * Events in EDT are supported, see {@link #addDatasetListener(DataSetListener, FireMode} + * Events in EDT are supported, see {@link #addDatasetListener(DataSetListener, FireMode)} * */ Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 5881) @@ -83,9 +83,9 @@ private DataSet ds; - /** Helper variable for {@link #drawSgement} */ + /** Helper variable for {@link #drawSegment} */ private static final double PHI = Math.toRadians(20); - /** Helper variable for {@link #drawSgement} */ + /** Helper variable for {@link #drawSegment} */ private static final double cosPHI = Math.cos(PHI); - /** Helper variable for {@link #drawSgement} */ + /** Helper variable for {@link #drawSegment} */ private static final double sinPHI = Math.sin(PHI); Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (revision 5881) @@ -132,5 +132,5 @@ * are not null and which do not exist yet in the list are added. * - * @param value a list of strings to add + * @param values a list of strings to add * @param priority the priority to use */ Index: trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java (revision 5881) @@ -172,6 +172,6 @@ /** * Return s new BasicStroke object with given thickness and style - * @param code = 3.5 -> thickness=3.5px - * @param code = 3.5 10 5 -> thickness=3.5px, dashed: 10px filled + 5px empty + * @param code = 3.5 -> thickness=3.5px; 3.5 10 5 -> thickness=3.5px, dashed: 10px filled + 5px empty + * @return stroke for drawing */ public static Stroke getCustomizedStroke(String code) { Index: trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java (revision 5881) @@ -16,5 +16,5 @@ * HTML. * - * It displays HTML text in the same font as {@link JLabel}. Hyperlinks are rendered in + * It displays HTML text in the same font as {@link javax.swing.JLabel}. Hyperlinks are rendered in * blue and they are underlined. There is also a CSS rule for the HTML tag <strong> * configured. Index: trunk/src/org/openstreetmap/josm/io/CacheFiles.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/CacheFiles.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/io/CacheFiles.java (revision 5881) @@ -51,6 +51,6 @@ /** * Creates a new cache class. The ident will be used to store the files on disk and to save - * expire/space settings. - * @param ident + * expire/space settings. Set plugin state to true. + * @param ident cache identifier */ public CacheFiles(String ident) { @@ -58,4 +58,10 @@ } + /** + * Creates a new cache class. The ident will be used to store the files on disk and to save + * expire/space settings. + * @param ident cache identifier + * @param isPlugin Whether this is a plugin or not (changes cache path) + */ public CacheFiles(String ident, boolean isPlugin) { String pref = isPlugin ? @@ -87,6 +93,6 @@ /** * Loads the data for the given ident as an byte array. Returns null if data not available. - * @param ident - * @return + * @param ident cache identifier + * @return stored data */ public byte[] getData(String ident) { @@ -118,6 +124,6 @@ /** * Writes an byte-array to disk - * @param ident - * @param data + * @param ident cache identifier + * @param data data to store */ public void saveData(String ident, byte[] data) { @@ -140,5 +146,5 @@ /** * Loads the data for the given ident as an image. If no image is found, null is returned - * @param ident Identifier + * @param ident cache identifier * @return BufferedImage or null */ @@ -167,6 +173,6 @@ /** * Saves a given image and ident to the cache - * @param ident - * @param image + * @param ident cache identifier + * @param image imaga data for storage */ public void saveImg(String ident, BufferedImage image) { @@ -211,7 +217,7 @@ /** - * Call this with true to update the last modification time when a file it is read. - * Call this with false to not update the last modification time when a file is read. - * @param to + * Call this with true to update the last modification time when a file it is read. + * Call this with false to not update the last modification time when a file is read. + * @param to update state */ public void setUpdateModTime(boolean to) { @@ -323,7 +329,7 @@ /** * Gets file path for ident with customizable file-ending - * @param ident - * @param ending - * @return File + * @param ident cache identifier + * @param ending file extension + * @return file structure */ private File getPath(String ident, String ending) { @@ -333,7 +339,6 @@ /** * Gets file path for ident - * @param ident - * @param ending - * @return File + * @param ident cache identifier + * @return file structure */ private File getPath(String ident) { @@ -343,6 +348,6 @@ /** * Checks whether a given file is expired - * @param file - * @return expired? + * @param file file description structure + * @return expired state */ private boolean isExpired(File file) { Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 5881) @@ -296,6 +296,5 @@ /** * Makes an XML string from an OSM primitive. Uses the OsmWriter class. - * @param o the OSM primitive - * @param addBody true to generate the full XML, false to only generate the encapsulating tag + * @param s the changeset * @return XML string */ Index: trunk/src/org/openstreetmap/josm/io/OsmChangeReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmChangeReader.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/io/OsmChangeReader.java (revision 5881) @@ -20,5 +20,5 @@ * constructor (for private and subclasses use only) * - * @see #parseDataSet(InputStream, DataSet, ProgressMonitor) + * @see #parseDataSet(InputStream, ProgressMonitor) */ protected OsmChangeReader() { @@ -90,10 +90,11 @@ * Parse the given input source and return the dataset. * - * @param source the source input stream. Must not be null. - * @param progressMonitor the progress monitor. If null, {@link NullProgressMonitor#INSTANCE} is assumed + * @param source the source input stream. Must not be null. + * @param progressMonitor the progress monitor. If null, + * {@link org.openstreetmap.josm.gui.progress.NullProgressMonitor#INSTANCE} is assumed * * @return the dataset with the parsed data * @throws IllegalDataException thrown if the an error was found while parsing the data from the source - * @throws IllegalArgumentException thrown if source is null + * @throws IllegalArgumentException thrown if source is null */ public static DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException { Index: trunk/src/org/openstreetmap/josm/io/OsmConnection.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmConnection.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/io/OsmConnection.java (revision 5881) @@ -142,5 +142,4 @@ * * @return true if this connection is canceled - * @return */ public boolean isCanceled() { Index: trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java (revision 5881) @@ -33,6 +33,6 @@ * * It is slightly different from {@link OsmReader} because we don't build an internal graph of - * {@link OsmPrimitive}s. We use objects derived from {@link HistoryOsmPrimitive} instead and we - * keep the data in a dedicated {@link HistoryDataSet}. + * {@link org.openstreetmap.josm.data.osm.OsmPrimitive}s. We use objects derived from + * {@link HistoryOsmPrimitive} instead and we keep the data in a dedicated {@link HistoryDataSet}. * */ Index: trunk/src/org/openstreetmap/josm/io/OsmReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 5881) @@ -73,5 +73,5 @@ * constructor (for private and subclasses use only) * - * @see #parseDataSet(InputStream, DataSet, ProgressMonitor) + * @see #parseDataSet(InputStream, ProgressMonitor) */ protected OsmReader() { Index: trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 5881) @@ -79,8 +79,8 @@ /** - * constructor - * - * @param id the id of the primitive. > 0 expected - * @param readFull true, if referers should be read fully (i.e. including their immediate children) + * Creates a back reference reader for given primitive + * + * @param primitive the primitive + * @param readFull true, if referers should be read fully (i.e. including their immediate children) * */ @@ -91,7 +91,8 @@ /** - * constructor - * - * @param primitive the primitive whose referers are to be read + * Creates a back reference reader for given primitive id + * + * @param id the id of the primitive whose referers are to be read + * @param type the type of the primitive * @param readFull true, if referers should be read fully (i.e. including their immediate children) * @@ -196,5 +197,5 @@ * *

    - *
  • if this reader reads referers for a {@link Node}, referring ways are always + *
  • if this reader reads referers for a {@link org.openstreetmap.josm.data.osm.Node}, referring ways are always * read individually from the server
    • *
  • if this reader reads referers for an {@link Way} or a {@link Relation}, referring relations Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 5881) @@ -99,4 +99,5 @@ if (line != null && !line.isEmpty()) { line = line.replaceAll("\"+",""); + line = line.replaceAll("NAME=",""); // strange code for some Gentoo's if(line.startsWith("Linux ")) // e.g. Linux Mint return line; Index: trunk/src/org/openstreetmap/josm/tools/Utils.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 5880) +++ trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 5881) @@ -598,5 +598,5 @@ * @return An buffered stream reader for the given URL (using UTF-8) * @throws IOException if an I/O exception occurs. - * @since 5867 + * @since 5868 */ public static BufferedReader openURLReader(URL url) throws IOException {