Author: rob.stryker(a)jboss.com
Date: 2009-03-18 02:10:43 -0400 (Wed, 18 Mar 2009)
New Revision: 14252
Modified:
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
Log:
JBIDE-4034 - wizard warning part 2
Modified:
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
---
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-03-18
06:10:24 UTC (rev 14251)
+++
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-03-18
06:10:43 UTC (rev 14252)
@@ -11,7 +11,7 @@
rwf_BaseName=JBoss _VERSION_ Runtime
rwf_NameInUse=Runtime name already in use
rwf_homeMissingFiles=The home directory does not exist or is missing the run.jar.
-rwf_homeIncorrectVersion=The server's home directory is of the incorrect version.
+rwf_homeIncorrectVersion=This server type expects a version of {0} but the server
directory is of version {1}.
rwf_nameTextBlank=The name field must not be blank
rwf_homeDirBlank=The directory field must not be blank
rwf_NoVMSelected=No VM selected
Modified:
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
---
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-03-18
06:10:24 UTC (rev 14251)
+++
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-03-18
06:10:43 UTC (rev 14252)
@@ -481,25 +481,22 @@
}
private String getWarningString() {
- if( !isHomeVersionValid())
- return Messages.rwf_homeIncorrectVersion;
+ if( getHomeVersionWarning() != null )
+ return getHomeVersionWarning();
return null;
}
protected boolean isHomeValid() {
if( homeDir == null || !(new File(homeDir).exists())) return false;
- IRuntime rt = (IRuntime) getTaskModel().getObject(
- TaskModel.TASK_RUNTIME);
- String v = rt.getRuntimeType().getVersion();
return new
Path(homeDir).append("bin").append("run.jar").toFile().exists();
}
- protected boolean isHomeVersionValid() {
+ protected String getHomeVersionWarning() {
String version = new ServerBeanLoader().getFullServerVersion(new File(homeDir,
JBossServerType.AS.getSystemJarPath()));
IRuntime rt = (IRuntime) getTaskModel().getObject(
TaskModel.TASK_RUNTIME);
String v = rt.getRuntimeType().getVersion();
- return version.startsWith(v);
+ return version.startsWith(v) ? null : NLS.bind(Messages.rwf_homeIncorrectVersion, v,
version);
}
private void browseHomeDirClicked() {