geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bjr...@apache.org
Subject svn commit: r707635 - in /geronimo/devtools/eclipse-plugin: branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/ branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21...
Date Fri, 24 Oct 2008 13:55:30 GMT
Author: bjreed
Date: Fri Oct 24 06:55:28 2008
New Revision: 707635

URL: http://svn.apache.org/viewvc?rev=707635&view=rev
Log:
minor cleanup changes at Abstraction level of GEP ui

Removed:
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientDeploymentPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientDeploymentPage.java
Modified:
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractListSection.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTableSection.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTreeSection.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersUnitRefSection.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServiceRefSection.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractListSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTableSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTreeSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersUnitRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServiceRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractListSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractListSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractListSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractListSection.java Fri Oct 24 06:55:28 2008
@@ -164,8 +164,6 @@
         return composite;
     }
 
-    protected abstract void createViewer(Composite composite);
-
     protected Composite createButtonComposite(Composite parent) {
         Composite buttonComp = new Composite(parent, SWT.NONE);
         GridLayout layout = new GridLayout();
@@ -193,8 +191,6 @@
         removeButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
     }
 
-    protected abstract void handleDelete();
-
     protected void createAddButton(FormToolkit toolkit, Composite buttonComp) {
         addButton = toolkit.createButton(buttonComp, CommonMessages.add, SWT.NONE);
         addButton.addSelectionListener(new SelectionAdapter() {
@@ -256,22 +252,6 @@
         activateButton(removeButton);
     }
 
-    protected abstract void activateButton(Button button);
-
-    abstract public String getTitle();
-
-    abstract public String getDescription();
-
-    abstract protected Wizard getWizard();
-
-    abstract public Class getTableEntryObjectType();
-
-    protected String[] COLUMN_NAMES = new String[] {};
-
-    public String[] getTableColumnNames() {
-        return COLUMN_NAMES;
-    }
-
     public ColumnViewer getViewer() {
         return viewer;
     }
@@ -352,4 +332,18 @@
     public IBaseLabelProvider getLabelProvider() {
         return new LabelProvider();
     }
+
+    abstract protected void createViewer(Composite composite);
+
+    abstract protected void handleDelete();
+
+    abstract protected void activateButton(Button button);
+
+    abstract public String getTitle();
+
+    abstract public String getDescription();
+
+    abstract protected Wizard getWizard();
+
+    abstract public Class getTableEntryObjectType();
 }

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTableSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTableSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTableSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTableSection.java Fri Oct 24 06:55:28 2008
@@ -25,7 +25,6 @@
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -46,8 +45,10 @@
 
     protected Table table;
 
-    public Listener sortListener = null;
+    protected String[] COLUMN_NAMES = new String[] {};
 
+    public Listener sortListener = null;
+    
     public AbstractTableSection(Section section) {
         super(section);
     }
@@ -131,5 +132,7 @@
         button.setEnabled(selected);
     }
 
-    abstract protected Wizard getWizard();
+    public String[] getTableColumnNames() {
+        return COLUMN_NAMES;
+    }
 }

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTreeSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTreeSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTreeSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTreeSection.java Fri Oct 24 06:55:28 2008
@@ -84,4 +84,6 @@
     protected void activateButton(Button button) {
         button.setEnabled(tree.getSelectionCount() > 0);
     }
+
+    abstract public Object getSelectedObject();
 }

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java Fri Oct 24 06:55:28 2008
@@ -27,7 +27,6 @@
 import org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader;
 import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
 import org.apache.geronimo.st.v21.core.GeronimoV21Utils;
-import org.apache.geronimo.st.v21.ui.pages.AppClientDeploymentPage;
 import org.apache.geronimo.st.v21.ui.pages.AppClientGeneralPage;
 import org.apache.geronimo.st.v21.ui.pages.AppClientSecurityPage;
 import org.apache.geronimo.st.v21.ui.pages.AppGeneralPage;
