← Back to branch summary

~ubuntu-branches/ubuntu/maverick/proguard/maverick

« back to all changes in this revision

Viewing changes to src/proguard/ant/ClassPathElement.java

  • Committer: Bazaar Package Importer
  • Author(s): Sam Clegg, Onkar Shinde, Sam Clegg
  • Date: 2009-10-09 16:17:49 UTC
  • mfrom: (1.2.3 upstream) (3.1.6 karmic)
  • Revision ID: james.westby@ubuntu.com-20091009161749-qjk059y5r792co7c
Tags: 4.4-1
http://bugs.debian.org/534029
http://bugs.debian.org/548810
[ Onkar Shinde ]
* Merge from Ubuntu. (Closes: #534029, #548810)

[ Sam Clegg ]
* Thanks Onkar for the above fixes!
* New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/proguard/ant/ClassPathElement.java
2
2
 * ProGuard -- shrinking, optimization, obfuscation, and preverification
3
3
 *             of Java bytecode.
4
4
 *
5
 
 * Copyright (c) 2002-2008 Eric Lafortune (eric@graphics.cornell.edu)
 
5
 * Copyright (c) 2002-2009 Eric Lafortune (eric@graphics.cornell.edu)
6
6
 *
7
7
 * This program is free software; you can redistribute it and/or modify it
8
8
 * under the terms of the GNU General Public License as published by the Free
23
23
import org.apache.tools.ant.*;
24
24
import org.apache.tools.ant.types.*;
25
25
import proguard.*;
 
26
import proguard.util.ListUtil;
26
27
 
27
28
import java.io.File;
28
29
 
118
119
            ClassPathEntry entry =
119
120
                new ClassPathEntry(file.isAbsolute() ? file : new File(baseDir, fileName),
120
121
                                   output);
121
 
            entry.setFilter(filter);
122
 
            entry.setJarFilter(jarFilter);
123
 
            entry.setWarFilter(warFilter);
124
 
            entry.setEarFilter(earFilter);
125
 
            entry.setZipFilter(zipFilter);
 
122
            entry.setFilter(ListUtil.commaSeparatedList(filter));
 
123
            entry.setJarFilter(ListUtil.commaSeparatedList(jarFilter));
 
124
            entry.setWarFilter(ListUtil.commaSeparatedList(warFilter));
 
125
            entry.setEarFilter(ListUtil.commaSeparatedList(earFilter));
 
126
            entry.setZipFilter(ListUtil.commaSeparatedList(zipFilter));
126
127
 
127
128
            // Add it to the class path.
128
129
            classPath.add(entry);