Author: DartPeng Date: 2008-12-10 02:15:36 -0500 (Wed, 10 Dec 2008) New Revision: 12528 Modified: branches/jbosstools-3.0.0.CR1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java branches/jbosstools-3.0.0.CR1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java branches/jbosstools-3.0.0.CR1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java Log: JBIDE-3379 Modified: branches/jbosstools-3.0.0.CR1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java =================================================================== --- branches/jbosstools-3.0.0.CR1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-12-10 07:15:00 UTC (rev 12527) +++ branches/jbosstools-3.0.0.CR1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-12-10 07:15:36 UTC (rev 12528) @@ -134,7 +134,7 @@ public void analyzeGraphicalModel(AbstractStructuredDataModel root, List resouceList) { - + if(root == null) return; List children = root.getChildren(); for (Iterator iterator = children.iterator(); iterator.hasNext();) { TreeItemRelationModel dataModel = (TreeItemRelationModel) iterator Modified: branches/jbosstools-3.0.0.CR1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java =================================================================== --- branches/jbosstools-3.0.0.CR1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-12-10 07:15:00 UTC (rev 12527) +++ branches/jbosstools-3.0.0.CR1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-12-10 07:15:36 UTC (rev 12528) @@ -793,7 +793,10 @@ } super.doSave(monitor); commandStackChanged = false; - getManagedForm().dirtyStateChanged(); + IManagedForm managedForm = getManagedForm(); + if(managedForm != null){ + managedForm.dirtyStateChanged(); + } } protected SmooksConfigurationFileGenerateContext createContext() { @@ -816,18 +819,21 @@ context.setDataMappingRootModel(this.rootModel); context.setSmooksConfigFile(((IFileEditorInput) getEditorInput()) .getFile()); - + if(sourceViewer != null){ context.setSourceViewerLabelProvider((LabelProvider) sourceViewer .getLabelProvider()); context .setSourceViewerContentProvider((ITreeContentProvider) sourceViewer .getContentProvider()); + } + if(targetViewer != null){ context.setTargetViewerLabelProvider((LabelProvider) targetViewer .getLabelProvider()); context .setTargetViewerContentProvider((ITreeContentProvider) targetViewer .getContentProvider()); + } context.setShell(getSite().getShell()); } Modified: branches/jbosstools-3.0.0.CR1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java =================================================================== --- branches/jbosstools-3.0.0.CR1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-12-10 07:15:00 UTC (rev 12527) +++ branches/jbosstools-3.0.0.CR1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-12-10 07:15:36 UTC (rev 12528) @@ -103,21 +103,23 @@ .getAbstractResourceConfig(); for (Iterator<AbstractResourceConfig> iterator = lists.iterator(); iterator .hasNext();) { - ResourceConfigType resourceConfig = (ResourceConfigType) iterator + AbstractResourceConfig resourceConfig = (AbstractResourceConfig) iterator .next(); - String selector = resourceConfig.getSelector(); - UIUtils.checkSelector(selector); - List<Object> list = SmooksModelUtils - .getBindingListFromResourceConfigType(resourceConfig); - if (list == null) - continue; - for (Iterator<Object> iterator2 = list.iterator(); iterator2 - .hasNext();) { - AnyType binding = (AnyType) iterator2.next(); - String bindingMessage = SmooksModelUtils - .getAttributeValueFromAnyType(binding, - SmooksModelUtils.ATTRIBUTE_SELECTOR); - UIUtils.checkSelector(bindingMessage); + if (resourceConfig instanceof ResourceConfigType) { + String selector = ((ResourceConfigType) resourceConfig).getSelector(); + UIUtils.checkSelector(selector); + List<Object> list = SmooksModelUtils + .getBindingListFromResourceConfigType((ResourceConfigType)resourceConfig); + if (list == null) + continue; + for (Iterator<Object> iterator2 = list.iterator(); iterator2 + .hasNext();) { + AnyType binding = (AnyType) iterator2.next(); + String bindingMessage = SmooksModelUtils + .getAttributeValueFromAnyType(binding, + SmooksModelUtils.ATTRIBUTE_SELECTOR); + UIUtils.checkSelector(bindingMessage); + } } } }