[LMS-695] remove: - TODOs.

SVN: 9439

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractRegistrationForm.java

@@ -26,8 +26,11 @@ import com.extjs.gxt.ui.client.widget.LayoutContainer;
 import com.extjs.gxt.ui.client.widget.button.Button;
 import com.extjs.gxt.ui.client.widget.form.FormPanel;
 import com.extjs.gxt.ui.client.widget.layout.FlowLayout;
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.Widget;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.ClickableFormPanel;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.InfoBox;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
 
@@ -78,9 +81,10 @@ public abstract class AbstractRegistrationForm extends LayoutContainer
         return infoBox;
     }
 
-    protected FormPanel createFormPanel(final IMessageProvider messageProvider)
+    protected ClickableFormPanel createFormPanel(final IMessageProvider messageProvider)
     {
-        final FormPanel panel = new FormPanel();
+        final ClickableFormPanel panel = new ClickableFormPanel();
+        panel.addClickListener(new InfoBoxResetListener(infoBox));
         panel.setHeaderVisible(false);
         panel.setBodyBorder(false);
         panel.setWidth(labelWidth + fieldWitdh + 40);
@@ -137,7 +141,7 @@ public abstract class AbstractRegistrationForm extends LayoutContainer
     // Helper classes
     //
 
-    public final static class InfoBoxResetListener implements Listener<FieldEvent>
+    public final static class InfoBoxResetListener implements Listener<FieldEvent>, ClickListener
     {
         private final InfoBox infoBox;
 
@@ -147,13 +151,27 @@ public abstract class AbstractRegistrationForm extends LayoutContainer
             this.infoBox = infoBox;
         }
 
+        private void resetInfoBox()
+        {
+            infoBox.reset();
+        }
+
         //
         // Listener
         //
 
         public final void handleEvent(final FieldEvent be)
         {
-            infoBox.reset();
+            resetInfoBox();
+        }
+
+        //
+        // ClickListener
+        //
+
+        public final void onClick(Widget sender)
+        {
+            resetInfoBox();
         }
     }
 

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/EnterKeyListener.java

@@ -2,6 +2,7 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui;
 
 import com.extjs.gxt.ui.client.event.ComponentEvent;
 import com.extjs.gxt.ui.client.event.KeyListener;
+import com.google.gwt.user.client.ui.KeyboardListener;
 
 /**
  * A {@link KeyListener} implementation which does something when enter key is entered.
@@ -19,7 +20,7 @@ public abstract class EnterKeyListener extends KeyListener
     @Override
     public final void componentKeyUp(final ComponentEvent event)
     {
-        if (event.getKeyCode() == 13)
+        if (event.getKeyCode() == KeyboardListener.KEY_ENTER)
         {
             onEnterKey();
             event.stopEvent();

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeRegistration.java

@@ -16,7 +16,6 @@
 
 package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property_type;
 
-import com.extjs.gxt.ui.client.Events;
 import com.extjs.gxt.ui.client.event.SelectionChangedEvent;
 import com.extjs.gxt.ui.client.event.SelectionChangedListener;
 import com.extjs.gxt.ui.client.widget.LayoutContainer;
@@ -44,7 +43,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.Vocabulary;
  * 
  * @author Christian Ribeaud
  */
-// TODO 2008-12-28, Christian Ribeaud: Add 'USER.' as label just before the field.
 public final class PropertyTypeRegistration extends AbstractRegistrationForm
 {
     private static final String PREFIX = "property-type-registration";
@@ -88,9 +86,6 @@ public final class PropertyTypeRegistration extends AbstractRegistrationForm
     private final void addFields()
     {
         formPanel.add(propertyTypeCodeField = createCodeField());
-        // TODO 2008-12-28, Christian Ribeaud: Find a generic way to handle this.
-        propertyTypeCodeField.addListener(Events.Focus,
-                new AbstractRegistrationForm.InfoBoxResetListener(infoBox));
         formPanel.add(propertyTypeLabelField = createPropertyTypeLabelField());
         formPanel.add(propertyTypeDescriptionField =
                 createDescriptionField(viewContext.getMessage(Dict.DESCRIPTION), true));
@@ -195,10 +190,11 @@ public final class PropertyTypeRegistration extends AbstractRegistrationForm
                                 DataTypeCode.CONTROLLEDVOCABULARY.name());
             } else
             {
-                vocabularySelectionWidget.reset();
                 visible = false;
             }
