--- old/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Archive.java 2015-05-23 09:49:46.327357056 -0700 +++ /dev/null 2015-04-26 22:05:36.465433038 -0700 @@ -1,116 +0,0 @@ -/* - * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.sun.tools.jdeps; - -import com.sun.tools.classfile.ClassFile; -import com.sun.tools.classfile.Dependency.Location; - -import java.io.IOException; -import java.io.UncheckedIOException; -import java.nio.file.Path; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; - -/** - * Represents the source of the class files. - */ -public class Archive { - public static Archive getInstance(Path p) { - try { - return new Archive(p, ClassFileReader.newInstance(p)); - } catch (IOException e) { - throw new UncheckedIOException(e); - } - } - - private final Path path; - private final String filename; - private final ClassFileReader reader; - protected Map> deps = new ConcurrentHashMap<>(); - - protected Archive(String name) { - this(name, null); - } - protected Archive(String name, ClassFileReader reader) { - this.path = null; - this.filename = name; - this.reader = reader; - } - protected Archive(Path p, ClassFileReader reader) { - this.path = p; - this.filename = path.getFileName().toString(); - this.reader = reader; - } - - public ClassFileReader reader() { - return reader; - } - - public String getName() { - return filename; - } - - public void addClass(Location origin) { - deps.computeIfAbsent(origin, _k -> new HashSet<>()); - } - - public void addClass(Location origin, Location target) { - deps.computeIfAbsent(origin, _k -> new HashSet<>()).add(target); - } - - public Set getClasses() { - return deps.keySet(); - } - - public void visitDependences(Visitor v) { - for (Map.Entry> e: deps.entrySet()) { - for (Location target : e.getValue()) { - v.visit(e.getKey(), target); - } - } - } - - public boolean isEmpty() { - return getClasses().isEmpty(); - } - - public String getPathName() { - return path != null ? path.toString() : filename; - } - - public String toString() { - return filename; - } - - public Path path() { - return path; - } - - interface Visitor { - void visit(Location origin, Location target); - } -} --- /dev/null 2015-04-26 22:05:36.465433038 -0700 +++ new/langtools/src/jdk.compiler/share/classes/com/sun/tools/jdeps/Archive.java 2015-05-23 09:49:46.167357054 -0700 @@ -0,0 +1,116 @@ +/* + * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.sun.tools.jdeps; + +import com.sun.tools.classfile.ClassFile; +import com.sun.tools.classfile.Dependency.Location; + +import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.file.Path; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; + +/** + * Represents the source of the class files. + */ +public class Archive { + public static Archive getInstance(Path p) { + try { + return new Archive(p, ClassFileReader.newInstance(p)); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + + private final Path path; + private final String filename; + private final ClassFileReader reader; + protected Map> deps = new ConcurrentHashMap<>(); + + protected Archive(String name) { + this(name, null); + } + protected Archive(String name, ClassFileReader reader) { + this.path = null; + this.filename = name; + this.reader = reader; + } + protected Archive(Path p, ClassFileReader reader) { + this.path = p; + this.filename = path.getFileName().toString(); + this.reader = reader; + } + + public ClassFileReader reader() { + return reader; + } + + public String getName() { + return filename; + } + + public void addClass(Location origin) { + deps.computeIfAbsent(origin, _k -> new HashSet<>()); + } + + public void addClass(Location origin, Location target) { + deps.computeIfAbsent(origin, _k -> new HashSet<>()).add(target); + } + + public Set getClasses() { + return deps.keySet(); + } + + public void visitDependences(Visitor v) { + for (Map.Entry> e: deps.entrySet()) { + for (Location target : e.getValue()) { + v.visit(e.getKey(), target); + } + } + } + + public boolean isEmpty() { + return getClasses().isEmpty(); + } + + public String getPathName() { + return path != null ? path.toString() : filename; + } + + public String toString() { + return filename; + } + + public Path path() { + return path; + } + + interface Visitor { + void visit(Location origin, Location target); + } +}