Index: trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 11348) +++ trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 11349) @@ -39,7 +39,18 @@ private static final ChangesetCache instance = new ChangesetCache(); + /** the cached changesets */ + private final Map cache = new HashMap<>(); + + private final CopyOnWriteArrayList listeners = new CopyOnWriteArrayList<>(); + + /** + * Constructs a new {@code ChangesetCache}. + */ + private ChangesetCache() { + Main.pref.addPreferenceChangeListener(this); + } + /** * Replies the unique instance of the cache - * * @return the unique instance of the cache */ @@ -48,13 +59,8 @@ } - /** the cached changesets */ - private final Map cache = new HashMap<>(); - - private final CopyOnWriteArrayList listeners = new CopyOnWriteArrayList<>(); - - private ChangesetCache() { - Main.pref.addPreferenceChangeListener(this); - } - + /** + * Add a changeset cache listener. + * @param listener changeset cache listener to add + */ public void addChangesetCacheListener(ChangesetCacheListener listener) { if (listener != null) { @@ -63,4 +69,8 @@ } + /** + * Remove a changeset cache listener. + * @param listener changeset cache listener to remove + */ public void removeChangesetCacheListener(ChangesetCacheListener listener) { if (listener != null) { @@ -90,4 +100,8 @@ } + /** + * Update a single changeset. + * @param cs changeset to update + */ public void update(Changeset cs) { DefaultChangesetCacheEvent e = new DefaultChangesetCacheEvent(this); @@ -96,4 +110,8 @@ } + /** + * Update a collection of changesets. + * @param changesets changesets to update + */ public void update(Collection changesets) { if (changesets == null || changesets.isEmpty()) return; @@ -105,4 +123,9 @@ } + /** + * Determines if the cache contains an entry for given changeset identifier. + * @param id changeset id + * @return {@code true} if the cache contains an entry for {@code id} + */ public boolean contains(int id) { if (id <= 0) return false; @@ -110,4 +133,9 @@ } + /** + * Determines if the cache contains an entry for given changeset. + * @param cs changeset + * @return {@code true} if the cache contains an entry for {@code cs} + */ public boolean contains(Changeset cs) { if (cs == null) return false; @@ -116,8 +144,17 @@ } + /** + * Returns the entry for given changeset identifier. + * @param id changeset id + * @return the entry for given changeset identifier, or null + */ public Changeset get(int id) { return cache.get(id); } + /** + * Returns the list of changesets contained in the cache. + * @return the list of changesets contained in the cache + */ public Set getChangesets() { return new HashSet<>(cache.values()); @@ -132,4 +169,9 @@ } + /** + * Remove the entry for the given changeset identifier. + * A {@link ChangesetCacheEvent} is fired. + * @param id changeset id + */ public void remove(int id) { DefaultChangesetCacheEvent e = new DefaultChangesetCacheEvent(this); @@ -140,4 +182,9 @@ } + /** + * Remove the entry for the given changeset. + * A {@link ChangesetCacheEvent} is fired. + * @param cs changeset + */ public void remove(Changeset cs) { if (cs == null) return; @@ -147,6 +194,6 @@ /** - * Removes the changesets in changesets from the cache. A - * {@link ChangesetCacheEvent} is fired. + * Removes the changesets in changesets from the cache. + * A {@link ChangesetCacheEvent} is fired. * * @param changesets the changesets to remove. Ignored if null. @@ -166,8 +213,15 @@ } + /** + * Returns the number of changesets contained in the cache. + * @return the number of changesets contained in the cache + */ public int size() { return cache.size(); } + /** + * Clears the cache. + */ public void clear() { DefaultChangesetCacheEvent e = new DefaultChangesetCacheEvent(this); Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java (revision 11348) +++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java (revision 11349) @@ -9,12 +9,20 @@ import java.util.Collection; +/** + * OSM primitive type. + * @since 1670 + */ public enum OsmPrimitiveType { + /** Node type */ NODE(marktr(/* ICON(data/) */"node"), Node.class, NodeData.class), + /** Way type */ WAY(marktr(/* ICON(data/) */"way"), Way.class, WayData.class), + /** Relation type */ RELATION(marktr(/* ICON(data/) */"relation"), Relation.class, RelationData.class), - /* only for display, no real type */ + /** Closed way: only for display, no real type */ CLOSEDWAY(marktr(/* ICON(data/) */"closedway"), null, WayData.class), + /** Multipolygon: only for display, no real type */ MULTIPOLYGON(marktr(/* ICON(data/) */"multipolygon"), null, RelationData.class); Index: trunk/src/org/openstreetmap/josm/data/osm/UserInfo.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/UserInfo.java (revision 11348) +++ trunk/src/org/openstreetmap/josm/data/osm/UserInfo.java (revision 11349) @@ -7,4 +7,8 @@ import org.openstreetmap.josm.data.coor.LatLon; +/** + * Public user information. + * @since 2115 + */ public class UserInfo { /** the user id */ @@ -32,56 +36,112 @@ } + /** + * Returns the user identifier. + * @return the user identifier + */ public int getId() { return id; } + /** + * Sets the user identifier. + * @param id the user identifier + */ public void setId(int id) { this.id = id; } + /** + * Returns the display name. + * @return the display name + */ public String getDisplayName() { return displayName; } + /** + * Sets the display name. + * @param displayName display name + */ public void setDisplayName(String displayName) { this.displayName = displayName; } + /** + * Returns the date at which the account has been created. + * @return the user account creation date + */ public Date getAccountCreated() { return accountCreated; } + /** + * Sets the date at which the account has been created. + * @param accountCreated user account creation date + */ public void setAccountCreated(Date accountCreated) { this.accountCreated = accountCreated; } + /** + * Returns the user home coordinates, if set. + * @return the user home lat/lon or null + */ public LatLon getHome() { return home; } + /** + * Sets the user home coordinates. + * @param home user home lat/lon or null + */ public void setHome(LatLon home) { this.home = home; } + /** + * Returns the public account description. + * @return the public account description + */ public String getDescription() { return description; } + /** + * Sets the public account description. + * @param description public account description + */ public void setDescription(String description) { this.description = description; } + /** + * Returns the list of preferred languages. + * @return the list of preferred languages + */ public List getLanguages() { return languages; } + /** + * Sets the list of preferred languages. + * @param languages list of preferred languages + */ public void setLanguages(List languages) { this.languages = languages; } + /** + * Returns the user home zoom level. + * @return the user home zoom level + */ public int getHomeZoom() { return homeZoom; } + /** + * Sets the user home zoom level. + * @param homeZoom user home zoom level + */ public void setHomeZoom(int homeZoom) { this.homeZoom = homeZoom;