Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 10193) +++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 10194) @@ -135,6 +135,8 @@ protected boolean canShowAsLatest(OsmPrimitive primitive) { - if (primitive == null) return false; - if (primitive.isNew() || !primitive.isUsable()) return false; + if (primitive == null) + return false; + if (primitive.isNew() || !primitive.isUsable()) + return false; //try creating a history primitive. if that fails, the primitive cannot be used. @@ -145,5 +147,6 @@ } - if (history == null) return false; + if (history == null) + return false; // only show latest of the same version if it is modified if (history.getByVersion(primitive.getVersion()) != null) @@ -394,5 +397,6 @@ */ public boolean isLatest(HistoryOsmPrimitive primitive) { - if (primitive == null) return false; + if (primitive == null) + return false; return primitive == latest; } @@ -446,5 +450,6 @@ @Override public void setValueAt(Object aValue, int row, int column) { - if (!((Boolean) aValue)) return; + if (!((Boolean) aValue)) + return; switch (column) { case 1: @@ -466,5 +471,6 @@ public void setReferencePointInTime(int row) { - if (history == null) return; + if (history == null) + return; if (row == history.getNumVersions()) { if (latest != null) { @@ -473,5 +479,6 @@ return; } - if (row < 0 || row > history.getNumVersions()) return; + if (row < 0 || row > history.getNumVersions()) + return; HistoryOsmPrimitive reference = history.get(row); HistoryBrowserModel.this.setReferencePointInTime(reference); @@ -479,5 +486,6 @@ public void setCurrentPointInTime(int row) { - if (history == null) return; + if (history == null) + return; if (row == history.getNumVersions()) { if (latest != null) { @@ -486,5 +494,6 @@ return; } - if (row < 0 || row > history.getNumVersions()) return; + if (row < 0 || row > history.getNumVersions()) + return; HistoryOsmPrimitive current = history.get(row); HistoryBrowserModel.this.setCurrentPointInTime(current); @@ -492,8 +501,10 @@ public boolean isReferencePointInTime(int row) { - if (history == null) return false; + if (history == null) + return false; if (row == history.getNumVersions()) return latest == reference; - if (row < 0 || row > history.getNumVersions()) return false; + if (row < 0 || row > history.getNumVersions()) + return false; HistoryOsmPrimitive p = history.get(row); return p == reference; @@ -501,8 +512,10 @@ public boolean isCurrentPointInTime(int row) { - if (history == null) return false; + if (history == null) + return false; if (row == history.getNumVersions()) return latest == current; - if (row < 0 || row > history.getNumVersions()) return false; + if (row < 0 || row > history.getNumVersions()) + return false; HistoryOsmPrimitive p = history.get(row); return p == current; @@ -520,7 +533,9 @@ public OsmPrimitive getLatest() { - if (latest == null) return null; + if (latest == null) + return null; OsmDataLayer editLayer = Main.main.getEditLayer(); - if (editLayer == null) return null; + if (editLayer == null) + return null; return editLayer.data.getPrimitiveById(latest.getId(), latest.getType()); } @@ -541,4 +556,9 @@ private List keys; private final PointInTimeType pointInTimeType; + + protected TagTableModel(PointInTimeType type) { + pointInTimeType = type; + initKeyList(); + } protected void initKeyList() { @@ -555,12 +575,8 @@ } - protected TagTableModel(PointInTimeType type) { - pointInTimeType = type; - initKeyList(); - } - @Override public int getRowCount() { - if (keys == null) return 0; + if (keys == null) + return 0; return keys.size(); } Index: trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (revision 10193) +++ trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (revision 10194) @@ -237,4 +237,9 @@ public final int limit; + /** + * Constructs a {@code MoreNotesException}. + * @param notes downloaded notes + * @param limit download limit sent to the server + */ public MoreNotesException(List notes, int limit) { this.notes = notes; @@ -242,4 +247,3 @@ } } - } Index: trunk/src/org/openstreetmap/josm/io/CachedFile.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/CachedFile.java (revision 10193) +++ trunk/src/org/openstreetmap/josm/io/CachedFile.java (revision 10194) @@ -176,4 +176,10 @@ } + /** + * Returns maximum age of cache file. Only applies to URLs. + * When this time has passed after the last download of the file, the + * cache is considered stale and a new download will be attempted. + * @return the maximum cache age in seconds + */ public long getMaxAge() { return maxAge; Index: trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (revision 10193) +++ trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (revision 10194) @@ -28,16 +28,5 @@ * Maximum number of changesets returned by the OSM API call "/changesets?" */ - public static int MAX_CHANGESETS_NUMBER = 100; - - /** - * Replies a changeset query object from the query part of a OSM API URL for querying changesets. - * - * @param query the query part - * @return the query object - * @throws ChangesetQueryUrlException if query doesn't consist of valid query parameters - */ - public static ChangesetQuery buildFromUrlQuery(String query) throws ChangesetQueryUrlException { - return new ChangesetQueryUrlParser().parse(query); - } + public static final int MAX_CHANGESETS_NUMBER = 100; /** the user id this query is restricted to. null, if no restriction to a user id applies */ @@ -56,4 +45,15 @@ /** a collection of changeset ids to query for */ private Collection changesetIds; + + /** + * Replies a changeset query object from the query part of a OSM API URL for querying changesets. + * + * @param query the query part + * @return the query object + * @throws ChangesetQueryUrlException if query doesn't consist of valid query parameters + */ + public static ChangesetQuery buildFromUrlQuery(String query) throws ChangesetQueryUrlException { + return new ChangesetQueryUrlParser().parse(query); + } /** @@ -305,4 +305,7 @@ } + /** + * Exception thrown for invalid changeset queries. + */ public static class ChangesetQueryUrlException extends Exception { @@ -339,4 +342,7 @@ } + /** + * Changeset query URL parser. + */ public static class ChangesetQueryUrlParser { protected int parseUid(String value) throws ChangesetQueryUrlException { @@ -486,6 +492,5 @@ * * - * @param query the query string. If null, an empty query (identical to a query for all changesets) is - * assumed + * @param query the query string. If null, an empty query (identical to a query for all changesets) is assumed * @return the changeset query * @throws ChangesetQueryUrlException if the query string doesn't represent a legal query for changesets @@ -494,9 +499,8 @@ if (query == null) return new ChangesetQuery(); - query = query.trim(); - if (query.isEmpty()) + String apiQuery = query.trim(); + if (apiQuery.isEmpty()) return new ChangesetQuery(); - Map queryParams = createMapFromQueryString(query); - return createFromMap(queryParams); + return createFromMap(createMapFromQueryString(apiQuery)); } }