# HG changeset patch # User Felix Wolfsteller # Date 1318508707 0 # Node ID ecd0243bc09e33bf201cff208d9e35b473fe846e # Parent 45b9b1fc26e2300058cdf0ff8aad6ec9d0af08c9 Cosmetics, docs. flys-client/trunk@2959 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 45b9b1fc26e2 -r ecd0243bc09e flys-client/ChangeLog --- a/flys-client/ChangeLog Thu Oct 13 10:22:39 2011 +0000 +++ b/flys-client/ChangeLog Thu Oct 13 12:25:07 2011 +0000 @@ -1,3 +1,10 @@ +2011-10-13 Felix Wolfsteller + + * src/main/java/de/intevation/flys/client/server/CollectionHelper.java, + src/main/java/de/intevation/flys/client/server/ArtifactHelper.java, + src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java: + Cosmetics, doc. + 2011-10-13 Ingo Weinzierl * src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java: diff -r 45b9b1fc26e2 -r ecd0243bc09e flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java --- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java Thu Oct 13 10:22:39 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java Thu Oct 13 12:25:07 2011 +0000 @@ -253,7 +253,7 @@ } } }); - addDistance.setCellIcon (IMAGES.markerGreen ().getURL ()); + addDistance.setCellIcon(IMAGES.markerGreen().getURL()); ListGridField ddescr = new ListGridField("description", MESSAGES.description()); diff -r 45b9b1fc26e2 -r ecd0243bc09e flys-client/src/main/java/de/intevation/flys/client/server/ArtifactHelper.java --- a/flys-client/src/main/java/de/intevation/flys/client/server/ArtifactHelper.java Thu Oct 13 10:22:39 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/ArtifactHelper.java Thu Oct 13 12:25:07 2011 +0000 @@ -33,6 +33,9 @@ } + /** + * @param factory ArtifactFactory to use. + */ public static Artifact createArtifact( String serverUrl, String locale, @@ -73,6 +76,9 @@ } + /** + * Create CreationFilter from Recommendation.Filter. + */ public static CreationFilter convertFilter(Recommendation.Filter filter) { if (filter == null) { diff -r 45b9b1fc26e2 -r ecd0243bc09e flys-client/src/main/java/de/intevation/flys/client/server/CollectionHelper.java --- a/flys-client/src/main/java/de/intevation/flys/client/server/CollectionHelper.java Thu Oct 13 10:22:39 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/CollectionHelper.java Thu Oct 13 12:25:07 2011 +0000 @@ -267,7 +267,7 @@ /** - * This method takes the DESCRIBE document of the Collections describe() + * Take the DESCRIBE document of the Collections describe() * operation and extracts the information about the collection itself and * the collection items. * @@ -299,8 +299,13 @@ "art:artifact-collection/@art:name", ArtifactNamespaceContext.INSTANCE); - if (uuid.length() == 0 || ttlStr.length() == 0) { - System.err.println("Found an invalid Collection!"); + if (uuid.length() == 0) { + System.err.println("Found an invalid (zero length uuid) Collection!"); + return null; + } + + if (ttlStr.length() == 0) { + System.err.println("Found an invalid Collectioni (zero length ttl)!"); return null; } @@ -611,6 +616,11 @@ } + /** + * Add an artifact to a collection. + * @param collection Collection to add artifact to. + * @param artifact Artifact to add to collection + */ public static Collection addArtifact( Collection collection, Artifact artifact,