From 9e7ff7f3fb4cf9c10d61b8e2ff368ab7b3f51fb3 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Mon, 20 Jun 2011 12:00:03 +0000
Subject: [PATCH] [LMS-2281] minor improvements
SVN: 21747
---
.../client/application/ui/TypedTableGrid.java | 27 ++++++-------------
.../application/ui/grid/ColumnUtils.java | 1 +
.../generic/shared/basic/TableCellUtil.java | 4 ++-
3 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGrid.java
index 6e5225f7193..181e3e551a9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGrid.java
@@ -231,27 +231,16 @@ public abstract class TypedTableGrid<T extends ISerializable>
{
for (TableModelColumnHeader header : headers)
{
- String id = header.getId();
- if (tryGetCellListenerAndLinkGenerator(id) != null)
+ final String id = header.getId();
+ final GridCellRenderer<BaseEntityModel<?>> specificRendererOrNull =
+ tryGetSpecificRenderer(header.getDataType(), header.getIndex());
+ if (specificRendererOrNull != null)
{
- final GridCellRenderer<BaseEntityModel<?>> specificRendererOrNull =
- tryGetSpecificRenderer(header.getDataType(), header.getIndex());
- if (specificRendererOrNull != null)
- {
- definitions.setGridCellRendererFor(id, specificRendererOrNull);
- } else
- {
- definitions.setGridCellRendererFor(id,
- LinkRenderer.createLinkRenderer(true, header.getIndex()));
- }
- } else
+ definitions.setGridCellRendererFor(id, specificRendererOrNull);
+ } else if (tryGetCellListenerAndLinkGenerator(id) != null)
{
- final GridCellRenderer<BaseEntityModel<?>> specificRendererOrNull =
- tryGetSpecificRenderer(header.getDataType(), header.getIndex());
- if (specificRendererOrNull != null)
- {
- definitions.setGridCellRendererFor(id, specificRendererOrNull);
- }
+ definitions.setGridCellRendererFor(id,
+ LinkRenderer.createLinkRenderer(true, header.getIndex()));
}
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnUtils.java
index e82d54f74eb..7e95119d16a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnUtils.java
@@ -61,6 +61,7 @@ public class ColumnUtils
{
final CellEditor editor;
DataTypeCode dataType = column.tryToGetDataType();
+ assert dataType != null;
switch (dataType)
{
case INTEGER:
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TableCellUtil.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TableCellUtil.java
index f966eac92a8..653b0ec033a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TableCellUtil.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TableCellUtil.java
@@ -85,10 +85,12 @@ public class TableCellUtil
case TIMESTAMP:
case CONTROLLEDVOCABULARY:
case MATERIAL:
+ case HYPERLINK:
return true;
- default:
+ case XML:
return false;
}
+ throw new UnsupportedOperationException(""); // not possible
}
private TableCellUtil()
--
GitLab