Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 156928 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptorManager.java (-1 / +2 lines)
Lines 20-25 Link Here
20
20
21
import org.eclipse.core.runtime.IConfigurationElement;
21
import org.eclipse.core.runtime.IConfigurationElement;
22
import org.eclipse.ui.WorkbenchException;
22
import org.eclipse.ui.WorkbenchException;
23
import org.eclipse.ui.activities.WorkbenchActivityHelper;
23
import org.eclipse.ui.internal.navigator.NavigatorPlugin;
24
import org.eclipse.ui.internal.navigator.NavigatorPlugin;
24
import org.eclipse.ui.internal.navigator.extensions.NavigatorContentRegistryReader;
25
import org.eclipse.ui.internal.navigator.extensions.NavigatorContentRegistryReader;
25
import org.eclipse.ui.navigator.INavigatorContentService;
26
import org.eclipse.ui.navigator.INavigatorContentService;
Lines 154-160 Link Here
154
					.next();
155
					.next();
155
156
156
			if (isVisible(aContentService, descriptor)
157
			if (isVisible(aContentService, descriptor)
157
						&& descriptor.isEnabledFor(anElement)) {
158
						&& descriptor.isEnabledFor(anElement) && !WorkbenchActivityHelper.filterItem(descriptor)) {
158
				descriptors.add(descriptor);
159
				descriptors.add(descriptor);
159
			}
160
			}
160
		}
161
		}
(-)src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptor.java (-1 / +15 lines)
Lines 23-28 Link Here
23
import org.eclipse.core.runtime.IConfigurationElement;
23
import org.eclipse.core.runtime.IConfigurationElement;
24
import org.eclipse.core.runtime.IStatus;
24
import org.eclipse.core.runtime.IStatus;
25
import org.eclipse.jface.viewers.IStructuredSelection;
25
import org.eclipse.jface.viewers.IStructuredSelection;
26
import org.eclipse.ui.IPluginContribution;
26
import org.eclipse.ui.WorkbenchException;
27
import org.eclipse.ui.WorkbenchException;
27
import org.eclipse.ui.internal.navigator.NavigatorPlugin;
28
import org.eclipse.ui.internal.navigator.NavigatorPlugin;
28
import org.eclipse.ui.internal.navigator.extensions.INavigatorContentExtPtConstants;
29
import org.eclipse.ui.internal.navigator.extensions.INavigatorContentExtPtConstants;
Lines 37-43 Link Here
37
 * 
38
 * 
38
 * @since 3.2
39
 * @since 3.2
39
 */
40
 */
40
public class CommonWizardDescriptor implements INavigatorContentExtPtConstants {
41
public class CommonWizardDescriptor implements INavigatorContentExtPtConstants, IPluginContribution {
41
	
42
	
42
	/** The default menu group id for commonWizards without a menuGroupId attribute. */
43
	/** The default menu group id for commonWizards without a menuGroupId attribute. */
43
	public static final String DEFAULT_MENU_GROUP_ID = "all-uncategorized"; //$NON-NLS-1$
44
	public static final String DEFAULT_MENU_GROUP_ID = "all-uncategorized"; //$NON-NLS-1$
Lines 243-246 Link Here
243
		return "CommonWizardDescriptor["+getId()+", wizardId="+getWizardId()+"]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
244
		return "CommonWizardDescriptor["+getId()+", wizardId="+getWizardId()+"]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
244
	}
245
	}
245
246
247
	/* (non-Javadoc)
248
	 * @see org.eclipse.ui.IPluginContribution#getLocalId()
249
	 */
250
	public String getLocalId() {
251
		return getId();
252
	}
253
	
254
	/* (non-Javadoc)
255
	 * @see org.eclipse.ui.IPluginContribution#getPluginId()
256
	 */
257
	public String getPluginId() {
258
        return (configElement != null) ? configElement.getNamespaceIdentifier() : null;
259
	}
246
}
260
}

Return to bug 156928