[gnue] r7407 - trunk/gnue-designer/src/base/tools

[reinhard]

Author: reinhard
Date: 2005-04-18 17:23:02 -0500 (Mon, 18 Apr 2005)
New Revision: 7407

Modified:
   trunk/gnue-designer/src/base/tools/DataSourceEditor.py
   trunk/gnue-designer/src/base/tools/SchemaViewer.py
Log:
Removed direct DataObject access in designer.


Modified: trunk/gnue-designer/src/base/tools/DataSourceEditor.py
===================================================================
--- trunk/gnue-designer/src/base/tools/DataSourceEditor.py      2005-04-18 
21:59:09 UTC (rev 7406)
+++ trunk/gnue-designer/src/base/tools/DataSourceEditor.py      2005-04-18 
22:23:02 UTC (rev 7407)
@@ -570,14 +570,10 @@
     # TODO: albeit without schema support.
 
 
-    # TODO: This is the old, deprecated syntax
-    dataObject = self.editor.connections.getDataObject(conn, "object")
+    c = self.editor.connections.getConnection (conn, True)
+    schema = c.introspector.findone(name=self.editor.current.table)
 
-    self.editor.connections.requestConnection(dataObject, conn)
 
-    schema = 
dataObject._connection.introspector.findone(name=self.editor.current.table)
-
-
     index = 0
     self.list.DeleteAllItems()
     if schema:

Modified: trunk/gnue-designer/src/base/tools/SchemaViewer.py
===================================================================
--- trunk/gnue-designer/src/base/tools/SchemaViewer.py  2005-04-18 21:59:09 UTC 
(rev 7406)
+++ trunk/gnue-designer/src/base/tools/SchemaViewer.py  2005-04-18 22:23:02 UTC 
(rev 7407)
@@ -135,12 +135,9 @@
       try:
         schemaTypes, schemas = self.connectionCache[conn]
       except KeyError:
-        dataObject = self.connections.getDataObject(conn, "object")
-
-        self.connections.requestConnection(dataObject, conn)
-
-        schemaTypes = dataObject.types
-        schemas = dataObject.find()
+        c = self.connections.getConnection (conn, True)
+        schemaTypes = c.introspector.types
+        schemas = c.introspector.find()
         schemas.sort()
 
         self.connectionCache[conn] = (schemaTypes, schemas)