Author: scabanovich Date: 2008-06-18 09:19:11 -0400 (Wed, 18 Jun 2008) New Revision: 8826 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizard.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizardPage.java Log: JBIDE-2295 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizard.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizard.java 2008-06-18 12:56:04 UTC (rev 8825) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizard.java 2008-06-18 13:19:11 UTC (rev 8826) @@ -95,13 +95,15 @@ public void fillColumn(){ Properties properties = fDropCommand.getProperties(); - String[] vs = page2.getSelectedProperties(); + String[] vs = page2.getSelectedProperties(); StringBuffer text = new StringBuffer(); text.append(properties.getProperty("start text")); String value = null; - if (page2.getValue().length() > 0) { - value = page2.getValue(); + if (page2.getValue().trim().length() > 0) { + value = page2.getValue().trim(); + if(value.startsWith("#{")) value = value.substring(2); + if(value.endsWith("}")) value = value.substring(0, value.length() - 1); } String var = null; if (page2.getVar().length() > 0) { @@ -131,4 +133,5 @@ getWizardModel().removePropertyChangeListener(this); super.dispose(); } + } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizardPage.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizardPage.java 2008-06-18 12:56:04 UTC (rev 8825) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizardPage.java 2008-06-18 13:19:11 UTC (rev 8826) @@ -14,6 +14,7 @@ import java.beans.PropertyChangeListener; import java.util.*; import java.util.List; +import java.util.regex.PatternSyntaxException; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -39,6 +40,7 @@ import org.jboss.tools.common.model.util.AbstractTableHelper; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.jsf.model.pv.JSFPromptingProvider; +import org.jboss.tools.jsf.ui.JsfUiPlugin; import org.jboss.tools.common.model.ui.editors.dnd.*; import org.jboss.tools.common.model.ui.editors.dnd.composite.*; import org.jboss.tools.common.model.ui.editors.dnd.composite.TagAttributesComposite.AttributeDescriptorValue; @@ -195,6 +197,27 @@ return generalTabContent; } + + public void validate() throws ValidationException { + super.validate(); + String value = getValue(); + if(value != null) value = value.trim(); + if(value != null && value.length() > 0) { + try { + boolean b1 = value.matches("[#\\$]\\{[^#\\$\\}\\{]*\\}"); + if(!b1) { + throw new ValidationException("Value must be set with Expression Language."); + } + boolean b2 = value.matches("[#\\$]\\{[^#\\$\\}\\{\\.]+(\\.[^#\\$\\}\\{\\.]+)*\\}"); + if(!b2) { + throw new ValidationException("Expression Language in Value is not correct."); + } + } catch (PatternSyntaxException e) { + JsfUiPlugin.getPluginLog().logError(e); + } + } + } + boolean flag = false; class PCL implements PropertyChangeListener {