From 795820e48f26c45eb3b08fbacc408ee566bed4a7 Mon Sep 17 00:00:00 2001
From: izabel <izabel>
Date: Tue, 17 Mar 2009 21:53:19 +0000
Subject: [PATCH] [LMS-780] small experiment editing improvement
SVN: 10270
---
.../client/application/ui/AbstractRegistrationForm.java | 7 +++++--
.../client/application/AbstractGenericEntityEditForm.java | 4 +++-
.../web/client/application/ClientPluginFactory.java | 2 +-
.../application/experiment/GenericExperimentEditForm.java | 8 ++++++++
4 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractRegistrationForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractRegistrationForm.java
index 8cd786d0ab5..8780640c0c7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractRegistrationForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractRegistrationForm.java
@@ -22,7 +22,7 @@ import com.extjs.gxt.ui.client.event.ButtonEvent;
import com.extjs.gxt.ui.client.event.FieldEvent;
import com.extjs.gxt.ui.client.event.Listener;
import com.extjs.gxt.ui.client.event.SelectionListener;
-import com.extjs.gxt.ui.client.widget.LayoutContainer;
+import com.extjs.gxt.ui.client.widget.ContentPanel;
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.form.HiddenField;
@@ -43,7 +43,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMess
*
* @author Christian Ribeaud
*/
-public abstract class AbstractRegistrationForm extends LayoutContainer
+public abstract class AbstractRegistrationForm extends ContentPanel
{
public static final String SAVE_BUTTON = "save-button";
@@ -71,7 +71,10 @@ public abstract class AbstractRegistrationForm extends LayoutContainer
{
this.labelWidth = labelWidth;
this.fieldWitdh = fieldWidth;
+ setHeaderVisible(false);
setLayout(new FlowLayout(5));
+ setBodyBorder(false);
+ setBorders(false);
setScrollMode(Scroll.AUTO);
setId(id);
add(infoBox = createInfoBox());
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityEditForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityEditForm.java
index 0d7e3482add..51947c4fbab 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityEditForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityEditForm.java
@@ -21,8 +21,10 @@ import java.util.List;
import com.extjs.gxt.ui.client.event.ComponentEvent;
import com.extjs.gxt.ui.client.event.SelectionListener;
+import com.extjs.gxt.ui.client.util.Margins;
import com.extjs.gxt.ui.client.widget.button.Button;
import com.extjs.gxt.ui.client.widget.form.Field;
+import com.extjs.gxt.ui.client.widget.layout.RowData;
import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.ui.Widget;
@@ -96,7 +98,7 @@ abstract public class AbstractGenericEntityEditForm<T extends EntityType, S exte
}));
for (Widget w : checkComponents)
{
- add(w);
+ add(w, new RowData(1, -1, new Margins(5)));
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/ClientPluginFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/ClientPluginFactory.java
index 43b4445e318..868b9771d9d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/ClientPluginFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/ClientPluginFactory.java
@@ -255,7 +255,7 @@ public final class ClientPluginFactory extends
Component component =
new GenericExperimentEditForm(getViewContext(), entity, true);
return new DefaultTabItem(getViewContext().getMessage(Dict.EDIT_TITLE,
- entity.getIdentifier()), component, false);
+ getViewContext().getMessage(Dict.EXPERIMENT)), component, false);
}
public String getId()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java
index e97ddcbef32..1e76626d465 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java
@@ -76,6 +76,8 @@ public final class GenericExperimentEditForm
this.viewContext = viewContext;
sessionKey = createSimpleId(EntityKind.EXPERIMENT, entity.getId() + "");
originalProjectIdentifier = entity.getProjectIdentifier();
+ setHeaderVisible(true);
+ updateHeader();
projectChooser =
new ProjectSelectionWidget(viewContext, sessionKey, originalProjectIdentifier);
FieldUtil.markAsMandatory(projectChooser);
@@ -197,6 +199,7 @@ public final class GenericExperimentEditForm
originalProjectIdentifier = projectChooser.tryGetSelectedProject().getIdentifier();
entity.setIdentifier(originalProjectIdentifier + "/" + entity.getCode());
attachmentsInfo.setHtml(getAttachmentInfoText(attachmentManager.attachmentsDefined()));
+ updateHeader();
}
public String getAttachmentInfoText(int attachmentDefined)
@@ -211,4 +214,9 @@ public final class GenericExperimentEditForm
return "No new attachments added.";
}
}
+
+ private void updateHeader()
+ {
+ setHeading("Experiment " + entity.getIdentifier());
+ }
}
--
GitLab