Mercurial > dive4elements > river
changeset 1442:4a6814be92ba
Cosmetics, doc.
flys-client/trunk@3438 c6561f87-3c4e-4783-a992-168aeb5c3f6f
line wrap: on
line diff
--- a/flys-client/ChangeLog Thu Dec 15 12:33:54 2011 +0000 +++ b/flys-client/ChangeLog Fri Dec 16 13:26:19 2011 +0000 @@ -1,3 +1,16 @@ +2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * src/main/java/de/intevation/flys/client/server/LoadArtifactServiceImpl.java, + src/main/java/de/intevation/flys/client/server/CollectionItemAttributeServiceImpl.java, + src/main/java/de/intevation/flys/client/server/MetaDataServiceImpl.java, + src/main/java/de/intevation/flys/client/shared/model/Recommendation.java, + src/main/java/de/intevation/flys/client/shared/model/DefaultData.java, + src/main/java/de/intevation/flys/client/client/services/LoadArtifactService.java, + src/main/java/de/intevation/flys/client/client/services/FeedService.java, + src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java, + src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java: + Cosmetics, doc. + 2011-12-15 Raimund Renkert <raimund.renkert@intevation.de> * src/main/java/de/intevation/flys/client/shared/model/PropertyGroup.java:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/FeedService.java Thu Dec 15 12:33:54 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/FeedService.java Fri Dec 16 13:26:19 2011 +0000 @@ -16,7 +16,6 @@ /** * Inserts new data into an existing artifact. * - * @param serverUrl The url of the artifact server. * @param locale The locale used for the request. * @param artifact The artifact. * @param data The data that should be inserted.
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/LoadArtifactService.java Thu Dec 15 12:33:54 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/LoadArtifactService.java Fri Dec 16 13:26:19 2011 +0000 @@ -8,10 +8,11 @@ import de.intevation.flys.client.shared.model.Collection; import de.intevation.flys.client.shared.model.Recommendation; - +/** @see LoadArtifactServiceImpl */ @RemoteServiceRelativePath("load-artifact") public interface LoadArtifactService extends RemoteService { + /** @see LoadArtifactServiceImpl */ Artifact load( Collection parent, Recommendation recom, @@ -19,6 +20,7 @@ String locale) throws ServerException; + /** @see LoadArtifactServiceImpl */ Artifact[] loadMany( Collection parent, Recommendation[] recom,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java Thu Dec 15 12:33:54 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java Fri Dec 16 13:26:19 2011 +0000 @@ -59,7 +59,7 @@ /** ListGrid that displays user-selected pairs to build differences with. */ protected ListGrid differencesList; - /* + /** * List to track previously selected but now removed pairs. (Needed to * be able to identify artifacts that can be removed from the collection. */ @@ -302,7 +302,8 @@ // TODO differentiate and merge: new clones, new, old. Recommendation firstR = r.getFirst(); if(firstR.getIDs() != null) { - GWT.log("First IDs: " + firstR.getIDs() + " factory: " + firstR.getFactory()); + GWT.log("First IDs: " + firstR.getIDs() + " factory: " + + firstR.getFactory()); } if(firstR.getIDs() != null) { // These do not get cloned but loaded ("spawned"). @@ -313,7 +314,8 @@ } Recommendation secondR = r.getSecond(); if(secondR.getIDs() != null) { - GWT.log("Second IDs: " + secondR.getIDs() + " factory: " + secondR.getFactory()); + GWT.log("Second IDs: " + secondR.getIDs() + " factory: " + + secondR.getFactory()); } if (secondR.getIDs() != null) { // These do not get cloned but loaded ("spawned").
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java Thu Dec 15 12:33:54 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java Fri Dec 16 13:26:19 2011 +0000 @@ -39,9 +39,11 @@ DatacageDoubleClickHandler, HasRedrawRequestHandlers { + /** i18ner. */ protected FLYSConstants messages = GWT.create(FLYSConstants.class); + /** Service to create/clone artifacts. */ protected LoadArtifactServiceAsync loadService = GWT.create(LoadArtifactService.class); @@ -183,6 +185,7 @@ new AsyncCallback<Artifact>() { public void onFailure(Throwable caught) { decreateInProgress(); + GWT.log("Create-artifact failed: " + caught.getMessage()); SC.warn(caught.getMessage()); }
--- a/flys-client/src/main/java/de/intevation/flys/client/server/CollectionItemAttributeServiceImpl.java Thu Dec 15 12:33:54 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/CollectionItemAttributeServiceImpl.java Fri Dec 16 13:26:19 2011 +0000 @@ -59,9 +59,9 @@ Document requestDoc = XMLUtils.newDocument(); XMLUtils.ElementCreator ec = new XMLUtils.ElementCreator( - requestDoc, - ArtifactNamespaceContext.NAMESPACE_URI, - ArtifactNamespaceContext.NAMESPACE_PREFIX); + requestDoc, + ArtifactNamespaceContext.NAMESPACE_URI, + ArtifactNamespaceContext.NAMESPACE_PREFIX); Element action = ec.create("action");
--- a/flys-client/src/main/java/de/intevation/flys/client/server/LoadArtifactServiceImpl.java Thu Dec 15 12:33:54 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/LoadArtifactServiceImpl.java Fri Dec 16 13:26:19 2011 +0000 @@ -25,7 +25,7 @@ private static final Logger logger = Logger.getLogger(LoadArtifactServiceImpl.class); - + /** Error. */ public static final String ERROR_LOAD_ARTIFACT = "error_load_artifact";
--- a/flys-client/src/main/java/de/intevation/flys/client/server/MetaDataServiceImpl.java Thu Dec 15 12:33:54 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/MetaDataServiceImpl.java Fri Dec 16 13:26:19 2011 +0000 @@ -46,6 +46,7 @@ { logger.info("MetaDataService.getMetaData"); + // Create the query document. String url = getServletContext().getInitParameter("server-url"); Document doc = XMLUtils.newDocument(); @@ -83,6 +84,7 @@ doc.appendChild(meta); + // Fire. HttpClient client = new HttpClientImpl(url, locale); try {
--- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/DefaultData.java Thu Dec 15 12:33:54 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/DefaultData.java Fri Dec 16 13:26:19 2011 +0000 @@ -10,19 +10,19 @@ */ public class DefaultData implements Data { - /** The label of this Data object.*/ + /** The label of this Data object. */ protected String label; - /** The description.*/ + /** The description. */ protected String description; - /** The type.*/ + /** The type. */ protected String type; - /** The DataItems.*/ + /** The DataItems. */ protected DataItem[] items; - /** The default DataItem.*/ + /** The default DataItem. */ protected DataItem defaultItem;
--- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/Recommendation.java Thu Dec 15 12:33:54 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/Recommendation.java Fri Dec 16 13:26:19 2011 +0000 @@ -8,6 +8,7 @@ import java.io.Serializable; /** + * Information bundle to let client create/clone an artifact with facets. * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> */ public class Recommendation implements Serializable { @@ -15,7 +16,9 @@ /** Index and name of a facet. */ public static class Facet implements Serializable { + /** Facet name. */ protected String name; + /** Facet name. */ protected String index; public Facet() { @@ -97,9 +100,12 @@ } } // class Filter + /** Factory to speak to when creating/cloning. */ protected String factory; + /** Sometimes database ids, sometimes other freeform text. */ protected String ids; protected String masterArtifact; + /** Optional facet filter. */ protected Filter filter; protected String displayName = null;