# HG changeset patch # User Christian Lins # Date 1349691723 -7200 # Node ID 7c03d3bd9262a2107cb8e7b7c9c13f2657153e85 # Parent 145980c217000bff6714dd8de26f9ff87180eeb8# Parent 644ac6d1955d2cf9de513292c6900c5e9a8491fb Merged diff -r 145980c21700 -r 7c03d3bd9262 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Mon Oct 08 12:10:50 2012 +0200 +++ b/flys-artifacts/ChangeLog Mon Oct 08 12:22:03 2012 +0200 @@ -1,3 +1,17 @@ +2012-10-08 Felix Wolfsteller + + * flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/extreme/ExtremeCalculation.java, + flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/OutliersInput.java: + Documentation. + +2012-10-08 Felix Wolfsteller + + * flys-artifacts/doc/conf/artifacts/winfo.xm: Introduce another + dummyish state for extreme value analysis. + + * flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/extreme/PercentInput.java: + New State to get percentage as input. + 2012-10-08 Felix Wolfsteller * flys-artifacts/doc/conf/artifacts/winfo.xm: Introduce dummyish states for diff -r 145980c21700 -r 7c03d3bd9262 flys-artifacts/doc/conf/artifacts/winfo.xml --- a/flys-artifacts/doc/conf/artifacts/winfo.xml Mon Oct 08 12:10:50 2012 +0200 +++ b/flys-artifacts/doc/conf/artifacts/winfo.xml Mon Oct 08 12:22:03 2012 +0200 @@ -172,10 +172,16 @@ - + + + + + + + @@ -582,6 +588,12 @@ + + + + diff -r 145980c21700 -r 7c03d3bd9262 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/extreme/ExtremeCalculation.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/extreme/ExtremeCalculation.java Mon Oct 08 12:10:50 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/extreme/ExtremeCalculation.java Mon Oct 08 12:22:03 2012 +0200 @@ -88,6 +88,8 @@ } } + + /** Calculate an extreme curve (extrapolate). */ public CalculationResult calculate() { WstValueTable wst = null; @@ -117,6 +119,8 @@ : innerCalculate(wst, function); } + + /** Calculate an extreme curve (extrapolate). */ protected CalculationResult innerCalculate( WstValueTable wst, Function function diff -r 145980c21700 -r 7c03d3bd9262 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/OutliersInput.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/OutliersInput.java Mon Oct 08 12:10:50 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/OutliersInput.java Mon Oct 08 12:22:03 2012 +0200 @@ -22,6 +22,8 @@ public OutliersInput() { } + + /** Tell UI how to allow for input. */ @Override protected String getUIProvider() { return "outliers_input"; @@ -36,6 +38,5 @@ return null; } - } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 145980c21700 -r 7c03d3bd9262 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/extreme/PercentInput.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/extreme/PercentInput.java Mon Oct 08 12:22:03 2012 +0200 @@ -0,0 +1,44 @@ +package de.intevation.flys.artifacts.states.extreme; + +import org.apache.log4j.Logger; + +import de.intevation.artifactdatabase.data.StateData; +import de.intevation.artifacts.CallContext; +import de.intevation.flys.artifacts.states.DefaultState; + + +/** + * @author Raimund Renkert + */ +public class PercentInput extends DefaultState { + + /** The logger used in this class. */ + private static Logger logger = Logger.getLogger(PercentInput.class); + + public static final String PARAMETER_NAME = "percent"; + + + /** + * The default constructor that initializes an empty State object. + */ + public PercentInput () { + } + + + /** Tell UI what to display for input. */ + @Override + protected String getUIProvider() { + return "percent_input"; + } + + + @Override + protected String[] getDefaultsFor(CallContext context, StateData data) { + if (data != null && data.getName().equals(PARAMETER_NAME)) { + return new String[] {"5", "5"}; + } + + return null; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 145980c21700 -r 7c03d3bd9262 flys-client/ChangeLog --- a/flys-client/ChangeLog Mon Oct 08 12:10:50 2012 +0200 +++ b/flys-client/ChangeLog Mon Oct 08 12:22:03 2012 +0200 @@ -10,6 +10,16 @@ 2012-10-08 Felix Wolfsteller + * flys-client/src/main/java/de/intevation/flys/client/client/ui/UIProviderFactory.java: + Handle percent_input ui for extreme value state. + +2012-10-08 Felix Wolfsteller + + * flys-client/src/main/java/de/intevation/flys/client/client/ui/DoubleInputPanel.java: + Documentation, vimline. + +2012-10-08 Felix Wolfsteller + * flys-client/src/main/java/de/intevation/flys/client/server/ChartInfoServiceImpl.java: Documentation. @@ -45,12 +55,12 @@ Doc. -2012-10-01 Björn Ricks +2012-10-01 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/ui/ParameterMatrixPanel.java: Add missing import of FLYSConstants -2012-10-01 Björn Ricks +2012-10-01 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/FLYSArtifactCreator.java: Add correct debug output for GaugeDischargeCurveArtifact @@ -80,7 +90,7 @@ flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/PointRecord.java: ManualPointsEditor supports Date x axis values. -2012-09-29 Björn Ricks +2012-09-29 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/ArtifactServiceImpl.java, src/main/java/de/intevation/flys/client/server/FLYSArtifactCreator.java, @@ -99,7 +109,7 @@ Allow to create a discharge curve from a gauge info. Currently the dicharge curve will not be displayed. -2012-09-29 Björn Ricks +2012-09-29 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/shared/model/DefaultGaugeInfo.java, src/main/java/de/intevation/flys/client/shared/model/GaugeInfo.java, @@ -147,7 +157,7 @@ src/main/java/de/intevation/flys/client/client/ui/ParameterMatrix.java: Removed trailing whitespace. -2012-09-27 Björn Ricks +2012-09-27 Bjďż˝rn Ricks * src/main/webapp/WEB-INF/web.xml: Add servlet mapping for the GaugeOverviewInfoService @@ -192,7 +202,7 @@ - Height is now normal again - "Junk" chars are now removed on change -2012-09-24 Björn Ricks +2012-09-24 Bjďż˝rn Ricks issue846 (GGInA: Auth mechanism ignores URL prefix) @@ -203,7 +213,7 @@ 2012-09-24 Felix Wolfsteller - issue871 (parameterization of flowvelocity loożs a tiny bit messy). + issue871 (parameterization of flowvelocity looďż˝s a tiny bit messy). * src/main/java/de/intevation/flys/client/client/ui/ParameterMatrixPanel.java: Show horizontal line between entries. @@ -214,12 +224,12 @@ src/main/java/de/intevation/flys/client/shared/model/IntegerOptionsData.java: Cosmetics, docs. -2012-09-24 Björn Ricks +2012-09-24 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/shared/model/DefaultGaugeInfo.java: Finally store passed kmup value in member variable. -2012-09-24 Björn Ricks +2012-09-24 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/GaugeOverviewInfoServiceImpl.java, src/main/java/de/intevation/flys/client/shared/model/DefaultRiverInfo.java, @@ -248,19 +258,19 @@ src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: Added i18n strings for bedheight difference calculation. -2012-09-21 Björn Ricks +2012-09-21 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/ui/GaugeTree.java: Open fold for historicalq reference. -2012-09-21 Björn Ricks +2012-09-21 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/GaugeOverviewInfoServiceImpl.java, src/main/java/de/intevation/flys/client/shared/model/DefaultGaugeInfo.java, src/main/java/de/intevation/flys/client/shared/model/GaugeInfo.java: Add the official gauge number to the GaugeInfo class. -2012-09-21 Björn Ricks +2012-09-21 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/ui/GaugeTree.java, src/main/java/de/intevation/flys/client/client/ui/GaugePanel.java: @@ -268,19 +278,19 @@ GaugeTree the code became quite lage. Therefore it is better preserved in its own file. -2012-09-21 Björn Ricks +2012-09-21 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/ui/GaugePanel.java: Additional refactoring to avoid code duplication and fixing reading double value from locations DataItem object. Also add another code path for location_distance winfo state. -2012-09-21 Björn Ricks +2012-09-21 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/ui/GaugePanel.java: Refactor to avoid code duplication -2012-09-21 Björn Ricks +2012-09-21 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties, src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties, @@ -289,7 +299,7 @@ src/main/java/de/intevation/flys/client/client/ui/GaugePanel.java: Add html links to the additional gauge and river info pages. -2012-09-21 Björn Ricks +2012-09-21 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/GaugeOverviewInfoServiceImpl.java, src/main/java/de/intevation/flys/client/shared/model/DefaultRiverInfo.java, @@ -299,14 +309,14 @@ Extend GaugeInfo and RiverInfo to store also the http url for additional info. -2012-09-21 Björn Ricks +2012-09-21 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/ui/GaugePanel.java, src/main/java/de/intevation/flys/client/client/ui/ParameterList.java: Open and close gauge tree folds that correspond to the selected WINFO calculation. -2012-09-21 Björn Ricks +2012-09-21 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/ui/DoubleArrayPanel.java: Fix NullPointerException on not available list @@ -339,7 +349,7 @@ src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: i18n (#858) -2012-09-19 Björn Ricks +2012-09-19 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/GaugeOverviewInfoServiceImpl.java, src/main/java/de/intevation/flys/client/shared/model/DefaultGaugeInfo.java, @@ -347,18 +357,18 @@ src/main/java/de/intevation/flys/client/client/ui/GaugePanel.java: Use the wstunit from the river as unit for the Pegelnullpunkt. -2012-09-19 Björn Ricks +2012-09-19 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/ui/ParameterList.java: Don't display the GaugePanel if no river is selected. -2012-09-19 Björn Ricks +2012-09-19 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/shared/model/DefaultArtifactDescription.java: Fix NullPointerException when going back in WINFO artifact to the river selection. -2012-09-19 Björn Ricks +2012-09-19 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties, src/main/java/de/intevation/flys/client/client/FLYSConstants.java, @@ -369,20 +379,20 @@ Don't reload the gauges if the river doesn't change. Correctly handle kmup of the river. -2012-09-19 Björn Ricks +2012-09-19 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/ui/ParameterList.java: Improve handling of the GaugePanel and don't delete members of the GaugePanel. -2012-09-19 Björn Ricks +2012-09-19 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/GaugeOverviewInfoServiceImpl.java, src/main/java/de/intevation/flys/client/shared/model/DefaultGaugeInfo.java, src/main/java/de/intevation/flys/client/shared/model/GaugeInfo.java: Add station information to the gauges. -2012-09-19 Björn Ricks +2012-09-19 Bjďż˝rn Ricks * src/main/webapp/FLYS.css, src/main/java/de/intevation/flys/client/client/ui/GaugePanel.java: @@ -424,7 +434,7 @@ src/main/java/de/intevation/flys/client/client/FLYSConstants.java: Removed trailing whitespace and superfluous imports. -2012-09-14 Björn Ricks +2012-09-14 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties, src/main/java/de/intevation/flys/client/client/FLYSConstants.java, @@ -434,7 +444,7 @@ src/main/java/de/intevation/flys/client/client/ui/GaugePanel.java: Add first draft for the gauge overview info ui -2012-09-14 Björn Ricks +2012-09-14 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/services/GaugeOverviewInfoService.java, src/main/java/de/intevation/flys/client/client/services/GaugeOverviewInfoServiceAsync.java, @@ -621,13 +631,13 @@ src/main/java/de/intevation/flys/client/client/ui/DatacagePairWidget.java: Cosmetics, docs. -2012-09-04 Björn Ricks +2012-09-04 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/UserServiceImpl.java: Refactor getCurrentUser to return the logged in user and not the first user from the artifact database. -2012-09-04 Björn Ricks +2012-09-04 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/RemoteServiceServlet.java, src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java, @@ -656,12 +666,12 @@ * src/main/java/de/intevation/flys/client/client/ui/LinkSelection.java: Place map image in helper section. -2012-09-04 Björn Ricks +2012-09-04 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/auth/plain/Authenticator.java: Add some debug which file will be used for local user authentification -2012-09-04 Björn Ricks +2012-09-04 Bjďż˝rn Ricks * src/main/webapp/WEB-INF/features.xml: Add features for flys_wsa_schweinfurt role @@ -770,19 +780,19 @@ * src/main/java/de/intevation/flys/client/client/ui/ProjectList.java: Call super() constructor. -2012-08-31 Björn Ricks +2012-08-31 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/ui/ModuleSelection.java: Set the default value of the RadioGroupItem if a module is selected. -2012-08-31 Björn Ricks +2012-08-31 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/ModuleServiceImpl.java, src/main/java/de/intevation/flys/client/client/services/ModuleService.java: Load the list of modules from the flys artifact server. Also respect the selected attribute of a module. -2012-08-31 Björn Ricks +2012-08-31 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/shared/model/DefaultModule.java, src/main/java/de/intevation/flys/client/client/services/ModuleService.java: @@ -808,12 +818,12 @@ * src/main/java/de/intevation/flys/client/client/ui/ExportPanel.java: Hide the W/Q AT export button in fix analysis parameter tab. -2012-08-31 Björn Ricks +2012-08-31 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/auth/UserClient.java: User xml namespace for XPath attribute query. -2012-08-31 Björn Ricks +2012-08-31 Bjďż˝rn Ricks * src/main/webapp/WEB-INF/web.xml: Add servlet settings for ModuleService @@ -841,30 +851,30 @@ src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: i18n for logo placement. -2012-08-29 Björn Ricks +2012-08-29 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/ui/ModuleSelection.java: Load modules from the ModuleService instead of using hardcoded strings. -2012-08-29 Björn Ricks +2012-08-29 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/ModuleServiceImpl.java: Hardcode German translations for module names until real translations are available. -2012-08-29 Björn Ricks +2012-08-29 Bjďż˝rn Ricks * src/main/webapp/WEB-INF/features.xml: Add roles and features for GGinA -2012-08-29 Björn Ricks +2012-08-29 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/services/ModuleServiceAsync.java, src/main/java/de/intevation/flys/client/client/services/ModuleService.java, src/main/java/de/intevation/flys/client/server/ModuleServiceImpl.java: Added service to list available modules for a user. -2012-08-29 Björn Ricks +2012-08-29 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/shared/model/DefaultModule.java, src/main/java/de/intevation/flys/client/shared/model/Module.java: @@ -931,23 +941,23 @@ src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: Added i18n strings. -2012-08-24 Björn Ricks +2012-08-24 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/auth/UserClient.java: Use new find-user REST interface to check if a user already exists in the database or a new user must be created. -2012-08-24 Björn Ricks +2012-08-24 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/auth/UserClient.java: Send account data to REST interface. -2012-08-24 Björn Ricks +2012-08-24 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/auth/UserClient.java: Don't use XPath Query to get attribute of a XML Node -2012-08-24 Björn Ricks +2012-08-24 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/auth/DefaultUser.java, src/main/java/de/intevation/flys/client/server/auth/was/Response.java, @@ -957,12 +967,12 @@ assertion NameIdentifier element for the account name. For text authentication user username also as account name. -2012-08-24 Björn Ricks +2012-08-24 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/LoginServlet.java: Add debug output if a database user will be created. -2012-08-23 Björn Ricks +2012-08-23 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/UserServiceImpl.java: Avoid using XPath queries for getting attributes of a node. @@ -1005,7 +1015,7 @@ Shortend lines to 80 chars. Made debug outout conditional. Use block copy instead of tight byte wise loop. -2012-08-16 Björn Ricks +2012-08-16 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/ProxyServlet.java: Implement a ProxyServlet to be able to restrict the access to the @@ -1019,7 +1029,7 @@ Replaced another attribute fetching XPath with a simple DOM getAttributeNS() call. -2012-08-15 Björn Ricks +2012-08-15 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java: Avoid NullPointerException if user authetication is deactivated. If user @@ -1039,14 +1049,14 @@ src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties: Added i18n string for single location label. -2012-08-15 Björn Ricks +2012-08-15 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java: Only return rivers that the user is allowed to see. Evaluate the allowed features of the current logged in user and hide rivers which aren't mentioned in the features list. -2012-08-15 Björn Ricks +2012-08-15 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/client/services/RemoteServiceServlet.java: Implement an extended GWT RemoteServiceServlet to be able to get the @@ -1058,29 +1068,29 @@ src/main/java/de/intevation/flys/client/server/features/XMLFileFeatures.java: Removed superfluous imports. -2012-08-08 Björn Ricks +2012-08-08 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/auth/was/Response.java: Add debug log of a successfull authentification inclusive the corresponding features of the authenticated user. -2012-08-08 Björn Ricks +2012-08-08 Bjďż˝rn Ricks * src/main/webapp/WEB-INF/features.xml: Add example features for GGinA/WAS role flys_bfg. -2012-08-08 Björn Ricks +2012-08-08 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/features/XMLFileFeatures.java: Don't use a xml namespace to get the "name" attribute of a role. -2012-08-08 Björn Ricks +2012-08-08 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/auth/was/Authenticator.java, src/main/java/de/intevation/flys/client/server/auth/was/Response.java, src/main/java/de/intevation/flys/client/server/auth/was/User.java: Implement Features handling for WAS authentication. -2012-08-08 Björn Ricks +2012-08-08 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/LoginServlet.java, src/main/java/de/intevation/flys/client/server/auth/plain/Authenticator.java, @@ -1101,25 +1111,25 @@ * src/main/java/de/intevation/flys/client/server/meta/Converter.java: Removed trailing whitespace. -2012-08-08 Björn Ricks +2012-08-08 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/features/XMLFileFeatures.java: Always close FileInputStream, improve for loops and avoid XPath for getting a xml attribute. -2012-08-08 Björn Ricks +2012-08-08 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/CapabilitiesParser.java, src/main/java/de/intevation/flys/client/server/BaseServlet.java, src/main/webapp/WEB-INF/web.xml: Remove the obsolete BaseServlet. Initializing of logging is now handled by the BaseServletContextListener class which is loaded before any Servlet. -2012-08-08 Björn Ricks +2012-08-08 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/features/FeatureServletContextListener.java, src/main/java/de/intevation/flys/client/server/BaseServletContextListener.java, src/main/webapp/WEB-INF/web.xml: Rename and move FeatureServletContextListener. -2012-08-08 Björn Ricks +2012-08-08 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/features/FeatureServletContextListener.java, src/main/webapp/WEB-INF/web.xml: Implement a ServletContextListener to initialize the Fearures from a xml @@ -1128,7 +1138,7 @@ The FeatureServletContextListener class also initializes the logging now because it is loaded before the BaseServlet. -2012-08-08 Björn Ricks +2012-08-08 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/features/XMLFileFeatures.java, src/main/java/de/intevation/flys/client/server/features/FeaturesNamespaceContext.java, @@ -1498,7 +1508,7 @@ src/main/java/de/intevation/flys/client/server/auth/AuthenticationFactory.java: Added debug output. -2012-07-13 Björn Ricks +2012-07-13 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/LoginServlet.java, src/main/java/de/intevation/flys/client/server/auth/UserClient.java: @@ -1542,12 +1552,12 @@ src/main/java/de/intevation/flys/client/server/auth/DefaultUser.java: Cosmetics. -2012-07-13 Björn Ricks +2012-07-13 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/auth/User.java: Add javadoc for the user class. -2012-07-13 Björn Ricks +2012-07-13 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/auth/User.java, src/main/java/de/intevation/flys/client/server/auth/plain/Authenticator.java @@ -1576,24 +1586,24 @@ main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: Added i18n strings. -2012-07-13 Björn Ricks +2012-07-13 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/auth/was/Request.java: Removed System.out.println debug statement for the request uri. -2012-07-13 Björn Ricks +2012-07-13 Bjďż˝rn Ricks * src/main/webapp/WEB-INF/web.xml: Removed trailing whitespace. -2012-07-13 Björn Ricks +2012-07-13 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/GGInAFilter.java: Implement re-authentication if the user (ticket) has expired. Every "ticket" in GGInA has an end date. Therefore send a new authentication request if the current date is after the end date. -2012-07-13 Björn Ricks +2012-07-13 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/LoginServlet.java, src/main/webapp/WEB-INF/web.xml: @@ -1601,12 +1611,12 @@ Using the servlet context allows to set the method globally and not only for one servlet. -2012-07-13 Björn Ricks +2012-07-13 Bjďż˝rn Ricks * src/main/webapp/FLYS.css: Add styles for the authentication error at the login page. -2012-07-13 Björn Ricks +2012-07-13 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/LoginServlet.java: Also log an authentication failure. Several reasons could exist @@ -1614,20 +1624,20 @@ wrong credentials but also because the GGInA protocol has changed unexpectedly. Therefore also log the error. -2012-07-13 Björn Ricks +2012-07-13 Bjďż˝rn Ricks * src/main/webapp/login.jsp, src/main/java/de/intevation/flys/client/server/LoginServlet.java: Display exception details to the user if an authentication fails. -2012-07-13 Björn Ricks +2012-07-13 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/auth/Authentication.java, src/main/java/de/intevation/flys/client/server/auth/was/Response.java: Extend Authentication getUser method to throw an AuthenticationException. Also the Response constructor now throws an IOException. -2012-07-13 Björn Ricks +2012-07-13 Bjďż˝rn Ricks * src/main/java/de/intevation/fly/client/server/auth/was/User.java: Derive User class from new @@ -1707,7 +1717,7 @@ src/main/java/de/intevation/flys/client/client/ui/sq/SQMultiPeriodPanel.java: Removed superfluous imports. -2012-07-11 Björn Ricks +2012-07-11 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/auth/Authentication.java, src/main/java/de/intevation/flys/client/server/auth/AuthenticationFactory.java, @@ -1727,7 +1737,7 @@ package. Abstract the authentication classes to allow other authentications beside WAS/GGInA. -2012-07-11 Björn Ricks +2012-07-11 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/GGInAFilter.java: Check filter config in web.xml for String false to deactivate the GGInAFilter instead of "1". @@ -1760,12 +1770,12 @@ * src/main/webapp/WEB-INF/web.xml: Added new service to config. -2012-07-11 Björn Ricks +2012-07-11 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/GGInAFilter.java: Redirect a user to the login page if he isn't authenticated. -2012-07-11 Björn Ricks +2012-07-11 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/LoginServlet.java, src/main/webapp/login.jsp, @@ -1773,12 +1783,12 @@ src/main/webapp/WEB-INF/web.xml: Implement a login page to be able to authenticate a user. -2012-07-11 Björn Ricks +2012-07-11 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/GGInATrustStrategy.java: Add a TrustStrategy to be able to accept all SSL certificates. -2012-07-11 Björn Ricks +2012-07-11 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/was/User.java: Add a first implementation of a WAS user class. @@ -1789,13 +1799,13 @@ Directly use Base64InputStream filter stream instead of reading into memory first. -2012-07-10 Björn Ricks +2012-07-10 Bjďż˝rn Ricks * pom.xml: Add dependencies for jdom 1.1.3, Apache commons-io 2.2 and Apache httpcomponents 4.2. All are dependencies are used in the new WAS classes. -2012-07-10 Björn Ricks +2012-07-10 Bjďż˝rn Ricks * src/main/java/de/intevation/flys/client/server/was/Assertion.java src/main/java/de/intevation/flys/client/server/was/Request.java, @@ -3045,7 +3055,7 @@ 2012-04-02 Ingo Weinzierl - flys/issue556 (ÜSK: neues Projekt, wenn zuvor INFO-Button verwendet wurde) + flys/issue556 (ďż˝SK: neues Projekt, wenn zuvor INFO-Button verwendet wurde) * src/main/java/de/intevation/flys/client/client/ui/map/GetFeatureInfoWindow.java: Made window modal and display a modal mask. @@ -3077,7 +3087,7 @@ 2012-03-20 Ingo Weinzierl - flys/issue544 (Historische ATs: Eingabeunterstützung W/Q) + flys/issue544 (Historische ATs: Eingabeunterstďż˝tzung W/Q) * src/main/java/de/intevation/flys/client/shared/model/ArtifactDescription.java, src/main/java/de/intevation/flys/client/shared/model/DefaultArtifactDescription.java: @@ -3137,7 +3147,7 @@ 2012-03-20 Ingo Weinzierl - * flys/issue204 (W-INFO: Wasserspiegellagenberechnung / Layout Auswahlunterstützung Q/W/D) + * flys/issue204 (W-INFO: Wasserspiegellagenberechnung / Layout Auswahlunterstďż˝tzung Q/W/D) * src/main/java/de/intevation/flys/client/client/FLYSConstants.java, src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties, @@ -3292,14 +3302,14 @@ 2012-03-01 Ingo Weinzierl - flys/issue557 (ÜSK: Flächenmessung --> Tooltip falsch) + flys/issue557 (ďż˝SK: Flďż˝chenmessung --> Tooltip falsch) * src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: Fixed wrong i18n string used for tooltip. 2012-03-01 Ingo Weinzierl - flys/issue558 (ÜSK: Farbänderung in Karte / keine Änderung in der Themenliste) + flys/issue558 (ďż˝SK: Farbďż˝nderung in Karte / keine ďż˝nderung in der Themenliste) * src/main/java/de/intevation/flys/client/shared/MapUtils.java: Append the current time millis at the end of the GetLegendGraphic URL to trick the @@ -3307,7 +3317,7 @@ 2012-03-01 Ingo Weinzierl - flys/issue555 (ÜSK: Info-Button) + flys/issue555 (ďż˝SK: Info-Button) * src/main/java/de/intevation/flys/client/client/ui/map/GetFeatureInfo.java: Close old GetFeatureInfoWindows before creating new ones. @@ -4429,7 +4439,7 @@ 2012-01-12 Felix Wolfsteller - Partial flys/issue441 (Fläche über HSQ (zweite Achse) verkehrt). + Partial flys/issue441 (Flďż˝che ďż˝ber HSQ (zweite Achse) verkehrt). * src/main/java/de/intevation/flys/client/client/ui/chart/ChartThemePanel.java: Adjust data content to what is expected on server side (to allow @@ -4454,7 +4464,7 @@ 2012-01-11 Felix Wolfsteller - Partial flys/issue439 (Streckenfavoriten lassen sich nicht über den + Partial flys/issue439 (Streckenfavoriten lassen sich nicht ďż˝ber den Datenkorb hinzuladen) * src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties, @@ -4697,7 +4707,7 @@ 2012-01-02 Ingo Weinzierl - flys/issue431 (Karte: Hinzuladen externer WMS Layer nicht möglich) + flys/issue431 (Karte: Hinzuladen externer WMS Layer nicht mďż˝glich) * src/main/java/de/intevation/flys/client/server/CapabilitiesParser.java: Added support for WMS 1.3.0: the projection's are defined in a @@ -5013,7 +5023,7 @@ 2011-12-19 Ingo Weinzierl - flys/issue409 (Überschwemmungsfläche: Reihenfolge in Themenliste nicht immer synchron mit Rendering) + flys/issue409 (ďż˝berschwemmungsflďż˝che: Reihenfolge in Themenliste nicht immer synchron mit Rendering) * src/main/java/de/intevation/flys/client/client/ui/map/FloodMap.java: Added a addLayer() method which should be used to add new layers to the map. New @@ -5383,7 +5393,7 @@ 2011-12-08 Ingo Weinzierl - flys/issue421 (Diagramm: Löschen eines Thema ohne Rückfrage beim Nutzer) + flys/issue421 (Diagramm: Lďż˝schen eines Thema ohne Rďż˝ckfrage beim Nutzer) * src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties, src/main/java/de/intevation/flys/client/client/FLYSConstants.properties, @@ -6129,7 +6139,7 @@ 2011-10-24 Felix Wolfsteller - Fix flys/issue390 (W-Diff: Icon zum Löschen anpassen). + Fix flys/issue390 (W-Diff: Icon zum Lďż˝schen anpassen). * src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java: Polishing and use different icon to remove rows in selections diff -r 145980c21700 -r 7c03d3bd9262 flys-client/src/main/java/de/intevation/flys/client/client/ui/DoubleInputPanel.java --- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DoubleInputPanel.java Mon Oct 08 12:10:50 2012 +0200 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DoubleInputPanel.java Mon Oct 08 12:22:03 2012 +0200 @@ -35,6 +35,7 @@ private double value; + public DoubleInputPanel() { } @@ -54,6 +55,7 @@ } + /** Create a labelled input-panel. */ public Canvas createWidget(DataList data) { VLayout layout = new VLayout(); @@ -83,6 +85,8 @@ return new VLayout(); } + + /** Create canvas to show previously entered value. */ @Override public Canvas createOld(DataList dataList) { List items = dataList.getAll(); @@ -154,3 +158,4 @@ return true; } } +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 145980c21700 -r 7c03d3bd9262 flys-client/src/main/java/de/intevation/flys/client/client/ui/UIProviderFactory.java --- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/UIProviderFactory.java Mon Oct 08 12:10:50 2012 +0200 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/UIProviderFactory.java Mon Oct 08 12:22:03 2012 +0200 @@ -131,6 +131,9 @@ else if (uiProvider.equals("outliers_input")) { return new DoubleInputPanel(); } + else if (uiProvider.equals("percent_input")) { + return new DoubleInputPanel(); + } else if (uiProvider.equals("parameter-matrix")) { return new ParameterMatrixPanel(); }