+            vocabularySelectionWidget.reset();
             vocabularySelectionWidget.setVisible(visible);
+            vocabularySelectionWidget.setAllowBlank(!visible);
         }
     }
 

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ClickableFormPanel.java

+/*
+ * Copyright 2008 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget;
+
+import com.extjs.gxt.ui.client.event.ComponentEvent;
+import com.extjs.gxt.ui.client.widget.form.FormPanel;
+import com.google.gwt.user.client.Event;
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.ClickListenerCollection;
+import com.google.gwt.user.client.ui.SourcesClickEvents;
+
+/**
+ * A clickable {@link FormPanel}.
+ * 
+ * @author Christian Ribeaud
+ */
+public final class ClickableFormPanel extends FormPanel implements SourcesClickEvents
+{
+
+    private ClickListenerCollection clickListeners = new ClickListenerCollection();
+
+    //
+    // SourcesClickEvents
+    //
+
+    public final void addClickListener(final ClickListener listener)
+    {
+        clickListeners.add(listener);
+    }
+
+    public final void removeClickListener(final ClickListener listener)
+    {
+        clickListeners.remove(listener);
+    }
+
+    //
+    // FormPanel
+    //
+
+    @Override
+    protected final void afterRender()
+    {
+        super.afterRender();
+        sinkEvents(Event.ONCLICK);
+    }
+
+    @Override
+    protected final void onClick(final ComponentEvent ce)
+    {
+        super.onClick(ce);
+        clickListeners.fireClick(this);
+    }
+}

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleBatchRegistrationForm.java

@@ -47,6 +47,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericCon
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.InfoBoxCallbackListener;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.AbstractRegistrationForm;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.ClickableFormPanel;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.InfoBox;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.StringUtils;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.BatchRegistrationResult;
@@ -126,10 +127,11 @@ public final class GenericSampleBatchRegistrationForm extends LayoutContainer
 
     private final FormPanel createFormPanel(final Button button)
     {
-        final FormPanel panel = new FormPanel();
+        final ClickableFormPanel panel = new ClickableFormPanel();
+        panel.addClickListener(new AbstractRegistrationForm.InfoBoxResetListener(infoBox));
         panel.setLayout(new FlowLayout());
-        panel.setWidth(AbstractRegistrationForm.DEFAULT_LABEL_WIDTH + AbstractRegistrationForm.DEFAULT_FIELD_WIDTH
-                + 50);
+        panel.setWidth(AbstractRegistrationForm.DEFAULT_LABEL_WIDTH
+                + AbstractRegistrationForm.DEFAULT_FIELD_WIDTH + 50);
         panel.setHeaderVisible(false);
         panel.setBodyBorder(false);
         panel.setAction(GenericConstants.createServicePath("upload"));
@@ -180,9 +182,6 @@ public final class GenericSampleBatchRegistrationForm extends LayoutContainer
     private final FileUploadField createFileUploadField(final int counter)
     {
         final FileUploadField file = new FileUploadField();
-        file
-                .addListener(Events.OnClick, new AbstractRegistrationForm.InfoBoxResetListener(
-                        infoBox));
         file.setAllowBlank(counter > 0);
         final int number = counter + 1;
         file.setFieldLabel(Format.substitute(FIELD_LABEL_TEMPLATE, number));

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationForm.java

@@ -100,10 +100,6 @@ public final class GenericSampleRegistrationForm extends AbstractRegistrationFor
     {
         codeField = new CodeField(viewContext, viewContext.getMessage(Dict.CODE));
         codeField.setId(CODE_FIELD_ID);
-        // TODO 2008-12-28, Christian Ribeaud: Find a generic way to handle this.
-        codeField.addListener(Events.Focus, new AbstractRegistrationForm.InfoBoxResetListener(
-                infoBox));
-
         groupSelectionWidget = new GroupSelectionWidget(viewContext.getCommonViewContext());
         groupSelectionWidget.setEnabled(SELECT_GROUP_BY_DEFAULT);