geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bjr...@apache.org
Subject svn commit: r727821 - in /geronimo/devtools/eclipse-plugin: branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/ branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21...
Date Thu, 18 Dec 2008 20:58:03 GMT
Author: bjreed
Date: Thu Dec 18 12:58:02 2008
New Revision: 727821

URL: http://svn.apache.org/viewvc?rev=727821&view=rev
Log:
GERONIMODEVTOOLS.  Adding labels to the table page of the Plugin Server Manager

Modified:
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties
    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/ServerPluginManagerWizard.java
    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/wizards/ServerPluginManagerWizard.java

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/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/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java?rev=727821&r1=727820&r2=727821&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java
Thu Dec 18 12:58:02 2008
@@ -29,9 +29,9 @@
     static {
         NLS.initializeMessages(Activator.PLUGIN_ID + ".internal.Messages", Messages.class);
     }
-    
+
     public static String editorTabSource;
-    
+
     public static String editorSectionSecurityTitle;
     public static String editorSectionSecurityDescription;
     public static String editorSectionPortsTitle;
@@ -42,13 +42,13 @@
     public static String editorSectionVMArgsDescription;
     public static String editorSectionStartupTitle;
     public static String editorSectionStartupDescription;
-    
+
     public static String editorSectionTestEnvTitle;
     public static String editorSectionTestEnvDescription;
     public static String editorSectionRunFromWorkspace;
     public static String editorSectionSharedLibrariesInPlace;
     public static String editorSectionSelectClasspathContainers;
-    
+
     public static String info;
     public static String debug;
     public static String httpPort;
@@ -65,14 +65,14 @@
     public static String pingDelayTooltip;
     public static String pingIntervalTooltip;
     public static String maxPingsTooltip;
-    
+
     public static String newServerWizardTitle;
     public static String newServerWizardDescription;
-    
+
     public static String installedJRE;
     public static String installedJREs;
     public static String runtimeDefaultJRE;
-    public static String runtimeWizardTitle; 
+    public static String runtimeWizardTitle;
     public static String browse;
     public static String installDir;
     public static String installDirInfo;
@@ -94,12 +94,12 @@
     public static String tooltipInstall;
     public static String tooltipJetty;
     public static String tooltipTomcat;
-    
+
     public static String sourceLocWizTitle;
     public static String sourceLocWizDescription;
     public static String sourceZipFile;
     public static String browseSrcDialog;
-    
+
     public static String hostName;
     public static String adminId;
     public static String adminPassword;
@@ -362,7 +362,7 @@
     public static String securityRunAsSubjects;
     public static String securityRunAsSubjectRole;
     public static String securityRunAsSubjectRealm;
-    public static String securityRunAsSubjectId;  
+    public static String securityRunAsSubjectId;
     public static String securityRefreshRoles;
 
     public static String editorCorrect;
@@ -372,7 +372,7 @@
     public static String gBeanLink;
     public static String moduleId;
     public static String seeRestrictions;
-    
+
     public static String useGBeanLink;
     public static String useGBeanPattern;
     public static String artifactType;
@@ -387,7 +387,7 @@
     public static String useResourcePattern;
     public static String resourceLink;
     public static String url;
-    
+
     public static String addSharedLib;
     public static String webContainerSection;
     public static String webContainerSectionDescription;
@@ -405,7 +405,7 @@
     public static String credential;
     public static String bindingName;
     public static String uri;
-    
+
     public static String connector;
     public static String ejb;
     public static String java;
@@ -452,4 +452,5 @@
     public static String obsoletes;
     public static String installable;
     public static String event;
+    public static String prerequisites;
 }

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/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/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties?rev=727821&r1=727820&r2=727821&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties
Thu Dec 18 12:58:02 2008
@@ -449,3 +449,4 @@
 obsoletes=Obsoletes
 installable=Installable
 event=Event
+prerequisites=Prerequisites

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/ServerPluginManagerWizard.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/ServerPluginManagerWizard.java?rev=727821&r1=727820&r2=727821&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/ServerPluginManagerWizard.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/ServerPluginManagerWizard.java
Thu Dec 18 12:58:02 2008
@@ -472,8 +472,10 @@
             parent.setLayoutData(createGridData(400, 300));
             Composite composite = createComposite(parent);
 
+            createLabel(composite, CommonMessages.license);
+            createLabel(composite, "");
             String[] lColumnNames = {CommonMessages.license, CommonMessages.osiApproved};
