August 2008 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r9761 - in workspace/dart/plugins: org.jboss.tools.smooks.xml/META-INF and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-08-18 03:29:09 -0400 (Mon, 18 Aug 2008) New Revision: 9761 Modified: workspace/dart/plugins/org.jboss.tools.smooks.javabean/META-INF/MANIFEST.MF workspace/dart/plugins/org.jboss.tools.smooks.xml/META-INF/MANIFEST.MF Log: Modified: workspace/dart/plugins/org.jboss.tools.smooks.javabean/META-INF/MANIFEST.MF =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.javabean/META-INF/MANIFEST.MF 2008-08-18 07:25:27 UTC (rev 9760) +++ workspace/dart/plugins/org.jboss.tools.smooks.javabean/META-INF/MANIFEST.MF 2008-08-18 07:29:09 UTC (rev 9761) @@ -14,7 +14,6 @@ org.eclipse.ui.views, org.eclipse.emf, org.eclipse.emf.ecore, - org.jboss.tools.smooks.core, org.jboss.tools.smooks.model, org.jboss.tools.smooks.model.edit, org.eclipse.ui.ide 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 07:25:27 UTC (rev 9760) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/META-INF/MANIFEST.MF 2008-08-18 07:29:09 UTC (rev 9761) @@ -7,7 +7,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.xsd, - org.jboss.tools.smooks.core, org.jboss.tools.smooks.model, org.jboss.tools.smooks.model.edit, org.jboss.tools.smooks.ui,

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9760 - workspace/dart/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-08-18 03:25:27 -0400 (Mon, 18 Aug 2008) New Revision: 9760 Removed: workspace/dart/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/views/ Log:

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9759 - trunk/ws/docs/reference/en/modules.

by jbosstools-commits＠lists.jboss.org

Author: dennyxu Date: 2008-08-18 02:33:15 -0400 (Mon, 18 Aug 2008) New Revision: 9759 Modified: trunk/ws/docs/reference/en/modules/overview.xml Log: remove the String "S" at the end of the file Modified: trunk/ws/docs/reference/en/modules/overview.xml =================================================================== --- trunk/ws/docs/reference/en/modules/overview.xml 2008-08-18 03:33:20 UTC (rev 9758) +++ trunk/ws/docs/reference/en/modules/overview.xml 2008-08-18 06:33:15 UTC (rev 9759) @@ -4,4 +4,4 @@ <para>JBossWS is a web service framework developed as part of the JBoss Application Server. It implements the JAX-WS specification that defines a programming model and run-time architecture for implementing web services in Java, targeted at the Java Platform, Enterprise Edition 5 (Java EE 5)</para> -</chapter>S \ No newline at end of file +</chapter> \ No newline at end of file

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9758 - in workspace/dart/plugins: org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/commandprocessor and 11 other directories.

