Attachment 98119 Details for Bug 229212 – patch-for-229212

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch-for-229212

patch-for-229212.txt (text/plain), 5.72 KB, created by song lin

on 2008-04-30 00:52:24 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: song lin

Created: 2008-04-30 00:52:24 EDT

Size: 5.72 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.datatools.connectivity.sqm.server.ui
>Index: src/org/eclipse/datatools/connectivity/sqm/server/internal/ui/explorer/providers/content/layout/vnode/ServerExplorerVNodeContentProviderNav.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/src/org/eclipse/datatools/connectivity/sqm/server/internal/ui/explorer/providers/content/layout/vnode/ServerExplorerVNodeContentProviderNav.java,v
>retrieving revision 1.8
>diff -u -r1.8 ServerExplorerVNodeContentProviderNav.java
>--- src/org/eclipse/datatools/connectivity/sqm/server/internal/ui/explorer/providers/content/layout/vnode/ServerExplorerVNodeContentProviderNav.java	12 Apr 2007 19:12:13 -0000	1.8
>+++ src/org/eclipse/datatools/connectivity/sqm/server/internal/ui/explorer/providers/content/layout/vnode/ServerExplorerVNodeContentProviderNav.java	30 Apr 2008 04:43:36 -0000
>@@ -24,10 +24,12 @@
> import org.eclipse.datatools.modelbase.sql.schema.Catalog;
> import org.eclipse.datatools.modelbase.sql.schema.Database;
> import org.eclipse.datatools.modelbase.sql.schema.SQLObject;
>+import org.eclipse.datatools.modelbase.sql.schema.SQLSchemaPackage;
> import org.eclipse.datatools.modelbase.sql.schema.Schema;
> import org.eclipse.datatools.modelbase.sql.tables.BaseTable;
> import org.eclipse.datatools.modelbase.sql.tables.Table;
> import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.EStructuralFeature;
> 
> 
> /**
>@@ -173,14 +175,14 @@
> 	 */
> 	protected Object[] displayTableNodeChildren (Object parent)
> 	{
>-		Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>-		return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getTables()));
>+		EStructuralFeature feature = SQLSchemaPackage.eINSTANCE.getSchema_Tables();
>+		return getSchemaChildren(parent, feature);
> 	}
>-
>+	
> 	protected Object[] displayUDFNodeChildren(Object parent)
>     {
>-		Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>-		return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getUDFs()));
>+		EStructuralFeature feature = SQLSchemaPackage.eINSTANCE.getSchema_Routines();
>+		return getSchemaChildren(parent, feature);
>     }
> 
>     /**
>@@ -188,8 +190,8 @@
>      */
>     protected Object[] displayStoredProcedureNodeChildren(Object parent)
>     {
>-		Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>-		return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getProcedures()));
>+    	EStructuralFeature feature = SQLSchemaPackage.eINSTANCE.getSchema_Routines();
>+		return getSchemaChildren(parent, feature);
>     }
> 	
> 	/**
>@@ -199,8 +201,8 @@
> 	 */
> 	protected Object [] displaySequenceNodeChildren (Object parent)
> 	{
>-		Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>-		return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getSequences()));
>+		EStructuralFeature feature = SQLSchemaPackage.eINSTANCE.getSchema_Sequences();
>+		return getSchemaChildren(parent, feature);
> 	}
> 
> 	/**
>@@ -210,8 +212,61 @@
> 	 */
> 	protected Object [] displayUDTNodeChildren (Object parent)
> 	{
>-		Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>-		return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getUserDefinedTypes()));
>+		EStructuralFeature feature = SQLSchemaPackage.eINSTANCE.getSchema_UserDefinedTypes();
>+		return getSchemaChildren(parent, feature);
>+	}
>+	
>+	/**
>+	 * Will display all the Views available under each View Node
>+	 * @param parent
>+	 * @return
>+	 */
>+	protected Object [] displayViewsNodeChildren (Object parent)
>+	{
>+		EStructuralFeature feature = SQLSchemaPackage.eINSTANCE.getSchema_Tables();
>+		return getSchemaChildren(parent, feature);
>+	}
>+	
>+	/**
>+	 * Return all children of feature specified type under each virtual node 
>+	 * @param parent
>+	 * @param feature
>+	 * @return
>+	 */
>+	protected Object[] getSchemaChildren(Object parent, EStructuralFeature feature)
>+	{
>+		Object ancestor = ((IVirtualNode)parent).getParent();
>+		if(ancestor instanceof Schema)
>+		{
>+			Schema schema = (Schema) ancestor;
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), (List)schema.eGet(feature)));
>+		}
>+		else if(ancestor instanceof Database)
>+		{
>+			List schemas = ((Database)ancestor).getSchemas();
>+			return getSchemasChildren(parent, schemas, feature);
>+		}
>+		else if(ancestor instanceof Catalog)
>+		{
>+			List schemas = ((Catalog)ancestor).getSchemas();
>+			return getSchemasChildren(parent, schemas, feature);
>+		}
>+		else
>+		{
>+			return EMPTY_ELEMENT_ARRAY;
>+		}
>+	}
>+	
>+	private Object[] getSchemasChildren(Object parent, List schemas, EStructuralFeature feature)
>+	{
>+		List result = new ArrayList();
>+		for (Iterator iterator = schemas.iterator(); iterator.hasNext();) 
>+		{
>+			Schema schema = (Schema) iterator.next();
>+			List objs = (List)schema.eGet(feature);
>+			result.addAll(objs);
>+		}
>+		return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), result));
> 	}
> 	
> 	/**
>@@ -250,18 +305,6 @@
> 		return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), table.getColumns()));
> 	}
> 
>-	
>-	/**
>-	 * Will display all the Views available under each View Node
>-	 * @param parent
>-	 * @return
>-	 */
>-	protected Object [] displayViewsNodeChildren (Object parent)
>-	{
>-		Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>-		return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getTables()));
>-	}
>-	
> 	/**
> 	 * Will display all the Nodes availables under each Table
> 	 * @param parent

Actions: View | Diff

Attachments on bug 229212: 97908 | 98119