-            int[] lColumnWidths = {300, 100};
+            int[] lColumnWidths = {275, 100};
             licenseTable = createEditableTable(composite, lColumnNames, lColumnWidths);
             licenseTable.addSelectionListener(new SelectionAdapter() {
                 public void widgetSelected(SelectionEvent arg0) {
@@ -527,6 +529,8 @@
                 }
             });
 
+            createLabel(composite, CommonMessages.prerequisites);
+            createLabel(composite, "");
             String[] pColumnNames = {CommonMessages.groupId, CommonMessages.artifactId, CommonMessages.version,
CommonMessages.type, CommonMessages.description};
             int[] pColumnWidths = {50, 50, 50, 50, 200};
             prereqTable = createEditableTable(composite, pColumnNames, pColumnWidths);

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=727821&r1=727820&r2=727821&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
Thu Dec 18 12:58:02 2008
@@ -29,9 +29,9 @@
     static {
         NLS.initializeMessages(Activator.PLUGIN_ID + ".internal.Messages", Messages.class);
     }
-    
+
     public static String editorTabSource;
-    
+
     public static String editorSectionSecurityTitle;
     public static String editorSectionSecurityDescription;
     public static String editorSectionPortsTitle;
@@ -42,13 +42,13 @@
     public static String editorSectionVMArgsDescription;
     public static String editorSectionStartupTitle;
     public static String editorSectionStartupDescription;
-    
+
     public static String editorSectionTestEnvTitle;
     public static String editorSectionTestEnvDescription;
     public static String editorSectionRunFromWorkspace;
     public static String editorSectionSharedLibrariesInPlace;
     public static String editorSectionSelectClasspathContainers;
-    
+
     public static String info;
     public static String debug;
     public static String httpPort;
@@ -65,14 +65,14 @@
     public static String pingDelayTooltip;
     public static String pingIntervalTooltip;
     public static String maxPingsTooltip;
-    
+
     public static String newServerWizardTitle;
     public static String newServerWizardDescription;
-    
+
     public static String installedJRE;
     public static String installedJREs;
     public static String runtimeDefaultJRE;
-    public static String runtimeWizardTitle; 
+    public static String runtimeWizardTitle;
     public static String browse;
     public static String installDir;
     public static String installDirInfo;
@@ -94,12 +94,12 @@
     public static String tooltipInstall;
     public static String tooltipJetty;
     public static String tooltipTomcat;
-    
+
     public static String sourceLocWizTitle;
     public static String sourceLocWizDescription;
     public static String sourceZipFile;
     public static String browseSrcDialog;
-    
+
     public static String hostName;
     public static String adminId;
     public static String adminPassword;
@@ -362,7 +362,7 @@
     public static String securityRunAsSubjects;
     public static String securityRunAsSubjectRole;
     public static String securityRunAsSubjectRealm;
-    public static String securityRunAsSubjectId;  
+    public static String securityRunAsSubjectId;
     public static String securityRefreshRoles;
 
     public static String editorCorrect;
@@ -372,7 +372,7 @@
     public static String gBeanLink;
     public static String moduleId;
     public static String seeRestrictions;
-    
+
     public static String useGBeanLink;
     public static String useGBeanPattern;
     public static String artifactType;
@@ -387,7 +387,7 @@
     public static String useResourcePattern;
     public static String resourceLink;
     public static String url;
-    
+
     public static String addSharedLib;
     public static String webContainerSection;
     public static String webContainerSectionDescription;
@@ -405,7 +405,7 @@
     public static String credential;
     public static String bindingName;
     public static String uri;
-    
+
     public static String connector;
     public static String ejb;
     public static String java;
@@ -452,4 +452,5 @@
     public static String obsoletes;
     public static String installable;
     public static String event;
+    public static String prerequisites;
 }

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=727821&r1=727820&r2=727821&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
Thu Dec 18 12:58:02 2008
@@ -449,3 +449,4 @@
 obsoletes=Obsoletes
 installable=Installable
 event=Event
+prerequisites=Prerequisites

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServerPluginManagerWizard.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/ServerPluginManagerWizard.java?rev=727821&r1=727820&r2=727821&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServerPluginManagerWizard.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServerPluginManagerWizard.java
Thu Dec 18 12:58:02 2008
@@ -175,7 +175,7 @@
                 break;
         }
     }
