reorg profile properties pages to admin UI

10 files changed, 58 insertions, 67 deletions

diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml b/bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml
index 5f4ea6779..f45dc1ef6 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml
@@ -63,8 +63,8 @@
          point="org.eclipse.ui.propertyPages">
       <page
             name="%Profile.name"
-            class="org.eclipse.equinox.p2.ui.dialogs.ProfilePropertyPage"
-            id="org.eclipse.equinox.p2.ui.admin.internal.dialogs.ProfilePropertyPage">
+            class="org.eclipse.equinox.internal.p2.ui.admin.dialogs.ProfilePropertyPage"
+            id="org.eclipse.equinox.internal.p2.ui.admin.dialogs.ProfilePropertyPage">
             <enabledWhen>
              <instanceof
                   value="org.eclipse.equinox.p2.engine.Profile">
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIMessages.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIMessages.java
index a112d942c..9c21e64d3 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIMessages.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIMessages.java
@@ -75,6 +75,22 @@ public class ProvAdminUIMessages extends NLS {
 	public static String IUGroup_TouchpointData;
 	public static String IUGroup_TouchpointType;
 	public static String IUGroup_Version;
-	public static String NO_IU_SELECTED;
+
+	public static String No_Property_Item_Selected;
+
+	public static String ProfileGroup_Browse;
+	public static String ProfileGroup_Browse2;
+	public static String ProfileGroup_Environments;
+	public static String ProfileGroup_Flavor;
+	public static String ProfileGroup_ID;
+	public static String ProfileGroup_Cache;
+	public static String ProfileGroup_InstallFolder;
+	public static String ProfileGroup_Name;
+	public static String ProfileGroup_NL;
+	public static String ProfileGroup_SelectProfileMessage;
+	public static String ProfileGroup_Description;
+	public static String ProfileGroup_ProfileIDRequired;
+	public static String ProfileGroup_ProfileInstallFolderRequired;
+	public static String ProfileGroup_SelectBundlePoolCache;
 
 }
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java
index e190d81c5..e3ffdce8c 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java
@@ -18,7 +18,6 @@ import org.eclipse.equinox.p2.engine.Profile;
 import org.eclipse.equinox.p2.ui.ProvUI;
 import org.eclipse.equinox.p2.ui.ProvisioningUndoSupport;
 import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator;
-import org.eclipse.equinox.p2.ui.dialogs.ProfileGroup;
 import org.eclipse.equinox.p2.ui.operations.AddProfileOperation;
 import org.eclipse.equinox.p2.ui.operations.ProfileOperation;
 import org.eclipse.jface.dialogs.*;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationPropertyPage.java
