Author: DartPeng Date: 2008-11-21 04:11:19 -0500 (Fri, 21 Nov 2008) New Revision: 11943 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelConstants.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java 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/ui/editors/DateTypeDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterSelectionDialog.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.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/SmooksNormalContentEditFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/messages.properties 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/XML2JavaAnalyzer.java Log: JBIDE-3246 Add new GUI to edit/add/remove "import" type. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelConstants.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelConstants.java 2008-11-21 07:05:45 UTC (rev 11942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelConstants.java 2008-11-21 09:11:19 UTC (rev 11943) @@ -21,6 +21,13 @@ public static final String DOM = "DOM"; public static final String SAX_DOM = "SAX/DOM"; public static final String BEAN_POPULATOR = "org.milyn.javabean.BeanPopulator"; + + public static final String[] DECODER_CLASSES = new String[] { + "org.milyn.javabean.decoders.DateDecoder", + "org.milyn.javabean.decoders.CalendarDecoder" }; + /** + * @deprecated + */ public static final String DATE_DECODER = "org.milyn.javabean.decoders.DateDecoder"; public static final String AT_DOCUMENT = "@document"; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-11-21 07:05:45 UTC (rev 11942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-11-21 09:11:19 UTC (rev 11943) @@ -81,8 +81,9 @@ List paramList = resourceConfig.getParam(); for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { ParamType param = (ParamType) iterator.next(); - if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(param - .getName())) { + String name = param.getName(); + if(name != null) name = name.trim(); + if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(name)) { typeParam = param; break; } @@ -131,6 +132,7 @@ public static boolean isTransformTypeResourceConfig( ResourceConfigType resourceConfig) { String selector = resourceConfig.getSelector(); + if(selector != null) selector = selector.trim(); if (!SmooksModelConstants.GLOBAL_PARAMETERS.equals(selector)) { return false; } @@ -141,7 +143,9 @@ List paramList = resourceConfig.getParam(); for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { ParamType p = (ParamType) iterator.next(); - if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(p.getName())) { + String paramName = p.getName(); + if(paramName != null) paramName = paramName.trim(); + if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(paramName)) { return true; } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java 2008-11-21 07:05:45 UTC (rev 11942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java 2008-11-21 09:11:19 UTC (rev 11943) @@ -32,17 +32,19 @@ public NormalSmooksModelPackage buildNormalSmooksModelPackage( SmooksResourceListType list) { - NormalSmooksModelPackage modelPackage = new NormalSmooksModelPackage(list); + NormalSmooksModelPackage modelPackage = new NormalSmooksModelPackage( + list); if (list != null) { List resourceConfigList = list.getAbstractResourceConfig(); for (Iterator iterator = resourceConfigList.iterator(); iterator .hasNext();) { - ResourceConfigType resourceConfig = (ResourceConfigType) iterator - .next(); - this.processResouceConfig(resourceConfig, modelPackage); + Object resourceConfig = iterator.next(); + if (resourceConfig instanceof ResourceConfigType) { + this.processResouceConfig((ResourceConfigType)resourceConfig, modelPackage); + } } - if(resourceConfigList.isEmpty()){ - + if (resourceConfigList.isEmpty()) { + } } return modelPackage; @@ -50,15 +52,15 @@ protected void processResouceConfig(ResourceConfigType config, NormalSmooksModelPackage modelPackage) { -// if (isBeanPopulator(config)) { -// modelPackage.getBeanPopulatorResourceConfigList().add(config); -// } -// if (isDateConfig(config)) { -// modelPackage.getDateResourceConfigList().add(config); -// } -// if (isSmooksTransformType(config)) { -// modelPackage.setSmooksTransformTypeResourceConfig(config); -// } + // if (isBeanPopulator(config)) { + // modelPackage.getBeanPopulatorResourceConfigList().add(config); + // } + // if (isDateConfig(config)) { + // modelPackage.getDateResourceConfigList().add(config); + // } + // if (isSmooksTransformType(config)) { + // modelPackage.setSmooksTransformTypeResourceConfig(config); + // } } public static boolean isSmooksTransformType(ResourceConfigType config) { @@ -78,8 +80,14 @@ ResourceType resource = config.getResource(); if (resource != null) { String r = resource.getValue(); - if (r != null) - return SmooksModelConstants.DATE_DECODER.equals(r.trim()); + if (r != null) { + for (int i = 0; i < SmooksModelConstants.DECODER_CLASSES.length; i++) { + String decoder = SmooksModelConstants.DECODER_CLASSES[i]; + if (r.trim().equals(decoder)) { + return true; + } + } + } } return false; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java 2008-11-21 07:05:45 UTC (rev 11942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java 2008-11-21 09:11:19 UTC (rev 11943) @@ -58,15 +58,9 @@ IMappingAnalyzer analyzer = factory.getMappingAnalyzer(context .getSourceDataTypeID(), context.getTargetDataTypeID()); - if (analyzer == null) { - throw new SmooksAnalyzerException( - Messages.getString("SmooksFileBuilder.NullAnalyzer1") //$NON-NLS-1$ - + context.getSourceDataTypeID() - + Messages.getString("SmooksFileBuilder.NullAnalyzer2") //$NON-NLS-1$ - + context.getTargetDataTypeID()); - } if (smooksResource == null) { - throw new SmooksAnalyzerException(Messages.getString("SmooksFileBuilder.ResourceIsNull")); //$NON-NLS-1$ + throw new SmooksAnalyzerException(Messages + .getString("SmooksFileBuilder.ResourceIsNull")); //$NON-NLS-1$ } DocumentRoot documentRoot = (DocumentRoot) smooksResource.getContents() .get(0); @@ -86,9 +80,9 @@ context.setGeneratorResourceList(new ArrayList()); context.setSmooksResourceListModel(listType); context.setDomain(domain); + if (analyzer != null) + analyzer.analyzeMappingGraphModel(context); - analyzer.analyzeMappingGraphModel(context); - insertResoureConfig(listType, context.getGeneratorResourceList()); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); @@ -182,54 +176,58 @@ protected void initSmooksParseStyle( SmooksConfigurationFileGenerateContext context, SmooksResourceListType resourceList) { -// String type = context.getSmooksType(); -// if (type == null) -// return; -// ResourceConfigType config = null; -// if (resourceList.getAbstractResourceConfig().size() < 1) { -// } else { -// config = (ResourceConfigType) resourceList -// .getAbstractResourceConfig().get(0); -// String selector = config.getSelector(); -// if (!SmooksModelConstants.GLOBAL_PARAMETERS.equals(selector)) { -// config = null; -// } else { -// if (config.getParam().isEmpty()) { -// config = null; -// } else { -// ParamType param = config.getParam().get(0); -// if (!SmooksModelConstants.STREAM_FILTER_TYPE.equals(param -// .getName())) { -// config = null; -// } -// } -// } -// } -// ParamType param = null; -// if (config == null) { -// config = SmooksFactory.eINSTANCE.createResourceConfigType(); -// AddCommand.create(domain, resourceList, SmooksPackage.eINSTANCE.getSmooksResourceListType_AbstractResourceConfig(), config).execute(); -// MoveCommand.create(domain, resourceList, SmooksPackage.eINSTANCE.getSmooksResourceListType_AbstractResourceConfig(), config, 0); -// config.setSelector(SmooksModelConstants.GLOBAL_PARAMETERS); -// param = SmooksFactory.eINSTANCE.createParamType(); -// param.setName(SmooksModelConstants.STREAM_FILTER_TYPE); -// config.getParam().add(param); -// }else{ -// List paramList = config.getParam(); -// for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { -// ParamType p = (ParamType) iterator.next(); -// if(SmooksModelConstants.STREAM_FILTER_TYPE.equals(p.getName())){ -// param = p; -// break; -// } -// } -// if(param == null){ -// param = SmooksFactory.eINSTANCE.createParamType(); -// param.setName(SmooksModelConstants.STREAM_FILTER_TYPE); -// config.getParam().add(param); -// } -// } -// SmooksModelUtils.cleanTextToSmooksType(param); -// SmooksModelUtils.appendTextToSmooksType(param, context.getSmooksType()); + // String type = context.getSmooksType(); + // if (type == null) + // return; + // ResourceConfigType config = null; + // if (resourceList.getAbstractResourceConfig().size() < 1) { + // } else { + // config = (ResourceConfigType) resourceList + // .getAbstractResourceConfig().get(0); + // String selector = config.getSelector(); + // if (!SmooksModelConstants.GLOBAL_PARAMETERS.equals(selector)) { + // config = null; + // } else { + // if (config.getParam().isEmpty()) { + // config = null; + // } else { + // ParamType param = config.getParam().get(0); + // if (!SmooksModelConstants.STREAM_FILTER_TYPE.equals(param + // .getName())) { + // config = null; + // } + // } + // } + // } + // ParamType param = null; + // if (config == null) { + // config = SmooksFactory.eINSTANCE.createResourceConfigType(); + // AddCommand.create(domain, resourceList, SmooksPackage.eINSTANCE. + // getSmooksResourceListType_AbstractResourceConfig(), + // config).execute(); + // MoveCommand.create(domain, resourceList, SmooksPackage.eINSTANCE. + // getSmooksResourceListType_AbstractResourceConfig(), config, 0); + // config.setSelector(SmooksModelConstants.GLOBAL_PARAMETERS); + // param = SmooksFactory.eINSTANCE.createParamType(); + // param.setName(SmooksModelConstants.STREAM_FILTER_TYPE); + // config.getParam().add(param); + // }else{ + // List paramList = config.getParam(); + // for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { + // ParamType p = (ParamType) iterator.next(); + // if(SmooksModelConstants.STREAM_FILTER_TYPE.equals(p.getName())){ + // param = p; + // break; + // } + // } + // if(param == null){ + // param = SmooksFactory.eINSTANCE.createParamType(); + // param.setName(SmooksModelConstants.STREAM_FILTER_TYPE); + // config.getParam().add(param); + // } + // } + // SmooksModelUtils.cleanTextToSmooksType(param); + // SmooksModelUtils.appendTextToSmooksType(param, + // context.getSmooksType()); } } 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-21 07:05:45 UTC (rev 11942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-11-21 09:11:19 UTC (rev 11943) @@ -863,7 +863,7 @@ if (resourceConfig != null) { rootModel.setBeanClassString(SmooksModelUtils.getParmaText( SmooksModelUtils.BEAN_CLASS, resourceConfig)); - setSelectorIsUsed(selector); +// setSelectorIsUsed(selector); buildChildrenOfTargetInputModel(listType, rootModel, false, rootIsError, resourceConfig, loader); list.add(rootModel); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java 2008-11-21 07:05:45 UTC (rev 11942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java 2008-11-21 09:11:19 UTC (rev 11943) @@ -19,6 +19,9 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; +import org.jboss.tools.smooks.model.ResourceType; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.util.SmooksModelConstants; import org.jboss.tools.smooks.model.util.SmooksModelUtils; /** @@ -32,6 +35,7 @@ private Combo localeLangaugeCombo; private Combo localeContryCombo; private Text selectorText; + private Combo decoderCombo; public DateTypeDetailPage(SmooksFormEditor parentEditor, EditingDomain domain) { @@ -55,6 +59,11 @@ selectorText = this.formToolKit.createText(parent, ""); //$NON-NLS-1$ selectorText.setLayoutData(gd); + this.formToolKit.createLabel(parent, "Decoder Class :"); + gd = new GridData(GridData.FILL_HORIZONTAL); + decoderCombo = new Combo(parent, SWT.FLAT); + decoderCombo.setLayoutData(gd); + this.formToolKit.createLabel(parent, Messages.getString("DateTypeDetailPage.DateTypeFormatText")); //$NON-NLS-1$ gd = new GridData(GridData.FILL_HORIZONTAL); formatText = this.formToolKit.createText(parent, ""); //$NON-NLS-1$ @@ -72,10 +81,26 @@ formToolKit.paintBordersFor(parent); + initComboBox(); hookControls(); } + private void initComboBox() { + for (int i = 0; i < SmooksModelConstants.DECODER_CLASSES.length; i++) { + decoderCombo.add(SmooksModelConstants.DECODER_CLASSES[i]); + } + } + private void hookControls() { + + decoderCombo.addModifyListener(new ModifyListener(){ + + public void modifyText(ModifyEvent e) { + setDecoderClass(); + } + + }); + selectorText.addModifyListener(new ModifyListener(){ public void modifyText(ModifyEvent e) { setSelector(); @@ -107,6 +132,24 @@ }); } + protected void setDecoderClass() { + String text = decoderCombo.getText(); + if(text == null) text = ""; + if(this.resourceConfigList != null){ + ResourceType resource = resourceConfigList.getResource(); + if(resource == null){ + resource = SmooksFactory.eINSTANCE.createResourceType(); + resourceConfigList.setResource(resource); + } + if(text.trim().equals(resource.getValue())){ + return; + } + resource.setValue(text); + this.parentEditor.fireEditorDirty(true); + } + + } + protected void setFormat() { String format = formatText.getText(); if(format == null) format = ""; @@ -156,6 +199,12 @@ String formate = SmooksModelUtils.getParmaText("format", resourceConfigList); //$NON-NLS-1$ String locallang = SmooksModelUtils.getParmaText("locale-language", resourceConfigList); //$NON-NLS-1$ String localcontry = SmooksModelUtils.getParmaText("locale-country", resourceConfigList); //$NON-NLS-1$ + String decoderClass = ""; + ResourceType resource = resourceConfigList.getResource(); + if(resource != null){ + decoderClass = resource.getValue(); + if(decoderClass != null) decoderClass = decoderClass.trim(); + } if(formate == null) formate = ""; //$NON-NLS-1$ if(locallang == null) locallang = ""; //$NON-NLS-1$ if(localcontry == null) localcontry = ""; //$NON-NLS-1$ @@ -166,6 +215,7 @@ formatText.setText(formate); localeContryCombo.setText(localcontry); localeLangaugeCombo.setText(locallang); + decoderCombo.setText(decoderClass); } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterSelectionDialog.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterSelectionDialog.java 2008-11-21 07:05:45 UTC (rev 11942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterSelectionDialog.java 2008-11-21 09:11:19 UTC (rev 11943) @@ -23,9 +23,11 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.smooks.model.AbstractResourceConfig; import org.jboss.tools.smooks.model.ResourceConfigType; import org.jboss.tools.smooks.model.ResourceType; import org.jboss.tools.smooks.model.SmooksResourceListType; +import org.jboss.tools.smooks.model.util.SmooksModelConstants; /** * @author Dart @@ -73,12 +75,13 @@ viewer.addDoubleClickListener(new IDoubleClickListener() { public void doubleClick(DoubleClickEvent event) { - IStructuredSelection selection = (IStructuredSelection) event.getSelection(); + IStructuredSelection selection = (IStructuredSelection) event + .getSelection(); Object obj = selection.getFirstElement(); if (obj == null) { return; } - if(obj instanceof Decorater){ + if (obj instanceof Decorater) { okPressed(); } } @@ -89,11 +92,13 @@ private void initViewer(TreeViewer viewer) { if (resourceList != null) { - List allList = new ArrayList(); - List dateDecoraterList = new ArrayList(); + List<Object> allList = new ArrayList<Object>(); + List<Decorater> dateDecoraterList = new ArrayList<Decorater>(); allList.add(dateDecoraterList); - List list = resourceList.getAbstractResourceConfig(); - for (Iterator iterator = list.iterator(); iterator.hasNext();) { + List<AbstractResourceConfig> list = resourceList + .getAbstractResourceConfig(); + for (Iterator<AbstractResourceConfig> iterator = list.iterator(); iterator + .hasNext();) { ResourceConfigType config = (ResourceConfigType) iterator .next(); String selector = config.getSelector(); @@ -102,18 +107,21 @@ String selector1 = selector.substring(0, selector .indexOf(":")); selector1 = selector1.trim(); - String selector2 = selector.substring(selector - .indexOf(":") + 1 , selector.length()); + String selector2 = selector.substring( + selector.indexOf(":") + 1, selector.length()); selector2 = selector2.trim(); - if (selector1.equals("decorat")) { + if (selector1.equals("decoder")) { ResourceType resource = config.getResource(); if (resource != null) { String value = resource.getValue(); - if(value != null) value = value.trim(); - if ("org.milyn.javabean.decoders.DateDecoder" - .equals(value)) { - dateDecoraterList.add(new DateDecorater( - selector2)); + if (value != null) + value = value.trim(); + for (int i = 0; i < SmooksModelConstants.DECODER_CLASSES.length; i++) { + String decoderClass = SmooksModelConstants.DECODER_CLASSES[i]; + if (decoderClass.equals(value)) { + dateDecoraterList.add(new DateDecorater( + selector2)); + } } } } @@ -154,7 +162,7 @@ } else { if (obj instanceof Decorater) { this.setSelectedDecorater((Decorater) obj); - }else{ + } else { setSelectedDecorater(null); } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java 2008-11-21 07:05:45 UTC (rev 11942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java 2008-11-21 09:11:19 UTC (rev 11943) @@ -62,8 +62,11 @@ return false; String value = resource.getValue(); if(value != null) value = value.trim(); - if (SmooksModelConstants.DATE_DECODER.equals(value)) { - return true; + for (int i = 0; i < SmooksModelConstants.DECODER_CLASSES.length; i++) { + String decoderClass = SmooksModelConstants.DECODER_CLASSES[i]; + if(decoderClass.equals(value)){ + return true; + } } return false; } 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-21 07:05:45 UTC (rev 11942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-11-21 09:11:19 UTC (rev 11943) @@ -112,6 +112,8 @@ if (mappingResourceConfig != null) { refreshNormalPage(mappingResourceConfig .getRelationgResourceConfigList()); + }else{ + refreshNormalPage(Collections.EMPTY_LIST); } } 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-21 07:05:45 UTC (rev 11942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-11-21 09:11:19 UTC (rev 11943) @@ -10,26 +10,51 @@ ******************************************************************************/ package org.jboss.tools.smooks.ui.editors; +import java.util.Collections; +import java.util.Iterator; import java.util.List; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; +import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.ui.dialogs.WorkspaceResourceDialog; import org.eclipse.emf.edit.command.AddCommand; import org.eclipse.emf.edit.command.MoveCommand; import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.jface.viewers.DoubleClickEvent; +import org.eclipse.jface.viewers.IDoubleClickListener; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.ui.IFileEditorInput; +import org.eclipse.ui.PartInitException; import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.editor.FormEditor; import org.eclipse.ui.forms.editor.FormPage; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.ScrolledForm; import org.eclipse.ui.forms.widgets.Section; +import org.eclipse.ui.ide.IDE; import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage; +import org.jboss.tools.smooks.model.ImportType; import org.jboss.tools.smooks.model.ParamType; import org.jboss.tools.smooks.model.ResourceConfigType; import org.jboss.tools.smooks.model.SmooksFactory; @@ -38,6 +63,9 @@ import org.jboss.tools.smooks.model.util.SmooksModelUtils; import org.jboss.tools.smooks.ui.AnalyzeResult; import org.jboss.tools.smooks.ui.IAnalyzeListener; +import org.jboss.tools.smooks.ui.SmooksUIActivator; +import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; +import org.jboss.tools.smooks.utils.SmooksGraphConstants; import org.jboss.tools.smooks.utils.UIUtils; /** @@ -75,6 +103,14 @@ private Section parseTypeSection; + private Button addFileButton; + + private Button removeFileButton; + + private Button editFileButton; + + private TableViewer fileViewer; + public SmooksNormalContentEditFormPage(FormEditor editor, String id, String title, NormalSmooksModelPackage modelPacakge) { super(editor, id, title); @@ -108,17 +144,17 @@ GridLayout gridLayout = UIUtils.createGeneralFormEditorLayout(1); resourceBlock.createContent(managedForm); Composite rootMainControl = form.getBody(); - form.setText(Messages.getString("SmooksNormalContentEditFormPage.ConfigurationPageText")); //$NON-NLS-1$ + form + .setText(Messages + .getString("SmooksNormalContentEditFormPage.ConfigurationPageText")); //$NON-NLS-1$ createSmooksTypeGUI(rootMainControl, tool); form.getBody().setLayout(gridLayout); form.pack(); - this.initTransformTypeResourceConfig(); + this.initOtherConfigurationsGUI(); resourceBlock.initViewers(transformType); setGUIStates(); } - - @Override public boolean isDirty() { @@ -156,7 +192,7 @@ return transformType; } - protected void initTransformTypeResourceConfig() { + protected void initOtherConfigurationsGUI() { if (saxButton != null) saxButton.setSelection(false); if (domButton != null) @@ -166,10 +202,14 @@ if (this.getModelPackage() != null) { List list = modelPackage.getSmooksResourceList() .getAbstractResourceConfig(); - if (list != null && !list.isEmpty()) { - ResourceConfigType first = (ResourceConfigType) list.get(0); - if (SmooksModelUtils.isTransformTypeResourceConfig(first)) { - this.transformType = first; + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + Object sr = iterator.next(); + if (sr instanceof ResourceConfigType) { + if (SmooksModelUtils + .isTransformTypeResourceConfig((ResourceConfigType) sr)) { + this.transformType = (ResourceConfigType) sr; + break; + } } } if (transformType == null) { @@ -196,30 +236,157 @@ protected void createSmooksTypeGUI(Composite mainComposite, FormToolkit tool) { GridData gd = new GridData(GridData.FILL_HORIZONTAL); parseTypeSection = tool.createSection(mainComposite, Section.TITLE_BAR - | Section.DESCRIPTION | Section.TWISTIE); + | Section.TWISTIE); parseTypeSection.setLayoutData(gd); - Composite typeSelectComposite = tool.createComposite(parseTypeSection); - parseTypeSection.setClient(typeSelectComposite); - parseTypeSection.setText(Messages.getString("SmooksNormalContentEditFormPage.SmooksParseType")); //$NON-NLS-1$ + Composite otherConfigurationComposite = tool + .createComposite(parseTypeSection); + parseTypeSection.setClient(otherConfigurationComposite); + parseTypeSection.setText(Messages + .getString("SmooksNormalContentEditFormPage.SmooksParseType")); //$NON-NLS-1$ GridLayout layout1 = new GridLayout(); - typeSelectComposite.setLayout(layout1); + otherConfigurationComposite.setLayout(layout1); gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; - typeSelectComposite.setLayoutData(gd); + otherConfigurationComposite.setLayoutData(gd); GridLayout layout = new GridLayout(); - layout.numColumns = 3; - typeSelectComposite.setLayout(layout); + otherConfigurationComposite.setLayout(layout); - saxButton = createTypeSelectRadioButton(typeSelectComposite, tool, + Composite buttonComposite = tool + .createComposite(otherConfigurationComposite); + GridLayout buttonAreaLayout = new GridLayout(); + buttonAreaLayout.numColumns = 4; + buttonComposite.setLayout(buttonAreaLayout); + + gd = new GridData(GridData.FILL_HORIZONTAL); + buttonComposite.setLayoutData(gd); + + tool.createLabel(buttonComposite, "Parse Type : "); + saxButton = createTypeSelectRadioButton(buttonComposite, tool, SmooksModelConstants.SAX); - domButton = createTypeSelectRadioButton(typeSelectComposite, tool, + domButton = createTypeSelectRadioButton(buttonComposite, tool, SmooksModelConstants.DOM); - saxdomButton = createTypeSelectRadioButton(typeSelectComposite, tool, + saxdomButton = createTypeSelectRadioButton(buttonComposite, tool, SmooksModelConstants.SAX_DOM); + + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + tool.createSeparator(otherConfigurationComposite, SWT.HORIZONTAL) + .setLayoutData(gd); + + Composite importFileComposite = tool + .createComposite(otherConfigurationComposite); + gd = new GridData(GridData.FILL_HORIZONTAL); + GridLayout fileLayout = new GridLayout(); + fileLayout.numColumns = 2; + importFileComposite.setLayoutData(gd); + importFileComposite.setLayout(fileLayout); + // importFileComposite.setBackground(ColorConstants.black); + + Label fileListLabel = tool.createLabel(importFileComposite, + "Import Files :"); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + fileListLabel.setLayoutData(gd); + + Composite viewerComposite = tool.createComposite(importFileComposite); + FillLayout viewerLayout = new FillLayout(); + viewerLayout.marginHeight = 1; + viewerLayout.marginWidth = 1; + viewerComposite.setLayout(viewerLayout); + fileViewer = new TableViewer(viewerComposite, SWT.NONE); + fileViewer.setContentProvider(new FileImportContentProvider()); + fileViewer.setLabelProvider(new FileImportLabelProvider()); + fileViewer.setInput(getModelPackage().getSmooksResourceList() + .getAbstractResourceConfig()); + fileViewer.addDoubleClickListener(new IDoubleClickListener() { + public void doubleClick(DoubleClickEvent event) { + openFile(fileViewer.getSelection()); + } + }); + fileViewer.addFilter(new ViewerFilter() { + + @Override + public boolean select(Viewer viewer, Object parentElement, + Object element) { + if (element instanceof ImportType) + return true; + return false; + } + + }); + gd = new GridData(GridData.FILL_BOTH); + viewerComposite.setLayoutData(gd); + viewerComposite.setBackground(GraphicsConstants.groupBorderColor); + tool.paintBordersFor(viewerComposite); + + Composite fileActionComposite = tool + .createComposite(importFileComposite); + gd = new GridData(GridData.FILL_VERTICAL); + fileActionComposite.setLayoutData(gd); + + GridLayout fileActionLayout = new GridLayout(); + fileActionComposite.setLayout(fileActionLayout); + + addFileButton = createFileActionButton(fileActionComposite, tool, "Add"); + removeFileButton = createFileActionButton(fileActionComposite, tool, + "Remove"); + editFileButton = createFileActionButton(fileActionComposite, tool, + "Edit"); + + tool.paintBordersFor(fileActionComposite); + hookButtons(); } + protected void openFile(ISelection selection) { + Object obj = ((IStructuredSelection) selection).getFirstElement(); + if (obj != null && obj instanceof ImportType) { + String filePath = ((ImportType) obj).getFile(); + IFile input = createEditorInput(filePath); + if (input != null) { + try { + IDE.openEditor(SmooksUIActivator.getDefault() + .getWorkbench().getActiveWorkbenchWindow() + .getActivePage(), input); + } catch (PartInitException e) { + UIUtils.showErrorDialog(getSite().getShell(), UIUtils + .createErrorStatus(e)); + } + } + } + } + + private IProject getCurrentProject() { + IFile file = ((IFileEditorInput) getEditor().getEditorInput()) + .getFile(); + if (file != null) { + IProject project = file.getProject(); + return project; + } + return null; + } + + protected IFile createEditorInput(String filePath) { + String workspacePath = this.getWorkspaceFilePath(filePath); + IProject project = getCurrentProject(); + if (project != null) { + IResource resource = project.findMember(new Path(workspacePath)); + if (resource instanceof IFile) { + return (IFile) resource; + } + } + return null; + } + + private Button createFileActionButton(Composite parent, FormToolkit tool, + String text) { + Button button = tool.createButton(parent, text, SWT.NONE); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + button.setLayoutData(gd); + return button; + } + private void setTransformType(String type) { if (this.transformType != null) { SmooksModelUtils.setTransformType(transformType, type); @@ -237,11 +404,9 @@ }); domButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { setTransformType(SmooksModelConstants.DOM); } - }); saxdomButton.addSelectionListener(new SelectionAdapter() { @@ -251,14 +416,124 @@ } }); + + addFileButton.addSelectionListener(new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + addFileImport(); + } + + }); + + removeFileButton.addSelectionListener(new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + removeFileImport(); + } + + }); + + editFileButton.addSelectionListener(new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + editFileImport(); + } + + }); } + protected void editFileImport() { + IStructuredSelection selection = (IStructuredSelection) fileViewer + .getSelection(); + Object obj = selection.getFirstElement(); + if (obj instanceof ImportType) { + String filePath = getWorkspaceFilePath(((ImportType) obj).getFile()); + IProject project = getCurrentProject(); + if (project != null) { + IResource resource = project.findMember(new Path(filePath)); + IFile[] files = WorkspaceResourceDialog.openFileSelection( + getSite().getShell(), "Select Files", "", false, + new Object[] { resource }, Collections.EMPTY_LIST); + if (files != null) { + IPath path1 = files[0].getFullPath().removeFirstSegments(1); + String s = path1.toString(); + if(s.startsWith("/") || s.startsWith("\\")){ + + }else{ + s = "/" + s; + } + ((ImportType) obj).setFile("classpath:" + s); + fileViewer.refresh(); + ((SmooksFormEditor) getEditor()).fireEditorDirty(true); + } + } + + } + } + + protected void removeFileImport() { + IStructuredSelection selection = (IStructuredSelection) fileViewer + .getSelection(); + NormalSmooksModelPackage modelPackage = getModelPackage(); + if (modelPackage != null) { + modelPackage.getSmooksResourceList().getAbstractResourceConfig() + .removeAll(selection.toList()); + fileViewer.refresh(); + ((SmooksFormEditor) getEditor()).fireEditorDirty(true); + } + } + + protected void addFileImport() { + IFile[] files = WorkspaceResourceDialog.openFileSelection(getSite() + .getShell(), "Select Files", "", false, null, + Collections.EMPTY_LIST); + if (files != null) { + ImportType fileImport = SmooksFactory.eINSTANCE.createImportType(); + IPath path1 = files[0].getFullPath().removeFirstSegments(1); + String s = path1.toString(); + if(s.startsWith("/") || s.startsWith("\\")){ + + }else{ + s = "/" + s; + } + fileImport.setFile("classpath:" + s); + NormalSmooksModelPackage modelPackage = getModelPackage(); + if (modelPackage != null) { + Command command = AddCommand + .create( + ((SmooksFormEditor) getEditor()) + .getEditingDomain(), + modelPackage.getSmooksResourceList(), + SmooksPackage.eINSTANCE + .getSmooksResourceListType_AbstractResourceConfig(), + fileImport); + ((SmooksFormEditor) getEditor()).getEditingDomain() + .getCommandStack().execute(command); + fileViewer.refresh(); + ((SmooksFormEditor) getEditor()).fireEditorDirty(true); + } + } + } + private Button createTypeSelectRadioButton(Composite parent, FormToolkit tool, String labelName) { Button button = tool.createButton(parent, labelName, SWT.RADIO); return button; } + private String getWorkspaceFilePath(String filePath) { + if (filePath == null) + return ""; + if (filePath.indexOf(":") != -1) { + int index = filePath.indexOf(":"); + return filePath.substring(index + 1, filePath.length()); + } + return filePath; + } + /** * @return the modelPackage */ @@ -297,9 +572,53 @@ setModelPackage(null); disableGUI = true; } - initTransformTypeResourceConfig(); + initOtherConfigurationsGUI(); if (resourceBlock != null) this.resourceBlock.initViewers(transformType); setGUIStates(); } + + private class FileImportContentProvider implements + IStructuredContentProvider { + + public Object[] getElements(Object inputElement) { + if (inputElement instanceof List) { + return ((List) inputElement).toArray(); + } + return new Object[] {}; + } + + public void dispose() { + } + + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } + + } + + private class FileImportLabelProvider extends LabelProvider { + + @Override + public Image getImage(Object element) { + if (element instanceof ImportType) { + String path = getWorkspaceFilePath(((ImportType) element) + .getFile()); + IProject project = getCurrentProject(); + IResource resource = project.findMember(new Path(path)); + if (resource == null || !resource.exists()) + return SmooksUIActivator.getDefault().getImageRegistry() + .get(SmooksGraphConstants.IMAGE_ERROR); + } + return super.getImage(element); + } + + @Override + public String getText(Object element) { + if (element instanceof ImportType) { + return getWorkspaceFilePath(((ImportType) element).getFile()); + } + return super.getText(element); + } + + } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-11-21 07:05:45 UTC (rev 11942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-11-21 09:11:19 UTC (rev 11943) @@ -213,6 +213,9 @@ Object element) { if (element == transformType) return false; + if(!(element instanceof ResourceConfigType)){ + return false; + } if (modelPackage != null) { List hidenList = modelPackage.getHidenSmooksElements(); if(hidenList == null) return false; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/messages.properties 2008-11-21 07:05:45 UTC (rev 11942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/messages.properties 2008-11-21 09:11:19 UTC (rev 11943) @@ -20,7 +20,7 @@ SmooksGraphicalFormPage.SourceSelectLinkText=Source Select SmooksGraphicalFormPage.TargetSelectLinkText=Target Select SmooksNormalContentEditFormPage.ConfigurationPageText=Configuration Page -SmooksNormalContentEditFormPage.SmooksParseType=Smooks Parse Type +SmooksNormalContentEditFormPage.SmooksParseType=Other Configurations SmooksResourceConfigFormBlock.BeanPopulator=BeanPopulator \: SmooksResourceConfigFormBlock.DateType=Date Type SmooksResourceConfigFormBlock.DeleteButton=Delete 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-21 07:05:45 UTC (rev 11942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-11-21 09:11:19 UTC (rev 11943) @@ -154,7 +154,7 @@ protected void openWorkSpaceSelection(Text relationT) { IFile[] files = WorkspaceResourceDialog.openFileSelection(getShell(), - "", "", false, null, Collections.EMPTY_LIST); //$NON-NLS-1$ //$NON-NLS-2$ + "Select Files", "", false, null, Collections.EMPTY_LIST); //$NON-NLS-1$ //$NON-NLS-2$ // dialog.setInitialSelections(selectedResources); if (files.length > 0) { IFile file = files[0]; 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-21 07:05:45 UTC (rev 11942) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-11-21 09:11:19 UTC (rev 11943) @@ -412,16 +412,8 @@ np.setValue(namespace); mapping.getProperties().add(np); } - // String targetProfile = config.getTargetProfile(); - // if(targetProfile != null){ - // PropertyModel np = new PropertyModel(); - // np.setName("targetProfile"); - // np.setValue(targetProfile); - // mapping.getProperties().add(np); - // } configList.addResourceConfig(config); - this.setSelectorIsUsed(config.getSelector()); List<ParamType> paramList = config.getParam(); ParamType bindingParam = null; @@ -449,7 +441,6 @@ SmooksModelUtils.ATTRIBUTE_SELECTOR); JavaBeanModel childBean = JavaBeanAnalyzer .findTheChildJavaBeanModel(property, targetJavaBean); - // PENGXUE processXMLSelector(configList, config, sourceRoot, childBean, list, selectorStr, binding); } @@ -476,6 +467,7 @@ Messages .getString("XML2JavaAnalyzer.CantFindNodeErrorMessage1") + newSelector + Messages.getString("XML2JavaAnalyzer.CantFindNodeErrorMessage2")); //$NON-NLS-1$ //$NON-NLS-2$ } + this.setSelectorIsUsed(resourceConfig1.getSelector()); createMappingResourceConfigList(configList, listType, resourceConfig1, newRoot, targetBean); } else {