Author: DartPeng Date: 2008-11-07 03:25:49 -0500 (Fri, 07 Nov 2008) New Revision: 11606 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.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/SmooksNormalContentEditFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java Log: JBIDE-3095 modify some code for make the NormalPage to know which resourceconfigs should be hide. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-11-07 05:50:50 UTC (rev 11605) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-11-07 08:25:49 UTC (rev 11606) @@ -474,9 +474,9 @@ } if (!(sourceObject instanceof JavaBeanModel) || !(targetObject instanceof JavaBeanModel)) { - throw new RuntimeException( - "Can't load the source/target data from Smooks configuration file."); - // return MappingResourceConfigList.createEmptyList(); +// throw new RuntimeException( +// "[JavaBeanAnalyzer]Can't load the source/target data from Smooks configuration file."); + return MappingResourceConfigList.createEmptyList(); } MappingResourceConfigList resourceConfigList = new MappingResourceConfigList(); JavaBeanModel source = (JavaBeanModel) sourceObject; @@ -551,7 +551,7 @@ if (childTargetModel == null) { // TODO if can't find the child node , throw exception // MODIFY by Dart 2008.11.07 - throw new RuntimeException("There isn't any child property named \"" + throw new RuntimeException("[JavaBeanAnalyzer]There isn't any child property named \"" + property + "\" of \"" + target.getName() + "\" JavaBean model"); } @@ -595,7 +595,7 @@ }else{ // TODO if can't find the class, throw exception // MODIFY by Dart 08.11.07 - throw new RuntimeException("JavaBean \"" + parentModel.getName()+ "\" can't load its class."); + throw new RuntimeException("[JavaBeanAnalyzer]JavaBean \"" + parentModel.getName()+ "\" can't load its class."); } if (s != null) { for (int i = 0; i < s.length; i++) { @@ -606,7 +606,7 @@ if (child == null){ // TODO if can't find the child node , throw exception // MODIFY by Dart 2008.11.07 - throw new RuntimeException("There isn't any child property named \"" + throw new RuntimeException("[JavaBeanAnalyzer]There isn't any child property named \"" + childName + "\" of \"" + parentModel.getName() + "\" JavaBean model"); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java 2008-11-07 05:50:50 UTC (rev 11605) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java 2008-11-07 08:25:49 UTC (rev 11606) @@ -42,6 +42,7 @@ private JavaBeanModelLoadComposite javaPropertySelectComposite; public JavaBeanModel getJavaBeanModel(){ + if(javaPropertySelectComposite == null) return null; return javaPropertySelectComposite.getCheckedJavaBeanModel(); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-11-07 05:50:50 UTC (rev 11605) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-11-07 08:25:49 UTC (rev 11606) @@ -34,6 +34,7 @@ import org.eclipse.ui.views.properties.IPropertySheetPage; import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; +import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; import org.jboss.tools.smooks.analyzer.NormalSmooksModelBuilder; import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage; import org.jboss.tools.smooks.model.DocumentRoot; @@ -52,6 +53,7 @@ ITabbedPropertySheetPageContributor { SmooksGraphicalFormPage graphicalPage = null; + public SmooksGraphicalFormPage getGraphicalPage() { return graphicalPage; } @@ -98,12 +100,17 @@ "Mapping"); int index = this.addPage(this.graphicalPage); this.setPageText(index, "Graph"); - normalPage = new SmooksNormalContentEditFormPage(this, "configuration", - "Configuration", null); + normalPage = new SmooksNormalContentEditFormPage(this, + "configuration", "Configuration", null); index = this.addPage(normalPage); setPageText(index, "Configuration"); // Set a default NormalPacakge to Normal Page - this.refreshNormalPage(Collections.EMPTY_LIST); + MappingResourceConfigList mappingResourceConfig = graphicalPage + .getMappingResourceConfigList(); + if (mappingResourceConfig != null) { + refreshNormalPage(mappingResourceConfig + .getRelationgResourceConfigList()); + } if (onlyShowTextEditor) { removeGraphicalFormPage(); } @@ -210,8 +217,8 @@ @Override public void doSave(IProgressMonitor monitor) { - if(onlyShowTextEditor){ - if(textEdtior != null){ + if (onlyShowTextEditor) { + if (textEdtior != null) { textEdtior.doSave(monitor); fireEditorDirty(false); return; @@ -228,8 +235,8 @@ @Override public void doSaveAs() { - if(onlyShowTextEditor){ - if(textEdtior != null){ + if (onlyShowTextEditor) { + if (textEdtior != null) { textEdtior.doSaveAs(); } } 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-11-07 05:50:50 UTC (rev 11605) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-11-07 08:25:49 UTC (rev 11606) @@ -192,6 +192,11 @@ private List selectionChangeListener = new ArrayList(); private ISelection selection; protected MappingResourceConfigList mappingResourceConfigList; + + public MappingResourceConfigList getMappingResourceConfigList() { + return mappingResourceConfigList; + } + protected AdapterFactoryEditingDomain editingDomain; private boolean canSaveFile = true; @@ -1012,9 +1017,9 @@ try { this.initTransformViewerModel((IEditorSite) getSite(), getEditorInput()); - if (mappingResourceConfigList != null) - callParentRefillNormalModelInfor(mappingResourceConfigList - .getRelationgResourceConfigList()); +// if (mappingResourceConfigList != null) +// callParentRefillNormalModelInfor(mappingResourceConfigList +// .getRelationgResourceConfigList()); } catch (IOWrappedException ex) { MessageDialog.openWarning(getSite().getShell(), "Waring", "Exceptions occurd during parsing Smooks file, no worries"); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-11-07 05:50:50 UTC (rev 11605) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-11-07 08:25:49 UTC (rev 11606) @@ -28,6 +28,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.ScrolledForm; import org.eclipse.ui.forms.widgets.Section; +import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage; import org.jboss.tools.smooks.model.ParamType; import org.jboss.tools.smooks.model.ResourceConfigType; @@ -116,7 +117,7 @@ ParamType typeParam = SmooksFactory.eINSTANCE.createParamType(); typeParam.setName(SmooksModelConstants.STREAM_FILTER_TYPE); transformType.getParam().add(typeParam); - + return transformType; } @@ -178,7 +179,7 @@ private void setTransformType(String type) { if (this.transformType != null) { SmooksModelUtils.setTransformType(transformType, type); - ((SmooksFormEditor)getEditor()).fireEditorDirty(true); + ((SmooksFormEditor) getEditor()).fireEditorDirty(true); } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-11-07 05:50:50 UTC (rev 11605) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-11-07 08:25:49 UTC (rev 11606) @@ -52,6 +52,7 @@ public Object getReturnValue() { try { String path = getFilePath(); + if(path == null) return null; path = AbstractXMLModelAnalyzer.parseFilePath(path); returnObject = this.loadedTheObject(path); } catch (Exception e) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java 2008-11-07 05:50:50 UTC (rev 11605) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java 2008-11-07 08:25:49 UTC (rev 11606) @@ -45,8 +45,9 @@ public AbstractXMLModelAnalyzer(String paramKey) { this.parmaKey = paramKey; } - - public static String parseFilePath(String path) throws InvocationTargetException{ + + public static String parseFilePath(String path) + throws InvocationTargetException { int index = path.indexOf(FILE_PRIX); if (index != -1) { path = path.substring(index + FILE_PRIX.length(), path.length()); @@ -61,10 +62,12 @@ if (file.exists()) { path = file.getLocation().toOSString(); } else { - throw new InvocationTargetException(new Exception("file dosen't exist" + path + " on the workspace.")); + throw new InvocationTargetException(new Exception( + "file dosen't exist" + path + " on the workspace.")); } - }else{ - throw new InvocationTargetException(new Exception("Illegal file path : " + path + ".")); + } else { + throw new InvocationTargetException(new Exception( + "Illegal file path : " + path + ".")); } } return path; @@ -87,9 +90,9 @@ } } if (path == null) { - return null; - // throw new InvocationTargetException(new Exception( - // "xml file can't be found in the .graph file.")); + return null; +// throw new InvocationTargetException(new Exception( +// "xml file can't be found in the .graph file.")); } path = parseFilePath(path); XMLObjectAnalyzer objectBuilder = new XMLObjectAnalyzer(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-11-07 05:50:50 UTC (rev 11605) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-11-07 08:25:49 UTC (rev 11606) @@ -224,9 +224,9 @@ // TODO if the type of input source/target data is illegal , throw // exceptions. // MODIFY by Dart 2008.11.07 - throw new RuntimeException( - "Can't load the source/target data from Smooks configuration file."); - // return MappingResourceConfigList.createEmptyList(); +// throw new RuntimeException( +// "[XMLBeanAnalyzer]Can't load the source/target data from Smooks configuration file."); + return MappingResourceConfigList.createEmptyList(); } AbstractXMLObject sourceRoot = (AbstractXMLObject) sourceObject; JavaBeanModel sourceTarget = (JavaBeanModel) targetObject; @@ -245,7 +245,7 @@ if (source == null) { // TODO if can't find the root , throw exception // MODIFY by Dart 2008.11.07 - throw new RuntimeException("Can't find the root node."); + throw new RuntimeException("[XML2JavaAnalyzer]Can't find the root node."); // return MappingResourceConfigList.createEmptyList(); } @@ -340,7 +340,7 @@ if (newRoot == null) { // TODO If can't find the element , throw exception // MODIFY by Dart , 2008.11.07 - throw new RuntimeException("Can't find the \""+ newSelector + "\" node."); + throw new RuntimeException("[XML2JavaAnalyzer]Can't find the \""+ newSelector + "\" node."); } createMappingResourceConfigList(configList, listType, resourceConfig1, newRoot, targetBean); @@ -350,7 +350,7 @@ if (source == null) { // TODO If can't find the element , throw exception // MODIFY by Dart , 2008.11.07 - throw new RuntimeException("Can't find the \""+ selector + "\" node."); + throw new RuntimeException("[XML2JavaAnalyzer]Can't find the \""+ selector + "\" node."); } if (source != null) { MappingModel mapping = new MappingModel(source, targetBean);