Pb d'interface avec ITable

src/main/java/fr/soleil/comete/swt/Table.java

@@ -15,12 +15,12 @@ import fr.soleil.comete.definition.listener.ITableListener;
 import fr.soleil.comete.definition.widget.ITable;
 import fr.soleil.data.container.matrix.AbstractMatrix;
 
-public class Table<T> extends CometeComposite<org.eclipse.swt.widgets.Table> implements ITable<AbstractMatrix<T>>, IEditableComponent {
+public class Table<T> extends CometeComposite<org.eclipse.swt.widgets.Table> implements
+        ITable<Object>, IEditableComponent {
 
     protected AbstractMatrix<T> matrix;
     protected String format = null;
-    protected final List<ITableListener<AbstractMatrix<T>>> tableListeners = new ArrayList<ITableListener<AbstractMatrix<T>>>();
-
+    protected final List<ITableListener<Object>> tableListeners = new ArrayList<ITableListener<Object>>();
 
     public Table(Composite parent, int style) {
         super(parent, style);
@@ -29,7 +29,8 @@ public class Table<T> extends CometeComposite<org.eclipse.swt.widgets.Table> imp
 
     @Override
     protected org.eclipse.swt.widgets.Table initControl() {
-        org.eclipse.swt.widgets.Table table = new org.eclipse.swt.widgets.Table(this, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.FULL_SELECTION);
+        org.eclipse.swt.widgets.Table table = new org.eclipse.swt.widgets.Table(this, SWT.BORDER
+                | SWT.V_SCROLL | SWT.H_SCROLL | SWT.FULL_SELECTION);
         table.setHeaderVisible(true);
         table.setLinesVisible(true);
         return table;
@@ -58,19 +59,18 @@ public class Table<T> extends CometeComposite<org.eclipse.swt.widgets.Table> imp
     }
 
     @Override
-    public void addTableListener(ITableListener<AbstractMatrix<T>> listener) {
+    public void addTableListener(ITableListener<Object> listener) {
         if (!tableListeners.contains(listener)) {
             tableListeners.add(listener);
         }
 
     }
 
-
     @Override
-    public void fireValueChanged(AbstractMatrix<T> amatrix) {
-        ListIterator<ITableListener<AbstractMatrix<T>>> iterator = tableListeners.listIterator();
+    public void fireValueChanged(Object amatrix) {
+        ListIterator<ITableListener<Object>> iterator = tableListeners.listIterator();
         while (iterator.hasNext()) {
-            ITableListener<AbstractMatrix<T>> listener = iterator.next();
+            ITableListener<Object> listener = iterator.next();
             listener.valueChanged(amatrix);
         }
 
@@ -100,7 +100,7 @@ public class Table<T> extends CometeComposite<org.eclipse.swt.widgets.Table> imp
     }
 
     @Override
-    public void removeTableListener(ITableListener<AbstractMatrix<T>> listener) {
+    public void removeTableListener(ITableListener<Object> listener) {
         if (tableListeners.contains(listener)) {
             synchronized (tableListeners) {
                 tableListeners.remove(listener);
@@ -122,12 +122,12 @@ public class Table<T> extends CometeComposite<org.eclipse.swt.widgets.Table> imp
     }
 
     @Override
-    public AbstractMatrix<T> getMatrixData() {
+    public Object getData() {
         return matrix;
     }
 
     @Override
-    public void setMatrixData(AbstractMatrix<T> matrix) {
+    public void setData(Object amatrix) {
 
         getControl().setRedraw(false);
         // Clean the table
@@ -136,8 +136,9 @@ public class Table<T> extends CometeComposite<org.eclipse.swt.widgets.Table> imp
             column.dispose();
         }
 
+        if (amatrix != null && amatrix instanceof AbstractMatrix<?>) {
             // Set matrix data
-        this.matrix = matrix;
+            this.matrix = (AbstractMatrix<T>) amatrix;
             // Column name
             for (int i = 0; i < matrix.getWidth(); i++) {
                 TableColumn column = new TableColumn(getControl(), SWT.NONE);
@@ -154,6 +155,7 @@ public class Table<T> extends CometeComposite<org.eclipse.swt.widgets.Table> imp
                 TableColumn column = getControl().getColumn(i);
                 column.pack();
             }
+        }
 
         getControl().setRedraw(true);
         fireValueChanged(matrix);