forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r226897 - in /forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/wizards: ActivatePluginsPage.java NewProjectWizard.java
Date Mon, 01 Aug 2005 22:20:59 GMT
Author: rgardler
Date: Mon Aug  1 15:20:49 2005
New Revision: 226897

URL: http://svn.apache.org/viewcvs?rev=226897&view=rev
Log:
Wizard will complete even when no plugins are selected in the wizard. (thanks to Anil Ramnanan,
fixes FOR-593)

Modified:
    forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/wizards/ActivatePluginsPage.java
    forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/wizards/NewProjectWizard.java

Modified: forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/wizards/ActivatePluginsPage.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/wizards/ActivatePluginsPage.java?rev=226897&r1=226896&r2=226897&view=diff
==============================================================================
--- forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/wizards/ActivatePluginsPage.java
(original)
+++ forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/wizards/ActivatePluginsPage.java
Mon Aug  1 15:20:49 2005
@@ -242,6 +242,10 @@
 		    pluginList= (pluginList + iterator.next().toString() + ",");
 		  } 
 		}
-		return pluginList.substring(0,(pluginList.length()-1)); 
+		if (pluginList != "") {  
+		  return pluginList.substring(0,(pluginList.length()-1)); 
+        } else {
+		  return null; 
+        }
 	}	 
 }

Modified: forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/wizards/NewProjectWizard.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/wizards/NewProjectWizard.java?rev=226897&r1=226896&r2=226897&view=diff
==============================================================================
--- forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/wizards/NewProjectWizard.java
(original)
+++ forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/wizards/NewProjectWizard.java
Mon Aug  1 15:20:49 2005
@@ -181,8 +181,10 @@
 										+ "\\forrest.properties",
 								"org.apache.forrest.plugin.output.viewHelper.xhtml,org.apache.forrest.plugin.internal.view");
 			}
-			Utilities.addForrestPluginProperty(strPath + "\\" + strName
+			if (pluginPage.getSelectedPlugins() != null ) {
+			  Utilities.addForrestPluginProperty(strPath + "\\" + strName
 					+ "\\forrest.properties", pluginPage.getSelectedPlugins());
+            }
 			updateConfig(strPath + "/" + strName + "/");
 		} finally {
 			monitor.done();



Mime
View raw message