3:44 a.m.
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);
}