Index: topia/src/java/org/codelutin/topia/ui/swing/TopiaComboBoxModel.java
diff -u topia/src/java/org/codelutin/topia/ui/swing/TopiaComboBoxModel.java:1.2 topia/src/java/org/codelutin/topia/ui/swing/TopiaComboBoxModel.java:1.3
--- topia/src/java/org/codelutin/topia/ui/swing/TopiaComboBoxModel.java:1.2	Fri Jul 16 16:19:36 2004
+++ topia/src/java/org/codelutin/topia/ui/swing/TopiaComboBoxModel.java	Tue Jul 20 16:02:25 2004
@@ -13,6 +13,8 @@
 
 import org.codelutin.topia.TopiaContext;
 import org.codelutin.topia.TopiaQuery;
+import org.codelutin.topia.TopiaElement;
+import org.codelutin.topia.TopiaException;
 
 /**
  * @author pineau
@@ -20,17 +22,30 @@
  * TODO To change the template for this generated type comment go to Window -
  * Preferences - Java - Code Style - Code Templates
  */
-public class TopiaComboBoxModel extends AbstractListModel implements ComboBoxModel {
+public class TopiaComboBoxModel extends AbstractListModel
+implements ComboBoxModel, TopiaElement {
 
     protected TopiaQuery query = null;
     protected TopiaContext context = null;
     protected List data = null;
     protected Object selectedItem = null;
 
+    public TopiaComboBoxModel() {
+    }
+
     public TopiaComboBoxModel(TopiaContext context, TopiaQuery query) {
         this.query = query;
         this.context = context;
         // lancer une invocation asynchrone pour la requete
+    }
+
+    public void setContext(TopiaContext context) throws TopiaException{
+        this.context = context;
+        eventOccured();
+    }
+
+    public TopiaContext getContext(){
+        return context;
     }
 
     public void setQuery(TopiaQuery query) {

Index: topia/src/java/org/codelutin/topia/ui/swing/TopiaTableModel.java
diff -u topia/src/java/org/codelutin/topia/ui/swing/TopiaTableModel.java:1.3 topia/src/java/org/codelutin/topia/ui/swing/TopiaTableModel.java:1.4
--- topia/src/java/org/codelutin/topia/ui/swing/TopiaTableModel.java:1.3	Fri Jul 16 16:19:36 2004
+++ topia/src/java/org/codelutin/topia/ui/swing/TopiaTableModel.java	Tue Jul 20 16:02:25 2004
@@ -24,13 +24,15 @@
 import org.codelutin.topia.TopiaException;
 import org.codelutin.topia.TopiaQuery;
 import org.codelutin.topia.TopiaContext;
+import org.codelutin.topia.TopiaElement;
+
 /**
  * @author pineau
  *
  * TODO To change the template for this generated type comment go to
  * Window - Preferences - Java - Code Style - Code Templates
  */
-public class TopiaTableModel extends AbstractTableModel {
+public class TopiaTableModel extends AbstractTableModel implements TopiaElement {
 
     protected static String ASCENDING="ascending";
     protected static String DESCENDING="descending";
@@ -42,6 +44,9 @@
     protected String[] columnOrders = null;
     protected List data = null;
 
+    public TopiaTableModel(){
+    }
+
     public TopiaTableModel(TopiaContext context, TopiaQuery query){
         this(context, query, null, null, null);
     }
@@ -69,6 +74,15 @@
         }
     }
 
+    public void setContext(TopiaContext context) throws TopiaException{
+        this.context = context;
+        eventOccured();
+    }
+
+    public TopiaContext getContext(){
+        return context;
+    }
+
     public void setQuery(TopiaQuery query) {
         this.query = query;
         eventOccured();
@@ -95,6 +109,7 @@
     }
 
     public int getColumnCount() {
+        if (fields == null) return 0;
         return fields.length;
     }