Attachment 230452 Details for Bug 401709 – Patch to handle secondaryIDs for findViewReference

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

[patch] Patch to handle secondaryIDs for findViewReference

patchGIT_421_EclipseWorkbench_03052013_1237#401709.txt (text/plain), 1.81 KB, created by Jens Kuebler

on 2013-05-03 06:44:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Kuebler

Created: 2013-05-03 06:44:35 EDT

Size: 1.81 KB

patch

obsolete

>Index: WorkbenchPage.java
>===================================================================
>--- WorkbenchPage.java	(revision 167911)
>+++ WorkbenchPage.java	(working copy)
>@@ -1933,29 +1933,38 @@
>      * @see org.eclipse.ui.IWorkbenchPage
>      */
>     public IViewReference findViewReference(String viewId) {
>-        return findViewReference(viewId, null);
>-    }
>+		String[] viewIds = viewId.split(":");
>+		if (viewIds.length > 1) {
>+			for (IViewReference reference : getViewReferences()) {
>+				String id = reference.getId();
>+				String secondaryId = reference.getSecondaryId();
>+				if (viewIds[0].equals(id) && Util.equals(viewIds[1], secondaryId)) {
>+					return reference;
>+				}
>+			}
>+		} else {
>+			for (IViewReference reference : getViewReferences()) {
>+				ViewReference ref = (ViewReference) reference;
>+				if (viewId.equals(ref.getModel().getElementId())) {
>+					return reference;
>+				}
>+			}
> 
>+		}
>+		return null;
>+	}
>+
>     /*
>      * (non-Javadoc)
>      * 
>      * @see org.eclipse.ui.IWorkbenchPage
>      */
>     public IViewReference findViewReference(String viewId, String secondaryId) {
>-		for (IViewReference reference : getViewReferences()) {
>-			if (viewId.equals(reference.getId())) {
>-				String refSecondaryId = reference.getSecondaryId();
>-				if (refSecondaryId == null) {
>-					if (secondaryId == null) {
>-						return reference;
>-					}
>-				} else if (refSecondaryId.equals(secondaryId)) {
>-					return reference;
>-				}
>-			}
>-		}
>-		return null;
>-    }
>+		String compoundId = viewId;
>+		if (secondaryId != null && secondaryId.length() > 0)
>+			compoundId += ":" + secondaryId; //$NON-NLS-1$
>+		return findViewReference(compoundId);
>+	}
> 
> 	public void createViewReferenceForPart(final MPart part, String viewId) {
> 		IViewDescriptor desc = getWorkbenchWindow().getWorkbench().getViewRegistry().find(viewId);

Actions: View | Diff

Attachments on bug 401709: 230452