Attachment 63169 Details for Bug 181394 – Patch to fix non-unique absolute name of filter and filter pool references

[patch] Patch to fix non-unique absolute name of filter and filter pool references

patch_bugzilla#181394_filterabsolutename.txt (text/plain), 4.31 KB, created by Tobias Schwarz

on 2007-04-06 08:16:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Schwarz

Created: 2007-04-06 08:16:35 EDT

Size: 4.31 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.ui
>Index: UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java,v
>retrieving revision 1.10
>diff -u -r1.10 SystemViewFilterReferenceAdapter.java
>--- UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java	4 Apr 2007 13:45:20 -0000	1.10
>+++ UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java	6 Apr 2007 11:46:41 -0000
>@@ -27,6 +27,7 @@
> import org.eclipse.jface.resource.ImageDescriptor;
> import org.eclipse.jface.viewers.IStructuredSelection;
> import org.eclipse.jface.viewers.Viewer;
>+import org.eclipse.rse.core.SystemAdapterHelpers;
> import org.eclipse.rse.core.SystemBasePlugin;
> import org.eclipse.rse.core.filters.ISystemFilter;
> import org.eclipse.rse.core.filters.ISystemFilterContainerReference;
>@@ -187,8 +188,10 @@
> 	 */
> 	public String getAbsoluteName(Object element)
> 	{
>-		ISystemFilter filter = getFilter(element);
>-		return filter.getSystemFilterPoolManager().getName() + "." + filter.getParentFilterPool().getName() + "." + filter.getName(); //$NON-NLS-1$ //$NON-NLS-2$
>+		ISystemFilterPoolReference filterPoolReference = getFilterReference(element).getParentSystemFilterReferencePool();
>+		ISystemViewElementAdapter adapter = SystemAdapterHelpers.getViewAdapter(filterPoolReference);
>+		String parentAbsoluteName = (adapter != null) ?	parentAbsoluteName = adapter.getAbsoluteName(filterPoolReference) : ""; //$NON-NLS-1$
>+		return parentAbsoluteName + "." + getName(element); //$NON-NLS-1$
> 	}
> 
> 	/**
>Index: UI/org/eclipse/rse/internal/ui/view/SystemViewFilterPoolReferenceAdapter.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterPoolReferenceAdapter.java,v
>retrieving revision 1.7
>diff -u -r1.7 SystemViewFilterPoolReferenceAdapter.java
>--- UI/org/eclipse/rse/internal/ui/view/SystemViewFilterPoolReferenceAdapter.java	19 Mar 2007 11:02:12 -0000	1.7
>+++ UI/org/eclipse/rse/internal/ui/view/SystemViewFilterPoolReferenceAdapter.java	6 Apr 2007 11:46:41 -0000
>@@ -22,9 +22,11 @@
> import org.eclipse.jface.action.IAction;
> import org.eclipse.jface.resource.ImageDescriptor;
> import org.eclipse.jface.viewers.IStructuredSelection;
>+import org.eclipse.rse.core.SystemAdapterHelpers;
> import org.eclipse.rse.core.filters.ISystemFilterPool;
> import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
> import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
>+import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
> import org.eclipse.rse.core.subsystems.ISubSystem;
> import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
> import org.eclipse.rse.core.subsystems.SubSystemHelpers;
>@@ -37,6 +39,7 @@
> import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;
> import org.eclipse.rse.ui.view.ISystemMementoConstants;
> import org.eclipse.rse.ui.view.ISystemPropertyConstants;
>+import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
> import org.eclipse.swt.widgets.Shell;
> import org.eclipse.ui.views.properties.IPropertyDescriptor;
> import org.eclipse.ui.views.properties.PropertyDescriptor;
>@@ -175,8 +178,13 @@
> 	 */
> 	public String getAbsoluteName(Object element)
> 	{
>-		ISystemFilterPoolReference filterPoolRef = (ISystemFilterPoolReference)element;
>-		return filterPoolRef.getReferencedFilterPool().getSystemFilterPoolManager().getName() + "." + filterPoolRef.getName(); //$NON-NLS-1$
>+		ISystemFilterPoolReference filterPoolRef = getFilterPoolReference(element);
>+		ISystemFilterPoolReferenceManagerProvider subSytsem = filterPoolRef.getProvider();
>+		ISystemViewElementAdapter adapter = SystemAdapterHelpers.getViewAdapter(subSytsem);
>+		String parentAbsoluteName = (adapter != null) ?	parentAbsoluteName = adapter.getAbsoluteName(subSytsem) : ""; //$NON-NLS-1$
>+		return parentAbsoluteName + "." +  //$NON-NLS-1$
>+			filterPoolRef.getReferencedFilterPool().getSystemFilterPoolManager().getName() + "." +  //$NON-NLS-1$
>+			filterPoolRef.getName();
> 	}			
> 	/**
> 	 * Return the type label for this object

Flags:

mober.at+eclipse: iplog+

Actions: View | Diff

Attachments on bug 181394: 63169 | 63170