Mercurial > dive4elements > river
changeset 2905:51ed89b754ae
FLYS client: Removed trailing whitespace.
flys-client/trunk@4671 c6561f87-3c4e-4783-a992-168aeb5c3f6f
line wrap: on
line diff
--- a/flys-client/ChangeLog Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/ChangeLog Fri Jun 15 09:35:37 2012 +0000 @@ -1,3 +1,7 @@ +2012-06-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/client/**/*.java: Removed trailing whitespace. + 2012-06-15 Ingo Weinzierl <ingo@intevation.de> * src/main/java/de/intevation/flys/client/client/config.xml,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Fri Jun 15 09:35:37 2012 +0000 @@ -898,7 +898,7 @@ // Manual Points editor String addpoints(); - + String pointname(); String removepoint();
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java Fri Jun 15 09:35:37 2012 +0000 @@ -650,7 +650,7 @@ newRecommendations.push(recommendation); // XXX: UGLY! If no reference artifact given use uuid of - // current artifact as reference. + // current artifact as reference. if (recommendation.getMasterArtifact() == null) { recommendation.setMasterArtifact(masterArtifact.getUuid()); }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageButton.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageButton.java Fri Jun 15 09:35:37 2012 +0000 @@ -17,8 +17,8 @@ protected CollectionView view; public DatacageButton( - String title, - Artifact artifact, + String title, + Artifact artifact, User user, CollectionView view ) {
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacagePairWidget.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacagePairWidget.java Fri Jun 15 09:35:37 2012 +0000 @@ -28,17 +28,17 @@ { protected FLYSConstants messages = GWT.create(FLYSConstants.class); - + /** The "remote" ListGrid to insert data to when add-button is clicked. */ - protected ListGrid grid; - + protected ListGrid grid; + /** First (upper) DataCage Grid. */ protected DatacageWidget firstDatacageWidget; - + /** Second (lower) DataCage Grid. */ protected DatacageWidget secondDatacageWidget; - + /** * * @param artifact Artifact to query datacage with. @@ -56,7 +56,7 @@ firstDatacageWidget = new DatacageWidget( artifact, user, - outs, + outs, "load-system:true", false); secondDatacageWidget = new DatacageWidget(
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java Fri Jun 15 09:35:37 2012 +0000 @@ -126,7 +126,7 @@ Recommendation r = new Recommendation("waterlevel", parts[0], this.artifact.getUuid(), filter); r.setDisplayName(parts[3]); - return r; + return r; } @@ -245,13 +245,13 @@ differencesList.setFields(new ListGridField[] {nameField, capitalField, removeField}); - + differencesList.addRecordClickHandler(new RecordClickHandler() { public void onRecordClick(final RecordClickEvent event) { // Just handle remove-clicks if(!event.getField().getName().equals(removeField.getName())) { return; - } + } trackRemoved(event.getRecord()); event.getViewer().removeData(event.getRecord()); } @@ -426,7 +426,7 @@ String uuid = newArtifact.getUuid(); r.setMasterArtifact(uuid); if (i>0) dataItemString += "#"; - + dataItemString += createDataString(uuid, r); } @@ -434,7 +434,7 @@ Recommendation r = oldRecommendations[i]; String uuid = r.getIDs(); if (dataItemString.length() > 0) dataItemString += "#"; - + dataItemString += createDataString(uuid, r); }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWidget.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWidget.java Fri Jun 15 09:35:37 2012 +0000 @@ -432,7 +432,7 @@ } protected TreeNode buildRecursiveChildren( - DataCageNode node, + DataCageNode node, IdGenerator idGenerator ) { TreeNode tn = new TreeNode();
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java Fri Jun 15 09:35:37 2012 +0000 @@ -55,7 +55,7 @@ public DatacageWindow( - Artifact artifact, + Artifact artifact, User user, String outs, CollectionView view
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationPanel.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationPanel.java Fri Jun 15 09:35:37 2012 +0000 @@ -166,7 +166,7 @@ DataItem[] items = data.getItems(); DataItem iMin = getDataItem(items, "min"); DataItem iMax = getDataItem(items, "max"); - + try { min = Double.parseDouble(iMin.getStringValue()); max = Double.parseDouble(iMax.getStringValue());
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/MultipleLocationPanel.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/MultipleLocationPanel.java Fri Jun 15 09:35:37 2012 +0000 @@ -86,7 +86,7 @@ } catch(java.util.MissingResourceException mre) { GWT.log("Cannot find translation for data item name : " + getDataItemName()); - labelString = MSG.location(); + labelString = MSG.location(); } Label label = new Label(labelString); Canvas widget = createWidget(data); @@ -136,7 +136,7 @@ DataItem[] items = data.getItems(); DataItem iMin = getDataItem(items, "min"); DataItem iMax = getDataItem(items, "max"); - + try { min = Double.parseDouble(iMin.getStringValue()); max = Double.parseDouble(iMax.getStringValue());
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/RangeTableFilter.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/RangeTableFilter.java Fri Jun 15 09:35:37 2012 +0000 @@ -69,7 +69,7 @@ public void onKeyUp(KeyUpEvent event) { DoubleValidator validator = new DoubleValidator(); Map errors = filterForm.getErrors(); - if(event.getItem().getValue() != null && + if(event.getItem().getValue() != null && !validator.validate(event.getItem(), errors)) { filterForm.setErrors(errors, true); GWT.log("no valid input!");
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/RecommendationPairRecord.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/RecommendationPairRecord.java Fri Jun 15 09:35:37 2012 +0000 @@ -12,7 +12,7 @@ /** First attribute-name for StringPairRecord. */ protected static final String ATTRIBUTE_FIRST = "first"; - + /** Second attribute-name for StringPairRecord. */ protected static final String ATTRIBUTE_SECOND = "second";
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartThemePanel.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartThemePanel.java Fri Jun 15 09:35:37 2012 +0000 @@ -267,7 +267,7 @@ ); } - + /** * Return true if two themes are canditates for an area being * rendered between them. @@ -305,7 +305,7 @@ protected void attachManualPointsMenu(Menu menu) { menu.addItem(createSeparator()); MenuItem editManualPoints = new MenuItem(MSG.editpoints()); - + editManualPoints.addClickHandler(new ClickHandler() { public void onClick(MenuItemClickEvent evt) { if(mode.getName().equals("historical_discharge")) { @@ -342,7 +342,7 @@ return menu; } } - + menu.addItem(createSeparator()); MenuItem areaMenuItem = new MenuItem(MSG.chart_themepanel_new_area());
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/CrossSectionChartThemePanel.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/CrossSectionChartThemePanel.java Fri Jun 15 09:35:37 2012 +0000 @@ -226,7 +226,7 @@ // Add Change Handler to first unset the old master and then set the // new master. masterCb.addChangeHandler(new ChangeHandler() { - public void onChange(ChangeEvent event) { + public void onChange(ChangeEvent event) { String selectedItem = (String) event.getValue(); final String artifact = selectedItem; @@ -257,7 +257,7 @@ else { feedTellMaster(artifact); } - } + } }); return layout; @@ -679,7 +679,7 @@ spinnerItem.disable(); } */ - + /* // To have visual representation of synchronous // navigation or not per theme, snip:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ManualDatePointsEditor.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ManualDatePointsEditor.java Fri Jun 15 09:35:37 2012 +0000 @@ -218,7 +218,7 @@ // Just handle remove-clicks if(!event.getField().getName().equals(removeField.getName())) { return; - } + } event.getViewer().removeData(event.getRecord()); } });
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ManualPointsEditor.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ManualPointsEditor.java Fri Jun 15 09:35:37 2012 +0000 @@ -139,7 +139,7 @@ setCanDragReposition(true); setCanDragResize(true); - // If no manualpoints artifact found, create it now. + // If no manualpoints artifact found, create it now. if(findManualPointsUUID() == null) { addArtifactCreateUI(); } @@ -289,7 +289,7 @@ // Just handle remove-clicks if(!event.getField().getName().equals(removeField.getName())) { return; - } + } event.getViewer().removeData(event.getRecord()); } }); @@ -441,7 +441,7 @@ Config config = Config.getInstance(); String locale = config.getLocale(); - + loadArtifactService.load( this.collection, new Recommendation("manualpoints", ""),
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java Fri Jun 15 09:35:37 2012 +0000 @@ -647,7 +647,7 @@ url += "maxy=" + maxY + "&"; } catch (Exception e) { - // XXX: Ignore it. bounds.getXXX() throw + // XXX: Ignore it. bounds.getXXX() throw // exceptions when bound is invalid. :-/ } }
--- a/flys-client/src/main/java/de/intevation/flys/client/server/FixingsKMChartServiceImpl.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/FixingsKMChartServiceImpl.java Fri Jun 15 09:35:37 2012 +0000 @@ -59,7 +59,7 @@ } InputStream in; - + try { HttpClient client = new HttpClientImpl(url, locale); in = (InputStream)client.callService(
--- a/flys-client/src/main/java/de/intevation/flys/client/server/LoadArtifactServiceImpl.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/LoadArtifactServiceImpl.java Fri Jun 15 09:35:37 2012 +0000 @@ -123,13 +123,13 @@ Artifact clone = ArtifactHelper.createArtifact( url, locale, realFactory, recom); - + if (clone != null) { logger.debug("LoadArtifactServiceImple: Successfully " + "loaded Artifact Clone."); Collection c = CollectionHelper.addArtifact( parent, clone, url, locale); - + if (c != null) { artifacts.add(clone); // Remember we cloned a recommendation like this.
--- a/flys-client/src/main/java/de/intevation/flys/client/server/MapPrintServiceImpl.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/MapPrintServiceImpl.java Fri Jun 15 09:35:37 2012 +0000 @@ -55,7 +55,7 @@ import org.mapfish.print.output.OutputFormat; import org.mapfish.print.utils.PJsonObject; -*/ +*/ import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -81,7 +81,7 @@ Element parent = (Element)element.getParentNode(); String parentName = parent.getAttribute("name"); - if (!(parentName.equals("map") + if (!(parentName.equals("map") || parentName.equals("floodmap"))) { return false; } @@ -222,7 +222,7 @@ @Override - public void doGet(HttpServletRequest req, HttpServletResponse resp) + public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { log.info("MapPrintServiceImpl.doGet");
--- a/flys-client/src/main/java/de/intevation/flys/client/server/meta/Converter.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/meta/Converter.java Fri Jun 15 09:35:37 2012 +0000 @@ -83,8 +83,8 @@ registerConverters(); } - public static final NodeConverter NAME_CONVERTER = new NameConverter(); - public static final NodeConverter I18N_CONVERTER = new I18NConverter(); + public static final NodeConverter NAME_CONVERTER = new NameConverter(); + public static final NodeConverter I18N_CONVERTER = new I18NConverter(); protected void registerConverters() { logger.debug("register converters called");
--- a/flys-client/src/main/java/de/intevation/flys/client/shared/DoubleUtils.java Fri Jun 15 07:14:45 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/shared/DoubleUtils.java Fri Jun 15 09:35:37 2012 +0000 @@ -69,7 +69,7 @@ int goTo = (newLen < toCopy.length) ? newLen - : toCopy.length; + : toCopy.length; for (int i = 0; i < goTo; i++) { nArray[i] = toCopy[i];