by jbosstools-commits＠lists.jboss.org

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

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9757 - in workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks: xml/ui and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-08-17 21:47:52 -0400 (Sun, 17 Aug 2008) New Revision: 9757 Added: 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/XSDStructuredDataWizard.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/XMLStructuredDataLabelProvider.java Removed: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizard.java 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/xsd/ui/XSDStructuredDataWizardPage.java Log: Change some java file contents or thire location Copied: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java (from rev 9756, workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java) =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java (rev 0) +++ 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) @@ -0,0 +1,311 @@ +/** + * + */ +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; +import org.eclipse.jface.viewers.ICheckStateListener; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +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.Control; +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; + +/** + * + * @author Dart Peng Date : 2008-8-13 + */ +public abstract class AbstractFileSelectionWizardPage extends WizardPage implements + SelectionListener { + + protected Object returnObject = null; + protected Text fileText; + protected Composite fileTextComposite; + protected CheckboxTableViewer tableViewer = null; + protected Button fileSystemBrowseButton; + protected boolean reasourceLoaded = false; + private Button workspaceBrowseButton; + + public AbstractFileSelectionWizardPage(String pageName, String title, + ImageDescriptor titleImage) { + super(pageName, title, titleImage); + // TODO Auto-generated constructor stub + } + + public AbstractFileSelectionWizardPage(String pageName) { + super(pageName); + // TODO Auto-generated constructor stub + } + + public Object getReturnValue() { + return returnObject; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) + */ + @Override + public void createControl(Composite parent) { + + Composite mainComposite = new Composite(parent, SWT.NONE); + GridLayout layout = new GridLayout(); + layout.numColumns = 1; + mainComposite.setLayout(layout); + + GridData gd = new GridData(GridData.FILL_BOTH); + gd.grabExcessHorizontalSpace = true; + gd.grabExcessVerticalSpace = true; + mainComposite.setLayoutData(gd); + + // xmlButton = new Button(mainComposite, SWT.RADIO); + // xmlButton.setText("Select a XML file"); + // + // Composite xmlComposite = this + // .createXMLFileSelectionComposite(mainComposite); + // + // Label sp = new Label(mainComposite, SWT.HORIZONTAL | SWT.SEPARATOR); + // gd = new GridData(GridData.FILL_HORIZONTAL); + // sp.setLayoutData(gd); + // + // xsdButton = new Button(mainComposite, SWT.RADIO); + // xsdButton.setText("Select a XSD file"); + + Composite xsdComposite = this + .createFileSelectionComposite(mainComposite); + + // init the panel status (XSD file selection composite is disabled) + // xsdButton.setSelection(true); + // + // setCompositeChildrenEnabled(xmlComposite, false); + + // registe the listener for controls + hookBrowseButtonSelectionAdapter(); + hookFileTextModifyListener(); + hookRadioButtonSelectionAdapter(); + this.setControl(mainComposite); + } + + protected void hookFileTextModifyListener() { + final ModifyListener modifyListener = new ModifyListener() { + @Override + public void modifyText(ModifyEvent e) { + changeWizardPageStatus(); + } + }; + // xmlFileText.addModifyListener(modifyListener); + fileText.addModifyListener(modifyListener); + } + + protected void hookRadioButtonSelectionAdapter() { + // xsdButton.addSelectionListener(this); + } + + protected void hookBrowseButtonSelectionAdapter() { + SelectionAdapter browseButtonSelectionAdapter = new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + Text relationT = null; + // if (e.getSource() == xmlFileSystemBrowseButton) { + // relationT = xmlFileText; + // } + if (e.getSource() == fileSystemBrowseButton) { + relationT = fileText; + } + openFileSelection(relationT); + } + }; + // xmlFileSystemBrowseButton + // .addSelectionListener(browseButtonSelectionAdapter); + fileSystemBrowseButton + .addSelectionListener(browseButtonSelectionAdapter); + } + + protected Composite createFileSelectionComposite(Composite parent) { + Composite xsdComposite = new Composite(parent, SWT.NONE); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + xsdComposite.setLayoutData(gd); + GridLayout xsdLayout = new GridLayout(); + xsdLayout.numColumns = 2; + xsdLayout.marginWidth = 0; + xsdComposite.setLayout(xsdLayout); + + Composite browseButtonComposite = new Composite(xsdComposite, SWT.NONE); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + browseButtonComposite.setLayoutData(gd); + + GridLayout bg = new GridLayout(); + bg.numColumns = 2; + bg.marginHeight = 0; + bg.marginWidth = 0; + bg.makeColumnsEqualWidth = false; + browseButtonComposite.setLayout(bg); + + fileSystemBrowseButton = new Button(browseButtonComposite, SWT.NONE); + fileSystemBrowseButton.setText("Browse File System..."); + + workspaceBrowseButton = new Button( + browseButtonComposite, SWT.NONE); + workspaceBrowseButton.setText("Browse workspace file.."); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalAlignment = GridData.END; + gd.grabExcessHorizontalSpace = true; + workspaceBrowseButton.setLayoutData(gd); + + gd = new GridData(); + gd.grabExcessHorizontalSpace = true; + fileSystemBrowseButton.setLayoutData(gd); + + Label nfileLanel = new Label(xsdComposite, SWT.NONE); + nfileLanel.setText("XSD File Path :"); + fileTextComposite = new Composite(xsdComposite, SWT.NONE); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.grabExcessHorizontalSpace = true; + fileTextComposite.setLayoutData(gd); + GridLayout xsdtgl = new GridLayout(); + xsdtgl.marginWidth = 0; + xsdtgl.marginHeight = 0; + xsdtgl.numColumns = 1; + fileTextComposite.setLayout(xsdtgl); + + fileText = new Text(fileTextComposite, SWT.BORDER); + gd = new GridData(GridData.FILL_HORIZONTAL); + fileText.setLayoutData(gd); + gd.grabExcessHorizontalSpace = true; + + final Button loadXSDButton = new Button(fileTextComposite, SWT.NONE); + loadXSDButton.setText("Load"); + loadXSDButton.addSelectionListener(new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + super.widgetSelected(e); + reasourceLoaded = false; + try { + returnObject = loadedTheObject(fileText.getText()); + reasourceLoaded = true; + } catch (Throwable e2) { + // ignore + e2.printStackTrace(); + } + changeWizardPageStatus(); + } + + }); + + // tableViewer = CheckboxTableViewer.newCheckList(xsdComposite, + // SWT.FULL_SELECTION | SWT.BORDER); + // gd = new GridData(GridData.FILL_BOTH); + // gd.heightHint = 200; + // gd.horizontalSpan = 2; + // tableViewer.getControl().setLayoutData(gd); + // + // initTableViewer(); + + return xsdComposite; + } + + abstract protected Object loadedTheObject(String path) throws Exception; + + protected void initTableViewer() { + tableViewer.addCheckStateListener(new ICheckStateListener() { + boolean flag = true; + + @Override + public void checkStateChanged(CheckStateChangedEvent event) { + if (flag) { + Object checkObject = event.getElement(); + boolean check = event.getChecked(); + flag = false; + tableViewer.setAllChecked(false); + tableViewer.setChecked(checkObject, check); + flag = true; + changeWizardPageStatus(); + } + } + }); + tableViewer.setContentProvider(new XSDStructuredModelContentProvider()); + tableViewer.setLabelProvider(new XSDStructuredModelLabelProvider()); + } + + protected void setCompositeChildrenEnabled(Composite composite, + boolean enabled) { + Control[] children = composite.getChildren(); + for (int i = 0; i < children.length; i++) { + Control child = children[i]; + if (child instanceof Text) { + child.setEnabled(enabled); + } + if (child instanceof Button) { + child.setEnabled(enabled); + } + if (child instanceof Composite) { + setCompositeChildrenEnabled((Composite) child, enabled); + } + } + } + + protected void openFileSelection(Text relationText) { + FileDialog dialog = new FileDialog(this.getShell()); + String path = dialog.open(); + if (path != null) { + relationText.setText(path); + } else { + relationText.setText(""); + } + } + + protected void changeWizardPageStatus() { + String text = this.fileText.getText(); + String error = null; + if (text == null || "".equals(text)) + error = "Please Select a file"; + if (!reasourceLoaded) { + error = "Resource must be loaded"; + } + this.setErrorMessage(error); + this.setPageComplete(error == null); + + } + + @Override + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + + @Override + public void widgetSelected(SelectionEvent e) { + changeWizardPageStatus(); + } + + public CheckboxTableViewer getTableViewer() { + return tableViewer; + } + + public void setTableViewer(CheckboxTableViewer tableViewer) { + this.tableViewer = tableViewer; + } + +} Property changes on: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/XSDStructuredDataWizard.java (from rev 9756, 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/xml/XSDStructuredDataWizard.java (rev 0) +++ 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) @@ -0,0 +1,58 @@ +/** + * + */ +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) { + + } + +} Property changes on: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/XSDStructuredDataWizard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java 2008-08-16 09:01:37 UTC (rev 9756) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java 2008-08-18 01:47:52 UTC (rev 9757) @@ -1,311 +0,0 @@ -/** - * - */ -package org.jboss.tools.smooks.xml.ui; - -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; -import org.eclipse.jface.viewers.ICheckStateListener; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -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.Control; -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; - -/** - * - * @author Dart Peng Date : 2008-8-13 - */ -public abstract class AbstractFileSelectionWizardPage extends WizardPage implements - SelectionListener { - - protected Object returnObject = null; - protected Text fileText; - protected Composite fileTextComposite; - protected CheckboxTableViewer tableViewer = null; - protected Button fileSystemBrowseButton; - protected boolean reasourceLoaded = false; - private Button workspaceBrowseButton; - - public AbstractFileSelectionWizardPage(String pageName, String title, - ImageDescriptor titleImage) { - super(pageName, title, titleImage); - // TODO Auto-generated constructor stub - } - - public AbstractFileSelectionWizardPage(String pageName) { - super(pageName); - // TODO Auto-generated constructor stub - } - - public Object getReturnValue() { - return returnObject; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - @Override - public void createControl(Composite parent) { - - Composite mainComposite = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 1; - mainComposite.setLayout(layout); - - GridData gd = new GridData(GridData.FILL_BOTH); - gd.grabExcessHorizontalSpace = true; - gd.grabExcessVerticalSpace = true; - mainComposite.setLayoutData(gd); - - // xmlButton = new Button(mainComposite, SWT.RADIO); - // xmlButton.setText("Select a XML file"); - // - // Composite xmlComposite = this - // .createXMLFileSelectionComposite(mainComposite); - // - // Label sp = new Label(mainComposite, SWT.HORIZONTAL | SWT.SEPARATOR); - // gd = new GridData(GridData.FILL_HORIZONTAL); - // sp.setLayoutData(gd); - // - // xsdButton = new Button(mainComposite, SWT.RADIO); - // xsdButton.setText("Select a XSD file"); - - Composite xsdComposite = this - .createFileSelectionComposite(mainComposite); - - // init the panel status (XSD file selection composite is disabled) - // xsdButton.setSelection(true); - // - // setCompositeChildrenEnabled(xmlComposite, false); - - // registe the listener for controls - hookBrowseButtonSelectionAdapter(); - hookFileTextModifyListener(); - hookRadioButtonSelectionAdapter(); - this.setControl(mainComposite); - } - - protected void hookFileTextModifyListener() { - final ModifyListener modifyListener = new ModifyListener() { - @Override - public void modifyText(ModifyEvent e) { - changeWizardPageStatus(); - } - }; - // xmlFileText.addModifyListener(modifyListener); - fileText.addModifyListener(modifyListener); - } - - protected void hookRadioButtonSelectionAdapter() { - // xsdButton.addSelectionListener(this); - } - - protected void hookBrowseButtonSelectionAdapter() { - SelectionAdapter browseButtonSelectionAdapter = new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - Text relationT = null; - // if (e.getSource() == xmlFileSystemBrowseButton) { - // relationT = xmlFileText; - // } - if (e.getSource() == fileSystemBrowseButton) { - relationT = fileText; - } - openFileSelection(relationT); - } - }; - // xmlFileSystemBrowseButton - // .addSelectionListener(browseButtonSelectionAdapter); - fileSystemBrowseButton - .addSelectionListener(browseButtonSelectionAdapter); - } - - protected Composite createFileSelectionComposite(Composite parent) { - Composite xsdComposite = new Composite(parent, SWT.NONE); - GridData gd = new GridData(GridData.FILL_HORIZONTAL); - xsdComposite.setLayoutData(gd); - GridLayout xsdLayout = new GridLayout(); - xsdLayout.numColumns = 2; - xsdLayout.marginWidth = 0; - xsdComposite.setLayout(xsdLayout); - - Composite browseButtonComposite = new Composite(xsdComposite, SWT.NONE); - gd = new GridData(GridData.FILL_HORIZONTAL); - gd.horizontalSpan = 2; - browseButtonComposite.setLayoutData(gd); - - GridLayout bg = new GridLayout(); - bg.numColumns = 2; - bg.marginHeight = 0; - bg.marginWidth = 0; - bg.makeColumnsEqualWidth = false; - browseButtonComposite.setLayout(bg); - - fileSystemBrowseButton = new Button(browseButtonComposite, SWT.NONE); - fileSystemBrowseButton.setText("Browse File System..."); - - workspaceBrowseButton = new Button( - browseButtonComposite, SWT.NONE); - workspaceBrowseButton.setText("Browse workspace file.."); - gd = new GridData(GridData.FILL_HORIZONTAL); - gd.horizontalAlignment = GridData.END; - gd.grabExcessHorizontalSpace = true; - workspaceBrowseButton.setLayoutData(gd); - - gd = new GridData(); - gd.grabExcessHorizontalSpace = true; - fileSystemBrowseButton.setLayoutData(gd); - - Label nfileLanel = new Label(xsdComposite, SWT.NONE); - nfileLanel.setText("XSD File Path :"); - fileTextComposite = new Composite(xsdComposite, SWT.NONE); - gd = new GridData(GridData.FILL_HORIZONTAL); - gd.grabExcessHorizontalSpace = true; - fileTextComposite.setLayoutData(gd); - GridLayout xsdtgl = new GridLayout(); - xsdtgl.marginWidth = 0; - xsdtgl.marginHeight = 0; - xsdtgl.numColumns = 1; - fileTextComposite.setLayout(xsdtgl); - - fileText = new Text(fileTextComposite, SWT.BORDER); - gd = new GridData(GridData.FILL_HORIZONTAL); - fileText.setLayoutData(gd); - gd.grabExcessHorizontalSpace = true; - - final Button loadXSDButton = new Button(fileTextComposite, SWT.NONE); - loadXSDButton.setText("Load"); - loadXSDButton.addSelectionListener(new SelectionAdapter() { - - @Override - public void widgetSelected(SelectionEvent e) { - super.widgetSelected(e); - reasourceLoaded = false; - try { - returnObject = loadedTheObject(fileText.getText()); - reasourceLoaded = true; - } catch (Throwable e2) { - // ignore - e2.printStackTrace(); - } - changeWizardPageStatus(); - } - - }); - - // tableViewer = CheckboxTableViewer.newCheckList(xsdComposite, - // SWT.FULL_SELECTION | SWT.BORDER); - // gd = new GridData(GridData.FILL_BOTH); - // gd.heightHint = 200; - // gd.horizontalSpan = 2; - // tableViewer.getControl().setLayoutData(gd); - // - // initTableViewer(); - - return xsdComposite; - } - - abstract protected Object loadedTheObject(String path) throws Exception; - - protected void initTableViewer() { - tableViewer.addCheckStateListener(new ICheckStateListener() { - boolean flag = true; - - @Override - public void checkStateChanged(CheckStateChangedEvent event) { - if (flag) { - Object checkObject = event.getElement(); - boolean check = event.getChecked(); - flag = false; - tableViewer.setAllChecked(false); - tableViewer.setChecked(checkObject, check); - flag = true; - changeWizardPageStatus(); - } - } - }); - tableViewer.setContentProvider(new XSDStructuredModelContentProvider()); - tableViewer.setLabelProvider(new XSDStructuredModelLabelProvider()); - } - - protected void setCompositeChildrenEnabled(Composite composite, - boolean enabled) { - Control[] children = composite.getChildren(); - for (int i = 0; i < children.length; i++) { - Control child = children[i]; - if (child instanceof Text) { - child.setEnabled(enabled); - } - if (child instanceof Button) { - child.setEnabled(enabled); - } - if (child instanceof Composite) { - setCompositeChildrenEnabled((Composite) child, enabled); - } - } - } - - protected void openFileSelection(Text relationText) { - FileDialog dialog = new FileDialog(this.getShell()); - String path = dialog.open(); - if (path != null) { - relationText.setText(path); - } else { - relationText.setText(""); - } - } - - protected void changeWizardPageStatus() { - String text = this.fileText.getText(); - String error = null; - if (text == null || "".equals(text)) - error = "Please Select a file"; - if (!reasourceLoaded) { - error = "Resource must be loaded"; - } - this.setErrorMessage(error); - this.setPageComplete(error == null); - - } - - @Override - public void widgetDefaultSelected(SelectionEvent e) { - widgetSelected(e); - } - - @Override - public void widgetSelected(SelectionEvent e) { - changeWizardPageStatus(); - } - - public CheckboxTableViewer getTableViewer() { - return tableViewer; - } - - public void setTableViewer(CheckboxTableViewer tableViewer) { - this.tableViewer = tableViewer; - } - -} Added: 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 (rev 0) +++ 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) @@ -0,0 +1,110 @@ +/******************************************************************************* + * 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 java.util.ArrayList; +import java.util.List; + +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.Viewer; +import org.jboss.tools.smooks.xml.model.DocumentObject; +import org.jboss.tools.smooks.xml.model.TagObject; + +/** + * @author Dart Peng + * @Date Aug 18, 2008 + */ +public class XMLStructuredDataContentProvider implements ITreeContentProvider { + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) + */ + public Object[] getChildren(Object obj) { + // for AbstractXMLObject (come from xml file fragment) + if(obj instanceof DocumentObject){ + return new Object[]{((DocumentObject)obj).getRootTag()}; + } + + if(obj instanceof TagObject){ + List c = new ArrayList(); + List pros = ((TagObject)obj).getProperties(); + c.addAll(pros); + c.addAll(((TagObject)obj).getChildren()); + + return c.toArray(); + } + return new Object[] {}; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object ) + */ + public Object getParent(Object arg0) { + // if(arg0 instanceof) + return null; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang. + * Object) + */ + public boolean hasChildren(Object obj) { + + // for AbstractXMLObject (come from xml file fragment) + if(obj instanceof DocumentObject){ + return true; + } + if(obj instanceof TagObject){ + List pros = ((TagObject)obj).getProperties(); + List c = (((TagObject)obj).getChildren()); + return !pros.isEmpty() || !c.isEmpty(); + } + return false; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java + * .lang.Object) + */ + public Object[] getElements(Object arg0) { + if (arg0 instanceof List) { + return ((List) arg0).toArray(); + } + return new Object[] {}; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.viewers.IContentProvider#dispose() + */ + public void dispose() { + + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface + * .viewers.Viewer, java.lang.Object, java.lang.Object) + */ + public void inputChanged(Viewer arg0, Object arg1, Object arg2) { + + } + + +} Property changes on: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataContentProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataLabelProvider.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataLabelProvider.java (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataLabelProvider.java 2008-08-18 01:47:52 UTC (rev 9757) @@ -0,0 +1,46 @@ +/******************************************************************************* + * 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.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; +import org.jboss.tools.smooks.xml.model.DocumentObject; + +/** + * @author Dart Peng + * @Date Aug 18, 2008 + */ +public class XMLStructuredDataLabelProvider extends LabelProvider { + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object) + */ + @Override + public Image getImage(Object element) { + return super.getImage(element); + } + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) + */ + @Override + public String getText(Object element) { + if(element instanceof DocumentObject){ + return "Root"; + } + if(element instanceof AbstractXMLObject){ + return ((AbstractXMLObject)element).getName(); + } + return super.getText(element); + } + +} Property changes on: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataLabelProvider.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-16 09:01:37 UTC (rev 9756) +++ 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) @@ -4,6 +4,7 @@ package org.jboss.tools.smooks.xml.ui; import org.eclipse.jface.resource.ImageDescriptor; +import org.jboss.tools.smooks.xml.AbstractFileSelectionWizardPage; /** * @author Dart Peng Deleted: 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 2008-08-16 09:01:37 UTC (rev 9756) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizard.java 2008-08-18 01:47:52 UTC (rev 9757) @@ -1,59 +0,0 @@ -/** - * - */ -package org.jboss.tools.smooks.xsd.ui; - -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.xml.XmlActivator; -import org.jboss.tools.smooks.xml.ui.AbstractFileSelectionWizardPage; - -/** - * @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/xsd/ui/XSDStructuredDataWizardPage.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizardPage.java 2008-08-16 09:01:37 UTC (rev 9756) +++ 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) @@ -10,7 +10,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.xsd.XSDSchema; import org.eclipse.xsd.util.XSDResourceFactoryImpl; -import org.jboss.tools.smooks.xml.ui.AbstractFileSelectionWizardPage; +import org.jboss.tools.smooks.xml.AbstractFileSelectionWizardPage; /** * @author Dart Peng

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9756 - workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-08-16 05:01:37 -0400 (Sat, 16 Aug 2008) New Revision: 9756 Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/TransformDataWizardSelectionPage.java Log: some change Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/TransformDataWizardSelectionPage.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/TransformDataWizardSelectionPage.java 2008-08-16 08:59:45 UTC (rev 9755) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/TransformDataWizardSelectionPage.java 2008-08-16 09:01:37 UTC (rev 9756) @@ -32,8 +32,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorSite; import org.jboss.tools.smooks.ui.IStrucutredDataCreationWizard; import org.jboss.tools.smooks.ui.IViewerInitor; import org.jboss.tools.smooks.ui.ViewerInitorStore; @@ -72,7 +70,8 @@ IWizardNode node = (IWizardNode) selection.getFirstElement(); if (node != null) { setSelectedNode(node); - IStrucutredDataCreationWizard wizard = (IStrucutredDataCreationWizard)node.getWizard(); + IStrucutredDataCreationWizard wizard = (IStrucutredDataCreationWizard) node + .getWizard(); TransformDataSelectionWizard pw = (TransformDataSelectionWizard) getWizard(); wizard.init(pw.getSite(), pw.getInput()); } @@ -123,7 +122,11 @@ for (Iterator iterator = viewers.iterator(); iterator.hasNext();) { IViewerInitor viewerInitor = (IViewerInitor) iterator.next(); TransformSelectWizardNode wn = new TransformSelectWizardNode(); - wn.setWizard(viewerInitor.getStructuredDataLoadWizard()); + IStrucutredDataCreationWizard wizard = viewerInitor + .getStructuredDataLoadWizard(); + if (wizard == null) + continue; + wn.setWizard(wizard); wn.setName(viewerInitor.getName()); wn.setIconPath(viewerInitor.getWizardIconPath()); this.registedWizard.add(wn); @@ -150,7 +153,7 @@ if (path != null) { Image icon = (Image) map.get(path); if (icon == null) { - + } } }

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9755 - in workspace/dart/plugins/org.jboss.tools.smooks.xml: src/org/jboss/tools/smooks and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-08-16 04:59:45 -0400 (Sat, 16 Aug 2008) New Revision: 9755 Added: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/model/ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelContentProvider.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelLabelProvider.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/ 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/XSDStructuredDataWizardPage.java Removed: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelContentProvider.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelLabelProvider.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizard.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizardPage.java Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/plugin.xml workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/XmlActivator.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src_test/org/jboss/tools/smooks/xml2java/model/ModelTest.java Log: Modify some java file name and the location; Change plugin.xml file for modifying the extension point define Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/plugin.xml =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/plugin.xml 2008-08-16 08:57:48 UTC (rev 9754) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/plugin.xml 2008-08-16 08:59:45 UTC (rev 9755) @@ -4,9 +4,9 @@ <extension point="org.jboss.tools.smooks.ui.viewerInitor"> <viewerInitor - contentProvider="org.jboss.tools.smooks.xml.model.XSDStructuredModelContentProvider" - creationWizard="org.jboss.tools.smooks.xml.ui.XSDStructuredDataWizard" - labelProvider="org.jboss.tools.smooks.xml.model.XSDStructuredModelLabelProvider" + contentProvider="org.jboss.tools.smooks.xsd.model.XSDStructuredModelContentProvider" + creationWizard="org.jboss.tools.smooks.xsd.ui.XSDStructuredDataWizard" + labelProvider="org.jboss.tools.smooks.xsd.model.XSDStructuredModelLabelProvider" name="XSD" typeID="org.jboss.tools.smooks.xml.viewerInitor.xsd"> </viewerInitor> Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/XmlActivator.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/XmlActivator.java 2008-08-16 08:57:48 UTC (rev 9754) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/XmlActivator.java 2008-08-16 08:59:45 UTC (rev 9755) @@ -11,7 +11,9 @@ // The plug-in ID public static final String PLUGIN_ID = "org.jboss.tools.smooks.xml"; - public static final String TYPE_ID = "org.jboss.tools.smooks.xml.viewerInitor.xml"; + public static final String TYPE_ID_XSD = "org.jboss.tools.smooks.xml.viewerInitor.xsd"; + + public static final String TYPE_ID_XML = "org.jboss.tools.smooks.xml.viewerInitor.xml"; // The shared instance private static XmlActivator plugin; Deleted: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelContentProvider.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelContentProvider.java 2008-08-16 08:57:48 UTC (rev 9754) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelContentProvider.java 2008-08-16 08:59:45 UTC (rev 9755) @@ -1,26 +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.xml.model; - -import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; -import org.eclipse.xsd.provider.XSDItemProviderAdapterFactory; - - -/** - * @author Dart Peng - * - * @CreateTime Jul 24, 2008 - */ -public class XSDStructuredModelContentProvider extends AdapterFactoryContentProvider { - public XSDStructuredModelContentProvider() { - super(new XSDItemProviderAdapterFactory()); - } -} Deleted: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelLabelProvider.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelLabelProvider.java 2008-08-16 08:57:48 UTC (rev 9754) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelLabelProvider.java 2008-08-16 08:59:45 UTC (rev 9755) @@ -1,26 +0,0 @@ -/******************************************************************************* - * 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.model; - -import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; -import org.eclipse.xsd.provider.XSDItemProviderAdapterFactory; - -/** - * @author Dart Peng - * @Date Jul 30, 2008 - */ -public class XSDStructuredModelLabelProvider extends AdapterFactoryLabelProvider { - - public XSDStructuredModelLabelProvider() { - super(new XSDItemProviderAdapterFactory()); - } - -} Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java 2008-08-16 08:57:48 UTC (rev 9754) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java 2008-08-16 08:59:45 UTC (rev 9755) @@ -28,8 +28,8 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.xsd.XSDSchema; import org.eclipse.xsd.util.XSDResourceFactoryImpl; -import org.jboss.tools.smooks.xml.model.XSDStructuredModelContentProvider; -import org.jboss.tools.smooks.xml.model.XSDStructuredModelLabelProvider; +import org.jboss.tools.smooks.xsd.model.XSDStructuredModelContentProvider; +import org.jboss.tools.smooks.xsd.model.XSDStructuredModelLabelProvider; /** * Deleted: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizard.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizard.java 2008-08-16 08:57:48 UTC (rev 9754) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizard.java 2008-08-16 08:59:45 UTC (rev 9755) @@ -1,58 +0,0 @@ -/** - * - */ -package org.jboss.tools.smooks.xml.ui; - -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.xml.XmlActivator; - -/** - * @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) { - - } - -} Deleted: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizardPage.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizardPage.java 2008-08-16 08:57:48 UTC (rev 9754) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizardPage.java 2008-08-16 08:59:45 UTC (rev 9755) @@ -1,38 +0,0 @@ -/** - * - */ -package org.jboss.tools.smooks.xml.ui; - -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.xsd.XSDSchema; -import org.eclipse.xsd.util.XSDResourceFactoryImpl; - -/** - * @author Dart Peng - * Date : 2008-8-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) { - super(pageName); - // TODO Auto-generated constructor stub - } - protected Object loadedTheObject(String path) throws Exception { - Resource resource = new XSDResourceFactoryImpl().createResource(URI - .createFileURI(path)); - resource.load(Collections.EMPTY_MAP); - XSDSchema schema = (XSDSchema) resource.getContents().get(0); - return schema; - } -} Copied: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelContentProvider.java (from rev 9753, workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelContentProvider.java) =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelContentProvider.java (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelContentProvider.java 2008-08-16 08:59:45 UTC (rev 9755) @@ -0,0 +1,26 @@ +/******************************************************************************* + * 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.xsd.model; + +import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; +import org.eclipse.xsd.provider.XSDItemProviderAdapterFactory; + + +/** + * @author Dart Peng + * + * @CreateTime Jul 24, 2008 + */ +public class XSDStructuredModelContentProvider extends AdapterFactoryContentProvider { + public XSDStructuredModelContentProvider() { + super(new XSDItemProviderAdapterFactory()); + } +} Copied: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelLabelProvider.java (from rev 9753, workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelLabelProvider.java) =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelLabelProvider.java (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelLabelProvider.java 2008-08-16 08:59:45 UTC (rev 9755) @@ -0,0 +1,26 @@ +/******************************************************************************* + * 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.model; + +import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; +import org.eclipse.xsd.provider.XSDItemProviderAdapterFactory; + +/** + * @author Dart Peng + * @Date Jul 30, 2008 + */ +public class XSDStructuredModelLabelProvider extends AdapterFactoryLabelProvider { + + public XSDStructuredModelLabelProvider() { + super(new XSDItemProviderAdapterFactory()); + } + +} Copied: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizard.java (from rev 9754, workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/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-16 08:59:45 UTC (rev 9755) @@ -0,0 +1,59 @@ +/** + * + */ +package org.jboss.tools.smooks.xsd.ui; + +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.xml.XmlActivator; +import org.jboss.tools.smooks.xml.ui.AbstractFileSelectionWizardPage; + +/** + * @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) { + + } + +} Copied: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizardPage.java (from rev 9753, workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizardPage.java) =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizardPage.java (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizardPage.java 2008-08-16 08:59:45 UTC (rev 9755) @@ -0,0 +1,39 @@ +/** + * + */ +package org.jboss.tools.smooks.xsd.ui; + +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.xsd.XSDSchema; +import org.eclipse.xsd.util.XSDResourceFactoryImpl; +import org.jboss.tools.smooks.xml.ui.AbstractFileSelectionWizardPage; + +/** + * @author Dart Peng + * Date : 2008-8-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) { + super(pageName); + // TODO Auto-generated constructor stub + } + protected Object loadedTheObject(String path) throws Exception { + Resource resource = new XSDResourceFactoryImpl().createResource(URI + .createFileURI(path)); + resource.load(Collections.EMPTY_MAP); + XSDSchema schema = (XSDSchema) resource.getContents().get(0); + return schema; + } +} Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/src_test/org/jboss/tools/smooks/xml2java/model/ModelTest.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src_test/org/jboss/tools/smooks/xml2java/model/ModelTest.java 2008-08-16 08:57:48 UTC (rev 9754) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src_test/org/jboss/tools/smooks/xml2java/model/ModelTest.java 2008-08-16 08:59:45 UTC (rev 9755) @@ -16,8 +16,8 @@ import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; import org.jboss.tools.smooks.ui.modelparser.ParseEngine; import org.jboss.tools.smooks.xml.model.XMLObjectAnalyzer; -import org.jboss.tools.smooks.xml.model.XSDStructuredModelContentProvider; import org.jboss.tools.smooks.xml.model.XMLStrucutredModelParser; +import org.jboss.tools.smooks.xsd.model.XSDStructuredModelContentProvider; public class ModelTest extends TestCase { public void testModelTrasform() throws IOException{

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9754 - workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-08-16 04:57:48 -0400 (Sat, 16 Aug 2008) New Revision: 9754 Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizard.java Log: modify some code for the bug : the typeid is not correct Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizard.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizard.java 2008-08-16 08:44:46 UTC (rev 9753) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizard.java 2008-08-16 08:57:48 UTC (rev 9754) @@ -44,7 +44,7 @@ } public String getInputDataTypeID() { - return XmlActivator.TYPE_ID; + return XmlActivator.TYPE_ID_XSD; } public Object getTreeViewerInputContents() {

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9753 - in workspace/dart/plugins/org.jboss.tools.smooks.xml: src/org/jboss/tools/smooks/xml/model and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-08-16 04:44:46 -0400 (Sat, 16 Aug 2008) New Revision: 9753 Added: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelContentProvider.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelLabelProvider.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/xml/ui/XSDStructuredDataWizard.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizardPage.java Removed: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XMLStructuredModelContentProvider.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XMLStructuredModelLabelProvider.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/plugin.xml workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java workspace/dart/plugins/org.jboss.tools.smooks.xml/src_test/org/jboss/tools/smooks/xml2java/model/ModelTest.java Log: Modify some java file name and the location; Change plugin.xml file for modifying the extension point define Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/plugin.xml =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/plugin.xml 2008-08-16 08:37:20 UTC (rev 9752) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/plugin.xml 2008-08-16 08:44:46 UTC (rev 9753) @@ -4,10 +4,14 @@ <extension point="org.jboss.tools.smooks.ui.viewerInitor"> <viewerInitor - contentProvider="org.jboss.tools.smooks.xml.model.XMLStructuredModelContentProvider" - creationWizard="org.jboss.tools.smooks.xml.ui.XMLStructuredDataWizard" - labelProvider="org.jboss.tools.smooks.xml.model.XMLStructuredModelLabelProvider" - name="XML/XSD" + contentProvider="org.jboss.tools.smooks.xml.model.XSDStructuredModelContentProvider" + creationWizard="org.jboss.tools.smooks.xml.ui.XSDStructuredDataWizard" + labelProvider="org.jboss.tools.smooks.xml.model.XSDStructuredModelLabelProvider" + name="XSD" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xsd"> + </viewerInitor> + <viewerInitor + name="XML" typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> </viewerInitor> </extension> Deleted: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XMLStructuredModelContentProvider.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XMLStructuredModelContentProvider.java 2008-08-16 08:37:20 UTC (rev 9752) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XMLStructuredModelContentProvider.java 2008-08-16 08:44:46 UTC (rev 9753) @@ -1,26 +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.xml.model; - -import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; -import org.eclipse.xsd.provider.XSDItemProviderAdapterFactory; - - -/** - * @author Dart Peng - * - * @CreateTime Jul 24, 2008 - */ -public class XMLStructuredModelContentProvider extends AdapterFactoryContentProvider { - public XMLStructuredModelContentProvider() { - super(new XSDItemProviderAdapterFactory()); - } -} Deleted: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XMLStructuredModelLabelProvider.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XMLStructuredModelLabelProvider.java 2008-08-16 08:37:20 UTC (rev 9752) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XMLStructuredModelLabelProvider.java 2008-08-16 08:44:46 UTC (rev 9753) @@ -1,26 +0,0 @@ -/******************************************************************************* - * 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.model; - -import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; -import org.eclipse.xsd.provider.XSDItemProviderAdapterFactory; - -/** - * @author Dart Peng - * @Date Jul 30, 2008 - */ -public class XMLStructuredModelLabelProvider extends AdapterFactoryLabelProvider { - - public XMLStructuredModelLabelProvider() { - super(new XSDItemProviderAdapterFactory()); - } - -} Copied: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelContentProvider.java (from rev 9749, workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XMLStructuredModelContentProvider.java) =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelContentProvider.java (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelContentProvider.java 2008-08-16 08:44:46 UTC (rev 9753) @@ -0,0 +1,26 @@ +/******************************************************************************* + * 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.xml.model; + +import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; +import org.eclipse.xsd.provider.XSDItemProviderAdapterFactory; + + +/** + * @author Dart Peng + * + * @CreateTime Jul 24, 2008 + */ +public class XSDStructuredModelContentProvider extends AdapterFactoryContentProvider { + public XSDStructuredModelContentProvider() { + super(new XSDItemProviderAdapterFactory()); + } +} Copied: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelLabelProvider.java (from rev 9749, workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XMLStructuredModelLabelProvider.java) =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelLabelProvider.java (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/model/XSDStructuredModelLabelProvider.java 2008-08-16 08:44:46 UTC (rev 9753) @@ -0,0 +1,26 @@ +/******************************************************************************* + * 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.model; + +import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; +import org.eclipse.xsd.provider.XSDItemProviderAdapterFactory; + +/** + * @author Dart Peng + * @Date Jul 30, 2008 + */ +public class XSDStructuredModelLabelProvider extends AdapterFactoryLabelProvider { + + public XSDStructuredModelLabelProvider() { + super(new XSDItemProviderAdapterFactory()); + } + +} Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java 2008-08-16 08:37:20 UTC (rev 9752) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java 2008-08-16 08:44:46 UTC (rev 9753) @@ -28,14 +28,14 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.xsd.XSDSchema; import org.eclipse.xsd.util.XSDResourceFactoryImpl; -import org.jboss.tools.smooks.xml.model.XMLStructuredModelContentProvider; -import org.jboss.tools.smooks.xml.model.XMLStructuredModelLabelProvider; +import org.jboss.tools.smooks.xml.model.XSDStructuredModelContentProvider; +import org.jboss.tools.smooks.xml.model.XSDStructuredModelLabelProvider; /** * * @author Dart Peng Date : 2008-8-13 */ -public class AbstractFileSelectionWizardPage extends WizardPage implements +public abstract class AbstractFileSelectionWizardPage extends WizardPage implements SelectionListener { protected Object returnObject = null; @@ -227,13 +227,7 @@ return xsdComposite; } - protected Object loadedTheObject(String path) throws Exception { - Resource resource = new XSDResourceFactoryImpl().createResource(URI - .createFileURI(path)); - resource.load(Collections.EMPTY_MAP); - XSDSchema schema = (XSDSchema) resource.getContents().get(0); - return schema; - } + abstract protected Object loadedTheObject(String path) throws Exception; protected void initTableViewer() { tableViewer.addCheckStateListener(new ICheckStateListener() { @@ -252,8 +246,8 @@ } } }); - tableViewer.setContentProvider(new XMLStructuredModelContentProvider()); - tableViewer.setLabelProvider(new XMLStructuredModelLabelProvider()); + tableViewer.setContentProvider(new XSDStructuredModelContentProvider()); + tableViewer.setLabelProvider(new XSDStructuredModelLabelProvider()); } protected void setCompositeChildrenEnabled(Composite composite, Deleted: 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 2008-08-16 08:37:20 UTC (rev 9752) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java 2008-08-16 08:44:46 UTC (rev 9753) @@ -1,61 +0,0 @@ -/** - * - */ -package org.jboss.tools.smooks.xml.ui; - -import java.util.ArrayList; -import java.util.List; - -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.xml.XmlActivator; - -/** - * @author Dart - * - */ -public class XMLStructuredDataWizard extends Wizard implements - IStrucutredDataCreationWizard { - AbstractFileSelectionWizardPage page = null; - Object xsdElement = null; - /** - * - */ - public XMLStructuredDataWizard() { - // TODO Auto-generated constructor stub - } - - @Override - public void addPages() { - if(page == null){ - page = new AbstractFileSelectionWizardPage("XML"); - } - 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; - } - - public Object getTreeViewerInputContents() { - return xsdElement; - } - - public void init(IEditorSite site, IEditorInput input) { - - } - -} Added: 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 (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java 2008-08-16 08:44:46 UTC (rev 9753) @@ -0,0 +1,35 @@ +/** + * + */ +package org.jboss.tools.smooks.xml.ui; + +import org.eclipse.jface.resource.ImageDescriptor; + +/** + * @author Dart Peng + * Date : 2008-8-16 + */ +public class XMLStructuredDataWizardPage extends + AbstractFileSelectionWizardPage { + + public XMLStructuredDataWizardPage(String pageName, String title, + ImageDescriptor titleImage) { + super(pageName, title, titleImage); + // TODO Auto-generated constructor stub + } + + public XMLStructuredDataWizardPage(String pageName) { + super(pageName); + // TODO Auto-generated constructor stub + } + + /* (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; + } + +} Property changes on: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizard.java (from rev 9752, 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/XSDStructuredDataWizard.java (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizard.java 2008-08-16 08:44:46 UTC (rev 9753) @@ -0,0 +1,58 @@ +/** + * + */ +package org.jboss.tools.smooks.xml.ui; + +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.xml.XmlActivator; + +/** + * @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; + } + + public Object getTreeViewerInputContents() { + return xsdElement; + } + + public void init(IEditorSite site, IEditorInput input) { + + } + +} Added: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizardPage.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizardPage.java (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizardPage.java 2008-08-16 08:44:46 UTC (rev 9753) @@ -0,0 +1,38 @@ +/** + * + */ +package org.jboss.tools.smooks.xml.ui; + +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.xsd.XSDSchema; +import org.eclipse.xsd.util.XSDResourceFactoryImpl; + +/** + * @author Dart Peng + * Date : 2008-8-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) { + super(pageName); + // TODO Auto-generated constructor stub + } + protected Object loadedTheObject(String path) throws Exception { + Resource resource = new XSDResourceFactoryImpl().createResource(URI + .createFileURI(path)); + resource.load(Collections.EMPTY_MAP); + XSDSchema schema = (XSDSchema) resource.getContents().get(0); + return schema; + } +} Property changes on: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizardPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/src_test/org/jboss/tools/smooks/xml2java/model/ModelTest.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src_test/org/jboss/tools/smooks/xml2java/model/ModelTest.java 2008-08-16 08:37:20 UTC (rev 9752) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src_test/org/jboss/tools/smooks/xml2java/model/ModelTest.java 2008-08-16 08:44:46 UTC (rev 9753) @@ -16,7 +16,7 @@ import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; import org.jboss.tools.smooks.ui.modelparser.ParseEngine; import org.jboss.tools.smooks.xml.model.XMLObjectAnalyzer; -import org.jboss.tools.smooks.xml.model.XMLStructuredModelContentProvider; +import org.jboss.tools.smooks.xml.model.XSDStructuredModelContentProvider; import org.jboss.tools.smooks.xml.model.XMLStrucutredModelParser; public class ModelTest extends TestCase { @@ -27,7 +27,7 @@ XSDSchema schema = (XSDSchema) resource.getContents().get(0); ParseEngine engine = new ParseEngine(); - AbstractStructuredDataModel model = engine.parseModel(schema, new XMLStructuredModelContentProvider(), new XMLStrucutredModelParser()); + AbstractStructuredDataModel model = engine.parseModel(schema, new XSDStructuredModelContentProvider(), new XMLStrucutredModelParser()); printStructuredDataModel(model); }

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9752 - workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-08-16 04:37:20 -0400 (Sat, 16 Aug 2008) New Revision: 9752 Added: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java Removed: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizardPage.java Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java Log: Copied: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java (from rev 9751, workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizardPage.java) =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java (rev 0) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/AbstractFileSelectionWizardPage.java 2008-08-16 08:37:20 UTC (rev 9752) @@ -0,0 +1,317 @@ +/** + * + */ +package org.jboss.tools.smooks.xml.ui; + +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; +import org.eclipse.jface.viewers.ICheckStateListener; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +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.Control; +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.xml.model.XMLStructuredModelContentProvider; +import org.jboss.tools.smooks.xml.model.XMLStructuredModelLabelProvider; + +/** + * + * @author Dart Peng Date : 2008-8-13 + */ +public class AbstractFileSelectionWizardPage extends WizardPage implements + SelectionListener { + + protected Object returnObject = null; + protected Text fileText; + protected Composite fileTextComposite; + protected CheckboxTableViewer tableViewer = null; + protected Button fileSystemBrowseButton; + protected boolean reasourceLoaded = false; + private Button workspaceBrowseButton; + + public AbstractFileSelectionWizardPage(String pageName, String title, + ImageDescriptor titleImage) { + super(pageName, title, titleImage); + // TODO Auto-generated constructor stub + } + + public AbstractFileSelectionWizardPage(String pageName) { + super(pageName); + // TODO Auto-generated constructor stub + } + + public Object getReturnValue() { + return returnObject; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) + */ + @Override + public void createControl(Composite parent) { + + Composite mainComposite = new Composite(parent, SWT.NONE); + GridLayout layout = new GridLayout(); + layout.numColumns = 1; + mainComposite.setLayout(layout); + + GridData gd = new GridData(GridData.FILL_BOTH); + gd.grabExcessHorizontalSpace = true; + gd.grabExcessVerticalSpace = true; + mainComposite.setLayoutData(gd); + + // xmlButton = new Button(mainComposite, SWT.RADIO); + // xmlButton.setText("Select a XML file"); + // + // Composite xmlComposite = this + // .createXMLFileSelectionComposite(mainComposite); + // + // Label sp = new Label(mainComposite, SWT.HORIZONTAL | SWT.SEPARATOR); + // gd = new GridData(GridData.FILL_HORIZONTAL); + // sp.setLayoutData(gd); + // + // xsdButton = new Button(mainComposite, SWT.RADIO); + // xsdButton.setText("Select a XSD file"); + + Composite xsdComposite = this + .createFileSelectionComposite(mainComposite); + + // init the panel status (XSD file selection composite is disabled) + // xsdButton.setSelection(true); + // + // setCompositeChildrenEnabled(xmlComposite, false); + + // registe the listener for controls + hookBrowseButtonSelectionAdapter(); + hookFileTextModifyListener(); + hookRadioButtonSelectionAdapter(); + this.setControl(mainComposite); + } + + protected void hookFileTextModifyListener() { + final ModifyListener modifyListener = new ModifyListener() { + @Override + public void modifyText(ModifyEvent e) { + changeWizardPageStatus(); + } + }; + // xmlFileText.addModifyListener(modifyListener); + fileText.addModifyListener(modifyListener); + } + + protected void hookRadioButtonSelectionAdapter() { + // xsdButton.addSelectionListener(this); + } + + protected void hookBrowseButtonSelectionAdapter() { + SelectionAdapter browseButtonSelectionAdapter = new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + Text relationT = null; + // if (e.getSource() == xmlFileSystemBrowseButton) { + // relationT = xmlFileText; + // } + if (e.getSource() == fileSystemBrowseButton) { + relationT = fileText; + } + openFileSelection(relationT); + } + }; + // xmlFileSystemBrowseButton + // .addSelectionListener(browseButtonSelectionAdapter); + fileSystemBrowseButton + .addSelectionListener(browseButtonSelectionAdapter); + } + + protected Composite createFileSelectionComposite(Composite parent) { + Composite xsdComposite = new Composite(parent, SWT.NONE); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + xsdComposite.setLayoutData(gd); + GridLayout xsdLayout = new GridLayout(); + xsdLayout.numColumns = 2; + xsdLayout.marginWidth = 0; + xsdComposite.setLayout(xsdLayout); + + Composite browseButtonComposite = new Composite(xsdComposite, SWT.NONE); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + browseButtonComposite.setLayoutData(gd); + + GridLayout bg = new GridLayout(); + bg.numColumns = 2; + bg.marginHeight = 0; + bg.marginWidth = 0; + bg.makeColumnsEqualWidth = false; + browseButtonComposite.setLayout(bg); + + fileSystemBrowseButton = new Button(browseButtonComposite, SWT.NONE); + fileSystemBrowseButton.setText("Browse File System..."); + + workspaceBrowseButton = new Button( + browseButtonComposite, SWT.NONE); + workspaceBrowseButton.setText("Browse workspace file.."); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalAlignment = GridData.END; + gd.grabExcessHorizontalSpace = true; + workspaceBrowseButton.setLayoutData(gd); + + gd = new GridData(); + gd.grabExcessHorizontalSpace = true; + fileSystemBrowseButton.setLayoutData(gd); + + Label nfileLanel = new Label(xsdComposite, SWT.NONE); + nfileLanel.setText("XSD File Path :"); + fileTextComposite = new Composite(xsdComposite, SWT.NONE); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.grabExcessHorizontalSpace = true; + fileTextComposite.setLayoutData(gd); + GridLayout xsdtgl = new GridLayout(); + xsdtgl.marginWidth = 0; + xsdtgl.marginHeight = 0; + xsdtgl.numColumns = 1; + fileTextComposite.setLayout(xsdtgl); + + fileText = new Text(fileTextComposite, SWT.BORDER); + gd = new GridData(GridData.FILL_HORIZONTAL); + fileText.setLayoutData(gd); + gd.grabExcessHorizontalSpace = true; + + final Button loadXSDButton = new Button(fileTextComposite, SWT.NONE); + loadXSDButton.setText("Load"); + loadXSDButton.addSelectionListener(new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + super.widgetSelected(e); + reasourceLoaded = false; + try { + returnObject = loadedTheObject(fileText.getText()); + reasourceLoaded = true; + } catch (Throwable e2) { + // ignore + e2.printStackTrace(); + } + changeWizardPageStatus(); + } + + }); + + // tableViewer = CheckboxTableViewer.newCheckList(xsdComposite, + // SWT.FULL_SELECTION | SWT.BORDER); + // gd = new GridData(GridData.FILL_BOTH); + // gd.heightHint = 200; + // gd.horizontalSpan = 2; + // tableViewer.getControl().setLayoutData(gd); + // + // initTableViewer(); + + return xsdComposite; + } + + protected Object loadedTheObject(String path) throws Exception { + Resource resource = new XSDResourceFactoryImpl().createResource(URI + .createFileURI(path)); + resource.load(Collections.EMPTY_MAP); + XSDSchema schema = (XSDSchema) resource.getContents().get(0); + return schema; + } + + protected void initTableViewer() { + tableViewer.addCheckStateListener(new ICheckStateListener() { + boolean flag = true; + + @Override + public void checkStateChanged(CheckStateChangedEvent event) { + if (flag) { + Object checkObject = event.getElement(); + boolean check = event.getChecked(); + flag = false; + tableViewer.setAllChecked(false); + tableViewer.setChecked(checkObject, check); + flag = true; + changeWizardPageStatus(); + } + } + }); + tableViewer.setContentProvider(new XMLStructuredModelContentProvider()); + tableViewer.setLabelProvider(new XMLStructuredModelLabelProvider()); + } + + protected void setCompositeChildrenEnabled(Composite composite, + boolean enabled) { + Control[] children = composite.getChildren(); + for (int i = 0; i < children.length; i++) { + Control child = children[i]; + if (child instanceof Text) { + child.setEnabled(enabled); + } + if (child instanceof Button) { + child.setEnabled(enabled); + } + if (child instanceof Composite) { + setCompositeChildrenEnabled((Composite) child, enabled); + } + } + } + + protected void openFileSelection(Text relationText) { + FileDialog dialog = new FileDialog(this.getShell()); + String path = dialog.open(); + if (path != null) { + relationText.setText(path); + } else { + relationText.setText(""); + } + } + + protected void changeWizardPageStatus() { + String text = this.fileText.getText(); + String error = null; + if (text == null || "".equals(text)) + error = "Please Select a file"; + if (!reasourceLoaded) { + error = "Resource must be loaded"; + } + this.setErrorMessage(error); + this.setPageComplete(error == null); + + } + + @Override + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + + @Override + public void widgetSelected(SelectionEvent e) { + changeWizardPageStatus(); + } + + public CheckboxTableViewer getTableViewer() { + return tableViewer; + } + + public void setTableViewer(CheckboxTableViewer tableViewer) { + this.tableViewer = tableViewer; + } + +} Modified: 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 2008-08-16 08:36:34 UTC (rev 9751) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java 2008-08-16 08:37:20 UTC (rev 9752) @@ -18,7 +18,7 @@ */ public class XMLStructuredDataWizard extends Wizard implements IStrucutredDataCreationWizard { - XSDStructuredDataWizardPage page = null; + AbstractFileSelectionWizardPage page = null; Object xsdElement = null; /** * @@ -30,7 +30,7 @@ @Override public void addPages() { if(page == null){ - page = new XSDStructuredDataWizardPage("XML"); + page = new AbstractFileSelectionWizardPage("XML"); } this.addPage(page); } Deleted: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizardPage.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizardPage.java 2008-08-16 08:36:34 UTC (rev 9751) +++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XSDStructuredDataWizardPage.java 2008-08-16 08:37:20 UTC (rev 9752) @@ -1,317 +0,0 @@ -/** - * - */ -package org.jboss.tools.smooks.xml.ui; - -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; -import org.eclipse.jface.viewers.ICheckStateListener; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -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.Control; -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.xml.model.XMLStructuredModelContentProvider; -import org.jboss.tools.smooks.xml.model.XMLStructuredModelLabelProvider; - -/** - * - * @author Dart Peng Date : 2008-8-13 - */ -public class XSDStructuredDataWizardPage extends WizardPage implements - SelectionListener { - - protected Object returnObject = null; - protected Text fileText; - protected Composite fileTextComposite; - protected CheckboxTableViewer tableViewer = null; - protected Button fileSystemBrowseButton; - protected boolean reasourceLoaded = false; - private Button workspaceBrowseButton; - - 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 - } - - public Object getReturnValue() { - return returnObject; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - @Override - public void createControl(Composite parent) { - - Composite mainComposite = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 1; - mainComposite.setLayout(layout); - - GridData gd = new GridData(GridData.FILL_BOTH); - gd.grabExcessHorizontalSpace = true; - gd.grabExcessVerticalSpace = true; - mainComposite.setLayoutData(gd); - - // xmlButton = new Button(mainComposite, SWT.RADIO); - // xmlButton.setText("Select a XML file"); - // - // Composite xmlComposite = this - // .createXMLFileSelectionComposite(mainComposite); - // - // Label sp = new Label(mainComposite, SWT.HORIZONTAL | SWT.SEPARATOR); - // gd = new GridData(GridData.FILL_HORIZONTAL); - // sp.setLayoutData(gd); - // - // xsdButton = new Button(mainComposite, SWT.RADIO); - // xsdButton.setText("Select a XSD file"); - - Composite xsdComposite = this - .createFileSelectionComposite(mainComposite); - - // init the panel status (XSD file selection composite is disabled) - // xsdButton.setSelection(true); - // - // setCompositeChildrenEnabled(xmlComposite, false); - - // registe the listener for controls - hookBrowseButtonSelectionAdapter(); - hookFileTextModifyListener(); - hookRadioButtonSelectionAdapter(); - this.setControl(mainComposite); - } - - protected void hookFileTextModifyListener() { - final ModifyListener modifyListener = new ModifyListener() { - @Override - public void modifyText(ModifyEvent e) { - changeWizardPageStatus(); - } - }; - // xmlFileText.addModifyListener(modifyListener); - fileText.addModifyListener(modifyListener); - } - - protected void hookRadioButtonSelectionAdapter() { - // xsdButton.addSelectionListener(this); - } - - protected void hookBrowseButtonSelectionAdapter() { - SelectionAdapter browseButtonSelectionAdapter = new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - Text relationT = null; - // if (e.getSource() == xmlFileSystemBrowseButton) { - // relationT = xmlFileText; - // } - if (e.getSource() == fileSystemBrowseButton) { - relationT = fileText; - } - openFileSelection(relationT); - } - }; - // xmlFileSystemBrowseButton - // .addSelectionListener(browseButtonSelectionAdapter); - fileSystemBrowseButton - .addSelectionListener(browseButtonSelectionAdapter); - } - - protected Composite createFileSelectionComposite(Composite parent) { - Composite xsdComposite = new Composite(parent, SWT.NONE); - GridData gd = new GridData(GridData.FILL_HORIZONTAL); - xsdComposite.setLayoutData(gd); - GridLayout xsdLayout = new GridLayout(); - xsdLayout.numColumns = 2; - xsdLayout.marginWidth = 0; - xsdComposite.setLayout(xsdLayout); - - Composite browseButtonComposite = new Composite(xsdComposite, SWT.NONE); - gd = new GridData(GridData.FILL_HORIZONTAL); - gd.horizontalSpan = 2; - browseButtonComposite.setLayoutData(gd); - - GridLayout bg = new GridLayout(); - bg.numColumns = 2; - bg.marginHeight = 0; - bg.marginWidth = 0; - bg.makeColumnsEqualWidth = false; - browseButtonComposite.setLayout(bg); - - fileSystemBrowseButton = new Button(browseButtonComposite, SWT.NONE); - fileSystemBrowseButton.setText("Browse File System..."); - - workspaceBrowseButton = new Button( - browseButtonComposite, SWT.NONE); - workspaceBrowseButton.setText("Browse workspace file.."); - gd = new GridData(GridData.FILL_HORIZONTAL); - gd.horizontalAlignment = GridData.END; - gd.grabExcessHorizontalSpace = true; - workspaceBrowseButton.setLayoutData(gd); - - gd = new GridData(); - gd.grabExcessHorizontalSpace = true; - fileSystemBrowseButton.setLayoutData(gd); - - Label nfileLanel = new Label(xsdComposite, SWT.NONE); - nfileLanel.setText("XSD File Path :"); - fileTextComposite = new Composite(xsdComposite, SWT.NONE); - gd = new GridData(GridData.FILL_HORIZONTAL); - gd.grabExcessHorizontalSpace = true; - fileTextComposite.setLayoutData(gd); - GridLayout xsdtgl = new GridLayout(); - xsdtgl.marginWidth = 0; - xsdtgl.marginHeight = 0; - xsdtgl.numColumns = 1; - fileTextComposite.setLayout(xsdtgl); - - fileText = new Text(fileTextComposite, SWT.BORDER); - gd = new GridData(GridData.FILL_HORIZONTAL); - fileText.setLayoutData(gd); - gd.grabExcessHorizontalSpace = true; - - final Button loadXSDButton = new Button(fileTextComposite, SWT.NONE); - loadXSDButton.setText("Load"); - loadXSDButton.addSelectionListener(new SelectionAdapter() { - - @Override - public void widgetSelected(SelectionEvent e) { - super.widgetSelected(e); - reasourceLoaded = false; - try { - returnObject = loadedTheObject(fileText.getText()); - reasourceLoaded = true; - } catch (Throwable e2) { - // ignore - e2.printStackTrace(); - } - changeWizardPageStatus(); - } - - }); - - // tableViewer = CheckboxTableViewer.newCheckList(xsdComposite, - // SWT.FULL_SELECTION | SWT.BORDER); - // gd = new GridData(GridData.FILL_BOTH); - // gd.heightHint = 200; - // gd.horizontalSpan = 2; - // tableViewer.getControl().setLayoutData(gd); - // - // initTableViewer(); - - return xsdComposite; - } - - protected Object loadedTheObject(String path) throws Exception { - Resource resource = new XSDResourceFactoryImpl().createResource(URI - .createFileURI(path)); - resource.load(Collections.EMPTY_MAP); - XSDSchema schema = (XSDSchema) resource.getContents().get(0); - return schema; - } - - protected void initTableViewer() { - tableViewer.addCheckStateListener(new ICheckStateListener() { - boolean flag = true; - - @Override - public void checkStateChanged(CheckStateChangedEvent event) { - if (flag) { - Object checkObject = event.getElement(); - boolean check = event.getChecked(); - flag = false; - tableViewer.setAllChecked(false); - tableViewer.setChecked(checkObject, check); - flag = true; - changeWizardPageStatus(); - } - } - }); - tableViewer.setContentProvider(new XMLStructuredModelContentProvider()); - tableViewer.setLabelProvider(new XMLStructuredModelLabelProvider()); - } - - protected void setCompositeChildrenEnabled(Composite composite, - boolean enabled) { - Control[] children = composite.getChildren(); - for (int i = 0; i < children.length; i++) { - Control child = children[i]; - if (child instanceof Text) { - child.setEnabled(enabled); - } - if (child instanceof Button) { - child.setEnabled(enabled); - } - if (child instanceof Composite) { - setCompositeChildrenEnabled((Composite) child, enabled); - } - } - } - - protected void openFileSelection(Text relationText) { - FileDialog dialog = new FileDialog(this.getShell()); - String path = dialog.open(); - if (path != null) { - relationText.setText(path); - } else { - relationText.setText(""); - } - } - - protected void changeWizardPageStatus() { - String text = this.fileText.getText(); - String error = null; - if (text == null || "".equals(text)) - error = "Please Select a file"; - if (!reasourceLoaded) { - error = "Resource must be loaded"; - } - this.setErrorMessage(error); - this.setPageComplete(error == null); - - } - - @Override - public void widgetDefaultSelected(SelectionEvent e) { - widgetSelected(e); - } - - @Override - public void widgetSelected(SelectionEvent e) { - changeWizardPageStatus(); - } - - public CheckboxTableViewer getTableViewer() { - return tableViewer; - } - - public void setTableViewer(CheckboxTableViewer tableViewer) { - this.tableViewer = tableViewer; - } - -}

17 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2008