[nobug] export work. Committing for DFH

2 files changed, 14 insertions, 50 deletions

diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorModuleExportWizard.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorModuleExportWizard.java
index d38174328..48463c83b 100644
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorModuleExportWizard.java
+++ b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorModuleExportWizard.java
@@ -10,14 +10,13 @@
  *******************************************************************************/ 
 package org.eclipse.jst.j2ee.jca.ui.internal.wizard;
 
-import org.eclipse.jst.j2ee.internal.jca.archive.operations.ConnectorModuleExportOperation;
-import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorModuleExportDataModel;
+import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorModuleExportDataModelProvider;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
 import org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactExportWizard;
 import org.eclipse.ui.IExportWizard;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
 
 /**
  * <p>
@@ -46,36 +45,13 @@ public final class ConnectorModuleExportWizard extends J2EEArtifactExportWizard
 	 * </p>
 	 * @param model The model parameter is used to pre-populate wizard controls and interface with the operation
 	 */
-	public ConnectorModuleExportWizard(ConnectorModuleExportDataModel model) {
+	public ConnectorModuleExportWizard(IDataModel model) {
 		super(model);
 	}
 
-	/**
-	 * {@inheritDoc} 
-	 * 
-	 * <p>
-	 * Overridden to return an {@link ConnectorModuleExportDataModel}.
-	 * </p>
-	 *  
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizard#createDefaultModel()
-	 */
-	protected WTPOperationDataModel createDefaultModel() {
-		return new ConnectorModuleExportDataModel(); 
-	}
-
-	/**
-	 * {@inheritDoc} 
-	 * 
-	 * <p>
-	 * Returns an {@link ConnectorModuleExportOperation} using the model either
-	 * supplied in the constructor or created from {@link #createDefaultModel()}.
-	 * </p>
-	 * @return Returns the operation to be executed when the Wizard completes.
-	 */
-	protected WTPOperation createBaseOperation() {
-		return new ConnectorModuleExportOperation(getSpecificModel());
-	}
-
+    protected IDataModelProvider getDefaultProvider() {
+        return new ConnectorModuleExportDataModelProvider();
+    }
 	/**
 	 * <p>
 	 * Adds the following pages:
@@ -85,7 +61,7 @@ public final class ConnectorModuleExportWizard extends J2EEArtifactExportWizard
 	 * </p>
 	 */
 	public void doAddPages() {
-		addPage(new RARExportPage(getSpecificModel(), MAIN_PG, getSelection()));
+		addPage(new RARExportPage(getDataModel(), MAIN_PG, getSelection()));
 	}
 
 	/**
@@ -98,9 +74,4 @@ public final class ConnectorModuleExportWizard extends J2EEArtifactExportWizard
 	protected void doInit() {
 		setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_EXPORT_WIZARD_BANNER));
 	} 
-
-	private ConnectorModuleExportDataModel getSpecificModel() {
-		return (ConnectorModuleExportDataModel) getModel();
-	}
-
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java
index 82dcdd70e..f4847666c 100644
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java
+++ b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java
@@ -17,16 +17,15 @@
 package org.eclipse.jst.j2ee.jca.ui.internal.wizard;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleExportDataModel;
 import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.IConnectorNatureConstants;
 import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleExportPage;
 import org.eclipse.jst.j2ee.jca.Connector;
 import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 
 /**
  * @author cbridgha
@@ -39,7 +38,7 @@ public class RARExportPage extends J2EEModuleExportPage {
 	 * @param model
 	 * @param pageName
 	 */
-	public RARExportPage(J2EEModuleExportDataModel model, String pageName, IStructuredSelection selection) {
+	public RARExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
 		super(model, pageName, selection);
 		setTitle(JCAUIMessages.getResourceString(JCAUIMessages.JCA_EXPORT_MAIN_PG_TITLE));
 		setDescription(JCAUIMessages.getResourceString(JCAUIMessages.JCA_EXPORT_MAIN_PG_DESC));
@@ -74,16 +73,6 @@ public class RARExportPage extends J2EEModuleExportPage {
 		return o instanceof Connector;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEExportPage#getNatureID()
-	 */
-	protected String getNatureID() {
-
-		return IConnectorNatureConstants.NATURE_ID;
-	}
-
 	protected Composite createTopLevelComposite(Composite parent) {
 		return super.createTopLevelComposite(parent);
 	}
@@ -97,4 +86,8 @@ public class RARExportPage extends J2EEModuleExportPage {
 	protected String getInfopopID() {
 		return IJ2EEUIContextIds.EXPORT_RAR_WIZARD_PAGE;
 	}
+
+    protected String getCompnentID() {
+        return "JST_CONNECTOR"; //$NON-NLS-1$
+    }
 }
\ No newline at end of file