### Eclipse Workspace Patch 1.0
#P org.eclipse.pde.ui
Index: src/org/eclipse/pde/internal/ui/pderesources.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties,v
retrieving revision 1.988
diff -u -r1.988 pderesources.properties
--- src/org/eclipse/pde/internal/ui/pderesources.properties 26 Apr 2008 00:15:13 -0000 1.988
+++ src/org/eclipse/pde/internal/ui/pderesources.properties 26 Apr 2008 23:26:55 -0000
@@ -519,7 +519,7 @@
ConfigurationTab_useDefaultLoc=&Use default location
ConfigurationTab_configLog=&Location:
ConfigurationSection_title=Configuration File
-ConfigurationSection_desc=An Eclipse product can be configured by setting properties in a config.ini file. These properties are read by the runtime upon startup and customization can vary per platform.
+ConfigurationSection_desc=A product can be configured by setting properties in a config.ini file. These properties are read by the runtime upon startup and customization can vary per platform.
ConfigurationSection_file=File:
ConfigurationSection_existing=Use an existing config.ini file
ConfigurationTab_configLocMessage=Select a configuration location:
@@ -1846,9 +1846,11 @@
Product_overview_configuration =
Product_PluginSection_working=Add Working Set...
ProductInfoSection_titleLabel=Specify the name that appears in the title bar of the application.
+ProductInfoSection_versionTitle=Specify the product version.
+ProductInfoSection_version=Version:
Product_PluginSection_required=Add Required Plug-ins
ProductInfoSection_prodIdLabel=Specify the product identifier.
-ProductInfoSection_productname=Product Name:
+ProductInfoSection_productname=Name:
ProductExportWizardPage_title=Eclipse product
ProductExportWizard_syncTitle=Synchronize
ProductExportWizardPage_config=Config&uration:
@@ -1925,7 +1927,7 @@
List all the required fragments on the Configuration page.\
ProductInfoSection_desc=This section describes general information about the product.
-ProductInfoSection_id=Product ID:
+ProductInfoSection_id=ID:
ProductInfoSection_new=New...
ProductInfoSection_app=Application:
SplashSection_title=Location
Index: src/org/eclipse/pde/internal/ui/PDEUIMessages.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java,v
retrieving revision 1.371
diff -u -r1.371 PDEUIMessages.java
--- src/org/eclipse/pde/internal/ui/PDEUIMessages.java 26 Apr 2008 00:15:13 -0000 1.371
+++ src/org/eclipse/pde/internal/ui/PDEUIMessages.java 26 Apr 2008 23:26:52 -0000
@@ -2107,6 +2107,8 @@
public static String Product_overview_configuration;
public static String Product_PluginSection_working;
public static String ProductInfoSection_titleLabel;
+ public static String ProductInfoSection_version;
+ public static String ProductInfoSection_versionTitle;
public static String Product_PluginSection_required;
public static String ProductInfoSection_prodIdLabel;
public static String ProductExportWizardPage_title;
Index: src/org/eclipse/pde/internal/ui/wizards/product/BaseProductCreationOperation.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/BaseProductCreationOperation.java,v
retrieving revision 1.25
diff -u -r1.25 BaseProductCreationOperation.java
--- src/org/eclipse/pde/internal/ui/wizards/product/BaseProductCreationOperation.java 17 Apr 2008 16:17:34 -0000 1.25
+++ src/org/eclipse/pde/internal/ui/wizards/product/BaseProductCreationOperation.java 26 Apr 2008 23:26:55 -0000
@@ -113,6 +113,7 @@
protected void initializeProductInfo(IProductModelFactory factory, IProduct product, String id) {
product.setId(id);
+ product.setVersion("1.0.0"); //$NON-NLS-1$
IPluginElement element = getProductExtension(id);
if (element != null) {
IPluginAttribute attr = element.getAttribute("application"); //$NON-NLS-1$
Index: src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java,v
retrieving revision 1.43
diff -u -r1.43 ProductInfoSection.java
--- src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java 16 Jan 2008 17:08:19 -0000 1.43
+++ src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java 26 Apr 2008 23:26:55 -0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2008 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
@@ -45,6 +45,7 @@
public class ProductInfoSection extends PDESection implements IRegistryChangeListener, IStateDeltaListener {
private FormEntry fNameEntry;
+ private FormEntry fVersionEntry;
private ExtensionIdComboPart fAppCombo;
private ExtensionIdComboPart fProductCombo;
private Button fPluginButton;
@@ -166,6 +167,7 @@
createNameEntry(client, toolkit, actionBars);
createIdEntry(client, toolkit, actionBars);
+ createVersionEntry(client, toolkit, actionBars);
createApplicationEntry(client, toolkit, actionBars);
createConfigurationOption(client, toolkit);
@@ -195,9 +197,30 @@
getProduct().setName(entry.getValue().trim());
}
});
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.grabExcessHorizontalSpace = true;
+ gd.horizontalSpan = 2;
+ fNameEntry.getText().setLayoutData(gd);
fNameEntry.setEditable(isEditable());
}
+ private void createVersionEntry(Composite client, FormToolkit toolkit, IActionBars actionBars) {
+ createLabel(client, toolkit, ""); //$NON-NLS-1$
+ createLabel(client, toolkit, PDEUIMessages.ProductInfoSection_versionTitle);
+
+ fVersionEntry = new FormEntry(client, toolkit, PDEUIMessages.ProductInfoSection_version, null, false);
+ fVersionEntry.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
+ public void textValueChanged(FormEntry entry) {
+ getProduct().setVersion(entry.getValue().trim());
+ }
+ });
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.grabExcessHorizontalSpace = true;
+ gd.horizontalSpan = 2;
+ fVersionEntry.getText().setLayoutData(gd);
+ fVersionEntry.setEditable(isEditable());
+ }
+
private void createIdEntry(Composite client, FormToolkit toolkit, IActionBars actionBars) {
createLabel(client, toolkit, ""); //$NON-NLS-1$
createLabel(client, toolkit, PDEUIMessages.ProductInfoSection_prodIdLabel);
@@ -324,6 +347,7 @@
*/
public void commit(boolean onSave) {
fNameEntry.commit();
+ fVersionEntry.commit();
super.commit(onSave);
}
@@ -332,6 +356,7 @@
*/
public void cancelEdit() {
fNameEntry.cancelEdit();
+ fVersionEntry.cancelEdit();
super.cancelEdit();
}
@@ -351,6 +376,9 @@
if (product.getName() != null) {
fNameEntry.setValue(product.getName(), true);
}
+ if (product.getVersion() != null) {
+ fVersionEntry.setValue(product.getVersion(), true);
+ }
if (product.getId() != null) {
refreshProductCombo(product.getId());
}
@@ -376,6 +404,8 @@
refreshProductCombo(e.getNewValue().toString());
} else if (prop.equals(IProduct.P_NAME)) {
fNameEntry.setValue(e.getNewValue().toString(), true);
+ } else if (prop.equals(IProduct.P_VERSION)) {
+ fVersionEntry.setValue(e.getNewValue().toString(), true);
} else if (prop.equals(IProduct.P_APPLICATION)) {
fAppCombo.setText(e.getNewValue().toString());
}
#P org.eclipse.pde.core
Index: src/org/eclipse/pde/internal/core/iproduct/IProduct.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IProduct.java,v
retrieving revision 1.30
diff -u -r1.30 IProduct.java
--- src/org/eclipse/pde/internal/core/iproduct/IProduct.java 17 Apr 2008 16:17:32 -0000 1.30
+++ src/org/eclipse/pde/internal/core/iproduct/IProduct.java 26 Apr 2008 23:26:56 -0000
@@ -62,6 +62,8 @@
void setId(String id);
+ void setVersion(String version);
+
void setName(String name);
void setAboutInfo(IAboutInfo info);
Index: src/org/eclipse/pde/internal/core/product/Product.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/Product.java,v
retrieving revision 1.39
diff -u -r1.39 Product.java
--- src/org/eclipse/pde/internal/core/product/Product.java 17 Apr 2008 16:17:33 -0000 1.39
+++ src/org/eclipse/pde/internal/core/product/Product.java 26 Apr 2008 23:26:56 -0000
@@ -89,6 +89,16 @@
}
/* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.iproduct.IProduct#setVersion(java.lang.String)
+ */
+ public void setVersion(String version) {
+ String old = fVersion;
+ fVersion = version;
+ if (isEditable())
+ firePropertyChanged(P_VERSION, old, fVersion);
+ }
+
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.iproduct.IProduct#setName(java.lang.String)
*/
public void setName(String name) {