Author: DartPeng Date: 2008-12-08 04:00:41 -0500 (Mon, 08 Dec 2008) New Revision: 12466 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ConfigurationViewerLabelProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigWarpper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterChangeLitener.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterTableViewerCreator.java 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/SmooksResourceFactoryImpl.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/BeanPopulatorDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DocumentResourceTypeDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/MappingGraphCompositeCreator.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/SmooksGraphicalFormPage.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/wizards/NewResourceConfigFactory.java Log: JBIDE-3371 Add new GUI in configuration page 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-12-08 01:37:53 UTC (rev 12465) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-12-08 09:00:41 UTC (rev 12466) @@ -33,6 +33,8 @@ public static final String TYPE_XSL = "xsl"; + public static final String[] TEMPLATE_TYPES = new String[] { "xsl","ftl" }; + public static final String BEAN_CLASS = "beanClass"; public static final String BEAN_ID = "beanId"; @@ -93,7 +95,11 @@ if(resource == null) return false; String type = resource.getType(); if(type != null) type = type.trim(); - return TYPE_XSL.equals(type); + for (int i = 0; i < TEMPLATE_TYPES.length; i++) { + String type1 = TEMPLATE_TYPES[i]; + if(type1.equalsIgnoreCase(type)) return true; + } + return false; } public static boolean isDateTypeSelector(ResourceConfigType type) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksResourceFactoryImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksResourceFactoryImpl.java 2008-12-08 01:37:53 UTC (rev 12465) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksResourceFactoryImpl.java 2008-12-08 09:00:41 UTC (rev 12466) @@ -50,6 +50,7 @@ result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE); result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE); + return result; } 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-12-08 01:37:53 UTC (rev 12465) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-12-08 09:00:41 UTC (rev 12466) @@ -891,8 +891,8 @@ throw new RuntimeException(e); } } - throw new RuntimeException( - "Can't load Java bean model form the config file."); +// throw new RuntimeException( +// "Can't load Java bean model form the config file."); } // if can't load the source from GraphicalInformation , return NULL if (current == null && rootClassName == null) @@ -924,8 +924,8 @@ } catch (ClassNotFoundException e) { // TODO if can't find the class throws exception // MODIFY by Dart 2008.11.12 - throw new RuntimeException("Can't find the class : \"" - + rootClassName + "\" to create the JavaBean model"); +// throw new RuntimeException("Can't find the class : \"" +// + rootClassName + "\" to create the JavaBean model"); } } boolean rootIsError = false; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java 2008-12-08 01:37:53 UTC (rev 12465) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java 2008-12-08 09:00:41 UTC (rev 12466) @@ -48,6 +48,7 @@ import org.jboss.tools.smooks.ui.SmooksUIActivator; /** + * @deprecated * @author Dart Peng<br> * Date : Sep 11, 2008 */ Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ConfigurationViewerLabelProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ConfigurationViewerLabelProvider.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ConfigurationViewerLabelProvider.java 2008-12-08 09:00:41 UTC (rev 12466) @@ -0,0 +1,68 @@ +/** + * + */ +package org.jboss.tools.smooks.ui.editors; + +import org.eclipse.jface.viewers.LabelProvider; +import org.jboss.tools.smooks.analyzer.NormalSmooksModelBuilder; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.ResourceType; +import org.jboss.tools.smooks.model.util.SmooksModelUtils; + +/** + * @author Dart + * + */ +public class ConfigurationViewerLabelProvider extends LabelProvider { + public String getText(Object element) { + if (element instanceof ResourceConfigType) { +// if (SmooksModelUtils +// .isBeanPopulatorResource((ResourceConfigType) element)) { +// String selector = ((ResourceConfigType) element).getSelector(); +// if (selector == null) +// selector = Messages +// .getString("SmooksResourceConfigFormBlock.NULLString"); //$NON-NLS-1$ +// return Messages +// .getString("SmooksResourceConfigFormBlock.BeanPopulator") + selector; //$NON-NLS-1$ +// } + if (SmooksModelUtils + .isDateTypeSelector((ResourceConfigType) element)) { + String name = Messages + .getString("SmooksResourceConfigFormBlock.DateType"); //$NON-NLS-1$ + String selector = ((ResourceConfigType) element).getSelector(); + if (selector == null) { + return name; + } + selector = selector.trim(); + if (selector.indexOf(":") != -1) { + selector = selector.substring(selector.indexOf(":") + 1, + selector.length()); + } + return name + "(" + selector + ")"; + } + if (SmooksModelUtils + .isFilePathResourceConfig((ResourceConfigType) element)) { + String selector = ((ResourceConfigType) element).getSelector(); + if (selector == null) + selector = Messages + .getString("SmooksResourceConfigFormBlock.NULLString"); //$NON-NLS-1$ + return Messages + .getString("SmooksResourceConfigFormBlock.TemplateFile") + selector; //$NON-NLS-1$ + } + if (SmooksModelUtils + .isInnerFileContents((ResourceConfigType) element)) { + ResourceType re = ((ResourceConfigType) element).getResource(); + String type = re.getType(); + String label = Messages + .getString("SmooksResourceConfigFormBlock.TemplateFile") + "(" + type + ")"; + return label; + } + String s = ((ResourceConfigType) element).getSelector(); + if (s == null) + s = Messages + .getString("SmooksResourceConfigFormBlock.NULLString"); //$NON-NLS-1$ + return "ResourceConfig (" + s + ")"; //$NON-NLS-1$ + } + return super.getText(element); + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ConfigurationViewerLabelProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DocumentResourceTypeDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DocumentResourceTypeDetailPage.java 2008-12-08 01:37:53 UTC (rev 12465) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DocumentResourceTypeDetailPage.java 2008-12-08 09:00:41 UTC (rev 12466) @@ -3,14 +3,19 @@ */ package org.jboss.tools.smooks.ui.editors; +import java.util.Collection; import java.util.Collections; import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; +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.SetCommand; import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -19,19 +24,27 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.forms.events.HyperlinkEvent; +import org.eclipse.ui.forms.events.IHyperlinkListener; +import org.eclipse.ui.forms.widgets.Hyperlink; +import org.eclipse.ui.ide.IDE; +import org.jboss.tools.smooks.model.ParamType; import org.jboss.tools.smooks.model.ResourceType; import org.jboss.tools.smooks.model.SmooksPackage; import org.jboss.tools.smooks.model.util.SmooksModelUtils; +import org.jboss.tools.smooks.ui.SmooksUIActivator; +import org.jboss.tools.smooks.utils.UIUtils; /** * @author dart * */ public class DocumentResourceTypeDetailPage extends - AbstractSmooksModelDetailPage { + AbstractSmooksModelDetailPage implements ParamaterChangeLitener { private static final int INNER = 0; private static final int EXTERNAL = 1; @@ -42,16 +55,58 @@ private Text innerContentText; private Button browseButton; private boolean isInit = true; + private Combo typeCombo; + // + // private static final String PARAM_NAME_PRO = "__param_name_pro"; + // + // private static final String PARAM_VALUE_PRO = "__param_value_pro"; + private ParamaterTableViewerCreator creator; + public DocumentResourceTypeDetailPage(SmooksFormEditor parentEditor, EditingDomain domain) { super(parentEditor, domain); } protected void createExternlaSelectionGUI(Composite parent) { + Hyperlink link = formToolKit.createHyperlink(parent, Messages + .getString("DocumentResourceTypeDetailPage.DocPath"), SWT.NONE); + link.addHyperlinkListener(new IHyperlinkListener() { - this.formToolKit.createLabel(parent, Messages - .getString("DocumentResourceTypeDetailPage.DocPath")); //$NON-NLS-1$ + public void linkActivated(HyperlinkEvent e) { + if (!externalCheckButton.getSelection()) + return; + String path = text.getText(); + if (path == null) + return; + Path p = new Path(path); + IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); + IResource resource = root.findMember(p); + if (resource != null && resource.exists() + && resource instanceof IFile) { + try { + IDE.openEditor(SmooksUIActivator.getDefault() + .getWorkbench().getActiveWorkbenchWindow() + .getActivePage(), (IFile) resource); + } catch (PartInitException e1) { + UIUtils.showErrorDialog(parentEditor.getSite() + .getShell(), UIUtils.createErrorStatus(e1)); + } + } else { + MessageDialog.openError(parentEditor.getSite().getShell(), + "Error", "Can't open the editor , because the \"" + + path + "\" dosen't exist or isn't file."); + } + } + + public void linkEntered(HyperlinkEvent e) { + + } + + public void linkExited(HyperlinkEvent e) { + } + }); + Composite fileCom = formToolKit.createComposite(parent); GridData gd = new GridData(GridData.FILL_HORIZONTAL); fileCom.setLayoutData(gd); @@ -81,12 +136,18 @@ super.widgetSelected(e); browseFileSystem(); } - }); formToolKit.paintBordersFor(fileCom); } + private void initTypeCombo() { + for (int i = 0; i < SmooksModelUtils.TEMPLATE_TYPES.length; i++) { + String type = SmooksModelUtils.TEMPLATE_TYPES[i]; + typeCombo.add(type); + } + } + protected void handleRadioButtons() { externalCheckButton.addSelectionListener(new SelectionAdapter() { @Override @@ -127,7 +188,20 @@ }); selectorText.setLayoutData(gd); + formToolKit.createLabel(parent, "Type :"); + typeCombo = new Combo(parent, SWT.FLAT); + initTypeCombo(); gd = new GridData(GridData.FILL_HORIZONTAL); + typeCombo.setLayoutData(gd); + typeCombo.addModifyListener(new ModifyListener() { + + public void modifyText(ModifyEvent e) { + resetResourceType(); + } + + }); + + gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; externalCheckButton = formToolKit.createButton(parent, "External File Selection", SWT.RADIO); @@ -146,25 +220,69 @@ gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; - formToolKit.createSeparator(parent, SWT.HORIZONTAL).setLayoutData(gd); + // formToolKit.createSeparator(parent, + // SWT.HORIZONTAL).setLayoutData(gd); + createParamerTable(parent); + formToolKit.paintBordersFor(parent); handleRadioButtons(); } + protected void resetResourceType() { + String type = typeCombo.getText(); + if (type == null) + return; + if (type != null) { + type = type.trim(); + } + + ResourceType resource = resourceConfig.getResource(); + if (resource != null) { + resource.setType(type); + parentEditor.fireEditorDirty(true); + } + } + + protected void createParamerTable(Composite parent) { + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + formToolKit.createLabel(parent, "Paramater List : ").setLayoutData(gd); + creator = new ParamaterTableViewerCreator( + parent, formToolKit, SWT.NONE); + creator.addParamaterListener(this); + } + + protected void createInnerContentsGUI(Composite parent) { GridData gd = new GridData(GridData.BEGINNING); gd.verticalAlignment = GridData.BEGINNING; - formToolKit.createLabel(parent, "File Contents").setLayoutData(gd); + // formToolKit.createLabel(parent, "File Contents :").setLayoutData(gd); innerContentText = formToolKit.createText(parent, "", SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL); gd = new GridData(GridData.FILL_HORIZONTAL); gd.heightHint = 200; + gd.horizontalSpan = 2; innerContentText.setLayoutData(gd); + innerContentText.addModifyListener(new ModifyListener() { + + public void modifyText(ModifyEvent e) { + resetCDATA(); + } + + }); } + private void resetCDATA() { + String text = innerContentText.getText(); + if (text == null) + text = ""; + SmooksModelUtils.setCDATAToAnyType(this.resourceConfig.getResource(), + text); + parentEditor.fireEditorDirty(true); + } + protected void resetSelector(String selector) { Command command = SetCommand.create(domain, resourceConfig, SmooksPackage.eINSTANCE.getResourceConfigType_Selector(), @@ -227,8 +345,13 @@ selectorText.setText(selector); ResourceType resource = resourceConfig.getResource(); if (resource != null) { + String type = resource.getType(); + if (type != null) { + typeCombo.setText(type); + } if (isInit) { - + creator.setInput(resourceConfig); + creator.setResourceConfig(resourceConfig); if (SmooksModelUtils.isInnerFileContents(resourceConfig)) { String cdata = resource.getCDATAValue(); if (cdata == null) @@ -281,4 +404,15 @@ return -1; } + public void paramaterAdded(ParamType param) { + parentEditor.fireEditorDirty(true); + } + + public void paramaterChanged(ParamType param) { + parentEditor.fireEditorDirty(true); + } + + public void paramaterRemoved(Collection<ParamType> params) { + parentEditor.fireEditorDirty(true); + } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/MappingGraphCompositeCreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/MappingGraphCompositeCreator.java 2008-12-08 01:37:53 UTC (rev 12465) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/MappingGraphCompositeCreator.java 2008-12-08 09:00:41 UTC (rev 12466) @@ -40,6 +40,7 @@ /** + * @deprecated * @author Dart Peng * @Date Aug 5, 2008 */ Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigDetailPage.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigDetailPage.java 2008-12-08 09:00:41 UTC (rev 12466) @@ -0,0 +1,172 @@ +/** + * + */ +package org.jboss.tools.smooks.ui.editors; + +import java.util.Collection; + +import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Text; +import org.jboss.tools.smooks.model.ParamType; +import org.jboss.tools.smooks.model.ResourceType; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.util.SmooksModelUtils; + +/** + * @author Dart + * + */ +public class NormalResourceConfigDetailPage extends + AbstractSmooksModelDetailPage { + + private boolean init = true; + private ParamaterTableViewerCreator paramTable; + private Text resourceValueText; + private Text resourceTypeText; + private Text selectorText; + + public NormalResourceConfigDetailPage(SmooksFormEditor parentEditor, + EditingDomain domain) { + super(parentEditor, domain); + } + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.ui.editors.AbstractSmooksModelDetailPage# + * createSectionContents(org.eclipse.swt.widgets.Composite) + */ + @Override + protected void createSectionContents(Composite parent) { + GridLayout layout = new GridLayout(); + layout.numColumns = 2; + parent.setLayout(layout); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + formToolKit.createLabel(parent, "Selector : "); + selectorText = formToolKit.createText(parent, ""); + selectorText.setLayoutData(gd); + + formToolKit.createLabel(parent, "Resource Type : "); + resourceTypeText = formToolKit.createText(parent, ""); + resourceTypeText.setLayoutData(gd); + + formToolKit.createLabel(parent, "Resource Value : "); + resourceValueText = formToolKit.createText(parent, ""); + resourceValueText.setLayoutData(gd); + + formToolKit.paintBordersFor(parent); + + paramTable = new ParamaterTableViewerCreator(parent, formToolKit, + SWT.NONE); + paramTable.addParamaterListener(new ParamaterChangeLitener() { + + public void paramaterAdded(ParamType param) { + parentEditor.fireEditorDirty(true); + } + + public void paramaterChanged(ParamType param) { + parentEditor.fireEditorDirty(true); + } + + public void paramaterRemoved(Collection<ParamType> params) { + parentEditor.fireEditorDirty(true); + } + + }); + + hookText(); + } + + protected void hookText() { + selectorText.addModifyListener(new ModifyListener() { + + public void modifyText(ModifyEvent e) { + resourceConfig.setSelector(selectorText.getText()); + parentEditor.fireEditorDirty(true); + } + + }); + + resourceTypeText.addModifyListener(new ModifyListener() { + + public void modifyText(ModifyEvent e) { + ResourceType resource = resourceConfig.getResource(); + if (resource == null) { + resource = SmooksFactory.eINSTANCE.createResourceType(); + resourceConfig.setResource(resource); + } + if (resource != null) { + resource.setType(resourceTypeText.getText()); + parentEditor.fireEditorDirty(true); + } + } + + }); + + resourceValueText.addModifyListener(new ModifyListener() { + + public void modifyText(ModifyEvent e) { + ResourceType resource = resourceConfig.getResource(); + if (resource == null) { + resource = SmooksFactory.eINSTANCE.createResourceType(); + resourceConfig.setResource(resource); + } + if (resource != null) { + SmooksModelUtils.setTextToAnyType(resource, + resourceValueText.getText()); + parentEditor.fireEditorDirty(true); + } + } + + }); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.ui.editors.AbstractSmooksModelDetailPage#initSectionUI + * () + */ + @Override + protected void initSectionUI() { + paramTable.setInput(resourceConfig); + paramTable.setResourceConfig(resourceConfig); + ResourceType resource = resourceConfig.getResource(); + String type = ""; + String value = ""; + if (resource != null) { + type = resource.getType(); + if (type != null) { + type = type.trim(); + + } else { + type = ""; + } + value = SmooksModelUtils.getAnyTypeText(resource); + if (value != null) { + value = value.trim(); + } else { + value = ""; + } + } + resourceTypeText.setText(type); + resourceValueText.setText(value); + String selector = resourceConfig.getSelector(); + if (selector != null) { + selector = selector.trim(); + }else{ + selector = ""; + } + selectorText.setText(selector); + + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigDetailPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigWarpper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigWarpper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigWarpper.java 2008-12-08 09:00:41 UTC (rev 12466) @@ -0,0 +1,25 @@ +/** + * + */ +package org.jboss.tools.smooks.ui.editors; + +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.ui.ResourceConfigWarrper; + +/** + * @author Dart + * + */ +public class NormalResourceConfigWarpper extends ResourceConfigWarrper { + + public NormalResourceConfigWarpper() { + super(); + // TODO Auto-generated constructor stub + } + + public NormalResourceConfigWarpper(ResourceConfigType type) { + super(type); + // TODO Auto-generated constructor stub + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigWarpper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterChangeLitener.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterChangeLitener.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterChangeLitener.java 2008-12-08 09:00:41 UTC (rev 12466) @@ -0,0 +1,20 @@ +/** + * + */ +package org.jboss.tools.smooks.ui.editors; + +import java.util.Collection; + +import org.jboss.tools.smooks.model.ParamType; + +/** + * @author Dart + * + */ +public interface ParamaterChangeLitener { + public void paramaterAdded(ParamType param); + + public void paramaterRemoved(Collection<ParamType> params); + + public void paramaterChanged(ParamType param); +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterChangeLitener.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterTableViewerCreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterTableViewerCreator.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterTableViewerCreator.java 2008-12-08 09:00:41 UTC (rev 12466) @@ -0,0 +1,309 @@ +/** + * + */ +package org.jboss.tools.smooks.ui.editors; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.jface.viewers.CellEditor; +import org.eclipse.jface.viewers.ICellModifier; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.TextCellEditor; +import org.eclipse.jface.viewers.Viewer; +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.Item; +import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.model.ParamType; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.util.SmooksModelUtils; +import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; + +/** + * @author Dart + * + */ +public class ParamaterTableViewerCreator extends Composite { + private TableViewer viewer; + private FormToolkit formToolKit; + + private List<ParamaterChangeLitener> listenerList = new ArrayList<ParamaterChangeLitener>(); + + public static final String PARAM_NAME_PRO = "__param_name_pro"; + + public static final String PARAM_VALUE_PRO = "__param_value_pro"; + + private ResourceConfigType resourceConfig; + + public ResourceConfigType getResourceConfig() { + return resourceConfig; + } + + public void setResourceConfig(ResourceConfigType resourceConfig) { + this.resourceConfig = resourceConfig; + } + + public void setInput(Object input) { + viewer.setInput(input); + } + + public ParamaterTableViewerCreator(Composite parent, + FormToolkit formToolKit, int style) { + super(parent, style); + this.formToolKit = formToolKit; + createParamaterTableViewer(this.formToolKit, parent); + } + + private Button createButtonForParamerTable(Composite parent, String label) { + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + Button button = formToolKit.createButton(parent, label, SWT.NONE); + button.setLayoutData(gd); + return button; + } + + public void addParamaterListener(ParamaterChangeLitener listener) { + this.listenerList.add(listener); + } + + public void removeParamaterListener(ParamaterChangeLitener listener) { + this.listenerList.remove(listener); + } + + protected void createParamaterTableViewer(FormToolkit formToolKit, + Composite parent) { + GridData gd = new GridData(GridData.FILL_BOTH); + gd.horizontalSpan = 2; + this.setLayoutData(gd); + + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + + GridLayout layout = new GridLayout(); + layout.marginWidth = 0; + layout.marginHeight = 0; + layout.numColumns = 2; + this.setLayout(layout); + + Composite tableContainer = formToolKit.createComposite(this); + + FillLayout filllayout = new FillLayout(); + filllayout.marginHeight = 1; + filllayout.marginWidth = 1; + tableContainer.setLayout(filllayout); + viewer = new TableViewer(tableContainer, SWT.NONE | SWT.MULTI); + + TableColumn nameColumn = new TableColumn(viewer.getTable(), SWT.NONE); + nameColumn.setText("Paramer Name"); + nameColumn.setWidth(150); + + TableColumn valueColumn = new TableColumn(viewer.getTable(), SWT.NONE); + valueColumn.setText("Paramer Value"); + valueColumn.setWidth(100); + viewer.getTable().setHeaderVisible(true); + viewer.getTable().setLinesVisible(true); + viewer.setContentProvider(new ParamaterContentProvider()); + viewer.setLabelProvider(new ParamaterLabelProvider()); + viewer.setColumnProperties(new String[] { PARAM_NAME_PRO, + PARAM_VALUE_PRO }); + viewer.setCellEditors(new CellEditor[] { + new TextCellEditor(viewer.getTable()), + new TextCellEditor(viewer.getTable()) }); + viewer.setCellModifier(new ICellModifier() { + + public boolean canModify(Object element, String property) { + if (element instanceof ParamType) { + if (property.equals(PARAM_NAME_PRO) + || property.equals(PARAM_VALUE_PRO)) + return true; + } + return false; + } + + public Object getValue(Object element, String property) { + Object data = element; + if (data instanceof ParamType) { + if (property.equals(PARAM_NAME_PRO)) { + String name = ((ParamType) data).getName(); + if (name == null) + name = ""; + return name; + } + if (property.equals(PARAM_VALUE_PRO)) { + String value = SmooksModelUtils + .getAnyTypeText((ParamType) data); + if (value == null) + value = ""; + return value; + } + } + return null; + } + + public void modify(Object element, String property, Object value) { + if (element instanceof Item) { + Object data = ((Item) element).getData(); + if (data instanceof ParamType) { + if (property.equals(PARAM_NAME_PRO)) { + if (value.equals(((ParamType) data).getName())) + return; + ((ParamType) data).setName((String) value); + viewer.refresh(data); + } + if (property.equals(PARAM_VALUE_PRO)) { + if (value.equals(SmooksModelUtils + .getAnyTypeText((ParamType) data))) + return; + SmooksModelUtils.setTextToAnyType((ParamType) data, + (String) value); + viewer.refresh(data); + } + notifyParamChanged((ParamType) data); + } + } + } + }); + + tableContainer.setBackground(GraphicsConstants.groupBorderColor); + gd = new GridData(GridData.FILL_BOTH); + tableContainer.setLayoutData(gd); + + Composite buttonComposite = formToolKit.createComposite(this); + gd = new GridData(GridData.FILL_VERTICAL); + buttonComposite.setLayoutData(gd); + GridLayout bgl = new GridLayout(); + buttonComposite.setLayout(bgl); + + Button newButton = createButtonForParamerTable(buttonComposite, "New"); + newButton.addSelectionListener(new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + super.widgetSelected(e); + if(resourceConfig == null) return; + ParamType param = SmooksFactory.eINSTANCE.createParamType(); + param.setName("param"); + SmooksModelUtils.setTextToAnyType(param, "value"); + resourceConfig.getParam().add(param); + viewer.refresh(); + notifyParamaterAdded(param); + } + + }); + + Button deleteButton = createButtonForParamerTable(buttonComposite, + "Delete"); + deleteButton.addSelectionListener(new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + super.widgetSelected(e); + IStructuredSelection selection = (IStructuredSelection) viewer + .getSelection(); + try { + if(resourceConfig == null) return; + resourceConfig.getParam().removeAll(selection.toList()); + viewer.refresh(); + notifyParamaterRemoved(selection.toList()); + } catch (Throwable t) { + // ignore; + } + } + + }); + } + + protected void notifyParamChanged(ParamType data) { + for (Iterator iterator = this.listenerList.iterator(); iterator + .hasNext();) { + ParamaterChangeLitener listener = (ParamaterChangeLitener) iterator + .next(); + listener.paramaterChanged(data); + } + } + + public void notifyParamaterRemoved(List params) { + for (Iterator iterator = this.listenerList.iterator(); iterator + .hasNext();) { + ParamaterChangeLitener listener = (ParamaterChangeLitener) iterator + .next(); + listener.paramaterRemoved(params); + } + } + + public void notifyParamaterAdded(ParamType param) { + for (Iterator iterator = this.listenerList.iterator(); iterator + .hasNext();) { + ParamaterChangeLitener listener = (ParamaterChangeLitener) iterator + .next(); + listener.paramaterAdded(param); + } + } + + private class ParamaterLabelProvider extends LabelProvider implements + ITableLabelProvider { + + public Image getColumnImage(Object element, int columnIndex) { + if (element instanceof ParamType) { + if (columnIndex == 0) { + + } + } + return null; + } + + public String getColumnText(Object element, int columnIndex) { + if (element instanceof ParamType) { + if (columnIndex == 0) { + return ((ParamType) element).getName(); + } + if (columnIndex == 1) { + String value = SmooksModelUtils + .getAnyTypeText((ParamType) element); + if (value == null) + value = ""; + value = value.trim(); + return value; + } + } + return ""; + } + + } + + private class ParamaterContentProvider implements + IStructuredContentProvider { + + public Object[] getElements(Object inputElement) { + if (inputElement instanceof ResourceConfigType) { + List<ParamType> paramList = ((ResourceConfigType) inputElement) + .getParam(); + return paramList.toArray(); + } + return new Object[] {}; + } + + public void dispose() { + + } + + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + + } + + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterTableViewerCreator.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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-12-08 01:37:53 UTC (rev 12465) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java 2008-12-08 09:00:41 UTC (rev 12466) @@ -11,8 +11,6 @@ package org.jboss.tools.smooks.ui.editors; import org.jboss.tools.smooks.model.ResourceConfigType; -import org.jboss.tools.smooks.model.ResourceType; -import org.jboss.tools.smooks.model.util.SmooksModelConstants; import org.jboss.tools.smooks.model.util.SmooksModelUtils; import org.jboss.tools.smooks.ui.BeanPopulatorWarrper; import org.jboss.tools.smooks.ui.DateTypeWarrper; @@ -28,10 +26,10 @@ public static ResourceConfigWarrper createResourceConfigWarrper( ResourceConfigType type) { - if (SmooksModelUtils.isBeanPopulatorResource(type)) { - BeanPopulatorWarrper p = new BeanPopulatorWarrper(type); - return p; - } +// if (SmooksModelUtils.isBeanPopulatorResource(type)) { +// BeanPopulatorWarrper p = new BeanPopulatorWarrper(type); +// return p; +// } if(SmooksModelUtils.isDateTypeSelector(type)){ DateTypeWarrper warrper = new DateTypeWarrper(type); return warrper; @@ -40,7 +38,7 @@ DocumentSelectionWarrper warrper = new DocumentSelectionWarrper(type); return warrper; } - return null; + return new NormalResourceConfigWarpper(type); } } 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-12-08 01:37:53 UTC (rev 12465) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-12-08 09:00:41 UTC (rev 12466) @@ -97,7 +97,6 @@ import org.eclipse.ui.forms.editor.FormPage; import org.eclipse.ui.forms.events.HyperlinkEvent; import org.eclipse.ui.forms.events.IHyperlinkListener; -import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Hyperlink; import org.eclipse.ui.forms.widgets.ScrolledForm; 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-12-08 01:37:53 UTC (rev 12465) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-12-08 09:00:41 UTC (rev 12466) @@ -152,11 +152,10 @@ */ @Override protected void registerPages(DetailsPart detailsPart) { - detailsPart.registerPage(BeanPopulatorWarrper.class, - new BeanPopulatorDetailPage(getParentEditor(), getDomain())); + detailsPart.registerPage(NormalResourceConfigWarpper.class, + new NormalResourceConfigDetailPage(getParentEditor(), getDomain())); detailsPart.registerPage(DateTypeWarrper.class, new DateTypeDetailPage( getParentEditor(), getDomain())); - detailsPart.registerPage(DocumentSelectionWarrper.class, new DocumentResourceTypeDetailPage(getParentEditor(), getDomain())); @@ -164,48 +163,7 @@ protected void configDateTypeViewer() { dateTypeViewer.setContentProvider(new DateTypeContentProvider()); - dateTypeViewer.setLabelProvider(new LabelProvider() { - - public String getText(Object element) { - if (element instanceof ResourceConfigType) { - if (NormalSmooksModelBuilder - .isBeanPopulator((ResourceConfigType) element)) { - String selector = ((ResourceConfigType) element) - .getSelector(); - if (selector == null) - selector = Messages.getString("SmooksResourceConfigFormBlock.NULLString"); //$NON-NLS-1$ - return Messages.getString("SmooksResourceConfigFormBlock.BeanPopulator") + selector; //$NON-NLS-1$ - } - if (NormalSmooksModelBuilder - .isDateConfig((ResourceConfigType) element)) { - String name = Messages.getString("SmooksResourceConfigFormBlock.DateType"); //$NON-NLS-1$ - String selector = ((ResourceConfigType) element).getSelector(); - if(selector == null){ - return name; - } - selector = selector.trim(); - if(selector.indexOf(":") != -1){ - selector = selector.substring(selector.indexOf(":") + 1, selector.length()); - } - return name + "(" + selector + ")"; - } - if (SmooksModelUtils - .isFilePathResourceConfig((ResourceConfigType) element)) { - String selector = ((ResourceConfigType) element) - .getSelector(); - if (selector == null) - selector = Messages.getString("SmooksResourceConfigFormBlock.NULLString"); //$NON-NLS-1$ - return Messages.getString("SmooksResourceConfigFormBlock.TemplateFile") + selector; //$NON-NLS-1$ - } - String s = ((ResourceConfigType) element).getSelector(); - if (s == null) - s = Messages.getString("SmooksResourceConfigFormBlock.NULLString"); //$NON-NLS-1$ - return Messages.getString("SmooksResourceConfigFormBlock.UnknownResourceConfig") + s; //$NON-NLS-1$ - } - return super.getText(element); - } - - }); + dateTypeViewer.setLabelProvider(new ConfigurationViewerLabelProvider()); // don't display the first ResourceConfig element;because it will be // "show" with Smooks TransformData Type GUI dateTypeViewer.setFilters(new ViewerFilter[] { new ViewerFilter() { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigFactory.java 2008-12-08 01:37:53 UTC (rev 12465) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigFactory.java 2008-12-08 09:00:41 UTC (rev 12466) @@ -46,18 +46,18 @@ ResourceType resource = SmooksFactory.eINSTANCE .createResourceType(); config.setResource(resource); - resource.setStringValue(SmooksModelConstants.BEAN_POPULATOR); - - ParamType idParmType = SmooksFactory.eINSTANCE.createParamType(); - ParamType classParmType = SmooksFactory.eINSTANCE.createParamType(); - ParamType bindingParmType = SmooksFactory.eINSTANCE - .createParamType(); - idParmType.setName(SmooksModelConstants.BEAN_ID); - classParmType.setName(SmooksModelConstants.BEAN_CLASS); - - config.getParam().add(idParmType); - config.getParam().add(classParmType); - config.getParam().add(bindingParmType); +// resource.setStringValue(SmooksModelConstants.BEAN_POPULATOR); +// +// ParamType idParmType = SmooksFactory.eINSTANCE.createParamType(); +// ParamType classParmType = SmooksFactory.eINSTANCE.createParamType(); +// ParamType bindingParmType = SmooksFactory.eINSTANCE +// .createParamType(); +// idParmType.setName(SmooksModelConstants.BEAN_ID); +// classParmType.setName(SmooksModelConstants.BEAN_CLASS); +// +// config.getParam().add(idParmType); +// config.getParam().add(classParmType); +// config.getParam().add(bindingParmType); return config; } if (SmooksModelConstants.DATE_DECODER.equals(key.getId())) { @@ -100,7 +100,7 @@ public NewResourceConfigKey[] getAllIDs() { NewResourceConfigKey bean = new NewResourceConfigKey(); bean.setId(SmooksModelConstants.BEAN_POPULATOR); - bean.setName("BeanPopulator"); //$NON-NLS-1$ + bean.setName("ResourceConfig Type"); //$NON-NLS-1$ NewResourceConfigKey date = new NewResourceConfigKey(); date.setId(SmooksModelConstants.DATE_DECODER);