Bug 238107 - False warning for the valid frame target name

5 files changed, 47 insertions, 1 deletions

diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml b/jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml
index 3d699e27d..329e3c4a0 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml
@@ -221,6 +221,10 @@
             class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.StringType"
             id="attributevalues.StringType"/>
       <attributeValueRuntimeType
+            class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.AnyStringType"
+            id="attributevalues.AnyStringType">
+      </attributeValueRuntimeType>
+      <attributeValueRuntimeType
             class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.BooleanType"
             id="attributevalues.BooleanType"/>
       <attributeValueRuntimeType
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/AnyStringType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/AnyStringType.java
new file mode 100644
index 000000000..e5cf1e513
--- /dev/null
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/AnyStringType.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * 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:
+ *    Ian Trimble/Oracle - initial API and implementation
+ *    
+ ********************************************************************************/
+package org.eclipse.jst.jsf.taglibprocessing.attributevalues;
+
+/**
+ * Meta-data processing type representing a String attribute value runtime type
+ * that extends StringType to allow any String as a valid value while still
+ * providing possible values and default values from metadata.
+ * 
+ * <p><b>Provisional API - subject to change</b></p>
+ * @author Ian Trimble - Oracle
+ */
+public class AnyStringType extends StringType {
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.jst.jsf.taglibprocessing.attributevalues.StringType#isValidValue(java.lang.String)
+	 */
+	public boolean isValidValue(String value) {
+		boolean valid = true;
+		if (value == null || value.length() < 1) {
+			valid = false;
+			addNewValidationMessage(Messages.AnyStringType_empty_value);
+		}
+		return valid;
+	}
+
+}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/Messages.java
index 7b2819630..c6e412358 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/Messages.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/Messages.java
@@ -44,6 +44,10 @@ public class Messages extends NLS {
 	/**
 	 * see messages.properties
 	 */
+	public static String AnyStringType_empty_value;
+	/**
+	 * see messages.properties
+	 */
 	public static String BooleanType_invalid_values;
 	/**
 	 * see messages.properties
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/messages.properties
index e4455251d..080ae9917 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/messages.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/messages.properties
@@ -277,3 +277,4 @@ JavaClassType_invalid_type=Value for type attribute must be valid Java class and
 JavaClassType_not_found=Java type not found, not instantiable, or does implement correct interfaces or extend correct superclass.
 ColorType_invalid_color=Value is not a valid color.
 Bundle_not_found_rb=Resource bundle {0} cannot be found on classpath 
+AnyStringType_empty_value=Value must not be empty.
diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/html.xml b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/html.xml
index 8074033b5..c4275530b 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/html.xml
+++ b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/html.xml
@@ -530,7 +530,7 @@
 		</entity>
 		<entity id="target">
 			<trait id="attribute-value-runtime-type">
-				<value xsi:type="mdt:StringValue">org.eclipse.jst.jsf.core.attributevalues.StringType</value>
+				<value xsi:type="mdt:StringValue">org.eclipse.jst.jsf.core.attributevalues.AnyStringType</value>
 			</trait>
 			<trait id="valid-values">
 				<value xsi:type="mdt:ListOfValues">