geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r654140 - in /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui: actions/LaunchGeronimoConsoleAction.java internal/GeronimoRuntimeWizardFragment.java internal/Messages.properties
Date Wed, 07 May 2008 15:07:36 GMT
Author: mcconne
Date: Wed May  7 08:07:35 2008
New Revision: 654140

URL: http://svn.apache.org/viewvc?rev=654140&view=rev
Log:
GERONIMODEVTOOLS-341 More branding fixes from Ted Kirby !!

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/actions/LaunchGeronimoConsoleAction.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/actions/LaunchGeronimoConsoleAction.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/actions/LaunchGeronimoConsoleAction.java?rev=654140&r1=654139&r2=654140&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/actions/LaunchGeronimoConsoleAction.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/actions/LaunchGeronimoConsoleAction.java
Wed May  7 08:07:35 2008
@@ -63,7 +63,10 @@
 		try {
 			int style = IWorkbenchBrowserSupport.AS_EDITOR
 					| IWorkbenchBrowserSupport.STATUS;
-			IWebBrowser browser = WorkbenchBrowserSupport.getInstance().createBrowser(style, "console",
Messages.console, Messages.consoleTooltip);
+			IWebBrowser browser = WorkbenchBrowserSupport.getInstance().createBrowser(style, "console",

+                                Messages.bind(Messages.console, server.getName()),
+                                Messages.bind(Messages.consoleTooltip, server
+                                                .getName()));
 			URL url = getConsoleUrl();
 			if (url != null)
 				browser.openURL(url);

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=654140&r1=654139&r2=654140&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
Wed May  7 08:07:35 2008
@@ -382,6 +382,8 @@
 
         IRuntime runtime = getRuntimeDelegate().getRuntime();
 
+        String runtimeName = runtime.getRuntimeType().getName();
+
         IWizardHandle wizard = getWizard();
 
         if (runtime == null) {
@@ -394,7 +396,7 @@
 
         if (installDir.getText() == null || installDir.getText().length() == 0) {
             // installDir field has not been entered
-            wizard.setMessage(Messages.installDirInfo, IMessageProvider.NONE);
+            wizard.setMessage(Messages.bind(Messages.installDirInfo, runtimeName), IMessageProvider.NONE);
         }
         else {
             IStatus status = runtimeWC.validate(null);
@@ -421,6 +423,7 @@
                 group.setEnabled(enableGroup);
                 if (file.isDirectory()) {
                     String message = file.canWrite() ? Messages.noImageFound : Messages.cannotInstallAtLocation;
+                    message = Messages.bind(message, runtimeName);
                     wizard.setMessage(message, IMessageProvider.ERROR);
                 }
                 else {
@@ -429,8 +432,10 @@
                 return;
             }
 
-            if (!isValidVM())
-                wizard.setMessage(Messages.jvmWarning, IMessageProvider.WARNING);
+            if (!isValidVM()) {
+                wizard.setMessage(Messages.bind(Messages.jvmWarning,
+                        runtimeName), IMessageProvider.WARNING);
+            }
         }
     }
 

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=654140&r1=654139&r2=654140&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
Wed May  7 08:07:35 2008
@@ -175,8 +175,8 @@
 name=Name
 description=Description
 
-console=Geronimo Console
-consoleTooltip=Apache Geronimo Console
+console={0} Console
+consoleTooltip={0} Console
 
 newServerWizardTitle=New {0} Server
 newServerWizardDescription=New {0} Server
@@ -188,16 +188,16 @@
 runtimeWizardDescription=Specify the location of an existing {0} installation.  If none exists,
specify an install location and press "Download and Install".
 browse=Browse
 installDir=Application Server Installation Directory:
-installDirInfo=Please enter the directory where Geronimo is currently installed or where
you would like it to be installed.
+installDirInfo=Please enter the directory where {0} is currently installed or where you would
like it to be installed.
 noSuchDir=The specified directory does not exist.
-noImageFound=A Geronimo installation does not exist at this location.  You can install an
image at this location.
-cannotInstallAtLocation=A Geronimo installation cannot be found nor can it be installed at
this location.
+noImageFound=A {0} installation does not exist at this location.  You can install an image
at this location.
+cannotInstallAtLocation=A {0} installation cannot be found nor can it be installed at this
location.
 downloadOptions=Download Options
 chooseWebContainer=Select a web container:
 gWithTomcat=Geronimo with Tomcat
 gWithJetty=Geronimo with Jetty
 install=Download and Install
-jvmWarning=Geronimo is currently only certified on a 1.5 JVM. Use of any other version is
not currently supported.
+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} ?
 tooltipLoc=A location of an existing {0} installation or a path to install to.



Mime
View raw message