Author: tfennelly
Date: 2010-09-04 10:24:03 -0400 (Sat, 04 Sep 2010)
New Revision: 24725
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/messages.properties
Log:
https://jira.jboss.org/browse/JBIDE-6991
Add Validation of Templating tasks where the template data provider is the input (not
Java)
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/Messages.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/Messages.java 2010-09-04
14:08:59 UTC (rev 24724)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/Messages.java 2010-09-04
14:24:03 UTC (rev 24725)
@@ -19,6 +19,7 @@
public static String SmooksJavaMappingGraphicalEditor_NullLabel;
public static String SmooksJavaMappingGraphicalEditor_WarningMessage1;
public static String SmooksProcessGraphicalEditor_Validation_No_Java_Mapping;
+ public static String SmooksProcessGraphicalEditor_Validation_No_DomModelCreator;
public static String SmooksProcessGraphicalEditor_AddTaskActionText;
public static String SmooksProcessGraphicalEditor_FormText;
public static String SmooksProcessGraphicalEditor_TaskConfigurationSectionTitle;
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2010-09-04
14:08:59 UTC (rev 24724)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2010-09-04
14:24:03 UTC (rev 24725)
@@ -102,6 +102,7 @@
import org.jboss.tools.smooks.graphical.editors.process.TaskType;
import
org.jboss.tools.smooks.graphical.editors.template.SmooksFreemarkerCSVTemplateGraphicalEditor;
import
org.jboss.tools.smooks.graphical.editors.template.SmooksFreemarkerTemplateGraphicalEditor;
+import org.jboss.tools.smooks.model.ModelFilter;
import org.jboss.tools.smooks.model.freemarker.Freemarker;
import org.jboss.tools.smooks.model.javabean12.BeanType;
import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig;
@@ -1156,6 +1157,8 @@
task.setProblemType(IFieldMarker.TYPE_NONE);
task.cleanProblemMessages();
String id = task.getId();
+ SmooksResourceListType resourceList = getSmooksResourceListType();
+
if (TaskTypeManager.TASK_ID_INPUT.equals(id)) {
// check the input data
List<InputType> inputLists =
SmooksUIUtils.getInputTypeList(getSmooksResourceListType());
@@ -1224,7 +1227,10 @@
task.setProblemType(IFieldMarker.TYPE_WARINING);
task.addProblemMessage(Messages.SmooksProcessGraphicalEditor_Validation_No_Java_Mapping);
} else if(templateDataProvider != null &&
templateDataProvider.trim().equals(TaskTypeManager.TASK_ID_INPUT)) {
- // TODO:
https://jira.jboss.org/browse/JBIDE-6991
+ if(ModelFilter.DomModelCreator.execute(resourceList).isEmpty()) {
+ task.setProblemType(IFieldMarker.TYPE_WARINING);
+ task.addProblemMessage(Messages.SmooksProcessGraphicalEditor_Validation_No_DomModelCreator);
+ }
}
}
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/messages.properties
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/messages.properties 2010-09-04
14:08:59 UTC (rev 24724)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/messages.properties 2010-09-04
14:24:03 UTC (rev 24725)
@@ -13,6 +13,7 @@
SmooksJavaMappingGraphicalEditor_NullLabel=<NULL>
SmooksJavaMappingGraphicalEditor_WarningMessage1=Decoder should be '
SmooksProcessGraphicalEditor_Validation_No_Java_Mapping=No java mapping has been
specified in the Java Mapping task.
+SmooksProcessGraphicalEditor_Validation_No_DomModelCreator=No #document DomModelCreator
found in configuration. Manually fix configuration.
SmooksProcessGraphicalEditor_ValidationError_MultipleTemplate=Doesn't support
multiple template task.
SmooksProcessGraphicalEditor_AddTaskActionText=Add Task
SmooksProcessGraphicalEditor_FormText=Smooks Processing