Author: DartPeng Date: 2008-10-17 05:55:10 -0400 (Fri, 17 Oct 2008) New Revision: 10910 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/blank.gif trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/DesignTimeAnalyzeResult.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IMappingAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksUIActivator.java 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/TypeIDSelectionWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/SmooksGraphConstants.java trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java Log: JBIDE-2867 Add notify information GUI above the graphical panel Modified: trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java 2008-10-17 07:27:04 UTC (rev 10909) +++ trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java 2008-10-17 09:55:10 UTC (rev 10910) @@ -19,6 +19,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.widgets.Shell; import org.jboss.tools.smooks.analyzer.AbstractAnalyzer; +import org.jboss.tools.smooks.analyzer.DesignTimeAnalyzeResult; import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException; import org.jboss.tools.smooks.javabean.model.JavaBeanModel; @@ -62,7 +63,7 @@ return; } - GraphRootModel rootModel = context.getDataMappingRootModel(); + GraphRootModel rootModel = context.getGraphicalRootModel(); List<SourceModel> sourceModelList = rootModel.loadSourceModelList(); List<TargetModel> targetModelList = rootModel.loadTargetModelList(); @@ -173,4 +174,10 @@ return "${" + name + "}"; } + public DesignTimeAnalyzeResult analyzeGraphModel( + SmooksConfigurationFileGenerateContext context) { + // TODO Auto-generated method stub + return null; + } + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-10-17 07:27:04 UTC (rev 10909) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-10-17 09:55:10 UTC (rev 10910) @@ -33,6 +33,7 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.smooks.analyzer.DesignTimeAnalyzeResult; import org.jboss.tools.smooks.analyzer.IMappingAnalyzer; import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer; import org.jboss.tools.smooks.analyzer.ITargetModelAnalyzer; @@ -356,6 +357,50 @@ } + private DesignTimeAnalyzeResult checkOtherNodeConnected( + SmooksConfigurationFileGenerateContext context) { + GraphRootModel root = context.getGraphicalRootModel(); + List sourceList = root.loadSourceModelList(); + List targetList = root.loadTargetModelList(); + StringBuffer buffer = new StringBuffer(); + for (Iterator iterator = targetList.iterator(); iterator.hasNext();) { + AbstractStructuredDataModel targetm = (AbstractStructuredDataModel) iterator + .next(); + if (targetm instanceof IConnectableModel) { + if (((IConnectableModel) targetm).getModelTargetConnections() + .isEmpty()) { + continue; + } + + JavaBeanModel javaModel = (JavaBeanModel) targetm + .getReferenceEntityModel(); + JavaBeanModel parent = javaModel.getParent(); + if (parent != null) { + AbstractStructuredDataModel pgm = UIUtils.findGraphModel( + root, parent); + if (pgm != null && pgm instanceof IConnectableModel) { + if (((IConnectableModel) pgm) + .getModelTargetConnections().isEmpty()) { + buffer + .append("The parent of Java node \"" + + javaModel.getName() + + "\" : \"" + + parent.getName() + + "\" doesn't be connected by any source node!\n"); + } + } + } + } + } + String result = buffer.toString(); + if ("".equals(result)) { + return null; + } + DesignTimeAnalyzeResult dr = new DesignTimeAnalyzeResult(); + dr.setErrorMessage(result); + return dr; + } + /** * If root node don't connect , it will ask user to connect them . * @@ -363,7 +408,7 @@ */ private void checkRootNodeConnected( SmooksConfigurationFileGenerateContext context) { - GraphRootModel root = context.getDataMappingRootModel(); + GraphRootModel root = context.getGraphicalRootModel(); List sourceList = root.loadSourceModelList(); List targetList = root.loadTargetModelList(); @@ -424,7 +469,7 @@ .openQuestion( displayParent, "Connection Question", - "The root models don't be connected , maybe it will make some errors with the generation config file contents.\nDo you wan to connect them?"); + "The root models don't be connected , it will make some errors with the generation config file contents.\nDo you wan to connect them?"); if (connectAuto) { // connect root model LineConnectionModel connectionModel = new LineConnectionModel(); @@ -448,22 +493,21 @@ public void analyzeMappingGraphModel( SmooksConfigurationFileGenerateContext context) throws SmooksAnalyzerException { - GraphRootModel root = context.getDataMappingRootModel(); - checkRootNodeConnected(context); + GraphRootModel root = context.getGraphicalRootModel(); this.analyzeGraphicalModel(root, context.getGeneratorResourceList()); } public MappingResourceConfigList analyzeMappingSmooksModel( SmooksResourceListType listType, Object sourceObject, Object targetObject) { - if(sourceObject instanceof List){ - if(!((List)sourceObject).isEmpty()){ - sourceObject = (JavaBeanModel) ((List)sourceObject).get(0); + if (sourceObject instanceof List) { + if (!((List) sourceObject).isEmpty()) { + sourceObject = (JavaBeanModel) ((List) sourceObject).get(0); } } - if(targetObject instanceof List){ - if(!((List)targetObject).isEmpty()){ - targetObject = (JavaBeanModel) ((List)targetObject).get(0); + if (targetObject instanceof List) { + if (!((List) targetObject).isEmpty()) { + targetObject = (JavaBeanModel) ((List) targetObject).get(0); } } if (!(sourceObject instanceof JavaBeanModel) @@ -659,7 +703,8 @@ current, classLoader); } List list = new ArrayList(); - if(model != null) list.add(model); + if (model != null) + list.add(model); return list; } @@ -957,4 +1002,10 @@ } return null; } + + public DesignTimeAnalyzeResult analyzeGraphModel( + SmooksConfigurationFileGenerateContext context) { + checkRootNodeConnected(context); + return checkOtherNodeConnected(context); + } } Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/blank.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/blank.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/DesignTimeAnalyzeResult.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/DesignTimeAnalyzeResult.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/DesignTimeAnalyzeResult.java 2008-10-17 09:55:10 UTC (rev 10910) @@ -0,0 +1,27 @@ +/** + * + */ +package org.jboss.tools.smooks.analyzer; + +/** + * @author dart + * + */ +public class DesignTimeAnalyzeResult { + public String errorMessage; + public String warningMessage; + public String getErrorMessage() { + return errorMessage; + } + public void setErrorMessage(String errorMessage) { + this.errorMessage = errorMessage; + } + public String getWarningMessage() { + return warningMessage; + } + public void setWarningMessage(String warningMessage) { + this.warningMessage = warningMessage; + } + + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/DesignTimeAnalyzeResult.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IMappingAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IMappingAnalyzer.java 2008-10-17 07:27:04 UTC (rev 10909) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IMappingAnalyzer.java 2008-10-17 09:55:10 UTC (rev 10910) @@ -26,4 +26,6 @@ public MappingResourceConfigList analyzeMappingSmooksModel( SmooksResourceListType listType,Object sourceObject,Object targetObject); + public DesignTimeAnalyzeResult analyzeGraphModel(SmooksConfigurationFileGenerateContext context); + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksUIActivator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksUIActivator.java 2008-10-17 07:27:04 UTC (rev 10909) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksUIActivator.java 2008-10-17 09:55:10 UTC (rev 10910) @@ -45,6 +45,7 @@ @Override protected void initializeImageRegistry(ImageRegistry reg) { super.initializeImageRegistry(reg); + reg.put(SmooksGraphConstants.IMAGE_EMPTY, getImageDescriptor(SmooksGraphConstants.IMAGE_PATH_BLANK)); reg.put(SmooksGraphConstants.IMAGE_ERROR, getImageDescriptor(SmooksGraphConstants.IMAGE_PATH_ERROR)); reg.put(SmooksGraphConstants.IMAGE_WARNING, getImageDescriptor(SmooksGraphConstants.IMAGE_PATH_WARNING)); } 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 2008-10-17 07:27:04 UTC (rev 10909) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-10-17 09:55:10 UTC (rev 10910) @@ -95,6 +95,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm; import org.eclipse.ui.forms.widgets.Section; import org.jboss.tools.smooks.analyzer.AnalyzerFactory; +import org.jboss.tools.smooks.analyzer.DesignTimeAnalyzeResult; import org.jboss.tools.smooks.analyzer.IMappingAnalyzer; import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer; import org.jboss.tools.smooks.analyzer.ITargetModelAnalyzer; @@ -114,7 +115,9 @@ import org.jboss.tools.smooks.model.util.SmooksModelConstants; import org.jboss.tools.smooks.ui.IStructuredDataCreationWizard; import org.jboss.tools.smooks.ui.IViewerInitor; +import org.jboss.tools.smooks.ui.SmooksUIActivator; import org.jboss.tools.smooks.ui.StructuredDataCreationWizardDailog; +import org.jboss.tools.smooks.ui.ViewerInitorStore; import org.jboss.tools.smooks.ui.gef.editparts.SmooksEditPartFactory; import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; @@ -128,6 +131,7 @@ import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; import org.jboss.tools.smooks.ui.wizards.TransformDataSelectionWizard; +import org.jboss.tools.smooks.utils.SmooksGraphConstants; import org.jboss.tools.smooks.utils.UIUtils; /** @@ -164,6 +168,9 @@ private ISelection selection; protected MappingResourceConfigList mappingResourceConfigList; protected AdapterFactoryEditingDomain editingDomain; + private Label notifyLabel; + private boolean canSaveFile = true; + private Label imageLabel; public ISelection getSelection() { return selection; @@ -268,6 +275,20 @@ mappingMainComposite.setLayout(gly); section.setClient(mappingMainComposite); + Composite notifyComposite = toolkit + .createComposite(mappingMainComposite); + GridData ngd = new GridData(GridData.FILL_HORIZONTAL); + ngd.horizontalSpan = 3; + GridLayout ngl = new GridLayout(); + ngl.numColumns = 2; + notifyComposite.setLayout(ngl); + notifyComposite.setLayoutData(ngd); + imageLabel = toolkit.createLabel(notifyComposite, ""); + imageLabel.setImage(SmooksUIActivator.getDefault().getImageRegistry() + .get(SmooksGraphConstants.IMAGE_EMPTY)); + notifyLabel = toolkit.createLabel(notifyComposite, "" ); + GridData nlgd = new GridData(GridData.FILL_HORIZONTAL); + notifyLabel.setLayoutData(nlgd); GridData sgd = new GridData(GridData.FILL_BOTH); section.setLayoutData(sgd); { @@ -648,6 +669,16 @@ */ @Override public void doSave(IProgressMonitor monitor) { + if (!canSaveFile) { + boolean cleanError = MessageDialog + .openQuestion( + getSite().getShell(), + "Clean all the errors please", + "There occurs some errors on the graphical design , please clean all errors .\n" + + "Click \"Yes\" to return . If you don't care that , click \"No\" to save file."); + if (cleanError) + return; + } SmooksFileBuilder builder = this.getSmooksFileBuilder(); builder.setSmooksResource(this.smooksResource); SmooksConfigurationFileGenerateContext context = this @@ -756,6 +787,7 @@ public void commandStackChanged(EventObject event) { commandStackChanged = true; + analyzeDesignGraph(); updateSelectionActions(); getManagedForm().dirtyStateChanged(); } @@ -901,8 +933,10 @@ if (dialog.open() == org.eclipse.jface.dialogs.Dialog.OK) { sourceDataTypeID = wizard.getSourceDataTypeID(); targetDataTypeID = wizard.getTargetDataTypeID(); - sourceTreeViewerInputModel = wizard.getSourceTreeViewerInputContents(); - targetTreeViewerInputModel = wizard.getTargetTreeViewerInputContents(); + sourceTreeViewerInputModel = wizard + .getSourceTreeViewerInputContents(); + targetTreeViewerInputModel = wizard + .getTargetTreeViewerInputContents(); this.getSmooksConfigurationFileGenerateContext() .setSourceDataTypeID(sourceDataTypeID); this.getSmooksConfigurationFileGenerateContext() @@ -956,9 +990,9 @@ if (input instanceof SmooksFileEditorInput) { this.sourceTreeViewerInputModel = ((SmooksFileEditorInput) input) .getSourceTreeViewerInputContents(); - + this.targetTreeViewerInputModel = ((SmooksFileEditorInput) input) - .getTargetTreeViewerInputContents(); + .getTargetTreeViewerInputContents(); } // } @@ -976,9 +1010,13 @@ } /** - * It's a very important method <p> - * If call the method , there will open the data selection wizard to allow user select new data , <p> + * It's a very important method + * <p> + * If call the method , there will open the data selection wizard to allow + * user select new data , + * <p> * when user select the new data , the connections will be removed. + * * @param viewer */ protected void showCreationWizard(TreeViewer viewer) { @@ -1210,10 +1248,63 @@ public void commandStackChanged(EventObject event) { commandStackChanged = true; + analyzeDesignGraph(); updateSelectionActions(); getManagedForm().dirtyStateChanged(); } + protected void setErrorMessage(String errorMessage) { + imageLabel.setImage(SmooksUIActivator.getDefault().getImageRegistry().get(SmooksGraphConstants.IMAGE_EMPTY)); + notifyLabel.setText(""); + canSaveFile = true; + if (errorMessage != null) { + imageLabel.setImage(SmooksUIActivator.getDefault() + .getImageRegistry().get(SmooksGraphConstants.IMAGE_ERROR)); + notifyLabel.setText(errorMessage); + canSaveFile = false; + } + } + + protected void setWarningMessage(String warningMessage) { + imageLabel.setImage(SmooksUIActivator.getDefault().getImageRegistry().get(SmooksGraphConstants.IMAGE_EMPTY)); + notifyLabel.setText(""); + if (warningMessage != null) { + imageLabel + .setImage(SmooksUIActivator.getDefault().getImageRegistry() + .get(SmooksGraphConstants.IMAGE_WARNING)); + notifyLabel.setText(warningMessage); + } + } + + protected void analyzeDesignGraph() { + try { + IMappingAnalyzer analyzer = AnalyzerFactory.getInstance() + .getMappingAnalyzer(sourceDataTypeID, targetDataTypeID); + SmooksConfigurationFileGenerateContext context = this + .createContext(); + this.initSmooksConfigurationFileGenerateContext(context); + DesignTimeAnalyzeResult result = analyzer + .analyzeGraphModel(context); + if (result != null) { + String errorMessage = result.getErrorMessage(); + String warningMessage = result.getWarningMessage(); + + if (errorMessage != null) { + setErrorMessage(errorMessage); + return; + } + + if (warningMessage != null) { + setWarningMessage(warningMessage); + return; + } + } + } catch (CoreException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + /** * @return the editingDomain */ Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizard.java 2008-10-17 07:27:04 UTC (rev 10909) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizard.java 2008-10-17 09:55:10 UTC (rev 10910) @@ -58,8 +58,8 @@ if(sid == null || tid == null) return false; this.sourceDataTypeID = sid; this.targetDataTypeID = tid; - setSourceTreeViewerInputContents(page.getSourceTreeViewerInputContents()); - setTargetTreeViewerInputContents(page.getTargetTreeViewerInputContents()); +// setSourceTreeViewerInputContents(page.getSourceTreeViewerInputContents()); +// setTargetTreeViewerInputContents(page.getTargetTreeViewerInputContents()); return true; } public Object getSourceTreeViewerInputContents() { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java 2008-10-17 07:27:04 UTC (rev 10909) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java 2008-10-17 09:55:10 UTC (rev 10910) @@ -327,6 +327,8 @@ if (wizard instanceof TypeIDSelectionWizard) { String s = ((TypeIDSelectionWizard) wizard).getSourceDataTypeID(); String t = ((TypeIDSelectionWizard) wizard).getTargetDataTypeID(); + this.setSourceID(s); + this.setTargetID(t); if (initViewerCheckState(s, source)) { source.getTable().setEnabled(false); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java 2008-10-17 07:27:04 UTC (rev 10909) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java 2008-10-17 09:55:10 UTC (rev 10910) @@ -68,7 +68,7 @@ /** * @return the dataMappingRootModel */ - public GraphRootModel getDataMappingRootModel() { + public GraphRootModel getGraphicalRootModel() { return dataMappingRootModel; } /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/SmooksGraphConstants.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/SmooksGraphConstants.java 2008-10-17 07:27:04 UTC (rev 10909) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/SmooksGraphConstants.java 2008-10-17 09:55:10 UTC (rev 10910) @@ -5,14 +5,18 @@ /** * @author root - * + * */ public class SmooksGraphConstants { public static final String IMAGE_PATH_ERROR = "icons/full/obj16/error_obj.gif"; - + public static final String IMAGE_PATH_WARNING = "icons/full/obj16/warning_obj.gif"; - + + public static final String IMAGE_PATH_BLANK = "icons/full/obj16/blank.gif"; + public static final String IMAGE_WARNING = IMAGE_PATH_WARNING; - + public static final String IMAGE_ERROR = IMAGE_PATH_ERROR; + + public static final String IMAGE_EMPTY = IMAGE_PATH_BLANK; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java 2008-10-17 07:27:04 UTC (rev 10909) +++ trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java 2008-10-17 09:55:10 UTC (rev 10910) @@ -6,6 +6,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.widgets.Shell; import org.jboss.tools.smooks.analyzer.AbstractAnalyzer; +import org.jboss.tools.smooks.analyzer.DesignTimeAnalyzeResult; import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException; import org.jboss.tools.smooks.model.SmooksResourceListType; @@ -45,4 +46,10 @@ return null; } + public DesignTimeAnalyzeResult analyzeGraphModel( + SmooksConfigurationFileGenerateContext context) { + // TODO Auto-generated method stub + return null; + } + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-10-17 07:27:04 UTC (rev 10909) +++ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-10-17 09:55:10 UTC (rev 10910) @@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.xml.type.AnyType; import org.jboss.tools.smooks.analyzer.AbstractAnalyzer; +import org.jboss.tools.smooks.analyzer.DesignTimeAnalyzeResult; import org.jboss.tools.smooks.analyzer.MappingModel; import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException; @@ -58,7 +59,7 @@ throws SmooksAnalyzerException { SmooksResourceListType listType = context.getSmooksResourceListModel(); - GraphRootModel rootModel = context.getDataMappingRootModel(); + GraphRootModel rootModel = context.getGraphicalRootModel(); List children = rootModel.getChildren(); for (Iterator iterator = children.iterator(); iterator.hasNext();) { TreeItemRelationModel dataModel = (TreeItemRelationModel) iterator @@ -144,7 +145,7 @@ boolean isComplex = true; JavaBeanModel child = (JavaBeanModel) iterator.next(); AbstractStructuredDataModel graphModel = UIUtils.findGraphModel( - context.getDataMappingRootModel(), child); + context.getGraphicalRootModel(), child); LineConnectionModel connection = UIUtils .getFirstTargetModelViaConnection(graphModel); if (connection == null) @@ -383,4 +384,10 @@ return null; } + public DesignTimeAnalyzeResult analyzeGraphModel( + SmooksConfigurationFileGenerateContext context) { + // TODO Auto-generated method stub + return null; + } + }