From 93eaea761d9f4fcd8b7d294620249cc20cf5a7a6 Mon Sep 17 00:00:00 2001 From: zwzhao Date: Sat, 8 Jun 2013 06:32:42 +0000 Subject: [PATCH] bug TDI-26034 fixed : Job name can not be "fr" git-svn-id: http://talendforge.org/svn/tos/branches/branch-5_2@103870 f6f1c999-d317-4740-80b0-e6d1abc6f99e --- .../talend/repository/ui/wizards/PropertiesWizardPage.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/org.talend.metadata.managment.ui/src/main/java/org/talend/repository/ui/wizards/PropertiesWizardPage.java b/org.talend.metadata.managment.ui/src/main/java/org/talend/repository/ui/wizards/PropertiesWizardPage.java index e267c45a0a..ca540cb4fa 100644 --- a/org.talend.metadata.managment.ui/src/main/java/org/talend/repository/ui/wizards/PropertiesWizardPage.java +++ b/org.talend.metadata.managment.ui/src/main/java/org/talend/repository/ui/wizards/PropertiesWizardPage.java @@ -25,6 +25,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jdt.core.JavaConventions; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.ITreeViewerListener; import org.eclipse.jface.viewers.LabelProvider; @@ -159,6 +160,8 @@ public abstract class PropertiesWizardPage extends WizardPage { private boolean isSaveAs = false; private boolean allowVerchange = true; + + private static String CLASS = ".class"; //$NON-NLS-1$ public void initializeSaveAs(String orignalName, String orignalVersion, boolean isSaveAs) { this.orignalName = orignalName; @@ -1005,7 +1008,8 @@ public abstract class PropertiesWizardPage extends WizardPage { } else if (!Pattern.matches(RepositoryConstants.getPattern(getRepositoryObjectType()), nameText.getText()) || nameText.getText().trim().contains(" ")) { //$NON-NLS-1$ nameStatus = createStatus(IStatus.ERROR, Messages.getString("PropertiesWizardPage.NameFormatError")); //$NON-NLS-1$ - } else if (isKeywords(nameText.getText()) || "java".equalsIgnoreCase(nameText.getText())) {//$NON-NLS-1$ + } else if (JavaConventions.validateClassFileName(nameText.getText() + CLASS).getSeverity() == IStatus.ERROR + || "java".equalsIgnoreCase(nameText.getText())) {//$NON-NLS-1$ nameStatus = createStatus(IStatus.ERROR, Messages.getString("PropertiesWizardPage.KeywordsError")); //$NON-NLS-1$ } else if (nameModifiedByUser) { if (retrieveNameFinished) {