Attachment 226653 Details for Bug 400129 – Fix analogous to the fix for bug 273049

[patch] Fix analogous to the fix for bug 273049

patch400129.txt (text/plain), 1.81 KB, created by Szymon Ptaszkiewicz

on 2013-02-06 13:17:16 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Szymon Ptaszkiewicz

Created: 2013-02-06 13:17:16 EST

Size: 1.81 KB

patch

obsolete

>diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpEditor.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpEditor.java
>index 8bda6c0..9fbc0d8 100644
>--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpEditor.java
>+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpEditor.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008, 2009 IBM Corporation and others.
>+ * Copyright (c) 2008, 2013 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -30,6 +30,7 @@
> import org.eclipse.jface.viewers.StructuredSelection;
> import org.eclipse.jface.wizard.WizardDialog;
> import org.eclipse.pde.core.IModel;
>+import org.eclipse.pde.internal.core.WorkspaceModelManager;
> import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpMarkerManager;
> import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpModel;
> import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject;
>@@ -315,7 +316,7 @@
> 	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#contributeToToolbar(org.eclipse.jface.action.IToolBarManager)
> 	 */
> 	public void contributeToToolbar(IToolBarManager manager) {
>-		if (getAggregateModel().isEditable()) {
>+		if (WorkspaceModelManager.isPluginProject(getCommonProject()) && getAggregateModel().isEditable()) {
> 			manager.add(new ControlContribution("Register") { //$NON-NLS-1$
> 						protected Control createControl(Composite parent) {
> 							ImageHyperlink fImageHyperlinkRegisterTOC = new ImageHyperlink(parent, SWT.NONE);

Flags:

curtis.windatt.public: iplog+

Actions: View | Diff

Attachments on bug 400129: 226651 | 226653