[LMS-2281] minor improvements

SVN: 21747

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()));
                 }
             }
         }

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:

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()