From 93f32bdde9ce3d646b4adc77a3b1ba56ccbd12a7 Mon Sep 17 00:00:00 2001
From: DJ Houghton
Date: Wed, 22 Sep 2010 20:34:07 +0000
Subject: Bug 326002 - [ui] [admin] 2 menu entries for Preferences (one not
working)
---
.../org.eclipse.equinox.p2.ui.admin.rcp/config.ini | 49 ----------------------
.../plugin.properties | 4 +-
.../rcp.product | 1 +
.../ui/admin/rcp/ApplicationActionBarAdvisor.java | 8 +++-
4 files changed, 9 insertions(+), 53 deletions(-)
delete mode 100644 bundles/org.eclipse.equinox.p2.ui.admin.rcp/config.ini
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/config.ini b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/config.ini
deleted file mode 100644
index 7126f905d..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/config.ini
+++ /dev/null
@@ -1,49 +0,0 @@
-osgi.bundles=\
- com.ibm.icu,\
- org.eclipse.core.commands,\
- org.eclipse.core.contenttype,\
- org.eclipse.core.databinding,\
- org.eclipse.core.expressions,\
- org.eclipse.core.jobs,\
- org.eclipse.core.runtime,\
- org.eclipse.ecf,\
- org.eclipse.ecf.filetransfer,\
- org.eclipse.ecf.identity,\
- org.eclipse.ecf.provider.filetransfer,\
- org.eclipse.equinox.app@start,\
- org.eclipse.equinox.common,\
- org.eclipse.equinox.frameworkadmin,\
- org.eclipse.equinox.frameworkadmin.equinox@start,\
- org.eclipse.equinox.launcher,\
- org.eclipse.equinox.launcher.win32.win32.x86,\
- org.eclipse.equinox.preferences,\
- org.eclipse.equinox.p2.jarprocessor,\
- org.eclipse.equinox.p2.artifact.repository,\
- org.eclipse.equinox.p2.console,\
- org.eclipse.equinox.p2.core,\
- org.eclipse.equinox.p2.director,\
- org.eclipse.equinox.p2.download,\
- org.eclipse.equinox.p2.engine,\
- org.eclipse.equinox.p2.metadata,\
- org.eclipse.equinox.p2.metadata.repository,\
- org.eclipse.equinox.p2.touchpoint.eclipse,\
- org.eclipse.equinox.p2.touchpoint.natives,\
- org.eclipse.equinox.p2.ui,\
- org.eclipse.equinox.p2.ui.admin,\
- org.eclipse.equinox.p2.ui.admin.rcp,\
- org.eclipse.equinox.registry,\
- org.eclipse.equinox.simpleconfigurator@1:start,\
- org.eclipse.equinox.simpleconfigurator.manipulator@start,\
- org.eclipse.help,\
- org.eclipse.jface,\
- org.eclipse.jface.databinding,\
- org.eclipse.osgi.services,\
- org.eclipse.swt,\
- org.eclipse.swt.win32.win32.x86,\
- org.eclipse.ui,\
- org.eclipse.ui.workbench,\
- org.sat4j.core,\
- org.sat4j.pb
-eclipse.product=org.eclipse.equinox.p2.ui.admin.rcp.product
-org.eclipse.equinox.simpleconfigurator.useReference=true
-org.eclipse.update.reconcile=false
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.properties b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.properties
index f90be3c48..3935dcd66 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.properties
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2007, 2009 IBM Corporation and others.
+# Copyright (c) 2007, 2010 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
@@ -18,4 +18,4 @@ appName=Eclipse Provisioning Admin UI
perspectiveName=Eclipse Provisioning
Views.Progress=Progress View
aboutText= Eclipse Provisioning Admin UI \n\n\
-(c) Copyright Eclipse contributors and others 2007-2009. All rights reserved.\n
+(c) Copyright Eclipse contributors and others 2007-2010. All rights reserved.\n
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product
index 4bea2a835..369053a13 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product
@@ -210,6 +210,7 @@ Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in t
+
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/ApplicationActionBarAdvisor.java b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/ApplicationActionBarAdvisor.java
index 2612358e1..001b6ebb2 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/ApplicationActionBarAdvisor.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/ApplicationActionBarAdvisor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2007, 2010 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
@@ -11,6 +11,7 @@
package org.eclipse.equinox.internal.p2.ui.admin.rcp;
import org.eclipse.jface.action.*;
+import org.eclipse.jface.util.Util;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.application.ActionBarAdvisor;
@@ -33,11 +34,14 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
protected void fillMenuBar(IMenuManager menuBar) {
IMenuManager fileMenu = new MenuManager(ProvAdminUIMessages.ApplicationActionBarAdvisor_FileMenuName, "file"); //$NON-NLS-1$
menuBar.add(fileMenu);
- fileMenu.add(quitAction);
+ ActionContributionItem quitItem = new ActionContributionItem(quitAction);
+ quitItem.setVisible(!Util.isMac());
+ fileMenu.add(quitItem);
IMenuManager windowMenu = new MenuManager(ProvAdminUIMessages.ApplicationActionBarAdvisor_WindowMenuName, "window"); //$NON-NLS-1$
menuBar.add(windowMenu);
windowMenu.add(prefsAction);
+ windowMenu.setVisible(!Util.isMac());
IMenuManager helpMenu = new MenuManager(ProvAdminUIMessages.ApplicationActionBarAdvisor_HelpMenuName, "help"); //$NON-NLS-1$
menuBar.add(helpMenu);
--
cgit v1.2.3