You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/06/18 00:30:17 UTC

svn commit: r668860 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/ org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ org.apache.geronimo.s...

Author: mcconne
Date: Tue Jun 17 15:30:17 2008
New Revision: 668860

URL: http://svn.apache.org/viewvc?rev=668860&view=rev
Log:
GERONIMODEVTOOLS-372 Add new fields to app client deployment plan editor -- Thanks to BJ Reed for this patch

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientGeneralPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppClientClientGeneralSection.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.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/internal/Messages.java?rev=668860&r1=668859&r2=668860&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java Tue Jun 17 15:30:17 2008
@@ -104,7 +104,7 @@
 	}
 	
 	public static String appGeneralPageTitle;
-    public static String appClientGeneralPageTitle;
+        public static String appClientGeneralPageTitle;
 	public static String connectorOverViewPageTitle;
 	public static String deploymentPageTitle;
 	public static String namingFormPageTitle;
@@ -120,10 +120,12 @@
 	public static String editorSectionGeneralDescription;
 	public static String editorContextRoot;
 	public static String editorApplicationName;
-    public static String editorSectionServerTitle;
-    public static String editorSectionServerDescription;
-    public static String editorSectionClientTitle;
-    public static String editorSectionClientDescription;
+	public static String editorCallbackHandler;
+	public static String editorRealmName;
+        public static String editorSectionServerTitle;
+        public static String editorSectionServerDescription;
+        public static String editorSectionClientTitle;
+        public static String editorSectionClientDescription;
 	//
 	public static String editorSectionSecurityRolesTitle;
 	public static String editorSectionSecurityRolesDescription;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties
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/internal/Messages.properties?rev=668860&r1=668859&r2=668860&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties Tue Jun 17 15:30:17 2008
@@ -73,11 +73,13 @@
 pingDelay=Ping Delay (ms):
 pingInterval=Ping Interval (ms):
 maxPings=Maximum Pings:
-pingDelayTooltip=The number of miliseconds to delay before starting to ping the server.
-pingIntervalTooltip=The number of miliseconds between each ping.
+pingDelayTooltip=The number of milliseconds to delay before starting to ping the server.
+pingIntervalTooltip=The number of milliseconds between each ping.
 maxPingsTooltip=The number of pings to the server before startup is considered a failure.
 
 editorContextRoot=Context Root:
+editorCallbackHandler=Callback Handler:
+editorRealmName=Realm Name:
 editorApplicationName=Application Name:
 
 editorResourceRefTitle=Resource References

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientGeneralPage.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/AppClientGeneralPage.java?rev=668860&r1=668859&r2=668860&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientGeneralPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientGeneralPage.java Tue Jun 17 15:30:17 2008
@@ -35,8 +35,8 @@
 	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
 	 */
 	protected void fillBody(IManagedForm managedForm) {
-		managedForm.addPart(new AppClientServerGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
         managedForm.addPart(new AppClientClientGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
+        managedForm.addPart(new AppClientServerGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
 	}
 
 	/*

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppClientClientGeneralSection.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/AppClientClientGeneralSection.java?rev=668860&r1=668859&r2=668860&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppClientClientGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppClientClientGeneralSection.java Tue Jun 17 15:30:17 2008
@@ -21,27 +21,52 @@
 import org.apache.geronimo.jee.applicationclient.ApplicationClient;
 import org.apache.geronimo.jee.deployment.Environment;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
 public class AppClientClientGeneralSection extends CommonGeneralSection {
 
-	ApplicationClient plan;
+    protected Text callbackHandler;
+    protected Text realmName;
+    ApplicationClient plan;
+
+    public AppClientClientGeneralSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
+        super(parent, toolkit, style, plan);
+        this.plan = (ApplicationClient) plan.getValue();
+        createClient();
+    }
+
+    protected void createClient() {
+        super.createClient();
+        Composite composite = (Composite) getSection().getClient();
+
+        createLabel(composite, CommonMessages.editorCallbackHandler);
+
+        callbackHandler = toolkit.createText(composite, plan.getCallbackHandler(), SWT.BORDER);
+        callbackHandler.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        callbackHandler.addModifyListener(new ModifyListener() {
+            public void modifyText(ModifyEvent e) {
+                plan.setCallbackHandler(callbackHandler.getText());
+                markDirty();
+            }
+        });
 
-	public AppClientClientGeneralSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
-		super(parent, toolkit, style, plan);
-		this.plan = (ApplicationClient) plan.getValue();
-		createClient();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.geronimo.st.v21.ui.sections.CommonGeneralSection#getEnvironmentEReference()
-	 */
-	protected JAXBElement getEnvironmentEReference() {
-		return null; //ApplicationPackage.eINSTANCE.getApplicationType_Environment();
-	}
+        createLabel(composite, CommonMessages.editorRealmName);
+
+        realmName = toolkit.createText(composite, plan.getRealmName(), SWT.BORDER);
+        realmName.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        realmName.addModifyListener(new ModifyListener() {
+            public void modifyText(ModifyEvent e) {
+                plan.setRealmName(realmName.getText());
+                markDirty();
+            }
+        });
+    }
 
     protected Environment getEnvironment(boolean create) {
         Environment type = null;