geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r689681 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/ org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/ org.apache.geronimo.st...
Date Thu, 28 Aug 2008 00:35:35 GMT
Author: mcconne
Date: Wed Aug 27 17:35:34 2008
New Revision: 689681

URL: http://svn.apache.org/viewvc?rev=689681&view=rev
Log:
GERONIMODEVTOOLS-422 Reduce the clutter of open sections in the GEP deployment plan editors.
Thanks Sainath Chowdary for this patch !!

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.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.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/DeploymentPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DependencySection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/EjbRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ResourceRefSection.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/sections/WebContainerSection.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.java?rev=689681&r1=689680&r2=689681&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.java
Wed Aug 27 17:35:34 2008
@@ -25,29 +25,29 @@
  */
 public class Messages extends NLS {
 
-	static {
-		NLS.initializeMessages("org.apache.geronimo.st.core.internal.Messages", Messages.class);
-	}
+    static {
+        NLS.initializeMessages("org.apache.geronimo.st.core.internal.Messages", Messages.class);
+    }
 
-	public static String DISTRIBUTE_FAIL;
-	public static String START_FAIL;
-	public static String STOP_FAIL;
-	public static String UNDEPLOY_FAIL;
-	public static String REDEPLOY_FAIL;
-	public static String DM_CONNECTION_FAIL;
-	
-	public static String errorJRE;
-	
-	public static String target20runtime;
-	public static String target21runtime;
-	public static String target22runtime;
-	
-	public static String incorrectVersion;
-	public static String noVersion;
-	public static String missingContent;
-	public static String errorPortInUse;
-	public static String missingServer;
-	
-	public static String errorNoProfiler;
+    public static String DISTRIBUTE_FAIL;
+    public static String START_FAIL;
+    public static String STOP_FAIL;
+    public static String UNDEPLOY_FAIL;
+    public static String REDEPLOY_FAIL;
+    public static String DM_CONNECTION_FAIL;
+    
+    public static String errorJRE;
+    
+    public static String target20runtime;
+    public static String target21runtime;
+    public static String target22runtime;
+    
+    public static String incorrectVersion;
+    public static String noVersion;
+    public static String missingContent;
+    public static String errorPortInUse;
+    public static String missingServer;
+    
+    public static String errorNoProfiler;
 
 }
\ No newline at end of file

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=689681&r1=689680&r2=689681&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
Wed Aug 27 17:35:34 2008
@@ -92,6 +92,7 @@
         getSection().setText(getTitle());
         getSection().setDescription(getDescription());
         getSection().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+        getSection().setExpanded(false);
         Composite clientComposite = createComposite(getSection(), 2);
         getSection().setClient(clientComposite);
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientDeploymentPage.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/AppClientDeploymentPage.java?rev=689681&r1=689680&r2=689681&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientDeploymentPage.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientDeploymentPage.java
Wed Aug 27 17:35:34 2008
@@ -21,6 +21,7 @@
 import org.apache.geronimo.st.v21.ui.sections.ClassFilterSection;
 import org.apache.geronimo.st.v21.ui.sections.DependencySection;
 import org.apache.geronimo.st.v21.ui.sections.GBeanSection;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormEditor;
 
@@ -28,7 +29,7 @@
  * @version $Rev$ $Date$
  */
 public class AppClientDeploymentPage extends DeploymentPage {
-	
+
     public AppClientDeploymentPage(FormEditor editor, String id, String title) {
         super(editor, id, title);
     }
@@ -47,6 +48,13 @@
         managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan(),
false), body, toolkit, getStyle(), false, false));
         managedForm.addPart(new GBeanSection(getDeploymentPlan(), JAXBModelUtils.getGbeans(getDeploymentPlan()),
body, toolkit, getStyle()));
     }
