Author: DartPeng Date: 2008-08-17 23:33:20 -0400 (Sun, 17 Aug 2008) New Revision: 9758 Added: workspace/dart/plugins/org.jboss.tools.smooks.model/src/org/milyn/xsd/smooks/util/SmooksModelUtils.java workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/DefaultSmooksConfigFileGenerateFactory.java workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/ISmooksConfigurationFileGenerateFactory.java workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractStructuredDdataWizard.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizard.java Removed: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/SmooksModelUtils.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/XSDStructuredDataWizard.java Modified: workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java workspace/dart/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalEditor.java workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/RootModelEditPart.java workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java workspace/dart/plugins/org.jboss.tools.smooks.xml/META-INF/MANIFEST.MF workspace/dart/plugins/org.jboss.tools.smooks.xml/build.properties workspace/dart/plugins/org.jboss.tools.smooks.xml/plugin.xml workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataContentProvider.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizardPage.java Log: remove the Smooks emf model plugin depenth from the Smooks UI; Modified: workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-08-18 01:47:52 UTC (rev 9757) +++ workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -31,7 +31,6 @@ import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; import org.jboss.tools.smooks.ui.gef.model.RootModel; import org.jboss.tools.smooks.ui.gef.model.StructuredDataModel; -import org.jboss.tools.smooks.utils.SmooksModelUtils; import org.milyn.xsd.smooks.ParamType; import org.milyn.xsd.smooks.ResourceConfigType; import org.milyn.xsd.smooks.ResourceType; @@ -39,6 +38,7 @@ import org.milyn.xsd.smooks.SmooksPackage; import org.milyn.xsd.smooks.SmooksResourceListType; import org.milyn.xsd.smooks.provider.SmooksItemProviderAdapterFactory; +import org.milyn.xsd.smooks.util.SmooksModelUtils; /** * @author Dart Peng Modified: workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java 2008-08-18 01:47:52 UTC (rev 9757) +++ workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -19,7 +19,7 @@ import org.eclipse.ui.IEditorPart; import org.jboss.tools.smooks.javabean.ui.JavaBeanModelCreationDialog; import org.jboss.tools.smooks.ui.gef.commandprocessor.ICommandProcessor; -import org.jboss.tools.smooks.utils.SmooksModelUtils; +import org.jboss.tools.smooks.utils.UIUtils; /** * @author Dart Peng @@ -43,7 +43,7 @@ IEditorPart editorPart = domain.getEditorPart(); Shell shell = editorPart.getSite().getShell(); JavaBeanModelCreationDialog dialog = new JavaBeanModelCreationDialog( - shell, SmooksModelUtils + shell, UIUtils .getJavaProjectFromEditorPart(editorPart)); if(dialog.open() == Window.OK){ return dialog.getCheckedJavaBeanModel(); Added: workspace/dart/plugins/org.jboss.tools.smooks.model/src/org/milyn/xsd/smooks/util/SmooksModelUtils.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.model/src/org/milyn/xsd/smooks/util/SmooksModelUtils.java (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.model/src/org/milyn/xsd/smooks/util/SmooksModelUtils.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -0,0 +1,67 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.milyn.xsd.smooks.util; + +import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.ecore.util.ExtendedMetaData; +import org.eclipse.emf.ecore.xml.type.AnyType; +import org.eclipse.emf.ecore.xml.type.XMLTypePackage; +import org.milyn.xsd.smooks.ParamType; +import org.milyn.xsd.smooks.SmooksPackage; + +/** + * @author Dart Peng + * + */ + +public class SmooksModelUtils { + + public static void addBindingTypeToParamType(ParamType param, + String property, String selector, String type, String uri) { + AnyType binding = createBindingType(property, selector, type, uri); + param.getMixed().add( + ExtendedMetaData.INSTANCE.demandFeature(uri, "binding", true), + binding); + } + + public static AnyType createBindingType(String property, String selector, + String type, String uri) { + if (uri == null) { + uri = SmooksPackage.eNS_URI; + } + + AnyType binding = (AnyType) EcoreUtil + .create(XMLTypePackage.Literals.ANY_TYPE); + if (property != null) { + binding.getAnyAttribute().add( + ExtendedMetaData.INSTANCE.demandFeature(null, "property", + false), property); + } + + if (selector != null) { + binding.getAnyAttribute().add( + ExtendedMetaData.INSTANCE.demandFeature(null, "selector", + false), selector); + } + if (type != null) { + binding.getAnyAttribute() + .add( + ExtendedMetaData.INSTANCE.demandFeature(null, + "type", true), false); + } + return binding; + } + + public static void appendTextToSmooksType(AnyType smooksModel, String text) { + smooksModel.getMixed().add( + XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, text); + } +} Property changes on: workspace/dart/plugins/org.jboss.tools.smooks.model/src/org/milyn/xsd/smooks/util/SmooksModelUtils.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-08-18 01:47:52 UTC (rev 9757) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-08-18 03:33:20 UTC (rev 9758) @@ -12,9 +12,6 @@ org.eclipse.ui.ide, org.eclipse.gef, org.junit, - org.jboss.tools.smooks.core;bundle-version="1.0.0", - org.jboss.tools.smooks.model;bundle-version="1.0.0", - org.jboss.tools.smooks.model.edit;bundle-version="1.0.0", org.eclipse.jdt.core, org.eclipse.jdt.ui, org.eclipse.xsd, Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalEditor.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalEditor.java 2008-08-18 01:47:52 UTC (rev 9757) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalEditor.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -44,10 +44,6 @@ import org.jboss.tools.smooks.ui.gef.editparts.SmooksEditPartFactory; import org.jboss.tools.smooks.ui.gef.model.RootModel; import org.jboss.tools.smooks.ui.modelparser.ParseEngine; -import org.milyn.xsd.smooks.DocumentRoot; -import org.milyn.xsd.smooks.SmooksFactory; -import org.milyn.xsd.smooks.SmooksResourceListType; -import org.milyn.xsd.smooks.util.SmooksResourceFactoryImpl; /** * @author Dart Peng @@ -197,48 +193,48 @@ // TODO TEST if(true) return; // JavaBeanAnalyzer analyzer = new JavaBeanAnalyzer(); - SmooksResourceListType resourceList = null; - monitor.worked(1); - try { - monitor.setTaskName("Anylize graph model..."); +// SmooksResourceListType resourceList = null; +// monitor.worked(1); +// try { +// monitor.setTaskName("Anylize graph model..."); // resourceList = analyzer.analyzeGraphicalModel(rootModel); - monitor.worked(1); - } catch (Exception e) { - e.printStackTrace(); - } - DocumentRoot doc = SmooksFactory.eINSTANCE.createDocumentRoot(); - doc.setSmooksResourceList(resourceList); - IFileEditorInput input = (IFileEditorInput) getEditorInput(); - String filePath = ResourcesPlugin.getWorkspace().getRoot() - .getLocation().append(input.getFile().getFullPath()).toString(); - Resource resource = new SmooksResourceFactoryImpl().createResource(URI - .createFileURI(filePath)); - resource.getContents().add(doc); - ByteArrayOutputStream stream = new ByteArrayOutputStream(); - Exception exp = null; - try { - monitor.setTaskName("Creating new content stream..."); - resource.save(stream, Collections.EMPTY_MAP); - input.getFile().setContents( - new ByteArrayInputStream(stream.toByteArray()), true, true, - monitor); - monitor.worked(1); - } catch (IOException e) { - exp = e; - } catch (CoreException e) { - exp = e; - } - if (exp != null) { - String title = "Error"; - if (exp instanceof IOException) { - title = "IO Error"; - } - MessageDialog - .openError(getSite().getShell(), title, exp.toString()); - return; - } - isDirty = false; - firePropertyChange(PROP_DIRTY); +// monitor.worked(1); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// DocumentRoot doc = SmooksFactory.eINSTANCE.createDocumentRoot(); +// doc.setSmooksResourceList(resourceList); +// IFileEditorInput input = (IFileEditorInput) getEditorInput(); +// String filePath = ResourcesPlugin.getWorkspace().getRoot() +// .getLocation().append(input.getFile().getFullPath()).toString(); +// Resource resource = new SmooksResourceFactoryImpl().createResource(URI +// .createFileURI(filePath)); +// resource.getContents().add(doc); +// ByteArrayOutputStream stream = new ByteArrayOutputStream(); +// Exception exp = null; +// try { +// monitor.setTaskName("Creating new content stream..."); +// resource.save(stream, Collections.EMPTY_MAP); +// input.getFile().setContents( +// new ByteArrayInputStream(stream.toByteArray()), true, true, +// monitor); +// monitor.worked(1); +// } catch (IOException e) { +// exp = e; +// } catch (CoreException e) { +// exp = e; +// } +// if (exp != null) { +// String title = "Error"; +// if (exp instanceof IOException) { +// title = "IO Error"; +// } +// MessageDialog +// .openError(getSite().getShell(), title, exp.toString()); +// return; +// } +// isDirty = false; +// firePropertyChange(PROP_DIRTY); } @Override Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-08-18 01:47:52 UTC (rev 9757) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.smooks.ui.editors; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.ConnectionLayer; import org.eclipse.gef.DefaultEditDomain; @@ -29,15 +30,12 @@ import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.events.PaintEvent; import org.eclipse.swt.events.PaintListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.TreeEvent; import org.eclipse.swt.events.TreeListener; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.ScrollBar; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.forms.IManagedForm; @@ -98,7 +96,7 @@ protected void createFormContent(IManagedForm managedForm) { final ScrolledForm form = managedForm.getForm(); FormToolkit toolkit = managedForm.getToolkit(); - + toolkit.decorateFormHeading(form.getForm()); GridLayout gridLayout = UIUtils.createGeneralFormEditorLayout(1); gridLayout.horizontalSpacing = 0; @@ -245,13 +243,11 @@ section1.setLayoutData(sgd1); toolkit.paintBordersFor(rootMainControl); - this.hookGraphicalViewer(); this.initGraphicalViewer(); } protected void initTargetTreeViewer() { - // TODO Auto-generated method stub targetViewer.expandAll(); } @@ -345,11 +341,20 @@ protected GraphicalViewer createGraphicalViewer(Composite parent) { GraphicalViewer viewer = new ScrollingGraphicalViewer(); - parent.setBackground(ColorConstants.red); viewer.createControl(parent); return viewer; } + + + /* (non-Javadoc) + * @see org.eclipse.ui.forms.editor.FormPage#doSave(org.eclipse.core.runtime.IProgressMonitor) + */ + @Override + public void doSave(IProgressMonitor monitor) { + super.doSave(monitor); + } + protected Composite createUISectionContainer(Composite parent, int columns) { Composite container = getManagedForm().getToolkit().createComposite( parent); @@ -378,7 +383,7 @@ this.getGraphicalViewer().setEditPartFactory( new SmooksEditPartFactory()); this.getGraphicalViewer().setContents(rootModel); - + LayerManager manager = (LayerManager) getGraphicalViewer() .getEditPartRegistry().get(LayerManager.ID); ConnectionLayer layer = (ConnectionLayer) manager @@ -451,8 +456,8 @@ if (dialog.open() == Dialog.OK) { IStrucutredDataCreationWizard cw = dialog .getCurrentCreationWizard(); - if (UIUtils.setTheProvidersForTreeViewer(viewer, cw - .getInputDataTypeID())) { + String typeID = cw.getInputDataTypeID(); + if (UIUtils.setTheProvidersForTreeViewer(viewer, typeID)) { viewer.setInput(cw.getTreeViewerInputContents()); // the viewer must be expanded , then the graphics model can // calculate the location correctly @@ -460,9 +465,11 @@ viewer.expandAll(); if (viewer == this.sourceViewer) { this.createSourceGraphModels(); + sourceDataTypeID = typeID; } if (viewer == this.targetViewer) { this.createTargetGraphModels(); + targetDataTypeID = typeID; } } catch (Exception e) { e.printStackTrace(); @@ -479,7 +486,6 @@ private class DataSelectLinkListener implements IHyperlinkListener { TreeViewer viewer = null; - public DataSelectLinkListener(TreeViewer viewer) { this.viewer = viewer; } Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/RootModelEditPart.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/RootModelEditPart.java 2008-08-18 01:47:52 UTC (rev 9757) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/RootModelEditPart.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -3,7 +3,6 @@ import java.beans.PropertyChangeEvent; import java.util.List; -import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.ScalableFreeformLayeredPane; import org.eclipse.gef.EditPolicy; @@ -14,17 +13,7 @@ public class RootModelEditPart extends AbstractStructuredDataEditPart { protected IFigure createFigure() { - IFigure figure = new ScalableFreeformLayeredPane() { - @Override - public void paintClientArea(Graphics graphics) { - // graphics.pushState(); - // graphics.setBackgroundColor(ColorConstants.lightGreen); - // graphics.setForegroundColor(ColorConstants.white); - // graphics.fillGradient(getBounds(), true); - // graphics.popState(); - super.paintClientArea(graphics); - } - }; + IFigure figure = new ScalableFreeformLayeredPane() ; figure.setLayoutManager(new GraphRootFigureLayout()); return figure; } Added: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/DefaultSmooksConfigFileGenerateFactory.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/DefaultSmooksConfigFileGenerateFactory.java (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/DefaultSmooksConfigFileGenerateFactory.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -0,0 +1,37 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.ui.modelparser; + +import java.io.OutputStream; + +import org.eclipse.core.runtime.IProgressMonitor; + +/** + * @author Dart Peng + * @Date Aug 18, 2008 + */ +public class DefaultSmooksConfigFileGenerateFactory implements + ISmooksConfigurationFileGenerateFactory { + + /* + * (non-Javadoc) + * + * @see org.jboss.tools.smooks.ui.modelparser.ISmooksConfigurationFileGenerateFactory#generateFile(org.eclipse.core.runtime.IProgressMonitor, + * org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext) + */ + public OutputStream generateFile(IProgressMonitor monior, + SmooksConfigurationFileGenerateContext context) throws Exception { + // TODO Auto-generated method stub +// context.getDataMappingRootModel(); + return null; + } + +} Property changes on: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/DefaultSmooksConfigFileGenerateFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/ISmooksConfigurationFileGenerateFactory.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/ISmooksConfigurationFileGenerateFactory.java (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/ISmooksConfigurationFileGenerateFactory.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -0,0 +1,31 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.ui.modelparser; + +import java.io.OutputStream; + +import org.eclipse.core.runtime.IProgressMonitor; + +/** + * @author Dart Peng + * @Date Aug 18, 2008 + */ +public interface ISmooksConfigurationFileGenerateFactory { + /** + * Generate the file + * @param monior + * @param context + * @return + * @throws Exception + */ + public OutputStream generateFile(IProgressMonitor monior, + SmooksConfigurationFileGenerateContext context) throws Exception; +} Property changes on: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/ISmooksConfigurationFileGenerateFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -0,0 +1,61 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.ui.modelparser; + +import org.jboss.tools.smooks.ui.gef.model.RootModel; + +/** + * @author Dart Peng + * @Date Aug 18, 2008 + */ +public class SmooksConfigurationFileGenerateContext { + protected String sourceDataTypeID = null; + protected String targetDataTypeID = null; + protected RootModel dataMappingRootModel; + /** + * @return the sourceDataTypeID + */ + public String getSourceDataTypeID() { + return sourceDataTypeID; + } + /** + * @param sourceDataTypeID the sourceDataTypeID to set + */ + public void setSourceDataTypeID(String sourceDataTypeID) { + this.sourceDataTypeID = sourceDataTypeID; + } + /** + * @return the targetDataTypeID + */ + public String getTargetDataTypeID() { + return targetDataTypeID; + } + /** + * @param targetDataTypeID the targetDataTypeID to set + */ + public void setTargetDataTypeID(String targetDataTypeID) { + this.targetDataTypeID = targetDataTypeID; + } + /** + * @return the dataMappingRootModel + */ + public RootModel getDataMappingRootModel() { + return dataMappingRootModel; + } + /** + * @param dataMappingRootModel the dataMappingRootModel to set + */ + public void setDataMappingRootModel(RootModel dataMappingRootModel) { + this.dataMappingRootModel = dataMappingRootModel; + } + + +} Property changes on: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/SmooksModelUtils.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/SmooksModelUtils.java 2008-08-18 01:47:52 UTC (rev 9757) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/SmooksModelUtils.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -1,85 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.utils; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.emf.ecore.util.ExtendedMetaData; -import org.eclipse.emf.ecore.xml.type.AnyType; -import org.eclipse.emf.ecore.xml.type.XMLTypePackage; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IFileEditorInput; -import org.milyn.xsd.smooks.ParamType; -import org.milyn.xsd.smooks.SmooksPackage; - -/** - * @author Dart Peng - * - */ - -public class SmooksModelUtils { - - public static void addBindingTypeToParamType(ParamType param, - String property, String selector, String type, String uri) { - AnyType binding = createBindingType(property, selector, type, uri); - param.getMixed().add( - ExtendedMetaData.INSTANCE.demandFeature(uri, "binding", true), - binding); - } - - public static IJavaProject getJavaProjectFromEditorPart(IEditorPart part) { - IEditorInput input = part.getEditorInput(); - if (input instanceof IFileEditorInput) { - IFile file = ((IFileEditorInput) input).getFile(); - IProject project = file.getProject(); - return JavaCore.create(project); - - } - return null; - } - - public static AnyType createBindingType(String property, String selector, - String type, String uri) { - if (uri == null) { - uri = SmooksPackage.eNS_URI; - } - - AnyType binding = (AnyType) EcoreUtil - .create(XMLTypePackage.Literals.ANY_TYPE); - if (property != null) { - binding.getAnyAttribute().add( - ExtendedMetaData.INSTANCE.demandFeature(null, "property", - false), property); - } - - if (selector != null) { - binding.getAnyAttribute().add( - ExtendedMetaData.INSTANCE.demandFeature(null, "selector", - false), selector); - } - if (type != null) { - binding.getAnyAttribute() - .add( - ExtendedMetaData.INSTANCE.demandFeature(null, - "type", true), false); - } - return binding; - } - - public static void appendTextToSmooksType(AnyType smooksModel, String text) { - smooksModel.getMixed().add( - XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, text); - } -} Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-08-18 01:47:52 UTC (rev 9757) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -1,10 +1,18 @@ package org.jboss.tools.smooks.utils; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jface.viewers.DecoratingLabelProvider; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridLayout; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IFileEditorInput; import org.jboss.tools.smooks.ui.ViewerInitorStore; /** @@ -47,7 +55,18 @@ public static FillLayout createFormCompositeFillLayout() { return createFillLayout(1, 1); } + + public static IJavaProject getJavaProjectFromEditorPart(IEditorPart part) { + IEditorInput input = part.getEditorInput(); + if (input instanceof IFileEditorInput) { + IFile file = ((IFileEditorInput) input).getFile(); + IProject project = file.getProject(); + return JavaCore.create(project); + } + return null; + } + public static GridLayout createGeneralFormEditorLayout(int columns) { GridLayout layout = new GridLayout(); layout.numColumns = columns; @@ -65,7 +84,7 @@ .getTreeCotentProvider(dataTypeID); if (tprovider == null) return false; - viewer.setLabelProvider(lprovider); + viewer.setLabelProvider(new DecoratingLabelProvider(lprovider,null)); viewer.setContentProvider(tprovider); return true; } Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/META-INF/MANIFEST.MF =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/META-INF/MANIFEST.MF 2008-08-18 01:47:52 UTC (rev 9757) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/META-INF/MANIFEST.MF 2008-08-18 03:33:20 UTC (rev 9758) @@ -18,3 +18,5 @@ org.eclipse.xsd.edit, org.eclipse.emf.edit.ui Eclipse-LazyStart: true +Bundle-ClassPath: libs/dom4j-1.6.1.jar, + . Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/build.properties =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/build.properties 2008-08-18 01:47:52 UTC (rev 9757) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/build.properties 2008-08-18 03:33:20 UTC (rev 9758) @@ -2,4 +2,5 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ - plugin.xml + plugin.xml,\ + libs/dom4j-1.6.1.jar Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/plugin.xml =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/plugin.xml 2008-08-18 01:47:52 UTC (rev 9757) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/plugin.xml 2008-08-18 03:33:20 UTC (rev 9758) @@ -10,8 +10,11 @@ name="XSD" typeID="org.jboss.tools.smooks.xml.viewerInitor.xsd"> </viewerInitor> - <viewerInitor - name="XML" + <viewerInitor + contentProvider="org.jboss.tools.smooks.xml.ui.XMLStructuredDataContentProvider" + creationWizard="org.jboss.tools.smooks.xml.ui.XMLStructuredDataWizard" + labelProvider="org.jboss.tools.smooks.xml.ui.XMLStructuredDataLabelProvider" + name="XML" typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> </viewerInitor> </extension> Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-08-18 01:47:52 UTC (rev 9757) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -3,10 +3,6 @@ */ package org.jboss.tools.smooks.xml; -import java.util.Collections; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.CheckboxTableViewer; @@ -26,8 +22,6 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.xsd.XSDSchema; -import org.eclipse.xsd.util.XSDResourceFactoryImpl; import org.jboss.tools.smooks.xsd.model.XSDStructuredModelContentProvider; import org.jboss.tools.smooks.xsd.model.XSDStructuredModelLabelProvider; @@ -169,13 +163,13 @@ workspaceBrowseButton = new Button( browseButtonComposite, SWT.NONE); workspaceBrowseButton.setText("Browse workspace file.."); - gd = new GridData(GridData.FILL_HORIZONTAL); + gd = new GridData(); gd.horizontalAlignment = GridData.END; - gd.grabExcessHorizontalSpace = true; workspaceBrowseButton.setLayoutData(gd); gd = new GridData(); gd.grabExcessHorizontalSpace = true; + gd.horizontalAlignment = GridData.END; fileSystemBrowseButton.setLayoutData(gd); Label nfileLanel = new Label(xsdComposite, SWT.NONE); @@ -187,7 +181,7 @@ GridLayout xsdtgl = new GridLayout(); xsdtgl.marginWidth = 0; xsdtgl.marginHeight = 0; - xsdtgl.numColumns = 1; + xsdtgl.numColumns = 2; fileTextComposite.setLayout(xsdtgl); fileText = new Text(fileTextComposite, SWT.BORDER); Copied: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractStructuredDdataWizard.java (from rev 9757, workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/XSDStructuredDataWizard.java) =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractStructuredDdataWizard.java (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractStructuredDdataWizard.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -0,0 +1,54 @@ +/** + * + */ +package org.jboss.tools.smooks.xml; + +import org.eclipse.jface.wizard.Wizard; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorSite; +import org.jboss.tools.smooks.ui.IStrucutredDataCreationWizard; + +/** + * @author Dart + * + */ +public abstract class AbstractStructuredDdataWizard extends Wizard implements + IStrucutredDataCreationWizard { + AbstractFileSelectionWizardPage page = null; + Object xsdElement = null; + /** + * + */ + public AbstractStructuredDdataWizard() { + // TODO Auto-generated constructor stub + } + + @Override + public void addPages() { + if(page == null){ + page = createAbstractFileSelectionWizardPage(); + } + this.addPage(page); + } + + abstract protected AbstractFileSelectionWizardPage createAbstractFileSelectionWizardPage() ; + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.wizard.Wizard#performFinish() + */ + @Override + public boolean performFinish() { + xsdElement = this.page.getReturnValue(); + return true; + } + public Object getTreeViewerInputContents() { + return xsdElement; + } + + public void init(IEditorSite site, IEditorInput input) { + + } + +} Property changes on: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractStructuredDdataWizard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/XSDStructuredDataWizard.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/XSDStructuredDataWizard.java 2008-08-18 01:47:52 UTC (rev 9757) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/XSDStructuredDataWizard.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -1,58 +0,0 @@ -/** - * - */ -package org.jboss.tools.smooks.xml; - -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorSite; -import org.jboss.tools.smooks.ui.IStrucutredDataCreationWizard; -import org.jboss.tools.smooks.xsd.ui.XSDStructuredDataWizardPage; - -/** - * @author Dart - * - */ -public class XSDStructuredDataWizard extends Wizard implements - IStrucutredDataCreationWizard { - AbstractFileSelectionWizardPage page = null; - Object xsdElement = null; - /** - * - */ - public XSDStructuredDataWizard() { - // TODO Auto-generated constructor stub - } - - @Override - public void addPages() { - if(page == null){ - page = new XSDStructuredDataWizardPage("XSD"); - } - this.addPage(page); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ - @Override - public boolean performFinish() { - xsdElement = this.page.getReturnValue(); - return true; - } - - public String getInputDataTypeID() { - return XmlActivator.TYPE_ID_XSD; - } - - public Object getTreeViewerInputContents() { - return xsdElement; - } - - public void init(IEditorSite site, IEditorInput input) { - - } - -} Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataContentProvider.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataContentProvider.java 2008-08-18 01:47:52 UTC (rev 9757) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataContentProvider.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -84,6 +84,9 @@ if (arg0 instanceof List) { return ((List) arg0).toArray(); } + if(arg0 instanceof DocumentObject){ + return new Object[]{((DocumentObject)arg0).getRootTag()}; + } return new Object[] {}; } Added: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml.ui; + +import org.jboss.tools.smooks.xml.AbstractFileSelectionWizardPage; +import org.jboss.tools.smooks.xml.AbstractStructuredDdataWizard; +import org.jboss.tools.smooks.xml.XmlActivator; + +/** + * @author Dart Peng + * @Date Aug 18, 2008 + */ +public class XMLStructuredDataWizard extends AbstractStructuredDdataWizard{ + + @Override + protected AbstractFileSelectionWizardPage createAbstractFileSelectionWizardPage() { + return new XMLStructuredDataWizardPage("XML"); + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.ui.IStrucutredDataCreationWizard#getInputDataTypeID() + */ + public String getInputDataTypeID() { + return XmlActivator.TYPE_ID_XML; + } + +} Property changes on: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java 2008-08-18 01:47:52 UTC (rev 9757) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -5,10 +5,11 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.jboss.tools.smooks.xml.AbstractFileSelectionWizardPage; +import org.jboss.tools.smooks.xml.model.DocumentObject; +import org.jboss.tools.smooks.xml.model.XMLObjectAnalyzer; /** - * @author Dart Peng - * Date : 2008-8-16 + * @author Dart Peng Date : 2008-8-16 */ public class XMLStructuredDataWizardPage extends AbstractFileSelectionWizardPage { @@ -24,13 +25,17 @@ // TODO Auto-generated constructor stub } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.jboss.tools.smooks.xml.ui.AbstractFileSelectionWizardPage#loadedTheObject(java.lang.String) */ @Override protected Object loadedTheObject(String path) throws Exception { - // TODO Auto-generated method stub - return null; + + XMLObjectAnalyzer analyzer = new XMLObjectAnalyzer(); + DocumentObject doc = analyzer.analyze(path); + + return doc; } - } Added: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizard.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizard.java (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizard.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xsd.ui; + +import org.jboss.tools.smooks.xml.AbstractFileSelectionWizardPage; +import org.jboss.tools.smooks.xml.AbstractStructuredDdataWizard; +import org.jboss.tools.smooks.xml.XmlActivator; + +/** + * @author Dart Peng + * @Date Aug 18, 2008 + */ +public class XSDStructuredDataWizard extends AbstractStructuredDdataWizard { + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.xml.AbstractStructuredDdataWizard#createAbstractFileSelectionWizardPage() + */ + @Override + protected AbstractFileSelectionWizardPage createAbstractFileSelectionWizardPage() { + return new XSDStructuredDataWizardPage("XSD"); + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.ui.IStrucutredDataCreationWizard#getInputDataTypeID() + */ + public String getInputDataTypeID() { + return XmlActivator.TYPE_ID_XSD; + } + +} Property changes on: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizardPage.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizardPage.java 2008-08-18 01:47:52 UTC (rev 9757) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizardPage.java 2008-08-18 03:33:20 UTC (rev 9758) @@ -19,15 +19,16 @@ public class XSDStructuredDataWizardPage extends AbstractFileSelectionWizardPage { - public XSDStructuredDataWizardPage(String pageName, String title, - ImageDescriptor titleImage) { - super(pageName, title, titleImage); - // TODO Auto-generated constructor stub - } +// public XSDStructuredDataWizardPage(String pageName, String title, +// ImageDescriptor titleImage) { +// super(pageName, title, titleImage); +// // TODO Auto-generated constructor stub +// } public XSDStructuredDataWizardPage(String pageName) { super(pageName); - // TODO Auto-generated constructor stub + this.setTitle("XSD File Selection"); + this.setMessage("Select a *.xsd file to loaded "); } protected Object loadedTheObject(String path) throws Exception { Resource resource = new XSDResourceFactoryImpl().createResource(URI