Bug 244461 - Duplicating colon in error message
Change-Id: Idef56221389bf7411ca02a210240988593b906cc
Signed-off-by: kitlo <kitlo@us.ibm.com>
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java
index 2755433..3f19a81 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java
@@ -15,6 +15,7 @@
* Fabian Miehe - Bug 440420
* Martin Karpisek <martin.karpisek@gmail.com> - Bug 438509
* Axel Richard (Obeo) - Bug 41353 - Launch configurations prototypes
+ * Kit Lo (IBM) - Bug 244461 - Duplicating colon in error message
*******************************************************************************/
package org.eclipse.pde.internal.ui;
@@ -1200,6 +1201,7 @@
public static String ContentPage_pClassGroup;
public static String ContentPage_pid;
public static String ContentPage_pversion;
+ public static String ContentPage_pversion_message;
public static String ContentPage_pname;
public static String ContentPage_pprovider;
public static String ContentPage_fid;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
index 814db12..a74c865 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
@@ -17,6 +17,7 @@
# Lars Vogel <Lars.Vogel@vogella.com> - Bug 473877
# Martin Karpisek <martin.karpisek@gmail.com> - Bug 438509
# Axel Richard (Obeo) - Bug 41353 - Launch configurations prototypes
+# Kit Lo (IBM) - Bug 244461 - Duplicating colon in error message
###############################################################################
#####################################
# PDE resource strings
@@ -761,6 +762,7 @@
ContentPage_pClassGroup = Options
ContentPage_pid = &ID:
ContentPage_pversion = &Version:
+ContentPage_pversion_message = Version: {0}
ContentPage_pname = N&ame:
ContentPage_pprovider = Ven&dor:
ContentPage_fid = &ID:
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/ContentPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/ContentPage.java
index 0e70e80..c56ca51 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/ContentPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/ContentPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -10,17 +10,19 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Kit Lo (IBM) - Bug 244461 - Duplicating colon in error message
*******************************************************************************/
package org.eclipse.pde.internal.ui.wizards.plugin;
+import java.text.MessageFormat;
+
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.pde.internal.core.util.*;
import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.util.PDELabelUtility;
import org.eclipse.pde.internal.ui.wizards.BundleProviderHistoryUtil;
import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
import org.eclipse.pde.ui.IFieldData;
@@ -122,9 +124,9 @@
*/
protected String validateVersion(Text text) {
if (text.getText().trim().length() == 0) {
- return PDELabelUtility.qualifyMessage(PDELabelUtility.getFieldLabel(text), PDEUIMessages.ControlValidationUtility_errorMsgValueMustBeSpecified);
+ return MessageFormat.format(PDEUIMessages.ContentPage_pversion_message, PDEUIMessages.ControlValidationUtility_errorMsgValueMustBeSpecified);
} else if (!isVersionValid(text.getText().trim())) {
- return PDELabelUtility.qualifyMessage(PDELabelUtility.getFieldLabel(text), UtilMessages.BundleErrorReporter_InvalidFormatInBundleVersion);
+ return MessageFormat.format(PDEUIMessages.ContentPage_pversion_message, UtilMessages.BundleErrorReporter_InvalidFormatInBundleVersion);
}
return null;
}
