Author: DartPeng Date: 2009-11-28 16:16:21 -0500 (Sat, 28 Nov 2009) New Revision: 18909 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationOverviewPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/CSVRecordSection.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerCSVNodeEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVNodeGraphicalModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateGraphicalModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/ProcessTaskAnalyzer.java Log: JBIDE-5299 Done Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationOverviewPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationOverviewPage.java 2009-11-28 20:46:14 UTC (rev 18908) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationOverviewPage.java 2009-11-28 21:16:21 UTC (rev 18909) @@ -512,6 +512,10 @@ public void sourceChange(Object model) { lockEventFire = true; + if (streamFilterTypeCombo == null || defaultSerializationOnCheckbox == null || versionCombo == null) { + lockEventFire = false; + return; + } streamFilterTypeCombo.setEnabled(true); defaultSerializationOnCheckbox.setEnabled(true); String version = getSmooksVersion(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/CSVRecordSection.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/CSVRecordSection.java 2009-11-28 20:46:14 UTC (rev 18908) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/CSVRecordSection.java 2009-11-28 21:16:21 UTC (rev 18909) @@ -30,6 +30,7 @@ import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateGraphicalModel; import org.jboss.tools.smooks.model.freemarker.Freemarker; import org.jboss.tools.smooks.model.smooks.ParamType; +import org.jboss.tools.smooks.model.smooks.SmooksFactory; import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** @@ -123,12 +124,15 @@ speratorText.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { if (fireEvent) { - Freemarker template = getFreemarker(); - if (template != null) { - ParamType param = SmooksModelUtils.getParam(template.getParam(), + Freemarker freemarker = getFreemarker(); + if (freemarker != null) { + ParamType param = SmooksModelUtils.getParam(freemarker.getParam(), SmooksModelUtils.KEY_CSV_SEPERATOR); - if (param == null) - return; + if (param == null){ + param = SmooksFactory.eINSTANCE.createParamType(); + param.setName(SmooksModelUtils.KEY_CSV_SEPERATOR); + freemarker.getParam().add(param); + } SmooksModelUtils.setTextToSmooksType(getSmooksModelProvider().getEditingDomain(), param, speratorText.getText()); generateNewTemplateContent(); @@ -140,12 +144,15 @@ quoteText.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { if (fireEvent) { - Freemarker template = getFreemarker(); - if (template != null) { + Freemarker freemarker = getFreemarker(); + if (freemarker != null) { ParamType param = SmooksModelUtils - .getParam(template.getParam(), SmooksModelUtils.KEY_CSV_QUOTE); - if (param == null) - return; + .getParam(freemarker.getParam(), SmooksModelUtils.KEY_CSV_QUOTE); + if (param == null){ + param = SmooksFactory.eINSTANCE.createParamType(); + param.setName(SmooksModelUtils.KEY_CSV_QUOTE); + freemarker.getParam().add(param); + } SmooksModelUtils.setTextToSmooksType(getSmooksModelProvider().getEditingDomain(), param, quoteText.getText()); generateNewTemplateContent(); @@ -170,7 +177,8 @@ if (freemarker != null) { String quote = SmooksModelUtils.getParamValue(freemarker.getParam(), SmooksModelUtils.KEY_CSV_QUOTE); String sperator = SmooksModelUtils.getParamValue(freemarker.getParam(), SmooksModelUtils.KEY_CSV_SEPERATOR); - + if(quote == null) quote = ""; + if(sperator == null) sperator = ""; speratorText.setText(sperator); quoteText.setText(quote); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerCSVNodeEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerCSVNodeEditPart.java 2009-11-28 20:46:14 UTC (rev 18908) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerCSVNodeEditPart.java 2009-11-28 21:16:21 UTC (rev 18909) @@ -273,7 +273,6 @@ */ @Override public void treeExpanded(TreeFigureExpansionEvent event) { - System.out.println(); } /* Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVNodeGraphicalModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVNodeGraphicalModel.java 2009-11-28 20:46:14 UTC (rev 18908) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVNodeGraphicalModel.java 2009-11-28 21:16:21 UTC (rev 18909) @@ -27,6 +27,7 @@ import org.jboss.tools.smooks.model.freemarker.Freemarker; import org.jboss.tools.smooks.model.freemarker.Template; import org.jboss.tools.smooks.model.smooks.ParamType; +import org.jboss.tools.smooks.model.smooks.SmooksFactory; import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** @@ -98,6 +99,11 @@ Freemarker freemarker = (Freemarker) parent.getData(); if (freemarker != null) { ParamType param = SmooksModelUtils.getParam(freemarker.getParam(), SmooksModelUtils.KEY_CSV_FIELDS); + if (param == null){ + param = SmooksFactory.eINSTANCE.createParamType(); + param.setName(SmooksModelUtils.KEY_CSV_FIELDS); + freemarker.getParam().add(param); + } if (param != null) { SmooksModelUtils.setTextToSmooksType(this.domainProvider.getEditingDomain(), param, fieldsString); changeFreemarkerContents(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateGraphicalModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateGraphicalModel.java 2009-11-28 20:46:14 UTC (rev 18908) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateGraphicalModel.java 2009-11-28 21:16:21 UTC (rev 18909) @@ -38,7 +38,7 @@ public static final int TYPE_XML = 3; - public static final int TYPE_XSD = 3; + public static final int TYPE_XSD = 4; private ISmooksModelProvider smooksModelProvider; @@ -56,17 +56,17 @@ Freemarker freemarker = (Freemarker) getData(); // Template template = freemarker.getTemplate(); if (freemarker != null) { + CSVNodeModel recordModel = new CSVNodeModel(); + recordModel.setName("CSV-Record"); + recordModel.setRecord(true); + FreemarkerCSVNodeGraphicalModel recordGraphNode = new FreemarkerCSVNodeGraphicalModel(recordModel, + contentProvider, labelProvider, smooksModelProvider); + this.getChildrenWithoutDynamic().add(recordGraphNode); + recordGraphNode.setParent(this); String[] fields = SmooksModelUtils.getFreemarkerCSVFileds(freemarker); String type = SmooksModelUtils.getTemplateType(freemarker); if (SmooksModelUtils.FREEMARKER_TEMPLATE_TYPE_CSV.equals(type)) { if (fields != null) { - CSVNodeModel recordModel = new CSVNodeModel(); - recordModel.setName("CSV-Record"); - recordModel.setRecord(true); - FreemarkerCSVNodeGraphicalModel recordGraphNode = new FreemarkerCSVNodeGraphicalModel(recordModel, - contentProvider, labelProvider, smooksModelProvider); - this.getChildrenWithoutDynamic().add(recordGraphNode); - recordGraphNode.setParent(this); List<FreemarkerCSVNodeGraphicalModel> fieldsGraphNodeList = new ArrayList<FreemarkerCSVNodeGraphicalModel>(); for (int i = 0; i < fields.length; i++) { String field = fields[i]; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/ProcessTaskAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/ProcessTaskAnalyzer.java 2009-11-28 20:46:14 UTC (rev 18908) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/ProcessTaskAnalyzer.java 2009-11-28 21:16:21 UTC (rev 18909) @@ -19,6 +19,7 @@ import org.jboss.tools.smooks.model.javabean12.BeanType; import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; +import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart @@ -28,12 +29,13 @@ public void analyzeTaskNode(ProcessType process, SmooksResourceListType resourceList) { process.getTask().clear(); - if(resourceList == null) return; + if (resourceList == null) + return; // Input task node must be in process: TaskType inputTask = ProcessFactory.eINSTANCE.createTaskType(); inputTask.setId(TaskTypeManager.TASK_ID_INPUT); inputTask.setName(TaskTypeManager.getTaskLabel(TaskTypeManager.TASK_ID_INPUT)); - + process.addTask(inputTask); List<AbstractResourceConfig> resourceConfigList = resourceList.getAbstractResourceConfig(); @@ -56,9 +58,15 @@ for (Iterator<?> iterator = resourceConfigList.iterator(); iterator.hasNext();) { AbstractResourceConfig abstractResourceConfig = (AbstractResourceConfig) iterator.next(); if (abstractResourceConfig instanceof Freemarker) { - TemplateAppyTaskNode templateTask =(TemplateAppyTaskNode) ProcessFactory.eINSTANCE.createTemplateTask(); - templateTask.addSmooksModel(abstractResourceConfig); - javaMappingTask.addTask(templateTask); + String messageType = SmooksModelUtils.getParamValue(((Freemarker) abstractResourceConfig) + .getParam(), SmooksModelUtils.KEY_TEMPLATE_TYPE); + if (SmooksModelUtils.FREEMARKER_TEMPLATE_TYPE_CSV.equals(messageType)) { + TemplateAppyTaskNode templateTask = (TemplateAppyTaskNode) ProcessFactory.eINSTANCE + .createTemplateTask(); + templateTask.setType(messageType); + templateTask.addSmooksModel(abstractResourceConfig); + javaMappingTask.addTask(templateTask); + } } } }