+    
+    protected GridLayout getLayout() {
+        GridLayout layout = new GridLayout();
+        layout.numColumns = 1;
+        layout.horizontalSpacing = 20;
+        return layout;
+    }
 
     /*
      * (non-Javadoc)

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=689681&r1=689680&r2=689681&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
Wed Aug 27 17:35:34 2008
@@ -29,6 +29,7 @@
 import org.apache.geronimo.st.v21.ui.sections.ExtModuleSection;
 import org.apache.geronimo.st.v21.ui.sections.GBeanSection;
 import org.apache.geronimo.st.v21.ui.sections.ModuleSection;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormEditor;
 
@@ -57,6 +58,13 @@
             managedForm.addPart(new ExtModuleSection(getDeploymentPlan(), body, toolkit,
getStyle(), application.getExtModule()));
         }
     }
+    
+    protected GridLayout getLayout() {
+        GridLayout layout = new GridLayout();
+        layout.numColumns = 1;
+        layout.horizontalSpacing = 20;
+        return layout;
+    }
 
     /*
      * (non-Javadoc)

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.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/NamingFormPage.java?rev=689681&r1=689680&r2=689681&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java
Wed Aug 27 17:35:34 2008
@@ -32,6 +32,7 @@
 import org.apache.geronimo.st.v21.ui.sections.ResourceEnvRefSection;
 import org.apache.geronimo.st.v21.ui.sections.ResourceRefSection;
 import org.apache.geronimo.st.v21.ui.sections.ServiceRefSection;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormEditor;
 
@@ -87,25 +88,32 @@
      */
     protected void fillBody(IManagedForm managedForm) {
         if (WebApp.class.isInstance (getDeploymentPlan().getValue())) {
+            managedForm.addPart(new EjbRefSection(getDeploymentPlan(), body, toolkit, getStyle(),
ejbRefs));
             managedForm.addPart(new ResourceRefSection(getDeploymentPlan(), body, toolkit,
getStyle(), resRefs));
+            managedForm.addPart(new ServiceRefSection(getDeploymentPlan(), body, toolkit,
getStyle(), serviceRefs));
             managedForm.addPart(new ResourceEnvRefSection(getDeploymentPlan(), body, toolkit,
getStyle(), resEnvRefs));
-            managedForm.addPart(new EjbRefSection(getDeploymentPlan(), body, toolkit, getStyle(),
ejbRefs));
             managedForm.addPart(new EjbLocalRefSection(getDeploymentPlan(), body, toolkit,
getStyle(), ejbLocalRefs));
-            managedForm.addPart(new ServiceRefSection(getDeploymentPlan(), body, toolkit,
getStyle(), serviceRefs));
             managedForm.addPart(new MessageDestSection(getDeploymentPlan(), body, toolkit,
getStyle(), messageDestinations));
         }
         else if (ApplicationClient.class.isInstance (getDeploymentPlan().getValue())){
+            managedForm.addPart(new EjbRefSection(getDeploymentPlan(), body, toolkit, getStyle(),
ejbRefs));
             managedForm.addPart(new ResourceRefSection(getDeploymentPlan(), body, toolkit,
getStyle(), resRefs));
+            managedForm.addPart(new ServiceRefSection(getDeploymentPlan(), body, toolkit,
getStyle(), serviceRefs));
             managedForm.addPart(new ResourceEnvRefSection(getDeploymentPlan(), body, toolkit,
getStyle(), resEnvRefs));
-            managedForm.addPart(new EjbRefSection(getDeploymentPlan(), body, toolkit, getStyle(),
ejbRefs));
             managedForm.addPart(new GBeanRefSection(getDeploymentPlan(), body, toolkit, getStyle(),
gbeanRefs));
-            managedForm.addPart(new ServiceRefSection(getDeploymentPlan(), body, toolkit,
getStyle(), serviceRefs));
             managedForm.addPart(new MessageDestSection(getDeploymentPlan(), body, toolkit,
getStyle(), messageDestinations));
         }
         else if (OpenejbJar.class.isInstance (getDeploymentPlan().getValue())){
             managedForm.addPart(new MessageDestSection(getDeploymentPlan(), body, toolkit,
getStyle(), messageDestinations));
         }
     }
