1.1 --- a/test/tools/javac/api/6411310/Test.java Fri Feb 18 12:28:49 2011 +0000
1.2 +++ b/test/tools/javac/api/6411310/Test.java Fri Feb 18 08:12:06 2011 -0800
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2009, 2011 Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -59,12 +59,12 @@
1.11 test(createFileManager(), createDir("dir", entries), "p", entries);
1.12 test(createFileManager(), createDir("a b/dir", entries), "p", entries);
1.13
1.14 - for (boolean useJavaUtilZip: new boolean[] { false, true }) {
1.15 - test(createFileManager(useJavaUtilZip), createJar("jar", entries), "p", entries);
1.16 - test(createFileManager(useJavaUtilZip), createJar("jar jar", entries), "p", entries);
1.17 + for (boolean useOptimizedZip: new boolean[] { false, true }) {
1.18 + test(createFileManager(useOptimizedZip), createJar("jar", entries), "p", entries);
1.19 + test(createFileManager(useOptimizedZip), createJar("jar jar", entries), "p", entries);
1.20
1.21 for (boolean useSymbolFile: new boolean[] { false, true }) {
1.22 - test(createFileManager(useJavaUtilZip, useSymbolFile), rt_jar, "java.lang.ref", null);
1.23 + test(createFileManager(useOptimizedZip, useSymbolFile), rt_jar, "java.lang.ref", null);
1.24 }
1.25 }
1.26
1.27 @@ -145,42 +145,22 @@
1.28 return createFileManager(false, false);
1.29 }
1.30
1.31 - JavacFileManager createFileManager(boolean useJavaUtilZip) {
1.32 - return createFileManager(useJavaUtilZip, false);
1.33 + JavacFileManager createFileManager(boolean useOptimizedZip) {
1.34 + return createFileManager(useOptimizedZip, false);
1.35 }
1.36
1.37 - JavacFileManager createFileManager(boolean useJavaUtilZip, boolean useSymbolFile) {
1.38 - // javac should really not be using system properties like this
1.39 - // -- it should really be using (hidden) options -- but until then
1.40 - // take care to leave system properties as we find them, so as not
1.41 - // to adversely affect other tests that might follow.
1.42 - String prev = System.getProperty("useJavaUtilZip");
1.43 - boolean resetProperties = false;
1.44 - try {
1.45 - if (useJavaUtilZip) {
1.46 - System.setProperty("useJavaUtilZip", "true");
1.47 - resetProperties = true;
1.48 - } else if (System.getProperty("useJavaUtilZip") != null) {
1.49 - System.getProperties().remove("useJavaUtilZip");
1.50 - resetProperties = true;
1.51 + JavacFileManager createFileManager(boolean useOptimizedZip, boolean useSymbolFile) {
1.52 + Context c = new Context();
1.53 + Options options = Options.instance(c);
1.54 +
1.55 + if (useOptimizedZip) {
1.56 + options.put("useOptimizedZip", "true");
1.57 }
1.58
1.59 - Context c = new Context();
1.60 if (!useSymbolFile) {
1.61 - Options options = Options.instance(c);
1.62 options.put("ignore.symbol.file", "true");
1.63 }
1.64 -
1.65 return new JavacFileManager(c, false, null);
1.66 - } finally {
1.67 - if (resetProperties) {
1.68 - if (prev == null) {
1.69 - System.getProperties().remove("useJavaUtilZip");
1.70 - } else {
1.71 - System.setProperty("useJavaUtilZip", prev);
1.72 - }
1.73 - }
1.74 - }
1.75 }
1.76
1.77 File createDir(String name, String... entries) throws Exception {
