Project

General

Profile

fix_classpath_char_v2.diff

dhogan dhogan, 11/29/2011 12:44 PM

View differences:

src/org/kepler/build/Run.java (working copy)
588 588
    {
589 589
        System.out.println("RUN CLASSPATH");
590 590
        System.out.println("=========");
591
        String[] parts = classpath.split(":");
591
        String[] parts = classpath.split(File.pathSeparator);
592 592
        for (String part : parts)
593 593
        {
594 594
            System.out.println(part);
src/org/kepler/build/project/Classpath.java (working copy)
27 27
import org.apache.tools.ant.Project;
28 28
import org.apache.tools.ant.types.Path;
29 29

  
30
import java.io.File;
31

  
30 32
/**
31 33
 * class that represents a classpath
32 34
 *
......
64 66
    {
65 67
        System.out.println(type + " CLASSPATH");
66 68
        System.out.println("==========================");
67
        String[] parts = toString().split(":");
69
        String[] parts = toString().split(File.pathSeparator);
68 70
        for (String part : parts)
69 71
        {
70 72
            System.out.println(part);
src/org/kepler/build/CreateJavadoc.java (working copy)
160 160
        String ant = Module.make("build-area").getLibDir() + "/ant.jar";
161 161
        RunClasspath rcp = new RunClasspath();
162 162
        //CompileClasspath ccp = new CompileClasspath();
163
        addToCommand("-classpath " + _ptolemyClassPath() + ":" + commonsLogging
164
                + ":" + ant);
163
        addToCommand("-classpath " + _ptolemyClassPath() + File.pathSeparator + commonsLogging
164
                + File.pathSeparator + ant);
165 165
        //addToCommand("-classpath " + rcp.toString());
166 166

  
167 167
        // Needed for RatingTaglet
......
177 177
        }
178 178

  
179 179
        specifyPackages("org", "com", "util", "ptolemy");
180
        addToCommand("-link http://java.sun.com/j2se/1.5.0/docs/api/");
180
        addToCommand("-link http://docs.oracle.com/javase/6/docs/api/");
181 181
        command.add("-linksource");
182 182
        command.add("-author");
183 183
        command.add("-breakiterator");
......
242 242
    }
243 243

  
244 244
    /**
245
     * Add the soruce path from which the javadoc shoudl be produced for one
245
     * Add the source path from which the javadoc should be produced for one
246 246
     * module.
247 247
     *
248 248
     * @param srcDir The directory that contains Java code from which javadoc
......
250 250
     */
251 251
    protected void addSourcepath(File srcDir)
252 252
    {
253
        sourcepath += sourcepath.equals("") ? "" : ":";
253
        sourcepath += sourcepath.equals("") ? "" : File.pathSeparator;
254 254
        sourcepath += srcDir.getAbsolutePath();
255 255
    }
256 256

  
......
269 269
    }
270 270

  
271 271
    /**
272
     * Return a colon separated list of Ptolemy jar file.
272
     * Return a File.pathSeparator separated list of Ptolemy jar files.
273 273
     *
274
     * @return a colon separated list of Ptolemy jar file.
274
     * @return a File.pathSeparator separated list of Ptolemy jar files.
275 275
     */
276 276
    private String _ptolemyClassPath()
277 277
    {
278 278
        PtolemyPathGenerator ptolemyPathGenerator = PtolemyPathGenerator
279 279
                .getInstance();
280 280
        FileSet fileSet = ptolemyPathGenerator.getFileset();
281
        return fileSet.toString().replace(";", ":");
281
        return fileSet.toString().replace(";", File.pathSeparator);
282 282
    }
283 283

  
284 284
    /**