From d6613ed0bdb70899cff64438b83b784066133873 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 21 Apr 2011 13:48:22 +0000
Subject: [PATCH] get rid of EntityTypeColDefKind and
EntityTypeColDefKindFactory
SVN: 21033
---
.../specific/EntityTypeColDefKind.java | 55 ------------
.../specific/EntityTypeColDefKindFactory.java | 84 -------------------
.../PropertyTypeAssignmentGrid.java | 3 +-
.../application/EntityTypeBrowserTest.java | 4 +-
4 files changed, 3 insertions(+), 143 deletions(-)
delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/EntityTypeColDefKind.java
delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/EntityTypeColDefKindFactory.java
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/EntityTypeColDefKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/EntityTypeColDefKind.java
deleted file mode 100644
index 75e2fbf903b..00000000000
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/EntityTypeColDefKind.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2009 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.columns.specific;
-
-import static ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.EntityTypeColDefKindFactory.entityTypeColDefKindFactory;
-
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.framework.AbstractColumnDefinitionKind;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.framework.IColumnDefinitionKind;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityType;
-
-/**
- * Columns definition for browsing grid of {@link EntityType} like material or sample types.
- *
- * @author Tomasz Pylak
- */
-public enum EntityTypeColDefKind implements IColumnDefinitionKind<EntityType>
-{
- CODE(entityTypeColDefKindFactory.createCodeColDefKind()),
-
- DESCRIPTION(entityTypeColDefKindFactory.createDescriptionColDefKind()),
-
- DATABASE_INSTANCE(entityTypeColDefKindFactory.createDatabaseInstanceColDefKind());
-
- private final AbstractColumnDefinitionKind<EntityType> columnDefinitionKind;
-
- private EntityTypeColDefKind(AbstractColumnDefinitionKind<EntityType> columnDefinitionKind)
- {
- this.columnDefinitionKind = columnDefinitionKind;
- }
-
- public String id()
- {
- return name();
- }
-
- public AbstractColumnDefinitionKind<EntityType> getDescriptor()
- {
- return columnDefinitionKind;
- }
-
-}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/EntityTypeColDefKindFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/EntityTypeColDefKindFactory.java
deleted file mode 100644
index 530cb2557fb..00000000000
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/EntityTypeColDefKindFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2009 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.columns.specific;
-
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.framework.AbstractColumnDefinitionKind;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityType;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExperimentType;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialType;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
-
-/**
- * Factory of column definitions common in grid browsers of {@link EntityType} subclasses like material or sample types.
- *
- * @author Piotr Buczek
- */
-public class EntityTypeColDefKindFactory<T extends EntityType>
-{
- public static final EntityTypeColDefKindFactory<EntityType> entityTypeColDefKindFactory =
- new EntityTypeColDefKindFactory<EntityType>();
-
- public static final EntityTypeColDefKindFactory<ExperimentType> experimentTypeColDefKindFactory =
- new EntityTypeColDefKindFactory<ExperimentType>();
-
- public static final EntityTypeColDefKindFactory<MaterialType> materialTypeColDefKindFactory =
- new EntityTypeColDefKindFactory<MaterialType>();
-
- public static final EntityTypeColDefKindFactory<SampleType> sampleTypeColDefKindFactory =
- new EntityTypeColDefKindFactory<SampleType>();
-
- public static final EntityTypeColDefKindFactory<DataSetType> dataSetTypeColDefKindFactory =
- new EntityTypeColDefKindFactory<DataSetType>();
-
- public AbstractColumnDefinitionKind<T> createCodeColDefKind()
- {
- return new AbstractColumnDefinitionKind<T>(Dict.CODE)
- {
- @Override
- public String tryGetValue(T entity)
- {
- return entity.getCode();
- }
- };
- }
-
- public AbstractColumnDefinitionKind<T> createDescriptionColDefKind()
- {
- return new AbstractColumnDefinitionKind<T>(Dict.DESCRIPTION, 300)
- {
- @Override
- public String tryGetValue(EntityType entity)
- {
- return entity.getDescription();
- }
- };
- }
-
- public AbstractColumnDefinitionKind<T> createDatabaseInstanceColDefKind()
- {
- return new AbstractColumnDefinitionKind<T>(Dict.DATABASE_INSTANCE, true)
- {
- @Override
- public String tryGetValue(EntityType entity)
- {
- return entity.getDatabaseInstance().getCode();
- }
- };
- }
-}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGrid.java
index 62d2de85038..0a534bdb58d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGrid.java
@@ -43,7 +43,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.
import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.BaseEntityModel;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.framework.IColumnDefinitionKind;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.EntityTypeColDefKind;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.PropertyTypeAssignmentColDefKind;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.field.CheckBoxField;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.field.PropertyFieldFactory;
@@ -455,7 +454,7 @@ public class PropertyTypeAssignmentGrid extends
protected ColumnDefsAndConfigs<EntityTypePropertyType<?>> createColumnsDefinition()
{
ColumnDefsAndConfigs<EntityTypePropertyType<?>> schema = super.createColumnsDefinition();
- schema.setGridCellRendererFor(EntityTypeColDefKind.DESCRIPTION.id(),
+ schema.setGridCellRendererFor(PropertyTypeAssignmentColDefKind.DESCRIPTION.id(),
createMultilineStringCellRenderer());
return schema;
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypeBrowserTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypeBrowserTest.java
index 0f011dfd51a..02d9eb252e8 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypeBrowserTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypeBrowserTest.java
@@ -17,11 +17,11 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.EntityTypeColDefKind;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.DataSetTypeGrid;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experiment.ExperimentTypeGrid;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.material.MaterialTypeGrid;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.SampleTypeGrid;
+import ch.systemsx.cisd.openbis.generic.client.web.client.dto.EntityTypeGridColumnIDs;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractGWTTestCase;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.CheckTableCommand;
import ch.systemsx.cisd.openbis.generic.shared.basic.Row;
@@ -64,7 +64,7 @@ public class EntityTypeBrowserTest extends AbstractGWTTestCase
private void checkGridRows(CheckTableCommand table, String expectedCode, int expectedRowsNum)
{
- table.expectedRow(new Row().withCell(EntityTypeColDefKind.CODE.id(), expectedCode));
+ table.expectedRow(new Row().withCell(EntityTypeGridColumnIDs.CODE, expectedCode));
remoteConsole.prepare(table.expectedSize(expectedRowsNum));
launchTest();
--
GitLab