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

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{