Allow graph printing and JAR output

When Soot was set to output to a jar and graphs were to be printed
simultaneously, only one would happen due to a naming conflict.

Author: tim-hoffman

src/soot/util/PhaseDumper.java

@@ -154,6 +154,16 @@ private static java.io.File makeDirectoryIfMissing(Body b)
 	throws java.io.IOException {
 	StringBuffer buf = 
 	    new StringBuffer(soot.SourceLocator.v().getOutputDir());
+        
+        //If the options specify that the output directory should be a jar, we
+        //  must use a different directory for the graphs
+        if(Options.v().output_jar()){
+            if(buf.toString().endsWith(".jar")){
+                buf.delete(buf.length()-4, buf.length());
+            }
+            buf.append(".graphs");
+        }
+        
 	buf.append(File.separatorChar);
 	String className = b.getMethod().getDeclaringClass().getName();
 	buf.append(className);