+    
+    protected GridLayout getLayout() {
+        GridLayout layout = new GridLayout();
+        layout.numColumns = 1;
+        layout.horizontalSpacing = 20;
+        return layout;
+        }
 
     /*
      * (non-Javadoc)

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/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/main/java/org/apache/geronimo/st/v21/ui/sections/DependencySection.java?rev=689681&r1=689680&r2=689681&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DependencySection.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DependencySection.java
Wed Aug 27 17:35:34 2008
@@ -56,6 +56,7 @@
                 CommonMessages.groupId, CommonMessages.artifactId, CommonMessages.version,
CommonMessages.type
         };
         createClient();
+        getSection().setExpanded(false);
     }
 
     public String getTitle() {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/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/main/java/org/apache/geronimo/st/v21/ui/sections/EjbRefSection.java?rev=689681&r1=689680&r2=689681&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/EjbRefSection.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/EjbRefSection.java
Wed Aug 27 17:35:34 2008
@@ -48,6 +48,7 @@
         COLUMN_NAMES = new String[] {
                 CommonMessages.name, CommonMessages.editorEjbRefEjbLink };
         createClient();
+        getSection().setExpanded(false);
     }
 
     public String getTitle() {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ResourceRefSection.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/ResourceRefSection.java?rev=689681&r1=689680&r2=689681&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ResourceRefSection.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ResourceRefSection.java
Wed Aug 27 17:35:34 2008
@@ -42,6 +42,7 @@
         COLUMN_NAMES = new String[] {
                 CommonMessages.editorResRefNameTitle, CommonMessages.editorResRefLinkTitle};
         createClient();
+        getSection().setExpanded(false);
     }
 
     public String getTitle() {

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=689681&r1=689680&r2=689681&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
Wed Aug 27 17:35:34 2008
@@ -39,6 +39,7 @@
         this.objectContainer = serviceRefs;
         COLUMN_NAMES = new String[] { CommonMessages.editorServiceRefName };
         createClient();
+        getSection().setExpanded(false);
     }
 
     public String getTitle() {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.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/WebContainerSection.java?rev=689681&r1=689680&r2=689681&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.java
Wed Aug 27 17:35:34 2008
@@ -103,7 +103,7 @@
         toolkit.createLabel(composite, CommonMessages.gBeanLink);
         String value = wc != null ? wc.getGbeanLink() : null;
         gBeanLink = toolkit.createText(composite, value, SWT.BORDER);
-        gBeanLink.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        gBeanLink.setLayoutData(createTextFieldGridData());
         gBeanLink.addModifyListener(new ModifyListener() {
             public void modifyText(ModifyEvent e) {
                 getGBeanLocator().setGbeanLink(gBeanLink.getText());
@@ -118,7 +118,7 @@
         value = wc != null && wc.getPattern() != null ? wc.getPattern().getGroupId()
                 : null;
         group = toolkit.createText(composite, value, SWT.BORDER);
-        group.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        group.setLayoutData(createTextFieldGridData());
         group.addModifyListener(new ModifyListener() {
             public void modifyText(ModifyEvent e) {
                 getPattern().setGroupId(group.getText());
@@ -130,7 +130,7 @@
         value = wc != null && wc.getPattern() != null ? wc.getPattern().getArtifactId()
                 : null;
         artifact = toolkit.createText(composite, value, SWT.BORDER);
-        artifact.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        artifact.setLayoutData(createTextFieldGridData());
         artifact.addModifyListener(new ModifyListener() {
             public void modifyText(ModifyEvent e) {
                 getPattern().setArtifactId(artifact.getText());
@@ -142,7 +142,7 @@
         value = wc != null && wc.getPattern() != null ? wc.getPattern().getModule()
                 : null;
         module = toolkit.createText(composite, value, SWT.BORDER);
-        module.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        module.setLayoutData(createTextFieldGridData());
         module.addModifyListener(new ModifyListener() {
             public void modifyText(ModifyEvent e) {
                 getPattern().setModule(module.getText());
@@ -154,7 +154,7 @@
         value = wc != null && wc.getPattern() != null ? wc.getPattern().getName()
                 : null;
         name = toolkit.createText(composite, value, SWT.BORDER);
-        name.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        name.setLayoutData(createTextFieldGridData());
         name.addModifyListener(new ModifyListener() {
             public void modifyText(ModifyEvent e) {
                 getPattern().setName(name.getText());
@@ -166,7 +166,7 @@
         value = wc != null && wc.getPattern() != null ? wc.getPattern().getVersion()
                 : null;
         version = toolkit.createText(composite, value, SWT.BORDER);
-        version.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        version.setLayoutData(createTextFieldGridData());
         version.addModifyListener(new ModifyListener() {
             public void modifyText(ModifyEvent e) {
                 getPattern().setVersion(version.getText());



Mime
View raw message