geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r659131 - in /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal: ConfirmInstallDialog.java GeronimoRuntimeWizardFragment.java Messages.properties
Date Thu, 22 May 2008 15:19:20 GMT
Author: mcconne
Date: Thu May 22 08:19:19 2008
New Revision: 659131

URL: http://svn.apache.org/viewvc?rev=659131&view=rev
Log:
GERONIMODEVTOOLS-341 Enhancement to the download and install confirmation dialog to specify
both the server and the version. Thanks to Ted Kirby for this patch !!

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/ConfirmInstallDialog.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/ConfirmInstallDialog.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/ConfirmInstallDialog.java?rev=659131&r1=659130&r2=659131&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/ConfirmInstallDialog.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/ConfirmInstallDialog.java
Thu May 22 08:19:19 2008
@@ -33,10 +33,12 @@
 public class ConfirmInstallDialog extends Dialog {
 
 	private String installPath = null;
+	private String runtimeName = null;
 
-	public ConfirmInstallDialog(Shell parentShell, String installPath) {
+	public ConfirmInstallDialog(Shell parentShell, String runtimeName, String installPath) {
 		super(parentShell);
 		this.installPath = installPath;
+		this.runtimeName = runtimeName;
 	}
 
 	/*
@@ -66,7 +68,7 @@
 		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
 		composite.setFont(parent.getFont());
 		Label label = new Label(composite, SWT.WRAP);
-		label.setText(NLS.bind(Messages.installMessage, new String[] { installPath }));
+		label.setText(NLS.bind(Messages.installMessage, new String[] { runtimeName, installPath
}));
 		GridData data = new GridData();
 		data.widthHint = 400;
 		label.setLayoutData(data);

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.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/GeronimoRuntimeWizardFragment.java?rev=659131&r1=659130&r2=659131&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
Thu May 22 08:19:19 2008
@@ -182,12 +182,13 @@
             data = new GridData();
             data.horizontalSpan = 3;
             install.setLayoutData(data);
+            String runtimeName = getRuntimeName();
             install.setToolTipText(Messages.bind(Messages.tooltipInstall, getRuntimeName()));
             install.addSelectionListener(new SelectionAdapter() {
                                              public void widgetSelected(SelectionEvent se)
{
                                                  if (installDir != null && isValidLocation())
{
                                                      Shell shell = installDir.getShell();
-                                                     ConfirmInstallDialog dialog = new ConfirmInstallDialog(shell,
installDir.getText());
+                                                     ConfirmInstallDialog dialog = new ConfirmInstallDialog(shell,
getRuntimeName(), installDir.getText());
                                                      dialog.open();
                                                      if (dialog.getReturnCode() == IDialogConstants.OK_ID)
{
 

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=659131&r1=659130&r2=659131&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 May 22 08:19:19 2008
@@ -199,7 +199,7 @@
 install=Download and Install
 jvmWarning={0} is currently only certified on a 1.5 JVM. Use of any other version is not
currently supported.
 installTitle=Install Confirmation
-installMessage=Install Apache Geronimo to {0} ?
+installMessage=Install {0} to {1} ?
 tooltipLoc=A location of an existing {0} installation or a path to install to.
 tooltipInstall=Downloads the selected {0} distribution and installs it to the specified location.
 tooltipJetty=Selects the Jetty distribution of Geronimo to install.



Mime
View raw message