diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractColumnDefinition.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractColumnDefinition.java index 62326237fe4dbf64358929eb4a68b0675e1d8aaa..616e8394cc09b1ee5e824abf1254f1968d106a71 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractColumnDefinition.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractColumnDefinition.java @@ -23,8 +23,6 @@ public abstract class AbstractColumnDefinition<T> implements IColumnDefinitionUI { protected abstract String tryGetValue(T entity); - public static final int DEFAULT_COLUMN_WIDTH = 100; - private String headerText; private int width; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractColumnDefinitionKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractColumnDefinitionKind.java index 200c3564f8da29fee9bf0fab6655f6a69c3871ab..889b66bcfe798dbdfd9a26822e38879be213b44e 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractColumnDefinitionKind.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractColumnDefinitionKind.java @@ -34,7 +34,9 @@ public abstract class AbstractColumnDefinitionKind<T> /** Renders the cell value of this column for the specified entity. */ abstract public String tryGetValue(T entity); - public static final int DATE_COLUMN_WIDTH = 200; + public static final int DATE_COLUMN_WIDTH = 300; + + public static final int DEFAULT_COLUMN_WIDTH = 150; private String headerMsgKey; @@ -52,7 +54,12 @@ public abstract class AbstractColumnDefinitionKind<T> public AbstractColumnDefinitionKind(final String headerMsgKey, final boolean isHidden) { - this(headerMsgKey, AbstractColumnDefinition.DEFAULT_COLUMN_WIDTH, isHidden); + this(headerMsgKey, DEFAULT_COLUMN_WIDTH, isHidden); + } + + public AbstractColumnDefinitionKind(final String headerMsgKey, final int width) + { + this(headerMsgKey, width, false); } public AbstractColumnDefinitionKind(final String headerMsgKey) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentColDefKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentColDefKind.java index 9be1bc403a4ed6eca52e681e67c2f2f9f0cfd49e..541642bd77bb15690cc076b205b72db8d169af9a 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentColDefKind.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentColDefKind.java @@ -29,7 +29,7 @@ public enum PropertyTypeAssignmentColDefKind implements IColumnDefinitionKind<EntityTypePropertyType<?>> { PROPERTY_TYPE_CODE(new AbstractColumnDefinitionKind<EntityTypePropertyType<?>>( - Dict.PROPERTY_TYPE_CODE) + Dict.PROPERTY_TYPE_CODE, 200) { @Override public String tryGetValue(EntityTypePropertyType<?> entity) @@ -38,7 +38,8 @@ public enum PropertyTypeAssignmentColDefKind implements } }), - ENTITY_TYPE_CODE(new AbstractColumnDefinitionKind<EntityTypePropertyType<?>>(Dict.ASSIGNED_TO) + ENTITY_TYPE_CODE(new AbstractColumnDefinitionKind<EntityTypePropertyType<?>>(Dict.ASSIGNED_TO, + 200) { @Override public String tryGetValue(EntityTypePropertyType<?> entity) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/AbstractParentSampleColDef.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/AbstractParentSampleColDef.java index 73184e043539240e2bccba21e08fb26aed69e18c..4ae1cacdd1e085334308dfe3a018ab22ab728964 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/AbstractParentSampleColDef.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/AbstractParentSampleColDef.java @@ -19,6 +19,7 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample import com.google.gwt.user.client.rpc.IsSerializable; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.AbstractColumnDefinition; +import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.AbstractColumnDefinitionKind; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.Sample; abstract class AbstractParentSampleColDef extends AbstractColumnDefinition<Sample> implements @@ -34,7 +35,7 @@ abstract class AbstractParentSampleColDef extends AbstractColumnDefinition<Sampl AbstractParentSampleColDef(int level, String headerText) { - super(headerText, AbstractColumnDefinition.DEFAULT_COLUMN_WIDTH, false); + super(headerText, AbstractColumnDefinitionKind.DEFAULT_COLUMN_WIDTH, false); this.level = level; } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyColDefKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyColDefKind.java index 9d993e6c1c9487857abc132f26de1f26e9e2a5e7..4556c52a1e2771f456d6f6eb72e1c720349d2200 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyColDefKind.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyColDefKind.java @@ -27,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample. */ public enum VocabularyColDefKind implements IColumnDefinitionKind<Vocabulary> { - CODE(new AbstractColumnDefinitionKind<Vocabulary>(Dict.CODE) + CODE(new AbstractColumnDefinitionKind<Vocabulary>(Dict.CODE, 200) { @Override public String tryGetValue(Vocabulary entity) @@ -36,7 +36,7 @@ public enum VocabularyColDefKind implements IColumnDefinitionKind<Vocabulary> } }), - DESCRIPTION(new AbstractColumnDefinitionKind<Vocabulary>(Dict.DESCRIPTION) + DESCRIPTION(new AbstractColumnDefinitionKind<Vocabulary>(Dict.DESCRIPTION, 300) { @Override public String tryGetValue(Vocabulary entity) @@ -45,7 +45,8 @@ public enum VocabularyColDefKind implements IColumnDefinitionKind<Vocabulary> } }), - IS_MANAGED_INTERNALLY(new AbstractColumnDefinitionKind<Vocabulary>(Dict.IS_MANAGED_INTERNALLY) + IS_MANAGED_INTERNALLY(new AbstractColumnDefinitionKind<Vocabulary>(Dict.IS_MANAGED_INTERNALLY, + 150) { @Override public String tryGetValue(Vocabulary entity)