diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/dataset/DataSetMenu.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/dataset/DataSetMenu.java
index 416b3e5da40ca45a0fd3880d2b5fada8c007a076..03639f581061bc9226d94e044924bc336bf9080d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/dataset/DataSetMenu.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/dataset/DataSetMenu.java
@@ -32,6 +32,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.Actio
import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenuItem;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
+import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ApplicationInfo;
import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
import ch.systemsx.cisd.openbis.generic.shared.basic.URLMethodWithParameters;
@@ -56,11 +57,10 @@ public class DataSetMenu extends TopMenuItem
componentProvider.getDataSetTypeBrowser()));
submenu.add(new ActionMenu(TopMenu.ActionMenuKind.DATA_SET_MENU_MASS_UPDATE,
messageProvider, componentProvider.getDataSetBatchUpdate()));
+ ApplicationInfo applicationInfo = viewContext.getModel().getApplicationInfo();
boolean cifexConfigured =
- StringUtils
- .isBlank(viewContext.getModel().getApplicationInfo().getCifexRecipient()) == false
- && StringUtils.isBlank(viewContext.getModel().getApplicationInfo()
- .getCIFEXURL()) == false;
+ StringUtils.isNotBlank(applicationInfo.getCifexRecipient())
+ && StringUtils.isNotBlank(applicationInfo.getCifexURL());
if (cifexConfigured)
{
submenu.add(new ActionMenu(TopMenu.ActionMenuKind.DATA_SET_MENU_UPLOAD,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java
index b3f9b33c3bb401430d0ef2dcf7cdfb16bd2069e4..a8142e595397ef5c018d45a811161082d1ee647d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java
@@ -182,7 +182,7 @@ public abstract class AbstractExternalDataGrid
viewContext);
}
});
- if (StringUtils.isBlank(viewContext.getModel().getApplicationInfo().getCIFEXURL()))
+ if (StringUtils.isBlank(viewContext.getModel().getApplicationInfo().getCifexURL()))
{
uploadButton.disable();
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadConfirmationDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadConfirmationDialog.java
index 17048784d6c2f5f898d1721be841c9ac3e753263..15a45fd1514f3524a83e2c9ab81216e5009414e7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadConfirmationDialog.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadConfirmationDialog.java
@@ -75,7 +75,7 @@ final class DataSetUploadConfirmationDialog extends
this.viewContext = viewContext;
this.displayedItemsCount = displayedItemsCount;
this.selectedAndDisplayedItemsAction = selectedAndDisplayedItemsAction;
- cifexURL = viewContext.getModel().getApplicationInfo().getCIFEXURL();
+ cifexURL = viewContext.getModel().getApplicationInfo().getCifexURL();
setWidth(LABEL_WIDTH_IN_UPLOAD_DIALOG + FIELD_WIDTH_IN_UPLOAD_DIALOG + 50);
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadForm.java
index deafc12cb381203de337e78859bf12d8f31a28ff..079430d711741d7d0dff3b507f4c26f200e62b48 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadForm.java
@@ -97,7 +97,7 @@ public class DataSetUploadForm extends AbstractRegistrationForm
String sampleIdentifierOrNull)
{
super(viewContext, createSimpleId(sampleIdentifierOrNull));
- cifexURL = viewContext.getModel().getApplicationInfo().getCIFEXURL();
+ cifexURL = viewContext.getModel().getApplicationInfo().getCifexURL();
cifexRecipient = viewContext.getModel().getApplicationInfo().getCifexRecipient();
saveButton.setText(viewContext.getMessage(Dict.BUTTON_UPLOAD_DATA_VIA_CIFEX));
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ApplicationInfo.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ApplicationInfo.java
index 21084d233669dfffb20614cf4e552af2c01392a1..d18110e3234e36f27c45cf6a47438d2ba4d6a714 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ApplicationInfo.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ApplicationInfo.java
@@ -74,12 +74,12 @@ public final class ApplicationInfo implements IsSerializable
this.version = version;
}
- public void setCIFEXURL(String cifexURL)
+ public void setCifexURL(String cifexURL)
{
this.cifexURL = cifexURL;
}
- public final String getCIFEXURL()
+ public final String getCifexURL()
{
return cifexURL;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
index 83c4bbd8a6fcb78f1baa7b2dbd8efd00efe74ecf..72939c570b62ee0723a9de98fbe956d605429c3d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
@@ -427,7 +427,7 @@ public abstract class AbstractClientService implements IClientService,
if (commonClientService == null || commonClientService == this
|| getApplicationInfoInvocationCount > 0)
{
- applicationInfo.setCIFEXURL(cifexURL);
+ applicationInfo.setCifexURL(cifexURL);
applicationInfo.setCifexRecipient(cifexRecipient);
applicationInfo.setMaxResults(maxResults);
applicationInfo.setWebClientConfiguration(getWebClientConfiguration());
@@ -436,9 +436,9 @@ public abstract class AbstractClientService implements IClientService,
getApplicationInfoInvocationCount++;
ApplicationInfo commonApplicationInfo = commonClientService.getApplicationInfo();
getApplicationInfoInvocationCount--;
- applicationInfo.setCIFEXURL(commonApplicationInfo.getCIFEXURL());
- applicationInfo.setMaxResults(commonApplicationInfo.getMaxResults());
+ applicationInfo.setCifexURL(commonApplicationInfo.getCifexURL());
applicationInfo.setCifexRecipient(commonApplicationInfo.getCifexRecipient());
+ applicationInfo.setMaxResults(commonApplicationInfo.getMaxResults());
applicationInfo.setWebClientConfiguration(commonApplicationInfo
.getWebClientConfiguration());
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/AbstractGenericSampleRegisterEditForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/AbstractGenericSampleRegisterEditForm.java
index 5b40674ad19b043df5f1b1cdef74962cd543a6cb..78daa354a5991a8e78076f2d545893837574d048 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/AbstractGenericSampleRegisterEditForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/AbstractGenericSampleRegisterEditForm.java
@@ -51,6 +51,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.field.S
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.file.AttachmentsFileFieldManager;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.FieldUtil;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
+import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ApplicationInfo;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExperimentIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdAndCodeHolder;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
@@ -121,11 +122,10 @@ abstract public class AbstractGenericSampleRegisterEditForm extends
addUploadFeatures(sesionKeys);
extractInitialValues(actionContext);
saveUploadButton = createSaveAndUploadButton();
+ ApplicationInfo applicationInfo = viewContext.getModel().getApplicationInfo();
boolean cifexConfigured =
- StringUtils
- .isBlank(viewContext.getModel().getApplicationInfo().getCifexRecipient()) == false
- && StringUtils.isBlank(viewContext.getModel().getApplicationInfo()
- .getCIFEXURL()) == false;
+ StringUtils.isNotBlank(applicationInfo.getCifexRecipient())
+ && StringUtils.isNotBlank(applicationInfo.getCifexURL());
if (cifexConfigured)
{
formPanel.addButton(saveUploadButton);
@@ -301,17 +301,18 @@ abstract public class AbstractGenericSampleRegisterEditForm extends
.withSuffix(getSampleTypeCode()));
parentsArea = new ParentSamplesArea(viewContext, getId());
SampleChooserButton parentChooserButton = parentButton.getChooserButton();
- parentChooserButton.addChosenEntityListener(new IChosenEntityListener<TableModelRowWithObject<Sample>>()
- {
- public void entityChosen(TableModelRowWithObject<Sample> entity)
- {
- if (entity != null)
+ parentChooserButton
+ .addChosenEntityListener(new IChosenEntityListener<TableModelRowWithObject<Sample>>()
{
- String sampleIdentifier = entity.getObjectOrNull().getIdentifier();
- parentsArea.appendItem(sampleIdentifier);
- }
- }
- });
+ public void entityChosen(TableModelRowWithObject<Sample> entity)
+ {
+ if (entity != null)
+ {
+ String sampleIdentifier = entity.getObjectOrNull().getIdentifier();
+ parentsArea.appendItem(sampleIdentifier);
+ }
+ }
+ });
container =
SampleChooserField.create(viewContext.getMessage(Dict.PART_OF_SAMPLE), false, null,
true, false, false, viewContext.getCommonViewContext(), getId()
@@ -358,7 +359,7 @@ abstract public class AbstractGenericSampleRegisterEditForm extends
builder.append(code);
return builder.toString().toUpperCase();
}
-
+
/** sets visibility of container and parent fields dependent on sample type */
private final void setContainerAndParentVisibility(final SampleType sampleType)
{