From 66ad42b8e1cda152aa3efe42098356c940b36e21 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 20 Apr 2010 07:45:38 +0000
Subject: [PATCH] [LMS-1489] fixed links in simple search results table (lost
in commit)
SVN: 15525
---
.../web/client/application/ClientPluginFactory.java | 6 +++---
.../client/web/client/application/ExperimentViewer.java | 6 +++---
.../application/ProteinByExperimentBrowserGrid.java | 4 ++--
.../web/client/application/ClientPluginFactory.java | 8 ++++----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ClientPluginFactory.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ClientPluginFactory.java
index 626e46220c8..8b10ab16c0f 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ClientPluginFactory.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ClientPluginFactory.java
@@ -23,11 +23,11 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAs
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractClientPluginFactory;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.AbstractTabItemFactory;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DatabaseModificationAwareComponent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DatabaseModificationAwareWidget;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DefaultTabItem;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.ITabItem;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.AbstractTabItemFactory;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier.HelpPageAction;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier.HelpPageDomain;
@@ -103,8 +103,8 @@ public class ClientPluginFactory extends AbstractClientPluginFactory<ViewContext
//
@Override
- public final AbstractTabItemFactory createEntityViewer(final ExperimentType experimentType,
- final IIdentifiable identifiable)
+ public final AbstractTabItemFactory createEntityViewer(
+ final BasicEntityType experimentType, final IIdentifiable identifiable)
{
return new AbstractTabItemFactory()
{
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ExperimentViewer.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ExperimentViewer.java
index 6d260af570f..ef7ff55662b 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ExperimentViewer.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ExperimentViewer.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewConte
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DatabaseModificationAwareComponent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentifiable;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExperimentType;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicEntityType;
import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.IGenericClientServiceAsync;
import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.GenericViewContext;
import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.experiment.GenericExperimentViewer;
@@ -37,7 +37,7 @@ public class ExperimentViewer extends GenericExperimentViewer
{
public static DatabaseModificationAwareComponent create(
IViewContext<IPhosphoNetXClientServiceAsync> viewContext,
- ExperimentType experimentType, IIdentifiable experimentId)
+ BasicEntityType experimentType, IIdentifiable experimentId)
{
ExperimentViewer viewer =
new ExperimentViewer(new GenericViewContext(viewContext.getCommonViewContext()),
@@ -49,7 +49,7 @@ public class ExperimentViewer extends GenericExperimentViewer
protected ExperimentViewer(IViewContext<IGenericClientServiceAsync> viewContext,
IViewContext<IPhosphoNetXClientServiceAsync> specificViewContext,
- ExperimentType experimentType, IIdentifiable experimentId)
+ BasicEntityType experimentType, IIdentifiable experimentId)
{
super(viewContext, experimentType, experimentId);
this.specificViewContext = specificViewContext;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinByExperimentBrowserGrid.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinByExperimentBrowserGrid.java
index 7cd4e98f615..98d278f284a 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinByExperimentBrowserGrid.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinByExperimentBrowserGrid.java
@@ -53,8 +53,8 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.GridRowModel;
import ch.systemsx.cisd.openbis.generic.shared.basic.IColumnDefinition;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentifiable;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicEntityType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExperimentType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.ObjectKind;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.client.web.client.IPhosphoNetXClientServiceAsync;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.client.web.client.application.columns.InternalAbundanceColumnDefinition;
@@ -97,7 +97,7 @@ class ProteinByExperimentBrowserGrid extends AbstractSimpleBrowserGrid<ProteinIn
static IDisposableComponent create(
final IViewContext<IPhosphoNetXClientServiceAsync> viewContext,
- ExperimentType experimentType, IIdentifiable experimentId)
+ BasicEntityType experimentType, IIdentifiable experimentId)
{
final IDisposableComponent summaryGrid = ProteinSummaryGrid.create(viewContext);
ProteinByExperimentBrowserGrid browserGrid =
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ClientPluginFactory.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ClientPluginFactory.java
index fdf796edb97..b2627eee69a 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ClientPluginFactory.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ClientPluginFactory.java
@@ -132,7 +132,7 @@ public final class ClientPluginFactory extends AbstractClientPluginFactory<Scree
}
@Override
- public final AbstractTabItemFactory createEntityViewer(final MaterialType materialType,
+ public final AbstractTabItemFactory createEntityViewer(final BasicEntityType materialType,
final IIdentifiable materialId)
{
return createGeneMaterialViewerTabFactory(materialId, null, getViewContext());
@@ -196,7 +196,7 @@ public final class ClientPluginFactory extends AbstractClientPluginFactory<Scree
}
@Override
- public final AbstractTabItemFactory createEntityViewer(final DataSetType dataSetType,
+ public final AbstractTabItemFactory createEntityViewer(final BasicEntityType dataSetType,
final IIdentifiable identifiable)
{
return new AbstractTabItemFactory()
@@ -237,7 +237,7 @@ public final class ClientPluginFactory extends AbstractClientPluginFactory<Scree
}
@Override
- public final AbstractTabItemFactory createEntityViewer(final SampleType sampleType,
+ public final AbstractTabItemFactory createEntityViewer(final BasicEntityType sampleType,
final IIdentifiable identifiable)
{
return new AbstractTabItemFactory()
@@ -315,7 +315,7 @@ public final class ClientPluginFactory extends AbstractClientPluginFactory<Scree
return clientPluginFactory;
}
- public AbstractTabItemFactory createEntityViewer(final T entityType,
+ public AbstractTabItemFactory createEntityViewer(final BasicEntityType entityType,
final IIdentifiable identifiable)
{
return delegator.createEntityViewer(entityType, identifiable);
--
GitLab