← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/proguard/DataEntryWriterFactory.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/DataEntryWriterFactory.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 proguard.io.*;
24
24
import proguard.util.*;
25
25
 
 
26
import java.util.List;
 
27
 
26
28
/**
27
29
 * This class can create DataEntryWriter instances based on class paths. The
28
30
 * writers will wrap the output in the proper jars, wars, ears, and zips.
69
71
        boolean isEar = endsWithIgnoreCase(entryName, ".ear");
70
72
        boolean isZip = endsWithIgnoreCase(entryName, ".zip");
71
73
 
72
 
        String filter    = classPathEntry.getFilter();
73
 
        String jarFilter = classPathEntry.getJarFilter();
74
 
        String warFilter = classPathEntry.getWarFilter();
75
 
        String earFilter = classPathEntry.getEarFilter();
76
 
        String zipFilter = classPathEntry.getZipFilter();
 
74
        List filter    = classPathEntry.getFilter();
 
75
        List jarFilter = classPathEntry.getJarFilter();
 
76
        List warFilter = classPathEntry.getWarFilter();
 
77
        List earFilter = classPathEntry.getEarFilter();
 
78
        List zipFilter = classPathEntry.getZipFilter();
77
79
 
78
80
        System.out.println("Preparing output " +
79
81
                           (isJar ? "jar" :
120
122
     */
121
123
    private static DataEntryWriter wrapInJarWriter(DataEntryWriter writer,
122
124
                                                   boolean         isJar,
123
 
                                                   String          jarFilter,
 
125
                                                   List            jarFilter,
124
126
                                                   String          jarExtension,
125
127
                                                   boolean         dontWrap)
126
128
    {