[Fudaa-svn-commit] SF.net SVN: fudaa:[8313] trunk/soft/fudaa-crue/ui-common/src/main/java/org/ fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java

[<de...@us...>]

Revision: 8313
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8313&view=rev
Author:   deniger
Date:     2013-03-07 16:59:06 +0000 (Thu, 07 Mar 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java

Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java	2013-03-07 16:58:04 UTC (rev 8312)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java	2013-03-07 16:59:06 UTC (rev 8313)
@@ -127,11 +127,11 @@
   }
   List<TableColumn> allColumns = new ArrayList<TableColumn>();
 
-  private void setColumns(List<PropertyColumnFilterable> columns) {
+  private void setColumns(List<PropertyColumnFilterable> newColumns) {
     allColumns.clear();
     ETableColumnModel columnModel = (ETableColumnModel) outlineLogsView.getOutline().getColumnModel();
     if (this.columns != null) {
-      for (PropertyColumnFilterable col : columns) {
+      for (PropertyColumnFilterable col : this.columns) {
         outlineLogsView.removePropertyColumn(col.getColumnId());
       }
       for (int i = columnModel.getColumnCount() - 1; i > 0; i--) {
@@ -139,19 +139,19 @@
         columnModel.removeColumn(column);
       }
     }
-    this.columns = new ArrayList<PropertyColumnFilterable>(columns);
-    for (PropertyColumnFilterable propertyColumn : columns) {
+    this.columns = new ArrayList<PropertyColumnFilterable>(newColumns);
+    for (PropertyColumnFilterable propertyColumn : newColumns) {
       outlineLogsView.addPropertyColumn(propertyColumn.getColumnId(), propertyColumn.getDisplayName(),
               propertyColumn.getDescription());
     }
 
 
-    int columnCount = columnModel.getColumnCount();
+    int columnCount = Math.min(columnModel.getColumnCount(), newColumns.size());
     CollectionUtils.addAll(allColumns, columnModel.getColumns());
     for (int i = columnCount - 1; i > 0; i--) {//on commence par la fin car les colonnes sont enlevées au fur et à mesure
       final TableColumn column = columnModel.getColumn(i);
       //enleve la colonne des colonnes visibles.
-      columnModel.setColumnHidden(column, !columns.get(i - 1).isVisibleByDefault());//enleve la colonne des colonnes visibles.
+      columnModel.setColumnHidden(column, !newColumns.get(i - 1).isVisibleByDefault());//enleve la colonne des colonnes visibles.
     }
     outlineLogsView.getOutline().getTableHeader().setToolTipText(null);
     outlineLogsView.setNodePopupFactory(new LogNodePopupFactory(this.columns));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.