index 9c929926b..36be27026 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationPropertyPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationPropertyPage.java
@@ -33,7 +33,7 @@ public class IUImplementationPropertyPage extends PropertyPage {
 		InstallableUnit iu = (InstallableUnit) getElement().getAdapter(InstallableUnit.class);
 		if (iu == null) {
 			Label label = new Label(parent, SWT.DEFAULT);
-			label.setText(ProvAdminUIMessages.NO_IU_SELECTED);
+			label.setText(ProvAdminUIMessages.No_Property_Item_Selected);
 		}
 		iuGroup = new IUImplementationGroup(parent, iu, new ModifyListener() {
 			public void modifyText(ModifyEvent event) {
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/ProfileGroup.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfileGroup.java
index d784ff3d9..a8fcccf68 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/ProfileGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfileGroup.java
@@ -10,11 +10,11 @@
  *     Andrew Overholt <overholt@redhat.com> - Fix for Bug 197970  
  *        	[prov] unset Profile name causes exception bringing up profile properties
  *******************************************************************************/
-package org.eclipse.equinox.p2.ui.dialogs;
+package org.eclipse.equinox.internal.p2.ui.admin.dialogs;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages;
 import org.eclipse.equinox.p2.engine.Profile;
 import org.eclipse.equinox.p2.ui.ProvUIActivator;
 import org.eclipse.equinox.p2.ui.model.ProfileFactory;
@@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.*;
  */
 public class ProfileGroup {
 
-	// FIXME: temporary for M1; should make flavor a dropdown, populated
+	// TODO should make flavor a dropdown, populated
 	//		 via a query for all flavors in known repositories
 	static private String FLAVOR_DEFAULT = "tooling"; //$NON-NLS-1$
 
@@ -64,7 +64,7 @@ public class ProfileGroup {
 		gd.horizontalSpan = 2;
 
 		Label label = new Label(composite, SWT.NONE);
-		label.setText(ProvUIMessages.ProfileGroup_ID);
+		label.setText(ProvAdminUIMessages.ProfileGroup_ID);
 		id = new Text(composite, SWT.BORDER);
 		id.setLayoutData(gd);
 		if (profile == null && listener != null) {
@@ -74,16 +74,16 @@ public class ProfileGroup {
 		}
 
 		label = new Label(composite, SWT.NONE);
-		label.setText(ProvUIMessages.ProfileGroup_InstallFolder);
+		label.setText(ProvAdminUIMessages.ProfileGroup_InstallFolder);
 		location = new Text(composite, SWT.BORDER);
 		location.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		location.addModifyListener(listener);
 		Button locationButton = new Button(composite, SWT.PUSH);
-		locationButton.setText(ProvUIMessages.ProfileGroup_Browse);
+		locationButton.setText(ProvAdminUIMessages.ProfileGroup_Browse);
 		locationButton.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent event) {
 				DirectoryDialog dialog = new DirectoryDialog(parent.getShell(), SWT.APPLICATION_MODAL);
-				dialog.setMessage(ProvUIMessages.ProfileGroup_SelectProfileMessage);
+				dialog.setMessage(ProvAdminUIMessages.ProfileGroup_SelectProfileMessage);
 				String dir = dialog.open();
 				if (dir != null) {
 					location.setText(dir);
@@ -92,16 +92,16 @@ public class ProfileGroup {
 		});
 
 		label = new Label(composite, SWT.NONE);
-		label.setText(ProvUIMessages.ProfileGroup_Cache);
+		label.setText(ProvAdminUIMessages.ProfileGroup_Cache);
 		cache = new Text(composite, SWT.BORDER);
 		cache.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		cache.addModifyListener(listener);
 		locationButton = new Button(composite, SWT.PUSH);
-		locationButton.setText(ProvUIMessages.ProfileGroup_Browse);
+		locationButton.setText(ProvAdminUIMessages.ProfileGroup_Browse2);
 		locationButton.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent event) {
 				DirectoryDialog dialog = new DirectoryDialog(parent.getShell(), SWT.APPLICATION_MODAL);
-				dialog.setMessage(ProvUIMessages.ProfileGroup_SelectBundlePoolCache);
+				dialog.setMessage(ProvAdminUIMessages.ProfileGroup_SelectBundlePoolCache);
 				String dir = dialog.open();
 				if (dir != null) {
 					cache.setText(dir);
@@ -110,30 +110,30 @@ public class ProfileGroup {
 		});
 
 		label = new Label(composite, SWT.NONE);
-		label.setText(ProvUIMessages.ProfileGroup_Name);
+		label.setText(ProvAdminUIMessages.ProfileGroup_Name);
 		name = new Text(composite, SWT.BORDER);
 		name.setLayoutData(gd);
 		name.addModifyListener(listener);
 		label = new Label(composite, SWT.NONE);
-		label.setText(ProvUIMessages.ProfileGroup_Description);
+		label.setText(ProvAdminUIMessages.ProfileGroup_Description);
 		description = new Text(composite, SWT.BORDER);
 		description.setLayoutData(gd);
 		description.addModifyListener(listener);
 
 		label = new Label(composite, SWT.NONE);
-		label.setText(ProvUIMessages.ProfileGroup_Flavor);
+		label.setText(ProvAdminUIMessages.ProfileGroup_Flavor);
 		flavor = new Text(composite, SWT.BORDER);
 		flavor.setLayoutData(gd);
 		flavor.addModifyListener(listener);
 
 		label = new Label(composite, SWT.NONE);
-		label.setText(ProvUIMessages.ProfileGroup_Environments);
+		label.setText(ProvAdminUIMessages.ProfileGroup_Environments);
 		environments = new Text(composite, SWT.BORDER);
 		environments.setLayoutData(gd);
 		environments.addModifyListener(listener);
 
 		label = new Label(composite, SWT.NONE);
-		label.setText(ProvUIMessages.ProfileGroup_NL);
+		label.setText(ProvAdminUIMessages.ProfileGroup_NL);
 		nl = new Text(composite, SWT.BORDER);
 		nl.setLayoutData(gd);
 		nl.addModifyListener(listener);
@@ -252,10 +252,10 @@ public class ProfileGroup {
 	 */
 	public IStatus verify() {
 		if (id.getText().trim().length() == 0) {
-			return new Status(IStatus.ERROR, ProvUIActivator.PLUGIN_ID, 0, ProvUIMessages.ProfileGroup_ProfileIDRequired, null);
+			return new Status(IStatus.ERROR, ProvUIActivator.PLUGIN_ID, 0, ProvAdminUIMessages.ProfileGroup_ProfileIDRequired, null);
 		}
 		if (location.getText().trim().length() == 0) {
-			return new Status(IStatus.ERROR, ProvUIActivator.PLUGIN_ID, 0, ProvUIMessages.ProfileGroup_ProfileInstallFolderRequired, null);
+			return new Status(IStatus.ERROR, ProvUIActivator.PLUGIN_ID, 0, ProvAdminUIMessages.ProfileGroup_ProfileInstallFolderRequired, null);
 		}
 
 		// TODO what kind of validation do we perform for other properties?
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/ProfilePropertyPage.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfilePropertyPage.java
index 1ece4c65c..8f890f120 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/ProfilePropertyPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfilePropertyPage.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.p2.ui.dialogs;
+package org.eclipse.equinox.internal.p2.ui.admin.dialogs;
 
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages;
 import org.eclipse.equinox.p2.engine.Profile;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.swt.SWT;
@@ -33,7 +33,7 @@ public class ProfilePropertyPage extends PropertyPage {
 		Profile profile = (Profile) getElement().getAdapter(Profile.class);
 		if (profile == null) {
 			Label label = new Label(parent, SWT.DEFAULT);
-			label.setText(ProvUIMessages.ProfilePropertyPage_NoProfileSelected);
+			label.setText(ProvAdminUIMessages.No_Property_Item_Selected);
 		}
 		profileGroup = new ProfileGroup(parent, profile, new ModifyListener() {
 			public void modifyText(ModifyEvent event) {
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/messages.properties b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/messages.properties
index d5819b799..1059b45ae 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/messages.properties
@@ -48,11 +48,26 @@ RepositoryGroup_NameColumnLabel=Name
 RepositoryGroup_ValueColumnLabel=Value
 IUGroup_ID=IU &id:
 IUGroup_Version=&Version:
-NO_IU_SELECTED=There is nothing to show in the properties
+No_Property_Item_Selected=There is nothing to show in the properties
 IUGroup_Namespace=&Namespace:
 IUGroup_TouchpointType=&Touchpoint type:
 IUGroup_TouchpointData=Touchpoint &data:
 IUGroup_RequiredCapabilities=&Required capabilities:
 IUGroup_ProvidedCapabilities=&Provided capabilities:
 IUGroup_IU_ID_Required=Must set an IU ID
+ProfileGroup_ID=Profile &id:
+ProfileGroup_Browse=&Browse...
+ProfileGroup_Browse2=B&rowse...
+ProfileGroup_SelectProfileMessage=Select an installation directory:
+ProfileGroup_SelectBundlePoolCache=Select a bundle pool directory:
+ProfileGroup_Name=&Name:
+ProfileGroup_Description=&Description:
+ProfileGroup_Flavor=&Flavor:
+ProfileGroup_NL=N&L:
+ProfileGroup_Cache=Bundle &pool location:
+ProfileGroup_InstallFolder=Install f&older:
+ProfileGroup_Environments=&Environments:
+ProfileGroup_ProfileIDRequired=Must specify a Profile ID
+ProfileGroup_ProfileInstallFolderRequired=Must specify an install folder
+
 
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml b/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml
index 69b23f390..9b8ccc89a 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml
@@ -4,19 +4,9 @@
  <extension
          point="org.eclipse.ui.propertyPages">
       <page
-            name="%Profile.name"
-            class="org.eclipse.equinox.p2.ui.dialogs.ProfilePropertyPage"
-            id="org.eclipse.equinox.p2.ui.internal.sdk.ProfilePropertyPage">
-            <enabledWhen>
-             <instanceof
-                  value="org.eclipse.equinox.p2.engine.Profile">
-             </instanceof>
-          </enabledWhen>
-      </page>
-      <page
             name="%IU.name"
             class="org.eclipse.equinox.p2.ui.dialogs.IUPropertyPage"
-            id="org.eclipse.equinox.p2.ui.internal.sdk.IUPropertyPage">
+            id="org.eclipse.equinox.internal.p2.ui.sdk.IUPropertyPage">
             <enabledWhen>
             <or>
              <instanceof
@@ -33,7 +23,7 @@
       <page
             name="%Repository.name"
             class="org.eclipse.equinox.p2.ui.dialogs.ColocatedRepositoryPropertyPage"
-            id="org.eclipse.equinox.p2.ui.internal.sdk.ColocatedRepositoryPropertyPage">
+            id="org.eclipse.equinox.internal.p2.ui.sdk.ColocatedRepositoryPropertyPage">
             <enabledWhen>
              <instanceof
                   value="org.eclipse.equinox.p2.metadata.repository.IMetadataRepository">
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java
index 657b590f8..638267724 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java
@@ -39,8 +39,6 @@ public class ProvUIMessages extends NLS {
 	public static String IUDetailsLabelProvider_Unknown;
 	public static String IUPropertiesGroup_NameProperty;
 	public static String IUPropertiesGroup_ProviderProperty;
-	public static String ProfileGroup_Cache;
-	public static String ProfileGroup_SelectBundlePoolCache;
 	// utility error messages
 	public static String ProvisioningUtil_NoRepositoryManager;
 	public static String ProvisioningUtil_AddRepositoryFailure;
@@ -87,7 +85,6 @@ public class ProvUIMessages extends NLS {
 	public static String RollbackIUProgress;
 
 	// Property pages
-	public static String ProfilePropertyPage_NoProfileSelected;
 	public static String IUPropertyPage_NoIUSelected;
 	public static String RepositoryPropertyPage_NoRepoSelected;
 
@@ -99,17 +96,6 @@ public class ProvUIMessages extends NLS {
 	public static String RepositoryGroup_RepositoryNameFieldLabel;
 	public static String RepositoryGroup_URLRequired;
 	public static String RepositoryGroup_RepositoryURLFieldLabel;
-	public static String ProfileGroup_Browse;
-	public static String ProfileGroup_Environments;
-	public static String ProfileGroup_Flavor;
-	public static String ProfileGroup_ID;
-	public static String ProfileGroup_InstallFolder;
-	public static String ProfileGroup_Name;
-	public static String ProfileGroup_NL;
-	public static String ProfileGroup_SelectProfileMessage;
-	public static String ProfileGroup_Description;
-	public static String ProfileGroup_ProfileIDRequired;
-	public static String ProfileGroup_ProfileInstallFolderRequired;
 
 	// Dialogs
 	public static String AddRepositoryDialog_DuplicateURL;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
index be76ca2d9..3e1ceb9f3 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
@@ -51,7 +51,6 @@ ProvDropAdapter_NoIUsToDrop=No IUs were available to be dropped
 ProvDropAdapter_InvalidDropTarget=Invalid drop target
 ProvDropAdapter_UnsupportedDropOperation=Unsupported drop operation
 
-ProfilePropertyPage_NoProfileSelected=There was no profile selected
 IUPropertyPage_NoIUSelected=There was nothing selected to show in the properties.
 IUDetailsLabelProvider_Unknown=Unknown
 IUPropertiesGroup_NameProperty=Name
@@ -66,24 +65,10 @@ RepositoryGroup_ArchivedRepoBrowseButton=&Archive...
 RepositoryGroup_SelectRepositoryDirectory=Select a repository root directory:
 RepositoryGroup_RepositoryFile=Repository archive
 RepositoryGroup_URLRequired=Must specify a URL
-ProfileGroup_ID=Profile &id:
-ProfileGroup_Browse=&Browse...
-ProfileGroup_SelectProfileMessage=Select a profile installation directory:
-ProfileGroup_SelectBundlePoolCache=Select a bundle pool directory:
-ProfileGroup_Name=&Name:
-ProfileGroup_Description=&Description:
-ProfileGroup_Flavor=&Flavor:
-ProfileGroup_Cache=Bundle &pool location:
-ProfileGroup_NL=N&L
-ProfileGroup_InstallFolder=Install &folder:
-ProfileGroup_Environments=&Environments:
-ProfileGroup_ProfileIDRequired=Must specify a Profile ID
-ProfileGroup_ProfileInstallFolderRequired=Must specify an install folder
 
 AddRepositoryDialog_Title=Add Repository
 AddRepositoryDialog_DuplicateURL=Duplicate URL
 
-
 UpdateAndInstallGroup_Properties=&Properties...
 UpdateAndInstallSelectionDialog_DeselectAllLabel=&Deselect All
 UpdateAndInstallSelectionDialog_SelectAllLabel=&Select All