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 [2/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.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/DependencySection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/DependencySection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/DependencySection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/DependencySection.java Tue Mar 11 10:53:06 2008
@@ -16,17 +16,19 @@
*/
package org.apache.geronimo.st.v20.ui.sections;
+import java.util.List;
+
+import javax.xml.bind.JAXBElement;
+
import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.providers.AdapterFactory;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v20.ui.Activator;
import org.apache.geronimo.st.v20.ui.internal.EMFEditorContext;
import org.apache.geronimo.st.v20.ui.wizards.DependencyWizard;
-import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
-import org.apache.geronimo.xml.ns.deployment.EnvironmentType;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
+import org.apache.geronimo.xml.ns.deployment_1.DependenciesType;
+import org.apache.geronimo.xml.ns.deployment_1.DependencyType;
+import org.apache.geronimo.xml.ns.deployment_1.EnvironmentType;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
@@ -34,7 +36,7 @@
public class DependencySection extends AbstractTableSection {
- private EReference environmentERef;
+ private EnvironmentType environment;
/**
* @param plan
@@ -42,9 +44,9 @@
* @param toolkit
* @param style
*/
- public DependencySection(EObject plan, EReference environment, Composite parent, FormToolkit toolkit, int style) {
+ public DependencySection(JAXBElement plan, EnvironmentType environment, Composite parent, FormToolkit toolkit, int style) {
super(plan, parent, toolkit, style);
- this.environmentERef = environment;
+ this.environment = environment;
createClient();
}
@@ -66,13 +68,8 @@
return CommonMessages.editorSectionDependenciesDescription;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geronimo.ui.sections.AbstractTableSection#getEReference()
- */
- public EReference getEReference() {
- return environmentERef;
+ public List getObjectContainer() {
+ return environment.getDependencies().getDependency();
}
/*
@@ -102,8 +99,8 @@
*
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getTableEntryObjectType()
*/
- public EClass getTableEntryObjectType() {
- return DeploymentPackage.eINSTANCE.getDependencyType();
+ public Class getTableEntryObjectType() {
+ return DependencyType.class;
}
/*
@@ -112,13 +109,30 @@
* @see org.apache.geronimo.st.ui.sections.AbstractTableSection#getAdapterFactory()
*/
public AdapterFactory getAdapterFactory() {
- return EMFEditorContext.getFactory();
+ return new AdapterFactory() {
+ public Object[] getElements(Object inputElement) {
+ if (!DependenciesType.class.isInstance(inputElement)) {
+ return new String[] { "" };
+ }
+ DependenciesType plan = (DependenciesType)inputElement;
+ return plan.getDependency().toArray();
+ }
+ public String getColumnText(Object element, int columnIndex) {
+ if (DependencyType.class.isInstance(element)) {
+ DependencyType dependency = (DependencyType)element;
+ switch (columnIndex) {
+ case 0: return dependency.getGroupId();
+ case 1: return dependency.getArtifactId();
+ }
+ }
+ return null;
+ }
+ };
}
public Object getInput() {
- EnvironmentType envType = (EnvironmentType) getPlan().eGet(getEReference());
- if (envType != null) {
- return envType.getDependencies();
+ if (environment != null) {
+ return environment.getDependencies();
}
return super.getInput();
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/EjbLocalRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/EjbLocalRefSection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/EjbLocalRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/EjbLocalRefSection.java Tue Mar 11 10:53:06 2008
@@ -16,16 +16,17 @@
*/
package org.apache.geronimo.st.v20.ui.sections;
+import java.util.List;
+
+import javax.xml.bind.JAXBElement;
+
import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.providers.AdapterFactory;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v20.ui.Activator;
import org.apache.geronimo.st.v20.ui.internal.EMFEditorContext;
import org.apache.geronimo.st.v20.ui.wizards.EjbLocalRefWizard;
-import org.apache.geronimo.xml.ns.naming.NamingPackage;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
+import org.apache.geronimo.xml.ns.naming_1.EjbLocalRefType;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
@@ -33,13 +34,13 @@
public class EjbLocalRefSection extends AbstractTableSection {
- EReference ejbLocalRefERef;
+ List ejbLocalRefERef;
private static final String[] COLUMN_NAMES = new String[] {
CommonMessages.name,
CommonMessages.editorEjbRefEjbLink };
- public EjbLocalRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference ejbLocalRefERef) {
+ public EjbLocalRefSection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style, List ejbLocalRefERef) {
super(plan, parent, toolkit, style);
this.ejbLocalRefERef = ejbLocalRefERef;
createClient();
@@ -77,9 +78,9 @@
*
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getEReference()
*/
- public EReference getEReference() {
- return ejbLocalRefERef;
- }
+// public EReference getEReference() {
+// return ejbLocalRefERef;
+// }
/*
* (non-Javadoc)
@@ -99,8 +100,8 @@
*
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getTableEntryObjectType()
*/
- public EClass getTableEntryObjectType() {
- return NamingPackage.eINSTANCE.getEjbLocalRefType();
+ public Class getTableEntryObjectType() {
+ return EjbLocalRefType.class;
}
/*
@@ -108,7 +109,7 @@
*
* @see org.apache.geronimo.st.ui.sections.AbstractTableSection#getAdapterFactory()
*/
- public AdapterFactory getAdapterFactory() {
- return EMFEditorContext.getFactory();
- }
+// public AdapterFactory getAdapterFactory() {
+// return EMFEditorContext.getFactory();
+// }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/EjbRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/EjbRefSection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/EjbRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/EjbRefSection.java Tue Mar 11 10:53:06 2008
@@ -16,16 +16,17 @@
*/
package org.apache.geronimo.st.v20.ui.sections;
+import java.util.List;
+
+import javax.xml.bind.JAXBElement;
+
import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.providers.AdapterFactory;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v20.ui.Activator;
import org.apache.geronimo.st.v20.ui.internal.EMFEditorContext;
import org.apache.geronimo.st.v20.ui.wizards.EjbRefWizard;
-import org.apache.geronimo.xml.ns.naming.NamingPackage;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
+import org.apache.geronimo.xml.ns.naming_1.EjbRefType;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
@@ -33,7 +34,7 @@
public class EjbRefSection extends AbstractTableSection {
- EReference ejbRefERef;
+ List ejbRefERef;
private static final String[] COLUMN_NAMES = new String[] {
CommonMessages.name,
@@ -45,7 +46,7 @@
* @param toolkit
* @param style
*/
- public EjbRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference ejbRefERef) {
+ public EjbRefSection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style, List ejbRefERef) {
super(plan, parent, toolkit, style);
this.ejbRefERef = ejbRefERef;
createClient();
@@ -83,9 +84,9 @@
*
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getEReference()
*/
- public EReference getEReference() {
- return ejbRefERef;
- }
+// public EReference getEReference() {
+// return ejbRefERef;
+// }
/*
* (non-Javadoc)
@@ -105,8 +106,8 @@
*
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getTableEntryObjectType()
*/
- public EClass getTableEntryObjectType() {
- return NamingPackage.eINSTANCE.getEjbRefType();
+ public Class getTableEntryObjectType() {
+ return EjbRefType.class;
}
/*
@@ -114,7 +115,7 @@
*
* @see org.apache.geronimo.st.ui.sections.AbstractTableSection#getAdapterFactory()
*/
- public AdapterFactory getAdapterFactory() {
- return EMFEditorContext.getFactory();
- }
+// public AdapterFactory getAdapterFactory() {
+// return EMFEditorContext.getFactory();
+// }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/GBeanRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/GBeanRefSection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/GBeanRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/GBeanRefSection.java Tue Mar 11 10:53:06 2008
@@ -16,28 +16,27 @@
*/
package org.apache.geronimo.st.v20.ui.sections;
+import javax.xml.bind.JAXBElement;
+
import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.providers.AdapterFactory;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v20.ui.internal.EMFEditorContext;
import org.apache.geronimo.st.v20.ui.wizards.GBeanRefWizard;
-import org.apache.geronimo.xml.ns.naming.NamingPackage;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
+import org.apache.geronimo.xml.ns.deployment_1.GbeanType;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
public class GBeanRefSection extends AbstractTableSection {
- EReference gbeanERef;
+ Object gbeanERef;
private static final String[] COLUMN_NAMES = new String[] {
CommonMessages.editorGBeanRefName,
CommonMessages.editorGBeanRefType};
- public GBeanRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference gbeanERef) {
+ public GBeanRefSection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style, Object gbeanERef) {
super(plan, parent, toolkit, style);
this.gbeanERef = gbeanERef;
createClient();
@@ -75,9 +74,9 @@
*
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getEReference()
*/
- public EReference getEReference() {
- return gbeanERef;
- }
+// public EReference getEReference() {
+// return gbeanERef;
+// }
/*
* (non-Javadoc)
@@ -93,8 +92,8 @@
*
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getTableEntryObjectType()
*/
- public EClass getTableEntryObjectType() {
- return NamingPackage.eINSTANCE.getGbeanRefType();
+ public Class getTableEntryObjectType() {
+ return GbeanType.class;
}
/*
@@ -102,7 +101,7 @@
*
* @see org.apache.geronimo.st.ui.sections.AbstractTableSection#getAdapterFactory()
*/
- public AdapterFactory getAdapterFactory() {
- return EMFEditorContext.getFactory();
- }
+// public AdapterFactory getAdapterFactory() {
+// return EMFEditorContext.getFactory();
+// }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/GBeanSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/GBeanSection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/GBeanSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/GBeanSection.java Tue Mar 11 10:53:06 2008
@@ -16,22 +16,25 @@
*/
package org.apache.geronimo.st.v20.ui.sections;
+import java.util.List;
+
+import javax.xml.bind.JAXBElement;
+
import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.providers.AdapterFactory;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v20.ui.internal.EMFEditorContext;
import org.apache.geronimo.st.v20.ui.wizards.GBeanWizard;
-import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
+import org.apache.geronimo.xml.ns.deployment_1.GbeanType;
+import org.apache.geronimo.xml.ns.j2ee.web_2_0.WebAppType;
+import org.apache.geronimo.xml.ns.naming_1.ResourceRefType;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
public class GBeanSection extends AbstractTableSection {
- private EReference gBeanERef;
+ private List gbeans;
private static final String[] COLUMN_NAMES = new String[] {
CommonMessages.name, CommonMessages.className };
@@ -42,9 +45,9 @@
* @param toolkit
* @param style
*/
- public GBeanSection(EObject plan, EReference gBeanERef, Composite parent, FormToolkit toolkit, int style) {
+ public GBeanSection(JAXBElement plan, List gbeans, Composite parent, FormToolkit toolkit, int style) {
super(plan, parent, toolkit, style);
- this.gBeanERef = gBeanERef;
+ this.gbeans = gbeans;
createClient();
}
@@ -75,13 +78,8 @@
return COLUMN_NAMES;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geronimo.ui.sections.AbstractTableSection#getEReference()
- */
- public EReference getEReference() {
- return gBeanERef;
+ public List getObjectContainer() {
+ return gbeans;
}
/*
@@ -98,8 +96,8 @@
*
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getTableEntryObjectType()
*/
- public EClass getTableEntryObjectType() {
- return DeploymentPackage.eINSTANCE.getGbeanType();
+ public Class getTableEntryObjectType() {
+ return GbeanType.class;
}
/*
@@ -108,6 +106,27 @@
* @see org.apache.geronimo.st.ui.sections.AbstractTableSection#getAdapterFactory()
*/
public AdapterFactory getAdapterFactory() {
- return EMFEditorContext.getFactory();
+ return new AdapterFactory() {
+ public Object[] getElements(Object inputElement) {
+ if (!JAXBElement.class.isInstance(inputElement)) {
+ return new String[] { "" };
+ }
+ JAXBElement plan = (JAXBElement)inputElement;
+ if (plan.getDeclaredType().equals(WebAppType.class)) {
+ return ((WebAppType)plan.getValue()).getResourceRef().toArray();
+ }
+ return new String[] { "" };
+ }
+ public String getColumnText(Object element, int columnIndex) {
+ if (ResourceRefType.class.isInstance(element)) {
+ ResourceRefType resourceRef = (ResourceRefType)element;
+ switch (columnIndex) {
+ case 0: return resourceRef.getRefName();
+ case 1: return resourceRef.getResourceLink();
+ }
+ }
+ return null;
+ }
+ };
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ImportSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ImportSection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ImportSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ImportSection.java Tue Mar 11 10:53:06 2008
@@ -16,17 +16,18 @@
*/
package org.apache.geronimo.st.v20.ui.sections;
+import javax.xml.bind.JAXBElement;
+
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.v20.ui.wizards.ImportWizard;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
+import org.apache.geronimo.xml.ns.deployment_1.EnvironmentType;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
public class ImportSection extends DependencySection {
- public ImportSection(EObject plan, EReference dependenciesERef, Composite parent, FormToolkit toolkit, int style) {
+ public ImportSection(JAXBElement plan, EnvironmentType dependenciesERef, Composite parent, FormToolkit toolkit, int style) {
super(plan, dependenciesERef, parent, toolkit, style);
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/OpenEjbJarGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/OpenEjbJarGeneralSection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/OpenEjbJarGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/OpenEjbJarGeneralSection.java Tue Mar 11 10:53:06 2008
@@ -16,20 +16,19 @@
*/
package org.apache.geronimo.st.v20.ui.sections;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.xml.ns.j2ee.ejb.openejb_2.OpenejbJarType;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.openejb.xml.ns.openejb.jar.JarPackage;
-import org.openejb.xml.ns.openejb.jar.OpenejbJarType;
public class OpenEjbJarGeneralSection extends CommonGeneralSection {
OpenejbJarType plan;
- public OpenEjbJarGeneralSection(Composite parent, FormToolkit toolkit, int style, EObject plan) {
+ public OpenEjbJarGeneralSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
super(parent, toolkit, style, plan);
- this.plan = (OpenejbJarType) plan;
+ this.plan = (OpenejbJarType) plan.getValue();
createClient();
}
@@ -38,7 +37,7 @@
*
* @see org.apache.geronimo.st.v20.ui.sections.CommonGeneralSection#getEnvironmentEReference()
*/
- protected EReference getEnvironmentEReference() {
- return JarPackage.eINSTANCE.getOpenejbJarType_Environment();
+ protected JAXBElement getEnvironmentEReference() {
+ return null;//JarPackage.eINSTANCE.getOpenejbJarType_Environment();
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ResourceEnvRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ResourceEnvRefSection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ResourceEnvRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ResourceEnvRefSection.java Tue Mar 11 10:53:06 2008
@@ -16,16 +16,15 @@
*/
package org.apache.geronimo.st.v20.ui.sections;
+import java.util.List;
+
+import javax.xml.bind.JAXBElement;
+
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v20.ui.Activator;
-import org.apache.geronimo.st.v20.ui.internal.EMFEditorContext;
import org.apache.geronimo.st.v20.ui.wizards.ResourceEnvRefWizard;
-import org.apache.geronimo.xml.ns.naming.NamingPackage;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
+import org.apache.geronimo.xml.ns.naming_1.ResourceEnvRefType;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
@@ -33,13 +32,13 @@
public class ResourceEnvRefSection extends AbstractTableSection {
- EReference resourceEnvRefERef;
+ List resourceEnvRefERef;
private static final String[] COLUMN_NAMES = new String[] {
CommonMessages.editorResEnvRefNameTitle,
CommonMessages.editorResEnvRefMsgDestTitle };
- public ResourceEnvRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference resourceEnvRefERef) {
+ public ResourceEnvRefSection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style, List resourceEnvRefERef) {
super(plan, parent, toolkit, style);
this.resourceEnvRefERef = resourceEnvRefERef;
createClient();
@@ -77,9 +76,9 @@
*
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getEReference()
*/
- public EReference getEReference() {
- return resourceEnvRefERef;
- }
+// public EReference getEReference() {
+// return resourceEnvRefERef;
+// }
/*
* (non-Javadoc)
@@ -99,8 +98,8 @@
*
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getTableEntryObjectType()
*/
- public EClass getTableEntryObjectType() {
- return NamingPackage.eINSTANCE.getResourceEnvRefType();
+ public Class getTableEntryObjectType() {
+ return ResourceEnvRefType.class;
}
/*
@@ -108,7 +107,7 @@
*
* @see org.apache.geronimo.st.ui.sections.AbstractTableSection#getAdapterFactory()
*/
- public AdapterFactory getAdapterFactory() {
- return EMFEditorContext.getFactory();
- }
+// public AdapterFactory getAdapterFactory() {
+// return EMFEditorContext.getFactory();
+// }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ResourceRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ResourceRefSection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ResourceRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ResourceRefSection.java Tue Mar 11 10:53:06 2008
@@ -16,16 +16,18 @@
*/
package org.apache.geronimo.st.v20.ui.sections;
+import java.util.List;
+
+import javax.xml.bind.JAXBElement;
+
import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.providers.AdapterFactory;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v20.ui.Activator;
import org.apache.geronimo.st.v20.ui.internal.EMFEditorContext;
import org.apache.geronimo.st.v20.ui.wizards.ResourceRefWizard;
-import org.apache.geronimo.xml.ns.naming.NamingPackage;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
+import org.apache.geronimo.xml.ns.j2ee.web_2_0.WebAppType;
+import org.apache.geronimo.xml.ns.naming_1.ResourceRefType;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
@@ -33,13 +35,13 @@
public class ResourceRefSection extends AbstractTableSection {
- EReference resourceRefERef;
+ List resourceRefERef;
private static final String[] COLUMN_NAMES = new String[] {
CommonMessages.editorResRefNameTitle,
CommonMessages.editorResRefLinkTitle};
- public ResourceRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference resourceRefERef) {
+ public ResourceRefSection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style, List resourceRefERef) {
super(plan, parent, toolkit, style);
this.resourceRefERef = resourceRefERef;
createClient();
@@ -77,9 +79,9 @@
*
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getEReference()
*/
- public EReference getEReference() {
- return resourceRefERef;
- }
+// public EReference getEReference() {
+// return resourceRefERef;
+// }
/*
* (non-Javadoc)
@@ -99,8 +101,8 @@
*
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getTableEntryObjectType()
*/
- public EClass getTableEntryObjectType() {
- return NamingPackage.eINSTANCE.getResourceRefType();
+ public Class getTableEntryObjectType() {
+ return ResourceRefType.class;
}
/*
@@ -109,6 +111,27 @@
* @see org.apache.geronimo.st.ui.sections.AbstractTableSection#getAdapterFactory()
*/
public AdapterFactory getAdapterFactory() {
- return EMFEditorContext.getFactory();
+ return new AdapterFactory() {
+ public Object[] getElements(Object inputElement) {
+ if (!JAXBElement.class.isInstance(inputElement)) {
+ return new String[] { "" };
+ }
+ JAXBElement plan = (JAXBElement)inputElement;
+ if (plan.getDeclaredType().equals(WebAppType.class)) {
+ return ((WebAppType)plan.getValue()).getResourceRef().toArray();
+ }
+ return new String[] { "" };
+ }
+ public String getColumnText(Object element, int columnIndex) {
+ if (ResourceRefType.class.isInstance(element)) {
+ ResourceRefType resourceRef = (ResourceRefType)element;
+ switch (columnIndex) {
+ case 0: return resourceRef.getRefName();
+ case 1: return resourceRef.getResourceLink();
+ }
+ }
+ return null;
+ }
+ };
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/SecurityRootSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/SecurityRootSection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/SecurityRootSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/SecurityRootSection.java Tue Mar 11 10:53:06 2008
@@ -16,13 +16,13 @@
*/
package org.apache.geronimo.st.v20.ui.sections;
+import javax.xml.bind.JAXBElement;
+
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractSectionPart;
-import org.apache.geronimo.xml.ns.security.SecurityFactory;
-import org.apache.geronimo.xml.ns.security.SecurityPackage;
-import org.apache.geronimo.xml.ns.security.SecurityType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
+import org.apache.geronimo.st.v20.core.jaxb.JAXBModelUtils;
+import org.apache.geronimo.st.v20.core.jaxb.JAXBObjectFactoryImpl;
+import org.apache.geronimo.xml.ns.security_2.SecurityType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -40,7 +40,7 @@
public class SecurityRootSection extends AbstractSectionPart {
- EReference secERef;
+ SecurityType secERef;
Text defaultRole;
@@ -60,7 +60,7 @@
* @param toolkit
* @param style
*/
- public SecurityRootSection(Composite parent, FormToolkit toolkit, int style, EObject plan, EReference secERef) {
+ public SecurityRootSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan, SecurityType secERef) {
super(parent, toolkit, style, plan);
this.secERef = secERef;
createClient();
@@ -136,19 +136,19 @@
}
private String getDefaultRole() {
- SecurityType secType = (SecurityType) getPlan().eGet(secERef);
+ SecurityType secType = JAXBModelUtils.getSecurityType(getPlan());
if (secType != null
- && secType.eIsSet(SecurityPackage.eINSTANCE.getSecurityType_DefaultRole())) {
+ && secType.getDefaultRole() != null) {
return secType.getDefaultRole();
}
return "";
}
private SecurityType getSecurityType() {
- SecurityType secType = (SecurityType) getPlan().eGet(secERef);
+ SecurityType secType = JAXBModelUtils.getSecurityType(getPlan());
if (secType == null) {
- secType = SecurityFactory.eINSTANCE.createSecurityType();
- getPlan().eSet(secERef, secType);
+ secType = (SecurityType)JAXBObjectFactoryImpl.getInstance().create( SecurityType.class );
+ JAXBModelUtils.setSecurityType(getPlan(),secType);
}
return secType;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/SecuritySection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/SecuritySection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/SecuritySection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/SecuritySection.java Tue Mar 11 10:53:06 2008
@@ -16,19 +16,19 @@
*/
package org.apache.geronimo.st.v20.ui.sections;
+import javax.xml.bind.JAXBElement;
+
import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.providers.AdapterFactory;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
+import org.apache.geronimo.st.v20.core.jaxb.JAXBModelUtils;
import org.apache.geronimo.st.v20.ui.Activator;
import org.apache.geronimo.st.v20.ui.internal.EMFEditorContext;
import org.apache.geronimo.st.v20.ui.wizards.SecurityRoleWizard;
-import org.apache.geronimo.xml.ns.security.DescriptionType;
-import org.apache.geronimo.xml.ns.security.RoleType;
-import org.apache.geronimo.xml.ns.security.SecurityPackage;
-import org.apache.geronimo.xml.ns.security.SecurityType;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
+import org.apache.geronimo.xml.ns.security_2.DescriptionType;
+import org.apache.geronimo.xml.ns.security_2.RoleMappingsType;
+import org.apache.geronimo.xml.ns.security_2.RoleType;
+import org.apache.geronimo.xml.ns.security_2.SecurityType;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.SWT;
@@ -45,7 +45,7 @@
public class SecuritySection extends AbstractTableSection {
- public EReference securityERef;
+ public RoleMappingsType securityERef;
Text roleNameText;
@@ -59,7 +59,7 @@
* @param toolkit
* @param style
*/
- public SecuritySection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference securityERef) {
+ public SecuritySection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style, RoleMappingsType securityERef) {
super(plan, parent, toolkit, style);
this.securityERef = securityERef;
createClient();
@@ -97,9 +97,9 @@
*
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getEReference()
*/
- public EReference getEReference() {
- return SecurityPackage.eINSTANCE.getRoleMappingsType_Role();
- }
+// public EReference getEReference() {
+// return SecurityPackage.eINSTANCE.getRoleMappingsType_Role();
+// }
/*
* (non-Javadoc)
@@ -115,8 +115,8 @@
*
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getTableEntryObjectType()
*/
- public EClass getTableEntryObjectType() {
- return SecurityPackage.eINSTANCE.getRoleType();
+ public Class getTableEntryObjectType() {
+ return RoleType.class;
}
/*
@@ -183,7 +183,7 @@
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getInput()
*/
public Object getInput() {
- SecurityType secType = (SecurityType) getPlan().eGet(securityERef);
+ SecurityType secType = JAXBModelUtils.getSecurityType(getPlan());//
if (secType != null) {
return secType.getRoleMappings();
}
@@ -220,6 +220,23 @@
* @see org.apache.geronimo.st.ui.sections.AbstractTableSection#getAdapterFactory()
*/
public AdapterFactory getAdapterFactory() {
- return EMFEditorContext.getFactory();
+ return new AdapterFactory() {
+ public Object[] getElements(Object inputElement) {
+ if (!RoleMappingsType.class.isInstance(inputElement)) {
+ return new String[] { "" };
+ }
+ RoleMappingsType plan = (RoleMappingsType)inputElement;
+ return plan.getRole().toArray();
+ }
+ public String getColumnText(Object element, int columnIndex) {
+ if (RoleType.class.isInstance(element)) {
+ RoleType role = (RoleType)element;
+ switch (columnIndex) {
+ case 0: return role.getRoleName();
+ }
+ }
+ return null;
+ }
+ };
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ServiceRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ServiceRefSection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ServiceRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ServiceRefSection.java Tue Mar 11 10:53:06 2008
@@ -16,26 +16,27 @@
*/
package org.apache.geronimo.st.v20.ui.sections;
+import java.util.List;
+
+import javax.xml.bind.JAXBElement;
+
import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.providers.AdapterFactory;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v20.ui.internal.EMFEditorContext;
import org.apache.geronimo.st.v20.ui.wizards.ServiceRefWizard;
-import org.apache.geronimo.xml.ns.naming.NamingPackage;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
+import org.apache.geronimo.xml.ns.naming_1.ServiceRefType;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
public class ServiceRefSection extends AbstractTableSection {
- EReference serviceRefERef;
+ List serviceRefERef;
private static final String[] COLUMN_NAMES = new String[] { CommonMessages.editorServiceRefName };
- public ServiceRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference serviceRefERef) {
+ public ServiceRefSection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style, List serviceRefERef) {
super(plan, parent, toolkit, style);
this.serviceRefERef = serviceRefERef;
createClient();
@@ -68,14 +69,14 @@
return COLUMN_NAMES;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geronimo.ui.sections.AbstractTableSection#getEReference()
- */
- public EReference getEReference() {
- return serviceRefERef;
- }
+// /*
+// * (non-Javadoc)
+// *
+// * @see org.apache.geronimo.ui.sections.AbstractTableSection#getEReference()
+// */
+// public EReference getEReference() {
+// return serviceRefERef;
+// }
/*
* (non-Javadoc)
@@ -91,16 +92,16 @@
*
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getTableEntryObjectType()
*/
- public EClass getTableEntryObjectType() {
- return NamingPackage.eINSTANCE.getServiceRefType();
+ public Class getTableEntryObjectType() {
+ return ServiceRefType.class;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geronimo.st.ui.sections.AbstractTableSection#getAdapterFactory()
- */
- public AdapterFactory getAdapterFactory() {
- return EMFEditorContext.getFactory();
- }
+// /*
+// * (non-Javadoc)
+// *
+// * @see org.apache.geronimo.st.ui.sections.AbstractTableSection#getAdapterFactory()
+// */
+// public AdapterFactory getAdapterFactory() {
+// return EMFEditorContext.getFactory();
+// }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/WebContainerSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/WebContainerSection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/WebContainerSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/WebContainerSection.java Tue Mar 11 10:53:06 2008
@@ -16,15 +16,13 @@
*/
package org.apache.geronimo.st.v20.ui.sections;
+import javax.xml.bind.JAXBElement;
+
import org.apache.geronimo.st.ui.sections.AbstractSectionPart;
import org.apache.geronimo.st.v20.ui.internal.Messages;
-import org.apache.geronimo.xml.ns.j2ee.web.WebAppType;
-import org.apache.geronimo.xml.ns.naming.GbeanLocatorType;
-import org.apache.geronimo.xml.ns.naming.NamingFactory;
-import org.apache.geronimo.xml.ns.naming.NamingPackage;
-import org.apache.geronimo.xml.ns.naming.PatternType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
+import org.apache.geronimo.xml.ns.deployment_1.PatternType;
+import org.apache.geronimo.xml.ns.j2ee.web_2_0.WebAppType;
+import org.apache.geronimo.xml.ns.naming_1.GbeanLocatorType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -66,9 +64,9 @@
* @param style
* @param plan
*/
- public WebContainerSection(Composite parent, FormToolkit toolkit, int style, EObject plan) {
+ public WebContainerSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
super(parent, toolkit, style, plan);
- this.plan = (WebAppType) plan;
+ this.plan = (WebAppType) plan.getValue();
createClient();
}
@@ -118,7 +116,7 @@
group.setLayoutData(createTextFieldGridData());
group.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
- setPatternTypeAttribute(NamingPackage.eINSTANCE.getPatternType_GroupId(), group.getText());
+// setPatternTypeAttribute(NamingPackage.eINSTANCE.getPatternType_GroupId(), group.getText());
markDirty();
}
});
@@ -130,7 +128,7 @@
artifact.setLayoutData(createTextFieldGridData());
artifact.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
- setPatternTypeAttribute(NamingPackage.eINSTANCE.getPatternType_ArtifactId(), artifact.getText());
+// setPatternTypeAttribute(NamingPackage.eINSTANCE.getPatternType_ArtifactId(), artifact.getText());
markDirty();
}
});
@@ -142,7 +140,7 @@
module.setLayoutData(createTextFieldGridData());
module.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
- setPatternTypeAttribute(NamingPackage.eINSTANCE.getPatternType_Module(), module.getText());
+// setPatternTypeAttribute(NamingPackage.eINSTANCE.getPatternType_Module(), module.getText());
markDirty();
}
});
@@ -154,7 +152,7 @@
name.setLayoutData(createTextFieldGridData());
name.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
- setPatternTypeAttribute(NamingPackage.eINSTANCE.getPatternType_Name(), name.getText());
+// setPatternTypeAttribute(NamingPackage.eINSTANCE.getPatternType_Name(), name.getText());
markDirty();
}
});
@@ -166,7 +164,7 @@
version.setLayoutData(createTextFieldGridData());
version.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
- setPatternTypeAttribute(NamingPackage.eINSTANCE.getPatternType_Version(), version.getText());
+// setPatternTypeAttribute(NamingPackage.eINSTANCE.getPatternType_Version(), version.getText());
markDirty();
}
});
@@ -174,11 +172,11 @@
specifyAsLink.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
if (specifyAsLink.getSelection()) {
- if (plan.getWebContainer() != null
- && plan.getWebContainer().eIsSet(NamingPackage.eINSTANCE.getGbeanLocatorType_Pattern())) {
- plan.getWebContainer().eUnset(NamingPackage.eINSTANCE.getGbeanLocatorType_Pattern());
- markDirty();
- }
+// if (plan.getWebContainer() != null
+// && plan.getWebContainer().eIsSet(NamingPackage.eINSTANCE.getGbeanLocatorType_Pattern())) {
+// plan.getWebContainer().eUnset(NamingPackage.eINSTANCE.getGbeanLocatorType_Pattern());
+// markDirty();
+// }
if (gBeanLink.getText().length() > 0) {
plan.getWebContainer().setGbeanLink(gBeanLink.getText());
markDirty();
@@ -191,11 +189,11 @@
specifyAsPattern.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
if (specifyAsPattern.getSelection()) {
- if (plan.getWebContainer() != null
- && plan.getWebContainer().eIsSet(NamingPackage.eINSTANCE.getGbeanLocatorType_GbeanLink())) {
- plan.getWebContainer().eUnset(NamingPackage.eINSTANCE.getGbeanLocatorType_GbeanLink());
- markDirty();
- }
+// if (plan.getWebContainer() != null
+// && plan.getWebContainer().eIsSet(NamingPackage.eINSTANCE.getGbeanLocatorType_GbeanLink())) {
+// plan.getWebContainer().eUnset(NamingPackage.eINSTANCE.getGbeanLocatorType_GbeanLink());
+// markDirty();
+// }
if (group.getText().length() > 0) {
getPatternType().setGroupId(group.getText());
markDirty();
@@ -209,7 +207,7 @@
markDirty();
}
if (name.getText().length() > 0) {
- getPatternType().setName(name.getText());
+// getPatternType().setName(name.getText());
markDirty();
}
if (version.getText().length() > 0) {
@@ -245,7 +243,7 @@
private GbeanLocatorType getGBeanLocator() {
GbeanLocatorType wc = plan.getWebContainer();
if (wc == null) {
- wc = NamingFactory.eINSTANCE.createGbeanLocatorType();
+// wc = NamingFactory.eINSTANCE.createGbeanLocatorType();
plan.setWebContainer(wc);
}
return wc;
@@ -256,21 +254,21 @@
*/
private PatternType getPatternType() {
GbeanLocatorType locator = getGBeanLocator();
- PatternType pattern = locator.getPattern();
- if (pattern == null) {
- pattern = NamingFactory.eINSTANCE.createPatternType();
- locator.setPattern(pattern);
- }
- return pattern;
+// PatternType pattern = locator.getPattern();
+// if (pattern == null) {
+// pattern = NamingFactory.eINSTANCE.createPatternType();
+// locator.setPattern(pattern);
+// }
+ return null;//pattern;
}
/**
* @param feature
* @param value
*/
- private void setPatternTypeAttribute(EStructuralFeature feature, String value) {
- getPatternType().eSet(feature, value);
- }
+// private void setPatternTypeAttribute(EStructuralFeature feature, String value) {
+// getPatternType().eSet(feature, value);
+// }
protected Label createLabel(Composite parent, String text) {
Label label = toolkit.createLabel(parent, text);
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/WebGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/WebGeneralSection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/WebGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/WebGeneralSection.java Tue Mar 11 10:53:06 2008
@@ -16,11 +16,10 @@
*/
package org.apache.geronimo.st.v20.ui.sections;
+import javax.xml.bind.JAXBElement;
+
import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.xml.ns.j2ee.web.WebAppType;
-import org.apache.geronimo.xml.ns.j2ee.web.WebPackage;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
+import org.apache.geronimo.xml.ns.j2ee.web_2_0.WebAppType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -35,9 +34,9 @@
WebAppType plan;
- public WebGeneralSection(Composite parent, FormToolkit toolkit, int style, EObject plan) {
+ public WebGeneralSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
super(parent, toolkit, style, plan);
- this.plan = (WebAppType) plan;
+ this.plan = (WebAppType) plan.getValue();
createClient();
}
@@ -62,7 +61,7 @@
*
* @see org.apache.geronimo.st.v20.ui.sections.CommonGeneralSection#getEnvironmentEReference()
*/
- protected EReference getEnvironmentEReference() {
- return WebPackage.eINSTANCE.getWebAppType_Environment();
+ protected JAXBElement getEnvironmentEReference() {
+ return null; //WebPackage.eINSTANCE.getWebAppType_Environment();
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/DependencyWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/DependencyWizard.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/DependencyWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/DependencyWizard.java Tue Mar 11 10:53:06 2008
@@ -16,18 +16,15 @@
*/
package org.apache.geronimo.st.v20.ui.wizards;
+import javax.enterprise.deploy.spi.factories.DeploymentFactory;
+
import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.st.v20.ui.internal.Trace;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
-import org.apache.geronimo.xml.ns.deployment.ArtifactType;
-import org.apache.geronimo.xml.ns.deployment.DependenciesType;
-import org.apache.geronimo.xml.ns.deployment.DeploymentFactory;
-import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
-import org.apache.geronimo.xml.ns.deployment.EnvironmentType;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
+import org.apache.geronimo.st.v20.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;
@@ -72,23 +69,23 @@
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#getTableColumnEAttributes()
- */
- public EAttribute[] getTableColumnEAttributes() {
- return new EAttribute[] {};
- }
+// /*
+// * (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#getTableColumnEAttributes()
+// */
+// public EAttribute[] getTableColumnEAttributes() {
+// return new EAttribute[] {};
+// }
/*
* (non-Javadoc)
@@ -218,18 +215,18 @@
typeText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
if (eObject != null) {
- if (eObject.eIsSet(DeploymentPackage.eINSTANCE.getArtifactType_ArtifactId())) {
- artifactIdText.setText(eObject.eGet(DeploymentPackage.eINSTANCE.getArtifactType_ArtifactId()).toString());
- }
- if (eObject.eIsSet(DeploymentPackage.eINSTANCE.getArtifactType_GroupId())) {
- groupIdText.setText(eObject.eGet(DeploymentPackage.eINSTANCE.getArtifactType_GroupId()).toString());
- }
- if (eObject.eIsSet(DeploymentPackage.eINSTANCE.getArtifactType_Version())) {
- versionText.setText(eObject.eGet(DeploymentPackage.eINSTANCE.getArtifactType_Version()).toString());
- }
- if (eObject.eIsSet(DeploymentPackage.eINSTANCE.getArtifactType_Type())) {
- typeText.setText(eObject.eGet(DeploymentPackage.eINSTANCE.getArtifactType_Type()).toString());
- }
+// if (eObject.eIsSet(DeploymentPackage.eINSTANCE.getArtifactType_ArtifactId())) {
+// artifactIdText.setText(eObject.eGet(DeploymentPackage.eINSTANCE.getArtifactType_ArtifactId()).toString());
+// }
+// if (eObject.eIsSet(DeploymentPackage.eINSTANCE.getArtifactType_GroupId())) {
+// groupIdText.setText(eObject.eGet(DeploymentPackage.eINSTANCE.getArtifactType_GroupId()).toString());
+// }
+// if (eObject.eIsSet(DeploymentPackage.eINSTANCE.getArtifactType_Version())) {
+// versionText.setText(eObject.eGet(DeploymentPackage.eINSTANCE.getArtifactType_Version()).toString());
+// }
+// if (eObject.eIsSet(DeploymentPackage.eINSTANCE.getArtifactType_Type())) {
+// typeText.setText(eObject.eGet(DeploymentPackage.eINSTANCE.getArtifactType_Type()).toString());
+// }
}
setControl(composite);
@@ -252,14 +249,14 @@
// 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);
+// 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]);
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/EjbLocalRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/EjbLocalRefWizard.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/EjbLocalRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/EjbLocalRefWizard.java Tue Mar 11 10:53:06 2008
@@ -19,10 +19,6 @@
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.xml.ns.naming.NamingFactory;
-import org.apache.geronimo.xml.ns.naming.NamingPackage;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EFactory;
public class EjbLocalRefWizard extends AbstractTableWizard {
@@ -38,7 +34,7 @@
public String getAddWizardWindowTitle() {
return CommonMessages.wizardNewTitle_EjbLocalRef;
}
-
+/*
public EFactory getEFactory() {
return NamingFactory.eINSTANCE;
}
@@ -48,7 +44,7 @@
NamingPackage.eINSTANCE.getEjbLocalRefType_RefName(),
NamingPackage.eINSTANCE.getEjbLocalRefType_EjbLink() };
}
-
+*/
/*
* (non-Javadoc)
*
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/EjbRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/EjbRefWizard.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/EjbRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/EjbRefWizard.java Tue Mar 11 10:53:06 2008
@@ -19,17 +19,13 @@
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.xml.ns.naming.NamingFactory;
-import org.apache.geronimo.xml.ns.naming.NamingPackage;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EFactory;
public class EjbRefWizard extends AbstractTableWizard {
public EjbRefWizard(AbstractTableSection section) {
super(section);
}
-
+/*
public EFactory getEFactory() {
return NamingFactory.eINSTANCE;
}
@@ -39,7 +35,7 @@
NamingPackage.eINSTANCE.getEjbRefType_RefName(),
NamingPackage.eINSTANCE.getEjbRefType_EjbLink() };
}
-
+*/
/*
* (non-Javadoc)
*
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/GBeanRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/GBeanRefWizard.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/GBeanRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/GBeanRefWizard.java Tue Mar 11 10:53:06 2008
@@ -19,17 +19,13 @@
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.xml.ns.naming.NamingFactory;
-import org.apache.geronimo.xml.ns.naming.NamingPackage;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EFactory;
public class GBeanRefWizard extends AbstractTableWizard {
public GBeanRefWizard(AbstractTableSection section) {
super(section);
}
-
+/*
public EFactory getEFactory() {
return NamingFactory.eINSTANCE;
}
@@ -39,7 +35,7 @@
NamingPackage.eINSTANCE.getGbeanRefType_RefName(),
NamingPackage.eINSTANCE.getGbeanRefType_RefType()};
}
-
+*/
/*
* (non-Javadoc)
*
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/GBeanWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/GBeanWizard.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/GBeanWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/GBeanWizard.java Tue Mar 11 10:53:06 2008
@@ -16,13 +16,11 @@
*/
package org.apache.geronimo.st.v20.ui.wizards;
+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.xml.ns.deployment.DeploymentFactory;
-import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EFactory;
+import org.apache.geronimo.st.v20.core.jaxb.JAXBObjectFactoryImpl;
public class GBeanWizard extends AbstractTableWizard {
@@ -33,14 +31,12 @@
super(section);
}
- public EFactory getEFactory() {
- return DeploymentFactory.eINSTANCE;
+ public JAXBObjectFactory getEFactory() {
+ return JAXBObjectFactoryImpl.getInstance();
}
-
- public EAttribute[] getTableColumnEAttributes() {
- return new EAttribute[] {
- DeploymentPackage.eINSTANCE.getGbeanType_Name(),
- DeploymentPackage.eINSTANCE.getGbeanType_Class() };
+
+ public String[] getTableColumnEAttributes() {
+ return new String[] { "Name", "Clazz" };
}
/*
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/ResourceEnvRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/ResourceEnvRefWizard.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/ResourceEnvRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/ResourceEnvRefWizard.java Tue Mar 11 10:53:06 2008
@@ -19,10 +19,6 @@
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.xml.ns.naming.NamingFactory;
-import org.apache.geronimo.xml.ns.naming.NamingPackage;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EFactory;
public class ResourceEnvRefWizard extends AbstractTableWizard {
@@ -32,7 +28,7 @@
public ResourceEnvRefWizard(AbstractTableSection section) {
super(section);
}
-
+/*
public EFactory getEFactory() {
return NamingFactory.eINSTANCE;
}
@@ -42,7 +38,7 @@
NamingPackage.eINSTANCE.getResourceEnvRefType_RefName(),
NamingPackage.eINSTANCE.getResourceEnvRefType_MessageDestinationLink() };
}
-
+*/
/*
* (non-Javadoc)
*
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/ResourceRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/ResourceRefWizard.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/ResourceRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/ResourceRefWizard.java Tue Mar 11 10:53:06 2008
@@ -16,13 +16,11 @@
*/
package org.apache.geronimo.st.v20.ui.wizards;
+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.xml.ns.naming.NamingFactory;
-import org.apache.geronimo.xml.ns.naming.NamingPackage;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EFactory;
+import org.apache.geronimo.st.v20.core.jaxb.JAXBObjectFactoryImpl;
public class ResourceRefWizard extends AbstractTableWizard {
@@ -33,14 +31,12 @@
super(section);
}
- public EFactory getEFactory() {
- return NamingFactory.eINSTANCE;
+ public JAXBObjectFactory getEFactory() {
+ return JAXBObjectFactoryImpl.getInstance();
}
- public EAttribute[] getTableColumnEAttributes() {
- return new EAttribute[] {
- NamingPackage.eINSTANCE.getResourceRefType_RefName(),
- NamingPackage.eINSTANCE.getResourceRefType_ResourceLink() };
+ public String[] getTableColumnEAttributes() {
+ return new String[] { "RefName", "ResourceLink" };
}
/*
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/SecurityRoleWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/SecurityRoleWizard.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/SecurityRoleWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/SecurityRoleWizard.java Tue Mar 11 10:53:06 2008
@@ -16,19 +16,19 @@
*/
package org.apache.geronimo.st.v20.ui.wizards;
+import javax.xml.bind.JAXBElement;
+
+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.v20.core.jaxb.JAXBModelUtils;
+import org.apache.geronimo.st.v20.core.jaxb.JAXBObjectFactoryImpl;
import org.apache.geronimo.st.v20.ui.sections.SecuritySection;
-import org.apache.geronimo.xml.ns.security.DescriptionType;
-import org.apache.geronimo.xml.ns.security.RoleMappingsType;
-import org.apache.geronimo.xml.ns.security.RoleType;
-import org.apache.geronimo.xml.ns.security.SecurityFactory;
-import org.apache.geronimo.xml.ns.security.SecurityPackage;
-import org.apache.geronimo.xml.ns.security.SecurityType;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
+import org.apache.geronimo.xml.ns.security_2.DescriptionType;
+import org.apache.geronimo.xml.ns.security_2.RoleMappingsType;
+import org.apache.geronimo.xml.ns.security_2.RoleType;
+import org.apache.geronimo.xml.ns.security_2.SecurityType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
@@ -41,12 +41,12 @@
super(section);
}
- public EFactory getEFactory() {
- return SecurityFactory.eINSTANCE;
+ public JAXBObjectFactory getEFactory() {
+ return JAXBObjectFactoryImpl.getInstance();
}
- public EAttribute[] getTableColumnEAttributes() {
- return new EAttribute[] { SecurityPackage.eINSTANCE.getRoleType_RoleName() };
+ public String[] getTableColumnEAttributes() {
+ return new String[] { "RoleName" };
}
public String getAddWizardWindowTitle() {
@@ -110,7 +110,7 @@
RoleType roleType = (RoleType) eObject;
if (!roleType.getDescription().isEmpty()) {
DescriptionType desc = (DescriptionType) roleType.getDescription().get(0);
- if (desc.eIsSet(SecurityPackage.eINSTANCE.getDescriptionType_Value())) {
+ if (desc.getValue() != null) {
descriptionText.setText(desc.getValue());
}
}
@@ -122,22 +122,22 @@
SecurityRoleWizardPage page = (SecurityRoleWizardPage) getPages()[0];
if (eObject == null) {
- eObject = getEFactory().create(getTableColumnEAttributes()[0].getEContainingClass());
- EObject plan = section.getPlan();
+ eObject = getEFactory().create(RoleType.class);
+ JAXBElement plan = section.getPlan();
- SecurityType securityType = (SecurityType) plan.eGet(((SecuritySection) section).securityERef);
+ SecurityType securityType = JAXBModelUtils.getSecurityType(plan);
if (securityType == null) {
- securityType = SecurityFactory.eINSTANCE.createSecurityType();
- plan.eSet(((SecuritySection) section).securityERef, securityType);
+ securityType = (SecurityType)getEFactory().create(SecurityType.class);
+ JAXBModelUtils.setSecurityType(plan, securityType);
}
RoleMappingsType roleMappingsType = securityType.getRoleMappings();
if (roleMappingsType == null) {
- roleMappingsType = SecurityFactory.eINSTANCE.createRoleMappingsType();
+ roleMappingsType = (RoleMappingsType)getEFactory().create(RoleMappingsType.class);
securityType.setRoleMappings(roleMappingsType);
}
- roleMappingsType.getRole().add(eObject);
+ roleMappingsType.getRole().add((RoleType)eObject);
}
processEAttributes(page);
@@ -145,7 +145,7 @@
DescriptionType type = null;
RoleType roleType = ((RoleType) eObject);
if (roleType.getDescription().isEmpty()) {
- type = SecurityFactory.eINSTANCE.createDescriptionType();
+ type = (DescriptionType)getEFactory().create(DescriptionType.class);
roleType.getDescription().add(type);
} else {
type = (DescriptionType) roleType.getDescription().get(0);
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/ServiceRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/ServiceRefWizard.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/ServiceRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/ServiceRefWizard.java Tue Mar 11 10:53:06 2008
@@ -19,10 +19,6 @@
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.xml.ns.naming.NamingFactory;
-import org.apache.geronimo.xml.ns.naming.NamingPackage;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EFactory;
public class ServiceRefWizard extends AbstractTableWizard {
@@ -32,7 +28,7 @@
public ServiceRefWizard(AbstractTableSection section) {
super(section);
}
-
+/*
public EFactory getEFactory() {
return NamingFactory.eINSTANCE;
}
@@ -40,7 +36,7 @@
public EAttribute[] getTableColumnEAttributes() {
return new EAttribute[] { NamingPackage.eINSTANCE.getServiceRefType_ServiceRefName() };
}
-
+*/
/*
* (non-Javadoc)
*
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java Tue Mar 11 10:53:06 2008
@@ -18,15 +18,13 @@
import java.io.IOException;
-import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
import org.apache.geronimo.deployment.xbeans.EnvironmentDocument;
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.st.core.GeronimoUtils;
import org.apache.geronimo.st.core.internal.Trace;
+import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
import org.apache.geronimo.xml.ns.deployment_1.ArtifactType;
import org.apache.geronimo.xml.ns.deployment_1.EnvironmentType;
import org.apache.geronimo.xml.ns.j2ee.application_2.ApplicationType;
@@ -38,7 +36,6 @@
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.server.core.IModule;
@@ -218,7 +215,7 @@
// if (resource != null) {
// return((org.apache.geronimo.xml.ns.j2ee.application.DocumentRoot) resource.getContents().get(0)).getApplication();
// }
- return unmarshalDeploymentPlan( file );
+ return JAXBModelUtils.unmarshalDeploymentPlan( file );
}
Trace.tracePoint("EXIT", "GeronimoV21Utils.getApplicationDeploymentPlan", null);
@@ -235,7 +232,7 @@
// if (resource != null) {
// return((DocumentRoot) resource.getContents().get(0)).getWebApp();
// }
- return unmarshalDeploymentPlan( file );
+ return JAXBModelUtils.unmarshalDeploymentPlan( file );
}
Trace.tracePoint("EXIT", "GeronimoV21Utils.getWebDeploymentPlan", null);
@@ -252,7 +249,7 @@
// if (resource != null) {
// return((org.openejb.xml.ns.openejb.jar.DocumentRoot) resource.getContents().get(0)).getOpenejbJar();
// }
- return unmarshalDeploymentPlan( file );
+ return JAXBModelUtils.unmarshalDeploymentPlan( file );
}
Trace.tracePoint("EXIT", "GeronimoV21Utils.getOpenEjbDeploymentPlan", null);
@@ -269,24 +266,11 @@
// if (resource != null) {
// return((org.apache.geronimo.xml.ns.j2ee.connector.DocumentRoot) resource.getContents().get(0)).getConnector();
// }
- return unmarshalDeploymentPlan( file );
+ return JAXBModelUtils.unmarshalDeploymentPlan( file );
}
Trace.tracePoint("EXIT", "GeronimoV21Utils.getConnectorDeploymentPlan", null);
return null;
}
- private static JAXBElement unmarshalDeploymentPlan( IFile file ) {
- try {
- JAXBContext jb = JAXBContext.newInstance( "org.apache.geronimo.xml.ns.j2ee.web_2_0:org.apache.geronimo.xml.ns.j2ee.application_2:org.apache.geronimo.xml.ns.deployment_1:org.apache.geronimo.xml.ns.naming_1:org.apache.geronimo.xml.ns.security_2", Activator.class.getClassLoader() );
- Unmarshaller ums = jb.createUnmarshaller();
- JAXBElement plan = (JAXBElement)ums.unmarshal( file.getContents() );
- return plan;
- } catch ( JAXBException e ) {
- e.printStackTrace();
- } catch ( CoreException e ) {
- e.printStackTrace();
- }
- return null;
- }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/jaxb/JAXBModelUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/jaxb/JAXBModelUtils.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/jaxb/JAXBModelUtils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/jaxb/JAXBModelUtils.java Tue Mar 11 10:53:06 2008
@@ -18,11 +18,17 @@
import java.util.List;
+import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import org.apache.geronimo.st.v21.core.Activator;
import org.apache.geronimo.xml.ns.deployment_1.EnvironmentType;
import org.apache.geronimo.xml.ns.j2ee.web_2_0.WebAppType;
import org.apache.geronimo.xml.ns.security_2.SecurityType;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
/**
* @version $Rev$ $Date$
@@ -47,6 +53,7 @@
public static EnvironmentType getEnvironmentType(JAXBElement element) {
Object plan = element.getValue();
if ( WebAppType.class.isInstance( plan ) ) {
+ System.out.println( "Element : " + ((WebAppType)plan).getEnvironment() );
return ((WebAppType)plan).getEnvironment() == null ? null : ((WebAppType)plan).getEnvironment();
}
return null;
@@ -56,6 +63,30 @@
Object plan = element.getValue();
if ( WebAppType.class.isInstance( plan ) ) {
return ((WebAppType)plan).getServiceOrPersistence() == null ? null : ((WebAppType)plan).getServiceOrPersistence();
+ }
+ return null;
+ }
+
+ public static List getGbeans(JAXBElement element) {
+ Object plan = element.getValue();
+ if ( WebAppType.class.isInstance( plan ) ) {
+// return ((WebAppType)plan).getGbeans() == null ? null : ((WebAppType)plan).getGbeans();
+ }
+ return null;
+ }
+
+ public static JAXBElement unmarshalDeploymentPlan( IFile file ) {
+ try {
+ JAXBContext jb = JAXBContext.newInstance( "org.apache.geronimo.xml.ns.j2ee.web_2_0:org.apache.geronimo.xml.ns.j2ee.application_2:org.apache.geronimo.xml.ns.deployment_1:org.apache.geronimo.xml.ns.naming_1:org.apache.geronimo.xml.ns.security_2", Activator.class.getClassLoader() );
+ Unmarshaller ums = jb.createUnmarshaller();
+ JAXBElement plan = (JAXBElement)ums.unmarshal( file.getContents() );
+ return plan;
+ } catch ( JAXBException e ) {
+ e.printStackTrace();
+ } catch ( CoreException e ) {
+ e.printStackTrace();
+ } catch ( Exception e ) {
+ e.printStackTrace();
}
return null;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/jaxb/JAXBObjectFactoryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/jaxb/JAXBObjectFactoryImpl.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/jaxb/JAXBObjectFactoryImpl.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/jaxb/JAXBObjectFactoryImpl.java Tue Mar 11 10:53:06 2008
@@ -17,6 +17,9 @@
package org.apache.geronimo.st.v21.core.jaxb;
import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory;
+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.DependencyType;
import org.apache.geronimo.xml.ns.deployment_1.GbeanType;
import org.apache.geronimo.xml.ns.naming_1.ObjectFactory;
import org.apache.geronimo.xml.ns.naming_1.ResourceRefType;
@@ -54,6 +57,12 @@
return (new org.apache.geronimo.xml.ns.security_2.ObjectFactory()).createRoleType();
} else if ( type.equals( GbeanType.class ) ) {
return (new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory()).createGbeanType();
+ } else if ( type.equals( ArtifactType.class ) ) {
+ return (new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory()).createArtifactType();
+ } else if ( type.equals( DependenciesType.class ) ) {
+ return (new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory()).createDependenciesType();
+ } else if ( type.equals( DependencyType.class ) ) {
+ return (new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory()).createDependencyType();
}
return null;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.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/pages/DeploymentPage.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/pages/DeploymentPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java Tue Mar 11 10:53:06 2008
@@ -31,7 +31,7 @@
// public EnvironmentType environment;
- public JAXBElement gbeanERef;
+// public JAXBElement gbeanERef;
public DeploymentPage(FormEditor editor, String id, String title) {
super(editor, id, title);
@@ -44,7 +44,7 @@
*/
protected void fillBody(IManagedForm managedForm) {
managedForm.addPart(new DependencySection(getDeploymentPlan(), JAXBModelUtils.getEnvironmentType(getDeploymentPlan()), body, toolkit, getStyle()));
- managedForm.addPart(new GBeanSection(getDeploymentPlan(), JAXBModelUtils.getServiceOrPersistence(getDeploymentPlan()), body, toolkit, getStyle()));
+ managedForm.addPart(new GBeanSection(getDeploymentPlan(), JAXBModelUtils.getGbeans(getDeploymentPlan()), body, toolkit, getStyle()));
}
/*
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/pages/SecurityPage.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/pages/SecurityPage.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/pages/SecurityPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/pages/SecurityPage.java Tue Mar 11 10:53:06 2008
@@ -41,7 +41,7 @@
*/
protected void fillBody(IManagedForm managedForm) {
managedForm.addPart(new SecurityRootSection(body, toolkit, getStyle(), getDeploymentPlan(), security));
- managedForm.addPart(new SecuritySection(getDeploymentPlan(), body, toolkit, getStyle(), security.getRoleMappings()));
+ managedForm.addPart(new SecuritySection(getDeploymentPlan(), body, toolkit, getStyle(), security == null ? null : security.getRoleMappings()));
}
/*
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/DependencySection.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/DependencySection.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/DependencySection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/DependencySection.java Tue Mar 11 10:53:06 2008
@@ -23,13 +23,12 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.providers.AdapterFactory;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
+import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
import org.apache.geronimo.st.v21.ui.Activator;
import org.apache.geronimo.st.v21.ui.wizards.DependencyWizard;
import org.apache.geronimo.xml.ns.deployment_1.DependenciesType;
import org.apache.geronimo.xml.ns.deployment_1.DependencyType;
import org.apache.geronimo.xml.ns.deployment_1.EnvironmentType;
-import org.apache.geronimo.xml.ns.j2ee.web_2_0.WebAppType;
-import org.apache.geronimo.xml.ns.naming_1.ResourceRefType;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
@@ -70,6 +69,10 @@
}
public List getObjectContainer() {
+ if ( environment.getDependencies() == null ) {
+ DependenciesType dependencies = (DependenciesType)JAXBObjectFactoryImpl.getInstance().create(DependenciesType.class);
+ environment.setDependencies(dependencies);
+ }
return environment.getDependencies().getDependency();
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/EjbLocalRefSection.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/EjbLocalRefSection.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/EjbLocalRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/EjbLocalRefSection.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 EjbLocalRefSection extends AbstractTableSection {
- Object ejbLocalRefERef;
+ List ejbLocalRefERef;
private static final String[] COLUMN_NAMES = new String[] {
CommonMessages.name,
CommonMessages.editorEjbRefEjbLink };
- public EjbLocalRefSection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style, Object ejbLocalRefERef) {
+ public EjbLocalRefSection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style, List ejbLocalRefERef) {
super(plan, parent, toolkit, style);
this.ejbLocalRefERef = ejbLocalRefERef;
createClient();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/EjbRefSection.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/EjbRefSection.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/EjbRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/EjbRefSection.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,7 +32,7 @@
public class EjbRefSection extends AbstractTableSection {
- Object ejbRefERef;
+ List ejbRefERef;
private static final String[] COLUMN_NAMES = new String[] {
CommonMessages.name,
@@ -42,7 +44,7 @@
* @param toolkit
* @param style
*/
- public EjbRefSection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style, Object ejbRefERef) {
+ public EjbRefSection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style, List ejbRefERef) {
super(plan, parent, toolkit, style);
this.ejbRefERef = ejbRefERef;
createClient();