Author: DartPeng Date: 2009-11-28 13:57:19 -0500 (Sat, 28 Nov 2009) New Revision: 18905 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java Log: JBIDE-5280 Analyze the config file when it dosen't contain the input type <param> information. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java 2009-11-28 14:29:16 UTC (rev 18904) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java 2009-11-28 18:57:19 UTC (rev 18905) @@ -20,7 +20,6 @@ import org.eclipse.core.filesystem.IFileInfo; import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.Path; import org.eclipse.draw2d.ColorConstants; import org.eclipse.emf.common.command.Command; @@ -137,7 +136,6 @@ public SmooksReaderFormPage(String id, String title) { super(id, title); - IResource resource; } @Override @@ -669,7 +667,6 @@ } AdapterFactoryEditingDomain editDomain = getEditingDomain(); - Object obj = editDomain.getAdapterFactory().adapt(resourceList, IEditingDomainItemProvider.class); IEditingDomainItemProvider provider = (IEditingDomainItemProvider) editDomain.getAdapterFactory().adapt( resourceList, IEditingDomainItemProvider.class); Collection<?> collections = provider.getNewChildDescriptors(resourceList, editDomain, null); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-11-28 14:29:16 UTC (rev 18904) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-11-28 18:57:19 UTC (rev 18905) @@ -3011,6 +3011,20 @@ } return SmooksConstants.VERSION_1_2; } + + public static void addInputTypeParam(String inputType, SmooksResourceListType resourceList){ + ParamsType params = resourceList.getParams(); + if(params == null){ + params = SmooksFactory.eINSTANCE.createParamsType(); + resourceList.setParams(params); + } + + ParamType param = SmooksFactory.eINSTANCE.createParamType(); + param.setName(SmooksModelUtils.INPUT_TYPE); + param.setStringValue(inputType); + + params.getParam().add(param); + } public static String judgeInputType(EObject smooksModel) { String inputType = null; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2009-11-28 14:29:16 UTC (rev 18904) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2009-11-28 18:57:19 UTC (rev 18905) @@ -91,10 +91,12 @@ import org.jboss.tools.smooks.model.rules10.provider.Rules10ItemProviderAdapterFactory; import org.jboss.tools.smooks.model.smooks.DocumentRoot; import org.jboss.tools.smooks.model.smooks.ParamType; +import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; import org.jboss.tools.smooks.model.smooks.provider.SmooksItemProviderAdapterFactory; import org.jboss.tools.smooks.model.smooks.util.SmooksResourceFactoryImpl; import org.jboss.tools.smooks.model.validation10.provider.Validation10ItemProviderAdapterFactory; import org.jboss.tools.smooks.model.xsl.provider.XslItemProviderAdapterFactory; +import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; public class AbstractSmooksFormEditor extends FormEditor implements IEditingDomainProvider, ISmooksModelValidateListener, ISmooksModelProvider { @@ -506,6 +508,7 @@ smooksModel = null; } setPlatformVersion(SmooksUIUtils.judgeSmooksPlatformVersion(smooksModel)); + judgeInputReader(); for (Iterator<?> iterator = this.sourceSynchronizeListener.iterator(); iterator.hasNext();) { ISourceSynchronizeListener l = (ISourceSynchronizeListener) iterator.next(); try { @@ -650,13 +653,39 @@ // create new one for it setPartName(partName); - String version = SmooksUIUtils.judgeSmooksPlatformVersion(smooksModel); - try { - this.setPlatformVersion(version); - } catch (Exception e) { + this.setPlatformVersion(version); + judgeInputReader(); + } + protected void judgeInputReader() { + SmooksResourceListType resourceList = SmooksUIUtils.getSmooks11ResourceListType(smooksModel); + if (resourceList == null) + return; + ParamType param = SmooksUIUtils.getInputTypeParam(resourceList); + String inputType = null; + if (param != null) { + inputType = param.getStringValue(); + String realInputType = SmooksUIUtils.judgeInputType(smooksModel); + if (realInputType == null) { + if (inputType != null) { + if (inputType.equals(SmooksModelUtils.INPUT_TYPE_XML) + || inputType.equals(SmooksModelUtils.INPUT_TYPE_JAVA) + || inputType.equals(SmooksModelUtils.INPUT_TYPE_XSD)) { + + } + } + } else { + if (!realInputType.equals(inputType)) { + param.setStringValue(realInputType); + inputType = realInputType; + } + } + } else { + inputType = SmooksUIUtils.judgeInputType(smooksModel); + SmooksUIUtils.addInputTypeParam(inputType, resourceList); } + this.setInputType(inputType); } public EObject getSmooksResourceList() {