Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSusan Franklin2009-03-16 14:23:39 -0400
committerSusan Franklin2009-03-16 14:23:39 -0400
commit230c2443a4f4c6f588ef13c71cf9944988f1b8eb (patch)
tree519787b94976dc3c1546444d2ae1ad8e940ac15a /examples
parent3d658d3fa49f2ab86215bfe3fae20b71ba02e25a (diff)
downloadrt.equinox.p2-230c2443a4f4c6f588ef13c71cf9944988f1b8eb.tar.gz
rt.equinox.p2-230c2443a4f4c6f588ef13c71cf9944988f1b8eb.tar.xz
rt.equinox.p2-230c2443a4f4c6f588ef13c71cf9944988f1b8eb.zip
contributions complete - spoofs up repos and profiles until a real build
Diffstat (limited to 'examples')
-rw-r--r--examples/org.eclipse.equinox.p2.examples.rcp.cloud/plugin.xml25
-rw-r--r--examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/ApplicationActionBarAdvisor.java12
-rw-r--r--examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/IHelpContextIds.java14
-rw-r--r--examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/Messages.java22
-rw-r--r--examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/messages.properties17
5 files changed, 26 insertions, 64 deletions
diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/plugin.xml b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/plugin.xml
index 632705bd1..f708f9a50 100644
--- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/plugin.xml
+++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/plugin.xml
@@ -98,12 +98,12 @@
<page
name="%installedSoftwarePage"
class="org.eclipse.equinox.internal.provisional.p2.ui.dialogs.InstalledSoftwarePage"
- id="10.org.eclipse.equinox.internal.p2.ui.sdk.InstalledSoftwarePage">
+ id="10.org.eclipse.equinox.p2.examples.rcp.cloud.InstalledSoftwarePage">
</page>
<page
name="%installHistoryPage"
class="org.eclipse.equinox.internal.provisional.p2.ui.dialogs.RevertProfilePage"
- id="11.org.eclipse.equinox.internal.p2.ui.sdk.RevertProfilePage">
+ id="11.org.eclipse.equinox.p2.examples.rcp.cloud.RevertProfilePage">
</page>
</extension>
@@ -111,43 +111,42 @@
point="org.eclipse.ui.commands">
<command
name="%Update.command"
- id="org.eclipse.equinox.p2.ui.sdk.update">
+ id="org.eclipse.equinox.p2.examples.rcp.cloud.command.update">
</command>
<command
name="%Install.command"
- id="org.eclipse.equinox.p2.ui.sdk.install">
+ id="org.eclipse.equinox.p2.examples.rcp.cloud.command.install">
</command>
</extension>
<extension
point="org.eclipse.ui.handlers">
<handler
- commandId="org.eclipse.equinox.p2.ui.sdk.update"
+ commandId="org.eclipse.equinox.p2.examples.rcp.cloud.command.update"
class="org.eclipse.equinox.p2.examples.rcp.cloud.p2.UpdateHandler">
</handler>
<handler
- commandId="org.eclipse.equinox.p2.ui.sdk.install"
+ commandId="org.eclipse.equinox.p2.examples.rcp.cloud.command.install"
class="org.eclipse.equinox.p2.examples.rcp.cloud.p2.InstallNewSoftwareHandler">
</handler>
</extension>
<extension
point="org.eclipse.ui.menus">
<menuContribution
- locationURI="menu:help?after=additions">
+ locationURI="menu:tools?after=additions">
<command
- commandId="org.eclipse.equinox.p2.ui.sdk.update"
+ commandId="org.eclipse.equinox.p2.examples.rcp.cloud.command.update"
mnemonic="%Update.command.mnemonic"
- id="org.eclipse.equinox.p2.ui.sdk.update">
+ id="org.eclipse.equinox.p2.examples.rcp.cloud.menu.update">
</command>
</menuContribution>
<menuContribution
- locationURI="menu:help?after=org.eclipse.equinox.p2.ui.sdk.update">
+ locationURI="menu:tools?after=org.eclipse.equinox.p2.examples.rcp.cloud.menu.update">
<command
- commandId="org.eclipse.equinox.p2.ui.sdk.install"
+ commandId="org.eclipse.equinox.p2.examples.rcp.cloud.command.install"
mnemonic="%Install.command.mnemonic"
- id="org.eclipse.equinox.p2.ui.sdk.install">
+ id="org.eclipse.equinox.p2.examples.rcp.cloud.menu.install">
</command>
-
</menuContribution>
</extension>
diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/ApplicationActionBarAdvisor.java b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/ApplicationActionBarAdvisor.java
index ea76f4c68..b705bf42d 100644
--- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/ApplicationActionBarAdvisor.java
+++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/ApplicationActionBarAdvisor.java
@@ -30,9 +30,12 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
private IWorkbenchAction exitAction;
private IWorkbenchAction aboutAction;
private IWorkbenchAction newWindowAction;
+ private IWorkbenchAction preferencesAction;
private OpenViewAction openViewAction;
private Action messagePopupAction;
+ public static final String M_TOOLS = "tools";
+
public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
super(configurer);
@@ -51,6 +54,9 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
aboutAction = ActionFactory.ABOUT.create(window);
register(aboutAction);
+ preferencesAction = ActionFactory.PREFERENCES.create(window);
+ register(preferencesAction);
+
newWindowAction = ActionFactory.OPEN_NEW_WINDOW.create(window);
register(newWindowAction);
@@ -63,9 +69,11 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
protected void fillMenuBar(IMenuManager menuBar) {
MenuManager fileMenu = new MenuManager("&File", IWorkbenchActionConstants.M_FILE);
+ MenuManager toolsMenu = new MenuManager("&Tools", M_TOOLS);
MenuManager helpMenu = new MenuManager("&Help", IWorkbenchActionConstants.M_HELP);
menuBar.add(fileMenu);
+ menuBar.add(toolsMenu);
// Add a group marker indicating where action set menus will appear.
menuBar.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
menuBar.add(helpMenu);
@@ -78,6 +86,10 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
fileMenu.add(new Separator());
fileMenu.add(exitAction);
+ // Tools
+ toolsMenu.add(preferencesAction);
+ toolsMenu.add(new Separator());
+ toolsMenu.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
// Help
helpMenu.add(aboutAction);
}
diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/IHelpContextIds.java b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/IHelpContextIds.java
deleted file mode 100644
index bf86d89a8..000000000
--- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/IHelpContextIds.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.equinox.p2.examples.rcp.cloud.p2;
-
-/**
- * Help context ids for the P2 SDK
- * <p>
- * This interface contains constants only; it is not intended to be implemented
- * or extended.
- * </p>
- * @since 3.4
- */
-
-public interface IHelpContextIds {
- public static final String PREFIX = "org.eclipse.equinox.p2.ui.sdk.";
-}
diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/Messages.java b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/Messages.java
index 8acea0ecb..2e228a737 100644
--- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/Messages.java
+++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/Messages.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2009 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
@@ -13,33 +13,13 @@ package org.eclipse.equinox.p2.examples.rcp.cloud.p2;
import org.eclipse.osgi.util.NLS;
-/**
- * Message class for provisioning UI messages.
- *
- * @since 3.4
- */
public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.equinox.p2.examples.rcp.cloud.p2.messages"; //$NON-NLS-1$
static {
// load message values from bundle file
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
- public static String Handler_CannotLaunchUI;
- public static String Handler_SDKUpdateUIMessageTitle;
public static String InstallNewSoftwareHandler_LoadRepositoryJobLabel;
- public static String ProvisioningPreferencePage_AlwaysOpenWizard;
- public static String ProvisioningPreferencePage_BrowsingPrefsGroup;
- public static String ProvisioningPreferencePage_ShowLatestVersions;
- public static String ProvisioningPreferencePage_ShowAllVersions;
- public static String ProvisioningPreferencePage_NeverOpenWizard;
- public static String ProvisioningPreferencePage_OpenWizardIfInvalid;
- public static String ProvisioningPreferencePage_PromptToOpenWizard;
- public static String ProvSDKUIActivator_ErrorWritingLicenseRegistry;
- public static String ProvSDKUIActivator_LicenseManagerReadError;
- public static String ProvSDKUIActivator_NoSelfProfile;
- public static String ProvSDKUIActivator_OpenWizardAnyway;
- public static String ProvSDKUIActivator_Question;
- public static String ProvSDKUIActivator_SitePrefLink;
public static String UpdateHandler_NoSitesMessage;
public static String UpdateHandler_NoSitesTitle;
}
diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/messages.properties b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/messages.properties
index 41c5f95db..e16c86732 100644
--- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/messages.properties
+++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/messages.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2007, 2008 IBM Corporation and others.
+# Copyright (c) 2009 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
@@ -10,21 +10,6 @@
###############################################################################
-Handler_CannotLaunchUI=Cannot launch the Update UI. This installation has not been configured properly for Software Updates.
-Handler_SDKUpdateUIMessageTitle=Software Updates
InstallNewSoftwareHandler_LoadRepositoryJobLabel=Contacting Software Sites
-ProvSDKUIActivator_ErrorWritingLicenseRegistry=Error writing license registry. Accepted licenses will not be remembered.
-ProvSDKUIActivator_LicenseManagerReadError=Error reading license registry. Accepted licenses will not be remembered.
-ProvSDKUIActivator_NoSelfProfile=Could not locate the running profile instance. The eclipse.p2.data.area and eclipse.p2.profile properties may not be set correctly in this application's config.ini file.
-ProvSDKUIActivator_OpenWizardAnyway=The software items you selected may not be valid with your current installation. Do you want to open the wizard anyway to review the selections?
-ProvSDKUIActivator_Question=Question
-ProvSDKUIActivator_SitePrefLink=Find more software by working with the <a>'Available Software Sites'</a> preferences.
-ProvisioningPreferencePage_AlwaysOpenWizard=&Open the wizard anyway to review or change selections
-ProvisioningPreferencePage_BrowsingPrefsGroup=Browsing for updates
-ProvisioningPreferencePage_ShowLatestVersions=Show only the &latest versions of available software
-ProvisioningPreferencePage_ShowAllVersions=Show all &versions of available software
-ProvisioningPreferencePage_NeverOpenWizard=&Report the problems and do not open the wizard
-ProvisioningPreferencePage_OpenWizardIfInvalid=When software selected for an install wizard may not be compatible
-ProvisioningPreferencePage_PromptToOpenWizard=&Ask me what to do when it happens
UpdateHandler_NoSitesMessage=There are no update sites to search. Do you wish to open the "Available Software Sites" preferences?
UpdateHandler_NoSitesTitle=No Updates Found

Back to the top