jdk-sandbox: comparison src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java

equal deleted inserted replaced

-:d07d5f7cab35
+:e1a6c0168741
 /*
 * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
-* @LastModified: Sep 2017
+* @LastModified: Oct 2017
 */
 /*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 /**
 * Contains the translet class definition(s). These are created when
 * this Templates is created or when it is read back from disk.
 */
-private Class[] _class = null;
+private Class<?>[] _class = null;
 /**
 * The index of the main translet class in the arrays _class[] and
 * _bytecodes.
 */
 * which is used by the document('') function.
 * Use ThreadLocal because a DTM cannot be shared between
 * multiple threads.
 * Declaring it transient to fix bug 22438
 */
-private transient ThreadLocal _sdom = new ThreadLocal();
+private transient ThreadLocal<DOM> _sdom = new ThreadLocal<>();
 /**
 * A reference to the transformer factory that this templates
 * object belongs to.
 */
 }
 /**
 * Access to final protected superclass member from outer class.
 */
-Class defineClass(final byte[] b) {
+Class<?> defineClass(final byte[] b) {
 return defineClass(null, b, 0, b.length);
 }
-Class defineClass(final byte[] b, ProtectionDomain pd) {
+Class<?> defineClass(final byte[] b, ProtectionDomain pd) {
 return defineClass(null, b, 0, b.length, pd);
 }
 }
 // We have to read serialized fields first.
 ObjectInputStream.GetField gf = is.readFields();
 _name = (String)gf.get("_name", null);
 _bytecodes = (byte[][])gf.get("_bytecodes", null);
-_class = (Class[])gf.get("_class", null);
+_class = (Class<?>[])gf.get("_class", null);
 _transletIndex = gf.get("_transletIndex", -1);
 _outputProperties = (Properties)gf.get("_outputProperties", null);
 _indentNumber = gf.get("_indentNumber", 0);
 * Note: This method is private for security reasons. See
 * CR 6537898. When merging with Apache, we must ensure
 * that the privateness of this method is maintained (that
 * is why it wasn't removed).
 */
-private synchronized Class[] getTransletClasses() {
+private synchronized Class<?>[] getTransletClasses() {
 try {
 if (_class == null) defineTransletClasses();
 }
 catch (TransformerConfigurationException e) {
 // Falls through
 if (_bytecodes == null) {
 ErrorMsg err = new ErrorMsg(ErrorMsg.NO_TRANSLET_CLASS_ERR);
 throw new TransformerConfigurationException(err.toString());
 }
-TransletClassLoader loader = (TransletClassLoader)
+TransletClassLoader loader =
-AccessController.doPrivileged(new PrivilegedAction() {
+AccessController.doPrivileged(new PrivilegedAction<TransletClassLoader>() {
-public Object run() {
+public TransletClassLoader run() {
-return new TransletClassLoader(ObjectFactory.findClassLoader(),_tfactory.getExternalExtensionsMap());
+return new TransletClassLoader(ObjectFactory.findClassLoader(),
+_tfactory.getExternalExtensionsMap());
 }
 });
 try {
 final int classCount = _bytecodes.length;
-_class = new Class[classCount];
+_class = new Class<?>[classCount];
 if (classCount > 1) {
 _auxClasses = new HashMap<>();
 }
 // java.xml needs to instantiate the translet class
 thisModule.addReads(m);
 for (int i = 0; i < classCount; i++) {
 _class[i] = loader.defineClass(_bytecodes[i], pd);
-final Class superClass = _class[i].getSuperclass();
+final Class<?> superClass = _class[i].getSuperclass();
 // Check if this is the main class
 if (superClass.getName().equals(ABSTRACT_TRANSLET)) {
 _transletIndex = i;
 }

changeset 47359	e1a6c0168741
parent 47312	d4f959806fe9
child 47712	bde0215f1f70