You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/09/26 00:19:25 UTC
svn commit: r449839 - in /geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/
org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/
Author: sppatel
Date: Mon Sep 25 15:19:21 2006
New Revision: 449839
URL: http://svn.apache.org/viewvc?view=rev&rev=449839
Log:
validation of runtime wizard fragment broken due to null value passed in status
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java?view=diff&rev=449839&r1=449838&r2=449839
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java Mon Sep 25 15:19:21 2006
@@ -90,16 +90,13 @@
// check for server file structure
int count = 0;
- count = runtimeLoc.append("bin/server.jar").toFile().exists() ? ++count
- : count;
- count = runtimeLoc.append("bin/deployer.jar").toFile().exists() ? ++count
- : count;
- count = runtimeLoc.append("lib").toFile().exists() ? ++count : ++count;
- count = runtimeLoc.append("repository").toFile().exists() ? ++count
- : count;
+ count = runtimeLoc.append("bin/server.jar").toFile().exists() ? ++count : count;
+ count = runtimeLoc.append("bin/deployer.jar").toFile().exists() ? ++count : count;
+ count = runtimeLoc.append("lib").toFile().exists() ? ++count : count;
+ count = runtimeLoc.append("repository").toFile().exists() ? ++count : count;
if (count == 0)
- return new Status(IStatus.ERROR, Activator.PLUGIN_ID, NO_IMAGE, null, null);
+ return new Status(IStatus.ERROR, Activator.PLUGIN_ID, NO_IMAGE, "", null);
if (count < 4) {
// part of a server image was found, don't let install happen
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/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/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java?view=diff&rev=449839&r1=449838&r2=449839
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java Mon Sep 25 15:19:21 2006
@@ -392,20 +392,16 @@
return;
} else {
File file = new Path(installDir.getText()).toFile();
- boolean enableGroup = file.isDirectory() && file.canWrite() ? true
- : false;
+ boolean enableGroup = file.isDirectory() && file.canWrite() ? true : false;
group.setEnabled(enableGroup);
if (file.isDirectory()) {
- String message = file.canWrite() ? Messages.noImageFound
- : Messages.cannotInstallAtLocation;
+ String message = file.canWrite() ? Messages.noImageFound : Messages.cannotInstallAtLocation;
wizard.setMessage(message, IMessageProvider.ERROR);
} else {
wizard.setMessage(Messages.noSuchDir, IMessageProvider.ERROR);
}
return;
}
-
- // wizard.setMessage(null, IMessageProvider.NONE);
if (!isValidVM())
wizard.setMessage(Messages.jvmWarning, IMessageProvider.WARNING);