summaryrefslogtreecommitdiff
path: root/src/proguard/InputReader.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/proguard/InputReader.java')
-rw-r--r--src/proguard/InputReader.java48
1 files changed, 2 insertions, 46 deletions
diff --git a/src/proguard/InputReader.java b/src/proguard/InputReader.java
index 707774e..503ce7e 100644
--- a/src/proguard/InputReader.java
+++ b/src/proguard/InputReader.java
@@ -2,7 +2,7 @@
* ProGuard -- shrinking, optimization, obfuscation, and preverification
* of Java bytecode.
*
- * Copyright (c) 2002-2013 Eric Lafortune (eric@graphics.cornell.edu)
+ * Copyright (c) 2002-2014 Eric Lafortune (eric@graphics.cornell.edu)
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -54,18 +54,6 @@ public class InputReader
public void execute(ClassPool programClassPool,
ClassPool libraryClassPool) throws IOException
{
- // Check if we have at least some input classes.
- if (configuration.programJars == null)
- {
- throw new IOException("The input is empty. You have to specify one or more '-injars' options");
- }
-
- // Perform some sanity checks on the class paths.
- checkInputOutput(configuration.libraryJars,
- configuration.programJars);
- checkInputOutput(configuration.programJars,
- configuration.programJars);
-
WarningPrinter warningPrinter = new WarningPrinter(System.err, configuration.warn);
WarningPrinter notePrinter = new WarningPrinter(System.out, configuration.note);
@@ -115,7 +103,7 @@ public class InputReader
{
System.err.println("Note: there were " + noteCount +
" duplicate class definitions.");
- System.out.println(" (http://proguard.sourceforge.net/manual/troubleshooting.html#duplicateclass)");
+ System.err.println(" (http://proguard.sourceforge.net/manual/troubleshooting.html#duplicateclass)");
}
// Print out a summary of the warnings, if necessary.
@@ -139,38 +127,6 @@ public class InputReader
/**
- * Performs some sanity checks on the class paths.
- */
- private void checkInputOutput(ClassPath inputClassPath,
- ClassPath outputClassPath)
- throws IOException
- {
- if (inputClassPath == null ||
- outputClassPath == null)
- {
- return;
- }
-
- for (int index1 = 0; index1 < inputClassPath.size(); index1++)
- {
- ClassPathEntry entry1 = inputClassPath.get(index1);
- if (!entry1.isOutput())
- {
- for (int index2 = 0; index2 < outputClassPath.size(); index2++)
- {
- ClassPathEntry entry2 = outputClassPath.get(index2);
- if (entry2.isOutput() &&
- entry2.getName().equals(entry1.getName()))
- {
- throw new IOException("Input jars and output jars must be different ["+entry1.getName()+"]");
- }
- }
- }
- }
- }
-
-
- /**
* Reads all input entries from the given class path.
*/
private void readInput(String messagePrefix,