@@ -76,7 +75,7 @@
         editor.addPage(new AppClientGeneralPage(editor, "appclientgeneralpage", CommonMessages.editorTabGeneral));
         editor.addPage(createNamingFormPage(editor));
         editor.addPage(new AppClientSecurityPage(editor, "securitypage", CommonMessages.editorTabSecurity));
-        editor.addPage(new AppClientDeploymentPage(editor, "deploymentpage", CommonMessages.editorTabDeployment));
+        editor.addPage(createDeploymentFormPage(editor));
     }
 
     /*

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java Fri Oct 24 06:55:28 2008
@@ -17,6 +17,7 @@
 package org.apache.geronimo.st.v21.ui.pages;
 
 import org.apache.geronimo.jee.application.Application;
+import org.apache.geronimo.jee.applicationclient.ApplicationClient;
 import org.apache.geronimo.jee.connector.Connector;
 import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
@@ -52,15 +53,21 @@
         managedForm.addPart(new GBeanSection(getDeploymentPlan(), JAXBModelUtils.getGbeans(getDeploymentPlan()), body, toolkit, getStyle()));
         managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan()), body, toolkit, getStyle(), true, true));
         managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan()), body, toolkit, getStyle(), true, false));
+
         if (Application.class.isInstance(getDeploymentPlan().getValue())) {
             Application application = (Application)((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue();
             managedForm.addPart(new ModuleSection(getDeploymentPlan(), body, toolkit, getStyle(), application.getModule()));
             managedForm.addPart(new ExtModuleSection(getDeploymentPlan(), body, toolkit, getStyle(), application.getExtModule()));
-        }
+        } 
         if (Connector.class.isInstance(getDeploymentPlan().getValue())) {
             Connector connector = (Connector)((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue();
             managedForm.addPart(new AdminObjectSection(getDeploymentPlan(), body, toolkit, getStyle(), connector.getAdminobject()));
         }
+        if (ApplicationClient.class.isInstance(getDeploymentPlan().getValue())) {
+            managedForm.addPart(new DependencySection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan(), false), body, toolkit, getStyle(), false));
+            managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan(), false), body, toolkit, getStyle(), false, true));
+            managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan(), false), body, toolkit, getStyle(), false, false));
+        }
     }
     
     protected GridLayout getLayout() {

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java Fri Oct 24 06:55:28 2008
@@ -93,7 +93,7 @@
         }
     }
 
-    public GbeanRef getSelectedGbeanRef () {
+    public GbeanRef getSelectedObject () {
         if (tree.getSelection().length == 0) {
             return null;
         }

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java Fri Oct 24 06:55:28 2008
@@ -75,7 +75,7 @@
         }
     }
 
-    public Gbean getSelectedGbean () {
+    public Gbean getSelectedObject () {
         if (tree.getSelection().length == 0) {
             return null;
         }

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.java Fri Oct 24 06:55:28 2008
@@ -88,7 +88,7 @@
         }
     }
 
-    public PersistenceContextRef getSelectedPersContext () {
+    public PersistenceContextRef getSelectedObject () {
         if (tree.getSelection().length == 0) {
             return null;
         }

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersUnitRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersUnitRefSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersUnitRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersUnitRefSection.java Fri Oct 24 06:55:28 2008
@@ -87,7 +87,7 @@
         }
     }
 
-    public PersistenceUnitRef getSelectedPersContext () {
+    public PersistenceUnitRef getSelectedObject () {
         if (tree.getSelection().length == 0) {
             return null;
         }

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java Fri Oct 24 06:55:28 2008
@@ -115,7 +115,7 @@
         ((ArrayList) JAXBUtils.getValue(role, selectedObject.getClass().getSimpleName())).remove(selectedObject);
     }
 
-    public Role getSelectedRoleDuringAdd() {
+    public Role getSelectedObject() {
         return (Role) tree.getSelection()[0].getData();
     }
 

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServiceRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServiceRefSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServiceRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServiceRefSection.java Fri Oct 24 06:55:28 2008
@@ -74,7 +74,7 @@
         }
     }
 
-    public ServiceRef getSelectedServiceRef () {
+    public ServiceRef getSelectedObject () {
         if (tree.getSelection().length == 0) {
             return null;
         }

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java Fri Oct 24 06:55:28 2008
@@ -28,7 +28,6 @@
 import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
-import org.apache.geronimo.st.v21.ui.sections.GBeanRefSection;
 
 /**
  * @version $Rev$ $Date$
@@ -85,7 +84,7 @@
         protected void initControl () {
             if (eObject == null) {
                 element.select(GBEAN_REF);
-                GbeanRef gbeanRef = ((GBeanRefSection)section).getSelectedGbeanRef();
+                GbeanRef gbeanRef = (GbeanRef)section.getSelectedObject();
                 if (gbeanRef == null) {
                     element.setEnabled(false);
                 }
@@ -172,7 +171,7 @@
                 return false;
             }
             String type = (String)eObject;
-            gbeanRef = ((GBeanRefSection)section).getSelectedGbeanRef();
+            gbeanRef = (GbeanRef)section.getSelectedObject();
             if (type == null) {
                 gbeanRef.getRefType().add(textList.get(0).getText());
             }
@@ -187,7 +186,7 @@
             Pattern pattern = (Pattern)eObject;
             if (pattern == null) {
                 pattern = (Pattern)getEFactory().create(Pattern.class);
-                gbeanRef = ((GBeanRefSection)section).getSelectedGbeanRef();
+                gbeanRef = (GbeanRef)section.getSelectedObject();
                 gbeanRef.getPattern().add(pattern);
             }
             pattern.setName(textList.get(0).getText());

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java Fri Oct 24 06:55:28 2008
@@ -29,7 +29,6 @@
 import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
-import org.apache.geronimo.st.v21.ui.sections.GBeanSection;
 
 /**
  * @version $Rev$ $Date$
@@ -58,7 +57,7 @@
         protected void initControl() {
             if (eObject == null) {
                 element.select(GBEAN);
-                if (((GBeanSection)section).getSelectedGbean() == null) {
+                if (section.getSelectedObject() == null) {
                     element.setEnabled(false);
                 }
             }
@@ -200,7 +199,7 @@
             Attribute attribute = (Attribute)eObject;
             if (attribute == null) {
                 attribute = (Attribute)getEFactory().create(Attribute.class);
-                gbean = ((GBeanSection)section).getSelectedGbean();
+                gbean = (Gbean)section.getSelectedObject();
                 
                 // add the JAXBElement of an Attribute, not the Attribute
                 ObjectFactory objectFactory = new ObjectFactory();
@@ -218,7 +217,7 @@
             Pattern dependency = (Pattern)eObject;
             if (dependency == null) {
                 dependency = (Pattern)getEFactory().create(Pattern.class);
-                gbean = ((GBeanSection)section).getSelectedGbean();
+                gbean = (Gbean)section.getSelectedObject();
 
                 // add the JAXBElement of a Dependency, not the Dependency
                 ObjectFactory objectFactory = new ObjectFactory();
@@ -240,7 +239,7 @@
             Reference reference = (Reference)eObject;
             if (reference == null) {
                 reference = (Reference)getEFactory().create(Reference.class);
-                gbean = ((GBeanSection)section).getSelectedGbean();
+                gbean = (Gbean)section.getSelectedObject();
 
                 // add the JAXBElement of a Dependency, not the Dependency
                 ObjectFactory objectFactory = new ObjectFactory();

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java Fri Oct 24 06:55:28 2008
@@ -29,7 +29,6 @@
 import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
-import org.apache.geronimo.st.v21.ui.sections.PersContextRefSection;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Button;
@@ -141,7 +140,7 @@
         protected void initControl () {
             if (eObject == null) {
                 element.select(CONTEXT);
-                PersistenceContextRef contextRef = ((PersContextRefSection)section).getSelectedPersContext();
+                PersistenceContextRef contextRef = (PersistenceContextRef)section.getSelectedObject();
                 if (contextRef == null) {
                     element.setEnabled(false);
                 }
@@ -258,7 +257,7 @@
             Property property = (Property)eObject;
             if (property == null) {
                 property = (Property)getEFactory().create(Property.class);
-                contextRef = ((PersContextRefSection)section).getSelectedPersContext();
+                contextRef = (PersistenceContextRef)section.getSelectedObject();
                 contextRef.getProperty().add(property);
             }
             property.setKey(textList.get(0).getText());

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java Fri Oct 24 06:55:28 2008
@@ -29,7 +29,6 @@
 import org.apache.geronimo.st.ui.wizards.AbstractWizard;
 import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
-import org.apache.geronimo.st.v21.ui.sections.SecurityRoleMappingSection;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Combo;
@@ -154,7 +153,7 @@
             DistinguishedName distinguishedName = (DistinguishedName)eObject;
             if (distinguishedName == null) {
                 distinguishedName = (DistinguishedName)getEFactory().create(DistinguishedName.class);
-                Role role = ((SecurityRoleMappingSection) section).getSelectedRoleDuringAdd();
+                Role role = (Role) section.getSelectedObject();
                 role.getDistinguishedName().add(distinguishedName);
             }
             distinguishedName.setName(name.getText());
@@ -167,7 +166,7 @@
             Principal principal = (Principal)eObject;
             if (principal == null) {
                 principal = (Principal)getEFactory().create(Principal.class);
-                Role role = ((SecurityRoleMappingSection) section).getSelectedRoleDuringAdd();
+                Role role = (Role) section.getSelectedObject();
                 role.getPrincipal().add(principal);
             }
             principal.setName(name.getText());
@@ -181,7 +180,7 @@
             LoginDomainPrincipal loginDomainPrincipal = (LoginDomainPrincipal)eObject;
             if (loginDomainPrincipal == null) {
                 loginDomainPrincipal = (LoginDomainPrincipal)getEFactory().create(LoginDomainPrincipal.class);
-                Role role = ((SecurityRoleMappingSection) section).getSelectedRoleDuringAdd();
+                Role role = (Role) section.getSelectedObject();
                 role.getLoginDomainPrincipal().add(loginDomainPrincipal);
             }
             loginDomainPrincipal.setName(name.getText());
@@ -197,7 +196,7 @@
             RealmPrincipal realmPrincipal = (RealmPrincipal)eObject;
             if (realmPrincipal == null) {
                 realmPrincipal = (RealmPrincipal)getEFactory().create(RealmPrincipal.class);
-                Role role = ((SecurityRoleMappingSection) section).getSelectedRoleDuringAdd();
+                Role role = (Role) section.getSelectedObject();
                 role.getRealmPrincipal().add(realmPrincipal);
             }
             realmPrincipal.setName(name.getText());

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java Fri Oct 24 06:55:28 2008
@@ -28,7 +28,6 @@
 import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
-import org.apache.geronimo.st.v21.ui.sections.ServiceRefSection;
 
 /**
  * @version $Rev$ $Date$
@@ -55,7 +54,7 @@
         protected void initControl () {
             if (eObject == null) {
                 element.select(SERVICE_REF);
-                ServiceRef serviceRef = ((ServiceRefSection)section).getSelectedServiceRef();
+                ServiceRef serviceRef = (ServiceRef)section.getSelectedObject();
                 // use of ports and port completions are mutually exclusive
                 if (serviceRef == null) {
                     element.setEnabled(false);
@@ -187,7 +186,7 @@
             Port port = (Port)eObject;
             if (port == null) {
                 port = (Port)getEFactory().create(Port.class);
-                serviceRef = ((ServiceRefSection)section).getSelectedServiceRef();
+                serviceRef = (ServiceRef)section.getSelectedObject();
                 serviceRef.getPort().add(port);
             }
             port.setPortName(textList.get(0).getText());
@@ -205,7 +204,7 @@
             PortCompletion portComp = (PortCompletion)eObject;
             if (portComp == null) {
                 portComp = (PortCompletion)getEFactory().create(PortCompletion.class);
-                serviceRef = ((ServiceRefSection)section).getSelectedServiceRef();
+                serviceRef = (ServiceRef)section.getSelectedObject();
                 serviceRef.getServiceCompletion().getPortCompletion().add(portComp);
                 Port port = (Port)getEFactory().create(Port.class);
                 portComp.setPort (port);

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractListSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractListSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractListSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractListSection.java Fri Oct 24 06:55:28 2008
@@ -164,8 +164,6 @@
         return composite;
     }
 
-    protected abstract void createViewer(Composite composite);
-
     protected Composite createButtonComposite(Composite parent) {
         Composite buttonComp = new Composite(parent, SWT.NONE);
         GridLayout layout = new GridLayout();
@@ -193,8 +191,6 @@
         removeButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
     }
 
-    protected abstract void handleDelete();
-
     protected void createAddButton(FormToolkit toolkit, Composite buttonComp) {
         addButton = toolkit.createButton(buttonComp, CommonMessages.add, SWT.NONE);
         addButton.addSelectionListener(new SelectionAdapter() {
@@ -256,22 +252,6 @@
         activateButton(removeButton);
     }
 
-    protected abstract void activateButton(Button button);
-
-    abstract public String getTitle();
-
-    abstract public String getDescription();
-
-    abstract protected Wizard getWizard();
-
-    abstract public Class getTableEntryObjectType();
-
-    protected String[] COLUMN_NAMES = new String[] {};
-
-    public String[] getTableColumnNames() {
-        return COLUMN_NAMES;
-    }
-
     public ColumnViewer getViewer() {
         return viewer;
     }
@@ -352,4 +332,18 @@
     public IBaseLabelProvider getLabelProvider() {
         return new LabelProvider();
     }
+
+    abstract protected void createViewer(Composite composite);
+
+    abstract protected void handleDelete();
+
+    abstract protected void activateButton(Button button);
+
+    abstract public String getTitle();
+
+    abstract public String getDescription();
+
+    abstract protected Wizard getWizard();
+
+    abstract public Class getTableEntryObjectType();
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTableSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTableSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTableSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTableSection.java Fri Oct 24 06:55:28 2008
@@ -25,7 +25,6 @@
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -46,8 +45,10 @@
 
     protected Table table;
 
-    public Listener sortListener = null;
+    protected String[] COLUMN_NAMES = new String[] {};
 
+    public Listener sortListener = null;
+    
     public AbstractTableSection(Section section) {
         super(section);
     }
@@ -131,5 +132,7 @@
         button.setEnabled(selected);
     }
 
-    abstract protected Wizard getWizard();
+    public String[] getTableColumnNames() {
+        return COLUMN_NAMES;
+    }
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTreeSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTreeSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTreeSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTreeSection.java Fri Oct 24 06:55:28 2008
@@ -84,4 +84,6 @@
     protected void activateButton(Button button) {
         button.setEnabled(tree.getSelectionCount() > 0);
     }
+
+    abstract public Object getSelectedObject();
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java Fri Oct 24 06:55:28 2008
@@ -27,7 +27,6 @@
 import org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader;
 import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
 import org.apache.geronimo.st.v21.core.GeronimoV21Utils;
-import org.apache.geronimo.st.v21.ui.pages.AppClientDeploymentPage;
 import org.apache.geronimo.st.v21.ui.pages.AppClientGeneralPage;
 import org.apache.geronimo.st.v21.ui.pages.AppClientSecurityPage;
 import org.apache.geronimo.st.v21.ui.pages.AppGeneralPage;
@@ -76,7 +75,7 @@
         editor.addPage(new AppClientGeneralPage(editor, "appclientgeneralpage", CommonMessages.editorTabGeneral));
         editor.addPage(createNamingFormPage(editor));
         editor.addPage(new AppClientSecurityPage(editor, "securitypage", CommonMessages.editorTabSecurity));
-        editor.addPage(new AppClientDeploymentPage(editor, "deploymentpage", CommonMessages.editorTabDeployment));
+        editor.addPage(createDeploymentFormPage(editor));
     }
 
     /*

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/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/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java Fri Oct 24 06:55:28 2008
@@ -17,6 +17,7 @@
 package org.apache.geronimo.st.v21.ui.pages;
 
 import org.apache.geronimo.jee.application.Application;
+import org.apache.geronimo.jee.applicationclient.ApplicationClient;
 import org.apache.geronimo.jee.connector.Connector;
 import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
@@ -52,15 +53,21 @@
         managedForm.addPart(new GBeanSection(getDeploymentPlan(), JAXBModelUtils.getGbeans(getDeploymentPlan()), body, toolkit, getStyle()));
         managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan()), body, toolkit, getStyle(), true, true));
         managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan()), body, toolkit, getStyle(), true, false));
+
         if (Application.class.isInstance(getDeploymentPlan().getValue())) {
             Application application = (Application)((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue();
             managedForm.addPart(new ModuleSection(getDeploymentPlan(), body, toolkit, getStyle(), application.getModule()));
             managedForm.addPart(new ExtModuleSection(getDeploymentPlan(), body, toolkit, getStyle(), application.getExtModule()));
-        }
+        } 
         if (Connector.class.isInstance(getDeploymentPlan().getValue())) {
             Connector connector = (Connector)((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue();
             managedForm.addPart(new AdminObjectSection(getDeploymentPlan(), body, toolkit, getStyle(), connector.getAdminobject()));
         }
+        if (ApplicationClient.class.isInstance(getDeploymentPlan().getValue())) {
+            managedForm.addPart(new DependencySection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan(), false), body, toolkit, getStyle(), false));
+            managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan(), false), body, toolkit, getStyle(), false, true));
+            managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan(), false), body, toolkit, getStyle(), false, false));
+        }
     }
     
     protected GridLayout getLayout() {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java Fri Oct 24 06:55:28 2008
@@ -93,7 +93,7 @@
         }
     }
 
-    public GbeanRef getSelectedGbeanRef () {
+    public GbeanRef getSelectedObject () {
         if (tree.getSelection().length == 0) {
             return null;
         }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java Fri Oct 24 06:55:28 2008
@@ -75,7 +75,7 @@
         }
     }
 
-    public Gbean getSelectedGbean () {
+    public Gbean getSelectedObject () {
         if (tree.getSelection().length == 0) {
             return null;
         }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.java Fri Oct 24 06:55:28 2008
@@ -88,7 +88,7 @@
         }
     }
 
-    public PersistenceContextRef getSelectedPersContext () {
+    public PersistenceContextRef getSelectedObject () {
         if (tree.getSelection().length == 0) {
             return null;
         }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersUnitRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersUnitRefSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersUnitRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersUnitRefSection.java Fri Oct 24 06:55:28 2008
@@ -87,7 +87,7 @@
         }
     }
 
-    public PersistenceUnitRef getSelectedPersContext () {
+    public PersistenceUnitRef getSelectedObject () {
         if (tree.getSelection().length == 0) {
             return null;
         }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java Fri Oct 24 06:55:28 2008
@@ -115,7 +115,7 @@
         ((ArrayList) JAXBUtils.getValue(role, selectedObject.getClass().getSimpleName())).remove(selectedObject);
     }
 
-    public Role getSelectedRoleDuringAdd() {
+    public Role getSelectedObject() {
         return (Role) tree.getSelection()[0].getData();
     }
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServiceRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServiceRefSection.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServiceRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServiceRefSection.java Fri Oct 24 06:55:28 2008
@@ -74,7 +74,7 @@
         }
     }
 
-    public ServiceRef getSelectedServiceRef () {
+    public ServiceRef getSelectedObject () {
         if (tree.getSelection().length == 0) {
             return null;
         }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java Fri Oct 24 06:55:28 2008
@@ -28,7 +28,6 @@
 import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
-import org.apache.geronimo.st.v21.ui.sections.GBeanRefSection;
 
 /**
  * @version $Rev$ $Date$
@@ -85,7 +84,7 @@
         protected void initControl () {
             if (eObject == null) {
                 element.select(GBEAN_REF);
-                GbeanRef gbeanRef = ((GBeanRefSection)section).getSelectedGbeanRef();
+                GbeanRef gbeanRef = (GbeanRef)section.getSelectedObject();
                 if (gbeanRef == null) {
                     element.setEnabled(false);
                 }
@@ -172,7 +171,7 @@
                 return false;
             }
             String type = (String)eObject;
-            gbeanRef = ((GBeanRefSection)section).getSelectedGbeanRef();
+            gbeanRef = (GbeanRef)section.getSelectedObject();
             if (type == null) {
                 gbeanRef.getRefType().add(textList.get(0).getText());
             }
@@ -187,7 +186,7 @@
             Pattern pattern = (Pattern)eObject;
             if (pattern == null) {
                 pattern = (Pattern)getEFactory().create(Pattern.class);
-                gbeanRef = ((GBeanRefSection)section).getSelectedGbeanRef();
+                gbeanRef = (GbeanRef)section.getSelectedObject();
                 gbeanRef.getPattern().add(pattern);
             }
             pattern.setName(textList.get(0).getText());

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java Fri Oct 24 06:55:28 2008
@@ -29,7 +29,6 @@
 import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
-import org.apache.geronimo.st.v21.ui.sections.GBeanSection;
 
 /**
  * @version $Rev$ $Date$
@@ -58,7 +57,7 @@
         protected void initControl() {
             if (eObject == null) {
                 element.select(GBEAN);
-                if (((GBeanSection)section).getSelectedGbean() == null) {
+                if (section.getSelectedObject() == null) {
                     element.setEnabled(false);
                 }
             }
@@ -200,7 +199,7 @@
             Attribute attribute = (Attribute)eObject;
             if (attribute == null) {
                 attribute = (Attribute)getEFactory().create(Attribute.class);
-                gbean = ((GBeanSection)section).getSelectedGbean();
+                gbean = (Gbean)section.getSelectedObject();
                 
                 // add the JAXBElement of an Attribute, not the Attribute
                 ObjectFactory objectFactory = new ObjectFactory();
@@ -218,7 +217,7 @@
             Pattern dependency = (Pattern)eObject;
             if (dependency == null) {
                 dependency = (Pattern)getEFactory().create(Pattern.class);
-                gbean = ((GBeanSection)section).getSelectedGbean();
+                gbean = (Gbean)section.getSelectedObject();
 
                 // add the JAXBElement of a Dependency, not the Dependency
                 ObjectFactory objectFactory = new ObjectFactory();
@@ -240,7 +239,7 @@
             Reference reference = (Reference)eObject;
             if (reference == null) {
                 reference = (Reference)getEFactory().create(Reference.class);
-                gbean = ((GBeanSection)section).getSelectedGbean();
+                gbean = (Gbean)section.getSelectedObject();
 
                 // add the JAXBElement of a Dependency, not the Dependency
                 ObjectFactory objectFactory = new ObjectFactory();

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java Fri Oct 24 06:55:28 2008
@@ -29,7 +29,6 @@
 import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
-import org.apache.geronimo.st.v21.ui.sections.PersContextRefSection;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Button;
@@ -141,7 +140,7 @@
         protected void initControl () {
             if (eObject == null) {
                 element.select(CONTEXT);
-                PersistenceContextRef contextRef = ((PersContextRefSection)section).getSelectedPersContext();
+                PersistenceContextRef contextRef = (PersistenceContextRef)section.getSelectedObject();
                 if (contextRef == null) {
                     element.setEnabled(false);
                 }
@@ -258,7 +257,7 @@
             Property property = (Property)eObject;
             if (property == null) {
                 property = (Property)getEFactory().create(Property.class);
-                contextRef = ((PersContextRefSection)section).getSelectedPersContext();
+                contextRef = (PersistenceContextRef)section.getSelectedObject();
                 contextRef.getProperty().add(property);
             }
             property.setKey(textList.get(0).getText());

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java Fri Oct 24 06:55:28 2008
@@ -29,7 +29,6 @@
 import org.apache.geronimo.st.ui.wizards.AbstractWizard;
 import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
-import org.apache.geronimo.st.v21.ui.sections.SecurityRoleMappingSection;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Combo;
@@ -154,7 +153,7 @@
             DistinguishedName distinguishedName = (DistinguishedName)eObject;
             if (distinguishedName == null) {
                 distinguishedName = (DistinguishedName)getEFactory().create(DistinguishedName.class);
-                Role role = ((SecurityRoleMappingSection) section).getSelectedRoleDuringAdd();
+                Role role = (Role) section.getSelectedObject();
                 role.getDistinguishedName().add(distinguishedName);
             }
             distinguishedName.setName(name.getText());
@@ -167,7 +166,7 @@
             Principal principal = (Principal)eObject;
             if (principal == null) {
                 principal = (Principal)getEFactory().create(Principal.class);
-                Role role = ((SecurityRoleMappingSection) section).getSelectedRoleDuringAdd();
+                Role role = (Role) section.getSelectedObject();
                 role.getPrincipal().add(principal);
             }
             principal.setName(name.getText());
@@ -181,7 +180,7 @@
             LoginDomainPrincipal loginDomainPrincipal = (LoginDomainPrincipal)eObject;
             if (loginDomainPrincipal == null) {
                 loginDomainPrincipal = (LoginDomainPrincipal)getEFactory().create(LoginDomainPrincipal.class);
-                Role role = ((SecurityRoleMappingSection) section).getSelectedRoleDuringAdd();
+                Role role = (Role) section.getSelectedObject();
                 role.getLoginDomainPrincipal().add(loginDomainPrincipal);
             }
             loginDomainPrincipal.setName(name.getText());
@@ -197,7 +196,7 @@
             RealmPrincipal realmPrincipal = (RealmPrincipal)eObject;
             if (realmPrincipal == null) {
                 realmPrincipal = (RealmPrincipal)getEFactory().create(RealmPrincipal.class);
-                Role role = ((SecurityRoleMappingSection) section).getSelectedRoleDuringAdd();
+                Role role = (Role) section.getSelectedObject();
                 role.getRealmPrincipal().add(realmPrincipal);
             }
             realmPrincipal.setName(name.getText());

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java?rev=707635&r1=707634&r2=707635&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java Fri Oct 24 06:55:28 2008
@@ -28,7 +28,6 @@
 import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
-import org.apache.geronimo.st.v21.ui.sections.ServiceRefSection;
 
 /**
  * @version $Rev$ $Date$
@@ -55,7 +54,7 @@
         protected void initControl () {
             if (eObject == null) {
                 element.select(SERVICE_REF);
-                ServiceRef serviceRef = ((ServiceRefSection)section).getSelectedServiceRef();
+                ServiceRef serviceRef = (ServiceRef)section.getSelectedObject();
                 // use of ports and port completions are mutually exclusive
                 if (serviceRef == null) {
                     element.setEnabled(false);
@@ -187,7 +186,7 @@
             Port port = (Port)eObject;
             if (port == null) {
                 port = (Port)getEFactory().create(Port.class);
-                serviceRef = ((ServiceRefSection)section).getSelectedServiceRef();
+                serviceRef = (ServiceRef)section.getSelectedObject();
                 serviceRef.getPort().add(port);
             }
             port.setPortName(textList.get(0).getText());
@@ -205,7 +204,7 @@
             PortCompletion portComp = (PortCompletion)eObject;
             if (portComp == null) {
                 portComp = (PortCompletion)getEFactory().create(PortCompletion.class);
-                serviceRef = ((ServiceRefSection)section).getSelectedServiceRef();
+                serviceRef = (ServiceRef)section.getSelectedObject();
                 serviceRef.getServiceCompletion().getPortCompletion().add(portComp);
                 Port port = (Port)getEFactory().create(Port.class);
                 portComp.setPort (port);



Mime
View raw message