You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sh...@apache.org on 2008/03/11 18:53:18 UTC
svn commit: r636035 [3/3] - in
/geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.runtime.v1/META-INF/
org.apache.geronimo.runtime.v21/META-INF/
org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/wizards/
org.apache.geronimo.st.v...
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/ResourceEnvRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/ResourceEnvRefSection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/ResourceEnvRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/ResourceEnvRefSection.java Tue Mar 11 10:53:06 2008
@@ -16,6 +16,8 @@
*/
package org.apache.geronimo.st.v21.ui.sections;
+import java.util.List;
+
import javax.xml.bind.JAXBElement;
import org.apache.geronimo.st.ui.CommonMessages;
@@ -30,13 +32,13 @@
public class ResourceEnvRefSection extends AbstractTableSection {
- Object resourceEnvRefERef;
+ List resourceEnvRefERef;
private static final String[] COLUMN_NAMES = new String[] {
CommonMessages.editorResEnvRefNameTitle,
CommonMessages.editorResEnvRefMsgDestTitle };
- public ResourceEnvRefSection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style, Object resourceEnvRefERef) {
+ public ResourceEnvRefSection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style, List resourceEnvRefERef) {
super(plan, parent, toolkit, style);
this.resourceEnvRefERef = resourceEnvRefERef;
createClient();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java Tue Mar 11 10:53:06 2008
@@ -16,15 +16,13 @@
*/
package org.apache.geronimo.st.v21.ui.wizards;
-import javax.enterprise.deploy.spi.factories.DeploymentFactory;
-
+import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
+import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
import org.apache.geronimo.st.v21.ui.internal.Trace;
import org.apache.geronimo.xml.ns.deployment_1.ArtifactType;
-import org.apache.geronimo.xml.ns.deployment_1.DependenciesType;
-import org.apache.geronimo.xml.ns.deployment_1.EnvironmentType;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardPage;
@@ -69,14 +67,14 @@
Trace.trace("Constructor Entry/Exit", "DependencyWizard");
}
-// /*
-// * (non-Javadoc)
-// *
-// * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEFactory()
-// */
-// public EFactory getEFactory() {
-// return DeploymentFactory.eINSTANCE;
-// }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEFactory()
+ */
+ public JAXBObjectFactory getEFactory() {
+ return JAXBObjectFactoryImpl.getInstance();
+ }
// /*
// * (non-Javadoc)
@@ -215,6 +213,11 @@
typeText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
if (eObject != null) {
+ ArtifactType artifact = (ArtifactType)eObject;
+ groupIdText.setText(artifact.getGroupId());
+ artifactIdText.setText(artifact.getArtifactId());
+ versionText.setText(artifact.getVersion());
+ typeText.setText(artifact.getType());
// if (eObject.eIsSet(DeploymentPackage.eINSTANCE.getArtifactType_ArtifactId())) {
// artifactIdText.setText(eObject.eGet(DeploymentPackage.eINSTANCE.getArtifactType_ArtifactId()).toString());
// }
@@ -245,27 +248,27 @@
/* (non-Javadoc)
* @see org.apache.geronimo.st.ui.wizards.AbstractTableWizard#performFinish()
*/
- public boolean performFinish() {
-// Trace.trace("Entry", "DependencyWizard.performFinish");
-
- if (eObject == null) {
-// eObject = getEFactory().create(section.getTableEntryObjectType());
-// EObject plan = section.getPlan();
-// DependenciesType dependenciesType = ((EnvironmentType) plan.eGet(section.getEReference())).getDependencies();
-// if(dependenciesType == null) {
-// dependenciesType = DeploymentFactory.eINSTANCE.createDependenciesType();
-// ((EnvironmentType) plan.eGet(section.getEReference())).setDependencies(dependenciesType);
-// }
-// dependenciesType.getDependency().add(eObject);
- }
-
- processEAttributes(getPages()[0]);
-
- if (section.getTableViewer().getInput() == null) {
- section.getTableViewer().setInput(section.getInput());
- }
-
-// Trace.trace("Exit", "DependencyWizard.performFinish", true);
- return true;
- }
+// public boolean performFinish() {
+//// Trace.trace("Entry", "DependencyWizard.performFinish");
+//
+// if (eObject == null) {
+//// eObject = getEFactory().create(section.getTableEntryObjectType());
+//// EObject plan = section.getPlan();
+//// DependenciesType dependenciesType = ((EnvironmentType) plan.eGet(section.getEReference())).getDependencies();
+//// if(dependenciesType == null) {
+//// dependenciesType = DeploymentFactory.eINSTANCE.createDependenciesType();
+//// ((EnvironmentType) plan.eGet(section.getEReference())).setDependencies(dependenciesType);
+//// }
+//// dependenciesType.getDependency().add(eObject);
+// }
+//
+// processEAttributes(getPages()[0]);
+//
+// if (section.getTableViewer().getInput() == null) {
+// section.getTableViewer().setInput(section.getInput());
+// }
+//
+//// Trace.trace("Exit", "DependencyWizard.performFinish", true);
+// return true;
+// }
}