TEIIDDES-1806 Property names now allow a '-' character

Also fixed couple minor I18n issues resulting from wrong UTIL class reference
Teiid-Designer · Jul 29, 2013 · 4783994 · 4783994
1 parent 0ef2987
commit 4783994
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/...designer.vdb.ui/src/org/teiid/designer/vdb/ui/editor/panels/AddGeneralPropertyDialog.java b/...designer.vdb.ui/src/org/teiid/designer/vdb/ui/editor/panels/AddGeneralPropertyDialog.java
@@ -7,7 +7,6 @@
 */
 package org.teiid.designer.vdb.ui.editor.panels;
 
-import static org.teiid.designer.vdb.VdbPlugin.UTIL;
 import static org.teiid.designer.vdb.ui.VdbUiConstants.Util;
 
 import java.util.HashSet;
@@ -233,28 +232,34 @@ private String validateValue() {
     public static String validateName( String proposedName ) {
         // must have a name
         if (StringUtilities.isEmpty(proposedName)) {
-            return UTIL.getString(PREFIX + "emptyPropertyName"); //$NON-NLS-1$
+            return Util.getString(PREFIX + "emptyPropertyName"); //$NON-NLS-1$
         }
 
         // make sure only letters
         for (char c : proposedName.toCharArray()) {
-            if (!Character.isLetter(c) && !Character.isDigit(c) ) {
-                return UTIL.getString(PREFIX + "invalidPropertyName"); //$NON-NLS-1$
+            if ( ! isValidChar(c)) {
+                return Util.getString(PREFIX + "invalidPropertyName"); //$NON-NLS-1$
             }
         }
 
         // valid name
         return null;
     }
 
+    private static boolean isValidChar(char c) {
+    	if((Character.isLetter(c) || Character.isDigit(c)) || c == '-') return true;
+
+    	return false;
+    }
+
     /**
      * @param proposedValue the proposed value
      * @return an error message or <code>null</code> if value is valid
      */
     public static String validateValue( String proposedValue ) {
         // must have a value
         if (StringUtilities.isEmpty(proposedValue)) {
-            return UTIL.getString(PREFIX + "emptyPropertyValue"); //$NON-NLS-1$
+            return Util.getString(PREFIX + "emptyPropertyValue"); //$NON-NLS-1$
         }
 
         // valid

diff --git a/plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/i18n.properties b/plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/i18n.properties
@@ -234,7 +234,8 @@ AddGeneralPropertyDialog.lblValue.text = Value:
 AddGeneralPropertyDialog.txtValue.toolTip = A non-empty value for this custom property
 AddGeneralPropertyDialog.customPropertyAlreadyExists = Property "{0}" already exists.
 AddGeneralPropertyDialog.emptyPropertyName=Name of property cannot be empty
-AddGeneralPropertyDialog.invalidPropertyName=Name must contain only letters and numbers
+AddGeneralPropertyDialog.invalidPropertyName=Name must contain only letters, numbers or a '-'
+AddGeneralPropertyDialog.emptyPropertyValue=Value or property cannot be empty
 
 AddPropertyDialog.customPropertyAlreadyExists = Property "{0}" already exists.
 AddPropertyDialog.title = Add New Property