# HG changeset patch
# User Tom Gottfried <tom@intevation.de>
# Date 1404836344 -7200
# Node ID b57ecf80e40c7c00dff6eddebbe6d972bf94e4c8
# Parent  107d38f6e489402d8fb0d1c83e88e5bba327b8cf# Parent  4ca747495cbf5c9144b17752f7f59a28778fdb71
merged default into branch facet-metadata.

diff -r 107d38f6e489 -r b57ecf80e40c contrib/make_flys_release/README
--- a/contrib/make_flys_release/README	Fri Jul 04 09:11:37 2014 +0200
+++ b/contrib/make_flys_release/README	Tue Jul 08 18:19:04 2014 +0200
@@ -41,10 +41,12 @@
 
 Nachdem die Konfigurationen angepasst wurden, kann das Skript mittels
   sh make_release.sh VERSION
-von der Konsole gestartet werden. Anschließend werden die Quellen des
+von der Konsole gestartet werden. VERSION kann dabei ein Tag oder der Name
+eines Branches sein. Anschließend werden die Quellen des
 dive4elements, des HTTP-Clients und von FLYS über SSH aus dem HG Repository
 ausgecheckt und in FLYS_SOURCE_DIR abgelegt.
 
+
 Wenn mit der option -t zusätzlich ausgewählt wird diese version zu taggen
 muss in der make_flys_release.sh der entsprechende accountname zum pushen
 des tags als DEVELOPER angegeben werden.
diff -r 107d38f6e489 -r b57ecf80e40c contrib/make_flys_release/make_release.sh
--- a/contrib/make_flys_release/make_release.sh	Fri Jul 04 09:11:37 2014 +0200
+++ b/contrib/make_flys_release/make_release.sh	Tue Jul 08 18:19:04 2014 +0200
@@ -126,7 +126,7 @@
 fi
 
 VERSION=$1
-if [ "$VERSION" = "default" ]; then
+if [ -n "`hg branches | sed -n "/$VERSION/p"`" ]; then
     ARTIFACT_PORT=${ARTIFACT_PORT:-29999}
 else
     ARTIFACT_PORT=${ARTIFACT_PORT:-`echo 1$VERSION | sed 's/\.//g'`}
@@ -178,7 +178,13 @@
 # Update to current version
 for repo in $REPOS; do
     cd $repo
-    hg up $VERSION
+    if [ -z "`hg tags | sed -n "/$VERSION/p"`" -a -z "`hg branches | sed -n "/$VERSION/p"`" ]
+    then
+        echo "[WARNING]: $VERSION not found in $repo! Updating to default."
+        hg up default
+    else
+        hg up "$VERSION"
+    fi
     cd $FLYS_SOURCE_DIR
 done
 
diff -r 107d38f6e489 -r b57ecf80e40c gwt-client/src/main/java/org/dive4elements/river/client/client/ui/ParameterList.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/ParameterList.java	Fri Jul 04 09:11:37 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/ParameterList.java	Tue Jul 08 18:19:04 2014 +0200
@@ -258,7 +258,9 @@
             public void addMember(Canvas component) {
                 super.addMember(component);
                 tableSection.setExpanded(true);
-                stack.getSection(InfoPanel.SECTION_ID).setExpanded(false);
+                if (stack.getSection(InfoPanel.SECTION_ID) != null) {
+                    stack.getSection(InfoPanel.SECTION_ID).setExpanded(false);
+                }
             }
 
             @Override
diff -r 107d38f6e489 -r b57ecf80e40c gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java	Fri Jul 04 09:11:37 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java	Tue Jul 08 18:19:04 2014 +0200
@@ -255,6 +255,7 @@
             FormItem fix = createBooleanProperty(fixation);
             fix.setValue(((BooleanProperty)
                 origPg.getPropertyByName("fixation")).getValue().booleanValue());
+            fix.setWidth(30);
 
             fix.addChangedHandler(new ChangedHandler() {
                 @Override
diff -r 107d38f6e489 -r b57ecf80e40c gwt-client/src/main/java/org/dive4elements/river/client/client/widgets/KMSpinner.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/widgets/KMSpinner.java	Fri Jul 04 09:11:37 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/widgets/KMSpinner.java	Tue Jul 08 18:19:04 2014 +0200
@@ -12,6 +12,8 @@
 import com.google.gwt.i18n.client.NumberFormat;
 
 import com.smartgwt.client.data.Record;
+import com.smartgwt.client.types.Alignment;
+import com.smartgwt.client.types.VerticalAlignment;
 import com.smartgwt.client.widgets.Button;
 import com.smartgwt.client.widgets.Label;
 import com.smartgwt.client.widgets.events.ClickEvent;
@@ -47,12 +49,13 @@
         this.value = initialValue;
 
         setWidth("99%");
-        setHeight(18);
+        setHeight(24);
 
         // minusButton shall ask service for previous available cs.
         Button minusButton = new Button("-");
         minusButton.setWidth(18);
-        minusButton.setHeight(18);
+        minusButton.setHeight(22);
+        minusButton.setValign(VerticalAlignment.CENTER);
         minusButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
             public void onClick(ClickEvent evt) {
                 fireChangedEvent(value - 0.1d, false);
@@ -64,7 +67,7 @@
         kmField.setValue(initialValue);
         kmField.setWidth("*");
         kmField.setTitle("");
-        kmField.setHeight(16);
+        kmField.setHeight(20);
 
         FormItemValueFormatter doubleFormat = new FormItemValueFormatter() {
             public String formatValue(Object value, Record record, DynamicForm form, FormItem item) {
@@ -134,18 +137,19 @@
         form.setTitleSuffix("");
         form.setTitleWidth(0);
         form.setWidth(50);
-        form.setHeight(18);
 
         // PlusButton shall ask service for next available cs.
         Button plusButton = new Button("+");
         plusButton.setWidth(18);
-        plusButton.setHeight(18);
+        plusButton.setHeight(22);
+        plusButton.setValign(VerticalAlignment.CENTER);
         plusButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
             public void onClick(ClickEvent evt) {
                 fireChangedEvent(value + 0.1d, true);
             }
         });
 
+        this.setMembersMargin(5);
         this.addMember(minusButton);
         this.addMember(form);
         this.addMember(plusButton);