Mercurial > dive4elements > river
changeset 3549:6a8f83c538e3
Merged revisions 5384 via svnmerge from
file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-client/trunk
........
r5384 | felix | 2012-09-07 15:02:46 +0200 (Fr, 07 Sep 2012) | 1 line
Cosmetics, docs.
........
flys-client/tags/2.9@5389 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Fri, 07 Sep 2012 13:12:48 +0000 |
parents | fed914a42a10 |
children | 06a65baae494 |
files | flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/FLYS.java flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacagePairWidget.java flys-client/src/main/java/de/intevation/flys/client/client/ui/FLYSView.java flys-client/src/main/java/de/intevation/flys/client/client/ui/FLYSWorkspace.java flys-client/src/main/java/de/intevation/flys/client/client/ui/OutputTab.java flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/MousePositionPanel.java flys-client/src/main/java/de/intevation/flys/client/shared/model/ChartInfo.java |
diffstat | 9 files changed, 27 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Fri Sep 07 12:03:15 2012 +0000 +++ b/flys-client/ChangeLog Fri Sep 07 13:12:48 2012 +0000 @@ -1,3 +1,15 @@ +2012-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * src/main/java/de/intevation/flys/client/shared/model/ChartInfo.java, + src/main/java/de/intevation/flys/client/client/FLYS.java, + src/main/java/de/intevation/flys/client/client/ui/FLYSView.java, + src/main/java/de/intevation/flys/client/client/ui/chart/MousePositionPanel.java, + src/main/java/de/intevation/flys/client/client/ui/OutputTab.java, + src/main/java/de/intevation/flys/client/client/ui/CollectionView.java, + src/main/java/de/intevation/flys/client/client/ui/FLYSWorkspace.java, + src/main/java/de/intevation/flys/client/client/ui/DatacagePairWidget.java: + Cosmetics, docs. + 2012-09-04 Björn Ricks <bjoern.ricks@intevation.de> * src/main/java/de/intevation/flys/client/server/UserServiceImpl.java:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYS.java Fri Sep 07 12:03:15 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYS.java Fri Sep 07 13:12:48 2012 +0000 @@ -75,7 +75,7 @@ /** The menu bar at the top of the application. */ protected MainMenu menu; - /** The content window. It takes the whole space beneath the menu bar.*/ + /** The content window. It takes the whole space beneath the menu bar. */ protected FLYSView view; /** The project list that displays the projects of the user. */ @@ -314,11 +314,13 @@ } + /** Whether project uuid is currently opened. */ protected boolean isProjectLocked(String uuid) { return openProjects.contains(uuid); } + /** Opens (or bring into foreground) project with given id. */ public void openProject(final String collectionID) { if (collectionID == null) { return;
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java Fri Sep 07 12:03:15 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java Fri Sep 07 13:12:48 2012 +0000 @@ -329,6 +329,7 @@ } + /** Disables input, grey out, show spinning wheel of joy. */ public void lockUI() { if (lockScreen == null) { lockScreen = new VLayout(); @@ -357,6 +358,7 @@ } + /** Enable input, remove grey, remove spinning wheel of joy. */ public void unlockUI() { layout.removeChild(lockScreen); }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacagePairWidget.java Fri Sep 07 12:03:15 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacagePairWidget.java Fri Sep 07 13:12:48 2012 +0000 @@ -20,12 +20,13 @@ /** - * Widget showing two Datacages and a plus-button. - * Insert a record into a listgrid when plus-button clicked. + * Widget showing two Datacages and a add-this-button. + * Insert a record into a listgrid when add-this-button clicked. */ public class DatacagePairWidget extends VLayout { + /** i18n resource. */ protected FLYSConstants MSG = GWT.create(FLYSConstants.class);
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/FLYSView.java Fri Sep 07 12:03:15 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/FLYSView.java Fri Sep 07 13:12:48 2012 +0000 @@ -5,6 +5,8 @@ /** + * Vertically speaking the main part of the ui (containing projectlist + * and workspace). * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> */ public class FLYSView extends Canvas {
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/FLYSWorkspace.java Fri Sep 07 12:03:15 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/FLYSWorkspace.java Fri Sep 07 13:12:48 2012 +0000 @@ -7,6 +7,7 @@ /** + * "Workspace" canvas showing the CollectionViews (subwindows). * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> */ public class FLYSWorkspace extends Canvas {
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/OutputTab.java Fri Sep 07 12:03:15 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/OutputTab.java Fri Sep 07 13:12:48 2012 +0000 @@ -16,7 +16,7 @@ /** The Collection that should be displayed in this tab.*/ protected Collection collection; - /** The CollectionView. */ + /** The CollectionView containing this tab. */ protected CollectionView collectionView;
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/MousePositionPanel.java Fri Sep 07 12:03:15 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/MousePositionPanel.java Fri Sep 07 13:12:48 2012 +0000 @@ -14,6 +14,7 @@ /** + * Panel showing the mouse position in data space. * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> */ public class MousePositionPanel extends HLayout implements MouseMoveHandler {
--- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/ChartInfo.java Fri Sep 07 12:03:15 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/ChartInfo.java Fri Sep 07 13:12:48 2012 +0000 @@ -8,6 +8,8 @@ /** + * Give information about chart dimension and transform of chart<->pixel + * space. * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> */ public class ChartInfo implements Serializable {