Author: DartPeng Date: 2009-03-09 05:56:54 -0400 (Mon, 09 Mar 2009) New Revision: 14101 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java Log: JBIDE-3940 fix it Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2009-03-09 00:58:26 UTC (rev 14100) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2009-03-09 09:56:54 UTC (rev 14101) @@ -476,16 +476,14 @@ targetViewer)); } } - - - + toolkit.paintBordersFor(rootMainControl); form.pack(); /* * below is init GUIs */ - + Throwable throwable = null; try { this.initTransformViewerModel((IEditorSite) getSite(), @@ -746,8 +744,17 @@ } if (item == null) continue; - if (item.getData(REFERENCE_MODEL) != null && !item.isDisposed()) { - + Object referenceModel = item.getData(REFERENCE_MODEL); + if (referenceModel != null && !item.isDisposed()) { + if (!rootModel.getChildren().contains(referenceModel)) { + rootModel.addChild(referenceModel); + } + ((TreeItemRelationModel) referenceModel).setTreeItem(item); + AbstractStructuredDataModel model = (AbstractStructuredDataModel) graph_trasform_data_map + .get(item.getData()); + if (model == null) { + graph_trasform_data_map.put(item.getData(), referenceModel); + } } else { AbstractStructuredDataModel model = (AbstractStructuredDataModel) graph_trasform_data_map .get(item.getData()); @@ -770,6 +777,9 @@ this.rootModel.addChild(model); } } else { + if (!rootModel.getChildren().contains(model)) { + rootModel.addChild(model); + } ((TreeItemRelationModel) model).setTreeItem(item); } } @@ -1337,39 +1347,47 @@ this.analyzeGraphicalModel(listType, graphinformations, file); } } - + /** * * @param listType */ - protected void checkSmooksConfigFileModel(SmooksResourceListType listType){ - List<AbstractResourceConfig> list = listType.getAbstractResourceConfig(); + protected void checkSmooksConfigFileModel(SmooksResourceListType listType) { + List<AbstractResourceConfig> list = listType + .getAbstractResourceConfig(); ResourceConfigType globalParameterResource = null; for (Iterator iterator = list.iterator(); iterator.hasNext();) { AbstractResourceConfig arc = (AbstractResourceConfig) iterator .next(); - if(arc instanceof ResourceConfigType){ - String selector = ((ResourceConfigType)arc).getSelector(); - if(selector == null) continue; + if (arc instanceof ResourceConfigType) { + String selector = ((ResourceConfigType) arc).getSelector(); + if (selector == null) + continue; selector = selector.trim(); - if(SmooksModelConstants.GLOBAL_PARAMETERS.equals(selector)){ - globalParameterResource = (ResourceConfigType)arc; + if (SmooksModelConstants.GLOBAL_PARAMETERS.equals(selector)) { + globalParameterResource = (ResourceConfigType) arc; break; } } } - - if(globalParameterResource == null){ - globalParameterResource = SmooksFactory.eINSTANCE.createResourceConfigType(); - globalParameterResource.setSelector(SmooksModelConstants.GLOBAL_PARAMETERS); - SmooksModelUtils.setParamText("stream.filter.type", "SAX", globalParameterResource); - }else{ - String value = SmooksModelUtils.getParmaText("stream.filter.type", globalParameterResource); - if(value == null){ - SmooksModelUtils.setParamText("stream.filter.type", "SAX", globalParameterResource); - }else{ - if(value.trim().length() == 0){ - SmooksModelUtils.setParamText("stream.filter.type", "SAX", globalParameterResource); + + if (globalParameterResource == null) { + globalParameterResource = SmooksFactory.eINSTANCE + .createResourceConfigType(); + globalParameterResource + .setSelector(SmooksModelConstants.GLOBAL_PARAMETERS); + SmooksModelUtils.setParamText("stream.filter.type", "SAX", + globalParameterResource); + } else { + String value = SmooksModelUtils.getParmaText("stream.filter.type", + globalParameterResource); + if (value == null) { + SmooksModelUtils.setParamText("stream.filter.type", "SAX", + globalParameterResource); + } else { + if (value.trim().length() == 0) { + SmooksModelUtils.setParamText("stream.filter.type", "SAX", + globalParameterResource); } } }