diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectViewer.java
index b4f2a928ea61ddc672229126886f8a6c1147e86f..075dc94a77755747d0d0b91371751c551a011af1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectViewer.java
@@ -78,6 +78,10 @@ public final class ProjectViewer extends AbstractViewer<IEntityInformationHolder
private void extendToolBar()
{
+ if (viewContext.isSimpleMode())
+ {
+ return;
+ }
addToolBarButton(createDeleteButton(new IDelegatedAction()
{
public void execute()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java
index 289eefdf663498a8e6e83679dd51790f71e84f96..7aafb5bfb5f5f831d155aa4df094b518b1595dea 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java
@@ -65,8 +65,6 @@ public abstract class AbstractViewer<D extends IEntityInformationHolder> extends
private final IViewContext<?> viewContext;
- protected Button editButton;
-
private LabelToolItem titleLabel;
private D originalData;
@@ -89,8 +87,10 @@ public abstract class AbstractViewer<D extends IEntityInformationHolder> extends
titleLabel = new LabelToolItem(title);
toolBar.add(titleLabel);
toolBar.add(new FillToolItem());
- editButton = createEditButton();
- addToolBarButton(editButton);
+ if (viewContext.isSimpleMode() == false)
+ {
+ addToolBarButton(createEditButton());
+ }
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/attachment/AttachmentBrowser.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/attachment/AttachmentBrowser.java
index d27496d2e624dc68daecb4a62041af4f1512d18b..43440281eebb8dcaf730372423499ef0ecd1a884 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/attachment/AttachmentBrowser.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/attachment/AttachmentBrowser.java
@@ -182,30 +182,34 @@ public class AttachmentBrowser extends AbstractSimpleBrowserGrid<AttachmentVersi
createSelectedItemButton(showAllVersionsTitle, asShowEntityInvoker(false));
addButton(showAllVersionsButton);
- addButton(createSelectedItemButton(viewContext.getMessage(Dict.BUTTON_EDIT),
- new ISelectedEntityInvoker<BaseEntityModel<AttachmentVersions>>()
- {
-
- public void invoke(BaseEntityModel<AttachmentVersions> selectedItem,
- boolean keyPressed)
+ if (viewContext.isSimpleMode() == false)
+ {
+ addButton(createSelectedItemButton(viewContext.getMessage(Dict.BUTTON_EDIT),
+ new ISelectedEntityInvoker<BaseEntityModel<AttachmentVersions>>()
{
- AttachmentVersions versions = selectedItem.getBaseObject();
- createEditAttachmentDialog(versions).show();
- }
- }));
- addButton(createSelectedItemsButton(viewContext.getMessage(Dict.BUTTON_DELETE),
- new AbstractCreateDialogListener()
- {
- @Override
- protected Dialog createDialog(List<AttachmentVersions> attachmentVersions,
- IBrowserGridActionInvoker invoker)
+ public void invoke(BaseEntityModel<AttachmentVersions> selectedItem,
+ boolean keyPressed)
+ {
+ AttachmentVersions versions = selectedItem.getBaseObject();
+ createEditAttachmentDialog(versions).show();
+
+ }
+ }));
+ addButton(createSelectedItemsButton(viewContext.getMessage(Dict.BUTTON_DELETE),
+ new AbstractCreateDialogListener()
{
- return new AttachmentListDeletionConfirmationDialog(viewContext,
- attachmentVersions, createDeletionCallback(invoker),
- attachmentHolder);
- }
- }));
+ @Override
+ protected Dialog createDialog(
+ List<AttachmentVersions> attachmentVersions,
+ IBrowserGridActionInvoker invoker)
+ {
+ return new AttachmentListDeletionConfirmationDialog(viewContext,
+ attachmentVersions, createDeletionCallback(invoker),
+ attachmentHolder);
+ }
+ }));
+ }
allowMultipleSelection(); // we allow deletion of multiple attachments
addEntityOperationsSeparator();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserGrid.java
index ff280c87fd549628a546e5d02db1a0b11a767456..d3b501ef9c8ba3b8b788a5dbcd80ae4b063d2ddd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserGrid.java
@@ -160,6 +160,11 @@ public class ExperimentBrowserGrid extends
private void extendBottomToolbar()
{
+ if (viewContext.isSimpleMode())
+ {
+ return;
+ }
+
addEntityOperationsLabel();
final Button addButton =
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialBrowserGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialBrowserGrid.java
index 429f96c57c4c23b66b44ebb30b0ececde4fb8f6a..5179abaee3f055309b180fad3014c6aaa9d55bc9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialBrowserGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialBrowserGrid.java
@@ -160,7 +160,7 @@ public class MaterialBrowserGrid extends
private void extendBottomToolbar(boolean detailsAvailable)
{
- if (detailsAvailable)
+ if (detailsAvailable && viewContext.isSimpleMode() == false)
{
addEntityOperationsLabel();
addEntityOperationButtons();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
index 4a42a18c0cda7e47eea588464a45972cdc643c0c..69eedb43b79eb30af0a499f39239394ecec2681f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
@@ -352,6 +352,10 @@ public class SampleBrowserGrid extends
// adds show, show-details and invalidate buttons
protected void extendBottomToolbar()
{
+ if (viewContext.isSimpleMode())
+ {
+ return;
+ }
addEntityOperationsLabel();
addEntityOperationButtons();
addEntityOperationsSeparator();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java
index c6b2e1aab93625051ce97290055d8bf45f0144dd..6e51b6555ac6d13ca330ec04169d6e37956c7c51 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java
@@ -35,12 +35,6 @@ public class DataSetUtils
private static final String MODE = "mode";
- public static void showDataSet(ExternalData dataSet, GenericViewModel model)
- {
- String url = createDataViewUrl(dataSet, model, null, false);
- WindowUtils.openWindow(url);
- }
-
public static String createDataViewUrl(ExternalData dataSet, GenericViewModel model,
String modeOrNull, boolean autoResolve)
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java
index c07be31767a8157147cfa6e63b1f6181d0ab3ad1..4f58220a4009034fb90bf72c5b48bdf86342945c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java
@@ -22,8 +22,6 @@ import java.util.List;
import java.util.Set;
import com.extjs.gxt.ui.client.Style.Scroll;
-import com.extjs.gxt.ui.client.event.ButtonEvent;
-import com.extjs.gxt.ui.client.event.SelectionListener;
import com.extjs.gxt.ui.client.widget.Component;
import com.extjs.gxt.ui.client.widget.ContentPanel;
import com.extjs.gxt.ui.client.widget.MessageBox;
@@ -45,8 +43,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.IActi
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.AbstractViewer;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.DataSetListDeletionConfirmationDialog;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.SectionsPanel;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.DataSetUtils;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DisplayedOrSelectedDatasetCriteria;
@@ -73,8 +69,6 @@ abstract public class GenericDataSetViewer extends AbstractViewer<ExternalData>
public static final String VIEW_BUTTON_ID_SUFFIX = "_view-button";
- private final BrowseButtonHolder browseButtonHolder;
-
private final ProcessButtonHolder processButtonHolder;
protected final TechId datasetId;
@@ -105,7 +99,6 @@ abstract public class GenericDataSetViewer extends AbstractViewer<ExternalData>
setLayout(new BorderLayout());
this.viewContext = viewContext;
this.datasetId = TechId.create(identifiable);
- this.browseButtonHolder = new BrowseButtonHolder();
this.processButtonHolder = new ProcessButtonHolder();
extendToolBar();
}
@@ -124,8 +117,10 @@ abstract public class GenericDataSetViewer extends AbstractViewer<ExternalData>
private void extendToolBar()
{
- addToolBarButton(browseButtonHolder.getButton());
-
+ if (viewContext.isSimpleMode())
+ {
+ return;
+ }
addToolBarButton(createDeleteButton(new IDelegatedAction()
{
public void execute()
@@ -149,11 +144,6 @@ abstract public class GenericDataSetViewer extends AbstractViewer<ExternalData>
return ID_PREFIX + datasetId;
}
- private final String createChildId(String childIdSuffix)
- {
- return getId() + childIdSuffix;
- }
-
/**
* Load the dataset information.
*/
@@ -274,7 +264,6 @@ abstract public class GenericDataSetViewer extends AbstractViewer<ExternalData>
protected void updateOriginalData(final ExternalData result)
{
super.updateOriginalData(result);
- browseButtonHolder.setupData(result);
processButtonHolder.setupData(result);
}
@@ -294,47 +283,6 @@ abstract public class GenericDataSetViewer extends AbstractViewer<ExternalData>
reloadAllData(); // reloads everything
}
- /**
- * Holder of a {@link Button} that goes to external data browsing on selection. The button is
- * disabled until data is successfully loaded by the viewer.
- */
- private class BrowseButtonHolder
- {
- private final Button button;
-
- public BrowseButtonHolder()
- {
- this.button = createBrowseButton();
- }
-
- private Button createBrowseButton()
- {
- Button result = new Button(viewContext.getMessage(Dict.BUTTON_VIEW));
- GWTUtils.setToolTip(result, viewContext.getMessage(Dict.TOOLTIP_VIEW_DATASET));
- result.setId(createChildId(VIEW_BUTTON_ID_SUFFIX));
- result.disable();
- return result;
- }
-
- public Button getButton()
- {
- return this.button;
- }
-
- /** @param data external data that will be browsed after selection */
- public void setupData(final ExternalData data)
- {
- button.addSelectionListener(new SelectionListener<ButtonEvent>()
- {
- @Override
- public void componentSelected(ButtonEvent ce)
- {
- DataSetUtils.showDataSet(data, viewContext.getModel());
- }
- });
- }
- }
-
/**
* Holder of a {@link Button} that has a menu with items that schedule dataset plugin
* processing. The button is hidden at the beginning. When data set is successfully loaded by
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewer.java
index a39b96a5c327e9a1debbbbbc3df8a2ae76a077e9..2b32e08bc7d89ca9ae926747c4828f60910be31c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewer.java
@@ -103,6 +103,10 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen
private void extendToolBar()
{
+ if (viewContext.isSimpleMode())
+ {
+ return;
+ }
addToolBarButton(createDeleteButton(new IDelegatedAction()
{
public void execute()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
index f9e47e168b992da0954810fab52455ecabd1a754..5fefcbd1645b4e5acbbdf6b1d922195c1ff510e5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
@@ -146,6 +146,10 @@ abstract public class GenericSampleViewer extends AbstractViewer<Sample> impleme
private void extendToolBar()
{
+ if (viewContext.isSimpleMode())
+ {
+ return;
+ }
addToolBarButton(createDeleteButton(new IDelegatedAction()
{
public void execute()