[CIShell-SVN] SF.net SVN: cishell: [260] trunk/templates/org.cishell.templates

[<hu...@us...>]

Revision: 260
          http://svn.sourceforge.net/cishell/?rev=260&view=rev
Author:   huangb
Date:     2006-10-11 11:51:25 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
fixed a bug on windows where the '\' was getting deleted when a file is passed into the executable

Modified Paths:
--------------
    trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF
    trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableRunner.java

Modified: trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF
===================================================================
--- trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF	2006-10-11 18:50:51 UTC (rev 259)
+++ trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF	2006-10-11 18:51:25 UTC (rev 260)
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CIShell Template Code Provider
-Bundle-SymbolicName: org.cishell.templates
+Bundle-SymbolicName: org.cishell.templates;singleton:=true
 Bundle-Version: 0.1.0.qualifier
 Bundle-Localization: plugin
 X-AutoStart: true

Modified: trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableRunner.java
===================================================================
--- trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableRunner.java	2006-10-11 18:50:51 UTC (rev 259)
+++ trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableRunner.java	2006-10-11 18:51:25 UTC (rev 260)
@@ -212,7 +212,16 @@
         
         for (int i=0; i < data.length; i++) {
             String file = ((File) data[i].getData()).getAbsolutePath();
+            
+            if (File.separatorChar == '\\') {
+            	file = file.replace(File.separatorChar, '/');
+        	}
+            
             str = str.replaceAll("\\$\\{inFile\\["+i+"\\]\\}", file);
+            
+            if (File.separatorChar == '\\') {
+            	str = str.replace('/',File.separatorChar);
+            }
         }
         
         for (Enumeration i=parameters.keys(); i.hasMoreElements(); ) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.