diff options
3 files changed, 11 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SharedIcons.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SharedIcons.java index e6d1bb5e2f..cdbd2feb43 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SharedIcons.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SharedIcons.java @@ -54,9 +54,9 @@ public class SharedIcons public static final String OBJ_EPACKAGE = OBJ + "EPackage"; //$NON-NLS-1$ - public static final String OBJ_CDORESOURCE = OBJ + "CDOResource"; //$NON-NLS-1$ + public static final String OBJ_RESOURCE = OBJ + "CDOResource"; //$NON-NLS-1$ - public static final String OBJ_CDORESOURCEFOLDER = OBJ + "CDOResourceFolder"; //$NON-NLS-1$ + public static final String OBJ_RESOURCE_FOLDER = OBJ + "CDOResourceFolder"; //$NON-NLS-1$ public static final String OBJ_EPACKAGE_CONVERTED = OBJ + "EPackageConverted"; //$NON-NLS-1$ diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CDOResourceNodeNameInputValidator.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CDOResourceNodeNameInputValidator.java index 901a081e77..bae27e90f6 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CDOResourceNodeNameInputValidator.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CDOResourceNodeNameInputValidator.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Victor Roldan Betancort - initial API and implementation */ @@ -14,6 +14,8 @@ import org.eclipse.emf.cdo.eresource.CDOResourceFolder; import org.eclipse.emf.cdo.eresource.CDOResourceNode; import org.eclipse.emf.cdo.internal.ui.messages.Messages; +import org.eclipse.net4j.util.StringUtil; + import org.eclipse.emf.ecore.EObject; import org.eclipse.jface.dialogs.IInputValidator; @@ -36,13 +38,14 @@ public class CDOResourceNodeNameInputValidator implements IInputValidator public String isValid(String newText) { // Do not allow empty names - if (newText == null || newText.length() == 0) + if (StringUtil.isEmpty(newText)) { return isFolder ? Messages.getString("CreateResourceNodeAction.3") : Messages.getString("CreateResourceNodeAction.4"); //$NON-NLS-1$ //$NON-NLS-2$ } - // Do not allow starting "/" - if (newText.contains("/") || newText.contains("\\")) { //$NON-NLS-1$ //$NON-NLS-2$ + // Do not allow "/" + if (newText.contains("/") || newText.contains("\\")) //$NON-NLS-1$ //$NON-NLS-2$ + { return Messages.getString("CreateResourceNodeAction.2"); //$NON-NLS-1$ } diff --git a/releng/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs b/releng/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs index 391c0e7e07..a6f62a5938 100644 --- a/releng/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs +++ b/releng/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,5 @@ -#Mon Feb 15 12:07:35 CET 2010 +#Mon Mar 15 16:05:01 CET 2010 eclipse.preferences.version=1 +encoding//psf/extssh/_bootstrap.psf=UTF-8 encoding/build.rmap=UTF-8 encoding/local.mspec=UTF-8 |