Attachment 97908 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), 9.71 KB, created by song lin

on 2008-04-29 02:16:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: song lin

Created: 2008-04-29 02:16:34 EDT

Size: 9.71 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	29 Apr 2008 06:07:14 -0000
>@@ -173,14 +173,74 @@
> 	 */
> 	protected Object[] displayTableNodeChildren (Object parent)
> 	{
>-		Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>-		return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getTables()));
>+		Object grandParent = ((IVirtualNode)parent).getParent();
>+		if(grandParent instanceof Schema)
>+		{
>+			Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getTables()));
>+		}
>+		else if(grandParent instanceof Database)
>+		{
>+			List result = new ArrayList();
>+			List schemas = ((Database)grandParent).getSchemas();
>+			for (Iterator iterator = schemas.iterator(); iterator.hasNext();) {
>+				Schema schema = (Schema) iterator.next();
>+				List udfs = schema.getTables();
>+				result.addAll(udfs);
>+			}
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), result));
>+		}
>+		else if(grandParent instanceof Catalog)
>+		{
>+			List result = new ArrayList();
>+			List schemas = ((Catalog)grandParent).getSchemas();
>+			for (Iterator iterator = schemas.iterator(); iterator.hasNext();) {
>+				Schema schema = (Schema) iterator.next();
>+				List udfs = schema.getTables();
>+				result.addAll(udfs);
>+			}
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), result));
>+		}
>+		else
>+		{
>+			return EMPTY_ELEMENT_ARRAY;
>+		}
> 	}
> 
> 	protected Object[] displayUDFNodeChildren(Object parent)
>     {
>-		Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>-		return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getUDFs()));
>+		Object grandParent = ((IVirtualNode)parent).getParent();
>+		if(grandParent instanceof Schema)
>+		{
>+			Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getUDFs()));
>+		}
>+		else if(grandParent instanceof Database)
>+		{
>+			List result = new ArrayList();
>+			List schemas = ((Database)grandParent).getSchemas();
>+			for (Iterator iterator = schemas.iterator(); iterator.hasNext();) {
>+				Schema schema = (Schema) iterator.next();
>+				List udfs = schema.getUDFs();
>+				result.addAll(udfs);
>+			}
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), result));
>+		}
>+		else if(grandParent instanceof Catalog)
>+		{
>+			List result = new ArrayList();
>+			List schemas = ((Catalog)grandParent).getSchemas();
>+			for (Iterator iterator = schemas.iterator(); iterator.hasNext();) {
>+				Schema schema = (Schema) iterator.next();
>+				List udfs = schema.getUDFs();
>+				result.addAll(udfs);
>+			}
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), result));
>+		}
>+		else
>+		{
>+			return EMPTY_ELEMENT_ARRAY;
>+		}
>     }
> 
>     /**
>@@ -188,8 +248,38 @@
>      */
>     protected Object[] displayStoredProcedureNodeChildren(Object parent)
>     {
>-		Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>-		return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getProcedures()));
>+    	Object grandParent = ((IVirtualNode)parent).getParent();
>+		if(grandParent instanceof Schema)
>+		{
>+			Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getProcedures()));
>+		}
>+		else if(grandParent instanceof Database)
>+		{
>+			List result = new ArrayList();
>+			List schemas = ((Database)grandParent).getSchemas();
>+			for (Iterator iterator = schemas.iterator(); iterator.hasNext();) {
>+				Schema schema = (Schema) iterator.next();
>+				List udfs = schema.getProcedures();
>+				result.addAll(udfs);
>+			}
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), result));
>+		}
>+		else if(grandParent instanceof Catalog)
>+		{
>+			List result = new ArrayList();
>+			List schemas = ((Catalog)grandParent).getSchemas();
>+			for (Iterator iterator = schemas.iterator(); iterator.hasNext();) {
>+				Schema schema = (Schema) iterator.next();
>+				List udfs = schema.getProcedures();
>+				result.addAll(udfs);
>+			}
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), result));
>+		}
>+		else
>+		{
>+			return EMPTY_ELEMENT_ARRAY;
>+		}
>     }
> 	
> 	/**
>@@ -199,8 +289,38 @@
> 	 */
> 	protected Object [] displaySequenceNodeChildren (Object parent)
> 	{
>-		Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>-		return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getSequences()));
>+		Object grandParent = ((IVirtualNode)parent).getParent();
>+		if(grandParent instanceof Schema)
>+		{
>+			Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getSequences()));
>+		}
>+		else if(grandParent instanceof Database)
>+		{
>+			List result = new ArrayList();
>+			List schemas = ((Database)grandParent).getSchemas();
>+			for (Iterator iterator = schemas.iterator(); iterator.hasNext();) {
>+				Schema schema = (Schema) iterator.next();
>+				List udfs = schema.getSequences();
>+				result.addAll(udfs);
>+			}
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), result));
>+		}
>+		else if(grandParent instanceof Catalog)
>+		{
>+			List result = new ArrayList();
>+			List schemas = ((Catalog)grandParent).getSchemas();
>+			for (Iterator iterator = schemas.iterator(); iterator.hasNext();) {
>+				Schema schema = (Schema) iterator.next();
>+				List udfs = schema.getSequences();
>+				result.addAll(udfs);
>+			}
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), result));
>+		}
>+		else
>+		{
>+			return EMPTY_ELEMENT_ARRAY;
>+		}
> 	}
> 
> 	/**
>@@ -210,8 +330,38 @@
> 	 */
> 	protected Object [] displayUDTNodeChildren (Object parent)
> 	{
>-		Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>-		return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getUserDefinedTypes()));
>+		Object grandParent = ((IVirtualNode)parent).getParent();
>+		if(grandParent instanceof Schema)
>+		{
>+			Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getUserDefinedTypes()));
>+		}
>+		else if(grandParent instanceof Database)
>+		{
>+			List result = new ArrayList();
>+			List schemas = ((Database)grandParent).getSchemas();
>+			for (Iterator iterator = schemas.iterator(); iterator.hasNext();) {
>+				Schema schema = (Schema) iterator.next();
>+				List udfs = schema.getUserDefinedTypes();
>+				result.addAll(udfs);
>+			}
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), result));
>+		}
>+		else if(grandParent instanceof Catalog)
>+		{
>+			List result = new ArrayList();
>+			List schemas = ((Catalog)grandParent).getSchemas();
>+			for (Iterator iterator = schemas.iterator(); iterator.hasNext();) {
>+				Schema schema = (Schema) iterator.next();
>+				List udfs = schema.getUserDefinedTypes();
>+				result.addAll(udfs);
>+			}
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), result));
>+		}
>+		else
>+		{
>+			return EMPTY_ELEMENT_ARRAY;
>+		}
> 	}
> 	
> 	/**
>@@ -258,8 +408,38 @@
> 	 */
> 	protected Object [] displayViewsNodeChildren (Object parent)
> 	{
>-		Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>-		return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getTables()));
>+		Object grandParent = ((IVirtualNode)parent).getParent();
>+		if(grandParent instanceof Schema)
>+		{
>+			Schema schema = (Schema) ((IVirtualNode)parent).getParent();
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), schema.getTables()));
>+		}
>+		else if(grandParent instanceof Database)
>+		{
>+			List result = new ArrayList();
>+			List schemas = ((Database)grandParent).getSchemas();
>+			for (Iterator iterator = schemas.iterator(); iterator.hasNext();) {
>+				Schema schema = (Schema) iterator.next();
>+				List udfs = schema.getTables();
>+				result.addAll(udfs);
>+			}
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), result));
>+		}
>+		else if(grandParent instanceof Catalog)
>+		{
>+			List result = new ArrayList();
>+			List schemas = ((Catalog)grandParent).getSchemas();
>+			for (Iterator iterator = schemas.iterator(); iterator.hasNext();) {
>+				Schema schema = (Schema) iterator.next();
>+				List udfs = schema.getTables();
>+				result.addAll(udfs);
>+			}
>+			return getArrays (parent, getChildren(((IVirtualNode)parent).getGroupID(), result));
>+		}
>+		else
>+		{
>+			return EMPTY_ELEMENT_ARRAY;
>+		}
> 	}
> 	
> 	/**

Actions: View | Diff

Attachments on bug 229212: 97908 | 98119