diff options
| author | Eike Stepper | 2010-03-15 15:34:35 +0000 |
|---|---|---|
| committer | Eike Stepper | 2010-03-15 15:34:35 +0000 |
| commit | bd8188a1a47567b4b812ff1cef1d55b1ee5c529d (patch) | |
| tree | 5a4fcdb97925d8878a1764e32900a0f2258f57d1 /plugins/org.eclipse.emf.cdo.ui/src/org | |
| parent | 7c52db52ff0fb66b0a69d412154cfa2dd8289720 (diff) | |
| download | cdo-bd8188a1a47567b4b812ff1cef1d55b1ee5c529d.tar.gz cdo-bd8188a1a47567b4b812ff1cef1d55b1ee5c529d.tar.xz cdo-bd8188a1a47567b4b812ff1cef1d55b1ee5c529d.zip | |
cleanup
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui/src/org')
2 files changed, 9 insertions, 6 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$ } |