LMS-1397 add default column width attribute to TableModelColumnHeader

SVN: 15074

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/report/ReportGrid.java

@@ -30,7 +30,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewConte
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DisplayTypeIDGenerator;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.BaseEntityModel;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.renderer.RealNumberRenderer;
-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.IColumnDefinitionUI;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.data.DataSetReportColumnDefinition;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.AbstractBrowserGrid;
@@ -87,17 +86,19 @@ public class ReportGrid extends AbstractBrowserGrid<TableModelRow, BaseEntityMod
             IColumnDefinitionUI<TableModelRow>
     {
         private boolean isHidden;
+        private int defaultColumnWidth;
 
         public ReportColumnUI(TableModelColumnHeader columnHeader, String downloadURL,
-                String sessionID, boolean isHidden)
+                String sessionID, int defaultColumnWidth, boolean isHidden)
         {
             super(columnHeader, downloadURL, sessionID);
             this.isHidden = isHidden;
+            this.defaultColumnWidth = defaultColumnWidth;
         }
 
         public int getWidth()
         {
-            return AbstractColumnDefinitionKind.DEFAULT_COLUMN_WIDTH;
+            return defaultColumnWidth;
         }
 
         public boolean isHidden()
@@ -114,7 +115,7 @@ public class ReportGrid extends AbstractBrowserGrid<TableModelRow, BaseEntityMod
         @SuppressWarnings("unused")
         private ReportColumnUI()
         {
-            this(null, null, null, false);
+            this(null, null, null, 0, false);
         }
     }
 
@@ -259,12 +260,13 @@ public class ReportGrid extends AbstractBrowserGrid<TableModelRow, BaseEntityMod
     {
         String sessionID = viewContext.getModel().getSessionContext().getSessionID();
         List<ReportColumnUI> columns = new ArrayList<ReportColumnUI>();
-        int i = 0;
-        for (TableModelColumnHeader columnHeader : tableHeader)
+        for (int i = 0; i < tableHeader.size(); i++)
         {
+            TableModelColumnHeader columnHeader = tableHeader.get(i);
             boolean isHidden = (i > MAX_SHOWN_COLUMNS);
-            columns.add(new ReportColumnUI(columnHeader, downloadURL, sessionID, isHidden));
-            i++;
+            int defaultColumnWidth = columnHeader.getDefaultColumnWidth();
+            columns.add(new ReportColumnUI(columnHeader, downloadURL, sessionID,
+                    defaultColumnWidth, isHidden));
         }
         return columns;
     }

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelColumnHeader.java

@@ -38,6 +38,8 @@ public class TableModelColumnHeader implements IsSerializable, Serializable
 
     // if column values contain permIds of certain entities entity kind is stored here
     private EntityKind entityKindOrNull;
+    
+    private int defaultColumnWidth = 150;
 
     public TableModelColumnHeader(String title, int index)
     {
@@ -64,6 +66,16 @@ public class TableModelColumnHeader implements IsSerializable, Serializable
     {
         return index;
     }
+    
+    public void setDefaultColumnWidth(int width)
+    {
+        this.defaultColumnWidth = width;
+    }
+    
+    public int getDefaultColumnWidth()
+    {
+        return defaultColumnWidth;
+    }
 
     public boolean isNumeric()
     {

openbis/source/java/service.properties

@@ -15,7 +15,7 @@ database.create-from-scratch = false
 # For debugging set this value to true.
 database.script-single-step-mode = false
 database.url-host-part =
-database.kind = dev
+database.kind = yeastx
 # database.kind = system_test
 # database.kind = system_test_strict
 # database.kind = system_test_plates_on_demand