author | sadayapalam |
Mon, 19 Sep 2016 05:31:53 +0530 | |
changeset 41033 | 49af2ecba616 |
parent 40308 | 274367a99f98 |
child 41440 | abd777fa486c |
permissions | -rw-r--r-- |
36526 | 1 |
/* |
2 |
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. |
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
|
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. Oracle designates this |
|
8 |
* particular file as subject to the "Classpath" exception as provided |
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
|
10 |
* |
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
24 |
*/ |
|
25 |
||
26 |
package com.sun.tools.javac.util; |
|
27 |
||
28 |
import java.lang.reflect.InvocationTargetException; |
|
29 |
import java.lang.reflect.Method; |
|
30 |
import java.nio.file.Path; |
|
31 |
import java.util.Collection; |
|
32 |
import java.util.ServiceLoader; |
|
33 |
||
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
34 |
/** |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
35 |
* This class provides wrappers for classes and methods that are new in JDK 9, and which are not |
36526 | 36 |
* available on older versions of the platform on which javac may be compiled and run. |
37 |
* In future releases, when javac is always compiled on JDK 9 or later, the use of these wrappers |
|
38 |
* can be replaced by use of the real underlying classes. |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
39 |
* |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
40 |
* <p>Wrapper classes provide a subset of the API of the wrapped classes, as needed for use |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
41 |
* in javac. Wrapper objects contain an {@code Object} reference to the underlying runtime object, |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
42 |
* and {@code Class} and {@code Method} objects for obtaining or using such instances via |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
43 |
* runtime reflection. The {@code Class} and {@code Method} objects are set up on a per-class |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
44 |
* basis, by an {@code init} method, which is called from static methods on the wrapper class, |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
45 |
* or in the constructor, when instances are created. |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
46 |
* <p> |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
47 |
* |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
48 |
* <p><b>This is NOT part of any supported API. |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
49 |
* If you write code that depends on this, you do so at your own risk. |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
50 |
* This code and its internal interfaces are subject to change or |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
51 |
* deletion without notice.</b> |
36526 | 52 |
*/ |
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
53 |
public class JDK9Wrappers { |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
54 |
|
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
55 |
/** |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
56 |
* Helper class for new method in java.util.ServiceLoader. |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
57 |
*/ |
36526 | 58 |
public static final class ServiceLoaderHelper { |
59 |
@SuppressWarnings("unchecked") |
|
60 |
public static <S> ServiceLoader<S> load(Layer layer, Class<S> service) { |
|
61 |
try { |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
62 |
init(); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
63 |
Object result = loadMethod.invoke(null, layer.theRealLayer, service); |
36526 | 64 |
return (ServiceLoader<S>)result; |
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
65 |
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
66 |
| SecurityException ex) { |
36526 | 67 |
throw new Abort(ex); |
68 |
} |
|
69 |
} |
|
70 |
||
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
71 |
// ----------------------------------------------------------------------------------------- |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
72 |
|
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
73 |
private static Method loadMethod = null; |
36526 | 74 |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
75 |
private static void init() { |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
76 |
if (loadMethod == null) { |
36526 | 77 |
try { |
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
78 |
Class<?> layerClass = Layer.layerClass; |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
79 |
loadMethod = ServiceLoader.class.getDeclaredMethod("load", layerClass, Class.class); |
36526 | 80 |
} catch (NoSuchMethodException | SecurityException ex) { |
81 |
throw new Abort(ex); |
|
82 |
} |
|
83 |
} |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
84 |
} |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
85 |
} |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
86 |
|
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
87 |
/** |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
88 |
* Wrapper class for java.lang.module.ModuleFinder. |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
89 |
*/ |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
90 |
public static class ModuleFinder { |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
91 |
private final Object theRealModuleFinder; |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
92 |
|
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
93 |
private ModuleFinder(Object moduleFinder) { |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
94 |
this.theRealModuleFinder = moduleFinder; |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
95 |
init(); |
36526 | 96 |
} |
97 |
||
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
98 |
public static ModuleFinder of(Path... dirs) { |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
99 |
try { |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
100 |
init(); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
101 |
Object result = ofMethod.invoke(null, (Object)dirs); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
102 |
ModuleFinder mFinder = new ModuleFinder(result); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
103 |
return mFinder; |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
104 |
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
105 |
| SecurityException ex) { |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
106 |
throw new Abort(ex); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
107 |
} |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
108 |
} |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
109 |
|
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
110 |
// ----------------------------------------------------------------------------------------- |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
111 |
|
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
112 |
private static Class<?> moduleFinderClass = null; |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
113 |
private static Method ofMethod; |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
114 |
|
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
115 |
static final Class<?> getModuleFinderClass() { |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
116 |
init(); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
117 |
return moduleFinderClass; |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
118 |
} |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
119 |
|
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
120 |
private static void init() { |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
121 |
if (moduleFinderClass == null) { |
36526 | 122 |
try { |
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
123 |
moduleFinderClass = Class.forName("java.lang.module.ModuleFinder", false, null); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
124 |
ofMethod = moduleFinderClass.getDeclaredMethod("of", Path[].class); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
125 |
} catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) { |
36526 | 126 |
throw new Abort(ex); |
127 |
} |
|
128 |
} |
|
129 |
} |
|
130 |
} |
|
131 |
||
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
132 |
/** |
41033
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
133 |
* Wrapper class for java.lang.reflect.Module. To materialize a handle use the static factory |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
134 |
* methods Module#getModule(Class<?>) or Module#getUnnamedModule(ClassLoader). |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
135 |
*/ |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
136 |
public static class Module { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
137 |
|
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
138 |
private final Object theRealModule; |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
139 |
|
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
140 |
private Module(Object module) { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
141 |
this.theRealModule = module; |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
142 |
init(); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
143 |
} |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
144 |
|
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
145 |
public static Module getModule(Class<?> clazz) { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
146 |
try { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
147 |
init(); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
148 |
Object result = getModuleMethod.invoke(clazz, new Object[0]); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
149 |
return new Module(result); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
150 |
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
151 |
| SecurityException ex) { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
152 |
throw new Abort(ex); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
153 |
} |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
154 |
} |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
155 |
|
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
156 |
public static Module getUnnamedModule(ClassLoader classLoader) { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
157 |
try { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
158 |
init(); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
159 |
Object result = getUnnamedModuleMethod.invoke(classLoader, new Object[0]); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
160 |
return new Module(result); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
161 |
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
162 |
| SecurityException ex) { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
163 |
throw new Abort(ex); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
164 |
} |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
165 |
} |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
166 |
|
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
167 |
public Module addExports(String pn, Module other) { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
168 |
try { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
169 |
addExportsMethod.invoke(theRealModule, new Object[] { pn, other.theRealModule}); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
170 |
} catch (IllegalAccessException | InvocationTargetException ex) { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
171 |
throw new Abort(ex); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
172 |
} |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
173 |
return this; |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
174 |
} |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
175 |
|
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
176 |
public Module addUses(Class<?> st) { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
177 |
try { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
178 |
addUsesMethod.invoke(theRealModule, new Object[] { st }); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
179 |
} catch (IllegalAccessException | InvocationTargetException ex) { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
180 |
throw new Abort(ex); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
181 |
} |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
182 |
return this; |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
183 |
} |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
184 |
|
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
185 |
// ----------------------------------------------------------------------------------------- |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
186 |
// on java.lang.reflect.Module |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
187 |
private static Method addExportsMethod = null; |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
188 |
// on java.lang.reflect.Module |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
189 |
private static Method addUsesMethod = null; |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
190 |
// on java.lang.Class |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
191 |
private static Method getModuleMethod; |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
192 |
// on java.lang.ClassLoader |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
193 |
private static Method getUnnamedModuleMethod; |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
194 |
|
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
195 |
private static void init() { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
196 |
if (addExportsMethod == null) { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
197 |
try { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
198 |
Class<?> moduleClass = Class.forName("java.lang.reflect.Module", false, null); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
199 |
addUsesMethod = moduleClass.getDeclaredMethod("addUses", new Class<?>[] { Class.class }); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
200 |
addExportsMethod = moduleClass.getDeclaredMethod("addExports", |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
201 |
new Class<?>[] { String.class, moduleClass }); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
202 |
getModuleMethod = Class.class.getDeclaredMethod("getModule", new Class<?>[0]); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
203 |
getUnnamedModuleMethod = ClassLoader.class.getDeclaredMethod("getUnnamedModule", new Class<?>[0]); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
204 |
} catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) { |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
205 |
throw new Abort(ex); |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
206 |
} |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
207 |
} |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
208 |
} |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
209 |
} |
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
210 |
|
49af2ecba616
8164742: ServiceConfigurationError on invoke of getServiceLoader method of StandardJavaFileManager
sadayapalam
parents:
40308
diff
changeset
|
211 |
/** |
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
212 |
* Wrapper class for java.lang.module.Configuration. |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
213 |
*/ |
36526 | 214 |
public static final class Configuration { |
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
215 |
private final Object theRealConfiguration; |
36526 | 216 |
|
217 |
private Configuration(Object configuration) { |
|
218 |
this.theRealConfiguration = configuration; |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
219 |
init(); |
36526 | 220 |
} |
221 |
||
222 |
public Configuration resolveRequiresAndUses( |
|
223 |
ModuleFinder beforeFinder, |
|
224 |
ModuleFinder afterFinder, |
|
225 |
Collection<String> roots) { |
|
226 |
try { |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
227 |
Object result = resolveRequiresAndUsesMethod.invoke(theRealConfiguration, |
36526 | 228 |
beforeFinder.theRealModuleFinder, |
229 |
afterFinder.theRealModuleFinder, |
|
230 |
roots |
|
231 |
); |
|
232 |
Configuration configuration = new Configuration(result); |
|
233 |
return configuration; |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
234 |
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
235 |
| SecurityException ex) { |
36526 | 236 |
throw new Abort(ex); |
237 |
} |
|
238 |
} |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
239 |
|
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
240 |
// ----------------------------------------------------------------------------------------- |
36526 | 241 |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
242 |
private static Class<?> configurationClass = null; |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
243 |
private static Method resolveRequiresAndUsesMethod; |
36526 | 244 |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
245 |
static final Class<?> getConfigurationClass() { |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
246 |
init(); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
247 |
return configurationClass; |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
248 |
} |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
249 |
|
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
250 |
private static void init() { |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
251 |
if (configurationClass == null) { |
36526 | 252 |
try { |
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
253 |
configurationClass = Class.forName("java.lang.module.Configuration", false, null); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
254 |
Class<?> moduleFinderInterface = ModuleFinder.getModuleFinderClass(); |
36526 | 255 |
resolveRequiresAndUsesMethod = configurationClass.getDeclaredMethod("resolveRequiresAndUses", |
256 |
moduleFinderInterface, |
|
257 |
moduleFinderInterface, |
|
258 |
Collection.class |
|
259 |
); |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
260 |
} catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) { |
36526 | 261 |
throw new Abort(ex); |
262 |
} |
|
263 |
} |
|
264 |
} |
|
265 |
} |
|
266 |
||
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
267 |
/** |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
268 |
* Wrapper class for java.lang.module.Layer. |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
269 |
*/ |
36526 | 270 |
public static final class Layer { |
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
271 |
private final Object theRealLayer; |
36526 | 272 |
|
273 |
private Layer(Object layer) { |
|
274 |
this.theRealLayer = layer; |
|
275 |
} |
|
276 |
||
277 |
public static Layer boot() { |
|
278 |
try { |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
279 |
init(); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
280 |
Object result = bootMethod.invoke(null); |
36526 | 281 |
Layer layer = new Layer(result); |
282 |
return layer; |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
283 |
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
284 |
| SecurityException ex) { |
36526 | 285 |
throw new Abort(ex); |
286 |
} |
|
287 |
} |
|
288 |
||
289 |
public Configuration configuration() { |
|
290 |
try { |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
291 |
Object result = configurationMethod.invoke(theRealLayer); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
292 |
Configuration configuration = new Configuration(result); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
293 |
return configuration; |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
294 |
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
295 |
| SecurityException ex) { |
36526 | 296 |
throw new Abort(ex); |
297 |
} |
|
298 |
} |
|
299 |
||
300 |
public Layer defineModulesWithOneLoader(Configuration configuration, ClassLoader parentClassLoader) { |
|
301 |
try { |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
302 |
Object result = defineModulesWithOneLoaderMethod.invoke( |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
303 |
theRealLayer, configuration.theRealConfiguration, parentClassLoader); |
36526 | 304 |
Layer layer = new Layer(result); |
305 |
return layer; |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
306 |
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
307 |
| SecurityException ex) { |
36526 | 308 |
throw new Abort(ex); |
309 |
} |
|
310 |
} |
|
311 |
||
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
312 |
// ----------------------------------------------------------------------------------------- |
36526 | 313 |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
314 |
private static Class<?> layerClass = null; |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
315 |
private static Method bootMethod; |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
316 |
private static Method defineModulesWithOneLoaderMethod; |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
317 |
private static Method configurationMethod; |
36526 | 318 |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
319 |
private static void init() { |
36526 | 320 |
if (layerClass == null) { |
321 |
try { |
|
38533
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
322 |
layerClass = Class.forName("java.lang.reflect.Layer", false, null); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
323 |
bootMethod = layerClass.getDeclaredMethod("boot"); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
324 |
defineModulesWithOneLoaderMethod = layerClass.getDeclaredMethod("defineModulesWithOneLoader", |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
325 |
Configuration.getConfigurationClass(), |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
326 |
ClassLoader.class); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
327 |
configurationMethod = layerClass.getDeclaredMethod("configuration"); |
2bd347dde526
8157474: clean up/simplify/rename ModuleWrappers class
jjg
parents:
37848
diff
changeset
|
328 |
} catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) { |
36526 | 329 |
throw new Abort(ex); |
330 |
} |
|
331 |
} |
|
332 |
} |
|
333 |
} |
|
40308
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
334 |
|
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
335 |
|
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
336 |
/** |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
337 |
* Helper class for new method in jdk.internal.misc.VM. |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
338 |
*/ |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
339 |
public static final class VMHelper { |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
340 |
public static final String VM_CLASSNAME = "jdk.internal.misc.VM"; |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
341 |
|
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
342 |
@SuppressWarnings("unchecked") |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
343 |
public static String[] getRuntimeArguments() { |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
344 |
try { |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
345 |
init(); |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
346 |
Object result = getRuntimeArgumentsMethod.invoke(null); |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
347 |
return (String[])result; |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
348 |
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
349 |
| SecurityException ex) { |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
350 |
throw new Abort(ex); |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
351 |
} |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
352 |
} |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
353 |
|
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
354 |
// ----------------------------------------------------------------------------------------- |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
355 |
|
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
356 |
private static Class<?> vmClass = null; |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
357 |
private static Method getRuntimeArgumentsMethod = null; |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
358 |
|
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
359 |
private static void init() { |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
360 |
if (vmClass == null) { |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
361 |
try { |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
362 |
vmClass = Class.forName(VM_CLASSNAME, false, null); |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
363 |
getRuntimeArgumentsMethod = vmClass.getDeclaredMethod("getRuntimeArguments"); |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
364 |
} catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) { |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
365 |
throw new Abort(ex); |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
366 |
} |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
367 |
} |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
368 |
} |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38533
diff
changeset
|
369 |
} |
36526 | 370 |
} |