-    
+
     public class ServerPluginManagerWizardPage0 extends AbstractWizardPage {
 
         public ServerPluginManagerWizardPage0(String pageName) {
@@ -279,7 +279,7 @@
         Text name, downloadRepos, category, description, pluginURL, author;
         Text geronimoVersions, jvmVersions, dependencies, obsoletes;
         Label id;
-        
+
         public ServerPluginManagerWizardPage2(String pageName) {
             super(pageName);
         }
@@ -399,7 +399,7 @@
             }
             return buf.toString();
          }
-        
+
         private String artifactToString(ArtifactType artifact) {
             StringBuffer buffer = new StringBuffer();
 
@@ -423,7 +423,7 @@
             }
             return buffer.toString();
         }
-        
+
         private void setText (Text text, String value) {
             if (value != null) {
                 text.setText(value);
@@ -463,7 +463,7 @@
         protected Button addLicenseButton, editLicenseButton, removeLicenseButton;
         protected Button addPrereqButton, editPrereqButton, removePrereqButton;
         protected PluginType pluginType;
-        
+
         public ServerPluginManagerWizardPage3(String pageName) {
             super(pageName);
         }
@@ -472,8 +472,10 @@
             parent.setLayoutData(createGridData(400, 300));
             Composite composite = createComposite(parent);
 
+            createLabel(composite, CommonMessages.license);
+            createLabel(composite, "");
             String[] lColumnNames = {CommonMessages.license, CommonMessages.osiApproved};
-            int[] lColumnWidths = {300, 100};
+            int[] lColumnWidths = {275, 100};
             licenseTable = createEditableTable(composite, lColumnNames, lColumnWidths);
             licenseTable.addSelectionListener(new SelectionAdapter() {
                 public void widgetSelected(SelectionEvent arg0) {
@@ -527,6 +529,8 @@
                 }
             });
 
+            createLabel(composite, CommonMessages.prerequisites);
+            createLabel(composite, "");
             String[] pColumnNames = {CommonMessages.groupId, CommonMessages.artifactId, CommonMessages.version,
CommonMessages.type, CommonMessages.description};
             int[] pColumnWidths = {50, 50, 50, 50, 200};
             prereqTable = createEditableTable(composite, pColumnNames, pColumnWidths);
@@ -591,7 +595,7 @@
             editPrereqButton.setEnabled(prereqTable.getSelectionCount() > 0);
             removePrereqButton.setEnabled(prereqTable.getSelectionCount() > 0);
         }
-        
+
         protected Composite createButtonComposite(Composite parent) {
             Composite buttonComp = new Composite(parent, SWT.NONE);
             GridLayout layout = new GridLayout();
@@ -647,14 +651,14 @@
             }
             return metadata;
         }
-        
+
         private String[] licenseToStringArray (LicenseType license) {
             String[] stringArray = new String[licenseTable.getColumnCount()];
             stringArray[0] = license.getValue();
             stringArray[1] = String.valueOf(license.isOsiApproved());
             return stringArray;
         }
-        
+
         private String[] prereqToStringArray (PrerequisiteType prereq) {
             String[] stringArray = new String[prereqTable.getColumnCount()];
             if (prereq.getId() != null) {
@@ -707,9 +711,9 @@
                         setPageComplete(false);
                     }
                 }
-                
+
             });
-            
+
             setPageComplete(false);
             setControl(composite);
         }
@@ -718,7 +722,7 @@
         public IWizardPage getPreviousPage() {
             return getPages()[0];
         }
-        
+
         public void populateTable (PluginListType pluginList) {
             String[] pluginValues;
             pluginLoadTable.removeAll();
@@ -734,14 +738,14 @@
 
         // install selected plugins to the server
         public ArrayList<String> installPlugins() {
-            // take each selected object in the pluginLoadTable and install and start 
+            // take each selected object in the pluginLoadTable and install and start
             List<PluginType> pluginList = new ArrayList<PluginType>();
             for (int i = 0; i < pluginLoadTable.getSelectionCount(); i++) {
                 pluginList.add ((PluginType)pluginLoadTable.getItem(pluginLoadTable.getSelectionIndices()[i]).getData());
             }
             return pluginManager.installPlugins(localRepoPath.getText(), pluginList);
         }
-        
+
         private String[] pluginToStringArray (PluginType plugin) {
             String[] stringArray = new String[pluginLoadTable.getColumnCount()];
             stringArray[0] = plugin.getName();
@@ -764,7 +768,7 @@
 
     public class ServerPluginManagerWizardPage5 extends AbstractWizardPage {
         Table eventTable;
-        
+
         public ServerPluginManagerWizardPage5(String pageName) {
             super(pageName);
         }



Mime
View raw message