diff --git a/.hgtags b/.hgtags index b10973146f8..a2e16484b47 100644 --- a/.hgtags +++ b/.hgtags @@ -136,3 +136,5 @@ cc1f5ce8e504d350e0b0c28c5f84333f8d540132 jdk8-b11 86db042b3385c338e17f7664447fdc7d406dd19e jdk8-b12 4cc0ef72c812943743ef4765f1100e2fbe2b1a08 jdk8-b13 9ffaa48dbfb0f5936c2b789867d0785faec7071d jdk8-b14 +b5060eae3b32fd9f884a09774338cd8186d7fafa jdk8-b15 +736a63b854f321c7824b7e47890135f80aee05e3 jdk8-b16 diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 9a2840005da..d837fdefdba 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -136,3 +136,4 @@ a6c4c248e8fa350c35014fa94bab5ac1a1ac3299 jdk8-b10 8e2104d565baee473895d5eba20e39f85ab4bf9f jdk8-b12 26fb81a1e9ceb9baffba216acd9ded62e9e9d5ab jdk8-b13 23aa7f2c80a2fa354c80decf03e7c2018177ef4e jdk8-b14 +a4f28069d44a379cda99dd1d921d19f819726d22 jdk8-b15 diff --git a/corba/.hgtags b/corba/.hgtags index 0ed9489cb7a..0eedad9f973 100644 --- a/corba/.hgtags +++ b/corba/.hgtags @@ -136,3 +136,4 @@ cda87f7fefcee3b89742a57ce5ad9b03a54c210d jdk8-b10 31d70911b712c6b4e580a3110363d5f044cfed7a jdk8-b12 5b9d9b839d3d7fe02347827221c97c6d242a6f96 jdk8-b13 e59c47de1ad8982ff3b0e843773a6902b36c2337 jdk8-b14 +7da69e7175a7c7564ee6d0e52255cbb8a57ef577 jdk8-b15 diff --git a/hotspot/.hgtags b/hotspot/.hgtags index 871721f37dc..4099ac55a93 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -200,3 +200,4 @@ d815de2e85e511b7deab2a83cf80c0224d011da9 jdk8-b10 b92ca8e229d29004f840c67e620833d23a346761 jdk8-b13 088d09a130ff02d8f5f05e92256baabe412f0439 jdk8-b14 6c2a55d4902f202e1c2de1df17b7da083a2c31e8 hs23-b06 +fde2a39ed7f39233b287fbc278f437aac06c275b jdk8-b15 diff --git a/jaxp/.hgtags b/jaxp/.hgtags index a5a1d0d667e..3947922b70a 100644 --- a/jaxp/.hgtags +++ b/jaxp/.hgtags @@ -136,3 +136,4 @@ d1b7a4f6dd2065fdeafbcdfd9dcc0072da8c6881 jdk8-b11 ca977d167697a561c04894187fc1c4d927582ffa jdk8-b12 bcc739229f6384786c7ac0b52c1822c85674dcf1 jdk8-b13 9d0c9d638757cb09de18933b946fa04b4f3fb94f jdk8-b14 +804f666d6d44e33caac12ad8da3d2780ac44ef72 jdk8-b15 diff --git a/jaxp/build.properties b/jaxp/build.properties index 8ec3620b01e..a468f8175fc 100644 --- a/jaxp/build.properties +++ b/jaxp/build.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 @@ -25,7 +25,7 @@ # Base locations where bundles are located slashjava=/java -drops.dir=${slashjava}/devtools/share/jdk7-drops +drops.dir=${slashjava}/devtools/share/jdk8-drops # This is the JDK used to build and run the bootstrap version of javac. # The bootstrap javac is used to compile both boostrap versions of the diff --git a/jaxp/make/Makefile b/jaxp/make/Makefile index 55076a028af..b2574d7d6da 100644 --- a/jaxp/make/Makefile +++ b/jaxp/make/Makefile @@ -99,9 +99,9 @@ ifdef ALT_DROPS_DIR DROPS_DIR = $(ALT_DROPS_DIR) else ifdef ALT_JDK_DEVTOOLS_DIR - DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops + DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk8-drops else - DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops + DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk8-drops endif endif diff --git a/jaxws/.hgtags b/jaxws/.hgtags index 3721c51e56d..be879b77d3c 100644 --- a/jaxws/.hgtags +++ b/jaxws/.hgtags @@ -136,3 +136,4 @@ a12ab897a249feb7859a6e6cd84b49411f4c06ac jdk8-b11 e6eed2ff5d5f62bdc815beb5276d23347600c760 jdk8-b12 adf2a6b5fde14090beb9ebc40c4114132ddee731 jdk8-b13 54c4bf4b83ecc191351747d5d28da849d34c0243 jdk8-b14 +c9ab96ff23d52d85d5dcce1f9c0fd7a3de418c74 jdk8-b15 diff --git a/jaxws/build.properties b/jaxws/build.properties index 8ec3620b01e..a468f8175fc 100644 --- a/jaxws/build.properties +++ b/jaxws/build.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 @@ -25,7 +25,7 @@ # Base locations where bundles are located slashjava=/java -drops.dir=${slashjava}/devtools/share/jdk7-drops +drops.dir=${slashjava}/devtools/share/jdk8-drops # This is the JDK used to build and run the bootstrap version of javac. # The bootstrap javac is used to compile both boostrap versions of the diff --git a/jaxws/make/Makefile b/jaxws/make/Makefile index 55076a028af..b2574d7d6da 100644 --- a/jaxws/make/Makefile +++ b/jaxws/make/Makefile @@ -99,9 +99,9 @@ ifdef ALT_DROPS_DIR DROPS_DIR = $(ALT_DROPS_DIR) else ifdef ALT_JDK_DEVTOOLS_DIR - DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops + DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk8-drops else - DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops + DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk8-drops endif endif diff --git a/jdk/.hgtags b/jdk/.hgtags index 472ceb82660..961824355d0 100644 --- a/jdk/.hgtags +++ b/jdk/.hgtags @@ -136,3 +136,6 @@ f1ec21b8142168ff40f3278d2f6b5fe4bd5f3b26 jdk8-b09 09fd2067f715e4505c44b01c301258a4e8f8964e jdk8-b12 4cb2e8679b27432854690cb688ea06d3b2d8e008 jdk8-b13 99632935785e2038b2fc836da9f2ede69dea294b jdk8-b14 +3c248d0e2c486624cc0d7aba1e4df45ae5774ff7 jdk8-b15 +b71d1acfae5240d8c1359443cd02b5ddb587231c jdk8-b17 +929597c6e777f742ad252660045ebaa4a3ea4772 jdk8-b16 diff --git a/jdk/make/common/Defs-embedded.gmk b/jdk/make/common/Defs-embedded.gmk index de449f82b5a..089fae9d586 100644 --- a/jdk/make/common/Defs-embedded.gmk +++ b/jdk/make/common/Defs-embedded.gmk @@ -65,5 +65,12 @@ ifdef CROSS_COMPILE_ARCH NIO_PLATFORM_CLASSES_ROOT_DIR = $(CLOSED_PLATFORM_SRC)/classes/ endif +# For ARM sflt we need to link to a library with improved FP accuracy +# and it must be linked after fdlibm - this places it at the end after libc +# -z muldefs avoids linker errors for duplicate symbols. +ifeq ($(CROSS_COMPILE_ARCH), arm) + EXTRA_LIBS += $(EXT_LIBS_PATH)/sflt_glibc_jdk.a -Xlinker -z -Xlinker muldefs +endif + endif # JAVASE_EMBEDDED diff --git a/jdk/make/common/Defs.gmk b/jdk/make/common/Defs.gmk index 99d1ed1a69e..5f8d91171de 100644 --- a/jdk/make/common/Defs.gmk +++ b/jdk/make/common/Defs.gmk @@ -202,7 +202,7 @@ endif # # zlib version # -ZLIB_VERSION = 1.2.3 +ZLIB_VERSION = 1.2.5 # diff --git a/jdk/make/common/Rules.gmk b/jdk/make/common/Rules.gmk index 5072b33c2c9..041e1d20226 100644 --- a/jdk/make/common/Rules.gmk +++ b/jdk/make/common/Rules.gmk @@ -233,13 +233,15 @@ classes : $(CLASSES_INIT) .delete.classlist .compile.classlist @$(MKDIR) -p $(CLASSDESTDIR) @$(RM) $<.filtered @$(CAT) $< | $(NAWK) 'length>0' | $(SORT) -u > $<.filtered - @if [ `$(CAT) $<.filtered | $(WC) -l` -ge 1 ] ; then \ - $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \ - $(CAT) $<.filtered; \ - $(ECHO) "# Running javac:"; \ - $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \ - $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \ - fi + @numfiles=`$(WC) -l < $<.filtered` ; \ + if [ $$numfiles -ge 1 ] ; then \ + $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \ + $(CAT) $<.filtered; \ + $(ECHO) "# Running javac: $$numfiles files; in $(CURDIR)"; \ + $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \ + $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \ + $(ECHO) "# javac finished"; \ + fi @$(java-vm-cleanup) clobber clean:: diff --git a/jdk/make/java/zip/FILES_c.gmk b/jdk/make/java/zip/FILES_c.gmk index 66648876daa..a1d5e933830 100644 --- a/jdk/make/java/zip/FILES_c.gmk +++ b/jdk/make/java/zip/FILES_c.gmk @@ -32,7 +32,10 @@ FILES_c = \ zip_util.c \ compress.c \ deflate.c \ - gzio.c \ + gzclose.c \ + gzlib.c \ + gzread.c \ + gzwrite.c \ infback.c \ inffast.c \ inflate.c \ diff --git a/jdk/make/java/zip/mapfile-vers b/jdk/make/java/zip/mapfile-vers index fdcd5b63be1..3f95d470b90 100644 --- a/jdk/make/java/zip/mapfile-vers +++ b/jdk/make/java/zip/mapfile-vers @@ -30,8 +30,10 @@ SUNWprivate_1.1 { Java_java_util_jar_JarFile_getMetaInfEntryNames; Java_java_util_zip_Adler32_update; Java_java_util_zip_Adler32_updateBytes; + Java_java_util_zip_Adler32_updateByteBuffer; Java_java_util_zip_CRC32_update; Java_java_util_zip_CRC32_updateBytes; + Java_java_util_zip_CRC32_updateByteBuffer; Java_java_util_zip_Deflater_deflateBytes; Java_java_util_zip_Deflater_end; Java_java_util_zip_Deflater_getAdler; diff --git a/jdk/make/sun/splashscreen/FILES_c.gmk b/jdk/make/sun/splashscreen/FILES_c.gmk index a7684a21a3e..b6e234f10b5 100644 --- a/jdk/make/sun/splashscreen/FILES_c.gmk +++ b/jdk/make/sun/splashscreen/FILES_c.gmk @@ -51,7 +51,10 @@ FILES_c = \ gifalloc.c \ compress.c \ deflate.c \ - gzio.c \ + gzclose.c \ + gzlib.c \ + gzread.c \ + gzwrite.c \ infback.c \ inffast.c \ inflate.c \ diff --git a/jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java b/jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java index c90578d46c2..8e7928dbe65 100644 --- a/jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java +++ b/jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java @@ -34,15 +34,13 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Properties; +import java.util.ServiceLoader; import java.security.AccessController; import java.security.PrivilegedAction; import javax.sound.sampled.AudioPermission; -import sun.misc.Service; - - /** Managing security in the Java Sound implementation. * This class contains all code that uses and is used by * SecurityManager.doPrivileged(). @@ -80,8 +78,8 @@ class JSSecurityManager { try { if (hasSecurityManager()) { if(Printer.debug) Printer.debug("using security manager to load library"); - PrivilegedAction action = new PrivilegedAction() { - public Object run() { + PrivilegedAction action = new PrivilegedAction() { + public Void run() { System.loadLibrary(libName); return null; } @@ -104,8 +102,8 @@ class JSSecurityManager { if (hasSecurityManager()) { if(Printer.debug) Printer.debug("using JDK 1.2 security to get property"); try{ - PrivilegedAction action = new PrivilegedAction() { - public Object run() { + PrivilegedAction action = new PrivilegedAction() { + public String run() { try { return System.getProperty(propertyName); } catch (Throwable t) { @@ -113,7 +111,7 @@ class JSSecurityManager { } } }; - propertyValue = (String) AccessController.doPrivileged(action); + propertyValue = AccessController.doPrivileged(action); } catch( Exception e ) { if(Printer.debug) Printer.debug("not using JDK 1.2 security to get properties"); propertyValue = System.getProperty(propertyName); @@ -142,8 +140,8 @@ class JSSecurityManager { if(hasSecurityManager()) { try { // invoke the privileged action using 1.2 security - PrivilegedAction action = new PrivilegedAction() { - public Object run() { + PrivilegedAction action = new PrivilegedAction() { + public Void run() { loadPropertiesImpl(properties, filename); return null; } @@ -197,8 +195,8 @@ class JSSecurityManager { if(hasSecurityManager()) { try { // invoke the privileged action using 1.2 security - PrivilegedAction action = new PrivilegedAction() { - public Object run() { + PrivilegedAction action = new PrivilegedAction() { + public ThreadGroup run() { try { return getTopmostThreadGroupImpl(); } catch (Throwable t) { @@ -206,7 +204,7 @@ class JSSecurityManager { } } }; - topmostThreadGroup = (ThreadGroup) AccessController.doPrivileged(action); + topmostThreadGroup = AccessController.doPrivileged(action); if(Printer.debug)Printer.debug("Got topmost thread group with JDK 1.2 security"); } catch (Exception e) { if(Printer.debug)Printer.debug("Exception getting topmost thread group with JDK 1.2 security"); @@ -240,8 +238,8 @@ class JSSecurityManager { final boolean doStart) { Thread thread = null; if(hasSecurityManager()) { - PrivilegedAction action = new PrivilegedAction() { - public Object run() { + PrivilegedAction action = new PrivilegedAction() { + public Thread run() { try { return createThreadImpl(runnable, threadName, isDaemon, priority, @@ -251,7 +249,7 @@ class JSSecurityManager { } } }; - thread = (Thread) AccessController.doPrivileged(action); + thread = AccessController.doPrivileged(action); if(Printer.debug) Printer.debug("created thread with JDK 1.2 security"); } else { if(Printer.debug)Printer.debug("not using JDK 1.2 security"); @@ -282,11 +280,11 @@ class JSSecurityManager { } - static List getProviders(final Class providerClass) { - List p = new ArrayList(); - // Service.providers(Class) just creates "lazy" iterator instance, - // so it doesn't require do be called from privileged section - final Iterator ps = Service.providers(providerClass); + static List getProviders(final Class providerClass) { + List p = new ArrayList<>(); + // ServiceLoader creates "lazy" iterator instance, so it doesn't, + // require do be called from privileged section + final Iterator ps = ServiceLoader.load(providerClass).iterator(); // the iterator's hasNext() method looks through classpath for // the provider class names, so it requires read permissions @@ -301,7 +299,7 @@ class JSSecurityManager { // the iterator's next() method creates instances of the // providers and it should be called in the current security // context - Object provider = ps.next(); + T provider = ps.next(); if (providerClass.isInstance(provider)) { // $$mp 2003-08-22 // Always adding at the beginning reverses the diff --git a/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java b/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java index ec8b91c5f5d..7b5c05331fe 100644 --- a/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java +++ b/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java @@ -25,50 +25,58 @@ package com.sun.net.httpserver.spi; -import java.io.FileDescriptor; import java.io.IOException; import java.net.*; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.Iterator; -import sun.misc.Service; -import sun.misc.ServiceConfigurationError; -import sun.security.action.GetPropertyAction; +import java.util.ServiceLoader; +import java.util.ServiceConfigurationError; import com.sun.net.httpserver.*; /** * Service provider class for HttpServer. - * Sub-classes of HttpServerProvider provide an implementation of {@link HttpServer} and - * associated classes. Applications do not normally use this class. - * See {@link #provider()} for how providers are found and loaded. + * Sub-classes of HttpServerProvider provide an implementation of + * {@link HttpServer} and associated classes. Applications do not normally use + * this class. See {@link #provider()} for how providers are found and loaded. */ public abstract class HttpServerProvider { /** * creates a HttpServer from this provider - * @param addr the address to bind to. May be null - * @param backlog the socket backlog. A value of zero means the systems default + * + * @param addr + * the address to bind to. May be {@code null} + * + * @param backlog + * the socket backlog. A value of {@code zero} means the systems default */ - public abstract HttpServer createHttpServer (InetSocketAddress addr, int backlog) throws IOException; + public abstract HttpServer createHttpServer(InetSocketAddress addr, + int backlog) + throws IOException; /** * creates a HttpsServer from this provider - * @param addr the address to bind to. May be null - * @param backlog the socket backlog. A value of zero means the systems default + * + * @param addr + * the address to bind to. May be {@code null} + * + * @param backlog + * the socket backlog. A value of {@code zero} means the systems default */ - public abstract HttpsServer createHttpsServer (InetSocketAddress addr, int backlog) throws IOException; - - + public abstract HttpsServer createHttpsServer(InetSocketAddress addr, + int backlog) + throws IOException; private static final Object lock = new Object(); private static HttpServerProvider provider = null; /** - * Initializes a new instance of this class.

+ * Initializes a new instance of this class. * * @throws SecurityException * If a security manager has been installed and it denies - * {@link RuntimePermission}("httpServerProvider") + * {@link RuntimePermission}{@code("httpServerProvider")} */ protected HttpServerProvider() { SecurityManager sm = System.getSecurityManager(); @@ -82,21 +90,22 @@ public abstract class HttpServerProvider { return false; try { Class c = Class.forName(cn, true, - ClassLoader.getSystemClassLoader()); + ClassLoader.getSystemClassLoader()); provider = (HttpServerProvider)c.newInstance(); return true; } catch (ClassNotFoundException | IllegalAccessException | InstantiationException | SecurityException x) { - throw new ServiceConfigurationError(x); + throw new ServiceConfigurationError(null, x); } } private static boolean loadProviderAsService() { - @SuppressWarnings("unchecked") - Iterator i = Service.providers(HttpServerProvider.class, - ClassLoader.getSystemClassLoader()); + Iterator i = + ServiceLoader.load(HttpServerProvider.class, + ClassLoader.getSystemClassLoader()) + .iterator(); for (;;) { try { if (!i.hasNext()) @@ -123,19 +132,19 @@ public abstract class HttpServerProvider { *
    * *

  1. If the system property - * com.sun.net.httpserver.HttpServerProvider is defined then it is - * taken to be the fully-qualified name of a concrete provider class. + * {@code com.sun.net.httpserver.HttpServerProvider} is defined then it + * is taken to be the fully-qualified name of a concrete provider class. * The class is loaded and instantiated; if this process fails then an * unspecified unchecked error or exception is thrown.

    2. * *

  2. If a provider class has been installed in a jar file that is * visible to the system class loader, and that jar file contains a * provider-configuration file named - * com.sun.net.httpserver.HttpServerProvider in the resource + * {@code com.sun.net.httpserver.HttpServerProvider} in the resource * directory META-INF/services, then the first class name * specified in that file is taken. The class is loaded and - * instantiated; if this process fails then an unspecified unchecked error or exception is - * thrown.

    3. + * instantiated; if this process fails then an unspecified unchecked error + * or exception is thrown.

    * *

  3. Finally, if no provider has been specified by any of the above * means then the system-default provider class is instantiated and the diff --git a/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java b/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java index 8008049a751..9b4670556c8 100644 --- a/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java +++ b/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java @@ -357,7 +357,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern // set the Reader, this maybe overridden latter provider = - (SyncProvider)SyncFactory.getInstance(DEFAULT_SYNC_PROVIDER); + SyncFactory.getInstance(DEFAULT_SYNC_PROVIDER); if (!(provider instanceof RIOptimisticProvider)) { throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.invalidp").toString()); @@ -445,11 +445,10 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern * @param env a Hashtable object with a list of desired * synchronization providers * @throws SQLException if the requested provider cannot be found by the - * synchonization factory + * synchronization factory * @see SyncProvider */ - - public CachedRowSetImpl(Hashtable env) throws SQLException { + public CachedRowSetImpl(@SuppressWarnings("rawtypes") Hashtable env) throws SQLException { try { @@ -467,7 +466,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern // set the Reader, this maybe overridden latter provider = - (SyncProvider)SyncFactory.getInstance(providerName); + SyncFactory.getInstance(providerName); rowSetReader = provider.getRowSetReader(); rowSetWriter = provider.getRowSetWriter(); @@ -525,7 +524,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern iMatchColumns = new Vector(10); for(int i = 0; i < 10 ; i++) { - iMatchColumns.add(i,Integer.valueOf(-1)); + iMatchColumns.add(i, -1); } strMatchColumns = new Vector(10); @@ -540,7 +539,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern */ private void checkTransactionalWriter() { if (rowSetWriter != null) { - Class c = rowSetWriter.getClass(); + Class c = rowSetWriter.getClass(); if (c != null) { Class[] theInterfaces = c.getInterfaces(); for (int i = 0; i < theInterfaces.length; i++) { @@ -685,7 +684,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern obj = new SerialArray((java.sql.Array)obj); } - ((Row)currentRow).initColumnObject(i, obj); + currentRow.initColumnObject(i, obj); } rowsFetched++; rvh.add(currentRow); @@ -881,7 +880,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern cursorPos = saveCursorPos; } - if ((tXWriter) && this.COMMIT_ON_ACCEPT_CHANGES) { + if (tXWriter) { // do commit/rollback's here if (!conflict) { tWriter = (TransactionalWriter)rowSetWriter; @@ -901,7 +900,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern if (success == true) { setOriginal(); - } else if (!(success) && !(this.COMMIT_ON_ACCEPT_CHANGES)) { + } else if (!(success) ) { throw new SyncProviderException(resBundle.handleGetObject("cachedrowsetimpl.accfailed").toString()); } @@ -938,10 +937,8 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern * @see javax.sql.rowset.spi.SyncProvider */ public void acceptChanges(Connection con) throws SyncProviderException{ - setConnection(con); acceptChanges(); - } /** @@ -957,7 +954,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern */ public void restoreOriginal() throws SQLException { Row currentRow; - for (Iterator i = rvh.iterator(); i.hasNext();) { + for (Iterator i = rvh.iterator(); i.hasNext();) { currentRow = (Row)i.next(); if (currentRow.getInserted() == true) { i.remove(); @@ -1287,7 +1284,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern TreeMap tMap = new TreeMap<>(); for (int i = 0; i c = map.get(s.getSQLTypeName()); if (c != null) { // create new instance of the class SQLData obj = null; @@ -3091,7 +3088,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.dtypemismt").toString()); } - return (java.io.Reader)charStream; + return charStream; } /** @@ -4006,7 +4003,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern switch (trgType) { case java.sql.Types.BIT: Integer i = Integer.valueOf(srcObj.toString().trim()); - return i.equals(Integer.valueOf((int)0)) ? + return i.equals(0) ? Boolean.valueOf(false) : Boolean.valueOf(true); case java.sql.Types.TINYINT: @@ -4173,7 +4170,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern switch (trgType) { case java.sql.Types.BIT: Integer i = Integer.valueOf(srcObj.toString().trim()); - return i.equals(Integer.valueOf((int)0)) ? + return i.equals(0) ? Boolean.valueOf(false) : Boolean.valueOf(true); case java.sql.Types.BOOLEAN: @@ -4358,7 +4355,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern checkIndex(columnIndex); // make sure the cursor is on a valid row checkCursor(); - Object obj = convertNumeric(Integer.valueOf(x), + Object obj = convertNumeric(x, java.sql.Types.INTEGER, RowSetMD.getColumnType(columnIndex)); @@ -5709,7 +5706,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern Struct s = (Struct)value; // look up the class in the map - Class c = (Class)map.get(s.getSQLTypeName()); + Class c = map.get(s.getSQLTypeName()); if (c != null) { // create new instance of the class SQLData obj = null; @@ -6293,7 +6290,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern int colCount = RowSetMD.getColumnCount(); Row orig; - for (Iterator i = rvh.iterator(); i.hasNext();) { + for (Iterator i = rvh.iterator(); i.hasNext();) { orig = new Row(colCount, ((Row)i.next()).getOrigRow()); crs.rvh.add(orig); } @@ -6379,7 +6376,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern * @throws SQLException if an error occurs */ public void setOriginal() throws SQLException { - for (Iterator i = rvh.iterator(); i.hasNext();) { + for (Iterator i = rvh.iterator(); i.hasNext();) { Row row = (Row)i.next(); makeRowOriginal(row); // remove deleted rows from the collection. @@ -6930,7 +6927,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern } for( int i = 0;i < columnIdxes.length ;i++) { - iMatchColumns.set(i,Integer.valueOf(-1)); + iMatchColumns.set(i, -1); } } @@ -6998,7 +6995,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern int [] i_temp = new int[iMatchColumns.size()]; int i_val; - i_val = ((Integer)iMatchColumns.get(0)).intValue(); + i_val = iMatchColumns.get(0); if( i_val == -1 ) { throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.setmatchcols").toString()); @@ -7039,7 +7036,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern } } for(int i = 0 ;i < columnIdxes.length; i++) { - iMatchColumns.add(i,Integer.valueOf(columnIdxes[i])); + iMatchColumns.add(i,columnIdxes[i]); } } @@ -7094,7 +7091,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.matchcols1").toString()); } else { // set iMatchColumn - iMatchColumns.set(0, Integer.valueOf(columnIdx)); + iMatchColumns.set(0, columnIdx); //strMatchColumn = null; } } @@ -7147,7 +7144,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.unsetmatch1").toString()); } else { // that is, we are unsetting it. - iMatchColumns.set(0, Integer.valueOf(-1)); + iMatchColumns.set(0, -1); } } @@ -7171,7 +7168,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern if(!((strMatchColumns.get(0)).equals(columnName))) { throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.unsetmatch").toString()); - } else if( ((Integer)(iMatchColumns.get(0))).intValue() > 0) { + } else if(iMatchColumns.get(0) > 0) { throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.unsetmatch2").toString()); } else { strMatchColumns.set(0, null); // that is, we are unsetting it. @@ -7369,7 +7366,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern obj = new SerialArray((java.sql.Array)obj, map); } - ((Row)currentRow).initColumnObject(i, obj); + currentRow.initColumnObject(i, obj); } rowsFetched++; maxRowsreached++; diff --git a/jdk/src/share/classes/com/sun/rowset/FilteredRowSetImpl.java b/jdk/src/share/classes/com/sun/rowset/FilteredRowSetImpl.java index f21013ca5f6..a18c0ac10bd 100644 --- a/jdk/src/share/classes/com/sun/rowset/FilteredRowSetImpl.java +++ b/jdk/src/share/classes/com/sun/rowset/FilteredRowSetImpl.java @@ -66,6 +66,7 @@ public class FilteredRowSetImpl extends WebRowSetImpl implements Serializable, C * @param env a Hashtable containing a desired synchconizatation provider * name-value pair. */ + @SuppressWarnings("rawtypes") public FilteredRowSetImpl(Hashtable env) throws SQLException { super(env); } diff --git a/jdk/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java b/jdk/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java index f29d7d9ef2a..f2a72f6a4ad 100644 --- a/jdk/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java +++ b/jdk/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java @@ -695,6 +695,7 @@ public class JdbcRowSetImpl extends BaseRowSet implements JdbcRowSet, Joinable { return ps; } + @SuppressWarnings("deprecation") private void decodeParams(Object[] params, PreparedStatement ps) throws SQLException { @@ -761,14 +762,17 @@ public class JdbcRowSetImpl extends BaseRowSet implements JdbcRowSet, Joinable { ps.setUnicodeStream(i + 1, (java.io.InputStream)param[0], ((Integer)param[1]).intValue()); + break; case JdbcRowSetImpl.BINARY_STREAM_PARAM: ps.setBinaryStream(i + 1, (java.io.InputStream)param[0], ((Integer)param[1]).intValue()); + break; case JdbcRowSetImpl.ASCII_STREAM_PARAM: ps.setAsciiStream(i + 1, (java.io.InputStream)param[0], ((Integer)param[1]).intValue()); + break; default: throw new SQLException(resBundle.handleGetObject("jdbcrowsetimpl.paramtype").toString()); } @@ -3822,7 +3826,7 @@ public class JdbcRowSetImpl extends BaseRowSet implements JdbcRowSet, Joinable { int [] i_temp = new int[iMatchColumns.size()]; int i_val; - i_val = ((Integer)iMatchColumns.get(0)).intValue(); + i_val = iMatchColumns.get(0); if( i_val == -1 ) { throw new SQLException(resBundle.handleGetObject("jdbcrowsetimpl.setmatchcols").toString()); @@ -3996,7 +4000,7 @@ public class JdbcRowSetImpl extends BaseRowSet implements JdbcRowSet, Joinable { if(!((strMatchColumns.get(0)).equals(columnName))) { throw new SQLException(resBundle.handleGetObject("jdbcrowsetimpl.unsetmatch").toString()); - } else if( ((Integer)(iMatchColumns.get(0))).intValue() > 0) { + } else if(iMatchColumns.get(0) > 0) { throw new SQLException(resBundle.handleGetObject("jdbcrowsetimpl.usecolid").toString()); } else { strMatchColumns.set(0, null); // that is, we are unsetting it. diff --git a/jdk/src/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java b/jdk/src/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java index acf7479fc01..f6991552e3f 100644 --- a/jdk/src/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java +++ b/jdk/src/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java @@ -135,6 +135,7 @@ public class JdbcRowSetResourceBundle implements Serializable { * @return an enumeration of keys which have messages tranlated to * corresponding locales. */ + @SuppressWarnings("rawtypes") public Enumeration getKeys() { return propResBundle.getKeys(); } diff --git a/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java b/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java index 05feebc2824..0f712f9946c 100644 --- a/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java +++ b/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java @@ -233,7 +233,7 @@ public class JoinRowSetImpl extends WebRowSetImpl implements JoinRowSet { } int[] indexes = new int[indices.size()]; for(int i=0; iArrayList will hold the values of SyncResolver.* */ - private ArrayList status; + private ArrayList status; /** * This will check whether the same field value has changed both @@ -305,7 +305,7 @@ public class CachedRowSetWriter implements TransactionalWriter, Serializable { iColCount = rsmdWrite.getColumnCount(); int sz= crs.size()+1; - status = new ArrayList(sz); + status = new ArrayList<>(sz); status.add(0,null); rsmdResolv.setColumnCount(iColCount); @@ -338,11 +338,11 @@ public class CachedRowSetWriter implements TransactionalWriter, Serializable { if (crs.rowDeleted()) { // The row has been deleted. if (conflict = (deleteOriginalRow(crs, this.crsResolve)) == true) { - status.add(rows, Integer.valueOf(SyncResolver.DELETE_ROW_CONFLICT)); + status.add(rows, SyncResolver.DELETE_ROW_CONFLICT); } else { // delete happened without any occurrence of conflicts // so update status accordingly - status.add(rows, Integer.valueOf(SyncResolver.NO_ROW_CONFLICT)); + status.add(rows, SyncResolver.NO_ROW_CONFLICT); } } else if (crs.rowInserted()) { @@ -350,20 +350,20 @@ public class CachedRowSetWriter implements TransactionalWriter, Serializable { pstmtIns = con.prepareStatement(insertCmd); if ( (conflict = insertNewRow(crs, pstmtIns, this.crsResolve)) == true) { - status.add(rows, Integer.valueOf(SyncResolver.INSERT_ROW_CONFLICT)); + status.add(rows, SyncResolver.INSERT_ROW_CONFLICT); } else { // insert happened without any occurrence of conflicts // so update status accordingly - status.add(rows, Integer.valueOf(SyncResolver.NO_ROW_CONFLICT)); + status.add(rows, SyncResolver.NO_ROW_CONFLICT); } } else if (crs.rowUpdated()) { // The row has been updated. if ( conflict = (updateOriginalRow(crs)) == true) { - status.add(rows, Integer.valueOf(SyncResolver.UPDATE_ROW_CONFLICT)); + status.add(rows, SyncResolver.UPDATE_ROW_CONFLICT); } else { // update happened without any occurrence of conflicts // so update status accordingly - status.add(rows, Integer.valueOf(SyncResolver.NO_ROW_CONFLICT)); + status.add(rows, SyncResolver.NO_ROW_CONFLICT); } } else { @@ -375,7 +375,7 @@ public class CachedRowSetWriter implements TransactionalWriter, Serializable { * that is fine. **/ int icolCount = crs.getMetaData().getColumnCount(); - status.add(rows, Integer.valueOf(SyncResolver.NO_ROW_CONFLICT)); + status.add(rows, SyncResolver.NO_ROW_CONFLICT); this.crsResolve.moveToInsertRow(); for(int cols=0;cols cols = new Vector<>(); String updateExec = updateCmd; Object orig; Object curr; @@ -566,14 +566,14 @@ public class CachedRowSetWriter implements TransactionalWriter, Serializable { * into a CachedRowSet so that comparison of the column values * from the ResultSet and CachedRowSet are possible */ - Map map = (crs.getTypeMap() == null)?con.getTypeMap():crs.getTypeMap(); + Map> map = (crs.getTypeMap() == null)?con.getTypeMap():crs.getTypeMap(); if (rsval instanceof Struct) { Struct s = (Struct)rsval; // look up the class in the map - Class c = null; - c = (Class)map.get(s.getSQLTypeName()); + Class c = null; + c = map.get(s.getSQLTypeName()); if (c != null) { // create new instance of the class SQLData obj = null; @@ -652,7 +652,7 @@ public class CachedRowSetWriter implements TransactionalWriter, Serializable { updateExec += ", "; } updateExec += crs.getMetaData().getColumnName(i); - cols.add(Integer.valueOf(i)); + cols.add(i); updateExec += " = ? "; first = false; @@ -698,7 +698,7 @@ public class CachedRowSetWriter implements TransactionalWriter, Serializable { updateExec += ", "; } updateExec += crs.getMetaData().getColumnName(i); - cols.add(Integer.valueOf(i)); + cols.add(i); updateExec += " = ? "; flag = false; } else { @@ -749,7 +749,7 @@ public class CachedRowSetWriter implements TransactionalWriter, Serializable { // Comments needed here for (i = 0; i < cols.size(); i++) { - Object obj = crs.getObject(((Integer)cols.get(i)).intValue()); + Object obj = crs.getObject(cols.get(i)); if (obj != null) pstmt.setObject(i + 1, obj); else diff --git a/jdk/src/share/classes/com/sun/rowset/internal/Row.java b/jdk/src/share/classes/com/sun/rowset/internal/Row.java index 7fa2eda8b31..1fa4b767b02 100644 --- a/jdk/src/share/classes/com/sun/rowset/internal/Row.java +++ b/jdk/src/share/classes/com/sun/rowset/internal/Row.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, 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 @@ -27,9 +27,7 @@ package com.sun.rowset.internal; import java.sql.*; import java.io.*; -import java.math.*; import java.lang.*; -import java.lang.reflect.*; import java.util.*; /** @@ -48,6 +46,8 @@ import java.util.*; */ public class Row extends BaseRow implements Serializable, Cloneable { +static final long serialVersionUID = 5047859032611314762L; + /** * An array containing the current column values for this Row * object. @@ -115,9 +115,7 @@ public class Row extends BaseRow implements Serializable, Cloneable { */ public Row(int numCols, Object[] vals) { origVals = new Object[numCols]; - for (int i=0; i < numCols; i++) { - origVals[i] = vals[i]; - } + System.arraycopy(vals, 0, origVals, 0, numCols); currentVals = new Object[numCols]; colsChanged = new BitSet(numCols); this.numCols = numCols; diff --git a/jdk/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java b/jdk/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java index 10573ae4d4d..911b1d17152 100644 --- a/jdk/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java +++ b/jdk/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java @@ -65,7 +65,7 @@ public class SyncResolverImpl extends CachedRowSetImpl implements SyncResolver { * This ArrayList will contain the status of a row * from the SyncResolver.* values else it will be null. */ - private ArrayList stats; + private ArrayList stats; /** * The RowSetWriter associated with the original @@ -429,6 +429,7 @@ public class SyncResolverImpl extends CachedRowSetImpl implements SyncResolver { * This is used to set the status of each row * to either of the values SyncResolver.*_CONFLICT **/ + @SuppressWarnings("rawtypes") void setStatus(ArrayList status){ stats = status; } @@ -856,6 +857,7 @@ public class SyncResolverImpl extends CachedRowSetImpl implements SyncResolver { * @see #toCollection(String) * @see java.util.TreeMap */ + @SuppressWarnings("rawtypes") public Collection toCollection() throws SQLException { throw new UnsupportedOperationException(); } @@ -878,6 +880,7 @@ public class SyncResolverImpl extends CachedRowSetImpl implements SyncResolver { * @see #toCollection(String) * @see java.util.Vector */ + @SuppressWarnings("rawtypes") public Collection toCollection(int column) throws SQLException { throw new UnsupportedOperationException(); } @@ -900,6 +903,7 @@ public class SyncResolverImpl extends CachedRowSetImpl implements SyncResolver { * @see #toCollection(int) * @see java.util.Vector */ + @SuppressWarnings("rawtypes") public Collection toCollection(String column) throws SQLException { throw new UnsupportedOperationException(); } diff --git a/jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java b/jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java index 936c7f60764..41737b7c47c 100644 --- a/jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java +++ b/jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java @@ -55,7 +55,7 @@ public class WebRowSetXmlWriter implements XmlWriter, Serializable { * object will use for storing the tags to be used for writing the calling * WebRowSet object as an XML document. */ - private java.util.Stack stack; + private java.util.Stack stack; private JdbcRowSetResourceBundle resBundle; @@ -94,7 +94,7 @@ public class WebRowSetXmlWriter implements XmlWriter, Serializable { throws SQLException { // create a new stack for tag checking. - stack = new java.util.Stack(); + stack = new java.util.Stack<>(); writer = wrt; writeRowSet(caller); } @@ -127,7 +127,7 @@ public class WebRowSetXmlWriter implements XmlWriter, Serializable { throws SQLException { // create a new stack for tag checking. - stack = new java.util.Stack(); + stack = new java.util.Stack<>(); writer = new OutputStreamWriter(oStream); writeRowSet(caller); } @@ -205,10 +205,10 @@ public class WebRowSetXmlWriter implements XmlWriter, Serializable { //Changed to beginSection and endSection for maps for proper indentation beginSection("map"); - java.util.Map typeMap = caller.getTypeMap(); + java.util.Map typeMap = caller.getTypeMap(); if (typeMap != null) { - Iterator i = typeMap.keySet().iterator(); - Class c; + Iterator i = typeMap.keySet().iterator(); + Class c; String type; while (i.hasNext()) { type = (String)i.next(); @@ -532,7 +532,7 @@ public class WebRowSetXmlWriter implements XmlWriter, Serializable { } private String getTag() { - return (String)stack.pop(); + return stack.pop(); } private void writeNull() throws java.io.IOException { diff --git a/jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java b/jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java index 50cb7e31705..2d36ac174d8 100644 --- a/jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java +++ b/jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, 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 @@ -71,14 +71,14 @@ import java.text.MessageFormat; public class XmlReaderContentHandler extends DefaultHandler { - private HashMap propMap; - private HashMap colDefMap; - private HashMap dataMap; + private HashMap propMap; + private HashMap colDefMap; + private HashMap dataMap; - private HashMap typeMap; + private HashMap> typeMap; - private Vector updates; - private Vector keyCols; + private Vector updates; + private Vector keyCols; private String columnValue; private String propertyValue; @@ -438,7 +438,7 @@ public class XmlReaderContentHandler extends DefaultHandler { initMaps(); // allocate the collection for the updates - updates = new Vector(); + updates = new Vector<>(); // start out with the empty string columnValue = ""; @@ -477,21 +477,21 @@ public class XmlReaderContentHandler extends DefaultHandler { private void initMaps() { int items, i; - propMap = new HashMap(); + propMap = new HashMap<>(); items = properties.length; for (i=0;i(); items = colDef.length; for (i=0;i(); items = data.length; for (i=0;i(); } public void startDocument() throws SAXException { @@ -549,14 +549,14 @@ public class XmlReaderContentHandler extends DefaultHandler { case PROPERTIES: tempCommand = ""; - tag = ((Integer)propMap.get(name)).intValue(); + tag = propMap.get(name); if (tag == PropNullTag) setNullValue(true); else setTag(tag); break; case METADATA: - tag = ((Integer)colDefMap.get(name)).intValue(); + tag = colDefMap.get(name); if (tag == MetaNullTag) setNullValue(true); @@ -573,10 +573,10 @@ public class XmlReaderContentHandler extends DefaultHandler { tempUpdate = ""; if(dataMap.get(name) == null) { tag = NullTag; - } else if(((Integer)dataMap.get(name)).intValue() == EmptyStringTag) { + } else if(dataMap.get(name) == EmptyStringTag) { tag = EmptyStringTag; } else { - tag = ((Integer)dataMap.get(name)).intValue(); + tag = dataMap.get(name); } if (tag == NullTag) { @@ -630,6 +630,7 @@ public class XmlReaderContentHandler extends DefaultHandler { * * @exception SAXException if a general SAX error occurs */ + @SuppressWarnings("fallthrough") public void endElement(String uri, String lName, String qName) throws SAXException { int tag; @@ -644,13 +645,13 @@ public class XmlReaderContentHandler extends DefaultHandler { } try { - tag = ((Integer)propMap.get(name)).intValue(); + tag = propMap.get(name); switch (tag) { case KeycolsTag: if (keyCols != null) { int i[] = new int[keyCols.size()]; for (int j = 0; j < i.length; j++) - i[j] = Integer.parseInt((String)keyCols.elementAt(j)); + i[j] = Integer.parseInt(keyCols.elementAt(j)); rs.setKeyColumns(i); } break; @@ -723,7 +724,7 @@ public class XmlReaderContentHandler extends DefaultHandler { if(dataMap.get(name) == null) { tag = NullTag; } else { - tag = ((Integer)dataMap.get(name)).intValue(); + tag = dataMap.get(name); } switch (tag) { case ColTag: @@ -820,7 +821,7 @@ public class XmlReaderContentHandler extends DefaultHandler { if (updates.size() > 0) { try { Object upd[]; - Iterator i = updates.iterator(); + Iterator i = updates.iterator(); while (i.hasNext()) { upd = (Object [])i.next(); idx = ((Integer)upd[0]).intValue(); @@ -1075,7 +1076,7 @@ public class XmlReaderContentHandler extends DefaultHandler { break; case PropColumnTag: if (keyCols == null) - keyCols = new Vector(); + keyCols = new Vector<>(); keyCols.add(s); break; case MapTag: diff --git a/jdk/src/share/classes/java/applet/Applet.java b/jdk/src/share/classes/java/applet/Applet.java index 1abacab80cf..4174029eba5 100644 --- a/jdk/src/share/classes/java/applet/Applet.java +++ b/jdk/src/share/classes/java/applet/Applet.java @@ -117,7 +117,7 @@ public class Applet extends Panel { s.checkPermission(new AWTPermission("setAppletStub")); } } - this.stub = (AppletStub)stub; + this.stub = stub; } /** @@ -210,6 +210,7 @@ public class Applet extends Panel { * @param width the new requested width for the applet. * @param height the new requested height for the applet. */ + @SuppressWarnings("deprecation") public void resize(int width, int height) { Dimension d = size(); if ((d.width != width) || (d.height != height)) { @@ -225,6 +226,7 @@ public class Applet extends Panel { * * @param d an object giving the new width and height. */ + @SuppressWarnings("deprecation") public void resize(Dimension d) { resize(d.width, d.height); } diff --git a/jdk/src/share/classes/java/awt/font/StyledParagraph.java b/jdk/src/share/classes/java/awt/font/StyledParagraph.java index 64ac10daa78..df231bf5300 100644 --- a/jdk/src/share/classes/java/awt/font/StyledParagraph.java +++ b/jdk/src/share/classes/java/awt/font/StyledParagraph.java @@ -34,6 +34,7 @@ import java.awt.Toolkit; import java.awt.im.InputMethodHighlight; import java.text.Annotation; import java.text.AttributedCharacterIterator; +import java.text.AttributedCharacterIterator.Attribute; import java.util.Vector; import java.util.HashMap; import java.util.Map; @@ -65,7 +66,7 @@ final class StyledParagraph { // If there are multiple Decorations in the paragraph, they are // stored in this Vector, in order. Otherwise this vector and // the decorationStarts array are null. - private Vector decorations; + private Vector decorations; // If there are multiple Decorations in the paragraph, // decorationStarts[i] contains the index where decoration i // starts. For convenience, there is an extra entry at the @@ -76,7 +77,7 @@ final class StyledParagraph { // they are // stored in this Vector, in order. Otherwise this vector and // the fontStarts array are null. - private Vector fonts; + private Vector fonts; // If there are multiple Fonts/GraphicAttributes in the paragraph, // fontStarts[i] contains the index where decoration i // starts. For convenience, there is an extra entry at the @@ -104,7 +105,7 @@ final class StyledParagraph { final int nextRunStart = aci.getRunLimit(); final int localIndex = index-start; - Map attributes = aci.getAttributes(); + Map attributes = aci.getAttributes(); attributes = addInputMethodAttrs(attributes); Decoration d = Decoration.getDecoration(attributes); addDecoration(d, localIndex); @@ -168,7 +169,8 @@ final class StyledParagraph { char ch = aci.setIndex(insertPos); int relativePos = Math.max(insertPos - aci.getBeginIndex() - 1, 0); - Map attributes = addInputMethodAttrs(aci.getAttributes()); + Map attributes = + addInputMethodAttrs(aci.getAttributes()); Decoration d = Decoration.getDecoration(attributes); if (!oldParagraph.getDecorationAt(relativePos).equals(d)) { return new StyledParagraph(aci, chars); @@ -297,7 +299,7 @@ final class StyledParagraph { return decoration; } int run = findRunContaining(index, decorationStarts); - return (Decoration) decorations.elementAt(run); + return decorations.elementAt(run); } /** @@ -339,6 +341,7 @@ final class StyledParagraph { * starts array does not have room for the index, a * new array is created and returned. */ + @SuppressWarnings({"rawtypes", "unchecked"}) private static int[] addToVector(Object obj, int index, Vector v, @@ -374,7 +377,7 @@ final class StyledParagraph { } else { if (!decoration.equals(d)) { - decorations = new Vector(INITIAL_SIZE); + decorations = new Vector(INITIAL_SIZE); decorations.addElement(decoration); decorations.addElement(d); decorationStarts = new int[INITIAL_SIZE]; @@ -398,7 +401,7 @@ final class StyledParagraph { } else { if (!font.equals(f)) { - fonts = new Vector(INITIAL_SIZE); + fonts = new Vector(INITIAL_SIZE); fonts.addElement(font); fonts.addElement(f); fontStarts = new int[INITIAL_SIZE]; @@ -412,7 +415,8 @@ final class StyledParagraph { * Resolve the given chars into Fonts using FontResolver, then add * font runs for each. */ - private void addFonts(char[] chars, Map attributes, int start, int limit) { + private void addFonts(char[] chars, Map attributes, + int start, int limit) { FontResolver resolver = FontResolver.getInstance(); CodePointIterator iter = CodePointIterator.create(chars, start, limit); @@ -426,7 +430,8 @@ final class StyledParagraph { * Return a Map with entries from oldStyles, as well as input * method entries, if any. */ - static Map addInputMethodAttrs(Map oldStyles) { + static Map + addInputMethodAttrs(Map oldStyles) { Object value = oldStyles.get(TextAttribute.INPUT_METHOD_HIGHLIGHT); @@ -439,7 +444,7 @@ final class StyledParagraph { InputMethodHighlight hl; hl = (InputMethodHighlight) value; - Map imStyles = null; + Map imStyles = null; try { imStyles = hl.getStyle(); } catch (NoSuchMethodError e) { @@ -451,7 +456,8 @@ final class StyledParagraph { } if (imStyles != null) { - HashMap newStyles = new HashMap(5, (float)0.9); + HashMap + newStyles = new HashMap<>(5, (float)0.9); newStyles.putAll(oldStyles); newStyles.putAll(imStyles); @@ -471,7 +477,8 @@ final class StyledParagraph { * If attributes does not contain a GraphicAttribute, Font, or * Font family entry this method returns null. */ - private static Object getGraphicOrFont(Map attributes) { + private static Object getGraphicOrFont( + Map attributes) { Object value = attributes.get(TextAttribute.CHAR_REPLACEMENT); if (value != null) { diff --git a/jdk/src/share/classes/java/awt/font/TextAttribute.java b/jdk/src/share/classes/java/awt/font/TextAttribute.java index 38808b7f3d6..50d47dace20 100644 --- a/jdk/src/share/classes/java/awt/font/TextAttribute.java +++ b/jdk/src/share/classes/java/awt/font/TextAttribute.java @@ -257,7 +257,8 @@ import java.util.HashMap; public final class TextAttribute extends Attribute { // table of all instances in this class, used by readResolve - private static final Map instanceMap = new HashMap(29); + private static final Map + instanceMap = new HashMap(29); /** * Constructs a TextAttribute with the specified name. @@ -280,7 +281,7 @@ public final class TextAttribute extends Attribute { "subclass didn't correctly implement readResolve"); } - TextAttribute instance = (TextAttribute) instanceMap.get(getName()); + TextAttribute instance = instanceMap.get(getName()); if (instance != null) { return instance; } else { diff --git a/jdk/src/share/classes/java/awt/font/TextLayout.java b/jdk/src/share/classes/java/awt/font/TextLayout.java index 51b0dc64e80..c09afd7e653 100644 --- a/jdk/src/share/classes/java/awt/font/TextLayout.java +++ b/jdk/src/share/classes/java/awt/font/TextLayout.java @@ -55,6 +55,7 @@ import java.awt.geom.Rectangle2D; import java.text.AttributedString; import java.text.AttributedCharacterIterator; import java.text.AttributedCharacterIterator.Attribute; +import java.text.CharacterIterator; import java.util.Map; import java.util.HashMap; import java.util.Hashtable; @@ -382,7 +383,7 @@ public final class TextLayout implements Cloneable { throw new IllegalArgumentException("Zero length string passed to TextLayout constructor."); } - Map attributes = null; + Map attributes = null; if (font.hasLayoutAttributes()) { attributes = font.getAttributes(); } @@ -451,7 +452,7 @@ public final class TextLayout implements Cloneable { private static Font singleFont(char[] text, int start, int limit, - Map attributes) { + Map attributes) { if (attributes.get(TextAttribute.CHAR_REPLACEMENT) != null) { return null; @@ -516,14 +517,17 @@ public final class TextLayout implements Cloneable { text.first(); char[] chars = new char[len]; int n = 0; - for (char c = text.first(); c != text.DONE; c = text.next()) { + for (char c = text.first(); + c != CharacterIterator.DONE; + c = text.next()) + { chars[n++] = c; } text.first(); if (text.getRunLimit() == limit) { - Map attributes = text.getAttributes(); + Map attributes = text.getAttributes(); Font font = singleFont(chars, 0, len, attributes); if (font != null) { fastInit(chars, font, attributes, frc); @@ -561,7 +565,9 @@ public final class TextLayout implements Cloneable { /** * Initialize the paragraph-specific data. */ - private void paragraphInit(byte aBaseline, CoreMetrics lm, Map paragraphAttrs, char[] text) { + private void paragraphInit(byte aBaseline, CoreMetrics lm, + Map paragraphAttrs, + char[] text) { baseline = aBaseline; @@ -581,7 +587,10 @@ public final class TextLayout implements Cloneable { * all renderable by one font (ie no embedded graphics) * all on one baseline */ - private void fastInit(char[] chars, Font font, Map attrs, FontRenderContext frc) { + private void fastInit(char[] chars, Font font, + Map attrs, + FontRenderContext frc) { + // Object vf = attrs.get(TextAttribute.ORIENTATION); // isVerticalLine = TextAttribute.ORIENTATION_VERTICAL.equals(vf); isVerticalLine = false; @@ -619,7 +628,7 @@ public final class TextLayout implements Cloneable { // and use it and its font to initialize the paragraph. // If not, use the first graphic to initialize. - Map paragraphAttrs = text.getAttributes(); + Map paragraphAttrs = text.getAttributes(); boolean haveFont = TextLine.advanceToFirstFont(text); diff --git a/jdk/src/share/classes/java/awt/font/TextLine.java b/jdk/src/share/classes/java/awt/font/TextLine.java index fd59d9fc6ef..3a4301ee92a 100644 --- a/jdk/src/share/classes/java/awt/font/TextLine.java +++ b/jdk/src/share/classes/java/awt/font/TextLine.java @@ -43,6 +43,7 @@ import java.awt.im.InputMethodHighlight; import java.awt.image.BufferedImage; import java.text.Annotation; import java.text.AttributedCharacterIterator; +import java.text.AttributedCharacterIterator.Attribute; import java.text.Bidi; import java.text.CharacterIterator; import java.util.Hashtable; @@ -318,7 +319,8 @@ final class TextLine { for (int i = 0, n = 0; i < fComponents.length; ++i, n += 2) { tlc = fComponents[getComponentLogicalIndex(i)]; AffineTransform at = tlc.getBaselineTransform(); - if (at != null && ((at.getType() & at.TYPE_TRANSLATION) != 0)) { + if (at != null && + ((at.getType() & AffineTransform.TYPE_TRANSLATION) != 0)) { double dx = at.getTranslateX(); double dy = at.getTranslateY(); builder.moveTo(tx += dx, ty += dy); @@ -903,7 +905,7 @@ final class TextLine { char[] chars, Font font, CoreMetrics lm, - Map attributes) { + Map attributes) { boolean isDirectionLTR = true; byte[] levels = null; @@ -1250,7 +1252,10 @@ final class TextLine { */ static boolean advanceToFirstFont(AttributedCharacterIterator aci) { - for (char ch = aci.first(); ch != aci.DONE; ch = aci.setIndex(aci.getRunLimit())) { + for (char ch = aci.first(); + ch != CharacterIterator.DONE; + ch = aci.setIndex(aci.getRunLimit())) + { if (aci.getAttribute(TextAttribute.CHAR_REPLACEMENT) == null) { return true; diff --git a/jdk/src/share/classes/java/awt/font/TextMeasurer.java b/jdk/src/share/classes/java/awt/font/TextMeasurer.java index ca052b36f34..b20afcd2c21 100644 --- a/jdk/src/share/classes/java/awt/font/TextMeasurer.java +++ b/jdk/src/share/classes/java/awt/font/TextMeasurer.java @@ -43,6 +43,7 @@ package java.awt.font; import java.awt.Font; import java.text.AttributedCharacterIterator; +import java.text.AttributedCharacterIterator.Attribute; import java.text.AttributedString; import java.text.Bidi; import java.text.BreakIterator; @@ -176,7 +177,7 @@ public final class TextMeasurer implements Cloneable { throw new Error(); } if (fComponents != null) { - other.fComponents = (TextLineComponent[]) fComponents.clone(); + other.fComponents = fComponents.clone(); } return other; } @@ -199,7 +200,10 @@ public final class TextMeasurer implements Cloneable { fChars = new char[text.getEndIndex() - fStart]; int n = 0; - for (char c = text.first(); c != text.DONE; c = text.next()) { + for (char c = text.first(); + c != CharacterIterator.DONE; + c = text.next()) + { fChars[n++] = c; } @@ -211,7 +215,7 @@ public final class TextMeasurer implements Cloneable { } text.first(); - Map paragraphAttrs = text.getAttributes(); + Map paragraphAttrs = text.getAttributes(); NumericShaper shaper = AttributeValues.getNumericShaping(paragraphAttrs); if (shaper != null) { shaper.shape(fChars, 0, fChars.length); @@ -243,7 +247,8 @@ public final class TextMeasurer implements Cloneable { GraphicAttribute graphic = (GraphicAttribute) paragraphAttrs.get(TextAttribute.CHAR_REPLACEMENT); fBaseline = TextLayout.getBaselineFromGraphic(graphic); - Font dummyFont = new Font(new Hashtable(5, (float)0.9)); + Hashtable fmap = new Hashtable<>(5, (float)0.9); + Font dummyFont = new Font(fmap); LineMetrics lm = dummyFont.getLineMetrics(" ", 0, 1, fFrc); fBaselineOffsets = lm.getBaselineOffsets(); } diff --git a/jdk/src/share/classes/java/awt/geom/Path2D.java b/jdk/src/share/classes/java/awt/geom/Path2D.java index 39f7d992b28..3aae874310c 100644 --- a/jdk/src/share/classes/java/awt/geom/Path2D.java +++ b/jdk/src/share/classes/java/awt/geom/Path2D.java @@ -667,7 +667,8 @@ public abstract class Path2D implements Shape, Cloneable { // Collapse out initial moveto/lineto break; } - // NO BREAK; + lineTo(coords[0], coords[1]); + break; case SEG_LINETO: lineTo(coords[0], coords[1]); break; @@ -1392,7 +1393,8 @@ public abstract class Path2D implements Shape, Cloneable { // Collapse out initial moveto/lineto break; } - // NO BREAK; + lineTo(coords[0], coords[1]); + break; case SEG_LINETO: lineTo(coords[0], coords[1]); break; @@ -2456,7 +2458,7 @@ public abstract class Path2D implements Shape, Cloneable { } } } - s.writeByte((byte) SERIAL_PATH_END); + s.writeByte(SERIAL_PATH_END); } final void readObject(java.io.ObjectInputStream s, boolean storedbl) diff --git a/jdk/src/share/classes/java/awt/im/InputMethodHighlight.java b/jdk/src/share/classes/java/awt/im/InputMethodHighlight.java index be610a1490f..ffa99dfea67 100644 --- a/jdk/src/share/classes/java/awt/im/InputMethodHighlight.java +++ b/jdk/src/share/classes/java/awt/im/InputMethodHighlight.java @@ -190,6 +190,6 @@ public class InputMethodHighlight { private boolean selected; private int state; private int variation; - private Map style; + private Map style; }; diff --git a/jdk/src/share/classes/java/beans/BeanDescriptor.java b/jdk/src/share/classes/java/beans/BeanDescriptor.java index 08d5b709865..2e235c2e9cc 100644 --- a/jdk/src/share/classes/java/beans/BeanDescriptor.java +++ b/jdk/src/share/classes/java/beans/BeanDescriptor.java @@ -37,8 +37,8 @@ import java.lang.ref.Reference; public class BeanDescriptor extends FeatureDescriptor { - private Reference beanClassRef; - private Reference customizerClassRef; + private Reference> beanClassRef; + private Reference> customizerClassRef; /** * Create a BeanDescriptor for a bean that doesn't have a customizer. @@ -59,8 +59,8 @@ public class BeanDescriptor extends FeatureDescriptor { * the bean's Customizer. For example sun.beans.OurButtonCustomizer.class. */ public BeanDescriptor(Class beanClass, Class customizerClass) { - this.beanClassRef = getWeakReference((Class)beanClass); - this.customizerClassRef = getWeakReference((Class)customizerClass); + this.beanClassRef = getWeakReference(beanClass); + this.customizerClassRef = getWeakReference(customizerClass); String name = beanClass.getName(); while (name.indexOf('.') >= 0) { diff --git a/jdk/src/share/classes/java/beans/Beans.java b/jdk/src/share/classes/java/beans/Beans.java index 03f0dc8d76e..2183d224167 100644 --- a/jdk/src/share/classes/java/beans/Beans.java +++ b/jdk/src/share/classes/java/beans/Beans.java @@ -176,9 +176,9 @@ public class Beans { // Try to find a serialized object with this name final String serName = beanName.replace('.','/').concat(".ser"); final ClassLoader loader = cls; - ins = (InputStream)AccessController.doPrivileged - (new PrivilegedAction() { - public Object run() { + ins = AccessController.doPrivileged + (new PrivilegedAction() { + public InputStream run() { if (loader == null) return ClassLoader.getSystemResourceAsStream(serName); else @@ -208,7 +208,7 @@ public class Beans { if (result == null) { // No serialized object, try just instantiating the class - Class cl; + Class cl; try { cl = ClassFinder.findClass(beanName, cls); @@ -273,10 +273,10 @@ public class Beans { // Now get the URL correponding to the resource name. final ClassLoader cloader = cls; - objectUrl = (URL) + objectUrl = AccessController.doPrivileged - (new PrivilegedAction() { - public Object run() { + (new PrivilegedAction() { + public URL run() { if (cloader == null) return ClassLoader.getSystemResource (resourceName); @@ -321,7 +321,7 @@ public class Beans { // now, if there is a BeanContext, add the bean, if applicable. if (beanContext != null) { - beanContext.add(result); + unsafeBeanContextAdd(beanContext, result); } // If it was deserialized then it was already init-ed. @@ -339,12 +339,16 @@ public class Beans { ((BeansAppletStub)stub).active = true; } else initializer.activate(applet); - } else if (beanContext != null) beanContext.add(result); + } else if (beanContext != null) unsafeBeanContextAdd(beanContext, result); } return result; } + @SuppressWarnings("unchecked") + private static void unsafeBeanContextAdd(BeanContext beanContext, Object res) { + beanContext.add(res); + } /** * From a given bean, obtain an object representing a specified @@ -489,6 +493,7 @@ class ObjectInputStreamWithLoader extends ObjectInputStream /** * Use the given ClassLoader rather than using the system class */ + @SuppressWarnings("rawtypes") protected Class resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException { @@ -504,7 +509,7 @@ class ObjectInputStreamWithLoader extends ObjectInputStream class BeansAppletContext implements AppletContext { Applet target; - Hashtable imageCache = new Hashtable(); + Hashtable imageCache = new Hashtable<>(); BeansAppletContext(Applet target) { this.target = target; @@ -549,8 +554,8 @@ class BeansAppletContext implements AppletContext { return null; } - public Enumeration getApplets() { - Vector applets = new Vector(); + public Enumeration getApplets() { + Vector applets = new Vector<>(); applets.addElement(target); return applets.elements(); } @@ -576,7 +581,7 @@ class BeansAppletContext implements AppletContext { return null; } - public Iterator getStreamKeys(){ + public Iterator getStreamKeys(){ // We do nothing. return null; } diff --git a/jdk/src/share/classes/java/beans/ChangeListenerMap.java b/jdk/src/share/classes/java/beans/ChangeListenerMap.java index 930c6975d89..e623d9b0df9 100644 --- a/jdk/src/share/classes/java/beans/ChangeListenerMap.java +++ b/jdk/src/share/classes/java/beans/ChangeListenerMap.java @@ -76,7 +76,7 @@ abstract class ChangeListenerMap { */ public final synchronized void add(String name, L listener) { if (this.map == null) { - this.map = new HashMap(); + this.map = new HashMap<>(); } L[] array = this.map.get(name); int size = (array != null) @@ -146,7 +146,7 @@ abstract class ChangeListenerMap { public final void set(String name, L[] listeners) { if (listeners != null) { if (this.map == null) { - this.map = new HashMap(); + this.map = new HashMap<>(); } this.map.put(name, listeners); } @@ -167,7 +167,7 @@ abstract class ChangeListenerMap { if (this.map == null) { return newArray(0); } - List list = new ArrayList(); + List list = new ArrayList<>(); L[] listeners = this.map.get(null); if (listeners != null) { @@ -239,6 +239,7 @@ abstract class ChangeListenerMap { */ public final L extract(L listener) { while (listener instanceof EventListenerProxy) { + @SuppressWarnings("unchecked") EventListenerProxy proxy = (EventListenerProxy) listener; listener = proxy.getListener(); } diff --git a/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java b/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java index 951d97210b0..db98785ca15 100644 --- a/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java +++ b/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java @@ -95,7 +95,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate { this.constructor = constructorPropertyNames; } - private static boolean definesEquals(Class type) { + private static boolean definesEquals(Class type) { try { return type == type.getMethod("equals", Object.class).getDeclaringClass(); } @@ -153,7 +153,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate { */ protected Expression instantiate(Object oldInstance, Encoder out) { int nArgs = constructor.length; - Class type = oldInstance.getClass(); + Class type = oldInstance.getClass(); Object[] constructorArgs = new Object[nArgs]; for(int i = 0; i < nArgs; i++) { try { @@ -167,7 +167,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate { return new Expression(oldInstance, oldInstance.getClass(), "new", constructorArgs); } - private Method findMethod(Class type, String property) { + private Method findMethod(Class type, String property) { if (property == null) { throw new IllegalArgumentException("Property name is null"); } @@ -182,7 +182,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate { return method; } - private void doProperty(Class type, PropertyDescriptor pd, Object oldInstance, Object newInstance, Encoder out) throws Exception { + private void doProperty(Class type, PropertyDescriptor pd, Object oldInstance, Object newInstance, Encoder out) throws Exception { Method getter = pd.getReadMethod(); Method setter = pd.getWriteMethod(); @@ -218,7 +218,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate { } // Write out the properties of this instance. - private void initBean(Class type, Object oldInstance, Object newInstance, Encoder out) { + private void initBean(Class type, Object oldInstance, Object newInstance, Encoder out) { for (Field field : type.getFields()) { int mod = field.getModifiers(); if (Modifier.isFinal(mod) || Modifier.isStatic(mod) || Modifier.isTransient(mod)) { @@ -288,7 +288,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate { if (d.isTransient()) { continue; } - Class listenerType = d.getListenerType(); + Class listenerType = d.getListenerType(); // The ComponentListener is added automatically, when @@ -318,7 +318,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate { } catch (Exception e2) { try { - Method m = type.getMethod("getListeners", new Class[]{Class.class}); + Method m = type.getMethod("getListeners", new Class[]{Class.class}); oldL = (EventListener[])MethodUtil.invoke(m, oldInstance, new Object[]{listenerType}); newL = (EventListener[])MethodUtil.invoke(m, newInstance, new Object[]{listenerType}); } @@ -401,7 +401,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate { } } - private static PropertyDescriptor getPropertyDescriptor(Class type, String property) { + private static PropertyDescriptor getPropertyDescriptor(Class type, String property) { try { for (PropertyDescriptor pd : Introspector.getBeanInfo(type).getPropertyDescriptors()) { if (property.equals(pd.getName())) diff --git a/jdk/src/share/classes/java/beans/Encoder.java b/jdk/src/share/classes/java/beans/Encoder.java index b8728132a5d..4a877f3bb58 100644 --- a/jdk/src/share/classes/java/beans/Encoder.java +++ b/jdk/src/share/classes/java/beans/Encoder.java @@ -47,10 +47,10 @@ import java.util.Map; public class Encoder { private final PersistenceDelegateFinder finder = new PersistenceDelegateFinder(); - private Map bindings = new IdentityHashMap(); + private Map bindings = new IdentityHashMap<>(); private ExceptionListener exceptionListener; boolean executeStatements = true; - private Map attributes; + private Map attributes; /** * Write the specified object to the output stream. @@ -227,7 +227,7 @@ public class Encoder { * @see #get */ public Object remove(Object oldInstance) { - Expression exp = (Expression)bindings.remove(oldInstance); + Expression exp = bindings.remove(oldInstance); return getValue(exp); } @@ -248,7 +248,7 @@ public class Encoder { oldInstance.getClass() == String.class) { return oldInstance; } - Expression exp = (Expression)bindings.get(oldInstance); + Expression exp = bindings.get(oldInstance); return getValue(exp); } @@ -337,7 +337,7 @@ public class Encoder { // Package private method for setting an attributes table for the encoder void setAttribute(Object key, Object value) { if (attributes == null) { - attributes = new HashMap(); + attributes = new HashMap<>(); } attributes.put(key, value); } diff --git a/jdk/src/share/classes/java/beans/EventHandler.java b/jdk/src/share/classes/java/beans/EventHandler.java index 2853017b7d1..b7635c931b7 100644 --- a/jdk/src/share/classes/java/beans/EventHandler.java +++ b/jdk/src/share/classes/java/beans/EventHandler.java @@ -385,14 +385,14 @@ public class EventHandler implements InvocationHandler { if (target != null) { getter = Statement.getMethod(target.getClass(), "get" + NameGenerator.capitalize(first), - new Class[]{}); + new Class[]{}); if (getter == null) { getter = Statement.getMethod(target.getClass(), "is" + NameGenerator.capitalize(first), - new Class[]{}); + new Class[]{}); } if (getter == null) { - getter = Statement.getMethod(target.getClass(), first, new Class[]{}); + getter = Statement.getMethod(target.getClass(), first, new Class[]{}); } } if (getter == null) { @@ -450,12 +450,12 @@ public class EventHandler implements InvocationHandler { if (eventPropertyName == null) { // Nullary method. newArgs = new Object[]{}; - argTypes = new Class[]{}; + argTypes = new Class[]{}; } else { Object input = applyGetters(arguments[0], getEventPropertyName()); newArgs = new Object[]{input}; - argTypes = new Class[]{input == null ? null : + argTypes = new Class[]{input == null ? null : input.getClass()}; } try { @@ -674,6 +674,7 @@ public class EventHandler implements InvocationHandler { * * @see EventHandler */ + @SuppressWarnings("unchecked") public static T create(Class listenerInterface, Object target, String action, String eventPropertyName, @@ -688,7 +689,7 @@ public class EventHandler implements InvocationHandler { "listenerInterface must be non-null"); } return (T)Proxy.newProxyInstance(target.getClass().getClassLoader(), - new Class[] {listenerInterface}, + new Class[] {listenerInterface}, eventHandler); } } diff --git a/jdk/src/share/classes/java/beans/EventSetDescriptor.java b/jdk/src/share/classes/java/beans/EventSetDescriptor.java index 83b5e0d8f1c..46d4f54a0c9 100644 --- a/jdk/src/share/classes/java/beans/EventSetDescriptor.java +++ b/jdk/src/share/classes/java/beans/EventSetDescriptor.java @@ -45,7 +45,7 @@ public class EventSetDescriptor extends FeatureDescriptor { private MethodDescriptor getMethodDescriptor; private Reference listenerMethodsRef; - private Reference listenerTypeRef; + private Reference> listenerTypeRef; private boolean unicast; private boolean inDefaultEventSet = true; @@ -91,7 +91,7 @@ public class EventSetDescriptor extends FeatureDescriptor { } } - private static String getListenerClassName(Class cls) { + private static String getListenerClassName(Class cls) { String className = cls.getName(); return className.substring(className.lastIndexOf('.') + 1); } @@ -182,7 +182,7 @@ public class EventSetDescriptor extends FeatureDescriptor { } } - private static Method getMethod(Class cls, String name, int args) + private static Method getMethod(Class cls, String name, int args) throws IntrospectionException { if (name == null) { return null; @@ -295,7 +295,7 @@ public class EventSetDescriptor extends FeatureDescriptor { : null; } - private void setListenerType(Class cls) { + private void setListenerType(Class cls) { this.listenerTypeRef = getWeakReference(cls); } diff --git a/jdk/src/share/classes/java/beans/FeatureDescriptor.java b/jdk/src/share/classes/java/beans/FeatureDescriptor.java index fcfc9d772df..34c27e5a4ab 100644 --- a/jdk/src/share/classes/java/beans/FeatureDescriptor.java +++ b/jdk/src/share/classes/java/beans/FeatureDescriptor.java @@ -51,7 +51,7 @@ import java.util.Map.Entry; public class FeatureDescriptor { private static final String TRANSIENT = "transient"; - private Reference classRef; + private Reference> classRef; /** * Constructs a FeatureDescriptor. @@ -284,7 +284,7 @@ public class FeatureDescriptor { */ private Hashtable getTable() { if (this.table == null) { - this.table = new Hashtable(); + this.table = new Hashtable<>(); } return this.table; } @@ -317,11 +317,11 @@ public class FeatureDescriptor { // Package private methods for recreating the weak/soft referent - void setClass0(Class cls) { + void setClass0(Class cls) { this.classRef = getWeakReference(cls); } - Class getClass0() { + Class getClass0() { return (this.classRef != null) ? this.classRef.get() : null; @@ -336,7 +336,7 @@ public class FeatureDescriptor { */ static Reference getSoftReference(T object) { return (object != null) - ? new SoftReference(object) + ? new SoftReference<>(object) : null; } @@ -349,7 +349,7 @@ public class FeatureDescriptor { */ static Reference getWeakReference(T object) { return (object != null) - ? new WeakReference(object) + ? new WeakReference<>(object) : null; } @@ -363,7 +363,7 @@ public class FeatureDescriptor { * @see Method#getGenericReturnType * @see Method#getReturnType */ - static Class getReturnType(Class base, Method method) { + static Class getReturnType(Class base, Method method) { if (base == null) { base = method.getDeclaringClass(); } @@ -380,7 +380,7 @@ public class FeatureDescriptor { * @see Method#getGenericParameterTypes * @see Method#getParameterTypes */ - static Class[] getParameterTypes(Class base, Method method) { + static Class[] getParameterTypes(Class base, Method method) { if (base == null) { base = method.getDeclaringClass(); } @@ -425,7 +425,7 @@ public class FeatureDescriptor { void appendTo(StringBuilder sb) { } - static void appendTo(StringBuilder sb, String name, Reference reference) { + static void appendTo(StringBuilder sb, String name, Reference reference) { if (reference != null) { appendTo(sb, name, reference.get()); } diff --git a/jdk/src/share/classes/java/beans/IndexedPropertyDescriptor.java b/jdk/src/share/classes/java/beans/IndexedPropertyDescriptor.java index 5764bf49b76..096e94d803a 100644 --- a/jdk/src/share/classes/java/beans/IndexedPropertyDescriptor.java +++ b/jdk/src/share/classes/java/beans/IndexedPropertyDescriptor.java @@ -40,7 +40,7 @@ import java.lang.reflect.Method; public class IndexedPropertyDescriptor extends PropertyDescriptor { - private Reference indexedPropertyTypeRef; + private Reference> indexedPropertyTypeRef; private Reference indexedReadMethodRef; private Reference indexedWriteMethodRef; @@ -175,14 +175,14 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor { public synchronized Method getIndexedReadMethod() { Method indexedReadMethod = getIndexedReadMethod0(); if (indexedReadMethod == null) { - Class cls = getClass0(); + Class cls = getClass0(); if (cls == null || (indexedReadMethodName == null && indexedReadMethodRef == null)) { // the Indexed readMethod was explicitly set to null. return null; } if (indexedReadMethodName == null) { - Class type = getIndexedPropertyType0(); + Class type = getIndexedPropertyType0(); if (type == boolean.class || type == null) { indexedReadMethodName = Introspector.IS_PREFIX + getBaseName(); } else { @@ -190,7 +190,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor { } } - Class[] args = { int.class }; + Class[] args = { int.class }; indexedReadMethod = Introspector.findMethod(cls, indexedReadMethodName, 1, args); if (indexedReadMethod == null) { // no "is" method, so look for a "get" method. @@ -240,7 +240,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor { public synchronized Method getIndexedWriteMethod() { Method indexedWriteMethod = getIndexedWriteMethod0(); if (indexedWriteMethod == null) { - Class cls = getClass0(); + Class cls = getClass0(); if (cls == null || (indexedWriteMethodName == null && indexedWriteMethodRef == null)) { // the Indexed writeMethod was explicitly set to null. @@ -250,14 +250,14 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor { // We need the indexed type to ensure that we get the correct method. // Cannot use the getIndexedPropertyType method since that could // result in an infinite loop. - Class type = getIndexedPropertyType0(); + Class type = getIndexedPropertyType0(); if (type == null) { try { type = findIndexedPropertyType(getIndexedReadMethod(), null); setIndexedPropertyType(type); } catch (IntrospectionException ex) { // Set iprop type to be the classic type - Class propType = getPropertyType(); + Class propType = getPropertyType(); if (propType.isArray()) { type = propType.getComponentType(); } @@ -268,7 +268,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor { indexedWriteMethodName = Introspector.SET_PREFIX + getBaseName(); } - Class[] args = (type == null) ? null : new Class[] { int.class, type }; + Class[] args = (type == null) ? null : new Class[] { int.class, type }; indexedWriteMethod = Introspector.findMethod(cls, indexedWriteMethodName, 2, args); if (indexedWriteMethod != null) { if (!indexedWriteMethod.getReturnType().equals(void.class)) { @@ -289,7 +289,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor { throws IntrospectionException { // If the indexed property type has not been set, then set it. - Class type = findIndexedPropertyType(getIndexedReadMethod(), + Class type = findIndexedPropertyType(getIndexedReadMethod(), writeMethod); setIndexedPropertyType(type); setIndexedWriteMethod0(writeMethod); @@ -319,7 +319,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor { * or {@code null} if the type cannot be determined */ public synchronized Class getIndexedPropertyType() { - Class type = getIndexedPropertyType0(); + Class type = getIndexedPropertyType0(); if (type == null) { try { type = findIndexedPropertyType(getIndexedReadMethod(), @@ -334,11 +334,11 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor { // Private methods which set get/set the Reference objects - private void setIndexedPropertyType(Class type) { + private void setIndexedPropertyType(Class type) { this.indexedPropertyTypeRef = getWeakReference(type); } - private Class getIndexedPropertyType0() { + private Class getIndexedPropertyType0() { return (this.indexedPropertyTypeRef != null) ? this.indexedPropertyTypeRef.get() : null; @@ -356,10 +356,10 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor { : null; } - private Class findIndexedPropertyType(Method indexedReadMethod, + private Class findIndexedPropertyType(Method indexedReadMethod, Method indexedWriteMethod) throws IntrospectionException { - Class indexedPropertyType = null; + Class indexedPropertyType = null; if (indexedReadMethod != null) { Class params[] = getParameterTypes(getClass0(), indexedReadMethod); @@ -389,7 +389,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor { } indexedPropertyType = params[1]; } - Class propertyType = getPropertyType(); + Class propertyType = getPropertyType(); if (propertyType != null && (!propertyType.isArray() || propertyType.getComponentType() != indexedPropertyType)) { throw new IntrospectionException("type mismatch between indexed and non-indexed methods: " diff --git a/jdk/src/share/classes/java/beans/Introspector.java b/jdk/src/share/classes/java/beans/Introspector.java index 2d85beef4c8..57342081059 100644 --- a/jdk/src/share/classes/java/beans/Introspector.java +++ b/jdk/src/share/classes/java/beans/Introspector.java @@ -97,13 +97,13 @@ public class Introspector { // Static Caches to speed up introspection. private static final WeakCache, Method[]> declaredMethodCache = new WeakCache<>(); - private Class beanClass; + private Class beanClass; private BeanInfo explicitBeanInfo; private BeanInfo superBeanInfo; private BeanInfo additionalBeanInfo[]; private boolean propertyChangeSource = false; - private static Class eventListenerType = EventListener.class; + private static Class eventListenerType = EventListener.class; // These should be removed. private String defaultEventName; @@ -111,14 +111,14 @@ public class Introspector { private int defaultEventIndex = -1; private int defaultPropertyIndex = -1; - // Methods maps from Method objects to MethodDescriptors - private Map methods; + // Methods maps from Method names to MethodDescriptors + private Map methods; // properties maps from String names to PropertyDescriptors - private Map properties; + private Map properties; // events maps from String names to EventSetDescriptors - private Map events; + private Map events; private final static EventSetDescriptor[] EMPTY_EVENTSETDESCRIPTORS = new EventSetDescriptor[0]; @@ -364,14 +364,14 @@ public class Introspector { // Private implementation methods //====================================================================== - private Introspector(Class beanClass, Class stopClass, int flags) + private Introspector(Class beanClass, Class stopClass, int flags) throws IntrospectionException { this.beanClass = beanClass; // Check stopClass is a superClass of startClass. if (stopClass != null) { boolean isSuper = false; - for (Class c = beanClass.getSuperclass(); c != null; c = c.getSuperclass()) { + for (Class c = beanClass.getSuperclass(); c != null; c = c.getSuperclass()) { if (c == stopClass) { isSuper = true; } @@ -386,7 +386,7 @@ public class Introspector { explicitBeanInfo = findExplicitBeanInfo(beanClass); } - Class superClass = beanClass.getSuperclass(); + Class superClass = beanClass.getSuperclass(); if (superClass != stopClass) { int newFlags = flags; if (newFlags == IGNORE_IMMEDIATE_BEANINFO) { @@ -432,7 +432,7 @@ public class Introspector { * @param beanClass the class type of the bean * @return Instance of an explicit BeanInfo class or null if one isn't found. */ - private static BeanInfo findExplicitBeanInfo(Class beanClass) { + private static BeanInfo findExplicitBeanInfo(Class beanClass) { return ThreadGroupContext.getContext().getBeanInfoFinder().find(beanClass); } @@ -482,8 +482,8 @@ public class Introspector { continue; } String name = method.getName(); - Class argTypes[] = method.getParameterTypes(); - Class resultType = method.getReturnType(); + Class[] argTypes = method.getParameterTypes(); + Class resultType = method.getReturnType(); int argCount = argTypes.length; PropertyDescriptor pd = null; @@ -541,8 +541,8 @@ public class Introspector { processPropertyDescriptors(); // Allocate and populate the result array. - PropertyDescriptor result[] = new PropertyDescriptor[properties.size()]; - result = (PropertyDescriptor[])properties.values().toArray(result); + PropertyDescriptor result[] = + properties.values().toArray(new PropertyDescriptor[properties.size()]); // Set the default index. if (defaultPropertyName != null) { @@ -556,16 +556,16 @@ public class Introspector { return result; } - private HashMap pdStore = new HashMap(); + private HashMap> pdStore = new HashMap<>(); /** * Adds the property descriptor to the list store. */ private void addPropertyDescriptor(PropertyDescriptor pd) { String propName = pd.getName(); - List list = (List)pdStore.get(propName); + List list = pdStore.get(propName); if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); pdStore.put(propName, list); } if (this.beanClass != pd.getClass0()) { @@ -620,25 +620,25 @@ public class Introspector { */ private void processPropertyDescriptors() { if (properties == null) { - properties = new TreeMap(); + properties = new TreeMap<>(); } - List list; + List list; PropertyDescriptor pd, gpd, spd; IndexedPropertyDescriptor ipd, igpd, ispd; - Iterator it = pdStore.values().iterator(); + Iterator> it = pdStore.values().iterator(); while (it.hasNext()) { pd = null; gpd = null; spd = null; ipd = null; igpd = null; ispd = null; - list = (List)it.next(); + list = it.next(); // First pass. Find the latest getter method. Merge properties // of previous getter methods. for (int i = 0; i < list.size(); i++) { - pd = (PropertyDescriptor)list.get(i); + pd = list.get(i); if (pd instanceof IndexedPropertyDescriptor) { ipd = (IndexedPropertyDescriptor)pd; if (ipd.getIndexedReadMethod() != null) { @@ -667,7 +667,7 @@ public class Introspector { // Second pass. Find the latest setter method which // has the same type as the getter method. for (int i = 0; i < list.size(); i++) { - pd = (PropertyDescriptor)list.get(i); + pd = list.get(i); if (pd instanceof IndexedPropertyDescriptor) { ipd = (IndexedPropertyDescriptor)pd; if (ipd.getIndexedWriteMethod() != null) { @@ -785,7 +785,7 @@ public class Introspector { // which does not have getter and setter methods. // See regression bug 4984912. if ( (pd == null) && (list.size() > 0) ) { - pd = (PropertyDescriptor) list.get(0); + pd = list.get(0); } if (pd != null) { @@ -804,8 +804,8 @@ public class Introspector { PropertyDescriptor pd) { PropertyDescriptor result = null; - Class propType = pd.getPropertyType(); - Class ipropType = ipd.getIndexedPropertyType(); + Class propType = pd.getPropertyType(); + Class ipropType = ipd.getIndexedPropertyType(); if (propType.isArray() && propType.getComponentType() == ipropType) { if (pd.getClass0().isAssignableFrom(ipd.getClass0())) { @@ -839,7 +839,7 @@ public class Introspector { if (write == null && read != null) { write = findMethod(result.getClass0(), SET_PREFIX + NameGenerator.capitalize(result.getName()), 1, - new Class[] { FeatureDescriptor.getReturnType(result.getClass0(), read) }); + new Class[] { FeatureDescriptor.getReturnType(result.getClass0(), read) }); if (write != null) { try { result.setWriteMethod(write); @@ -879,7 +879,7 @@ public class Introspector { */ private EventSetDescriptor[] getTargetEventInfo() throws IntrospectionException { if (events == null) { - events = new HashMap(); + events = new HashMap<>(); } // Check if the bean has its own BeanInfo that will provide @@ -930,9 +930,9 @@ public class Introspector { // Find all suitable "add", "remove" and "get" Listener methods // The name of the listener type is the key for these hashtables // i.e, ActionListener - Map adds = null; - Map removes = null; - Map gets = null; + Map adds = null; + Map removes = null; + Map gets = null; for (int i = 0; i < methodList.length; i++) { Method method = methodList[i]; @@ -951,8 +951,8 @@ public class Introspector { continue; } - Class argTypes[] = FeatureDescriptor.getParameterTypes(beanClass, method); - Class resultType = FeatureDescriptor.getReturnType(beanClass, method); + Class[] argTypes = FeatureDescriptor.getParameterTypes(beanClass, method); + Class resultType = FeatureDescriptor.getReturnType(beanClass, method); if (name.startsWith(ADD_PREFIX) && argTypes.length == 1 && resultType == Void.TYPE && @@ -961,7 +961,7 @@ public class Introspector { if (listenerName.length() > 0 && argTypes[0].getName().endsWith(listenerName)) { if (adds == null) { - adds = new HashMap(); + adds = new HashMap<>(); } adds.put(listenerName, method); } @@ -973,7 +973,7 @@ public class Introspector { if (listenerName.length() > 0 && argTypes[0].getName().endsWith(listenerName)) { if (removes == null) { - removes = new HashMap(); + removes = new HashMap<>(); } removes.put(listenerName, method); } @@ -986,7 +986,7 @@ public class Introspector { if (listenerName.length() > 0 && resultType.getComponentType().getName().endsWith(listenerName)) { if (gets == null) { - gets = new HashMap(); + gets = new HashMap<>(); } gets.put(listenerName, method); } @@ -996,26 +996,26 @@ public class Introspector { if (adds != null && removes != null) { // Now look for matching addFooListener+removeFooListener pairs. // Bonus if there is a matching getFooListeners method as well. - Iterator keys = adds.keySet().iterator(); + Iterator keys = adds.keySet().iterator(); while (keys.hasNext()) { - String listenerName = (String) keys.next(); + String listenerName = keys.next(); // Skip any "add" which doesn't have a matching "remove" or // a listener name that doesn't end with Listener if (removes.get(listenerName) == null || !listenerName.endsWith("Listener")) { continue; } String eventName = decapitalize(listenerName.substring(0, listenerName.length()-8)); - Method addMethod = (Method)adds.get(listenerName); - Method removeMethod = (Method)removes.get(listenerName); + Method addMethod = adds.get(listenerName); + Method removeMethod = removes.get(listenerName); Method getMethod = null; if (gets != null) { - getMethod = (Method)gets.get(listenerName); + getMethod = gets.get(listenerName); } - Class argType = FeatureDescriptor.getParameterTypes(beanClass, addMethod)[0]; + Class argType = FeatureDescriptor.getParameterTypes(beanClass, addMethod)[0]; // generate a list of Method objects for each of the target methods: Method allMethods[] = getPublicDeclaredMethods(argType); - List validMethods = new ArrayList(allMethods.length); + List validMethods = new ArrayList<>(allMethods.length); for (int i = 0; i < allMethods.length; i++) { if (allMethods[i] == null) { continue; @@ -1025,7 +1025,7 @@ public class Introspector { validMethods.add(allMethods[i]); } } - Method[] methods = (Method[])validMethods.toArray(new Method[validMethods.size()]); + Method[] methods = validMethods.toArray(new Method[validMethods.size()]); EventSetDescriptor esd = new EventSetDescriptor(eventName, argType, methods, addMethod, @@ -1048,7 +1048,7 @@ public class Introspector { } else { // Allocate and populate the result array. result = new EventSetDescriptor[events.size()]; - result = (EventSetDescriptor[])events.values().toArray(result); + result = events.values().toArray(result); // Set the default index. if (defaultEventName != null) { @@ -1067,7 +1067,7 @@ public class Introspector { if (esd.getName().equals("propertyChange")) { propertyChangeSource = true; } - EventSetDescriptor old = (EventSetDescriptor)events.get(key); + EventSetDescriptor old = events.get(key); if (old == null) { events.put(key, esd); return; @@ -1082,7 +1082,7 @@ public class Introspector { */ private MethodDescriptor[] getTargetMethodInfo() { if (methods == null) { - methods = new HashMap(100); + methods = new HashMap<>(100); } // Check if the bean has its own BeanInfo that will provide @@ -1135,7 +1135,7 @@ public class Introspector { // Allocate and populate the result array. MethodDescriptor result[] = new MethodDescriptor[methods.size()]; - result = (MethodDescriptor[])methods.values().toArray(result); + result = methods.values().toArray(result); return result; } @@ -1146,7 +1146,7 @@ public class Introspector { // This method gets called a *lot, so we try to be efficient. String name = md.getName(); - MethodDescriptor old = (MethodDescriptor)methods.get(name); + MethodDescriptor old = methods.get(name); if (old == null) { // This is the common case. methods.put(name, md); @@ -1179,7 +1179,7 @@ public class Introspector { // This is very rare. String longKey = makeQualifiedMethodName(name, p1); - old = (MethodDescriptor)methods.get(longKey); + old = methods.get(longKey); if (old == null) { methods.put(longKey, md); return; @@ -1250,7 +1250,7 @@ public class Introspector { /* * Internal method to return *public* methods within a class. */ - private static Method[] getPublicDeclaredMethods(Class clz) { + private static Method[] getPublicDeclaredMethods(Class clz) { // Looking up Class.getDeclaredMethods is relatively expensive, // so we cache the results. if (!ReflectUtil.isPackageAccessible(clz)) { @@ -1280,14 +1280,14 @@ public class Introspector { * Internal support for finding a target methodName with a given * parameter list on a given class. */ - private static Method internalFindMethod(Class start, String methodName, + private static Method internalFindMethod(Class start, String methodName, int argCount, Class args[]) { // For overriden methods we need to find the most derived version. // So we start with the given class and walk up the superclass chain. Method method = null; - for (Class cl = start; cl != null; cl = cl.getSuperclass()) { + for (Class cl = start; cl != null; cl = cl.getSuperclass()) { Method methods[] = getPublicDeclaredMethods(cl); for (int i = 0; i < methods.length; i++) { method = methods[i]; @@ -1338,7 +1338,7 @@ public class Introspector { /** * Find a target methodName on a given class. */ - static Method findMethod(Class cls, String methodName, int argCount) { + static Method findMethod(Class cls, String methodName, int argCount) { return findMethod(cls, methodName, argCount, null); } @@ -1354,7 +1354,7 @@ public class Introspector { * @param args Array of argument types for the method. * @return the method or null if not found */ - static Method findMethod(Class cls, String methodName, int argCount, + static Method findMethod(Class cls, String methodName, int argCount, Class args[]) { if (methodName == null) { return null; @@ -1368,7 +1368,7 @@ public class Introspector { * or "implements" b. * Note tht either or both "Class" objects may represent interfaces. */ - static boolean isSubclass(Class a, Class b) { + static boolean isSubclass(Class a, Class b) { // We rely on the fact that for any given java class or // primtitive type there is a unqiue Class object, so // we can use object equivalence in the comparisons. @@ -1378,12 +1378,12 @@ public class Introspector { if (a == null || b == null) { return false; } - for (Class x = a; x != null; x = x.getSuperclass()) { + for (Class x = a; x != null; x = x.getSuperclass()) { if (x == b) { return true; } if (b.isInterface()) { - Class interfaces[] = x.getInterfaces(); + Class[] interfaces = x.getInterfaces(); for (int i = 0; i < interfaces.length; i++) { if (isSubclass(interfaces[i], b)) { return true; @@ -1397,7 +1397,7 @@ public class Introspector { /** * Return true iff the given method throws the given exception. */ - private boolean throwsException(Method method, Class exception) { + private boolean throwsException(Method method, Class exception) { Class exs[] = method.getExceptionTypes(); for (int i = 0; i < exs.length; i++) { if (exs[i] == exception) { @@ -1412,12 +1412,12 @@ public class Introspector { * First try the classloader of "sibling", then try the system * classloader then the class loader of the current Thread. */ - static Object instantiate(Class sibling, String className) + static Object instantiate(Class sibling, String className) throws InstantiationException, IllegalAccessException, ClassNotFoundException { // First check with sibling's classloader (if any). ClassLoader cl = sibling.getClassLoader(); - Class cls = ClassFinder.findClass(className, cl); + Class cls = ClassFinder.findClass(className, cl); return cls.newInstance(); } @@ -1452,7 +1452,7 @@ class GenericBeanInfo extends SimpleBeanInfo { this.properties = properties; this.defaultProperty = defaultProperty; this.methods = methods; - this.targetBeanInfoRef = new SoftReference(targetBeanInfo); + this.targetBeanInfoRef = new SoftReference<>(targetBeanInfo); } /** diff --git a/jdk/src/share/classes/java/beans/MetaData.java b/jdk/src/share/classes/java/beans/MetaData.java index c4ab869e955..3e3f5d11e09 100644 --- a/jdk/src/share/classes/java/beans/MetaData.java +++ b/jdk/src/share/classes/java/beans/MetaData.java @@ -93,7 +93,7 @@ class EnumPersistenceDelegate extends PersistenceDelegate { } protected Expression instantiate(Object oldInstance, Encoder out) { - Enum e = (Enum) oldInstance; + Enum e = (Enum) oldInstance; return new Expression(e, Enum.class, "valueOf", new Object[]{e.getDeclaringClass(), e.name()}); } } @@ -118,7 +118,7 @@ class ArrayPersistenceDelegate extends PersistenceDelegate { protected Expression instantiate(Object oldInstance, Encoder out) { // System.out.println("instantiate: " + type + " " + oldInstance); - Class oldClass = oldInstance.getClass(); + Class oldClass = oldInstance.getClass(); return new Expression(oldInstance, Array.class, "newInstance", new Object[]{oldClass.getComponentType(), new Integer(Array.getLength(oldInstance))}); @@ -152,14 +152,14 @@ class ArrayPersistenceDelegate extends PersistenceDelegate { class ProxyPersistenceDelegate extends PersistenceDelegate { protected Expression instantiate(Object oldInstance, Encoder out) { - Class type = oldInstance.getClass(); + Class type = oldInstance.getClass(); java.lang.reflect.Proxy p = (java.lang.reflect.Proxy)oldInstance; // This unappealing hack is not required but makes the // representation of EventHandlers much more concise. java.lang.reflect.InvocationHandler ih = java.lang.reflect.Proxy.getInvocationHandler(p); if (ih instanceof EventHandler) { EventHandler eh = (EventHandler)ih; - Vector args = new Vector(); + Vector args = new Vector<>(); args.add(type.getInterfaces()[0]); args.add(eh.getTarget()); args.add(eh.getAction()); @@ -200,7 +200,7 @@ class java_lang_Class_PersistenceDelegate extends PersistenceDelegate { } protected Expression instantiate(Object oldInstance, Encoder out) { - Class c = (Class)oldInstance; + Class c = (Class)oldInstance; // As of 1.3 it is not possible to call Class.forName("int"), // so we have to generate different code for primitive types. // This is needed for arrays whose subtype may be primitive. @@ -362,8 +362,8 @@ abstract class java_util_Collections extends PersistenceDelegate { if ((oldInstance instanceof List) || (oldInstance instanceof Set) || (oldInstance instanceof Map)) { return oldInstance.equals(newInstance); } - Collection oldC = (Collection) oldInstance; - Collection newC = (Collection) newInstance; + Collection oldC = (Collection) oldInstance; + Collection newC = (Collection) newInstance; return (oldC.size() == newC.size()) && oldC.containsAll(newC); } @@ -387,21 +387,21 @@ abstract class java_util_Collections extends PersistenceDelegate { static final class SingletonList_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - List list = (List) oldInstance; + List list = (List) oldInstance; return new Expression(oldInstance, Collections.class, "singletonList", new Object[]{list.get(0)}); } } static final class SingletonSet_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - Set set = (Set) oldInstance; + Set set = (Set) oldInstance; return new Expression(oldInstance, Collections.class, "singleton", new Object[]{set.iterator().next()}); } } static final class SingletonMap_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - Map map = (Map) oldInstance; + Map map = (Map) oldInstance; Object key = map.keySet().iterator().next(); return new Expression(oldInstance, Collections.class, "singletonMap", new Object[]{key, map.get(key)}); } @@ -409,98 +409,98 @@ abstract class java_util_Collections extends PersistenceDelegate { static final class UnmodifiableCollection_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - List list = new ArrayList((Collection) oldInstance); + List list = new ArrayList<>((Collection) oldInstance); return new Expression(oldInstance, Collections.class, "unmodifiableCollection", new Object[]{list}); } } static final class UnmodifiableList_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - List list = new LinkedList((Collection) oldInstance); + List list = new LinkedList<>((Collection) oldInstance); return new Expression(oldInstance, Collections.class, "unmodifiableList", new Object[]{list}); } } static final class UnmodifiableRandomAccessList_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - List list = new ArrayList((Collection) oldInstance); + List list = new ArrayList<>((Collection) oldInstance); return new Expression(oldInstance, Collections.class, "unmodifiableList", new Object[]{list}); } } static final class UnmodifiableSet_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - Set set = new HashSet((Set) oldInstance); + Set set = new HashSet<>((Set) oldInstance); return new Expression(oldInstance, Collections.class, "unmodifiableSet", new Object[]{set}); } } static final class UnmodifiableSortedSet_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - SortedSet set = new TreeSet((SortedSet) oldInstance); + SortedSet set = new TreeSet<>((SortedSet) oldInstance); return new Expression(oldInstance, Collections.class, "unmodifiableSortedSet", new Object[]{set}); } } static final class UnmodifiableMap_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - Map map = new HashMap((Map) oldInstance); + Map map = new HashMap<>((Map) oldInstance); return new Expression(oldInstance, Collections.class, "unmodifiableMap", new Object[]{map}); } } static final class UnmodifiableSortedMap_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - SortedMap map = new TreeMap((SortedMap) oldInstance); + SortedMap map = new TreeMap<>((SortedMap) oldInstance); return new Expression(oldInstance, Collections.class, "unmodifiableSortedMap", new Object[]{map}); } } static final class SynchronizedCollection_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - List list = new ArrayList((Collection) oldInstance); + List list = new ArrayList<>((Collection) oldInstance); return new Expression(oldInstance, Collections.class, "synchronizedCollection", new Object[]{list}); } } static final class SynchronizedList_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - List list = new LinkedList((Collection) oldInstance); + List list = new LinkedList<>((Collection) oldInstance); return new Expression(oldInstance, Collections.class, "synchronizedList", new Object[]{list}); } } static final class SynchronizedRandomAccessList_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - List list = new ArrayList((Collection) oldInstance); + List list = new ArrayList<>((Collection) oldInstance); return new Expression(oldInstance, Collections.class, "synchronizedList", new Object[]{list}); } } static final class SynchronizedSet_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - Set set = new HashSet((Set) oldInstance); + Set set = new HashSet<>((Set) oldInstance); return new Expression(oldInstance, Collections.class, "synchronizedSet", new Object[]{set}); } } static final class SynchronizedSortedSet_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - SortedSet set = new TreeSet((SortedSet) oldInstance); + SortedSet set = new TreeSet<>((SortedSet) oldInstance); return new Expression(oldInstance, Collections.class, "synchronizedSortedSet", new Object[]{set}); } } static final class SynchronizedMap_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - Map map = new HashMap((Map) oldInstance); + Map map = new HashMap<>((Map) oldInstance); return new Expression(oldInstance, Collections.class, "synchronizedMap", new Object[]{map}); } } static final class SynchronizedSortedMap_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { - SortedMap map = new TreeMap((SortedMap) oldInstance); + SortedMap map = new TreeMap<>((SortedMap) oldInstance); return new Expression(oldInstance, Collections.class, "synchronizedSortedMap", new Object[]{map}); } } @@ -508,7 +508,7 @@ abstract class java_util_Collections extends PersistenceDelegate { static final class CheckedCollection_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { Object type = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedCollection.type"); - List list = new ArrayList((Collection) oldInstance); + List list = new ArrayList<>((Collection) oldInstance); return new Expression(oldInstance, Collections.class, "checkedCollection", new Object[]{list, type}); } } @@ -516,7 +516,7 @@ abstract class java_util_Collections extends PersistenceDelegate { static final class CheckedList_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { Object type = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedCollection.type"); - List list = new LinkedList((Collection) oldInstance); + List list = new LinkedList<>((Collection) oldInstance); return new Expression(oldInstance, Collections.class, "checkedList", new Object[]{list, type}); } } @@ -524,7 +524,7 @@ abstract class java_util_Collections extends PersistenceDelegate { static final class CheckedRandomAccessList_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { Object type = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedCollection.type"); - List list = new ArrayList((Collection) oldInstance); + List list = new ArrayList<>((Collection) oldInstance); return new Expression(oldInstance, Collections.class, "checkedList", new Object[]{list, type}); } } @@ -532,7 +532,7 @@ abstract class java_util_Collections extends PersistenceDelegate { static final class CheckedSet_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { Object type = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedCollection.type"); - Set set = new HashSet((Set) oldInstance); + Set set = new HashSet<>((Set) oldInstance); return new Expression(oldInstance, Collections.class, "checkedSet", new Object[]{set, type}); } } @@ -540,7 +540,7 @@ abstract class java_util_Collections extends PersistenceDelegate { static final class CheckedSortedSet_PersistenceDelegate extends java_util_Collections { protected Expression instantiate(Object oldInstance, Encoder out) { Object type = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedCollection.type"); - SortedSet set = new TreeSet((SortedSet) oldInstance); + SortedSet set = new TreeSet<>((SortedSet) oldInstance); return new Expression(oldInstance, Collections.class, "checkedSortedSet", new Object[]{set, type}); } } @@ -549,7 +549,7 @@ abstract class java_util_Collections extends PersistenceDelegate { protected Expression instantiate(Object oldInstance, Encoder out) { Object keyType = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedMap.keyType"); Object valueType = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedMap.valueType"); - Map map = new HashMap((Map) oldInstance); + Map map = new HashMap<>((Map) oldInstance); return new Expression(oldInstance, Collections.class, "checkedMap", new Object[]{map, keyType, valueType}); } } @@ -558,7 +558,7 @@ abstract class java_util_Collections extends PersistenceDelegate { protected Expression instantiate(Object oldInstance, Encoder out) { Object keyType = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedMap.keyType"); Object valueType = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedMap.valueType"); - SortedMap map = new TreeMap((SortedMap) oldInstance); + SortedMap map = new TreeMap<>((SortedMap) oldInstance); return new Expression(oldInstance, Collections.class, "checkedSortedMap", new Object[]{map, keyType, valueType}); } } @@ -605,13 +605,13 @@ class java_util_EnumSet_PersistenceDelegate extends PersistenceDelegate { // Collection class java_util_Collection_PersistenceDelegate extends DefaultPersistenceDelegate { protected void initialize(Class type, Object oldInstance, Object newInstance, Encoder out) { - java.util.Collection oldO = (java.util.Collection)oldInstance; - java.util.Collection newO = (java.util.Collection)newInstance; + java.util.Collection oldO = (java.util.Collection)oldInstance; + java.util.Collection newO = (java.util.Collection)newInstance; if (newO.size() != 0) { invokeStatement(oldInstance, "clear", new Object[]{}, out); } - for (Iterator i = oldO.iterator(); i.hasNext();) { + for (Iterator i = oldO.iterator(); i.hasNext();) { invokeStatement(oldInstance, "add", new Object[]{i.next()}, out); } } @@ -620,8 +620,8 @@ class java_util_Collection_PersistenceDelegate extends DefaultPersistenceDelegat // List class java_util_List_PersistenceDelegate extends DefaultPersistenceDelegate { protected void initialize(Class type, Object oldInstance, Object newInstance, Encoder out) { - java.util.List oldO = (java.util.List)oldInstance; - java.util.List newO = (java.util.List)newInstance; + java.util.List oldO = (java.util.List)oldInstance; + java.util.List newO = (java.util.List)newInstance; int oldSize = oldO.size(); int newSize = (newO == null) ? 0 : newO.size(); if (oldSize < newSize) { @@ -656,8 +656,8 @@ class java_util_List_PersistenceDelegate extends DefaultPersistenceDelegate { class java_util_Map_PersistenceDelegate extends DefaultPersistenceDelegate { protected void initialize(Class type, Object oldInstance, Object newInstance, Encoder out) { // System.out.println("Initializing: " + newInstance); - java.util.Map oldMap = (java.util.Map)oldInstance; - java.util.Map newMap = (java.util.Map)newInstance; + java.util.Map oldMap = (java.util.Map)oldInstance; + java.util.Map newMap = (java.util.Map)newInstance; // Remove the new elements. // Do this first otherwise we undo the adding work. if (newMap != null) { @@ -746,9 +746,9 @@ final class java_awt_Font_PersistenceDelegate extends PersistenceDelegate { int style = Font.PLAIN; int size = 12; - Map basic = font.getAttributes(); - Map clone = new HashMap(basic.size()); - for (Object key : basic.keySet()) { + Map basic = font.getAttributes(); + Map clone = new HashMap<>(basic.size()); + for (TextAttribute key : basic.keySet()) { Object value = basic.get(key); if (value != null) { clone.put(key, value); @@ -784,7 +784,7 @@ final class java_awt_Font_PersistenceDelegate extends PersistenceDelegate { } } } - Class type = font.getClass(); + Class type = font.getClass(); if (count == clone.size()) { return new Expression(font, type, "new", new Object[]{family, style, size}); } @@ -832,7 +832,7 @@ final class java_awt_AWTKeyStroke_PersistenceDelegate extends PersistenceDelegat if (args == null) { throw new IllegalStateException("Unsupported KeyStroke: " + key); } - Class type = key.getClass(); + Class type = key.getClass(); String name = type.getName(); // get short name of the class int index = name.lastIndexOf('.') + 1; @@ -1057,12 +1057,12 @@ class java_awt_CardLayout_PersistenceDelegate extends DefaultPersistenceDelegate protected void initialize(Class type, Object oldInstance, Object newInstance, Encoder out) { super.initialize(type, oldInstance, newInstance, out); - Hashtable tab = (Hashtable)ReflectionUtils.getPrivateField(oldInstance, + Hashtable tab = (Hashtable)ReflectionUtils.getPrivateField(oldInstance, java.awt.CardLayout.class, "tab", out.getExceptionListener()); if (tab != null) { - for(Enumeration e = tab.keys(); e.hasMoreElements();) { + for(Enumeration e = tab.keys(); e.hasMoreElements();) { Object child = e.nextElement(); invokeStatement(oldInstance, "addLayoutComponent", new Object[]{child, (String)tab.get(child)}, out); @@ -1076,12 +1076,12 @@ class java_awt_GridBagLayout_PersistenceDelegate extends DefaultPersistenceDeleg protected void initialize(Class type, Object oldInstance, Object newInstance, Encoder out) { super.initialize(type, oldInstance, newInstance, out); - Hashtable comptable = (Hashtable)ReflectionUtils.getPrivateField(oldInstance, + Hashtable comptable = (Hashtable)ReflectionUtils.getPrivateField(oldInstance, java.awt.GridBagLayout.class, "comptable", out.getExceptionListener()); if (comptable != null) { - for(Enumeration e = comptable.keys(); e.hasMoreElements();) { + for(Enumeration e = comptable.keys(); e.hasMoreElements();) { Object child = e.nextElement(); invokeStatement(oldInstance, "addLayoutComponent", new Object[]{child, comptable.get(child)}, out); @@ -1119,8 +1119,8 @@ class javax_swing_DefaultListModel_PersistenceDelegate extends DefaultPersistenc protected void initialize(Class type, Object oldInstance, Object newInstance, Encoder out) { // Note, the "size" property will be set here. super.initialize(type, oldInstance, newInstance, out); - javax.swing.DefaultListModel m = (javax.swing.DefaultListModel)oldInstance; - javax.swing.DefaultListModel n = (javax.swing.DefaultListModel)newInstance; + javax.swing.DefaultListModel m = (javax.swing.DefaultListModel)oldInstance; + javax.swing.DefaultListModel n = (javax.swing.DefaultListModel)newInstance; for (int i = n.getSize(); i < m.getSize(); i++) { invokeStatement(oldInstance, "add", // Can also use "addElement". new Object[]{m.getElementAt(i)}, out); @@ -1132,7 +1132,7 @@ class javax_swing_DefaultListModel_PersistenceDelegate extends DefaultPersistenc class javax_swing_DefaultComboBoxModel_PersistenceDelegate extends DefaultPersistenceDelegate { protected void initialize(Class type, Object oldInstance, Object newInstance, Encoder out) { super.initialize(type, oldInstance, newInstance, out); - javax.swing.DefaultComboBoxModel m = (javax.swing.DefaultComboBoxModel)oldInstance; + javax.swing.DefaultComboBoxModel m = (javax.swing.DefaultComboBoxModel)oldInstance; for (int i = 0; i < m.getSize(); i++) { invokeStatement(oldInstance, "addElement", new Object[]{m.getElementAt(i)}, out); } @@ -1275,7 +1275,7 @@ final class sun_swing_PrintColorUIResource_PersistenceDelegate extends Persisten class MetaData { private static final Map fields = Collections.synchronizedMap(new WeakHashMap()); - private static Hashtable internalPersistenceDelegates = new Hashtable(); + private static Hashtable internalPersistenceDelegates = new Hashtable<>(); private static PersistenceDelegate nullPersistenceDelegate = new NullPersistenceDelegate(); private static PersistenceDelegate enumPersistenceDelegate = new EnumPersistenceDelegate(); @@ -1308,6 +1308,7 @@ class MetaData { internalPersistenceDelegates.put("java.util.RegularEnumSet", new java_util_EnumSet_PersistenceDelegate()); } + @SuppressWarnings("rawtypes") public synchronized static PersistenceDelegate getPersistenceDelegate(Class type) { if (type == null) { return nullPersistenceDelegate; @@ -1342,7 +1343,7 @@ class MetaData { String typeName = type.getName(); PersistenceDelegate pd = (PersistenceDelegate)getBeanAttribute(type, "persistenceDelegate"); if (pd == null) { - pd = (PersistenceDelegate)internalPersistenceDelegates.get(typeName); + pd = internalPersistenceDelegates.get(typeName); if (pd != null) { return pd; } @@ -1369,7 +1370,7 @@ class MetaData { return (pd != null) ? pd : defaultPersistenceDelegate; } - private static String[] getConstructorProperties(Class type) { + private static String[] getConstructorProperties(Class type) { String[] names = null; int length = 0; for (Constructor constructor : type.getConstructors()) { @@ -1402,7 +1403,7 @@ class MetaData { return true; } - private static Object getBeanAttribute(Class type, String attribute) { + private static Object getBeanAttribute(Class type, String attribute) { try { return Introspector.getBeanInfo(type).getBeanDescriptor().getValue(attribute); } catch (IntrospectionException exception) { diff --git a/jdk/src/share/classes/java/beans/MethodDescriptor.java b/jdk/src/share/classes/java/beans/MethodDescriptor.java index d9e78be516f..ae26fb211c7 100644 --- a/jdk/src/share/classes/java/beans/MethodDescriptor.java +++ b/jdk/src/share/classes/java/beans/MethodDescriptor.java @@ -42,7 +42,7 @@ public class MethodDescriptor extends FeatureDescriptor { private String[] paramNames; - private List params; + private List>> params; private ParameterDescriptor parameterDescriptors[]; @@ -81,10 +81,10 @@ public class MethodDescriptor extends FeatureDescriptor { public synchronized Method getMethod() { Method method = getMethod0(); if (method == null) { - Class cls = getClass0(); + Class cls = getClass0(); String name = getName(); if ((cls != null) && (name != null)) { - Class[] params = getParams(); + Class[] params = getParams(); if (params == null) { for (int i = 0; i < 3; i++) { // Find methods for up to 2 params. We are guessing here. @@ -121,15 +121,15 @@ public class MethodDescriptor extends FeatureDescriptor { : null; } - private synchronized void setParams(Class[] param) { + private synchronized void setParams(Class[] param) { if (param == null) { return; } paramNames = new String[param.length]; - params = new ArrayList(param.length); + params = new ArrayList<>(param.length); for (int i = 0; i < param.length; i++) { paramNames[i] = param[i].getName(); - params.add(new WeakReference(param[i])); + params.add(new WeakReference>(param[i])); } } @@ -138,12 +138,12 @@ public class MethodDescriptor extends FeatureDescriptor { return paramNames; } - private synchronized Class[] getParams() { - Class[] clss = new Class[params.size()]; + private synchronized Class[] getParams() { + Class[] clss = new Class[params.size()]; for (int i = 0; i < params.size(); i++) { - Reference ref = (Reference)params.get(i); - Class cls = (Class)ref.get(); + Reference> ref = (Reference>)params.get(i); + Class cls = ref.get(); if (cls == null) { return null; } else { diff --git a/jdk/src/share/classes/java/beans/NameGenerator.java b/jdk/src/share/classes/java/beans/NameGenerator.java index 3fa7f52db8e..ddc1b213aef 100644 --- a/jdk/src/share/classes/java/beans/NameGenerator.java +++ b/jdk/src/share/classes/java/beans/NameGenerator.java @@ -43,12 +43,12 @@ import static java.util.Locale.ENGLISH; */ class NameGenerator { - private Map valueToName; - private Map nameToCount; + private Map valueToName; + private Map nameToCount; public NameGenerator() { - valueToName = new IdentityHashMap(); - nameToCount = new HashMap(); + valueToName = new IdentityHashMap<>(); + nameToCount = new HashMap<>(); } /** @@ -63,6 +63,7 @@ class NameGenerator { /** * Returns the root name of the class. */ + @SuppressWarnings("rawtypes") public static String unqualifiedClassName(Class type) { if (type.isArray()) { return unqualifiedClassName(type.getComponentType())+"Array"; @@ -97,15 +98,15 @@ class NameGenerator { return unqualifiedClassName((Class)instance); } else { - String result = (String)valueToName.get(instance); + String result = valueToName.get(instance); if (result != null) { return result; } - Class type = instance.getClass(); + Class type = instance.getClass(); String className = unqualifiedClassName(type); - Object size = nameToCount.get(className); - int instanceNumber = (size == null) ? 0 : ((Integer)size).intValue() + 1; + Integer size = nameToCount.get(className); + int instanceNumber = (size == null) ? 0 : (size).intValue() + 1; nameToCount.put(className, new Integer(instanceNumber)); result = className + instanceNumber; diff --git a/jdk/src/share/classes/java/beans/PersistenceDelegate.java b/jdk/src/share/classes/java/beans/PersistenceDelegate.java index f8622c13023..01c5bb12387 100644 --- a/jdk/src/share/classes/java/beans/PersistenceDelegate.java +++ b/jdk/src/share/classes/java/beans/PersistenceDelegate.java @@ -207,7 +207,7 @@ public abstract class PersistenceDelegate { Object oldInstance, Object newInstance, Encoder out) { - Class superType = type.getSuperclass(); + Class superType = type.getSuperclass(); PersistenceDelegate info = out.getPersistenceDelegate(superType); info.initialize(superType, oldInstance, newInstance, out); } diff --git a/jdk/src/share/classes/java/beans/PropertyChangeSupport.java b/jdk/src/share/classes/java/beans/PropertyChangeSupport.java index db5b613d035..1ea326e88c9 100644 --- a/jdk/src/share/classes/java/beans/PropertyChangeSupport.java +++ b/jdk/src/share/classes/java/beans/PropertyChangeSupport.java @@ -431,7 +431,7 @@ public class PropertyChangeSupport implements Serializable { listeners = entry.getValue(); } else { if (children == null) { - children = new Hashtable(); + children = new Hashtable<>(); } PropertyChangeSupport pcs = new PropertyChangeSupport(this.source); pcs.map.set(null, entry.getValue()); @@ -460,6 +460,7 @@ public class PropertyChangeSupport implements Serializable { ObjectInputStream.GetField fields = s.readFields(); + @SuppressWarnings("unchecked") Hashtable children = (Hashtable) fields.get("children", null); this.source = fields.get("source", null); fields.get("propertyChangeSupportSerializedDataVersion", 2); diff --git a/jdk/src/share/classes/java/beans/PropertyDescriptor.java b/jdk/src/share/classes/java/beans/PropertyDescriptor.java index d60ad1ff2d4..6abe8a0bdc4 100644 --- a/jdk/src/share/classes/java/beans/PropertyDescriptor.java +++ b/jdk/src/share/classes/java/beans/PropertyDescriptor.java @@ -35,10 +35,10 @@ import java.lang.reflect.Constructor; */ public class PropertyDescriptor extends FeatureDescriptor { - private Reference propertyTypeRef; + private Reference> propertyTypeRef; private Reference readMethodRef; private Reference writeMethodRef; - private Reference propertyEditorClassRef; + private Reference> propertyEditorClassRef; private boolean bound; private boolean constrained; @@ -186,11 +186,11 @@ public class PropertyDescriptor extends FeatureDescriptor { return type; } - private void setPropertyType(Class type) { + private void setPropertyType(Class type) { this.propertyTypeRef = getWeakReference(type); } - private Class getPropertyType0() { + private Class getPropertyType0() { return (this.propertyTypeRef != null) ? this.propertyTypeRef.get() : null; @@ -344,7 +344,7 @@ public class PropertyDescriptor extends FeatureDescriptor { /** * Overridden to ensure that a super class doesn't take precedent */ - void setClass0(Class clz) { + void setClass0(Class clz) { if (getClass0() != null && clz.isAssignableFrom(getClass0())) { // dont replace a subclass with a superclass return; @@ -402,7 +402,7 @@ public class PropertyDescriptor extends FeatureDescriptor { * @param propertyEditorClass The Class for the desired PropertyEditor. */ public void setPropertyEditorClass(Class propertyEditorClass) { - this.propertyEditorClassRef = getWeakReference((Class)propertyEditorClass); + this.propertyEditorClassRef = getWeakReference(propertyEditorClass); } /** @@ -442,7 +442,7 @@ public class PropertyDescriptor extends FeatureDescriptor { Constructor ctor = null; if (bean != null) { try { - ctor = cls.getConstructor(new Class[] { Object.class }); + ctor = cls.getConstructor(new Class[] { Object.class }); } catch (Exception ex) { // Fall through } @@ -639,7 +639,7 @@ public class PropertyDescriptor extends FeatureDescriptor { Class propertyType = null; try { if (readMethod != null) { - Class[] params = getParameterTypes(getClass0(), readMethod); + Class[] params = getParameterTypes(getClass0(), readMethod); if (params.length != 0) { throw new IntrospectionException("bad read method arg count: " + readMethod); @@ -651,7 +651,7 @@ public class PropertyDescriptor extends FeatureDescriptor { } } if (writeMethod != null) { - Class params[] = getParameterTypes(getClass0(), writeMethod); + Class[] params = getParameterTypes(getClass0(), writeMethod); if (params.length != 1) { throw new IntrospectionException("bad write method arg count: " + writeMethod); diff --git a/jdk/src/share/classes/java/beans/PropertyEditorSupport.java b/jdk/src/share/classes/java/beans/PropertyEditorSupport.java index 776b47e68df..246eca0ad61 100644 --- a/jdk/src/share/classes/java/beans/PropertyEditorSupport.java +++ b/jdk/src/share/classes/java/beans/PropertyEditorSupport.java @@ -251,7 +251,7 @@ public class PropertyEditorSupport implements PropertyEditor { public synchronized void addPropertyChangeListener( PropertyChangeListener listener) { if (listeners == null) { - listeners = new java.util.Vector(); + listeners = new java.util.Vector<>(); } listeners.addElement(listener); } @@ -278,25 +278,30 @@ public class PropertyEditorSupport implements PropertyEditor { * Report that we have been modified to any interested listeners. */ public void firePropertyChange() { - java.util.Vector targets; + java.util.Vector targets; synchronized (this) { if (listeners == null) { return; } - targets = (java.util.Vector) listeners.clone(); + targets = unsafeClone(listeners); } // Tell our listeners that "everything" has changed. PropertyChangeEvent evt = new PropertyChangeEvent(source, null, null, null); for (int i = 0; i < targets.size(); i++) { - PropertyChangeListener target = (PropertyChangeListener)targets.elementAt(i); + PropertyChangeListener target = targets.elementAt(i); target.propertyChange(evt); } } + @SuppressWarnings("unchecked") + private java.util.Vector unsafeClone(java.util.Vector v) { + return (java.util.Vector)v.clone(); + } + //---------------------------------------------------------------------- private Object value; private Object source; - private java.util.Vector listeners; + private java.util.Vector listeners; } diff --git a/jdk/src/share/classes/java/beans/ReflectionUtils.java b/jdk/src/share/classes/java/beans/ReflectionUtils.java index c1c9dca3397..9271827b135 100644 --- a/jdk/src/share/classes/java/beans/ReflectionUtils.java +++ b/jdk/src/share/classes/java/beans/ReflectionUtils.java @@ -32,10 +32,12 @@ import java.lang.reflect.Field; */ class ReflectionUtils { + @SuppressWarnings("rawtypes") public static boolean isPrimitive(Class type) { return primitiveTypeFor(type) != null; } + @SuppressWarnings("rawtypes") public static Class primitiveTypeFor(Class wrapper) { if (wrapper == Boolean.class) return Boolean.TYPE; if (wrapper == Byte.class) return Byte.TYPE; @@ -58,6 +60,7 @@ class ReflectionUtils { * @param el an exception listener to handle exceptions; or null * @return value of the field; null if not found or an error is encountered */ + @SuppressWarnings("rawtypes") public static Object getPrivateField(Object instance, Class cls, String name, ExceptionListener el) { try { diff --git a/jdk/src/share/classes/java/beans/SimpleBeanInfo.java b/jdk/src/share/classes/java/beans/SimpleBeanInfo.java index ddd6b026ab4..88348ffd3ae 100644 --- a/jdk/src/share/classes/java/beans/SimpleBeanInfo.java +++ b/jdk/src/share/classes/java/beans/SimpleBeanInfo.java @@ -116,10 +116,10 @@ public class SimpleBeanInfo implements BeanInfo { */ public java.awt.Image loadImage(final String resourceName) { try { - final Class c = getClass(); + final Class c = getClass(); java.awt.image.ImageProducer ip = (java.awt.image.ImageProducer) java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { + new java.security.PrivilegedAction() { public Object run() { java.net.URL url; if ((url = c.getResource(resourceName)) == null) { diff --git a/jdk/src/share/classes/java/beans/Statement.java b/jdk/src/share/classes/java/beans/Statement.java index b6e1c2f9be6..5ffccc3cff4 100644 --- a/jdk/src/share/classes/java/beans/Statement.java +++ b/jdk/src/share/classes/java/beans/Statement.java @@ -212,7 +212,7 @@ public class Statement { if (target == Class.class && methodName.equals("forName")) { return ClassFinder.resolveClass((String)arguments[0], this.loader); } - Class[] argClasses = new Class[arguments.length]; + Class[] argClasses = new Class[arguments.length]; for(int i = 0; i < arguments.length; i++) { argClasses[i] = (arguments[i] == null) ? null : arguments[i].getClass(); } diff --git a/jdk/src/share/classes/java/beans/VetoableChangeSupport.java b/jdk/src/share/classes/java/beans/VetoableChangeSupport.java index 4cb8f3fc271..318abd23576 100644 --- a/jdk/src/share/classes/java/beans/VetoableChangeSupport.java +++ b/jdk/src/share/classes/java/beans/VetoableChangeSupport.java @@ -420,7 +420,7 @@ public class VetoableChangeSupport implements Serializable { listeners = entry.getValue(); } else { if (children == null) { - children = new Hashtable(); + children = new Hashtable<>(); } VetoableChangeSupport vcs = new VetoableChangeSupport(this.source); vcs.map.set(null, entry.getValue()); @@ -449,7 +449,8 @@ public class VetoableChangeSupport implements Serializable { ObjectInputStream.GetField fields = s.readFields(); - Hashtable children = (Hashtable) fields.get("children", null); + @SuppressWarnings("unchecked") + Hashtable children = (Hashtable)fields.get("children", null); this.source = fields.get("source", null); fields.get("vetoableChangeSupportSerializedDataVersion", 2); diff --git a/jdk/src/share/classes/java/beans/XMLEncoder.java b/jdk/src/share/classes/java/beans/XMLEncoder.java index 3866a630187..21749e0db9c 100644 --- a/jdk/src/share/classes/java/beans/XMLEncoder.java +++ b/jdk/src/share/classes/java/beans/XMLEncoder.java @@ -287,8 +287,8 @@ public class XMLEncoder extends Encoder implements AutoCloseable { this.declaration = declaration; this.indentation = indentation; this.out = new OutputStreamWriter(out, cs.newEncoder()); - valueToExpression = new IdentityHashMap(); - targetToStatementList = new IdentityHashMap>(); + valueToExpression = new IdentityHashMap<>(); + targetToStatementList = new IdentityHashMap<>(); nameGenerator = new NameGenerator(); } @@ -334,7 +334,7 @@ public class XMLEncoder extends Encoder implements AutoCloseable { private List statementList(Object target) { List list = targetToStatementList.get(target); if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); targetToStatementList.put(target, list); } return list; @@ -604,7 +604,7 @@ public class XMLEncoder extends Encoder implements AutoCloseable { return; } - Class primitiveType = ReflectionUtils.primitiveTypeFor(value.getClass()); + Class primitiveType = ReflectionUtils.primitiveTypeFor(value.getClass()); if (primitiveType != null && target == value.getClass() && methodName.equals("new")) { String primitiveTypeName = primitiveType.getName(); diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContext.java b/jdk/src/share/classes/java/beans/beancontext/BeanContext.java index 37f15f91076..c6217289faf 100644 --- a/jdk/src/share/classes/java/beans/beancontext/BeanContext.java +++ b/jdk/src/share/classes/java/beans/beancontext/BeanContext.java @@ -53,6 +53,7 @@ import java.util.Locale; * @see java.util.Collection */ +@SuppressWarnings("rawtypes") public interface BeanContext extends BeanContextChild, Collection, DesignMode, Visibility { /** diff --git a/jdk/src/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java b/jdk/src/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java index 0ed013a5a94..6b5f4f5609c 100644 --- a/jdk/src/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java +++ b/jdk/src/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java @@ -65,6 +65,7 @@ public class BeanContextMembershipEvent extends BeanContextEvent { * @throws NullPointerException if changes is null */ + @SuppressWarnings("rawtypes") public BeanContextMembershipEvent(BeanContext bc, Collection changes) { super(bc); @@ -117,6 +118,7 @@ public class BeanContextMembershipEvent extends BeanContextEvent { * Gets the array of children affected by this event. * @return the array of children effected */ + @SuppressWarnings("rawtypes") public Iterator iterator() { return children.iterator(); } /* @@ -127,5 +129,6 @@ public class BeanContextMembershipEvent extends BeanContextEvent { * The list of children affected by this * event notification. */ + @SuppressWarnings("rawtypes") protected Collection children; } diff --git a/jdk/src/share/classes/java/io/ExpiringCache.java b/jdk/src/share/classes/java/io/ExpiringCache.java index 8c07afbbc0c..42c9ce20961 100644 --- a/jdk/src/share/classes/java/io/ExpiringCache.java +++ b/jdk/src/share/classes/java/io/ExpiringCache.java @@ -35,7 +35,7 @@ import java.util.Set; class ExpiringCache { private long millisUntilExpiration; - private Map map; + private Map map; // Clear out old entries every few queries private int queryCount; private int queryOverflow = 300; @@ -61,10 +61,11 @@ class ExpiringCache { this(30000); } + @SuppressWarnings("serial") ExpiringCache(long millisUntilExpiration) { this.millisUntilExpiration = millisUntilExpiration; - map = new LinkedHashMap() { - protected boolean removeEldestEntry(Map.Entry eldest) { + map = new LinkedHashMap() { + protected boolean removeEldestEntry(Map.Entry eldest) { return size() > MAX_ENTRIES; } }; @@ -99,7 +100,7 @@ class ExpiringCache { } private Entry entryFor(String key) { - Entry entry = (Entry) map.get(key); + Entry entry = map.get(key); if (entry != null) { long delta = System.currentTimeMillis() - entry.timestamp(); if (delta < 0 || delta >= millisUntilExpiration) { @@ -111,12 +112,11 @@ class ExpiringCache { } private void cleanup() { - Set keySet = map.keySet(); + Set keySet = map.keySet(); // Avoid ConcurrentModificationExceptions String[] keys = new String[keySet.size()]; int i = 0; - for (Iterator iter = keySet.iterator(); iter.hasNext(); ) { - String key = (String) iter.next(); + for (String key: keySet) { keys[i++] = key; } for (int j = 0; j < keys.length; j++) { diff --git a/jdk/src/share/classes/java/io/File.java b/jdk/src/share/classes/java/io/File.java index 4b9d389a2d0..fba80c2f461 100644 --- a/jdk/src/share/classes/java/io/File.java +++ b/jdk/src/share/classes/java/io/File.java @@ -2006,7 +2006,7 @@ public class File throws IOException { s.defaultWriteObject(); - s.writeChar(this.separatorChar); // Add the separator character + s.writeChar(separatorChar); // Add the separator character } /** diff --git a/jdk/src/share/classes/java/io/LineNumberInputStream.java b/jdk/src/share/classes/java/io/LineNumberInputStream.java index d3b5d9b323c..11cfdf8b8b9 100644 --- a/jdk/src/share/classes/java/io/LineNumberInputStream.java +++ b/jdk/src/share/classes/java/io/LineNumberInputStream.java @@ -87,6 +87,7 @@ class LineNumberInputStream extends FilterInputStream { * @see java.io.FilterInputStream#in * @see java.io.LineNumberInputStream#getLineNumber() */ + @SuppressWarnings("fallthrough") public int read() throws IOException { int c = pushBack; diff --git a/jdk/src/share/classes/java/io/LineNumberReader.java b/jdk/src/share/classes/java/io/LineNumberReader.java index 31f1e87e5b6..40a0272acb8 100644 --- a/jdk/src/share/classes/java/io/LineNumberReader.java +++ b/jdk/src/share/classes/java/io/LineNumberReader.java @@ -120,6 +120,7 @@ public class LineNumberReader extends BufferedReader { * @throws IOException * If an I/O error occurs */ + @SuppressWarnings("fallthrough") public int read() throws IOException { synchronized (lock) { int c = super.read(); @@ -159,6 +160,7 @@ public class LineNumberReader extends BufferedReader { * @throws IOException * If an I/O error occurs */ + @SuppressWarnings("fallthrough") public int read(char cbuf[], int off, int len) throws IOException { synchronized (lock) { int n = super.read(cbuf, off, len); diff --git a/jdk/src/share/classes/java/io/ObjectInputStream.java b/jdk/src/share/classes/java/io/ObjectInputStream.java index 04705e63229..1963187eaaa 100644 --- a/jdk/src/share/classes/java/io/ObjectInputStream.java +++ b/jdk/src/share/classes/java/io/ObjectInputStream.java @@ -689,9 +689,9 @@ public class ObjectInputStream boolean hasNonPublicInterface = false; // define proxy in class loader of non-public interface(s), if any - Class[] classObjs = new Class[interfaces.length]; + Class[] classObjs = new Class[interfaces.length]; for (int i = 0; i < interfaces.length; i++) { - Class cl = Class.forName(interfaces[i], false, latestLoader); + Class cl = Class.forName(interfaces[i], false, latestLoader); if ((cl.getModifiers() & Modifier.PUBLIC) == 0) { if (hasNonPublicInterface) { if (nonPublicLoader != cl.getClassLoader()) { @@ -1229,7 +1229,7 @@ public class ObjectInputStream * "enableSubclassImplementation" SerializablePermission is checked. */ private void verifySubclass() { - Class cl = getClass(); + Class cl = getClass(); if (cl == ObjectInputStream.class) { return; } @@ -1473,12 +1473,12 @@ public class ObjectInputStream * ClassNotFoundException will be associated with the class' handle in the * handle table). */ - private Class readClass(boolean unshared) throws IOException { + private Class readClass(boolean unshared) throws IOException { if (bin.readByte() != TC_CLASS) { throw new InternalError(); } ObjectStreamClass desc = readClassDesc(false); - Class cl = desc.forClass(); + Class cl = desc.forClass(); passHandle = handles.assign(unshared ? unsharedMarker : cl); ClassNotFoundException resolveEx = desc.getResolveException(); @@ -1542,7 +1542,7 @@ public class ObjectInputStream ifaces[i] = bin.readUTF(); } - Class cl = null; + Class cl = null; ClassNotFoundException resolveEx = null; bin.setBlockDataMode(true); try { @@ -1586,7 +1586,7 @@ public class ObjectInputStream "failed to read class descriptor").initCause(ex); } - Class cl = null; + Class cl = null; ClassNotFoundException resolveEx = null; bin.setBlockDataMode(true); try { @@ -1643,7 +1643,7 @@ public class ObjectInputStream int len = bin.readInt(); Object array = null; - Class cl, ccl = null; + Class cl, ccl = null; if ((cl = desc.forClass()) != null) { ccl = cl.getComponentType(); array = Array.newInstance(ccl, len); @@ -1696,7 +1696,7 @@ public class ObjectInputStream * Reads in and returns enum constant, or null if enum type is * unresolvable. Sets passHandle to enum constant's assigned handle. */ - private Enum readEnum(boolean unshared) throws IOException { + private Enum readEnum(boolean unshared) throws IOException { if (bin.readByte() != TC_ENUM) { throw new InternalError(); } @@ -1713,24 +1713,26 @@ public class ObjectInputStream } String name = readString(false); - Enum en = null; - Class cl = desc.forClass(); + Enum result = null; + Class cl = desc.forClass(); if (cl != null) { try { - en = Enum.valueOf(cl, name); + @SuppressWarnings("unchecked") + Enum en = Enum.valueOf((Class)cl, name); + result = en; } catch (IllegalArgumentException ex) { throw (IOException) new InvalidObjectException( "enum constant " + name + " does not exist in " + cl).initCause(ex); } if (!unshared) { - handles.setObject(enumHandle, en); + handles.setObject(enumHandle, result); } } handles.finish(enumHandle); passHandle = enumHandle; - return en; + return result; } /** @@ -1941,7 +1943,7 @@ public class ObjectInputStream throws IOException { // REMIND: is isInstance check necessary? - Class cl = desc.forClass(); + Class cl = desc.forClass(); if (cl != null && obj != null && !cl.isInstance(obj)) { throw new ClassCastException(); } @@ -2140,7 +2142,7 @@ public class ObjectInputStream * class descriptor, returns -1. Throws IllegalArgumentException if * neither incoming nor local class descriptor contains a match. */ - private int getFieldOffset(String name, Class type) { + private int getFieldOffset(String name, Class type) { ObjectStreamField field = desc.getField(name, type); if (field != null) { return field.getOffset(); @@ -2838,6 +2840,7 @@ public class ObjectInputStream return readUTFBody(readUnsignedShort()); } + @SuppressWarnings("deprecation") public String readLine() throws IOException { return din.readLine(); // deprecated, not worth optimizing } diff --git a/jdk/src/share/classes/java/io/ObjectOutputStream.java b/jdk/src/share/classes/java/io/ObjectOutputStream.java index 76a08f38d4d..52e590fd78e 100644 --- a/jdk/src/share/classes/java/io/ObjectOutputStream.java +++ b/jdk/src/share/classes/java/io/ObjectOutputStream.java @@ -1034,7 +1034,7 @@ public class ObjectOutputStream * "enableSubclassImplementation" SerializablePermission is checked. */ private void verifySubclass() { - Class cl = getClass(); + Class cl = getClass(); if (cl == ObjectOutputStream.class) { return; } @@ -1060,22 +1060,22 @@ public class ObjectOutputStream * override security-sensitive non-final methods. Returns true if subclass * is "safe", false otherwise. */ - private static boolean auditSubclass(final Class subcl) { + private static boolean auditSubclass(final Class subcl) { Boolean result = AccessController.doPrivileged( new PrivilegedAction() { public Boolean run() { - for (Class cl = subcl; + for (Class cl = subcl; cl != ObjectOutputStream.class; cl = cl.getSuperclass()) { try { cl.getDeclaredMethod( - "writeUnshared", new Class[] { Object.class }); + "writeUnshared", new Class[] { Object.class }); return Boolean.FALSE; } catch (NoSuchMethodException ex) { } try { - cl.getDeclaredMethod("putFields", (Class[]) null); + cl.getDeclaredMethod("putFields", (Class[]) null); return Boolean.FALSE; } catch (NoSuchMethodException ex) { } @@ -1122,11 +1122,11 @@ public class ObjectOutputStream // check for replacement object Object orig = obj; - Class cl = obj.getClass(); + Class cl = obj.getClass(); ObjectStreamClass desc; for (;;) { // REMIND: skip this check for strings/arrays? - Class repCl; + Class repCl; desc = ObjectStreamClass.lookup(cl, true); if (!desc.hasWriteReplaceMethod() || (obj = desc.invokeWriteReplace(obj)) == null || @@ -1169,7 +1169,7 @@ public class ObjectOutputStream } else if (cl.isArray()) { writeArray(obj, desc, unshared); } else if (obj instanceof Enum) { - writeEnum((Enum) obj, desc, unshared); + writeEnum((Enum) obj, desc, unshared); } else if (obj instanceof Serializable) { writeOrdinaryObject(obj, desc, unshared); } else { @@ -1204,7 +1204,7 @@ public class ObjectOutputStream /** * Writes representation of given class to stream. */ - private void writeClass(Class cl, boolean unshared) throws IOException { + private void writeClass(Class cl, boolean unshared) throws IOException { bout.writeByte(TC_CLASS); writeClassDesc(ObjectStreamClass.lookup(cl, true), false); handles.assign(unshared ? null : cl); @@ -1237,7 +1237,7 @@ public class ObjectOutputStream bout.writeByte(TC_PROXYCLASSDESC); handles.assign(unshared ? null : desc); - Class cl = desc.forClass(); + Class cl = desc.forClass(); Class[] ifaces = cl.getInterfaces(); bout.writeInt(ifaces.length); for (int i = 0; i < ifaces.length; i++) { @@ -1269,7 +1269,7 @@ public class ObjectOutputStream writeClassDescriptor(desc); } - Class cl = desc.forClass(); + Class cl = desc.forClass(); bout.setBlockDataMode(true); annotateClass(cl); bout.setBlockDataMode(false); @@ -1306,7 +1306,7 @@ public class ObjectOutputStream writeClassDesc(desc, false); handles.assign(unshared ? null : array); - Class ccl = desc.forClass().getComponentType(); + Class ccl = desc.forClass().getComponentType(); if (ccl.isPrimitive()) { if (ccl == Integer.TYPE) { int[] ia = (int[]) array; @@ -1377,7 +1377,7 @@ public class ObjectOutputStream /** * Writes given enum constant to stream. */ - private void writeEnum(Enum en, + private void writeEnum(Enum en, ObjectStreamClass desc, boolean unshared) throws IOException @@ -1700,7 +1700,7 @@ public class ObjectOutputStream * types, and any other non-null type matches assignable types only. * Throws IllegalArgumentException if no matching field found. */ - private int getFieldOffset(String name, Class type) { + private int getFieldOffset(String name, Class type) { ObjectStreamField field = desc.getField(name, type); if (field == null) { throw new IllegalArgumentException("no such field " + name + diff --git a/jdk/src/share/classes/java/io/ObjectStreamClass.java b/jdk/src/share/classes/java/io/ObjectStreamClass.java index f1c0d5b782f..1a03b6b6a10 100644 --- a/jdk/src/share/classes/java/io/ObjectStreamClass.java +++ b/jdk/src/share/classes/java/io/ObjectStreamClass.java @@ -144,7 +144,7 @@ public class ObjectStreamClass implements Serializable { private volatile ClassDataSlot[] dataLayout; /** serialization-appropriate constructor, or null if none */ - private Constructor cons; + private Constructor cons; /** class-defined writeObject method, or null if none */ private Method writeObjectMethod; /** class-defined readObject method, or null if none */ @@ -1308,9 +1308,9 @@ public class ObjectStreamClass implements Serializable { * Access checks are disabled on the returned constructor (if any), since * the defining class may still be non-public. */ - private static Constructor getExternalizableConstructor(Class cl) { + private static Constructor getExternalizableConstructor(Class cl) { try { - Constructor cons = cl.getDeclaredConstructor((Class[]) null); + Constructor cons = cl.getDeclaredConstructor((Class[]) null); cons.setAccessible(true); return ((cons.getModifiers() & Modifier.PUBLIC) != 0) ? cons : null; @@ -1324,7 +1324,7 @@ public class ObjectStreamClass implements Serializable { * superclass, or null if none found. Access checks are disabled on the * returned constructor (if any). */ - private static Constructor getSerializableConstructor(Class cl) { + private static Constructor getSerializableConstructor(Class cl) { Class initCl = cl; while (Serializable.class.isAssignableFrom(initCl)) { if ((initCl = initCl.getSuperclass()) == null) { @@ -1332,7 +1332,7 @@ public class ObjectStreamClass implements Serializable { } } try { - Constructor cons = initCl.getDeclaredConstructor((Class[]) null); + Constructor cons = initCl.getDeclaredConstructor((Class[]) null); int mods = cons.getModifiers(); if ((mods & Modifier.PRIVATE) != 0 || ((mods & (Modifier.PUBLIC | Modifier.PROTECTED)) == 0 && @@ -1802,7 +1802,7 @@ public class ObjectStreamClass implements Serializable { signature = getClassSignature(field.getType()); } - public MemberSignature(Constructor cons) { + public MemberSignature(Constructor cons) { member = cons; name = cons.getName(); signature = getMethodSignature( diff --git a/jdk/src/share/classes/java/io/RandomAccessFile.java b/jdk/src/share/classes/java/io/RandomAccessFile.java index 65bfbf46c79..893fc94ab63 100644 --- a/jdk/src/share/classes/java/io/RandomAccessFile.java +++ b/jdk/src/share/classes/java/io/RandomAccessFile.java @@ -1049,6 +1049,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable { * @param s a string of bytes to be written. * @exception IOException if an I/O error occurs. */ + @SuppressWarnings("deprecation") public final void writeBytes(String s) throws IOException { int len = s.length(); byte[] b = new byte[len]; diff --git a/jdk/src/share/classes/java/io/SequenceInputStream.java b/jdk/src/share/classes/java/io/SequenceInputStream.java index f64ec38c622..efc3af71a65 100644 --- a/jdk/src/share/classes/java/io/SequenceInputStream.java +++ b/jdk/src/share/classes/java/io/SequenceInputStream.java @@ -44,7 +44,7 @@ import java.util.Vector; */ public class SequenceInputStream extends InputStream { - Enumeration e; + Enumeration e; InputStream in; /** @@ -85,7 +85,7 @@ class SequenceInputStream extends InputStream { * @param s2 the second input stream to read. */ public SequenceInputStream(InputStream s1, InputStream s2) { - Vector v = new Vector(2); + Vector v = new Vector<>(2); v.addElement(s1); v.addElement(s2); diff --git a/jdk/src/share/classes/java/lang/ClassLoader.java b/jdk/src/share/classes/java/lang/ClassLoader.java index f8588f527a2..d599396e8ad 100644 --- a/jdk/src/share/classes/java/lang/ClassLoader.java +++ b/jdk/src/share/classes/java/lang/ClassLoader.java @@ -258,7 +258,7 @@ public abstract class ClassLoader { private final Set domains; // Invoked by the VM to record every loaded class with this loader. - void addClass(Class c) { + void addClass(Class c) { classes.addElement(c); } @@ -402,7 +402,7 @@ public abstract class ClassLoader { { synchronized (getClassLoadingLock(name)) { // First, check if the class has already been loaded - Class c = findLoadedClass(name); + Class c = findLoadedClass(name); if (c == null) { long t0 = System.nanoTime(); try { @@ -468,7 +468,7 @@ public abstract class ClassLoader { } // This method is invoked by the virtual machine to load a class. - private Class loadClassInternal(String name) + private Class loadClassInternal(String name) throws ClassNotFoundException { // For backward compatibility, explicitly lock on 'this' when @@ -483,7 +483,7 @@ public abstract class ClassLoader { } // Invoked by the VM after loading class with this loader. - private void checkPackageAccess(Class cls, ProtectionDomain pd) { + private void checkPackageAccess(Class cls, ProtectionDomain pd) { final SecurityManager sm = System.getSecurityManager(); if (sm != null) { final String name = cls.getName(); @@ -669,9 +669,9 @@ public abstract class ClassLoader { return source; } - private Class defineTransformedClass(String name, byte[] b, int off, int len, - ProtectionDomain pd, - ClassFormatError cfe, String source) + private Class defineTransformedClass(String name, byte[] b, int off, int len, + ProtectionDomain pd, + ClassFormatError cfe, String source) throws ClassFormatError { // Class format error - try to transform the bytecode and @@ -679,7 +679,7 @@ public abstract class ClassLoader { // ClassFileTransformer[] transformers = ClassFileTransformer.getTransformers(); - Class c = null; + Class c = null; if (transformers != null) { for (ClassFileTransformer transformer : transformers) { @@ -704,7 +704,7 @@ public abstract class ClassLoader { return c; } - private void postDefineClass(Class c, ProtectionDomain pd) + private void postDefineClass(Class c, ProtectionDomain pd) { if (pd.getCodeSource() != null) { Certificate certs[] = pd.getCodeSource().getCertificates(); @@ -784,7 +784,7 @@ public abstract class ClassLoader { { protectionDomain = preDefineClass(name, protectionDomain); - Class c = null; + Class c = null; String source = defineClassSourceLocation(protectionDomain); try { @@ -882,7 +882,7 @@ public abstract class ClassLoader { protectionDomain = preDefineClass(name, protectionDomain); - Class c = null; + Class c = null; String source = defineClassSourceLocation(protectionDomain); try { @@ -899,15 +899,15 @@ public abstract class ClassLoader { return c; } - private native Class defineClass0(String name, byte[] b, int off, int len, - ProtectionDomain pd); + private native Class defineClass0(String name, byte[] b, int off, int len, + ProtectionDomain pd); - private native Class defineClass1(String name, byte[] b, int off, int len, - ProtectionDomain pd, String source); + private native Class defineClass1(String name, byte[] b, int off, int len, + ProtectionDomain pd, String source); - private native Class defineClass2(String name, java.nio.ByteBuffer b, - int off, int len, ProtectionDomain pd, - String source); + private native Class defineClass2(String name, java.nio.ByteBuffer b, + int off, int len, ProtectionDomain pd, + String source); // true if the name is null or has the potential to be a valid binary name private boolean checkName(String name) { @@ -1010,7 +1010,7 @@ public abstract class ClassLoader { resolveClass0(c); } - private native void resolveClass0(Class c); + private native void resolveClass0(Class c); /** * Finds a class with the specified binary name, @@ -1041,7 +1041,7 @@ public abstract class ClassLoader { if (system == null) { if (!checkName(name)) throw new ClassNotFoundException(name); - Class cls = findBootstrapClass(name); + Class cls = findBootstrapClass(name); if (cls == null) { throw new ClassNotFoundException(name); } @@ -1054,7 +1054,7 @@ public abstract class ClassLoader { * Returns a class loaded by the bootstrap class loader; * or return null if not found. */ - private Class findBootstrapClassOrNull(String name) + private Class findBootstrapClassOrNull(String name) { if (!checkName(name)) return null; @@ -1062,7 +1062,7 @@ public abstract class ClassLoader { } // return null if not found - private native Class findBootstrapClass(String name); + private native Class findBootstrapClass(String name); /** * Returns the class with the given binary name if this @@ -1084,7 +1084,7 @@ public abstract class ClassLoader { return findLoadedClass0(name); } - private native final Class findLoadedClass0(String name); + private native final Class findLoadedClass0(String name); /** * Sets the signers of a class. This should be invoked after defining a @@ -1528,7 +1528,7 @@ public abstract class ClassLoader { // invocation and the desired invoker. static ClassLoader getCallerClassLoader() { // NOTE use of more generic Reflection.getCallerClass() - Class caller = Reflection.getCallerClass(3); + Class caller = Reflection.getCallerClass(3); // This can be null if the VM is requesting it if (caller == null) { return null; @@ -1722,7 +1722,7 @@ public abstract class ClassLoader { private int jniVersion; // the class from which the library is loaded, also indicates // the loader this native library belongs. - private Class fromClass; + private Class fromClass; // the canonicalized name of the native library. String name; @@ -1730,7 +1730,7 @@ public abstract class ClassLoader { native long find(String name); native void unload(); - public NativeLibrary(Class fromClass, String name) { + public NativeLibrary(Class fromClass, String name) { this.name = name; this.fromClass = fromClass; } @@ -1758,7 +1758,7 @@ public abstract class ClassLoader { } // Invoked in the VM to determine the context class in // JNI_Load/JNI_Unload - static Class getFromClass() { + static Class getFromClass() { return ClassLoader.nativeLibraryContext.peek().fromClass; } } @@ -1813,7 +1813,7 @@ public abstract class ClassLoader { } // Invoked in the java.lang.Runtime class to implement load and loadLibrary. - static void loadLibrary(Class fromClass, String name, + static void loadLibrary(Class fromClass, String name, boolean isAbsolute) { ClassLoader loader = (fromClass == null) ? null : fromClass.getClassLoader(); @@ -1860,7 +1860,7 @@ public abstract class ClassLoader { throw new UnsatisfiedLinkError("no " + name + " in java.library.path"); } - private static boolean loadLibrary0(Class fromClass, final File file) { + private static boolean loadLibrary0(Class fromClass, final File file) { boolean exists = AccessController.doPrivileged( new PrivilegedAction() { public Object run() { @@ -2194,8 +2194,8 @@ class SystemClassLoaderAction return parent; } - Constructor ctor = Class.forName(cls, true, parent) - .getDeclaredConstructor(new Class[] { ClassLoader.class }); + Constructor ctor = Class.forName(cls, true, parent) + .getDeclaredConstructor(new Class[] { ClassLoader.class }); ClassLoader sys = (ClassLoader) ctor.newInstance( new Object[] { parent }); Thread.currentThread().setContextClassLoader(sys); diff --git a/jdk/src/share/classes/java/lang/Enum.java b/jdk/src/share/classes/java/lang/Enum.java index 798ae3fa6f6..80fcd9c5526 100644 --- a/jdk/src/share/classes/java/lang/Enum.java +++ b/jdk/src/share/classes/java/lang/Enum.java @@ -173,8 +173,8 @@ public abstract class Enum> * method is the order in which the constants are declared. */ public final int compareTo(E o) { - Enum other = (Enum)o; - Enum self = this; + Enum other = (Enum)o; + Enum self = this; if (self.getClass() != other.getClass() && // optimization self.getDeclaringClass() != other.getDeclaringClass()) throw new ClassCastException(); @@ -193,10 +193,11 @@ public abstract class Enum> * @return the Class object corresponding to this enum constant's * enum type */ + @SuppressWarnings("unchecked") public final Class getDeclaringClass() { - Class clazz = getClass(); - Class zuper = clazz.getSuperclass(); - return (zuper == Enum.class) ? clazz : zuper; + Class clazz = getClass(); + Class zuper = clazz.getSuperclass(); + return (zuper == Enum.class) ? (Class)clazz : (Class)zuper; } /** diff --git a/jdk/src/share/classes/java/lang/Package.java b/jdk/src/share/classes/java/lang/Package.java index 3ea8013238d..f7af97a6590 100644 --- a/jdk/src/share/classes/java/lang/Package.java +++ b/jdk/src/share/classes/java/lang/Package.java @@ -608,5 +608,5 @@ public class Package implements java.lang.reflect.AnnotatedElement { private final String implVendor; private final URL sealBase; private transient final ClassLoader loader; - private transient Class packageInfo; + private transient Class packageInfo; } diff --git a/jdk/src/share/classes/java/lang/Runtime.java b/jdk/src/share/classes/java/lang/Runtime.java index 3fc29d08376..7f2ef469a20 100644 --- a/jdk/src/share/classes/java/lang/Runtime.java +++ b/jdk/src/share/classes/java/lang/Runtime.java @@ -780,7 +780,7 @@ public class Runtime { load0(System.getCallerClass(), filename); } - synchronized void load0(Class fromClass, String filename) { + synchronized void load0(Class fromClass, String filename) { SecurityManager security = System.getSecurityManager(); if (security != null) { security.checkLink(filename); @@ -833,7 +833,7 @@ public class Runtime { loadLibrary0(System.getCallerClass(), libname); } - synchronized void loadLibrary0(Class fromClass, String libname) { + synchronized void loadLibrary0(Class fromClass, String libname) { SecurityManager security = System.getSecurityManager(); if (security != null) { security.checkLink(libname); diff --git a/jdk/src/share/classes/java/lang/SecurityManager.java b/jdk/src/share/classes/java/lang/SecurityManager.java index 27f7d90ca1a..f84fe3e16a5 100644 --- a/jdk/src/share/classes/java/lang/SecurityManager.java +++ b/jdk/src/share/classes/java/lang/SecurityManager.java @@ -400,7 +400,7 @@ class SecurityManager { */ @Deprecated protected Class currentLoadedClass() { - Class c = currentLoadedClass0(); + Class c = currentLoadedClass0(); if ((c != null) && hasAllPermission()) c = null; return c; @@ -1715,7 +1715,7 @@ class SecurityManager { checkPermission(new SecurityPermission(target)); } - private native Class currentLoadedClass0(); + private native Class currentLoadedClass0(); /** * Returns the thread group into which to instantiate any new diff --git a/jdk/src/share/classes/java/lang/String.java b/jdk/src/share/classes/java/lang/String.java index 1a40916a20a..50b3f7b6b48 100644 --- a/jdk/src/share/classes/java/lang/String.java +++ b/jdk/src/share/classes/java/lang/String.java @@ -1245,6 +1245,9 @@ public final class String } return n1 - n2; } + + /** Replaces the de-serialized object. */ + private Object readResolve() { return CASE_INSENSITIVE_ORDER; } } /** diff --git a/jdk/src/share/classes/java/lang/System.java b/jdk/src/share/classes/java/lang/System.java index 5c33dd08fca..6e4f7436cf8 100644 --- a/jdk/src/share/classes/java/lang/System.java +++ b/jdk/src/share/classes/java/lang/System.java @@ -1171,13 +1171,13 @@ public final class System { private static void setJavaLangAccess() { // Allow privileged classes outside of java.lang sun.misc.SharedSecrets.setJavaLangAccess(new sun.misc.JavaLangAccess(){ - public sun.reflect.ConstantPool getConstantPool(Class klass) { + public sun.reflect.ConstantPool getConstantPool(Class klass) { return klass.getConstantPool(); } - public void setAnnotationType(Class klass, AnnotationType type) { + public void setAnnotationType(Class klass, AnnotationType type) { klass.setAnnotationType(type); } - public AnnotationType getAnnotationType(Class klass) { + public AnnotationType getAnnotationType(Class klass) { return klass.getAnnotationType(); } public > diff --git a/jdk/src/share/classes/java/lang/Thread.java b/jdk/src/share/classes/java/lang/Thread.java index 45393eb2373..b3d2e39d58f 100644 --- a/jdk/src/share/classes/java/lang/Thread.java +++ b/jdk/src/share/classes/java/lang/Thread.java @@ -1650,7 +1650,7 @@ class Thread implements Runnable { * security-sensitive non-final methods, or else the * "enableContextClassLoaderOverride" RuntimePermission is checked. */ - private static boolean isCCLOverridden(Class cl) { + private static boolean isCCLOverridden(Class cl) { if (cl == Thread.class) return false; @@ -1670,21 +1670,21 @@ class Thread implements Runnable { * override security-sensitive non-final methods. Returns true if the * subclass overrides any of the methods, false otherwise. */ - private static boolean auditSubclass(final Class subcl) { + private static boolean auditSubclass(final Class subcl) { Boolean result = AccessController.doPrivileged( new PrivilegedAction() { public Boolean run() { - for (Class cl = subcl; + for (Class cl = subcl; cl != Thread.class; cl = cl.getSuperclass()) { try { - cl.getDeclaredMethod("getContextClassLoader", new Class[0]); + cl.getDeclaredMethod("getContextClassLoader", new Class[0]); return Boolean.TRUE; } catch (NoSuchMethodException ex) { } try { - Class[] params = {ClassLoader.class}; + Class[] params = {ClassLoader.class}; cl.getDeclaredMethod("setContextClassLoader", params); return Boolean.TRUE; } catch (NoSuchMethodException ex) { diff --git a/jdk/src/share/classes/java/lang/ThreadGroup.java b/jdk/src/share/classes/java/lang/ThreadGroup.java index a0ec567f494..8b93210aafa 100644 --- a/jdk/src/share/classes/java/lang/ThreadGroup.java +++ b/jdk/src/share/classes/java/lang/ThreadGroup.java @@ -670,6 +670,7 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler { * {@link Thread#suspend} for details. */ @Deprecated + @SuppressWarnings("deprecation") public final void suspend() { if (stopOrSuspend(true)) Thread.currentThread().suspend(); @@ -682,6 +683,7 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler { * if (and only if) the current thread is found to be in this thread * group or one of its subgroups. */ + @SuppressWarnings("deprecation") private boolean stopOrSuspend(boolean suspend) { boolean suicide = false; Thread us = Thread.currentThread(); @@ -731,6 +733,7 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler { * deadlock-prone. See {@link Thread#suspend} for details. */ @Deprecated + @SuppressWarnings("deprecation") public final void resume() { int ngroupsSnapshot; ThreadGroup[] groupsSnapshot; diff --git a/jdk/src/share/classes/java/lang/instrument/ClassDefinition.java b/jdk/src/share/classes/java/lang/instrument/ClassDefinition.java index db925e6b513..aa026092d84 100644 --- a/jdk/src/share/classes/java/lang/instrument/ClassDefinition.java +++ b/jdk/src/share/classes/java/lang/instrument/ClassDefinition.java @@ -40,12 +40,12 @@ public final class ClassDefinition { /** * The class to redefine */ - private final Class mClass; + private final Class mClass; /** * The replacement class file bytes */ - private final byte[] mClassFile; + private final byte[] mClassFile; /** * Creates a new ClassDefinition binding using the supplied diff --git a/jdk/src/share/classes/java/lang/management/ManagementFactory.java b/jdk/src/share/classes/java/lang/management/ManagementFactory.java index 695bc37e394..98f2e4005cc 100644 --- a/jdk/src/share/classes/java/lang/management/ManagementFactory.java +++ b/jdk/src/share/classes/java/lang/management/ManagementFactory.java @@ -576,7 +576,7 @@ public class ManagementFactory { Class mxbeanInterface) throws java.io.IOException { - final Class interfaceClass = mxbeanInterface; + final Class interfaceClass = mxbeanInterface; // Only allow MXBean interfaces from rt.jar loaded by the // bootstrap class loader final ClassLoader loader = diff --git a/jdk/src/share/classes/java/lang/management/PlatformComponent.java b/jdk/src/share/classes/java/lang/management/PlatformComponent.java index 82b6e8711e3..d9243354b01 100644 --- a/jdk/src/share/classes/java/lang/management/PlatformComponent.java +++ b/jdk/src/share/classes/java/lang/management/PlatformComponent.java @@ -314,7 +314,7 @@ enum PlatformComponent { private final String domain; private final String type; private final Set keyProperties; - private final MXBeanFetcher fetcher; + private final MXBeanFetcher fetcher; private final PlatformComponent[] subComponents; private final boolean singleton; @@ -322,7 +322,7 @@ enum PlatformComponent { String domain, String type, Set keyProperties, boolean singleton, - MXBeanFetcher fetcher, + MXBeanFetcher fetcher, PlatformComponent... subComponents) { this.mxbeanInterfaceName = intfName; this.domain = domain; @@ -373,7 +373,7 @@ enum PlatformComponent { List getMXBeans(Class mxbeanInterface) { - return fetcher.getMXBeans(); + return (List) fetcher.getMXBeans(); } T getSingletonMXBean(Class mxbeanInterface) @@ -382,7 +382,7 @@ enum PlatformComponent { throw new IllegalArgumentException(mxbeanInterfaceName + " can have zero or more than one instances"); - List list = fetcher.getMXBeans(); + List list = getMXBeans(mxbeanInterface); assert list.size() == 1; return list.isEmpty() ? null : list.get(0); } diff --git a/jdk/src/share/classes/java/net/HttpCookie.java b/jdk/src/share/classes/java/net/HttpCookie.java index a932a5fef10..52d1218835a 100644 --- a/jdk/src/share/classes/java/net/HttpCookie.java +++ b/jdk/src/share/classes/java/net/HttpCookie.java @@ -31,17 +31,15 @@ import java.util.NoSuchElementException; import java.text.SimpleDateFormat; import java.util.TimeZone; import java.util.Date; - -import java.lang.NullPointerException; // for javadoc import java.util.Locale; import java.util.Objects; /** - * An HttpCookie object represents an http cookie, which carries state + * An HttpCookie object represents an HTTP cookie, which carries state * information between server and user agent. Cookie is widely adopted * to create stateful sessions. * - *

    There are 3 http cookie specifications: + *

    There are 3 HTTP cookie specifications: *

    * Netscape draft
    * RFC 2109 - @@ -50,25 +48,19 @@ import java.util.Objects; * http://www.ietf.org/rfc/rfc2965.txt *
    * - *

    HttpCookie class can accept all these 3 forms of syntax. + *

    HttpCookie class can accept all these 3 forms of syntax. * * @author Edward Wang * @since 1.6 */ public final class HttpCookie implements Cloneable { - /* ---------------- Fields -------------- */ + // ---------------- Fields -------------- - // // The value of the cookie itself. - // - - private String name; // NAME= ... "$Name" style is reserved + private final String name; // NAME= ... "$Name" style is reserved private String value; // value of NAME - // // Attributes encoded in the header's cookie fields. - // - private String comment; // Comment=VALUE ... describes cookie's use private String commentURL; // CommentURL="http URL" ... describes cookie's use private boolean toDiscard; // Discard ... discard cookie unconditionally @@ -80,70 +72,61 @@ public final class HttpCookie implements Cloneable { private boolean httpOnly; // HttpOnly ... i.e. not accessible to scripts private int version = 1; // Version=1 ... RFC 2965 style - // // Hold the creation time (in seconds) of the http cookie for later // expiration calculation - // - private long whenCreated = 0; + private final long whenCreated; - - // // Since the positive and zero max-age have their meanings, // this value serves as a hint as 'not specify max-age' - // private final static long MAX_AGE_UNSPECIFIED = -1; - - // // date formats used by Netscape's cookie draft // as well as formats seen on various sites - // private final static String[] COOKIE_DATE_FORMATS = { "EEE',' dd-MMM-yyyy HH:mm:ss 'GMT'", "EEE',' dd MMM yyyy HH:mm:ss 'GMT'", "EEE MMM dd yyyy HH:mm:ss 'GMT'Z" }; - // // constant strings represent set-cookie header token - // private final static String SET_COOKIE = "set-cookie:"; private final static String SET_COOKIE2 = "set-cookie2:"; - - /* ---------------- Ctors -------------- */ + // ---------------- Ctors -------------- /** * Constructs a cookie with a specified name and value. * - *

    The name must conform to RFC 2965. That means it can contain + *

    The name must conform to RFC 2965. That means it can contain * only ASCII alphanumeric characters and cannot contain commas, * semicolons, or white space or begin with a $ character. The cookie's * name cannot be changed after creation. * - *

    The value can be anything the server chooses to send. Its + *

    The value can be anything the server chooses to send. Its * value is probably of interest only to the server. The cookie's * value can be changed after creation with the - * setValue method. + * {@code setValue} method. * - *

    By default, cookies are created according to the RFC 2965 + *

    By default, cookies are created according to the RFC 2965 * cookie specification. The version can be changed with the - * setVersion method. + * {@code setVersion} method. * * - * @param name a String specifying the name of the cookie + * @param name + * a {@code String} specifying the name of the cookie * - * @param value a String specifying the value of the cookie + * @param value + * a {@code String} specifying the value of the cookie + * + * @throws IllegalArgumentException + * if the cookie name contains illegal characters or it is one of + * the tokens reserved for use by the cookie protocol + * @throws NullPointerException + * if {@code name} is {@code null} * - * @throws IllegalArgumentException if the cookie name contains illegal characters - * or it is one of the tokens reserved for use - * by the cookie protocol - * @throws NullPointerException if name is null * @see #setValue * @see #setVersion - * */ - public HttpCookie(String name, String value) { name = name.trim(); if (name.length() == 0 || !isToken(name) || isReserved(name)) { @@ -159,23 +142,25 @@ public final class HttpCookie implements Cloneable { portlist = null; } - /** * Constructs cookies from set-cookie or set-cookie2 header string. * RFC 2965 section 3.2.2 set-cookie2 syntax indicates that one header line * may contain more than one cookie definitions, so this is a static * utility method instead of another constructor. * - * @param header a String specifying the set-cookie header. - * The header should start with "set-cookie", or "set-cookie2" - * token; or it should have no leading token at all. - * @return a List of cookie parsed from header line string - * @throws IllegalArgumentException if header string violates the cookie - * specification's syntax, or the cookie - * name contains llegal characters, or - * the cookie name is one of the tokens - * reserved for use by the cookie protocol - * @throws NullPointerException if the header string is null + * @param header + * a {@code String} specifying the set-cookie header. The header + * should start with "set-cookie", or "set-cookie2" token; or it + * should have no leading token at all. + * + * @return a List of cookie parsed from header line string + * + * @throws IllegalArgumentException + * if header string violates the cookie specification's syntax, or + * the cookie name contains illegal characters, or the cookie name + * is one of the tokens reserved for use by the cookie protocol + * @throws NullPointerException + * if the header string is {@code null} */ public static List parse(String header) { int version = guessCookieVersion(header); @@ -187,10 +172,9 @@ public final class HttpCookie implements Cloneable { header = header.substring(SET_COOKIE.length()); } - - List cookies = new java.util.ArrayList(); - // The Netscape cookie may have a comma in its expires attribute, - // while the comma is the delimiter in rfc 2965/2109 cookie header string. + List cookies = new java.util.ArrayList<>(); + // The Netscape cookie may have a comma in its expires attribute, while + // the comma is the delimiter in rfc 2965/2109 cookie header string. // so the parse logic is slightly different if (version == 0) { // Netscape draft cookie @@ -212,17 +196,13 @@ public final class HttpCookie implements Cloneable { return cookies; } - - - - /* ---------------- Public operations -------------- */ - + // ---------------- Public operations -------------- /** - * Reports whether this http cookie has expired or not. + * Reports whether this HTTP cookie has expired or not. * - * @return true to indicate this http cookie has expired; - * otherwise, false + * @return {@code true} to indicate this HTTP cookie has expired; + * otherwise, {@code false} */ public boolean hasExpired() { if (maxAge == 0) return true; @@ -240,155 +220,123 @@ public final class HttpCookie implements Cloneable { } /** - * * Specifies a comment that describes a cookie's purpose. * The comment is useful if the browser presents the cookie - * to the user. Comments - * are not supported by Netscape Version 0 cookies. + * to the user. Comments are not supported by Netscape Version 0 cookies. * - * @param purpose a String specifying the comment - * to display to the user - * - * @see #getComment + * @param purpose + * a {@code String} specifying the comment to display to the user * + * @see #getComment */ - public void setComment(String purpose) { comment = purpose; } - - - /** * Returns the comment describing the purpose of this cookie, or - * null if the cookie has no comment. + * {@code null} if the cookie has no comment. * - * @return a String containing the comment, - * or null if none - * - * @see #setComment + * @return a {@code String} containing the comment, or {@code null} if none * + * @see #setComment */ - public String getComment() { return comment; } - /** + * Specifies a comment URL that describes a cookie's purpose. + * The comment URL is useful if the browser presents the cookie + * to the user. Comment URL is RFC 2965 only. * - * Specifies a comment url that describes a cookie's purpose. - * The comment url is useful if the browser presents the cookie - * to the user. Comment url is RFC 2965 only. - * - * @param purpose a String specifying the comment url - * to display to the user - * - * @see #getCommentURL + * @param purpose + * a {@code String} specifying the comment URL to display to the user * + * @see #getCommentURL */ - public void setCommentURL(String purpose) { commentURL = purpose; } - - - /** - * Returns the comment url describing the purpose of this cookie, or - * null if the cookie has no comment url. + * Returns the comment URL describing the purpose of this cookie, or + * {@code null} if the cookie has no comment URL. * - * @return a String containing the comment url, - * or null if none - * - * @see #setCommentURL + * @return a {@code String} containing the comment URL, or {@code null} + * if none * + * @see #setCommentURL */ - public String getCommentURL() { return commentURL; } - /** * Specify whether user agent should discard the cookie unconditionally. * This is RFC 2965 only attribute. * - * @param discard true indicates to discard cookie unconditionally + * @param discard + * {@code true} indicates to discard cookie unconditionally * - * @see #getDiscard + * @see #getDiscard */ - public void setDiscard(boolean discard) { toDiscard = discard; } - - - /** - * Return the discard attribute of the cookie + * Returns the discard attribute of the cookie * - * @return a boolean to represent this cookie's discard attribute + * @return a {@code boolean} to represent this cookie's discard attribute * - * @see #setDiscard + * @see #setDiscard */ - public boolean getDiscard() { return toDiscard; } - /** * Specify the portlist of the cookie, which restricts the port(s) * to which a cookie may be sent back in a Cookie header. * - * @param ports a String specify the port list, which is - * comma seperated series of digits - * @see #getPortlist + * @param ports + * a {@code String} specify the port list, which is comma separated + * series of digits + * + * @see #getPortlist */ - public void setPortlist(String ports) { portlist = ports; } - - - /** - * Return the port list attribute of the cookie + * Returns the port list attribute of the cookie * - * @return a String contains the port list - * or null if none - * @see #setPortlist + * @return a {@code String} contains the port list or {@code null} if none + * + * @see #setPortlist */ - public String getPortlist() { return portlist; } /** - * * Specifies the domain within which this cookie should be presented. * - *

    The form of the domain name is specified by RFC 2965. A domain - * name begins with a dot (.foo.com) and means that + *

    The form of the domain name is specified by RFC 2965. A domain + * name begins with a dot ({@code .foo.com}) and means that * the cookie is visible to servers in a specified Domain Name System - * (DNS) zone (for example, www.foo.com, but not - * a.b.foo.com). By default, cookies are only returned + * (DNS) zone (for example, {@code www.foo.com}, but not + * {@code a.b.foo.com}). By default, cookies are only returned * to the server that sent them. * + * @param pattern + * a {@code String} containing the domain name within which this + * cookie is visible; form is according to RFC 2965 * - * @param pattern a String containing the domain name - * within which this cookie is visible; - * form is according to RFC 2965 - * - * @see #getDomain - * + * @see #getDomain */ - public void setDomain(String pattern) { if (pattern != null) domain = pattern.toLowerCase(); @@ -396,261 +344,187 @@ public final class HttpCookie implements Cloneable { domain = pattern; } - - - - /** - * Returns the domain name set for this cookie. The form of - * the domain name is set by RFC 2965. + * Returns the domain name set for this cookie. The form of the domain name + * is set by RFC 2965. * - * @return a String containing the domain name - * - * @see #setDomain + * @return a {@code String} containing the domain name * + * @see #setDomain */ - public String getDomain() { return domain; } - /** * Sets the maximum age of the cookie in seconds. * - *

    A positive value indicates that the cookie will expire + *

    A positive value indicates that the cookie will expire * after that many seconds have passed. Note that the value is * the maximum age when the cookie will expire, not the cookie's * current age. * - *

    A negative value means - * that the cookie is not stored persistently and will be deleted - * when the Web browser exits. A zero value causes the cookie - * to be deleted. + *

    A negative value means that the cookie is not stored persistently + * and will be deleted when the Web browser exits. A zero value causes the + * cookie to be deleted. * - * @param expiry an integer specifying the maximum age of the - * cookie in seconds; if zero, the cookie - * should be discarded immediately; - * otherwise, the cookie's max age is unspecified. - * - * @see #getMaxAge + * @param expiry + * an integer specifying the maximum age of the cookie in seconds; + * if zero, the cookie should be discarded immediately; otherwise, + * the cookie's max age is unspecified. * + * @see #getMaxAge */ public void setMaxAge(long expiry) { maxAge = expiry; } - - - /** - * Returns the maximum age of the cookie, specified in seconds. - * By default, -1 indicating the cookie will persist - * until browser shutdown. + * Returns the maximum age of the cookie, specified in seconds. By default, + * {@code -1} indicating the cookie will persist until browser shutdown. * + * @return an integer specifying the maximum age of the cookie in seconds * - * @return an integer specifying the maximum age of the - * cookie in seconds - * - * - * @see #setMaxAge - * + * @see #setMaxAge */ - public long getMaxAge() { return maxAge; } - - - /** - * Specifies a path for the cookie - * to which the client should return the cookie. + * Specifies a path for the cookie to which the client should return + * the cookie. * - *

    The cookie is visible to all the pages in the directory + *

    The cookie is visible to all the pages in the directory * you specify, and all the pages in that directory's subdirectories. * A cookie's path must include the servlet that set the cookie, * for example, /catalog, which makes the cookie * visible to all directories on the server under /catalog. * - *

    Consult RFC 2965 (available on the Internet) for more + *

    Consult RFC 2965 (available on the Internet) for more * information on setting path names for cookies. * + * @param uri + * a {@code String} specifying a path * - * @param uri a String specifying a path - * - * - * @see #getPath - * + * @see #getPath */ - public void setPath(String uri) { path = uri; } - - - /** - * Returns the path on the server - * to which the browser returns this cookie. The - * cookie is visible to all subpaths on the server. + * Returns the path on the server to which the browser returns this cookie. + * The cookie is visible to all subpaths on the server. * + * @return a {@code String} specifying a path that contains a servlet name, + * for example, /catalog * - * @return a String specifying a path that contains - * a servlet name, for example, /catalog - * - * @see #setPath - * + * @see #setPath */ - public String getPath() { return path; } - - - - /** * Indicates whether the cookie should only be sent using a secure protocol, * such as HTTPS or SSL. * - *

    The default value is false. + *

    The default value is {@code false}. * - * @param flag If true, the cookie can only be sent over - * a secure protocol like https. - * If false, it can be sent over any protocol. - * - * @see #getSecure + * @param flag + * If {@code true}, the cookie can only be sent over a secure + * protocol like HTTPS. If {@code false}, it can be sent over + * any protocol. * + * @see #getSecure */ - public void setSecure(boolean flag) { secure = flag; } - - - /** - * Returns true if sending this cookie should be - * restricted to a secure protocol, or false if the - * it can be sent using any protocol. + * Returns {@code true} if sending this cookie should be restricted to a + * secure protocol, or {@code false} if the it can be sent using any + * protocol. * - * @return false if the cookie can be sent over - * any standard protocol; otherwise, true - * - * @see #setSecure + * @return {@code false} if the cookie can be sent over any standard + * protocol; otherwise, true * + * @see #setSecure */ - public boolean getSecure() { return secure; } - - - - /** * Returns the name of the cookie. The name cannot be changed after * creation. * - * @return a String specifying the cookie's name - * + * @return a {@code String} specifying the cookie's name */ - public String getName() { return name; } - - - - /** - * * Assigns a new value to a cookie after the cookie is created. * If you use a binary value, you may want to use BASE64 encoding. * - *

    With Version 0 cookies, values should not contain white - * space, brackets, parentheses, equals signs, commas, - * double quotes, slashes, question marks, at signs, colons, - * and semicolons. Empty values may not behave the same way - * on all browsers. + *

    With Version 0 cookies, values should not contain white space, + * brackets, parentheses, equals signs, commas, double quotes, slashes, + * question marks, at signs, colons, and semicolons. Empty values may not + * behave the same way on all browsers. * - * @param newValue a String specifying the new value - * - * - * @see #getValue + * @param newValue + * a {@code String} specifying the new value * + * @see #getValue */ - public void setValue(String newValue) { value = newValue; } - - - /** * Returns the value of the cookie. * - * @return a String containing the cookie's - * present value - * - * @see #setValue + * @return a {@code String} containing the cookie's present value * + * @see #setValue */ - public String getValue() { return value; } - - - /** - * Returns the version of the protocol this cookie complies - * with. Version 1 complies with RFC 2965/2109, - * and version 0 complies with the original - * cookie specification drafted by Netscape. Cookies provided - * by a browser use and identify the browser's cookie version. + * Returns the version of the protocol this cookie complies with. Version 1 + * complies with RFC 2965/2109, and version 0 complies with the original + * cookie specification drafted by Netscape. Cookies provided by a browser + * use and identify the browser's cookie version. * + * @return 0 if the cookie complies with the original Netscape + * specification; 1 if the cookie complies with RFC 2965/2109 * - * @return 0 if the cookie complies with the - * original Netscape specification; 1 - * if the cookie complies with RFC 2965/2109 - * - * @see #setVersion - * + * @see #setVersion */ - public int getVersion() { return version; } - - - /** * Sets the version of the cookie protocol this cookie complies * with. Version 0 complies with the original Netscape cookie * specification. Version 1 complies with RFC 2965/2109. * + * @param v + * 0 if the cookie should comply with the original Netscape + * specification; 1 if the cookie should comply with RFC 2965/2109 * - * @param v 0 if the cookie should comply with - * the original Netscape specification; - * 1 if the cookie should comply with RFC 2965/2109 - * - * @throws IllegalArgumentException if v is neither 0 nor 1 - * - * @see #getVersion + * @throws IllegalArgumentException + * if {@code v} is neither 0 nor 1 * + * @see #getVersion */ - public void setVersion(int v) { if (v != 0 && v != 1) { throw new IllegalArgumentException("cookie version should be 0 or 1"); @@ -664,11 +538,11 @@ public final class HttpCookie implements Cloneable { * attribute. This means that the cookie should not be accessible to * scripting engines, like javascript. * - * @return {@code true} if this cookie should be considered http only. - * @see #setHttpOnly(boolean) + * @return {@code true} if this cookie should be considered HTTPOnly + * + * @see #setHttpOnly(boolean) */ - public boolean isHttpOnly() - { + public boolean isHttpOnly() { return httpOnly; } @@ -677,24 +551,25 @@ public final class HttpCookie implements Cloneable { * {@code true} it means the cookie should not be accessible to scripting * engines like javascript. * - * @param httpOnly if {@code true} make the cookie HTTP only, i.e. - * only visible as part of an HTTP request. - * @see #isHttpOnly() + * @param httpOnly + * if {@code true} make the cookie HTTP only, i.e. only visible as + * part of an HTTP request. + * + * @see #isHttpOnly() */ - public void setHttpOnly(boolean httpOnly) - { + public void setHttpOnly(boolean httpOnly) { this.httpOnly = httpOnly; } /** - * The utility method to check whether a host name is in a domain - * or not. + * The utility method to check whether a host name is in a domain or not. * - *

    This concept is described in the cookie specification. + *

    This concept is described in the cookie specification. * To understand the concept, some terminologies need to be defined first: *

    * effective host name = hostname if host name contains dot
    - *                  or = hostname.local if not + *              + *      or = hostname.local if not *
    *

    Host A's name domain-matches host B's if: *

      @@ -731,9 +606,13 @@ public final class HttpCookie implements Cloneable { * host is example.local, and example.local domain-matches .local. *
    * - * @param domain the domain name to check host name with - * @param host the host name in question - * @return true if they domain-matches; false if not + * @param domain + * the domain name to check host name with + * + * @param host + * the host name in question + * + * @return {@code true} if they domain-matches; {@code false} if not */ public static boolean domainMatches(String domain, String host) { if (domain == null || host == null) @@ -745,7 +624,8 @@ public final class HttpCookie implements Cloneable { if (embeddedDotInDomain == 0) embeddedDotInDomain = domain.indexOf('.', 1); if (!isLocalDomain - && (embeddedDotInDomain == -1 || embeddedDotInDomain == domain.length() - 1)) + && (embeddedDotInDomain == -1 || + embeddedDotInDomain == domain.length() - 1)) return false; // if the host name contains no dot and the domain name @@ -779,7 +659,6 @@ public final class HttpCookie implements Cloneable { return false; } - /** * Constructs a cookie header string representation of this cookie, * which is in the format defined by corresponding cookie specification, @@ -796,17 +675,15 @@ public final class HttpCookie implements Cloneable { } } - /** - * Test the equality of two http cookies. + * Test the equality of two HTTP cookies. * - *

    The result is true only if two cookies - * come from same domain (case-insensitive), - * have same name (case-insensitive), - * and have same path (case-sensitive). + *

    The result is {@code true} only if two cookies come from same domain + * (case-insensitive), have same name (case-insensitive), and have same path + * (case-sensitive). * - * @return true if 2 http cookies equal to each other; - * otherwise, false + * @return {@code true} if two HTTP cookies equal to each other; + * otherwise, {@code false} */ @Override public boolean equals(Object obj) { @@ -825,19 +702,17 @@ public final class HttpCookie implements Cloneable { Objects.equals(getPath(), other.getPath()); } - /** - * Return hash code of this http cookie. The result is the sum of - * hash code value of three significant components of this cookie: - * name, domain, and path. - * That is, the hash code is the value of the expression: + * Returns the hash code of this HTTP cookie. The result is the sum of + * hash code value of three significant components of this cookie: name, + * domain, and path. That is, the hash code is the value of the expression: *

    * getName().toLowerCase().hashCode()
    * + getDomain().toLowerCase().hashCode()
    * + getPath().hashCode() *
    * - * @return this http cookie's hash code + * @return this HTTP cookie's hash code */ @Override public int hashCode() { @@ -851,7 +726,7 @@ public final class HttpCookie implements Cloneable { /** * Create and return a copy of this object. * - * @return a clone of this http cookie + * @return a clone of this HTTP cookie */ @Override public Object clone() { @@ -862,8 +737,7 @@ public final class HttpCookie implements Cloneable { } } - - /* ---------------- Private operations -------------- */ + // ---------------- Private operations -------------- // Note -- disabled for now to allow full Netscape compatibility // from RFC 2068, token special case characters @@ -872,15 +746,14 @@ public final class HttpCookie implements Cloneable { private static final String tspecials = ",;"; /* - * Tests a string and returns true if the string counts as a - * token. + * Tests a string and returns true if the string counts as a token. * - * @param value the String to be tested + * @param value + * the {@code String} to be tested * - * @return true if the String is - * a token; false if it is not + * @return {@code true} if the {@code String} is a token; + * {@code false} if it is not */ - private static boolean isToken(String value) { int len = value.length(); @@ -893,11 +766,12 @@ public final class HttpCookie implements Cloneable { return true; } - /* - * @param name the name to be tested - * @return true if the name is reserved by cookie - * specification, false if it is not + * @param name + * the name to be tested + * + * @return {@code true} if the name is reserved by cookie specification, + * {@code false} if it is not */ private static boolean isReserved(String name) { if (name.equalsIgnoreCase("Comment") @@ -919,16 +793,16 @@ public final class HttpCookie implements Cloneable { return false; } - /* * Parse header string to cookie object. * - * @param header header string; should contain only one NAME=VALUE pair + * @param header + * header string; should contain only one NAME=VALUE pair * - * @return an HttpCookie being extracted + * @return an HttpCookie being extracted * - * @throws IllegalArgumentException if header string violates the cookie - * specification + * @throws IllegalArgumentException + * if header string violates the cookie specification */ private static HttpCookie parseInternal(String header) { @@ -974,69 +848,97 @@ public final class HttpCookie implements Cloneable { return cookie; } - /* * assign cookie attribute value to attribute name; * use a map to simulate method dispatch */ static interface CookieAttributeAssignor { - public void assign(HttpCookie cookie, String attrName, String attrValue); + public void assign(HttpCookie cookie, + String attrName, + String attrValue); } - static java.util.Map assignors = null; + static final java.util.Map assignors = + new java.util.HashMap<>(); static { - assignors = new java.util.HashMap(); - assignors.put("comment", new CookieAttributeAssignor(){ - public void assign(HttpCookie cookie, String attrName, String attrValue) { - if (cookie.getComment() == null) cookie.setComment(attrValue); + assignors.put("comment", new CookieAttributeAssignor() { + public void assign(HttpCookie cookie, + String attrName, + String attrValue) { + if (cookie.getComment() == null) + cookie.setComment(attrValue); } }); - assignors.put("commenturl", new CookieAttributeAssignor(){ - public void assign(HttpCookie cookie, String attrName, String attrValue) { - if (cookie.getCommentURL() == null) cookie.setCommentURL(attrValue); + assignors.put("commenturl", new CookieAttributeAssignor() { + public void assign(HttpCookie cookie, + String attrName, + String attrValue) { + if (cookie.getCommentURL() == null) + cookie.setCommentURL(attrValue); } }); - assignors.put("discard", new CookieAttributeAssignor(){ - public void assign(HttpCookie cookie, String attrName, String attrValue) { + assignors.put("discard", new CookieAttributeAssignor() { + public void assign(HttpCookie cookie, + String attrName, + String attrValue) { cookie.setDiscard(true); } }); assignors.put("domain", new CookieAttributeAssignor(){ - public void assign(HttpCookie cookie, String attrName, String attrValue) { - if (cookie.getDomain() == null) cookie.setDomain(attrValue); + public void assign(HttpCookie cookie, + String attrName, + String attrValue) { + if (cookie.getDomain() == null) + cookie.setDomain(attrValue); } }); assignors.put("max-age", new CookieAttributeAssignor(){ - public void assign(HttpCookie cookie, String attrName, String attrValue) { + public void assign(HttpCookie cookie, + String attrName, + String attrValue) { try { long maxage = Long.parseLong(attrValue); - if (cookie.getMaxAge() == MAX_AGE_UNSPECIFIED) cookie.setMaxAge(maxage); + if (cookie.getMaxAge() == MAX_AGE_UNSPECIFIED) + cookie.setMaxAge(maxage); } catch (NumberFormatException ignored) { - throw new IllegalArgumentException("Illegal cookie max-age attribute"); + throw new IllegalArgumentException( + "Illegal cookie max-age attribute"); } } }); assignors.put("path", new CookieAttributeAssignor(){ - public void assign(HttpCookie cookie, String attrName, String attrValue) { - if (cookie.getPath() == null) cookie.setPath(attrValue); + public void assign(HttpCookie cookie, + String attrName, + String attrValue) { + if (cookie.getPath() == null) + cookie.setPath(attrValue); } }); assignors.put("port", new CookieAttributeAssignor(){ - public void assign(HttpCookie cookie, String attrName, String attrValue) { - if (cookie.getPortlist() == null) cookie.setPortlist(attrValue == null ? "" : attrValue); + public void assign(HttpCookie cookie, + String attrName, + String attrValue) { + if (cookie.getPortlist() == null) + cookie.setPortlist(attrValue == null ? "" : attrValue); } }); assignors.put("secure", new CookieAttributeAssignor(){ - public void assign(HttpCookie cookie, String attrName, String attrValue) { + public void assign(HttpCookie cookie, + String attrName, + String attrValue) { cookie.setSecure(true); } }); assignors.put("httponly", new CookieAttributeAssignor(){ - public void assign(HttpCookie cookie, String attrName, String attrValue) { + public void assign(HttpCookie cookie, + String attrName, + String attrValue) { cookie.setHttpOnly(true); } }); assignors.put("version", new CookieAttributeAssignor(){ - public void assign(HttpCookie cookie, String attrName, String attrValue) { + public void assign(HttpCookie cookie, + String attrName, + String attrValue) { try { int version = Integer.parseInt(attrValue); cookie.setVersion(version); @@ -1046,7 +948,9 @@ public final class HttpCookie implements Cloneable { } }); assignors.put("expires", new CookieAttributeAssignor(){ // Netscape only - public void assign(HttpCookie cookie, String attrName, String attrValue) { + public void assign(HttpCookie cookie, + String attrName, + String attrValue) { if (cookie.getMaxAge() == MAX_AGE_UNSPECIFIED) { cookie.setMaxAge(cookie.expiryDate2DeltaSeconds(attrValue)); } @@ -1054,8 +958,8 @@ public final class HttpCookie implements Cloneable { }); } private static void assignAttribute(HttpCookie cookie, - String attrName, - String attrValue) + String attrName, + String attrValue) { // strip off the surrounding "-sign if there's any attrValue = stripOffSurroundingQuote(attrValue); @@ -1073,11 +977,7 @@ public final class HttpCookie implements Cloneable { * as Netscape spec, but without leading "Cookie:" token. */ private String toNetscapeHeaderString() { - StringBuilder sb = new StringBuilder(); - - sb.append(getName() + "=" + getValue()); - - return sb.toString(); + return getName() + "=" + getValue(); } /* @@ -1101,15 +1001,16 @@ public final class HttpCookie implements Cloneable { static final TimeZone GMT = TimeZone.getTimeZone("GMT"); /* - * @param dateString a date string in one of the formats - * defined in Netscape cookie spec + * @param dateString + * a date string in one of the formats defined in Netscape cookie spec * - * @return delta seconds between this cookie's creation - * time and the time specified by dateString + * @return delta seconds between this cookie's creation time and the time + * specified by dateString */ private long expiryDate2DeltaSeconds(String dateString) { for (int i = 0; i < COOKIE_DATE_FORMATS.length; i++) { - SimpleDateFormat df = new SimpleDateFormat(COOKIE_DATE_FORMATS[i], Locale.US); + SimpleDateFormat df = new SimpleDateFormat(COOKIE_DATE_FORMATS[i], + Locale.US); df.setTimeZone(GMT); try { Date date = df.parse(dateString); @@ -1121,8 +1022,6 @@ public final class HttpCookie implements Cloneable { return 0; } - - /* * try to guess the cookie version through set-cookie header string */ @@ -1184,10 +1083,10 @@ public final class HttpCookie implements Cloneable { * 2) but not the comma surrounding by double-quotes, which is the comma * inside port list or embeded URIs. * - * @param header the cookie header string to split - * - * @return list of strings; never null + * @param header + * the cookie header string to split * + * @return list of strings; never null */ private static List splitMultiCookies(String header) { List cookies = new java.util.ArrayList(); @@ -1197,7 +1096,8 @@ public final class HttpCookie implements Cloneable { for (p = 0, q = 0; p < header.length(); p++) { char c = header.charAt(p); if (c == '"') quoteCount++; - if (c == ',' && (quoteCount % 2 == 0)) { // it is comma and not surrounding by double-quotes + if (c == ',' && (quoteCount % 2 == 0)) { + // it is comma and not surrounding by double-quotes cookies.add(header.substring(q, p)); q = p + 1; } diff --git a/jdk/src/share/classes/java/net/InetAddress.java b/jdk/src/share/classes/java/net/InetAddress.java index 8758cab7af3..d927d160a68 100644 --- a/jdk/src/share/classes/java/net/InetAddress.java +++ b/jdk/src/share/classes/java/net/InetAddress.java @@ -32,6 +32,7 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.ArrayList; +import java.util.ServiceLoader; import java.security.AccessController; import java.io.ObjectStreamException; import java.io.IOException; @@ -39,7 +40,6 @@ import java.io.ObjectInputStream; import sun.security.action.*; import sun.net.InetAddressCachePolicy; import sun.net.util.IPAddressUtil; -import sun.misc.Service; import sun.net.spi.nameservice.*; /** @@ -876,10 +876,9 @@ class InetAddress implements java.io.Serializable { nameService = java.security.AccessController.doPrivileged( new java.security.PrivilegedExceptionAction() { public NameService run() { - // sun.misc.Service.providers returns a raw Iterator - @SuppressWarnings("unchecked") Iterator itr = - Service.providers(NameServiceDescriptor.class); + ServiceLoader.load(NameServiceDescriptor.class) + .iterator(); while (itr.hasNext()) { NameServiceDescriptor nsd = itr.next(); if (providerName. diff --git a/jdk/src/share/classes/java/rmi/MarshalledObject.java b/jdk/src/share/classes/java/rmi/MarshalledObject.java index cd881294995..4ac4a8bc303 100644 --- a/jdk/src/share/classes/java/rmi/MarshalledObject.java +++ b/jdk/src/share/classes/java/rmi/MarshalledObject.java @@ -156,6 +156,7 @@ public final class MarshalledObject implements Serializable { (locBytes == null ? null : new ByteArrayInputStream(locBytes)); MarshalledObjectInputStream in = new MarshalledObjectInputStream(bin, lin); + @SuppressWarnings("unchecked") T obj = (T) in.readObject(); in.close(); return obj; @@ -190,7 +191,7 @@ public final class MarshalledObject implements Serializable { return true; if (obj != null && obj instanceof MarshalledObject) { - MarshalledObject other = (MarshalledObject) obj; + MarshalledObject other = (MarshalledObject) obj; // if either is a ref to null, both must be if (objBytes == null || other.objBytes == null) diff --git a/jdk/src/share/classes/java/rmi/dgc/VMID.java b/jdk/src/share/classes/java/rmi/dgc/VMID.java index c9f1647e1f1..5e9c0a51b4b 100644 --- a/jdk/src/share/classes/java/rmi/dgc/VMID.java +++ b/jdk/src/share/classes/java/rmi/dgc/VMID.java @@ -118,7 +118,7 @@ public final class VMID implements java.io.Serializable { StringBuffer result = new StringBuffer(); if (addr != null) for (int i = 0; i < addr.length; ++ i) { - int x = (int) (addr[i] & 0xFF); + int x = addr[i] & 0xFF; result.append((x < 0x10 ? "0" : "") + Integer.toString(x, 16)); } diff --git a/jdk/src/share/classes/java/rmi/server/LogStream.java b/jdk/src/share/classes/java/rmi/server/LogStream.java index 4120e32de77..cc35f7a4407 100644 --- a/jdk/src/share/classes/java/rmi/server/LogStream.java +++ b/jdk/src/share/classes/java/rmi/server/LogStream.java @@ -39,7 +39,7 @@ import java.util.*; public class LogStream extends PrintStream { /** table mapping known log names to log stream objects */ - private static Hashtable known = new Hashtable(5); + private static Map known = new HashMap<>(5); /** default output stream for new logs */ private static PrintStream defaultStream = System.err; @@ -90,7 +90,7 @@ public class LogStream extends PrintStream { public static LogStream log(String name) { LogStream stream; synchronized (known) { - stream = (LogStream)known.get(name); + stream = known.get(name); if (stream == null) { stream = new LogStream(name, defaultStream); } diff --git a/jdk/src/share/classes/java/rmi/server/RemoteObject.java b/jdk/src/share/classes/java/rmi/server/RemoteObject.java index 31aab0c3fbd..b3b32c5fb41 100644 --- a/jdk/src/share/classes/java/rmi/server/RemoteObject.java +++ b/jdk/src/share/classes/java/rmi/server/RemoteObject.java @@ -436,7 +436,7 @@ public abstract class RemoteObject implements Remote, java.io.Serializable { */ String internalRefClassName = RemoteRef.packagePrefix + "." + refClassName; - Class refClass = Class.forName(internalRefClassName); + Class refClass = Class.forName(internalRefClassName); try { ref = (RemoteRef) refClass.newInstance(); diff --git a/jdk/src/share/classes/java/sql/Date.java b/jdk/src/share/classes/java/sql/Date.java index 1d82ab36a1b..de39d148502 100644 --- a/jdk/src/share/classes/java/sql/Date.java +++ b/jdk/src/share/classes/java/sql/Date.java @@ -150,6 +150,7 @@ public class Date extends java.util.Date { *

    * @return a String in yyyy-mm-dd format */ + @SuppressWarnings("deprecation") public String toString () { int year = super.getYear() + 1900; int month = super.getMonth() + 1; diff --git a/jdk/src/share/classes/java/sql/DriverManager.java b/jdk/src/share/classes/java/sql/DriverManager.java index 4864eb2cc93..0a7cd94d348 100644 --- a/jdk/src/share/classes/java/sql/DriverManager.java +++ b/jdk/src/share/classes/java/sql/DriverManager.java @@ -80,7 +80,7 @@ public class DriverManager { // List of registered JDBC drivers - private final static CopyOnWriteArrayList registeredDrivers = new CopyOnWriteArrayList(); + private final static CopyOnWriteArrayList registeredDrivers = new CopyOnWriteArrayList<>(); private static volatile int loginTimeout = 0; private static volatile java.io.PrintWriter logWriter = null; private static volatile java.io.PrintStream logStream = null; @@ -357,7 +357,7 @@ public class DriverManager { * @return the list of JDBC Drivers loaded by the caller's class loader */ public static java.util.Enumeration getDrivers() { - java.util.Vector result = new java.util.Vector(); + java.util.Vector result = new java.util.Vector<>(); // Gets the classloader of the code that called this method, may // be null. @@ -621,15 +621,18 @@ class DriverInfo { this.driver = driver; } + @Override public boolean equals(Object other) { return (other instanceof DriverInfo) && this.driver == ((DriverInfo) other).driver; } + @Override public int hashCode() { return driver.hashCode(); } + @Override public String toString() { return ("driver[className=" + driver + "]"); } diff --git a/jdk/src/share/classes/java/sql/Time.java b/jdk/src/share/classes/java/sql/Time.java index 22d60d6c409..230e07b69ec 100644 --- a/jdk/src/share/classes/java/sql/Time.java +++ b/jdk/src/share/classes/java/sql/Time.java @@ -115,6 +115,7 @@ public class Time extends java.util.Date { * * @return a String in hh:mm:ss format */ + @SuppressWarnings("deprecation") public String toString () { int hour = super.getHours(); int minute = super.getMinutes(); diff --git a/jdk/src/share/classes/java/sql/Timestamp.java b/jdk/src/share/classes/java/sql/Timestamp.java index 14f648b2678..18b61edd6a7 100644 --- a/jdk/src/share/classes/java/sql/Timestamp.java +++ b/jdk/src/share/classes/java/sql/Timestamp.java @@ -271,6 +271,7 @@ public class Timestamp extends java.util.Date { * @return a String object in * yyyy-mm-dd hh:mm:ss.fffffffff format */ + @SuppressWarnings("deprecation") public String toString () { int year = super.getYear() + 1900; diff --git a/jdk/src/share/classes/java/util/Currency.java b/jdk/src/share/classes/java/util/Currency.java index dc9271ae92d..87b7e01b75b 100644 --- a/jdk/src/share/classes/java/util/Currency.java +++ b/jdk/src/share/classes/java/util/Currency.java @@ -189,7 +189,7 @@ public final class Currency implements Serializable { private static final int VALID_FORMAT_VERSION = 1; static { - AccessController.doPrivileged(new PrivilegedAction() { + AccessController.doPrivileged(new PrivilegedAction() { public Object run() { String homeDir = System.getProperty("java.home"); try { @@ -431,7 +431,9 @@ public final class Currency implements Serializable { } } - return (Set) available.clone(); + @SuppressWarnings("unchecked") + Set result = (Set) available.clone(); + return result; } /** diff --git a/jdk/src/share/classes/java/util/Date.java b/jdk/src/share/classes/java/util/Date.java index e5e5e14454a..77352094173 100644 --- a/jdk/src/share/classes/java/util/Date.java +++ b/jdk/src/share/classes/java/util/Date.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2011, 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 @@ -770,7 +770,7 @@ public class Date */ @Deprecated public int getDay() { - return normalize().getDayOfWeek() - gcal.SUNDAY; + return normalize().getDayOfWeek() - BaseCalendar.SUNDAY; } /** @@ -1027,7 +1027,7 @@ public class Date BaseCalendar.Date date = normalize(); StringBuilder sb = new StringBuilder(28); int index = date.getDayOfWeek(); - if (index == gcal.SUNDAY) { + if (index == BaseCalendar.SUNDAY) { index = 8; } convertToAbbr(sb, wtb[index]).append(' '); // EEE @@ -1039,7 +1039,7 @@ public class Date CalendarUtils.sprintf0d(sb, date.getSeconds(), 2).append(' '); // ss TimeZone zi = date.getZone(); if (zi != null) { - sb.append(zi.getDisplayName(date.isDaylightTime(), zi.SHORT, Locale.US)); // zzz + sb.append(zi.getDisplayName(date.isDaylightTime(), TimeZone.SHORT, Locale.US)); // zzz } else { sb.append("GMT"); } @@ -1237,7 +1237,7 @@ public class Date } GregorianCalendar gc = new GregorianCalendar(tz); gc.clear(); - gc.set(gc.MILLISECOND, ms); + gc.set(GregorianCalendar.MILLISECOND, ms); gc.set(y, m-1, d, hh, mm, ss); fastTime = gc.getTimeInMillis(); BaseCalendar cal = getCalendarSystem(fastTime); diff --git a/jdk/src/share/classes/java/util/Formatter.java b/jdk/src/share/classes/java/util/Formatter.java index 038ec6eabf0..65d34fa7dd9 100644 --- a/jdk/src/share/classes/java/util/Formatter.java +++ b/jdk/src/share/classes/java/util/Formatter.java @@ -2879,7 +2879,7 @@ public final class Formatter implements Closeable, Flushable { } public String toString() { - StringBuilder sb = new StringBuilder('%'); + StringBuilder sb = new StringBuilder("%"); // Flags.UPPERCASE is set internally for legal conversions. Flags dupf = f.dup().remove(Flags.UPPERCASE); sb.append(dupf.toString()); diff --git a/jdk/src/share/classes/java/util/GregorianCalendar.java b/jdk/src/share/classes/java/util/GregorianCalendar.java index 3a6d203256a..586524b3bd8 100644 --- a/jdk/src/share/classes/java/util/GregorianCalendar.java +++ b/jdk/src/share/classes/java/util/GregorianCalendar.java @@ -947,7 +947,7 @@ public class GregorianCalendar extends Calendar { } if (month >= 0) { - set(MONTH, (int) (month % 12)); + set(MONTH, month % 12); } else { // month < 0 month %= 12; @@ -1313,8 +1313,8 @@ public class GregorianCalendar extends Calendar { } // the first day of week of the month. - long monthDay1st = calsys.getDayOfWeekDateOnOrBefore(month1 + 6, - getFirstDayOfWeek()); + long monthDay1st = BaseCalendar.getDayOfWeekDateOnOrBefore(month1 + 6, + getFirstDayOfWeek()); // if the week has enough days to form a week, the // week starts from the previous month. if ((int)(monthDay1st - month1) >= getMinimalDaysInFirstWeek()) { @@ -1407,7 +1407,7 @@ public class GregorianCalendar extends Calendar { return; } long fd = getCurrentFixedDate(); - long dowFirst = calsys.getDayOfWeekDateOnOrBefore(fd, getFirstDayOfWeek()); + long dowFirst = BaseCalendar.getDayOfWeekDateOnOrBefore(fd, getFirstDayOfWeek()); fd += amount; if (fd < dowFirst) { fd += 7; @@ -1926,7 +1926,7 @@ public class GregorianCalendar extends Calendar { * Returns the millisecond offset from the beginning of this * year. This Calendar object must have been normalized. */ - private final long getYearOffsetInMillis() { + private long getYearOffsetInMillis() { long t = (internalGet(DAY_OF_YEAR) - 1) * 24; t += internalGet(HOUR_OF_DAY); t *= 60; @@ -2485,8 +2485,8 @@ public class GregorianCalendar extends Calendar { if (cdate.isLeapYear()) { nextJan1++; } - long nextJan1st = calsys.getDayOfWeekDateOnOrBefore(nextJan1 + 6, - getFirstDayOfWeek()); + long nextJan1st = BaseCalendar.getDayOfWeekDateOnOrBefore(nextJan1 + 6, + getFirstDayOfWeek()); int ndays = (int)(nextJan1st - nextJan1); if (ndays >= getMinimalDaysInFirstWeek() && fixedDate >= (nextJan1st - 7)) { // The first days forms a week in which the date is included. @@ -2518,8 +2518,8 @@ public class GregorianCalendar extends Calendar { calForJan1 = gcal; } - long nextJan1st = calForJan1.getDayOfWeekDateOnOrBefore(nextJan1 + 6, - getFirstDayOfWeek()); + long nextJan1st = BaseCalendar.getDayOfWeekDateOnOrBefore(nextJan1 + 6, + getFirstDayOfWeek()); int ndays = (int)(nextJan1st - nextJan1); if (ndays >= getMinimalDaysInFirstWeek() && fixedDate >= (nextJan1st - 7)) { // The first days forms a week in which the date is included. @@ -2543,11 +2543,11 @@ public class GregorianCalendar extends Calendar { * @param fixedDate the fixed date of the last day of the period * @return the number of weeks of the given period */ - private final int getWeekNumber(long fixedDay1, long fixedDate) { + private int getWeekNumber(long fixedDay1, long fixedDate) { // We can always use `gcal' since Julian and Gregorian are the // same thing for this calculation. - long fixedDay1st = gcal.getDayOfWeekDateOnOrBefore(fixedDay1 + 6, - getFirstDayOfWeek()); + long fixedDay1st = Gregorian.getDayOfWeekDateOnOrBefore(fixedDay1 + 6, + getFirstDayOfWeek()); int ndays = (int)(fixedDay1st - fixedDay1); assert ndays <= 7; if (ndays >= getMinimalDaysInFirstWeek()) { @@ -2818,16 +2818,16 @@ public class GregorianCalendar extends Calendar { } } else { if (isFieldSet(fieldMask, WEEK_OF_MONTH)) { - long firstDayOfWeek = cal.getDayOfWeekDateOnOrBefore(fixedDate + 6, - getFirstDayOfWeek()); + long firstDayOfWeek = BaseCalendar.getDayOfWeekDateOnOrBefore(fixedDate + 6, + getFirstDayOfWeek()); // If we have enough days in the first week, then // move to the previous week. if ((firstDayOfWeek - fixedDate) >= getMinimalDaysInFirstWeek()) { firstDayOfWeek -= 7; } if (isFieldSet(fieldMask, DAY_OF_WEEK)) { - firstDayOfWeek = cal.getDayOfWeekDateOnOrBefore(firstDayOfWeek + 6, - internalGet(DAY_OF_WEEK)); + firstDayOfWeek = BaseCalendar.getDayOfWeekDateOnOrBefore(firstDayOfWeek + 6, + internalGet(DAY_OF_WEEK)); } // In lenient mode, we treat days of the previous // months as a part of the specified @@ -2850,15 +2850,15 @@ public class GregorianCalendar extends Calendar { dowim = 1; } if (dowim >= 0) { - fixedDate = cal.getDayOfWeekDateOnOrBefore(fixedDate + (7 * dowim) - 1, - dayOfWeek); + fixedDate = BaseCalendar.getDayOfWeekDateOnOrBefore(fixedDate + (7 * dowim) - 1, + dayOfWeek); } else { // Go to the first day of the next week of // the specified week boundary. int lastDate = monthLength(month, year) + (7 * (dowim + 1)); // Then, get the day of week date on or before the last date. - fixedDate = cal.getDayOfWeekDateOnOrBefore(fixedDate + lastDate - 1, - dayOfWeek); + fixedDate = BaseCalendar.getDayOfWeekDateOnOrBefore(fixedDate + lastDate - 1, + dayOfWeek); } } } @@ -2877,8 +2877,8 @@ public class GregorianCalendar extends Calendar { fixedDate += internalGet(DAY_OF_YEAR); fixedDate--; } else { - long firstDayOfWeek = cal.getDayOfWeekDateOnOrBefore(fixedDate + 6, - getFirstDayOfWeek()); + long firstDayOfWeek = BaseCalendar.getDayOfWeekDateOnOrBefore(fixedDate + 6, + getFirstDayOfWeek()); // If we have enough days in the first week, then move // to the previous week. if ((firstDayOfWeek - fixedDate) >= getMinimalDaysInFirstWeek()) { @@ -2887,8 +2887,8 @@ public class GregorianCalendar extends Calendar { if (isFieldSet(fieldMask, DAY_OF_WEEK)) { int dayOfWeek = internalGet(DAY_OF_WEEK); if (dayOfWeek != getFirstDayOfWeek()) { - firstDayOfWeek = cal.getDayOfWeekDateOnOrBefore(firstDayOfWeek + 6, - dayOfWeek); + firstDayOfWeek = BaseCalendar.getDayOfWeekDateOnOrBefore(firstDayOfWeek + 6, + dayOfWeek); } } fixedDate = firstDayOfWeek + 7 * ((long)internalGet(WEEK_OF_YEAR) - 1); @@ -2903,7 +2903,7 @@ public class GregorianCalendar extends Calendar { * in sync). Otherwise, a cloned object is returned after calling * complete() in lenient mode. */ - private final GregorianCalendar getNormalizedCalendar() { + private GregorianCalendar getNormalizedCalendar() { GregorianCalendar gc; if (isFullyNormalized()) { gc = this; @@ -2920,7 +2920,7 @@ public class GregorianCalendar extends Calendar { * Returns the Julian calendar system instance (singleton). 'jcal' * and 'jeras' are set upon the return. */ - synchronized private static final BaseCalendar getJulianCalendarSystem() { + synchronized private static BaseCalendar getJulianCalendarSystem() { if (jcal == null) { jcal = (JulianCalendar) CalendarSystem.forName("julian"); jeras = jcal.getEras(); @@ -2958,7 +2958,7 @@ public class GregorianCalendar extends Calendar { * or Julian). * @param fixedDate the fixed date representation of the date */ - private final long getFixedDateJan1(BaseCalendar.Date date, long fixedDate) { + private long getFixedDateJan1(BaseCalendar.Date date, long fixedDate) { assert date.getNormalizedYear() == gregorianCutoverYear || date.getNormalizedYear() == gregorianCutoverYearJulian; if (gregorianCutoverYear != gregorianCutoverYearJulian) { @@ -2984,7 +2984,7 @@ public class GregorianCalendar extends Calendar { * or Julian). * @param fixedDate the fixed date representation of the date */ - private final long getFixedDateMonth1(BaseCalendar.Date date, long fixedDate) { + private long getFixedDateMonth1(BaseCalendar.Date date, long fixedDate) { assert date.getNormalizedYear() == gregorianCutoverYear || date.getNormalizedYear() == gregorianCutoverYearJulian; BaseCalendar.Date gCutover = getGregorianCutoverDate(); @@ -3023,7 +3023,7 @@ public class GregorianCalendar extends Calendar { * * @param fd the fixed date */ - private final BaseCalendar.Date getCalendarDate(long fd) { + private BaseCalendar.Date getCalendarDate(long fd) { BaseCalendar cal = (fd >= gregorianCutoverDate) ? gcal : getJulianCalendarSystem(); BaseCalendar.Date d = (BaseCalendar.Date) cal.newCalendarDate(TimeZone.NO_TIMEZONE); cal.getCalendarDateFromFixedDate(d, fd); @@ -3034,7 +3034,7 @@ public class GregorianCalendar extends Calendar { * Returns the Gregorian cutover date as a BaseCalendar.Date. The * date is a Gregorian date. */ - private final BaseCalendar.Date getGregorianCutoverDate() { + private BaseCalendar.Date getGregorianCutoverDate() { return getCalendarDate(gregorianCutoverDate); } @@ -3042,7 +3042,7 @@ public class GregorianCalendar extends Calendar { * Returns the day before the Gregorian cutover date as a * BaseCalendar.Date. The date is a Julian date. */ - private final BaseCalendar.Date getLastJulianDate() { + private BaseCalendar.Date getLastJulianDate() { return getCalendarDate(gregorianCutoverDate - 1); } @@ -3052,7 +3052,7 @@ public class GregorianCalendar extends Calendar { * * @see #isLeapYear(int) */ - private final int monthLength(int month, int year) { + private int monthLength(int month, int year) { return isLeapYear(year) ? LEAP_MONTH_LENGTH[month] : MONTH_LENGTH[month]; } @@ -3062,7 +3062,7 @@ public class GregorianCalendar extends Calendar { * * @see #isLeapYear(int) */ - private final int monthLength(int month) { + private int monthLength(int month) { int year = internalGet(YEAR); if (internalGetEra() == BCE) { year = 1 - year; @@ -3070,7 +3070,7 @@ public class GregorianCalendar extends Calendar { return monthLength(month, year); } - private final int actualMonthLength() { + private int actualMonthLength() { int year = cdate.getNormalizedYear(); if (year != gregorianCutoverYear && year != gregorianCutoverYearJulian) { return calsys.getMonthLength(cdate); @@ -3094,7 +3094,7 @@ public class GregorianCalendar extends Calendar { * Returns the length (in days) of the specified year. The year * must be normalized. */ - private final int yearLength(int year) { + private int yearLength(int year) { return isLeapYear(year) ? 366 : 365; } @@ -3102,7 +3102,7 @@ public class GregorianCalendar extends Calendar { * Returns the length (in days) of the year provided by * internalGet(YEAR). */ - private final int yearLength() { + private int yearLength() { int year = internalGet(YEAR); if (internalGetEra() == BCE) { year = 1 - year; @@ -3116,7 +3116,7 @@ public class GregorianCalendar extends Calendar { * 3, we want it to go to Feb 28. Adjustments which might run into this * problem call this method to retain the proper month. */ - private final void pinDayOfMonth() { + private void pinDayOfMonth() { int year = internalGet(YEAR); int monthLen; if (year > gregorianCutoverYear || year < gregorianCutoverYearJulian) { @@ -3135,14 +3135,14 @@ public class GregorianCalendar extends Calendar { * Returns the fixed date value of this object. The time value and * calendar fields must be in synch. */ - private final long getCurrentFixedDate() { + private long getCurrentFixedDate() { return (calsys == gcal) ? cachedFixedDate : calsys.getFixedDate(cdate); } /** * Returns the new value after 'roll'ing the specified value and amount. */ - private static final int getRolledValue(int value, int amount, int min, int max) { + private static int getRolledValue(int value, int amount, int min, int max) { assert value >= min && value <= max; int range = max - min + 1; amount %= range; @@ -3160,7 +3160,7 @@ public class GregorianCalendar extends Calendar { * Returns the ERA. We need a special method for this because the * default ERA is CE, but a zero (unset) ERA is BCE. */ - private final int internalGetEra() { + private int internalGetEra() { return isSet(ERA) ? internalGet(ERA) : CE; } diff --git a/jdk/src/share/classes/java/util/JapaneseImperialCalendar.java b/jdk/src/share/classes/java/util/JapaneseImperialCalendar.java index c18c0bb97fa..940ab6210c4 100644 --- a/jdk/src/share/classes/java/util/JapaneseImperialCalendar.java +++ b/jdk/src/share/classes/java/util/JapaneseImperialCalendar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -260,8 +260,9 @@ class JapaneseImperialCalendar extends Calendar { // max value could be one year short. For example, if it's // Showa 63 January 8, 63 is the actual max value since // Showa 64 January 8 doesn't exist. - if (!(lgd.getMonth() == BaseCalendar.JANUARY && lgd.getDayOfMonth() == 1)) + if (!(lgd.getMonth() == BaseCalendar.JANUARY && lgd.getDayOfMonth() == 1)) { y--; + } year = Math.min(y, year); } LEAST_MAX_VALUES[YEAR] = year; // Max year could be smaller than this value. @@ -294,7 +295,7 @@ class JapaneseImperialCalendar extends Calendar { * @param zone the given time zone. * @param aLocale the given locale. */ - public JapaneseImperialCalendar(TimeZone zone, Locale aLocale) { + JapaneseImperialCalendar(TimeZone zone, Locale aLocale) { super(zone, aLocale); jdate = jcal.newCalendarDate(zone); setTimeInMillis(System.currentTimeMillis()); @@ -792,8 +793,8 @@ class JapaneseImperialCalendar extends Calendar { } // the first day of week of the month. - long monthDay1st = jcal.getDayOfWeekDateOnOrBefore(month1 + 6, - getFirstDayOfWeek()); + long monthDay1st = LocalGregorianCalendar.getDayOfWeekDateOnOrBefore(month1 + 6, + getFirstDayOfWeek()); // if the week has enough days to form a week, the // week starts from the previous month. if ((int)(monthDay1st - month1) >= getMinimalDaysInFirstWeek()) { @@ -884,7 +885,7 @@ class JapaneseImperialCalendar extends Calendar { return; } long fd = cachedFixedDate; - long dowFirst = jcal.getDayOfWeekDateOnOrBefore(fd, getFirstDayOfWeek()); + long dowFirst = LocalGregorianCalendar.getDayOfWeekDateOnOrBefore(fd, getFirstDayOfWeek()); fd += amount; if (fd < dowFirst) { fd += 7; @@ -963,8 +964,9 @@ class JapaneseImperialCalendar extends Calendar { Era era = eras[index]; name = (style == SHORT) ? era.getAbbreviation() : era.getName(); } else { - if (field == DAY_OF_WEEK) + if (field == DAY_OF_WEEK) { --index; + } name = strings[index]; } } @@ -1000,7 +1002,7 @@ class JapaneseImperialCalendar extends Calendar { private Map getDisplayNamesImpl(int field, int style, Locale locale) { ResourceBundle rb = LocaleData.getDateFormatData(locale); String key = getKey(field, style); - Map map = new HashMap(); + Map map = new HashMap<>(); if (key != null) { String[] strings = rb.getStringArray(key); if (field == YEAR) { @@ -1392,8 +1394,8 @@ class JapaneseImperialCalendar extends Calendar { jcal.normalize(jd); long jan1 = jcal.getFixedDate(d); long nextJan1 = jcal.getFixedDate(jd); - long nextJan1st = jcal.getDayOfWeekDateOnOrBefore(nextJan1 + 6, - getFirstDayOfWeek()); + long nextJan1st = LocalGregorianCalendar.getDayOfWeekDateOnOrBefore(nextJan1 + 6, + getFirstDayOfWeek()); int ndays = (int)(nextJan1st - nextJan1); if (ndays >= getMinimalDaysInFirstWeek()) { nextJan1st -= 7; @@ -1523,7 +1525,7 @@ class JapaneseImperialCalendar extends Calendar { * beyond the limit. The given CalendarDate object must have been * normalized before calling this method. */ - private final long getYearOffsetInMillis(CalendarDate date) { + private long getYearOffsetInMillis(CalendarDate date) { long t = (jcal.getDayOfYear(date) - 1) * ONE_DAY; return t + date.getTimeOfDay() - date.getZoneOffset(); } @@ -1755,7 +1757,7 @@ class JapaneseImperialCalendar extends Calendar { d.setMonth(pd.getMonth()).setDayOfMonth(pd.getDayOfMonth()); } } else { - d.setMonth(jcal.JANUARY).setDayOfMonth(1); + d.setMonth(LocalGregorianCalendar.JANUARY).setDayOfMonth(1); } jcal.normalize(d); prevJan1 = jcal.getFixedDate(d); @@ -1780,8 +1782,8 @@ class JapaneseImperialCalendar extends Calendar { if (jdate.isLeapYear()) { nextJan1++; } - long nextJan1st = jcal.getDayOfWeekDateOnOrBefore(nextJan1 + 6, - getFirstDayOfWeek()); + long nextJan1st = LocalGregorianCalendar.getDayOfWeekDateOnOrBefore(nextJan1 + 6, + getFirstDayOfWeek()); int ndays = (int)(nextJan1st - nextJan1); if (ndays >= getMinimalDaysInFirstWeek() && fixedDate >= (nextJan1st - 7)) { // The first days forms a week in which the date is included. @@ -1793,7 +1795,7 @@ class JapaneseImperialCalendar extends Calendar { long nextJan1; if (jdate.getYear() == 1) { d.addYear(+1); - d.setMonth(jcal.JANUARY).setDayOfMonth(1); + d.setMonth(LocalGregorianCalendar.JANUARY).setDayOfMonth(1); nextJan1 = jcal.getFixedDate(d); } else { int nextEraIndex = getEraIndex(d) + 1; @@ -1803,8 +1805,8 @@ class JapaneseImperialCalendar extends Calendar { jcal.normalize(d); nextJan1 = jcal.getFixedDate(d); } - long nextJan1st = jcal.getDayOfWeekDateOnOrBefore(nextJan1 + 6, - getFirstDayOfWeek()); + long nextJan1st = LocalGregorianCalendar.getDayOfWeekDateOnOrBefore(nextJan1 + 6, + getFirstDayOfWeek()); int ndays = (int)(nextJan1st - nextJan1); if (ndays >= getMinimalDaysInFirstWeek() && fixedDate >= (nextJan1st - 7)) { // The first days forms a week in which the date is included. @@ -1828,11 +1830,11 @@ class JapaneseImperialCalendar extends Calendar { * @param fixedDate the fixed date of the last day of the period * @return the number of weeks of the given period */ - private final int getWeekNumber(long fixedDay1, long fixedDate) { + private int getWeekNumber(long fixedDay1, long fixedDate) { // We can always use `jcal' since Julian and Gregorian are the // same thing for this calculation. - long fixedDay1st = jcal.getDayOfWeekDateOnOrBefore(fixedDay1 + 6, - getFirstDayOfWeek()); + long fixedDay1st = LocalGregorianCalendar.getDayOfWeekDateOnOrBefore(fixedDay1 + 6, + getFirstDayOfWeek()); int ndays = (int)(fixedDay1st - fixedDay1); assert ndays <= 7; if (ndays >= getMinimalDaysInFirstWeek()) { @@ -2026,10 +2028,12 @@ class JapaneseImperialCalendar extends Calendar { if (year == MIN_VALUES[YEAR]) { CalendarDate dx = jcal.getCalendarDate(Long.MIN_VALUE, getZone()); int m = dx.getMonth() - 1; - if (month < m) + if (month < m) { month = m; - if (month == m) + } + if (month == m) { firstDayOfMonth = dx.getDayOfMonth(); + } } LocalGregorianCalendar.Date date = jcal.newCalendarDate(TimeZone.NO_TIMEZONE); @@ -2058,16 +2062,16 @@ class JapaneseImperialCalendar extends Calendar { } } else { if (isFieldSet(fieldMask, WEEK_OF_MONTH)) { - long firstDayOfWeek = jcal.getDayOfWeekDateOnOrBefore(fixedDate + 6, - getFirstDayOfWeek()); + long firstDayOfWeek = LocalGregorianCalendar.getDayOfWeekDateOnOrBefore(fixedDate + 6, + getFirstDayOfWeek()); // If we have enough days in the first week, then // move to the previous week. if ((firstDayOfWeek - fixedDate) >= getMinimalDaysInFirstWeek()) { firstDayOfWeek -= 7; } if (isFieldSet(fieldMask, DAY_OF_WEEK)) { - firstDayOfWeek = jcal.getDayOfWeekDateOnOrBefore(firstDayOfWeek + 6, - internalGet(DAY_OF_WEEK)); + firstDayOfWeek = LocalGregorianCalendar.getDayOfWeekDateOnOrBefore(firstDayOfWeek + 6, + internalGet(DAY_OF_WEEK)); } // In lenient mode, we treat days of the previous // months as a part of the specified @@ -2090,15 +2094,15 @@ class JapaneseImperialCalendar extends Calendar { dowim = 1; } if (dowim >= 0) { - fixedDate = jcal.getDayOfWeekDateOnOrBefore(fixedDate + (7 * dowim) - 1, - dayOfWeek); + fixedDate = LocalGregorianCalendar.getDayOfWeekDateOnOrBefore(fixedDate + (7 * dowim) - 1, + dayOfWeek); } else { // Go to the first day of the next week of // the specified week boundary. int lastDate = monthLength(month, year) + (7 * (dowim + 1)); // Then, get the day of week date on or before the last date. - fixedDate = jcal.getDayOfWeekDateOnOrBefore(fixedDate + lastDate - 1, - dayOfWeek); + fixedDate = LocalGregorianCalendar.getDayOfWeekDateOnOrBefore(fixedDate + lastDate - 1, + dayOfWeek); } } } @@ -2112,8 +2116,8 @@ class JapaneseImperialCalendar extends Calendar { fixedDate += internalGet(DAY_OF_YEAR); fixedDate--; } else { - long firstDayOfWeek = jcal.getDayOfWeekDateOnOrBefore(fixedDate + 6, - getFirstDayOfWeek()); + long firstDayOfWeek = LocalGregorianCalendar.getDayOfWeekDateOnOrBefore(fixedDate + 6, + getFirstDayOfWeek()); // If we have enough days in the first week, then move // to the previous week. if ((firstDayOfWeek - fixedDate) >= getMinimalDaysInFirstWeek()) { @@ -2122,8 +2126,8 @@ class JapaneseImperialCalendar extends Calendar { if (isFieldSet(fieldMask, DAY_OF_WEEK)) { int dayOfWeek = internalGet(DAY_OF_WEEK); if (dayOfWeek != getFirstDayOfWeek()) { - firstDayOfWeek = jcal.getDayOfWeekDateOnOrBefore(firstDayOfWeek + 6, - dayOfWeek); + firstDayOfWeek = LocalGregorianCalendar.getDayOfWeekDateOnOrBefore(firstDayOfWeek + 6, + dayOfWeek); } } fixedDate = firstDayOfWeek + 7 * ((long)internalGet(WEEK_OF_YEAR) - 1); @@ -2140,7 +2144,7 @@ class JapaneseImperialCalendar extends Calendar { * calculated. The date has to be in the cut-over year. * @param fixedDate the fixed date representation of the date */ - private final long getFixedDateJan1(LocalGregorianCalendar.Date date, long fixedDate) { + private long getFixedDateJan1(LocalGregorianCalendar.Date date, long fixedDate) { Era era = date.getEra(); if (date.getEra() != null && date.getYear() == 1) { for (int eraIndex = getEraIndex(date); eraIndex > 0; eraIndex--) { @@ -2154,7 +2158,7 @@ class JapaneseImperialCalendar extends Calendar { } } CalendarDate d = gcal.newCalendarDate(TimeZone.NO_TIMEZONE); - d.setDate(date.getNormalizedYear(), gcal.JANUARY, 1); + d.setDate(date.getNormalizedYear(), Gregorian.JANUARY, 1); return gcal.getFixedDate(d); } @@ -2166,7 +2170,7 @@ class JapaneseImperialCalendar extends Calendar { * calculated. The date must be in the era transition year. * @param fixedDate the fixed date representation of the date */ - private final long getFixedDateMonth1(LocalGregorianCalendar.Date date, + private long getFixedDateMonth1(LocalGregorianCalendar.Date date, long fixedDate) { int eraIndex = getTransitionEraIndex(date); if (eraIndex != -1) { @@ -2187,7 +2191,7 @@ class JapaneseImperialCalendar extends Calendar { * * @param fd the fixed date */ - private static final LocalGregorianCalendar.Date getCalendarDate(long fd) { + private static LocalGregorianCalendar.Date getCalendarDate(long fd) { LocalGregorianCalendar.Date d = jcal.newCalendarDate(TimeZone.NO_TIMEZONE); jcal.getCalendarDateFromFixedDate(d, fd); return d; @@ -2199,7 +2203,7 @@ class JapaneseImperialCalendar extends Calendar { * * @see #isLeapYear(int) */ - private final int monthLength(int month, int gregorianYear) { + private int monthLength(int month, int gregorianYear) { return CalendarUtils.isGregorianLeapYear(gregorianYear) ? GregorianCalendar.LEAP_MONTH_LENGTH[month] : GregorianCalendar.MONTH_LENGTH[month]; } @@ -2210,13 +2214,13 @@ class JapaneseImperialCalendar extends Calendar { * * @see #isLeapYear(int) */ - private final int monthLength(int month) { + private int monthLength(int month) { assert jdate.isNormalized(); return jdate.isLeapYear() ? GregorianCalendar.LEAP_MONTH_LENGTH[month] : GregorianCalendar.MONTH_LENGTH[month]; } - private final int actualMonthLength() { + private int actualMonthLength() { int length = jcal.getMonthLength(jdate); int eraIndex = getTransitionEraIndex(jdate); if (eraIndex == -1) { @@ -2239,7 +2243,7 @@ class JapaneseImperialCalendar extends Calendar { * January 3, then the era index for Heisei is returned. If the * given date is not in any transition month, then -1 is returned. */ - private static final int getTransitionEraIndex(LocalGregorianCalendar.Date date) { + private static int getTransitionEraIndex(LocalGregorianCalendar.Date date) { int eraIndex = getEraIndex(date); CalendarDate transitionDate = eras[eraIndex].getSinceDate(); if (transitionDate.getYear() == date.getNormalizedYear() && @@ -2256,7 +2260,7 @@ class JapaneseImperialCalendar extends Calendar { return -1; } - private final boolean isTransitionYear(int normalizedYear) { + private boolean isTransitionYear(int normalizedYear) { for (int i = eras.length - 1; i > 0; i--) { int transitionYear = eras[i].getSinceDate().getYear(); if (normalizedYear == transitionYear) { @@ -2269,7 +2273,7 @@ class JapaneseImperialCalendar extends Calendar { return false; } - private static final int getEraIndex(LocalGregorianCalendar.Date date) { + private static int getEraIndex(LocalGregorianCalendar.Date date) { Era era = date.getEra(); for (int i = eras.length - 1; i > 0; i--) { if (eras[i] == era) { @@ -2284,7 +2288,7 @@ class JapaneseImperialCalendar extends Calendar { * in sync). Otherwise, a cloned object is returned after calling * complete() in lenient mode. */ - private final JapaneseImperialCalendar getNormalizedCalendar() { + private JapaneseImperialCalendar getNormalizedCalendar() { JapaneseImperialCalendar jc; if (isFullyNormalized()) { jc = this; @@ -2303,7 +2307,7 @@ class JapaneseImperialCalendar extends Calendar { * 3, we want it to go to Feb 28. Adjustments which might run into this * problem call this method to retain the proper month. */ - private final void pinDayOfMonth(LocalGregorianCalendar.Date date) { + private void pinDayOfMonth(LocalGregorianCalendar.Date date) { int year = date.getYear(); int dom = date.getDayOfMonth(); if (year != getMinimum(YEAR)) { @@ -2347,7 +2351,7 @@ class JapaneseImperialCalendar extends Calendar { /** * Returns the new value after 'roll'ing the specified value and amount. */ - private static final int getRolledValue(int value, int amount, int min, int max) { + private static int getRolledValue(int value, int amount, int min, int max) { assert value >= min && value <= max; int range = max - min + 1; amount %= range; @@ -2365,7 +2369,7 @@ class JapaneseImperialCalendar extends Calendar { * Returns the ERA. We need a special method for this because the * default ERA is the current era, but a zero (unset) ERA means before Meiji. */ - private final int internalGetEra() { + private int internalGetEra() { return isSet(ERA) ? internalGet(ERA) : eras.length - 1; } diff --git a/jdk/src/share/classes/java/util/PropertyPermission.java b/jdk/src/share/classes/java/util/PropertyPermission.java index 026ce9be0ee..17731883598 100644 --- a/jdk/src/share/classes/java/util/PropertyPermission.java +++ b/jdk/src/share/classes/java/util/PropertyPermission.java @@ -305,7 +305,7 @@ public final class PropertyPermission extends BasicPermission { switch(a[i-matchlen]) { case ',': seencomma = true; - /*FALLTHROUGH*/ + break; case ' ': case '\r': case '\n': case '\f': case '\t': break; @@ -442,7 +442,7 @@ implements Serializable * Key is property name; value is PropertyPermission. * Not serialized; see serialization section at end of class. */ - private transient Map perms; + private transient Map perms; /** * Boolean saying if "*" is in the collection. @@ -458,7 +458,7 @@ implements Serializable */ public PropertyPermissionCollection() { - perms = new HashMap(32); // Capacity for default policy + perms = new HashMap<>(32); // Capacity for default policy all_allowed = false; } @@ -593,7 +593,7 @@ implements Serializable * @return an enumeration of all the PropertyPermission objects. */ - public Enumeration elements() { + public Enumeration elements() { // Convert Iterator of Map values into an Enumeration synchronized (this) { return Collections.enumeration(perms.values()); @@ -633,7 +633,7 @@ implements Serializable // Don't call out.defaultWriteObject() // Copy perms into a Hashtable - Hashtable permissions = new Hashtable(perms.size()*2); + Hashtable permissions = new Hashtable<>(perms.size()*2); synchronized (this) { permissions.putAll(perms); } @@ -660,8 +660,10 @@ implements Serializable all_allowed = gfields.get("all_allowed", false); // Get permissions - Hashtable permissions = (Hashtable)gfields.get("permissions", null); - perms = new HashMap(permissions.size()*2); + @SuppressWarnings("unchecked") + Hashtable permissions = + (Hashtable)gfields.get("permissions", null); + perms = new HashMap<>(permissions.size()*2); perms.putAll(permissions); } } diff --git a/jdk/src/share/classes/java/util/ResourceBundle.java b/jdk/src/share/classes/java/util/ResourceBundle.java index a4a4d55a1a5..c7b425db7ac 100644 --- a/jdk/src/share/classes/java/util/ResourceBundle.java +++ b/jdk/src/share/classes/java/util/ResourceBundle.java @@ -294,7 +294,7 @@ public abstract class ResourceBundle { /** * Queue for reference objects referring to class loaders or bundles. */ - private static final ReferenceQueue referenceQueue = new ReferenceQueue(); + private static final ReferenceQueue referenceQueue = new ReferenceQueue<>(); /** * The parent bundle of this bundle. @@ -389,12 +389,13 @@ public abstract class ResourceBundle { if (parent != null) { obj = parent.getObject(key); } - if (obj == null) + if (obj == null) { throw new MissingResourceException("Can't find resource for bundle " +this.getClass().getName() +", key "+key, this.getClass().getName(), key); + } } return obj; } @@ -418,7 +419,7 @@ public abstract class ResourceBundle { private static ClassLoader getLoader() { Class[] stack = getClassContext(); /* Magic number 2 identifies our caller's caller */ - Class c = stack[2]; + Class c = stack[2]; ClassLoader cl = (c == null) ? null : c.getClassLoader(); if (cl == null) { // When the caller's loader is the boot class loader, cl is null @@ -488,7 +489,7 @@ public abstract class ResourceBundle { * null, but the base name and the locale must have a non-null * value. */ - private static final class CacheKey implements Cloneable { + private static class CacheKey implements Cloneable { // These three are the actual keys for lookup in Map. private String name; private Locale locale; @@ -583,8 +584,7 @@ public abstract class ResourceBundle { // treat it as unequal && (loader != null) && (loader == otherEntry.loaderRef.get()); - } catch (NullPointerException e) { - } catch (ClassCastException e) { + } catch ( NullPointerException | ClassCastException e) { } return false; } @@ -669,11 +669,11 @@ public abstract class ResourceBundle { * garbage collected when nobody else is using them. The ResourceBundle * class has no reason to keep class loaders alive. */ - private static final class LoaderReference extends WeakReference - implements CacheKeyReference { + private static class LoaderReference extends WeakReference + implements CacheKeyReference { private CacheKey cacheKey; - LoaderReference(ClassLoader referent, ReferenceQueue q, CacheKey key) { + LoaderReference(ClassLoader referent, ReferenceQueue q, CacheKey key) { super(referent, q); cacheKey = key; } @@ -687,11 +687,11 @@ public abstract class ResourceBundle { * References to bundles are soft references so that they can be garbage * collected when they have no hard references. */ - private static final class BundleReference extends SoftReference - implements CacheKeyReference { + private static class BundleReference extends SoftReference + implements CacheKeyReference { private CacheKey cacheKey; - BundleReference(ResourceBundle referent, ReferenceQueue q, CacheKey key) { + BundleReference(ResourceBundle referent, ReferenceQueue q, CacheKey key) { super(referent, q); cacheKey = key; } @@ -1331,8 +1331,8 @@ public abstract class ResourceBundle { * Checks if the given List is not null, not empty, * not having null in its elements. */ - private static final boolean checkList(List a) { - boolean valid = (a != null && a.size() != 0); + private static boolean checkList(List a) { + boolean valid = (a != null && !a.isEmpty()); if (valid) { int size = a.size(); for (int i = 0; valid && i < size; i++) { @@ -1342,12 +1342,12 @@ public abstract class ResourceBundle { return valid; } - private static final ResourceBundle findBundle(CacheKey cacheKey, - List candidateLocales, - List formats, - int index, - Control control, - ResourceBundle baseBundle) { + private static ResourceBundle findBundle(CacheKey cacheKey, + List candidateLocales, + List formats, + int index, + Control control, + ResourceBundle baseBundle) { Locale targetLocale = candidateLocales.get(index); ResourceBundle parent = null; if (index != candidateLocales.size() - 1) { @@ -1419,10 +1419,10 @@ public abstract class ResourceBundle { return parent; } - private static final ResourceBundle loadBundle(CacheKey cacheKey, - List formats, - Control control, - boolean reload) { + private static ResourceBundle loadBundle(CacheKey cacheKey, + List formats, + Control control, + boolean reload) { // Here we actually load the bundle in the order of formats // specified by the getFormats() value. @@ -1459,7 +1459,7 @@ public abstract class ResourceBundle { return bundle; } - private static final boolean isValidBundle(ResourceBundle bundle) { + private static boolean isValidBundle(ResourceBundle bundle) { return bundle != null && bundle != NONEXISTENT_BUNDLE; } @@ -1467,7 +1467,7 @@ public abstract class ResourceBundle { * Determines whether any of resource bundles in the parent chain, * including the leaf, have expired. */ - private static final boolean hasValidParentChain(ResourceBundle bundle) { + private static boolean hasValidParentChain(ResourceBundle bundle) { long now = System.currentTimeMillis(); while (bundle != null) { if (bundle.expired) { @@ -1488,9 +1488,9 @@ public abstract class ResourceBundle { /** * Throw a MissingResourceException with proper message */ - private static final void throwMissingResourceException(String baseName, - Locale locale, - Throwable cause) { + private static void throwMissingResourceException(String baseName, + Locale locale, + Throwable cause) { // If the cause is a MissingResourceException, avoid creating // a long chain. (6355009) if (cause instanceof MissingResourceException) { @@ -1513,8 +1513,8 @@ public abstract class ResourceBundle { * cache or its parent has expired. bundle.expire is true * upon return if the bundle in the cache has expired. */ - private static final ResourceBundle findBundleInCache(CacheKey cacheKey, - Control control) { + private static ResourceBundle findBundleInCache(CacheKey cacheKey, + Control control) { BundleReference bundleRef = cacheList.get(cacheKey); if (bundleRef == null) { return null; @@ -1620,9 +1620,9 @@ public abstract class ResourceBundle { * the bundle before this call, the one found in the cache is * returned. */ - private static final ResourceBundle putBundleInCache(CacheKey cacheKey, - ResourceBundle bundle, - Control control) { + private static ResourceBundle putBundleInCache(CacheKey cacheKey, + ResourceBundle bundle, + Control control) { setExpirationTime(cacheKey, control); if (cacheKey.expirationTime != Control.TTL_DONT_CACHE) { CacheKey key = (CacheKey) cacheKey.clone(); @@ -1653,7 +1653,7 @@ public abstract class ResourceBundle { return bundle; } - private static final void setExpirationTime(CacheKey cacheKey, Control control) { + private static void setExpirationTime(CacheKey cacheKey, Control control) { long ttl = control.getTimeToLive(cacheKey.getName(), cacheKey.getLocale()); if (ttl >= 0) { @@ -2350,18 +2350,27 @@ public abstract class ResourceBundle { if (script.length() == 0 && region.length() > 0) { // Supply script for users who want to use zh_Hans/zh_Hant // as bundle names (recommended for Java7+) - if (region.equals("TW") || region.equals("HK") || region.equals("MO")) { + switch (region) { + case "TW": + case "HK": + case "MO": script = "Hant"; - } else if (region.equals("CN") || region.equals("SG")) { + break; + case "CN": + case "SG": script = "Hans"; + break; } } else if (script.length() > 0 && region.length() == 0) { // Supply region(country) for users who still package Chinese // bundles using old convension. - if (script.equals("Hans")) { + switch (script) { + case "Hans": region = "CN"; - } else if (script.equals("Hant")) { + break; + case "Hant": region = "TW"; + break; } } } @@ -2562,6 +2571,7 @@ public abstract class ResourceBundle { ResourceBundle bundle = null; if (format.equals("java.class")) { try { + @SuppressWarnings("unchecked") Class bundleClass = (Class)loader.loadClass(bundleName); diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicBoolean.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicBoolean.java index c21df7bab8c..a4d6d8297da 100644 --- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicBoolean.java +++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicBoolean.java @@ -54,10 +54,10 @@ public class AtomicBoolean implements java.io.Serializable { private static final long valueOffset; static { - try { - valueOffset = unsafe.objectFieldOffset - (AtomicBoolean.class.getDeclaredField("value")); - } catch (Exception ex) { throw new Error(ex); } + try { + valueOffset = unsafe.objectFieldOffset + (AtomicBoolean.class.getDeclaredField("value")); + } catch (Exception ex) { throw new Error(ex); } } private volatile int value; diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java index ec68acd781a..1bc7fa2aa44 100644 --- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java +++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java @@ -57,10 +57,10 @@ public class AtomicInteger extends Number implements java.io.Serializable { private static final long valueOffset; static { - try { - valueOffset = unsafe.objectFieldOffset - (AtomicInteger.class.getDeclaredField("value")); - } catch (Exception ex) { throw new Error(ex); } + try { + valueOffset = unsafe.objectFieldOffset + (AtomicInteger.class.getDeclaredField("value")); + } catch (Exception ex) { throw new Error(ex); } } private volatile int value; @@ -247,8 +247,7 @@ public class AtomicInteger extends Number implements java.io.Serializable { /** - * Returns the value of this {@code AtomicInteger} as an - * {@code int}. + * Returns the value of this {@code AtomicInteger} as an {@code int}. */ public int intValue() { return get(); diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java index 46227019856..9928e5974fa 100644 --- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java +++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java @@ -35,7 +35,6 @@ package java.util.concurrent.atomic; import sun.misc.Unsafe; -import java.util.*; /** * An {@code int} array in which elements may be updated atomically. diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java index aed5d1fc170..9f4fee4aa84 100644 --- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java +++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java @@ -135,7 +135,6 @@ public abstract class AtomicIntegerFieldUpdater { */ public abstract void lazySet(T obj, int newValue); - /** * Gets the current value held in the field of the given object managed * by this updater. @@ -266,11 +265,11 @@ public abstract class AtomicIntegerFieldUpdater { private static final Unsafe unsafe = Unsafe.getUnsafe(); private final long offset; private final Class tclass; - private final Class cclass; + private final Class cclass; AtomicIntegerFieldUpdaterImpl(Class tclass, String fieldName) { Field field = null; - Class caller = null; + Class caller = null; int modifiers = 0; try { field = tclass.getDeclaredField(fieldName); @@ -283,7 +282,7 @@ public abstract class AtomicIntegerFieldUpdater { throw new RuntimeException(ex); } - Class fieldt = field.getType(); + Class fieldt = field.getType(); if (fieldt != int.class) throw new IllegalArgumentException("Must be integer type"); diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLong.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLong.java index bf2c71a340a..f503d577d1b 100644 --- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLong.java +++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLong.java @@ -71,10 +71,10 @@ public class AtomicLong extends Number implements java.io.Serializable { private static native boolean VMSupportsCS8(); static { - try { - valueOffset = unsafe.objectFieldOffset - (AtomicLong.class.getDeclaredField("value")); - } catch (Exception ex) { throw new Error(ex); } + try { + valueOffset = unsafe.objectFieldOffset + (AtomicLong.class.getDeclaredField("value")); + } catch (Exception ex) { throw new Error(ex); } } private volatile long value; @@ -270,8 +270,7 @@ public class AtomicLong extends Number implements java.io.Serializable { } /** - * Returns the value of this {@code AtomicLong} as a {@code long} - * value. + * Returns the value of this {@code AtomicLong} as a {@code long}. */ public long longValue() { return get(); @@ -287,8 +286,8 @@ public class AtomicLong extends Number implements java.io.Serializable { } /** - * Returns the value of this {@code AtomicLong} as a {@code - * double} after a widening primitive conversion. + * Returns the value of this {@code AtomicLong} as a {@code double} + * after a widening primitive conversion. * @jls 5.1.2 Widening Primitive Conversions */ public double doubleValue() { diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java index ece5b6ad9b0..856ab39e0c6 100644 --- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java +++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java @@ -35,7 +35,6 @@ package java.util.concurrent.atomic; import sun.misc.Unsafe; -import java.util.*; /** * A {@code long} array in which elements may be updated atomically. @@ -136,7 +135,6 @@ public class AtomicLongArray implements java.io.Serializable { unsafe.putOrderedLong(array, checkedByteOffset(i), newValue); } - /** * Atomically sets the element at position {@code i} to the given value * and returns the old value. diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java index fa0a857152d..ccc5acbfe21 100644 --- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java +++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java @@ -265,11 +265,11 @@ public abstract class AtomicLongFieldUpdater { private static final Unsafe unsafe = Unsafe.getUnsafe(); private final long offset; private final Class tclass; - private final Class cclass; + private final Class cclass; CASUpdater(Class tclass, String fieldName) { Field field = null; - Class caller = null; + Class caller = null; int modifiers = 0; try { field = tclass.getDeclaredField(fieldName); @@ -282,7 +282,7 @@ public abstract class AtomicLongFieldUpdater { throw new RuntimeException(ex); } - Class fieldt = field.getType(); + Class fieldt = field.getType(); if (fieldt != long.class) throw new IllegalArgumentException("Must be long type"); @@ -348,11 +348,11 @@ public abstract class AtomicLongFieldUpdater { private static final Unsafe unsafe = Unsafe.getUnsafe(); private final long offset; private final Class tclass; - private final Class cclass; + private final Class cclass; LockedUpdater(Class tclass, String fieldName) { Field field = null; - Class caller = null; + Class caller = null; int modifiers = 0; try { field = tclass.getDeclaredField(fieldName); @@ -365,7 +365,7 @@ public abstract class AtomicLongFieldUpdater { throw new RuntimeException(ex); } - Class fieldt = field.getType(); + Class fieldt = field.getType(); if (fieldt != long.class) throw new IllegalArgumentException("Must be long type"); diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReference.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReference.java index 3178ca1579f..978664e2d83 100644 --- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReference.java +++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReference.java @@ -51,10 +51,10 @@ public class AtomicReference implements java.io.Serializable { private static final long valueOffset; static { - try { - valueOffset = unsafe.objectFieldOffset - (AtomicReference.class.getDeclaredField("value")); - } catch (Exception ex) { throw new Error(ex); } + try { + valueOffset = unsafe.objectFieldOffset + (AtomicReference.class.getDeclaredField("value")); + } catch (Exception ex) { throw new Error(ex); } } private volatile V value; diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java index b173f26808b..d92bdb5f2f4 100644 --- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java +++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java @@ -113,6 +113,7 @@ public class AtomicReferenceArray implements java.io.Serializable { return getRaw(checkedByteOffset(i)); } + @SuppressWarnings("unchecked") private E getRaw(long offset) { return (E) unsafe.getObjectVolatile(array, offset); } @@ -150,7 +151,7 @@ public class AtomicReferenceArray implements java.io.Serializable { public final E getAndSet(int i, E newValue) { long offset = checkedByteOffset(i); while (true) { - E current = (E) getRaw(offset); + E current = getRaw(offset); if (compareAndSetRaw(offset, current, newValue)) return current; } diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java index 7b72f0ff494..f2e0118aae7 100644 --- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java +++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java @@ -183,7 +183,7 @@ public abstract class AtomicReferenceFieldUpdater { private final long offset; private final Class tclass; private final Class vclass; - private final Class cclass; + private final Class cclass; /* * Internal type checks within all update methods contain @@ -201,8 +201,8 @@ public abstract class AtomicReferenceFieldUpdater { Class vclass, String fieldName) { Field field = null; - Class fieldClass = null; - Class caller = null; + Class fieldClass = null; + Class caller = null; int modifiers = 0; try { field = tclass.getDeclaredField(fieldName); @@ -280,6 +280,7 @@ public abstract class AtomicReferenceFieldUpdater { unsafe.putOrderedObject(obj, offset, newValue); } + @SuppressWarnings("unchecked") public V get(T obj) { if (obj == null || obj.getClass() != tclass || cclass != null) targetCheck(obj); diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java index 90aa3a0c538..5f8f1a03db9 100644 --- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java +++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java @@ -155,7 +155,6 @@ public class AtomicStampedReference { casPair(current, Pair.of(newReference, newStamp))); } - /** * Unconditionally sets the value of both the reference and stamp. * diff --git a/jdk/src/share/classes/java/util/jar/JarVerifier.java b/jdk/src/share/classes/java/util/jar/JarVerifier.java index 4f84ac28eff..6a9a8b55667 100644 --- a/jdk/src/share/classes/java/util/jar/JarVerifier.java +++ b/jdk/src/share/classes/java/util/jar/JarVerifier.java @@ -90,7 +90,7 @@ class JarVerifier { private Object csdomain = new Object(); /** collect -DIGEST-MANIFEST values for blacklist */ - private List manifestDigests; + private List manifestDigests; public JarVerifier(byte rawBytes[]) { manifestRawBytes = rawBytes; @@ -99,7 +99,7 @@ class JarVerifier { sigFileData = new Hashtable(11); pendingBlocks = new ArrayList(); baos = new ByteArrayOutputStream(); - manifestDigests = new ArrayList(); + manifestDigests = new ArrayList<>(); } /** @@ -872,7 +872,7 @@ class JarVerifier { eagerValidation = eager; } - public synchronized List getManifestDigests() { + public synchronized List getManifestDigests() { return Collections.unmodifiableList(manifestDigests); } diff --git a/jdk/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java b/jdk/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java index c53ba0c6f52..9541a5a45f3 100644 --- a/jdk/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java +++ b/jdk/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java @@ -57,7 +57,7 @@ class JavaUtilJarAccessImpl implements JavaUtilJarAccess { jar.setEagerValidation(eager); } - public List getManifestDigests(JarFile jar) { + public List getManifestDigests(JarFile jar) { return jar.getManifestDigests(); } } diff --git a/jdk/src/share/classes/java/util/zip/Adler32.java b/jdk/src/share/classes/java/util/zip/Adler32.java index fd534592c37..1e67a80ad19 100644 --- a/jdk/src/share/classes/java/util/zip/Adler32.java +++ b/jdk/src/share/classes/java/util/zip/Adler32.java @@ -25,16 +25,23 @@ package java.util.zip; +import java.nio.ByteBuffer; +import sun.nio.ch.DirectBuffer; + /** * A class that can be used to compute the Adler-32 checksum of a data * stream. An Adler-32 checksum is almost as reliable as a CRC-32 but * can be computed much faster. * + *

    Passing a {@code null} argument to a method in this class will cause + * a {@link NullPointerException} to be thrown. + * * @see Checksum * @author David Connelly */ public class Adler32 implements Checksum { + private int adler = 1; /** @@ -75,6 +82,39 @@ class Adler32 implements Checksum { adler = updateBytes(adler, b, 0, b.length); } + + /** + * Updates the checksum with the bytes from the specified buffer. + * + * The checksum is updated using + * buffer.{@link java.nio.Buffer#remaining() remaining()} + * bytes starting at + * buffer.{@link java.nio.Buffer#position() position()} + * Upon return, the buffer's position will be updated to its + * limit; its limit will not have been changed. + * + * @param buffer the ByteBuffer to update the checksum with + * @since 1.8 + */ + public void update(ByteBuffer buffer) { + int pos = buffer.position(); + int limit = buffer.limit(); + assert (pos <= limit); + int rem = limit - pos; + if (rem <= 0) + return; + if (buffer instanceof DirectBuffer) { + adler = updateByteBuffer(adler, ((DirectBuffer)buffer).address(), pos, rem); + } else if (buffer.hasArray()) { + adler = updateBytes(adler, buffer.array(), pos + buffer.arrayOffset(), rem); + } else { + byte[] b = new byte[rem]; + buffer.get(b); + adler = updateBytes(adler, b, 0, b.length); + } + buffer.position(limit); + } + /** * Resets the checksum to initial value. */ @@ -92,4 +132,6 @@ class Adler32 implements Checksum { private native static int update(int adler, int b); private native static int updateBytes(int adler, byte[] b, int off, int len); + private native static int updateByteBuffer(int adler, long addr, + int off, int len); } diff --git a/jdk/src/share/classes/java/util/zip/CRC32.java b/jdk/src/share/classes/java/util/zip/CRC32.java index 9f62c8572d5..7c173694eed 100644 --- a/jdk/src/share/classes/java/util/zip/CRC32.java +++ b/jdk/src/share/classes/java/util/zip/CRC32.java @@ -25,9 +25,15 @@ package java.util.zip; +import java.nio.ByteBuffer; +import sun.nio.ch.DirectBuffer; + /** * A class that can be used to compute the CRC-32 of a data stream. * + *

    Passing a {@code null} argument to a method in this class will cause + * a {@link NullPointerException} to be thrown. + * * @see Checksum * @author David Connelly */ @@ -74,6 +80,38 @@ class CRC32 implements Checksum { crc = updateBytes(crc, b, 0, b.length); } + /** + * Updates the checksum with the bytes from the specified buffer. + * + * The checksum is updated using + * buffer.{@link java.nio.Buffer#remaining() remaining()} + * bytes starting at + * buffer.{@link java.nio.Buffer#position() position()} + * Upon return, the buffer's position will + * be updated to its limit; its limit will not have been changed. + * + * @param buffer the ByteBuffer to update the checksum with + * @since 1.8 + */ + public void update(ByteBuffer buffer) { + int pos = buffer.position(); + int limit = buffer.limit(); + assert (pos <= limit); + int rem = limit - pos; + if (rem <= 0) + return; + if (buffer instanceof DirectBuffer) { + crc = updateByteBuffer(crc, ((DirectBuffer)buffer).address(), pos, rem); + } else if (buffer.hasArray()) { + crc = updateBytes(crc, buffer.array(), pos + buffer.arrayOffset(), rem); + } else { + byte[] b = new byte[rem]; + buffer.get(b); + crc = updateBytes(crc, b, 0, b.length); + } + buffer.position(limit); + } + /** * Resets CRC-32 to initial value. */ @@ -90,4 +128,7 @@ class CRC32 implements Checksum { private native static int update(int crc, int b); private native static int updateBytes(int crc, byte[] b, int off, int len); + + private native static int updateByteBuffer(int adler, long addr, + int off, int len); } diff --git a/jdk/src/share/classes/javax/script/ScriptEngineManager.java b/jdk/src/share/classes/javax/script/ScriptEngineManager.java index c87f4817562..bb43053426c 100644 --- a/jdk/src/share/classes/javax/script/ScriptEngineManager.java +++ b/jdk/src/share/classes/javax/script/ScriptEngineManager.java @@ -25,11 +25,9 @@ package javax.script; import java.util.*; -import java.net.URL; -import java.io.*; import java.security.*; -import sun.misc.Service; -import sun.misc.ServiceConfigurationError; +import java.util.ServiceLoader; +import java.util.ServiceConfigurationError; import sun.reflect.Reflection; import sun.security.util.SecurityConstants; @@ -102,13 +100,15 @@ public class ScriptEngineManager { } private void initEngines(final ClassLoader loader) { - Iterator itr = null; + Iterator itr = null; try { + ServiceLoader sl; if (loader != null) { - itr = Service.providers(ScriptEngineFactory.class, loader); + sl = ServiceLoader.load(ScriptEngineFactory.class, loader); } else { - itr = Service.installedProviders(ScriptEngineFactory.class); + sl = ServiceLoader.loadInstalled(ScriptEngineFactory.class); } + itr = sl.iterator(); } catch (ServiceConfigurationError err) { System.err.println("Can't find ScriptEngineFactory providers: " + err.getMessage()); @@ -124,7 +124,7 @@ public class ScriptEngineManager { try { while (itr.hasNext()) { try { - ScriptEngineFactory fact = (ScriptEngineFactory) itr.next(); + ScriptEngineFactory fact = itr.next(); engineSpis.add(fact); } catch (ServiceConfigurationError err) { System.err.println("ScriptEngineManager providers.next(): " @@ -441,7 +441,7 @@ public class ScriptEngineManager { // Note that this code is same as ClassLoader.getCallerClassLoader(). // But, that method is package private and hence we can't call here. private ClassLoader getCallerClassLoader() { - Class caller = Reflection.getCallerClass(3); + Class caller = Reflection.getCallerClass(3); if (caller == null) { return null; } diff --git a/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java b/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java index c79d0e11e4c..a22e8cc4221 100644 --- a/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java +++ b/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java @@ -369,7 +369,7 @@ public final class ServicePermission extends Permission switch(a[i-matchlen]) { case ',': seencomma = true; - /*FALLTHROUGH*/ + break; case ' ': case '\r': case '\n': case '\f': case '\t': break; diff --git a/jdk/src/share/classes/javax/sql/StatementEvent.java b/jdk/src/share/classes/javax/sql/StatementEvent.java index bb41be781f2..53c61c5ac64 100644 --- a/jdk/src/share/classes/javax/sql/StatementEvent.java +++ b/jdk/src/share/classes/javax/sql/StatementEvent.java @@ -42,6 +42,7 @@ import java.util.EventObject; */ public class StatementEvent extends EventObject { + static final long serialVersionUID = -8089573731826608315L; private SQLException exception; private PreparedStatement statement; diff --git a/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java b/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java index cf0bbecf386..bbb1852b965 100644 --- a/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java +++ b/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, 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 @@ -619,8 +619,8 @@ public abstract class BaseRowSet implements Serializable, Cloneable { checkforRowSetInterface(); if (listeners.isEmpty() == false) { RowSetEvent event = new RowSetEvent((RowSet)this); - for (Iterator i = listeners.iterator(); i.hasNext(); ) { - ((RowSetListener)i.next()).cursorMoved(event); + for (RowSetListener rsl : listeners) { + rsl.cursorMoved(event); } } } @@ -644,8 +644,8 @@ public abstract class BaseRowSet implements Serializable, Cloneable { checkforRowSetInterface(); if (listeners.isEmpty() == false) { RowSetEvent event = new RowSetEvent((RowSet)this); - for (Iterator i = listeners.iterator(); i.hasNext(); ) { - ((RowSetListener)i.next()).rowChanged(event); + for (RowSetListener rsl : listeners) { + rsl.rowChanged(event); } } } @@ -669,8 +669,8 @@ public abstract class BaseRowSet implements Serializable, Cloneable { checkforRowSetInterface(); if (listeners.isEmpty() == false) { RowSetEvent event = new RowSetEvent((RowSet)this); - for (Iterator i = listeners.iterator(); i.hasNext(); ) { - ((RowSetListener)i.next()).rowSetChanged(event); + for (RowSetListener rsl : listeners) { + rsl.rowSetChanged(event); } } } diff --git a/jdk/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java b/jdk/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java index f4591c09cb5..659f2e5463e 100644 --- a/jdk/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java +++ b/jdk/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java @@ -97,7 +97,7 @@ public class RowSetMetaDataImpl implements RowSetMetaData, Serializable { */ private void checkColType(int SQLType) throws SQLException { try { - Class c = java.sql.Types.class; + Class c = java.sql.Types.class; Field[] publicFields = c.getFields(); int fieldValue = 0; for (int i = 0; i < publicFields.length; i++) { @@ -1091,5 +1091,7 @@ public class RowSetMetaDataImpl implements RowSetMetaData, Serializable { *@serial */ public boolean writable = true; + + static final long serialVersionUID = 5490834817919311283L; } } diff --git a/jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java b/jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java index c161eded789..68226eec15b 100644 --- a/jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java +++ b/jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java @@ -181,7 +181,7 @@ public class RowSetProvider { trace("***In newInstance()"); try { - Class providerClass = getFactoryClass(factoryClassName, cl, false); + Class providerClass = getFactoryClass(factoryClassName, cl, false); RowSetFactory instance = (RowSetFactory) providerClass.newInstance(); if (debug) { trace("Created new instance of " + providerClass + @@ -229,7 +229,7 @@ public class RowSetProvider { * context class loader followed by the current class loader. * @return The class which was loaded */ - static private Class getFactoryClass(String factoryClassName, ClassLoader cl, + static private Class getFactoryClass(String factoryClassName, ClassLoader cl, boolean doFallback) throws ClassNotFoundException { try { if (cl == null) { diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java b/jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java index c84527d8036..c4b1e4d9120 100644 --- a/jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java +++ b/jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, 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 @@ -22,13 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ - package javax.sql.rowset.serial; import java.sql.*; -import javax.sql.*; -import java.io.*; -import java.math.*; import java.util.Map; /** @@ -91,7 +87,7 @@ public class SQLInputImpl implements SQLInput { * SQLData (the Java class that defines how the UDT * will be mapped). */ - private Map map; + private Map> map; /** @@ -279,7 +275,7 @@ public class SQLInputImpl implements SQLInput { if (attrib == null) { lastValueWasNull = true; - return (int)0; + return 0; } else { lastValueWasNull = false; return attrib.intValue(); @@ -591,7 +587,7 @@ public class SQLInputImpl implements SQLInput { * position; or if there are no further values in the stream. */ public Object readObject() throws SQLException { - Object attrib = (Object)getNextAttribute(); + Object attrib = getNextAttribute(); if (attrib == null) { lastValueWasNull = true; @@ -601,7 +597,7 @@ public class SQLInputImpl implements SQLInput { if (attrib instanceof Struct) { Struct s = (Struct)attrib; // look up the class in the map - Class c = (Class)map.get(s.getSQLTypeName()); + Class c = map.get(s.getSQLTypeName()); if (c != null) { // create new instance of the class SQLData obj = null; @@ -620,10 +616,10 @@ public class SQLInputImpl implements SQLInput { SQLInputImpl sqlInput = new SQLInputImpl(attribs, map); // read the values... obj.readSQL(sqlInput, s.getSQLTypeName()); - return (Object)obj; + return obj; } } - return (Object)attrib; + return attrib; } } diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java b/jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java index 7b5d8d4b867..2217e4e2cab 100644 --- a/jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java +++ b/jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java @@ -60,6 +60,7 @@ public class SQLOutputImpl implements SQLOutput { * A reference to an existing vector that * contains the attributes of a Struct object. */ + @SuppressWarnings("rawtypes") private Vector attribs; /** @@ -70,6 +71,7 @@ public class SQLOutputImpl implements SQLOutput { * method will in turn call the appropriate * SQLOutputImpl writer methods. */ + @SuppressWarnings("rawtypes") private Map map; /** @@ -121,6 +123,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeString(String x) throws SQLException { //System.out.println("Adding :"+x); attribs.add(x); @@ -136,6 +139,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeBoolean(boolean x) throws SQLException { attribs.add(Boolean.valueOf(x)); } @@ -150,6 +154,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeByte(byte x) throws SQLException { attribs.add(Byte.valueOf(x)); } @@ -164,6 +169,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeShort(short x) throws SQLException { attribs.add(Short.valueOf(x)); } @@ -178,6 +184,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeInt(int x) throws SQLException { attribs.add(Integer.valueOf(x)); } @@ -192,6 +199,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeLong(long x) throws SQLException { attribs.add(Long.valueOf(x)); } @@ -206,6 +214,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeFloat(float x) throws SQLException { attribs.add(new Float(x)); } @@ -220,6 +229,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeDouble(double x) throws SQLException{ attribs.add(new Double(x)); } @@ -234,6 +244,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeBigDecimal(java.math.BigDecimal x) throws SQLException{ attribs.add(x); } @@ -249,6 +260,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeBytes(byte[] x) throws SQLException { attribs.add(x); } @@ -263,6 +275,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeDate(java.sql.Date x) throws SQLException { attribs.add(x); } @@ -277,6 +290,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeTime(java.sql.Time x) throws SQLException { attribs.add(x); } @@ -291,6 +305,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeTimestamp(java.sql.Timestamp x) throws SQLException { attribs.add(x); } @@ -305,6 +320,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeCharacterStream(java.io.Reader x) throws SQLException { BufferedReader bufReader = new BufferedReader(x); try { @@ -334,6 +350,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeAsciiStream(java.io.InputStream x) throws SQLException { BufferedReader bufReader = new BufferedReader(new InputStreamReader(x)); try { @@ -363,6 +380,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeBinaryStream(java.io.InputStream x) throws SQLException { BufferedReader bufReader = new BufferedReader(new InputStreamReader(x)); try { @@ -414,6 +432,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeObject(SQLData x) throws SQLException { /* @@ -434,7 +453,7 @@ public class SQLOutputImpl implements SQLOutput { * the name of this class otherwise we don't know * what to re-instantiate during readSQL() */ - attribs.add(new SerialStruct((SQLData)x, map)); + attribs.add(new SerialStruct(x, map)); } /** @@ -448,6 +467,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeRef(Ref x) throws SQLException { if (x == null) { attribs.add(x); @@ -467,6 +487,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeBlob(Blob x) throws SQLException { if (x == null) { attribs.add(x); @@ -486,6 +507,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeClob(Clob x) throws SQLException { if (x == null) { attribs.add(x); @@ -511,6 +533,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeStruct(Struct x) throws SQLException { SerialStruct s = new SerialStruct(x,map);; attribs.add(s); @@ -528,6 +551,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeArray(Array x) throws SQLException { if (x == null) { attribs.add(x); @@ -547,6 +571,7 @@ public class SQLOutputImpl implements SQLOutput { * use by a SQLData object attempting to write the attribute * values of a UDT to the database. */ + @SuppressWarnings("unchecked") public void writeURL(java.net.URL url) throws SQLException { if (url == null) { attribs.add(url); @@ -570,6 +595,7 @@ public class SQLOutputImpl implements SQLOutput { * @exception SQLException if a database access error occurs * @since 1.6 */ + @SuppressWarnings("unchecked") public void writeNString(String x) throws SQLException { throw new UnsupportedOperationException("Operation not supported"); } @@ -583,6 +609,7 @@ public class SQLOutputImpl implements SQLOutput { * @exception SQLException if a database access error occurs * @since 1.6 */ + @SuppressWarnings("unchecked") public void writeNClob(NClob x) throws SQLException { throw new UnsupportedOperationException("Operation not supported"); } @@ -597,6 +624,7 @@ public class SQLOutputImpl implements SQLOutput { * @exception SQLException if a database access error occurs * @since 1.6 */ + @SuppressWarnings("unchecked") public void writeRowId(RowId x) throws SQLException { throw new UnsupportedOperationException("Operation not supported"); } @@ -611,6 +639,7 @@ public class SQLOutputImpl implements SQLOutput { * @exception SQLException if a database access error occurs * @since 1.6 */ + @SuppressWarnings("unchecked") public void writeSQLXML(SQLXML x) throws SQLException { throw new UnsupportedOperationException("Operation not supported"); } diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SerialArray.java b/jdk/src/share/classes/javax/sql/rowset/serial/SerialArray.java index 17856e17d66..5ab127c6ce3 100644 --- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialArray.java +++ b/jdk/src/share/classes/javax/sql/rowset/serial/SerialArray.java @@ -186,10 +186,8 @@ public class SerialArray implements Array, Serializable, Cloneable { case java.sql.Types.JAVA_OBJECT: for (int i = 0; i < len; i++) { - elements[i] = new SerialJavaObject((Object)elements[i]); + elements[i] = new SerialJavaObject(elements[i]); } - default: - ; } } @@ -285,11 +283,10 @@ public class SerialArray implements Array, Serializable, Cloneable { case java.sql.Types.JAVA_OBJECT: for (int i = 0; i < len; i++) { - elements[i] = new SerialJavaObject((Object)elements[i]); + elements[i] = new SerialJavaObject(elements[i]); } + break; - default: - ; } diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SerialBlob.java b/jdk/src/share/classes/javax/sql/rowset/serial/SerialBlob.java index 795e404fdaf..bae2d9355eb 100644 --- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialBlob.java +++ b/jdk/src/share/classes/javax/sql/rowset/serial/SerialBlob.java @@ -207,7 +207,7 @@ public class SerialBlob implements Blob, Serializable, Cloneable { */ public java.io.InputStream getBinaryStream() throws SerialException { InputStream stream = new ByteArrayInputStream(buf); - return (java.io.InputStream)stream; + return stream; } /** diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java b/jdk/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java index 5aa034f6854..4517ff3c2d2 100644 --- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java +++ b/jdk/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java @@ -142,14 +142,14 @@ public class SerialJavaObject implements Serializable, Cloneable { * object. When there are multiple warnings, each warning is chained to the * previous warning. */ - java.util.Vector chain; + java.util.Vector chain; /** * Registers the given warning. */ private void setWarning(RowSetWarning e) { if (chain == null) { - chain = new java.util.Vector(); + chain = new java.util.Vector<>(); } chain.add(e); } diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SerialRef.java b/jdk/src/share/classes/javax/sql/rowset/serial/SerialRef.java index 8503caaaf78..efc88198e73 100644 --- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialRef.java +++ b/jdk/src/share/classes/javax/sql/rowset/serial/SerialRef.java @@ -109,7 +109,7 @@ public class SerialRef implements Ref, Serializable, Cloneable { public Object getObject(java.util.Map> map) throws SerialException { - map = new Hashtable(map); + map = new Hashtable>(map); if (object != null) { return map.get(object); } else { diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SerialStruct.java b/jdk/src/share/classes/javax/sql/rowset/serial/SerialStruct.java index b546da769f4..a9462eb8688 100644 --- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialStruct.java +++ b/jdk/src/share/classes/javax/sql/rowset/serial/SerialStruct.java @@ -139,7 +139,7 @@ public class SerialStruct implements Struct, Serializable, Cloneable { //set the type name SQLTypeName = in.getSQLTypeName(); - Vector tmp = new Vector(); + Vector tmp = new Vector<>(); in.writeSQL(new SQLOutputImpl(tmp, map)); attribs = tmp.toArray(); @@ -220,7 +220,7 @@ public class SerialStruct implements Struct, Serializable, Cloneable { * that defines how the UDT is to be mapped * @throws SerialException if an error occurs */ - private void mapToSerial(Map map) throws SerialException { + private void mapToSerial(Map> map) throws SerialException { try { diff --git a/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java b/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java index 4e2b164d683..11a59c4a9e1 100644 --- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java +++ b/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java @@ -257,7 +257,7 @@ public class SyncFactory { * See section 2.0 of the class comment for SyncFactory for an * explanation of how a provider can be added to this registry. */ - private static Hashtable implementations; + private static Hashtable implementations; /** * Internal sync object used to maintain the SPI as a singleton */ @@ -344,7 +344,7 @@ public class SyncFactory { Properties properties = new Properties(); if (implementations == null) { - implementations = new Hashtable(); + implementations = new Hashtable<>(); try { @@ -445,7 +445,7 @@ public class SyncFactory { String key = null; String[] propertyNames = null; - for (Enumeration e = p.propertyNames(); e.hasMoreElements();) { + for (Enumeration e = p.propertyNames(); e.hasMoreElements();) { String str = (String) e.nextElement(); @@ -541,7 +541,7 @@ public class SyncFactory { } // Attempt to invoke classname from registered SyncProvider list - Class c = null; + Class c = null; try { ClassLoader cl = Thread.currentThread().getContextClassLoader(); @@ -740,7 +740,7 @@ public class SyncFactory { */ private static Properties parseJNDIContext() throws NamingException { - NamingEnumeration bindings = ic.listBindings(""); + NamingEnumeration bindings = ic.listBindings(""); Properties properties = new Properties(); // Hunt one level below context for available SyncProvider objects @@ -755,7 +755,7 @@ public class SyncFactory { * scan the current context using a re-entrant call to this method until all * bindings have been enumerated. */ - private static void enumerateBindings(NamingEnumeration bindings, + private static void enumerateBindings(NamingEnumeration bindings, Properties properties) throws NamingException { boolean syncProviderObj = false; // move to parameters ? diff --git a/jdk/src/share/classes/sun/awt/im/CompositionArea.java b/jdk/src/share/classes/sun/awt/im/CompositionArea.java index 5e0a19db852..15eb0885225 100644 --- a/jdk/src/share/classes/sun/awt/im/CompositionArea.java +++ b/jdk/src/share/classes/sun/awt/im/CompositionArea.java @@ -313,4 +313,7 @@ public final class CompositionArea extends JPanel implements InputMethodListener compositionWindow.pack(); } + // Proclaim serial compatibility with 1.7.0 + private static final long serialVersionUID = -1057247068746557444L; + } diff --git a/jdk/src/share/classes/sun/awt/im/CompositionAreaHandler.java b/jdk/src/share/classes/sun/awt/im/CompositionAreaHandler.java index 7a5626dc571..6ae4a957ce2 100644 --- a/jdk/src/share/classes/sun/awt/im/CompositionAreaHandler.java +++ b/jdk/src/share/classes/sun/awt/im/CompositionAreaHandler.java @@ -257,7 +257,7 @@ class CompositionAreaHandler implements InputMethodListener, */ InputMethodRequests getClientInputMethodRequests() { if (clientComponent != null) { - return (InputMethodRequests) clientComponent.getInputMethodRequests(); + return clientComponent.getInputMethodRequests(); } return null; diff --git a/jdk/src/share/classes/sun/awt/im/InputContext.java b/jdk/src/share/classes/sun/awt/im/InputContext.java index 226b7f9ff79..27f05465d95 100644 --- a/jdk/src/share/classes/sun/awt/im/InputContext.java +++ b/jdk/src/share/classes/sun/awt/im/InputContext.java @@ -79,7 +79,7 @@ public class InputContext extends java.awt.im.InputContext private boolean inputMethodCreationFailed; // holding bin for previously used input method instances, but not the current one - private HashMap usedInputMethods; + private HashMap usedInputMethods; // the current client component is kept until the user focusses on a different // client component served by the same input context. When that happens, we call @@ -106,7 +106,7 @@ public class InputContext extends java.awt.im.InputContext // cache location notification private Rectangle clientWindowLocation = null; // holding the state of clientWindowNotificationEnabled of only non-current input methods - private HashMap perInputMethodState; + private HashMap perInputMethodState; // Input Method selection hot key stuff private static AWTKeyStroke inputMethodSelectionKey; @@ -219,6 +219,7 @@ public class InputContext extends java.awt.im.InputContext /** * @see java.awt.im.InputContext#dispatchEvent */ + @SuppressWarnings("fallthrough") public void dispatchEvent(AWTEvent event) { if (event instanceof InputMethodEvent) { @@ -394,7 +395,7 @@ public class InputContext extends java.awt.im.InputContext isInputMethodActive = true; if (perInputMethodState != null) { - Boolean state = (Boolean) perInputMethodState.remove(inputMethod); + Boolean state = perInputMethodState.remove(inputMethod); if (state != null) { clientWindowNotificationEnabled = state.booleanValue(); } @@ -549,10 +550,10 @@ public class InputContext extends java.awt.im.InputContext // keep the input method instance around for future use if (usedInputMethods == null) { - usedInputMethods = new HashMap(5); + usedInputMethods = new HashMap<>(5); } if (perInputMethodState == null) { - perInputMethodState = new HashMap(5); + perInputMethodState = new HashMap<>(5); } usedInputMethods.put(inputMethodLocator.deriveLocator(null), inputMethod); perInputMethodState.put(inputMethod, @@ -689,10 +690,10 @@ public class InputContext extends java.awt.im.InputContext } inputMethodLocator = null; if (usedInputMethods != null && !usedInputMethods.isEmpty()) { - Iterator iterator = usedInputMethods.values().iterator(); + Iterator iterator = usedInputMethods.values().iterator(); usedInputMethods = null; while (iterator.hasNext()) { - ((InputMethod) iterator.next()).dispose(); + iterator.next().dispose(); } } @@ -830,13 +831,13 @@ public class InputContext extends java.awt.im.InputContext // see whether we have a previously used input method if (usedInputMethods != null) { - inputMethodInstance = (InputMethod) usedInputMethods.remove(locator.deriveLocator(null)); + inputMethodInstance = usedInputMethods.remove(locator.deriveLocator(null)); if (inputMethodInstance != null) { if (locale != null) { inputMethodInstance.setLocale(locale); } inputMethodInstance.setCharacterSubsets(characterSubsets); - Boolean state = (Boolean) perInputMethodState.remove(inputMethodInstance); + Boolean state = perInputMethodState.remove(inputMethodInstance); if (state != null) { enableClientWindowNotification(inputMethodInstance, state.booleanValue()); } @@ -919,7 +920,7 @@ public class InputContext extends java.awt.im.InputContext // method becomes the current one. if (requester != inputMethod) { if (perInputMethodState == null) { - perInputMethodState = new HashMap(5); + perInputMethodState = new HashMap<>(5); } perInputMethodState.put(requester, Boolean.valueOf(enable)); return; @@ -1029,7 +1030,7 @@ public class InputContext extends java.awt.im.InputContext * Initializes the input method selection key definition in preference trees */ private void initializeInputMethodSelectionKey() { - AccessController.doPrivileged(new PrivilegedAction() { + AccessController.doPrivileged(new PrivilegedAction() { public Object run() { // Look in user's tree Preferences root = Preferences.userRoot(); diff --git a/jdk/src/share/classes/sun/awt/im/InputMethodContext.java b/jdk/src/share/classes/sun/awt/im/InputMethodContext.java index 78706ba4c97..98f35387931 100644 --- a/jdk/src/share/classes/sun/awt/im/InputMethodContext.java +++ b/jdk/src/share/classes/sun/awt/im/InputMethodContext.java @@ -72,12 +72,11 @@ public class InputMethodContext static { // check whether we should use below-the-spot input // get property from command line - String inputStyle = (String) AccessController.doPrivileged + String inputStyle = AccessController.doPrivileged (new GetPropertyAction("java.awt.im.style", null)); // get property from awt.properties file if (inputStyle == null) { - inputStyle = Toolkit.getDefaultToolkit(). - getProperty("java.awt.im.style", null); + inputStyle = Toolkit.getProperty("java.awt.im.style", null); } belowTheSpotInputRequested = "below-the-spot".equals(inputStyle); } diff --git a/jdk/src/share/classes/sun/awt/im/InputMethodJFrame.java b/jdk/src/share/classes/sun/awt/im/InputMethodJFrame.java index 602b46d4963..e83dc9eb1dd 100644 --- a/jdk/src/share/classes/sun/awt/im/InputMethodJFrame.java +++ b/jdk/src/share/classes/sun/awt/im/InputMethodJFrame.java @@ -68,4 +68,7 @@ public class InputMethodJFrame return super.getInputContext(); } } + + // Proclaim serial compatibility with 1.7.0 + private static final long serialVersionUID = -4705856747771842549L; } diff --git a/jdk/src/share/classes/sun/awt/im/InputMethodManager.java b/jdk/src/share/classes/sun/awt/im/InputMethodManager.java index 1b99c3d5815..0e15b7e7fce 100644 --- a/jdk/src/share/classes/sun/awt/im/InputMethodManager.java +++ b/jdk/src/share/classes/sun/awt/im/InputMethodManager.java @@ -270,7 +270,7 @@ class ExecutableInputMethodManager extends InputMethodManager // IM preference stuff private static final String preferredIMNode = "/sun/awt/im/preferredInputMethod"; private static final String descriptorKey = "descriptor"; - private Hashtable preferredLocatorCache = new Hashtable(); + private Hashtable preferredLocatorCache = new Hashtable<>(); private Preferences userRoot; ExecutableInputMethodManager() { @@ -430,7 +430,7 @@ class ExecutableInputMethodManager extends InputMethodManager synchronized (javaInputMethodLocatorList) { javaInputMethodLocatorList.clear(); try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { + AccessController.doPrivileged(new PrivilegedExceptionAction() { public Object run() { for (InputMethodDescriptor descriptor : ServiceLoader.loadInstalled(InputMethodDescriptor.class)) { @@ -611,7 +611,7 @@ class ExecutableInputMethodManager extends InputMethodManager } // look for the cached preference first. - preferredLocator = (InputMethodLocator)preferredLocatorCache.get(locale.toString().intern()); + preferredLocator = preferredLocatorCache.get(locale.toString().intern()); if (preferredLocator != null) { return preferredLocator; } @@ -767,8 +767,8 @@ class ExecutableInputMethodManager extends InputMethodManager } private Preferences getUserRoot() { - return (Preferences)AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { + return AccessController.doPrivileged(new PrivilegedAction() { + public Preferences run() { return Preferences.userRoot(); } }); diff --git a/jdk/src/share/classes/sun/awt/im/SimpleInputMethodWindow.java b/jdk/src/share/classes/sun/awt/im/SimpleInputMethodWindow.java index 2bcbdc316bd..5ed13409171 100644 --- a/jdk/src/share/classes/sun/awt/im/SimpleInputMethodWindow.java +++ b/jdk/src/share/classes/sun/awt/im/SimpleInputMethodWindow.java @@ -61,4 +61,7 @@ public class SimpleInputMethodWindow return super.getInputContext(); } } + + // Proclaim serial compatibility with 1.7.0 + private static final long serialVersionUID = 5093376647036461555L; } diff --git a/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java b/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java index 239f8834ac5..5910c4bb4a4 100644 --- a/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java +++ b/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java @@ -323,8 +323,8 @@ public class BufImgSurfaceData extends SurfaceData { } public RenderLoops getRenderLoops(SunGraphics2D sg2d) { - if (sg2d.paintState <= sg2d.PAINT_ALPHACOLOR && - sg2d.compositeState <= sg2d.COMP_ISCOPY) + if (sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR && + sg2d.compositeState <= SunGraphics2D.COMP_ISCOPY) { return solidloops; } diff --git a/jdk/src/share/classes/sun/instrument/InstrumentationImpl.java b/jdk/src/share/classes/sun/instrument/InstrumentationImpl.java index 359cdbdff3e..9957e1c64d4 100644 --- a/jdk/src/share/classes/sun/instrument/InstrumentationImpl.java +++ b/jdk/src/share/classes/sun/instrument/InstrumentationImpl.java @@ -136,7 +136,7 @@ public class InstrumentationImpl implements Instrumentation { } public void - retransformClasses(Class[] classes) { + retransformClasses(Class... classes) { if (!isRetransformClassesSupported()) { throw new UnsupportedOperationException( "retransformClasses is not supported in this environment"); @@ -150,7 +150,7 @@ public class InstrumentationImpl implements Instrumentation { } public void - redefineClasses(ClassDefinition[] definitions) + redefineClasses(ClassDefinition... definitions) throws ClassNotFoundException { if (!isRedefineClassesSupported()) { throw new UnsupportedOperationException("redefineClasses is not supported in this environment"); @@ -321,7 +321,7 @@ public class InstrumentationImpl implements Instrumentation { try { m = javaAgentClass.getDeclaredMethod( methodname, - new Class[] { + new Class[] { String.class, java.lang.instrument.Instrumentation.class } @@ -336,7 +336,7 @@ public class InstrumentationImpl implements Instrumentation { // now try the declared 1-arg method try { m = javaAgentClass.getDeclaredMethod(methodname, - new Class[] { String.class }); + new Class[] { String.class }); } catch (NoSuchMethodException x) { // ignore this exception because we'll try // two arg inheritance next @@ -347,7 +347,7 @@ public class InstrumentationImpl implements Instrumentation { // now try the inherited 2-arg method try { m = javaAgentClass.getMethod( methodname, - new Class[] { + new Class[] { String.class, java.lang.instrument.Instrumentation.class } @@ -363,7 +363,7 @@ public class InstrumentationImpl implements Instrumentation { // finally try the inherited 1-arg method try { m = javaAgentClass.getMethod(methodname, - new Class[] { String.class }); + new Class[] { String.class }); } catch (NoSuchMethodException x) { // none of the methods exists so we throw the // first NoSuchMethodException as per 5.0 @@ -411,7 +411,7 @@ public class InstrumentationImpl implements Instrumentation { private byte[] transform( ClassLoader loader, String classname, - Class classBeingRedefined, + Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer, boolean isRetransformer) { diff --git a/jdk/src/share/classes/sun/instrument/TransformerManager.java b/jdk/src/share/classes/sun/instrument/TransformerManager.java index 2f8cfa1ae0f..b0a020570ef 100644 --- a/jdk/src/share/classes/sun/instrument/TransformerManager.java +++ b/jdk/src/share/classes/sun/instrument/TransformerManager.java @@ -169,7 +169,7 @@ public class TransformerManager public byte[] transform( ClassLoader loader, String classname, - Class classBeingRedefined, + Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) { boolean someoneTouchedTheBytecode = false; diff --git a/jdk/src/share/classes/sun/java2d/SunGraphics2D.java b/jdk/src/share/classes/sun/java2d/SunGraphics2D.java index 8d9c2ea233f..4571b81167f 100644 --- a/jdk/src/share/classes/sun/java2d/SunGraphics2D.java +++ b/jdk/src/share/classes/sun/java2d/SunGraphics2D.java @@ -941,7 +941,7 @@ public final class SunGraphics2D } } } - Class paintClass = paint.getClass(); + Class paintClass = paint.getClass(); if (paintClass == GradientPaint.class) { paintState = PAINT_GRADIENT; } else if (paintClass == LinearGradientPaint.class) { @@ -1280,7 +1280,7 @@ public final class SunGraphics2D interpolationHint = -1; interpolationType = AffineTransformOp.TYPE_NEAREST_NEIGHBOR; boolean customHintPresent = false; - Iterator iter = hints.keySet().iterator(); + Iterator iter = hints.keySet().iterator(); while (iter.hasNext()) { Object key = iter.next(); if (key == SunHints.KEY_RENDERING || @@ -1311,7 +1311,7 @@ public final class SunGraphics2D */ public void addRenderingHints(Map hints) { boolean customHintPresent = false; - Iterator iter = hints.keySet().iterator(); + Iterator iter = hints.keySet().iterator(); while (iter.hasNext()) { Object key = iter.next(); if (key == SunHints.KEY_RENDERING || diff --git a/jdk/src/share/classes/sun/java2d/SurfaceData.java b/jdk/src/share/classes/sun/java2d/SurfaceData.java index 9916c5b38a8..bd882343862 100644 --- a/jdk/src/share/classes/sun/java2d/SurfaceData.java +++ b/jdk/src/share/classes/sun/java2d/SurfaceData.java @@ -520,8 +520,8 @@ public abstract class SurfaceData } public boolean canRenderParallelograms(SunGraphics2D sg2d) { - if (sg2d.paintState <= sg2d.PAINT_ALPHACOLOR) { - if (sg2d.compositeState == sg2d.COMP_XOR) { + if (sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR) { + if (sg2d.compositeState == SunGraphics2D.COMP_XOR) { if (havePgramXORLoop == LOOP_UNKNOWN) { FillParallelogram loop = FillParallelogram.locate(SurfaceType.AnyColor, @@ -531,9 +531,9 @@ public abstract class SurfaceData (loop != null) ? LOOP_FOUND : LOOP_NOTFOUND; } return havePgramXORLoop == LOOP_FOUND; - } else if (sg2d.compositeState <= sg2d.COMP_ISCOPY && + } else if (sg2d.compositeState <= SunGraphics2D.COMP_ISCOPY && sg2d.antialiasHint != SunHints.INTVAL_ANTIALIAS_ON && - sg2d.clipState != sg2d.CLIP_SHAPE) + sg2d.clipState != SunGraphics2D.CLIP_SHAPE) { if (havePgramSolidLoop == LOOP_UNKNOWN) { FillParallelogram loop = @@ -551,8 +551,8 @@ public abstract class SurfaceData public void validatePipe(SunGraphics2D sg2d) { sg2d.imagepipe = imagepipe; - if (sg2d.compositeState == sg2d.COMP_XOR) { - if (sg2d.paintState > sg2d.PAINT_ALPHACOLOR) { + if (sg2d.compositeState == SunGraphics2D.COMP_XOR) { + if (sg2d.paintState > SunGraphics2D.PAINT_ALPHACOLOR) { sg2d.drawpipe = paintViaShape; sg2d.fillpipe = paintViaShape; sg2d.shapepipe = paintShape; @@ -576,7 +576,7 @@ public abstract class SurfaceData converter = colorViaShape; sg2d.shapepipe = colorPrimitives; } - if (sg2d.clipState == sg2d.CLIP_SHAPE) { + if (sg2d.clipState == SunGraphics2D.CLIP_SHAPE) { sg2d.drawpipe = converter; sg2d.fillpipe = converter; // REMIND: We should not be changing text strategies @@ -589,11 +589,11 @@ public abstract class SurfaceData // which is not defined for XOR. sg2d.textpipe = outlineTextRenderer; } else { - if (sg2d.transformState >= sg2d.TRANSFORM_TRANSLATESCALE) { + if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) { sg2d.drawpipe = converter; sg2d.fillpipe = converter; } else { - if (sg2d.strokeState != sg2d.STROKE_THIN) { + if (sg2d.strokeState != SunGraphics2D.STROKE_THIN) { sg2d.drawpipe = converter; } else { sg2d.drawpipe = colorPrimitives; @@ -604,9 +604,9 @@ public abstract class SurfaceData } // assert(sg2d.surfaceData == this); } - } else if (sg2d.compositeState == sg2d.COMP_CUSTOM) { + } else if (sg2d.compositeState == SunGraphics2D.COMP_CUSTOM) { if (sg2d.antialiasHint == SunHints.INTVAL_ANTIALIAS_ON) { - if (sg2d.clipState == sg2d.CLIP_SHAPE) { + if (sg2d.clipState == SunGraphics2D.CLIP_SHAPE) { sg2d.drawpipe = AAClipCompViaShape; sg2d.fillpipe = AAClipCompViaShape; sg2d.shapepipe = AAClipCompViaShape; @@ -621,7 +621,7 @@ public abstract class SurfaceData sg2d.drawpipe = compViaShape; sg2d.fillpipe = compViaShape; sg2d.shapepipe = compShape; - if (sg2d.clipState == sg2d.CLIP_SHAPE) { + if (sg2d.clipState == SunGraphics2D.CLIP_SHAPE) { sg2d.textpipe = clipCompText; } else { sg2d.textpipe = compText; @@ -631,7 +631,7 @@ public abstract class SurfaceData sg2d.alphafill = getMaskFill(sg2d); // assert(sg2d.surfaceData == this); if (sg2d.alphafill != null) { - if (sg2d.clipState == sg2d.CLIP_SHAPE) { + if (sg2d.clipState == SunGraphics2D.CLIP_SHAPE) { sg2d.drawpipe = AAClipColorViaShape; sg2d.fillpipe = AAClipColorViaShape; sg2d.shapepipe = AAClipColorViaShape; @@ -644,8 +644,8 @@ public abstract class SurfaceData sg2d.drawpipe = converter; sg2d.fillpipe = converter; sg2d.shapepipe = converter; - if (sg2d.paintState > sg2d.PAINT_ALPHACOLOR || - sg2d.compositeState > sg2d.COMP_ISCOPY) + if (sg2d.paintState > SunGraphics2D.PAINT_ALPHACOLOR || + sg2d.compositeState > SunGraphics2D.COMP_ISCOPY) { sg2d.textpipe = colorText; } else { @@ -653,7 +653,7 @@ public abstract class SurfaceData } } } else { - if (sg2d.clipState == sg2d.CLIP_SHAPE) { + if (sg2d.clipState == SunGraphics2D.CLIP_SHAPE) { sg2d.drawpipe = AAClipPaintViaShape; sg2d.fillpipe = AAClipPaintViaShape; sg2d.shapepipe = AAClipPaintViaShape; @@ -665,9 +665,9 @@ public abstract class SurfaceData sg2d.textpipe = paintText; } } - } else if (sg2d.paintState > sg2d.PAINT_ALPHACOLOR || - sg2d.compositeState > sg2d.COMP_ISCOPY || - sg2d.clipState == sg2d.CLIP_SHAPE) + } else if (sg2d.paintState > SunGraphics2D.PAINT_ALPHACOLOR || + sg2d.compositeState > SunGraphics2D.COMP_ISCOPY || + sg2d.clipState == SunGraphics2D.CLIP_SHAPE) { sg2d.drawpipe = paintViaShape; sg2d.fillpipe = paintViaShape; @@ -675,13 +675,13 @@ public abstract class SurfaceData sg2d.alphafill = getMaskFill(sg2d); // assert(sg2d.surfaceData == this); if (sg2d.alphafill != null) { - if (sg2d.clipState == sg2d.CLIP_SHAPE) { + if (sg2d.clipState == SunGraphics2D.CLIP_SHAPE) { sg2d.textpipe = clipColorText; } else { sg2d.textpipe = colorText; } } else { - if (sg2d.clipState == sg2d.CLIP_SHAPE) { + if (sg2d.clipState == SunGraphics2D.CLIP_SHAPE) { sg2d.textpipe = clipPaintText; } else { sg2d.textpipe = paintText; @@ -700,11 +700,11 @@ public abstract class SurfaceData converter = colorViaShape; sg2d.shapepipe = colorPrimitives; } - if (sg2d.transformState >= sg2d.TRANSFORM_TRANSLATESCALE) { + if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) { sg2d.drawpipe = converter; sg2d.fillpipe = converter; } else { - if (sg2d.strokeState != sg2d.STROKE_THIN) { + if (sg2d.strokeState != SunGraphics2D.STROKE_THIN) { sg2d.drawpipe = converter; } else { sg2d.drawpipe = colorPrimitives; @@ -817,7 +817,7 @@ public abstract class SurfaceData private static CompositeType getFillCompositeType(SunGraphics2D sg2d) { CompositeType compType = sg2d.imageComp; - if (sg2d.compositeState == sg2d.COMP_ISCOPY) { + if (sg2d.compositeState == SunGraphics2D.COMP_ISCOPY) { if (compType == CompositeType.SrcOverNoEa) { compType = CompositeType.OpaqueSrcOverNoEa; } else { diff --git a/jdk/src/share/classes/sun/java2d/SurfaceDataProxy.java b/jdk/src/share/classes/sun/java2d/SurfaceDataProxy.java index 638579cfebe..fefb50797ca 100644 --- a/jdk/src/share/classes/sun/java2d/SurfaceDataProxy.java +++ b/jdk/src/share/classes/sun/java2d/SurfaceDataProxy.java @@ -71,7 +71,7 @@ public abstract class SurfaceDataProxy static { cachingAllowed = true; - String manimg = (String)AccessController.doPrivileged( + String manimg = AccessController.doPrivileged( new GetPropertyAction("sun.java2d.managedimages")); if (manimg != null && manimg.equals("false")) { cachingAllowed = false; @@ -79,7 +79,7 @@ public abstract class SurfaceDataProxy } defaultThreshold = 1; - String num = (String)AccessController.doPrivileged( + String num = AccessController.doPrivileged( new GetPropertyAction("sun.java2d.accthreshold")); if (num != null) { try { diff --git a/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java b/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java index 664d5ff7e47..205da2f0d3b 100644 --- a/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java +++ b/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java @@ -328,7 +328,7 @@ public abstract class GraphicsPrimitive { static { GetPropertyAction gpa = new GetPropertyAction("sun.java2d.trace"); - String trace = (String)AccessController.doPrivileged(gpa); + String trace = AccessController.doPrivileged(gpa); if (trace != null) { boolean verbose = false; int traceflags = 0; @@ -391,9 +391,9 @@ public abstract class GraphicsPrimitive { private static PrintStream getTraceOutputFile() { if (traceout == null) { if (tracefile != null) { - Object o = - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { + FileOutputStream o = AccessController.doPrivileged( + new PrivilegedAction() { + public FileOutputStream run() { try { return new FileOutputStream(tracefile); } catch (FileNotFoundException e) { @@ -402,7 +402,7 @@ public abstract class GraphicsPrimitive { } }); if (o != null) { - traceout = new PrintStream((OutputStream) o); + traceout = new PrintStream(o); } else { traceout = System.err; } @@ -415,8 +415,8 @@ public abstract class GraphicsPrimitive { public static class TraceReporter extends Thread { public static void setShutdownHook() { - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { + AccessController.doPrivileged(new PrivilegedAction() { + public Void run() { TraceReporter t = new TraceReporter(); t.setContextClassLoader(null); Runtime.getRuntime().addShutdownHook(t); diff --git a/jdk/src/share/classes/sun/java2d/loops/SurfaceType.java b/jdk/src/share/classes/sun/java2d/loops/SurfaceType.java index bcce58eb215..907c6f3c550 100644 --- a/jdk/src/share/classes/sun/java2d/loops/SurfaceType.java +++ b/jdk/src/share/classes/sun/java2d/loops/SurfaceType.java @@ -56,7 +56,7 @@ import java.util.HashMap; public final class SurfaceType { private static int unusedUID = 1; - private static HashMap surfaceUIDMap = new HashMap(100); + private static HashMap surfaceUIDMap = new HashMap<>(100); /* * CONSTANTS USED BY ALL PRIMITIVES TO DESCRIBE THE SURFACES @@ -402,7 +402,7 @@ public final class SurfaceType { } public synchronized static final int makeUniqueID(String desc) { - Integer i = (Integer) surfaceUIDMap.get((Object) desc); + Integer i = surfaceUIDMap.get(desc); if (i == null) { if (unusedUID > 255) { diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLBufImgOps.java b/jdk/src/share/classes/sun/java2d/opengl/OGLBufImgOps.java index 994b46ec8ea..8d8366bbc77 100644 --- a/jdk/src/share/classes/sun/java2d/opengl/OGLBufImgOps.java +++ b/jdk/src/share/classes/sun/java2d/opengl/OGLBufImgOps.java @@ -78,12 +78,12 @@ class OGLBufImgOps extends BufferedBufImgOps { } SurfaceData srcData = - dstData.getSourceSurfaceData(img, sg.TRANSFORM_ISIDENT, + dstData.getSourceSurfaceData(img, SunGraphics2D.TRANSFORM_ISIDENT, CompositeType.SrcOver, null); if (!(srcData instanceof OGLSurfaceData)) { // REMIND: this hack tries to ensure that we have a cached texture srcData = - dstData.getSourceSurfaceData(img, sg.TRANSFORM_ISIDENT, + dstData.getSourceSurfaceData(img, SunGraphics2D.TRANSFORM_ISIDENT, CompositeType.SrcOver, null); if (!(srcData instanceof OGLSurfaceData)) { return false; diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLDrawImage.java b/jdk/src/share/classes/sun/java2d/opengl/OGLDrawImage.java index 07a416ed950..9e373f22647 100644 --- a/jdk/src/share/classes/sun/java2d/opengl/OGLDrawImage.java +++ b/jdk/src/share/classes/sun/java2d/opengl/OGLDrawImage.java @@ -60,7 +60,7 @@ public class OGLDrawImage extends DrawImage { SurfaceData dstData = sg.surfaceData; SurfaceData srcData = dstData.getSourceSurfaceData(img, - sg.TRANSFORM_GENERIC, + SunGraphics2D.TRANSFORM_GENERIC, sg.imageComp, bgColor); diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLPaints.java b/jdk/src/share/classes/sun/java2d/opengl/OGLPaints.java index 24b839ba805..62d400153f7 100644 --- a/jdk/src/share/classes/sun/java2d/opengl/OGLPaints.java +++ b/jdk/src/share/classes/sun/java2d/opengl/OGLPaints.java @@ -123,14 +123,16 @@ abstract class OGLPaints { } SurfaceData srcData = - dstData.getSourceSurfaceData(bi, sg2d.TRANSFORM_ISIDENT, + dstData.getSourceSurfaceData(bi, + SunGraphics2D.TRANSFORM_ISIDENT, CompositeType.SrcOver, null); if (!(srcData instanceof OGLSurfaceData)) { // REMIND: this is a hack that attempts to cache the system // memory image from the TexturePaint instance into an // OpenGL texture... srcData = - dstData.getSourceSurfaceData(bi, sg2d.TRANSFORM_ISIDENT, + dstData.getSourceSurfaceData(bi, + SunGraphics2D.TRANSFORM_ISIDENT, CompositeType.SrcOver, null); if (!(srcData instanceof OGLSurfaceData)) { return false; diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java b/jdk/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java index ca6c9a65b01..3968f05d58f 100644 --- a/jdk/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java +++ b/jdk/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java @@ -428,18 +428,18 @@ public abstract class OGLSurfaceData extends SurfaceData // by the CompositeType.SrcNoEa (any color) test below.) if (/* CompositeType.SrcNoEa (any color) */ - (sg2d.compositeState <= sg2d.COMP_ISCOPY && - sg2d.paintState <= sg2d.PAINT_ALPHACOLOR) || + (sg2d.compositeState <= SunGraphics2D.COMP_ISCOPY && + sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR) || /* CompositeType.SrcOver (any color) */ - (sg2d.compositeState == sg2d.COMP_ALPHA && - sg2d.paintState <= sg2d.PAINT_ALPHACOLOR && + (sg2d.compositeState == SunGraphics2D.COMP_ALPHA && + sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR && (((AlphaComposite)sg2d.composite).getRule() == - AlphaComposite.SRC_OVER)) || + AlphaComposite.SRC_OVER)) || /* CompositeType.Xor (any color) */ - (sg2d.compositeState == sg2d.COMP_XOR && - sg2d.paintState <= sg2d.PAINT_ALPHACOLOR)) + (sg2d.compositeState == SunGraphics2D.COMP_XOR && + sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR)) { textpipe = oglTextPipe; } else { @@ -454,12 +454,12 @@ public abstract class OGLSurfaceData extends SurfaceData OGLRenderer nonTxPipe = null; if (sg2d.antialiasHint != SunHints.INTVAL_ANTIALIAS_ON) { - if (sg2d.paintState <= sg2d.PAINT_ALPHACOLOR) { - if (sg2d.compositeState <= sg2d.COMP_XOR) { + if (sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR) { + if (sg2d.compositeState <= SunGraphics2D.COMP_XOR) { txPipe = oglTxRenderPipe; nonTxPipe = oglRenderPipe; } - } else if (sg2d.compositeState <= sg2d.COMP_ALPHA) { + } else if (sg2d.compositeState <= SunGraphics2D.COMP_ALPHA) { if (OGLPaints.isValid(sg2d)) { txPipe = oglTxRenderPipe; nonTxPipe = oglRenderPipe; @@ -467,7 +467,7 @@ public abstract class OGLSurfaceData extends SurfaceData // custom paints handled by super.validatePipe() below } } else { - if (sg2d.paintState <= sg2d.PAINT_ALPHACOLOR) { + if (sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR) { if (graphicsConfig.isCapPresent(CAPS_PS30) && (sg2d.imageComp == CompositeType.SrcOverNoEa || sg2d.imageComp == CompositeType.SrcOver)) @@ -484,7 +484,7 @@ public abstract class OGLSurfaceData extends SurfaceData sg2d.drawpipe = aaConverter; sg2d.fillpipe = aaConverter; sg2d.shapepipe = aaConverter; - } else if (sg2d.compositeState == sg2d.COMP_XOR) { + } else if (sg2d.compositeState == SunGraphics2D.COMP_XOR) { // install the solid pipes when AA and XOR are both enabled txPipe = oglTxRenderPipe; nonTxPipe = oglRenderPipe; @@ -494,10 +494,10 @@ public abstract class OGLSurfaceData extends SurfaceData } if (txPipe != null) { - if (sg2d.transformState >= sg2d.TRANSFORM_TRANSLATESCALE) { + if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) { sg2d.drawpipe = txPipe; sg2d.fillpipe = txPipe; - } else if (sg2d.strokeState != sg2d.STROKE_THIN) { + } else if (sg2d.strokeState != SunGraphics2D.STROKE_THIN) { sg2d.drawpipe = txPipe; sg2d.fillpipe = nonTxPipe; } else { @@ -524,7 +524,7 @@ public abstract class OGLSurfaceData extends SurfaceData @Override protected MaskFill getMaskFill(SunGraphics2D sg2d) { - if (sg2d.paintState > sg2d.PAINT_ALPHACOLOR) { + if (sg2d.paintState > SunGraphics2D.PAINT_ALPHACOLOR) { /* * We can only accelerate non-Color MaskFill operations if * all of the following conditions hold true: @@ -548,8 +548,8 @@ public abstract class OGLSurfaceData extends SurfaceData public boolean copyArea(SunGraphics2D sg2d, int x, int y, int w, int h, int dx, int dy) { - if (sg2d.transformState < sg2d.TRANSFORM_TRANSLATESCALE && - sg2d.compositeState < sg2d.COMP_XOR) + if (sg2d.transformState < SunGraphics2D.TRANSFORM_TRANSLATESCALE && + sg2d.compositeState < SunGraphics2D.COMP_XOR) { x += sg2d.transX; y += sg2d.transY; diff --git a/jdk/src/share/classes/sun/java2d/pipe/AAShapePipe.java b/jdk/src/share/classes/sun/java2d/pipe/AAShapePipe.java index eaa821d9022..7da9b58ea10 100644 --- a/jdk/src/share/classes/sun/java2d/pipe/AAShapePipe.java +++ b/jdk/src/share/classes/sun/java2d/pipe/AAShapePipe.java @@ -144,7 +144,7 @@ public class AAShapePipe public void renderPath(SunGraphics2D sg, Shape s, BasicStroke bs) { boolean adjust = (bs != null && sg.strokeHint != SunHints.INTVAL_STROKE_PURE); - boolean thin = (sg.strokeState <= sg.STROKE_THINDASHED); + boolean thin = (sg.strokeState <= SunGraphics2D.STROKE_THINDASHED); Region clip = sg.getCompClip(); int abox[] = new int[4]; diff --git a/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java b/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java index 87ff6490bfd..afdfe6d2063 100644 --- a/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java +++ b/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java @@ -247,7 +247,7 @@ public class BufferedPaints { BufferedImage bi = paint.getImage(); SurfaceData dstData = sg2d.surfaceData; SurfaceData srcData = - dstData.getSourceSurfaceData(bi, sg2d.TRANSFORM_ISIDENT, + dstData.getSourceSurfaceData(bi, SunGraphics2D.TRANSFORM_ISIDENT, CompositeType.SrcOver, null); boolean filter = (sg2d.interpolationType != diff --git a/jdk/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java b/jdk/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java index c5f30976958..3270a463c4c 100644 --- a/jdk/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java +++ b/jdk/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java @@ -508,9 +508,9 @@ public abstract class BufferedRenderPipe } public void draw(SunGraphics2D sg2d, Shape s) { - if (sg2d.strokeState == sg2d.STROKE_THIN) { + if (sg2d.strokeState == SunGraphics2D.STROKE_THIN) { if (s instanceof Polygon) { - if (sg2d.transformState < sg2d.TRANSFORM_TRANSLATESCALE) { + if (sg2d.transformState < SunGraphics2D.TRANSFORM_TRANSLATESCALE) { Polygon p = (Polygon)s; drawPolygon(sg2d, p.xpoints, p.ypoints, p.npoints); return; @@ -518,7 +518,7 @@ public abstract class BufferedRenderPipe } Path2D.Float p2df; int transx, transy; - if (sg2d.transformState <= sg2d.TRANSFORM_INT_TRANSLATE) { + if (sg2d.transformState <= SunGraphics2D.TRANSFORM_INT_TRANSLATE) { if (s instanceof Path2D.Float) { p2df = (Path2D.Float)s; } else { @@ -532,7 +532,7 @@ public abstract class BufferedRenderPipe transy = 0; } drawPath(sg2d, p2df, transx, transy); - } else if (sg2d.strokeState < sg2d.STROKE_CUSTOM) { + } else if (sg2d.strokeState < SunGraphics2D.STROKE_CUSTOM) { ShapeSpanIterator si = LoopPipe.getStrokeSpans(sg2d, s); try { fillSpans(sg2d, si, 0, 0); @@ -547,11 +547,11 @@ public abstract class BufferedRenderPipe public void fill(SunGraphics2D sg2d, Shape s) { int transx, transy; - if (sg2d.strokeState == sg2d.STROKE_THIN) { + if (sg2d.strokeState == SunGraphics2D.STROKE_THIN) { // Here we are able to use fillPath() for // high-quality fills. Path2D.Float p2df; - if (sg2d.transformState <= sg2d.TRANSFORM_INT_TRANSLATE) { + if (sg2d.transformState <= SunGraphics2D.TRANSFORM_INT_TRANSLATE) { if (s instanceof Path2D.Float) { p2df = (Path2D.Float)s; } else { @@ -569,7 +569,7 @@ public abstract class BufferedRenderPipe } AffineTransform at; - if (sg2d.transformState <= sg2d.TRANSFORM_INT_TRANSLATE) { + if (sg2d.transformState <= SunGraphics2D.TRANSFORM_INT_TRANSLATE) { // Transform (translation) will be done by FillSpans (we could // delegate to fillPolygon() here, but most hardware accelerated // libraries cannot handle non-convex polygons, so we will use diff --git a/jdk/src/share/classes/sun/java2d/pipe/DrawImage.java b/jdk/src/share/classes/sun/java2d/pipe/DrawImage.java index f702a68be68..510a46bd253 100644 --- a/jdk/src/share/classes/sun/java2d/pipe/DrawImage.java +++ b/jdk/src/share/classes/sun/java2d/pipe/DrawImage.java @@ -146,7 +146,7 @@ public class DrawImage implements DrawImagePipe int imgh = img.getHeight(null); boolean checkfinalxform; - if (sg.transformState <= sg.TRANSFORM_ANY_TRANSLATE && + if (sg.transformState <= SunGraphics2D.TRANSFORM_ANY_TRANSLATE && (txtype == AffineTransform.TYPE_IDENTITY || txtype == AffineTransform.TYPE_TRANSLATION)) { @@ -166,7 +166,7 @@ public class DrawImage implements DrawImagePipe return; } checkfinalxform = false; - } else if (sg.transformState <= sg.TRANSFORM_TRANSLATESCALE && + } else if (sg.transformState <= SunGraphics2D.TRANSFORM_TRANSLATESCALE && ((txtype & (AffineTransform.TYPE_FLIP | AffineTransform.TYPE_MASK_ROTATION | AffineTransform.TYPE_GENERAL_TRANSFORM)) == 0)) @@ -344,14 +344,14 @@ public class DrawImage implements DrawImagePipe Region clip = sg.getCompClip(); SurfaceData dstData = sg.surfaceData; SurfaceData srcData = dstData.getSourceSurfaceData(img, - sg.TRANSFORM_GENERIC, + SunGraphics2D.TRANSFORM_GENERIC, sg.imageComp, bgColor); if (srcData == null) { img = getBufferedImage(img); srcData = dstData.getSourceSurfaceData(img, - sg.TRANSFORM_GENERIC, + SunGraphics2D.TRANSFORM_GENERIC, sg.imageComp, bgColor); if (srcData == null) { @@ -372,7 +372,7 @@ public class DrawImage implements DrawImagePipe sx1 = sy1 = 0; srcData = dstData.getSourceSurfaceData(img, - sg.TRANSFORM_GENERIC, + SunGraphics2D.TRANSFORM_GENERIC, sg.imageComp, bgColor); } @@ -398,7 +398,7 @@ public class DrawImage implements DrawImagePipe sx1 = sy1 = 0; srcData = dstData.getSourceSurfaceData(img, - sg.TRANSFORM_GENERIC, + SunGraphics2D.TRANSFORM_GENERIC, sg.imageComp, null); srcType = srcData.getSurfaceType(); @@ -449,7 +449,7 @@ public class DrawImage implements DrawImagePipe SurfaceType dstType = dstData.getSurfaceType(); MaskBlit maskblit; Blit blit; - if (sg.compositeState <= sg.COMP_ALPHA) { + if (sg.compositeState <= SunGraphics2D.COMP_ALPHA) { /* NOTE: We either have, or we can make, * a MaskBlit for any alpha composite type */ @@ -565,7 +565,7 @@ public class DrawImage implements DrawImagePipe while (true) { SurfaceData srcData = dstData.getSourceSurfaceData(img, - sg.TRANSFORM_ISIDENT, + SunGraphics2D.TRANSFORM_ISIDENT, sg.imageComp, bgColor); if (srcData == null) { @@ -628,7 +628,7 @@ public class DrawImage implements DrawImagePipe while (true) { SurfaceData srcData = dstData.getSourceSurfaceData(img, - sg.TRANSFORM_TRANSLATESCALE, + SunGraphics2D.TRANSFORM_TRANSLATESCALE, sg.imageComp, bgColor); @@ -800,11 +800,11 @@ public class DrawImage implements DrawImagePipe public static boolean isSimpleTranslate(SunGraphics2D sg) { int ts = sg.transformState; - if (ts <= sg.TRANSFORM_INT_TRANSLATE) { + if (ts <= SunGraphics2D.TRANSFORM_INT_TRANSLATE) { // Integer translates are always "simple" return true; } - if (ts >= sg.TRANSFORM_TRANSLATESCALE) { + if (ts >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) { // Scales and beyond are always "not simple" return false; } @@ -846,8 +846,11 @@ public class DrawImage implements DrawImagePipe } int type = tx.getType(); boolean needTrans = - ((type&(tx.TYPE_MASK_ROTATION|tx.TYPE_GENERAL_TRANSFORM)) != 0); - if (! needTrans && type != tx.TYPE_TRANSLATION && type != tx.TYPE_IDENTITY) + ((type & (AffineTransform.TYPE_MASK_ROTATION | + AffineTransform.TYPE_GENERAL_TRANSFORM)) != 0); + if (! needTrans && + type != AffineTransform.TYPE_TRANSLATION && + type != AffineTransform.TYPE_IDENTITY) { double[] mtx = new double[4]; tx.getMatrix(mtx); @@ -861,7 +864,7 @@ public class DrawImage implements DrawImagePipe Raster raster = bImg.getRaster(); IndexColorModel icm = (IndexColorModel) cm; // Just need to make sure that we have a transparent pixel - if (needTrans && cm.getTransparency() == cm.OPAQUE) { + if (needTrans && cm.getTransparency() == Transparency.OPAQUE) { // Fix 4221407 if (raster instanceof sun.awt.image.BytePackedRaster) { dstCM = ColorModel.getRGBdefault(); @@ -892,7 +895,7 @@ public class DrawImage implements DrawImagePipe } /* raster instanceof sun.awt.image.BytePackedRaster */ } /* if (cm.getTransparency() == cm.OPAQUE) */ } /* if (cm instanceof IndexColorModel) */ - else if (needTrans && cm.getTransparency() == cm.OPAQUE) { + else if (needTrans && cm.getTransparency() == Transparency.OPAQUE) { // Need a bitmask transparency // REMIND: for now, use full transparency since no loops // for bitmask @@ -902,7 +905,7 @@ public class DrawImage implements DrawImagePipe else { if (cm instanceof IndexColorModel || - (needTrans && cm.getTransparency() == cm.OPAQUE)) + (needTrans && cm.getTransparency() == Transparency.OPAQUE)) { // Need a bitmask transparency // REMIND: for now, use full transparency since no loops diff --git a/jdk/src/share/classes/sun/java2d/pipe/GlyphListPipe.java b/jdk/src/share/classes/sun/java2d/pipe/GlyphListPipe.java index 5a44749c4e9..0467290cb8b 100644 --- a/jdk/src/share/classes/sun/java2d/pipe/GlyphListPipe.java +++ b/jdk/src/share/classes/sun/java2d/pipe/GlyphListPipe.java @@ -54,7 +54,7 @@ public abstract class GlyphListPipe implements TextPipe { } float devx, devy; - if (sg2d.transformState >= sg2d.TRANSFORM_TRANSLATESCALE) { + if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) { double origin[] = {x + info.originX, y + info.originY}; sg2d.transform.transform(origin, 0, origin, 0, 1); devx = (float)origin[0]; @@ -90,7 +90,7 @@ public abstract class GlyphListPipe implements TextPipe { sg2d, data, offset, length, ix, iy); return; } - if (sg2d.transformState >= sg2d.TRANSFORM_TRANSLATESCALE) { + if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) { double origin[] = {ix + info.originX, iy + info.originY}; sg2d.transform.transform(origin, 0, origin, 0, 1); x = (float) origin[0]; @@ -122,7 +122,7 @@ public abstract class GlyphListPipe implements TextPipe { SurfaceData.outlineTextRenderer.drawGlyphVector(sg2d, gv, x, y); return; } - if (sg2d.transformState >= sg2d.TRANSFORM_TRANSLATESCALE) { + if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) { double origin[] = {x, y}; sg2d.transform.transform(origin, 0, origin, 0, 1); x = (float) origin[0]; diff --git a/jdk/src/share/classes/sun/java2d/pipe/LoopPipe.java b/jdk/src/share/classes/sun/java2d/pipe/LoopPipe.java index e975cc9c3cd..e70ab694795 100644 --- a/jdk/src/share/classes/sun/java2d/pipe/LoopPipe.java +++ b/jdk/src/share/classes/sun/java2d/pipe/LoopPipe.java @@ -171,11 +171,11 @@ public class LoopPipe public void draw(SunGraphics2D sg2d, Shape s) { - if (sg2d.strokeState == sg2d.STROKE_THIN) { + if (sg2d.strokeState == SunGraphics2D.STROKE_THIN) { Path2D.Float p2df; int transX; int transY; - if (sg2d.transformState <= sg2d.TRANSFORM_INT_TRANSLATE) { + if (sg2d.transformState <= SunGraphics2D.TRANSFORM_INT_TRANSLATE) { if (s instanceof Path2D.Float) { p2df = (Path2D.Float)s; } else { @@ -193,7 +193,7 @@ public class LoopPipe return; } - if (sg2d.strokeState == sg2d.STROKE_CUSTOM) { + if (sg2d.strokeState == SunGraphics2D.STROKE_CUSTOM) { fill(sg2d, sg2d.stroke.createStrokedShape(s)); return; } @@ -271,7 +271,7 @@ public class LoopPipe sr.setRule(PathIterator.WIND_NON_ZERO); BasicStroke bs = (BasicStroke) sg2d.stroke; - boolean thin = (sg2d.strokeState <= sg2d.STROKE_THINDASHED); + boolean thin = (sg2d.strokeState <= SunGraphics2D.STROKE_THINDASHED); boolean normalize = (sg2d.strokeHint != SunHints.INTVAL_STROKE_PURE); @@ -288,11 +288,11 @@ public class LoopPipe } public void fill(SunGraphics2D sg2d, Shape s) { - if (sg2d.strokeState == sg2d.STROKE_THIN) { + if (sg2d.strokeState == SunGraphics2D.STROKE_THIN) { Path2D.Float p2df; int transX; int transY; - if (sg2d.transformState <= sg2d.TRANSFORM_INT_TRANSLATE) { + if (sg2d.transformState <= SunGraphics2D.TRANSFORM_INT_TRANSLATE) { if (s instanceof Path2D.Float) { p2df = (Path2D.Float)s; } else { @@ -314,7 +314,7 @@ public class LoopPipe try { sr.setOutputArea(sg2d.getCompClip()); AffineTransform at = - ((sg2d.transformState == sg2d.TRANSFORM_ISIDENT) + ((sg2d.transformState == SunGraphics2D.TRANSFORM_ISIDENT) ? null : sg2d.transform); sr.appendPath(s.getPathIterator(at)); @@ -328,7 +328,7 @@ public class LoopPipe // REMIND: Eventually, the plan is that it will not be possible for // fs to be null since the FillSpans loop will be the fundamental // loop implemented for any destination type... - if (sg2d.clipState == sg2d.CLIP_SHAPE) { + if (sg2d.clipState == SunGraphics2D.CLIP_SHAPE) { si = sg2d.clipRegion.filter(si); // REMIND: Region.filter produces a Java-only iterator // with no native counterpart... diff --git a/jdk/src/share/classes/sun/java2d/pipe/RenderingEngine.java b/jdk/src/share/classes/sun/java2d/pipe/RenderingEngine.java index e2913ab45e3..83b691186ce 100644 --- a/jdk/src/share/classes/sun/java2d/pipe/RenderingEngine.java +++ b/jdk/src/share/classes/sun/java2d/pipe/RenderingEngine.java @@ -117,16 +117,16 @@ public abstract class RenderingEngine { return reImpl; } - reImpl = (RenderingEngine) - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { + reImpl = + AccessController.doPrivileged(new PrivilegedAction() { + public RenderingEngine run() { final String ductusREClass = "sun.dc.DuctusRenderingEngine"; String reClass = System.getProperty("sun.java2d.renderer", ductusREClass); if (reClass.equals(ductusREClass)) { try { - Class cls = Class.forName(ductusREClass); - return cls.newInstance(); + Class cls = Class.forName(ductusREClass); + return (RenderingEngine) cls.newInstance(); } catch (ReflectiveOperationException ignored) { // not found } @@ -153,7 +153,7 @@ public abstract class RenderingEngine { GetPropertyAction gpa = new GetPropertyAction("sun.java2d.renderer.trace"); - String reTrace = (String) AccessController.doPrivileged(gpa); + String reTrace = AccessController.doPrivileged(gpa); if (reTrace != null) { reImpl = new Tracer(reImpl); } diff --git a/jdk/src/share/classes/sun/launcher/LauncherHelper.java b/jdk/src/share/classes/sun/launcher/LauncherHelper.java index 24eeaca2cc1..2f3710bce10 100644 --- a/jdk/src/share/classes/sun/launcher/LauncherHelper.java +++ b/jdk/src/share/classes/sun/launcher/LauncherHelper.java @@ -428,7 +428,7 @@ public enum LauncherHelper { if (t != null) { t.printStackTrace(); } else { - Thread.currentThread().dumpStack(); + Thread.dumpStack(); } } System.exit(1); diff --git a/jdk/src/share/classes/sun/management/counter/perf/PerfInstrumentation.java b/jdk/src/share/classes/sun/management/counter/perf/PerfInstrumentation.java index 154174407ba..eb7ae7ac332 100644 --- a/jdk/src/share/classes/sun/management/counter/perf/PerfInstrumentation.java +++ b/jdk/src/share/classes/sun/management/counter/perf/PerfInstrumentation.java @@ -169,17 +169,15 @@ public class PerfInstrumentation { Matcher matcher = pattern.matcher(""); List matches = new ArrayList(); - Iterator iter = map.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry me = (Map.Entry) iter.next(); - String name = (String) me.getKey(); + for (Map.Entry me: map.entrySet()) { + String name = me.getKey(); // apply pattern to counter name matcher.reset(name); // if the pattern matches, then add Counter to list if (matcher.lookingAt()) { - matches.add((Counter)me.getValue()); + matches.add(me.getValue()); } } return matches; diff --git a/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java b/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java index 3e480891772..a3b318a8cec 100644 --- a/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java +++ b/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java @@ -233,16 +233,14 @@ public final class ConnectorBootstrap { "the access file [" + accessFile + "] as the " + "authenticated Subject is null"); } - final Set principals = subject.getPrincipals(); - for (Iterator i = principals.iterator(); i.hasNext();) { - final Principal p = (Principal) i.next(); + final Set principals = subject.getPrincipals(); + for (Principal p: principals) { if (properties.containsKey(p.getName())) { return; } } final Set principalsStr = new HashSet(); - for (Iterator i = principals.iterator(); i.hasNext();) { - final Principal p = (Principal) i.next(); + for (Principal p: principals) { principalsStr.add(p.getName()); } throw new SecurityException( @@ -653,7 +651,7 @@ public final class ConnectorBootstrap { } TrustManagerFactory tmf = TrustManagerFactory.getInstance( TrustManagerFactory.getDefaultAlgorithm()); - tmf.init((KeyStore) ts); + tmf.init(ts); SSLContext ctx = SSLContext.getInstance("SSL"); ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); diff --git a/jdk/src/share/classes/sun/misc/BASE64Decoder.java b/jdk/src/share/classes/sun/misc/BASE64Decoder.java index 63f1228ad98..d4132529f91 100644 --- a/jdk/src/share/classes/sun/misc/BASE64Decoder.java +++ b/jdk/src/share/classes/sun/misc/BASE64Decoder.java @@ -102,6 +102,7 @@ public class BASE64Decoder extends CharacterDecoder { /** * Decode one BASE64 atom into 1, 2, or 3 bytes of data. */ + @SuppressWarnings("fallthrough") protected void decodeAtom(PushbackInputStream inStream, OutputStream outStream, int rem) throws java.io.IOException { diff --git a/jdk/src/share/classes/sun/misc/CEFormatException.java b/jdk/src/share/classes/sun/misc/CEFormatException.java index 974a55ca116..0b3aa0514c6 100644 --- a/jdk/src/share/classes/sun/misc/CEFormatException.java +++ b/jdk/src/share/classes/sun/misc/CEFormatException.java @@ -28,7 +28,9 @@ package sun.misc; import java.io.IOException; public class CEFormatException extends IOException { - public CEFormatException(String s) { - super(s); - } + static final long serialVersionUID = -7139121221067081482L; + public CEFormatException(String s) { + super(s); + } } + diff --git a/jdk/src/share/classes/sun/misc/CEStreamExhausted.java b/jdk/src/share/classes/sun/misc/CEStreamExhausted.java index 28e0ffe6ae3..d346d550772 100644 --- a/jdk/src/share/classes/sun/misc/CEStreamExhausted.java +++ b/jdk/src/share/classes/sun/misc/CEStreamExhausted.java @@ -27,4 +27,7 @@ package sun.misc; import java.io.IOException; /** This exception is thrown when EOF is reached */ -public class CEStreamExhausted extends IOException { }; +public class CEStreamExhausted extends IOException { + static final long serialVersionUID = -5889118049525891904L; +} + diff --git a/jdk/src/share/classes/sun/misc/ClassLoaderUtil.java b/jdk/src/share/classes/sun/misc/ClassLoaderUtil.java index 61106dbb73b..81f00d4ac40 100644 --- a/jdk/src/share/classes/sun/misc/ClassLoaderUtil.java +++ b/jdk/src/share/classes/sun/misc/ClassLoaderUtil.java @@ -79,9 +79,9 @@ public class ClassLoaderUtil { URLClassPath ucp = SharedSecrets.getJavaNetAccess() .getURLClassPath(classLoader); - ArrayList loaders = ucp.loaders; - Stack urls = ucp.urls; - HashMap lmap = ucp.lmap; + ArrayList loaders = ucp.loaders; + Stack urls = ucp.urls; + HashMap lmap = ucp.lmap; /* *The urls variable in the URLClassPath object holds URLs that have not yet diff --git a/jdk/src/share/classes/sun/misc/CompoundEnumeration.java b/jdk/src/share/classes/sun/misc/CompoundEnumeration.java index 69de7f89753..fc3ecea3e9f 100644 --- a/jdk/src/share/classes/sun/misc/CompoundEnumeration.java +++ b/jdk/src/share/classes/sun/misc/CompoundEnumeration.java @@ -33,10 +33,10 @@ import java.util.NoSuchElementException; * enumerations. */ public class CompoundEnumeration implements Enumeration { - private Enumeration[] enums; + private Enumeration[] enums; private int index = 0; - public CompoundEnumeration(Enumeration[] enums) { + public CompoundEnumeration(Enumeration[] enums) { this.enums = enums; } @@ -58,6 +58,6 @@ public class CompoundEnumeration implements Enumeration { if (!next()) { throw new NoSuchElementException(); } - return (E)enums[index].nextElement(); + return enums[index].nextElement(); } } diff --git a/jdk/src/share/classes/sun/misc/ExtensionDependency.java b/jdk/src/share/classes/sun/misc/ExtensionDependency.java index ca9ad721486..81a77747178 100644 --- a/jdk/src/share/classes/sun/misc/ExtensionDependency.java +++ b/jdk/src/share/classes/sun/misc/ExtensionDependency.java @@ -70,7 +70,7 @@ import sun.net.www.ParseUtil; public class ExtensionDependency { /* Callbak interfaces to delegate installation of missing extensions */ - private static Vector providers; + private static Vector providers; /** *

    @@ -83,7 +83,7 @@ public class ExtensionDependency { (ExtensionInstallationProvider eip) { if (providers == null) { - providers = new Vector(); + providers = new Vector<>(); } providers.add(eip); } @@ -93,7 +93,7 @@ public class ExtensionDependency { * Unregister a previously installed installation provider *

    */ - public synchronized static void removeExtensionInstallationProvider + public synchronized static void removeExtensionInstallationProvider (ExtensionInstallationProvider eip) { providers.remove(eip); @@ -348,14 +348,16 @@ public class ExtensionDependency { ExtensionInfo instInfo) throws ExtensionInstallationException { - - Vector currentProviders; + Vector currentProviders; synchronized(providers) { - currentProviders = (Vector) providers.clone(); + @SuppressWarnings("unchecked") + Vector tmp = + (Vector) providers.clone(); + currentProviders = tmp; } - for (Enumeration e=currentProviders.elements();e.hasMoreElements();) { - ExtensionInstallationProvider eip = - (ExtensionInstallationProvider) e.nextElement(); + for (Enumeration e = currentProviders.elements(); + e.hasMoreElements();) { + ExtensionInstallationProvider eip = e.nextElement(); if (eip!=null) { // delegate the installation to the provider diff --git a/jdk/src/share/classes/sun/misc/ExtensionInstallationException.java b/jdk/src/share/classes/sun/misc/ExtensionInstallationException.java index 61f484a786d..156ba0babb4 100644 --- a/jdk/src/share/classes/sun/misc/ExtensionInstallationException.java +++ b/jdk/src/share/classes/sun/misc/ExtensionInstallationException.java @@ -34,6 +34,8 @@ package sun.misc; public class ExtensionInstallationException extends Exception { + static final long serialVersionUID = 3139688306909345924L; + /* *

    * Construct a new exception with an exception reason diff --git a/jdk/src/share/classes/sun/misc/FloatingDecimal.java b/jdk/src/share/classes/sun/misc/FloatingDecimal.java index 4df0487c88e..478f120035c 100644 --- a/jdk/src/share/classes/sun/misc/FloatingDecimal.java +++ b/jdk/src/share/classes/sun/misc/FloatingDecimal.java @@ -325,7 +325,7 @@ public class FloatingDecimal{ // can do int arithmetic rather than long! int ivalue = (int)lvalue; ndigits = 10; - digits = (char[])(perThreadBuffer.get()); + digits = perThreadBuffer.get(); digitno = ndigits-1; c = ivalue%10; ivalue /= 10; @@ -345,7 +345,7 @@ public class FloatingDecimal{ // same algorithm as above (same bugs, too ) // but using long arithmetic. ndigits = 20; - digits = (char[])(perThreadBuffer.get()); + digits = perThreadBuffer.get(); digitno = ndigits-1; c = (int)(lvalue%10L); lvalue /= 10L; @@ -477,9 +477,9 @@ public class FloatingDecimal{ } // Begin to unpack // Discover obvious special cases of NaN and Infinity. - binExp = (int)( (fBits&singleExpMask) >> singleExpShift ); + binExp = (fBits&singleExpMask) >> singleExpShift; fractBits = fBits&singleFractMask; - if ( binExp == (int)(singleExpMask>>singleExpShift) ) { + if ( binExp == (singleExpMask>>singleExpShift) ) { isExceptional = true; if ( fractBits == 0L ){ digits = infinity; @@ -900,7 +900,7 @@ public class FloatingDecimal{ } public String toJavaFormatString() { - char result[] = (char[])(perThreadBuffer.get()); + char result[] = perThreadBuffer.get(); int i = getChars(result); return new String(result, 0, i); } @@ -978,14 +978,14 @@ public class FloatingDecimal{ } // Per-thread buffer for string/stringbuffer conversion - private static ThreadLocal perThreadBuffer = new ThreadLocal() { - protected synchronized Object initialValue() { + private static ThreadLocal perThreadBuffer = new ThreadLocal() { + protected synchronized char[] initialValue() { return new char[26]; } }; public void appendTo(Appendable buf) { - char result[] = (char[])(perThreadBuffer.get()); + char result[] = perThreadBuffer.get(); int i = getChars(result); if (buf instanceof StringBuilder) ((StringBuilder) buf).append(result, 0, i); @@ -995,6 +995,7 @@ public class FloatingDecimal{ assert false; } + @SuppressWarnings("fallthrough") public static FloatingDecimal readJavaFormatString( String in ) throws NumberFormatException { boolean isNegative = false; @@ -2209,7 +2210,7 @@ public class FloatingDecimal{ // exponent correctly, even in the case of // Double.MAX_VALUE overflowing to infinity. - significand = (( ((long)exponent + + significand = (( (exponent + (long)DoubleConsts.EXP_BIAS) << (DoubleConsts.SIGNIFICAND_WIDTH-1)) & DoubleConsts.EXP_BIT_MASK) | diff --git a/jdk/src/share/classes/sun/misc/FormattedFloatingDecimal.java b/jdk/src/share/classes/sun/misc/FormattedFloatingDecimal.java index 261dbc07e2f..5532b92c3ea 100644 --- a/jdk/src/share/classes/sun/misc/FormattedFloatingDecimal.java +++ b/jdk/src/share/classes/sun/misc/FormattedFloatingDecimal.java @@ -333,7 +333,7 @@ public class FormattedFloatingDecimal{ // can do int arithmetic rather than long! int ivalue = (int)lvalue; ndigits = 10; - digits = (char[])(perThreadBuffer.get()); + digits = perThreadBuffer.get(); digitno = ndigits-1; c = ivalue%10; ivalue /= 10; @@ -353,7 +353,7 @@ public class FormattedFloatingDecimal{ // same algorithm as above (same bugs, too ) // but using long arithmetic. ndigits = 20; - digits = (char[])(perThreadBuffer.get()); + digits = perThreadBuffer.get(); digitno = ndigits-1; c = (int)(lvalue%10L); lvalue /= 10L; @@ -554,9 +554,9 @@ public class FormattedFloatingDecimal{ } // Begin to unpack // Discover obvious special cases of NaN and Infinity. - binExp = (int)( (fBits&singleExpMask) >> singleExpShift ); + binExp = (fBits&singleExpMask) >> singleExpShift; fractBits = fBits&singleFractMask; - if ( binExp == (int)(singleExpMask>>singleExpShift) ) { + if ( binExp == (singleExpMask>>singleExpShift) ) { isExceptional = true; if ( fractBits == 0L ){ digits = infinity; @@ -1140,8 +1140,8 @@ public class FormattedFloatingDecimal{ } // Per-thread buffer for string/stringbuffer conversion - private static ThreadLocal perThreadBuffer = new ThreadLocal() { - protected synchronized Object initialValue() { + private static ThreadLocal perThreadBuffer = new ThreadLocal() { + protected synchronized char[] initialValue() { return new char[26]; } }; diff --git a/jdk/src/share/classes/sun/misc/InvalidJarIndexException.java b/jdk/src/share/classes/sun/misc/InvalidJarIndexException.java index 83e81991f7d..4c6de5d1d83 100644 --- a/jdk/src/share/classes/sun/misc/InvalidJarIndexException.java +++ b/jdk/src/share/classes/sun/misc/InvalidJarIndexException.java @@ -38,6 +38,8 @@ import java.lang.LinkageError; public class InvalidJarIndexException extends RuntimeException { + static final long serialVersionUID = -6159797516569680148L; + /** * Constructs an InvalidJarIndexException with no * detail message. diff --git a/jdk/src/share/classes/sun/misc/JarIndex.java b/jdk/src/share/classes/sun/misc/JarIndex.java index f9781d65a0d..02f3c529c43 100644 --- a/jdk/src/share/classes/sun/misc/JarIndex.java +++ b/jdk/src/share/classes/sun/misc/JarIndex.java @@ -48,13 +48,13 @@ public class JarIndex { * The hash map that maintains mappings from * package/classe/resource to jar file list(s) */ - private HashMap indexMap; + private HashMap> indexMap; /** * The hash map that maintains mappings from * jar file to package/class/resource lists */ - private HashMap jarMap; + private HashMap> jarMap; /* * An ordered list of jar file names. @@ -78,8 +78,8 @@ public class JarIndex { * Constructs a new, empty jar index. */ public JarIndex() { - indexMap = new HashMap(); - jarMap = new HashMap(); + indexMap = new HashMap<>(); + jarMap = new HashMap<>(); } /** @@ -150,10 +150,11 @@ public class JarIndex { * Add the key, value pair to the hashmap, the value will * be put in a linked list which is created if necessary. */ - private void addToList(String key, String value, HashMap t) { - LinkedList list = (LinkedList)t.get(key); + private void addToList(String key, String value, + HashMap> t) { + LinkedList list = t.get(key); if (list == null) { - list = new LinkedList(); + list = new LinkedList<>(); list.add(value); t.put(key, list); } else if (!list.contains(value)) { @@ -166,13 +167,13 @@ public class JarIndex { * * @param fileName the key of the mapping */ - public LinkedList get(String fileName) { - LinkedList jarFiles = null; - if ((jarFiles = (LinkedList)indexMap.get(fileName)) == null) { + public LinkedList get(String fileName) { + LinkedList jarFiles = null; + if ((jarFiles = indexMap.get(fileName)) == null) { /* try the package name again */ int pos; if((pos = fileName.lastIndexOf("/")) != -1) { - jarFiles = (LinkedList)indexMap.get(fileName.substring(0, pos)); + jarFiles = indexMap.get(fileName.substring(0, pos)); } } return jarFiles; @@ -235,9 +236,9 @@ public class JarIndex { ZipFile zrf = new ZipFile(currentJar.replace ('/', File.separatorChar)); - Enumeration entries = zrf.entries(); + Enumeration entries = zrf.entries(); while(entries.hasMoreElements()) { - ZipEntry entry = (ZipEntry) entries.nextElement(); + ZipEntry entry = entries.nextElement(); String fileName = entry.getName(); // Skip the META-INF directory, the index, and manifest. @@ -282,11 +283,11 @@ public class JarIndex { /* print out the jar file name */ String jar = jarFiles[i]; bw.write(jar + "\n"); - LinkedList jarlist = (LinkedList)jarMap.get(jar); + LinkedList jarlist = jarMap.get(jar); if (jarlist != null) { - Iterator listitr = jarlist.iterator(); + Iterator listitr = jarlist.iterator(); while(listitr.hasNext()) { - bw.write((String)(listitr.next()) + "\n"); + bw.write(listitr.next() + "\n"); } } bw.write("\n"); @@ -309,7 +310,7 @@ public class JarIndex { String currentJar = null; /* an ordered list of jar file names */ - Vector jars = new Vector(); + Vector jars = new Vector<>(); /* read until we see a .jar line */ while((line = br.readLine()) != null && !line.endsWith(".jar")); @@ -328,7 +329,7 @@ public class JarIndex { } } - jarFiles = (String[])jars.toArray(new String[jars.size()]); + jarFiles = jars.toArray(new String[jars.size()]); } /** @@ -342,14 +343,14 @@ public class JarIndex { * */ public void merge(JarIndex toIndex, String path) { - Iterator itr = indexMap.entrySet().iterator(); + Iterator>> itr = indexMap.entrySet().iterator(); while(itr.hasNext()) { - Map.Entry e = (Map.Entry)itr.next(); - String packageName = (String)e.getKey(); - LinkedList from_list = (LinkedList)e.getValue(); - Iterator listItr = from_list.iterator(); + Map.Entry> e = itr.next(); + String packageName = e.getKey(); + LinkedList from_list = e.getValue(); + Iterator listItr = from_list.iterator(); while(listItr.hasNext()) { - String jarName = (String)listItr.next(); + String jarName = listItr.next(); if (path != null) { jarName = path.concat(jarName); } diff --git a/jdk/src/share/classes/sun/misc/JavaLangAccess.java b/jdk/src/share/classes/sun/misc/JavaLangAccess.java index c61f590cdda..d4805d87d45 100644 --- a/jdk/src/share/classes/sun/misc/JavaLangAccess.java +++ b/jdk/src/share/classes/sun/misc/JavaLangAccess.java @@ -31,19 +31,19 @@ import sun.nio.ch.Interruptible; public interface JavaLangAccess { /** Return the constant pool for a class. */ - ConstantPool getConstantPool(Class klass); + ConstantPool getConstantPool(Class klass); /** * Set the AnnotationType instance corresponding to this class. * (This method only applies to annotation types.) */ - void setAnnotationType(Class klass, AnnotationType annotationType); + void setAnnotationType(Class klass, AnnotationType annotationType); /** * Get the AnnotationType instance corresponding to this class. * (This method only applies to annotation types.) */ - AnnotationType getAnnotationType(Class klass); + AnnotationType getAnnotationType(Class klass); /** * Returns the elements of an enum class or null if the diff --git a/jdk/src/share/classes/sun/misc/JavaUtilJarAccess.java b/jdk/src/share/classes/sun/misc/JavaUtilJarAccess.java index 0f1efd1d2cb..81654824c3a 100644 --- a/jdk/src/share/classes/sun/misc/JavaUtilJarAccess.java +++ b/jdk/src/share/classes/sun/misc/JavaUtilJarAccess.java @@ -40,5 +40,5 @@ public interface JavaUtilJarAccess { public Enumeration entryNames(JarFile jar, CodeSource[] cs); public Enumeration entries2(JarFile jar); public void setEagerValidation(JarFile jar, boolean eager); - public List getManifestDigests(JarFile jar); + public List getManifestDigests(JarFile jar); } diff --git a/jdk/src/share/classes/sun/misc/LRUCache.java b/jdk/src/share/classes/sun/misc/LRUCache.java index d4b95547bc9..f40f65a7a80 100644 --- a/jdk/src/share/classes/sun/misc/LRUCache.java +++ b/jdk/src/share/classes/sun/misc/LRUCache.java @@ -52,7 +52,9 @@ public abstract class LRUCache { public V forName(N name) { if (oa == null) { - oa = (V[])new Object[size]; + @SuppressWarnings("unchecked") + V[] temp = (V[])new Object[size]; + oa = temp; } else { for (int i = 0; i < oa.length; i++) { V ob = oa[i]; diff --git a/jdk/src/share/classes/sun/misc/Launcher.java b/jdk/src/share/classes/sun/misc/Launcher.java index 3d9b336edc2..71b3d3bbce8 100644 --- a/jdk/src/share/classes/sun/misc/Launcher.java +++ b/jdk/src/share/classes/sun/misc/Launcher.java @@ -295,7 +295,7 @@ public class Launcher { /** * Override loadClass so we can checkPackageAccess. */ - public Class loadClass(String name, boolean resolve) + public Class loadClass(String name, boolean resolve) throws ClassNotFoundException { int i = name.lastIndexOf('.'); @@ -473,7 +473,7 @@ public class Launcher { public URLStreamHandler createURLStreamHandler(String protocol) { String name = PREFIX + "." + protocol + ".Handler"; try { - Class c = Class.forName(name); + Class c = Class.forName(name); return (URLStreamHandler)c.newInstance(); } catch (ReflectiveOperationException e) { throw new InternalError("could not load " + protocol + diff --git a/jdk/src/share/classes/sun/misc/ProxyGenerator.java b/jdk/src/share/classes/sun/misc/ProxyGenerator.java index c66f82ce8f1..4b5e3613336 100644 --- a/jdk/src/share/classes/sun/misc/ProxyGenerator.java +++ b/jdk/src/share/classes/sun/misc/ProxyGenerator.java @@ -351,7 +351,7 @@ public class ProxyGenerator { try { hashCodeMethod = Object.class.getMethod("hashCode"); equalsMethod = - Object.class.getMethod("equals", new Class[] { Object.class }); + Object.class.getMethod("equals", new Class[] { Object.class }); toStringMethod = Object.class.getMethod("toString"); } catch (NoSuchMethodException e) { throw new NoSuchMethodError(e.getMessage()); @@ -559,11 +559,11 @@ public class ProxyGenerator { * passed to the invocation handler's "invoke" method for a given * set of duplicate methods. */ - private void addProxyMethod(Method m, Class fromClass) { + private void addProxyMethod(Method m, Class fromClass) { String name = m.getName(); - Class[] parameterTypes = m.getParameterTypes(); - Class returnType = m.getReturnType(); - Class[] exceptionTypes = m.getExceptionTypes(); + Class[] parameterTypes = m.getParameterTypes(); + Class returnType = m.getReturnType(); + Class[] exceptionTypes = m.getExceptionTypes(); String sig = name + getParameterDescriptors(parameterTypes); List sigmethods = proxyMethods.get(sig); @@ -581,7 +581,7 @@ public class ProxyGenerator { exceptionTypes, pm.exceptionTypes, legalExceptions); collectCompatibleTypes( pm.exceptionTypes, exceptionTypes, legalExceptions); - pm.exceptionTypes = new Class[legalExceptions.size()]; + pm.exceptionTypes = new Class[legalExceptions.size()]; pm.exceptionTypes = legalExceptions.toArray(pm.exceptionTypes); return; @@ -848,15 +848,15 @@ public class ProxyGenerator { private class ProxyMethod { public String methodName; - public Class[] parameterTypes; - public Class returnType; - public Class[] exceptionTypes; - public Class fromClass; + public Class[] parameterTypes; + public Class returnType; + public Class[] exceptionTypes; + public Class fromClass; public String methodFieldName; - private ProxyMethod(String methodName, Class[] parameterTypes, - Class returnType, Class[] exceptionTypes, - Class fromClass) + private ProxyMethod(String methodName, Class[] parameterTypes, + Class returnType, Class[] exceptionTypes, + Class fromClass) { this.methodName = methodName; this.parameterTypes = parameterTypes; @@ -1001,7 +1001,7 @@ public class ProxyGenerator { * invocation handler's "invoke" method. The code is written * to the supplied stream. */ - private void codeWrapArgument(Class type, int slot, + private void codeWrapArgument(Class type, int slot, DataOutputStream out) throws IOException { @@ -1042,7 +1042,7 @@ public class ProxyGenerator { * Object) to its correct type. The code is written to the * supplied stream. */ - private void codeUnwrapReturnValue(Class type, DataOutputStream out) + private void codeUnwrapReturnValue(Class type, DataOutputStream out) throws IOException { if (type.isPrimitive()) { @@ -1391,7 +1391,7 @@ public class ProxyGenerator { * the supplied stream. Note that the code generated by this method * may caused the checked ClassNotFoundException to be thrown. */ - private void codeClassForName(Class cl, DataOutputStream out) + private void codeClassForName(Class cl, DataOutputStream out) throws IOException { code_ldc(cp.getString(cl.getName()), out); @@ -1422,8 +1422,8 @@ public class ProxyGenerator { * Return the "method descriptor" string for a method with the given * parameter types and return type. See JVMS section 4.3.3. */ - private static String getMethodDescriptor(Class[] parameterTypes, - Class returnType) + private static String getMethodDescriptor(Class[] parameterTypes, + Class returnType) { return getParameterDescriptors(parameterTypes) + ((returnType == void.class) ? "V" : getFieldType(returnType)); @@ -1436,7 +1436,7 @@ public class ProxyGenerator { * string is useful for constructing string keys for methods without * regard to their return type. */ - private static String getParameterDescriptors(Class[] parameterTypes) { + private static String getParameterDescriptors(Class[] parameterTypes) { StringBuilder desc = new StringBuilder("("); for (int i = 0; i < parameterTypes.length; i++) { desc.append(getFieldType(parameterTypes[i])); @@ -1450,7 +1450,7 @@ public class ProxyGenerator { * a field descriptor, a parameter descriptor, or a return descriptor * other than "void". See JVMS section 4.3.2. */ - private static String getFieldType(Class type) { + private static String getFieldType(Class type) { if (type.isPrimitive()) { return PrimitiveTypeInfo.get(type).baseTypeString; } else if (type.isArray()) { @@ -1472,7 +1472,7 @@ public class ProxyGenerator { * method with the given name and parameter types. */ private static String getFriendlyMethodSignature(String name, - Class[] parameterTypes) + Class[] parameterTypes) { StringBuilder sig = new StringBuilder(name); sig.append('('); @@ -1480,7 +1480,7 @@ public class ProxyGenerator { if (i > 0) { sig.append(','); } - Class parameterType = parameterTypes[i]; + Class parameterType = parameterTypes[i]; int dimensions = 0; while (parameterType.isArray()) { parameterType = parameterType.getComponentType(); @@ -1504,7 +1504,7 @@ public class ProxyGenerator { * this abstract notion of a "word" in section 3.4, but that definition * was removed for the second edition. */ - private static int getWordsPerType(Class type) { + private static int getWordsPerType(Class type) { if (type == long.class || type == double.class) { return 2; } else { @@ -1632,8 +1632,7 @@ public class ProxyGenerator { /** descriptor of same method */ public String unwrapMethodDesc; - private static Map table = - new HashMap(); + private static Map,PrimitiveTypeInfo> table = new HashMap<>(); static { add(byte.class, Byte.class); add(char.class, Character.class); @@ -1645,12 +1644,12 @@ public class ProxyGenerator { add(boolean.class, Boolean.class); } - private static void add(Class primitiveClass, Class wrapperClass) { + private static void add(Class primitiveClass, Class wrapperClass) { table.put(primitiveClass, new PrimitiveTypeInfo(primitiveClass, wrapperClass)); } - private PrimitiveTypeInfo(Class primitiveClass, Class wrapperClass) { + private PrimitiveTypeInfo(Class primitiveClass, Class wrapperClass) { assert primitiveClass.isPrimitive(); baseTypeString = @@ -1663,7 +1662,7 @@ public class ProxyGenerator { unwrapMethodDesc = "()" + baseTypeString; } - public static PrimitiveTypeInfo get(Class cl) { + public static PrimitiveTypeInfo get(Class cl) { return table.get(cl); } } @@ -1694,7 +1693,7 @@ public class ProxyGenerator { * and for assigning the next index value. Note that element 0 * of this list corresponds to constant pool index 1. */ - private List pool = new ArrayList(32); + private List pool = new ArrayList<>(32); /** * maps constant pool data of all types to constant pool indexes. @@ -1702,7 +1701,7 @@ public class ProxyGenerator { * This map is used to look up the index of an existing entry for * values of all types. */ - private Map map = new HashMap(16); + private Map map = new HashMap<>(16); /** true if no new constant pool entries may be added */ private boolean readOnly = false; diff --git a/jdk/src/share/classes/sun/misc/Queue.java b/jdk/src/share/classes/sun/misc/Queue.java index 4edc8c9187b..5a447a54bb5 100644 --- a/jdk/src/share/classes/sun/misc/Queue.java +++ b/jdk/src/share/classes/sun/misc/Queue.java @@ -35,12 +35,12 @@ import java.util.NoSuchElementException; * @author Herb Jellinek */ -public class Queue { +public class Queue { int length = 0; - QueueElement head = null; - QueueElement tail = null; + QueueElement head = null; + QueueElement tail = null; public Queue() { } @@ -48,9 +48,9 @@ public class Queue { /** * Enqueue an object. */ - public synchronized void enqueue(Object obj) { + public synchronized void enqueue(T obj) { - QueueElement newElt = new QueueElement(obj); + QueueElement newElt = new QueueElement<>(obj); if (head == null) { head = newElt; @@ -72,7 +72,7 @@ public class Queue { * @exception java.lang.InterruptedException if any thread has * interrupted this thread. */ - public Object dequeue() throws InterruptedException { + public T dequeue() throws InterruptedException { return dequeue(0L); } @@ -85,13 +85,13 @@ public class Queue { * @exception java.lang.InterruptedException if any thread has * interrupted this thread. */ - public synchronized Object dequeue(long timeOut) + public synchronized T dequeue(long timeOut) throws InterruptedException { while (tail == null) { wait(timeOut); } - QueueElement elt = tail; + QueueElement elt = tail; tail = elt.prev; if (tail == null) { head = null; @@ -115,8 +115,8 @@ public class Queue { * order. Use the Enumeration methods on the returned object to * fetch the elements sequentially. */ - public final synchronized Enumeration elements() { - return new LIFOQueueEnumerator(this); + public final synchronized Enumeration elements() { + return new LIFOQueueEnumerator<>(this); } /** @@ -124,8 +124,8 @@ public class Queue { * order. Use the Enumeration methods on the returned object to * fetch the elements sequentially. */ - public final synchronized Enumeration reverseElements() { - return new FIFOQueueEnumerator(this); + public final synchronized Enumeration reverseElements() { + return new FIFOQueueEnumerator<>(this); } public synchronized void dump(String msg) { @@ -133,8 +133,8 @@ public class Queue { System.err.println("["+length+" elt(s); head = "+ (head == null ? "null" : (head.obj)+"")+ " tail = "+(tail == null ? "null" : (tail.obj)+"")); - QueueElement cursor = head; - QueueElement last = null; + QueueElement cursor = head; + QueueElement last = null; while (cursor != null) { System.err.println(" "+cursor); last = cursor; @@ -147,11 +147,11 @@ public class Queue { } } -final class FIFOQueueEnumerator implements Enumeration { - Queue queue; - QueueElement cursor; +final class FIFOQueueEnumerator implements Enumeration { + Queue queue; + QueueElement cursor; - FIFOQueueEnumerator(Queue q) { + FIFOQueueEnumerator(Queue q) { queue = q; cursor = q.tail; } @@ -160,10 +160,10 @@ final class FIFOQueueEnumerator implements Enumeration { return (cursor != null); } - public Object nextElement() { + public T nextElement() { synchronized (queue) { if (cursor != null) { - QueueElement result = cursor; + QueueElement result = cursor; cursor = cursor.prev; return result.obj; } @@ -172,11 +172,11 @@ final class FIFOQueueEnumerator implements Enumeration { } } -final class LIFOQueueEnumerator implements Enumeration { - Queue queue; - QueueElement cursor; +final class LIFOQueueEnumerator implements Enumeration { + Queue queue; + QueueElement cursor; - LIFOQueueEnumerator(Queue q) { + LIFOQueueEnumerator(Queue q) { queue = q; cursor = q.head; } @@ -185,10 +185,10 @@ final class LIFOQueueEnumerator implements Enumeration { return (cursor != null); } - public Object nextElement() { + public T nextElement() { synchronized (queue) { if (cursor != null) { - QueueElement result = cursor; + QueueElement result = cursor; cursor = cursor.next; return result.obj; } @@ -197,13 +197,13 @@ final class LIFOQueueEnumerator implements Enumeration { } } -class QueueElement { - QueueElement next = null; - QueueElement prev = null; +class QueueElement { + QueueElement next = null; + QueueElement prev = null; - Object obj = null; + T obj = null; - QueueElement(Object obj) { + QueueElement(T obj) { this.obj = obj; } diff --git a/jdk/src/share/classes/sun/misc/RequestProcessor.java b/jdk/src/share/classes/sun/misc/RequestProcessor.java index ae9e1b9ec3e..51b8e99f267 100644 --- a/jdk/src/share/classes/sun/misc/RequestProcessor.java +++ b/jdk/src/share/classes/sun/misc/RequestProcessor.java @@ -36,7 +36,7 @@ package sun.misc; public class RequestProcessor implements Runnable { - private static Queue requestQueue; + private static Queue requestQueue; private static Thread dispatcher; /** @@ -55,15 +55,12 @@ public class RequestProcessor implements Runnable { lazyInitialize(); while (true) { try { - Object obj = requestQueue.dequeue(); - if (obj instanceof Request) { // ignore bogons - Request req = (Request)obj; - try { - req.execute(); - } catch (Throwable t) { - // do nothing at the moment...maybe report an error - // in the future - } + Request req = requestQueue.dequeue(); + try { + req.execute(); + } catch (Throwable t) { + // do nothing at the moment...maybe report an error + // in the future } } catch (InterruptedException e) { // do nothing at the present time. @@ -92,7 +89,7 @@ public class RequestProcessor implements Runnable { */ private static synchronized void lazyInitialize() { if (requestQueue == null) { - requestQueue = new Queue(); + requestQueue = new Queue(); } } diff --git a/jdk/src/share/classes/sun/misc/Service.java b/jdk/src/share/classes/sun/misc/Service.java index ce0ed44f937..37d39b43019 100644 --- a/jdk/src/share/classes/sun/misc/Service.java +++ b/jdk/src/share/classes/sun/misc/Service.java @@ -125,13 +125,13 @@ import java.util.TreeSet; * @since 1.3 */ -public final class Service { +public final class Service { private static final String prefix = "META-INF/services/"; private Service() { } - private static void fail(Class service, String msg, Throwable cause) + private static void fail(Class service, String msg, Throwable cause) throws ServiceConfigurationError { ServiceConfigurationError sce @@ -140,13 +140,13 @@ public final class Service { throw sce; } - private static void fail(Class service, String msg) + private static void fail(Class service, String msg) throws ServiceConfigurationError { throw new ServiceConfigurationError(service.getName() + ": " + msg); } - private static void fail(Class service, URL u, int line, String msg) + private static void fail(Class service, URL u, int line, String msg) throws ServiceConfigurationError { fail(service, u + ":" + line + ": " + msg); @@ -157,8 +157,8 @@ public final class Service { * on the line to both the names list and the returned set iff the name is * not already a member of the returned set. */ - private static int parseLine(Class service, URL u, BufferedReader r, int lc, - List names, Set returned) + private static int parseLine(Class service, URL u, BufferedReader r, int lc, + List names, Set returned) throws IOException, ServiceConfigurationError { String ln = r.readLine(); @@ -211,12 +211,12 @@ public final class Service { * If an I/O error occurs while reading from the given URL, or * if a configuration-file format error is detected */ - private static Iterator parse(Class service, URL u, Set returned) + private static Iterator parse(Class service, URL u, Set returned) throws ServiceConfigurationError { InputStream in = null; BufferedReader r = null; - ArrayList names = new ArrayList(); + ArrayList names = new ArrayList<>(); try { in = u.openStream(); r = new BufferedReader(new InputStreamReader(in, "utf-8")); @@ -239,16 +239,16 @@ public final class Service { /** * Private inner class implementing fully-lazy provider lookup */ - private static class LazyIterator implements Iterator { + private static class LazyIterator implements Iterator { - Class service; + Class service; ClassLoader loader; - Enumeration configs = null; - Iterator pending = null; - Set returned = new TreeSet(); + Enumeration configs = null; + Iterator pending = null; + Set returned = new TreeSet<>(); String nextName = null; - private LazyIterator(Class service, ClassLoader loader) { + private LazyIterator(Class service, ClassLoader loader) { this.service = service; this.loader = loader; } @@ -272,20 +272,20 @@ public final class Service { if (!configs.hasMoreElements()) { return false; } - pending = parse(service, (URL)configs.nextElement(), returned); + pending = parse(service, configs.nextElement(), returned); } - nextName = (String)pending.next(); + nextName = pending.next(); return true; } - public Object next() throws ServiceConfigurationError { + public S next() throws ServiceConfigurationError { if (!hasNext()) { throw new NoSuchElementException(); } String cn = nextName; nextName = null; try { - return Class.forName(cn, true, loader).newInstance(); + return service.cast(Class.forName(cn, true, loader).newInstance()); } catch (ClassNotFoundException x) { fail(service, "Provider " + cn + " not found"); @@ -342,10 +342,10 @@ public final class Service { * @see #providers(java.lang.Class) * @see #installedProviders(java.lang.Class) */ - public static Iterator providers(Class service, ClassLoader loader) + public static Iterator providers(Class service, ClassLoader loader) throws ServiceConfigurationError { - return new LazyIterator(service, loader); + return new LazyIterator(service, loader); } @@ -374,7 +374,7 @@ public final class Service { * * @see #providers(java.lang.Class, java.lang.ClassLoader) */ - public static Iterator providers(Class service) + public static Iterator providers(Class service) throws ServiceConfigurationError { ClassLoader cl = Thread.currentThread().getContextClassLoader(); @@ -411,7 +411,7 @@ public final class Service { * * @see #providers(java.lang.Class, java.lang.ClassLoader) */ - public static Iterator installedProviders(Class service) + public static Iterator installedProviders(Class service) throws ServiceConfigurationError { ClassLoader cl = ClassLoader.getSystemClassLoader(); diff --git a/jdk/src/share/classes/sun/misc/ServiceConfigurationError.java b/jdk/src/share/classes/sun/misc/ServiceConfigurationError.java index 5659b23870a..74d0c846b58 100644 --- a/jdk/src/share/classes/sun/misc/ServiceConfigurationError.java +++ b/jdk/src/share/classes/sun/misc/ServiceConfigurationError.java @@ -43,6 +43,8 @@ package sun.misc; public class ServiceConfigurationError extends Error { + static final long serialVersionUID = 8769866263384244465L; + /** * Constructs a new instance with the specified detail string. */ diff --git a/jdk/src/share/classes/sun/misc/Signal.java b/jdk/src/share/classes/sun/misc/Signal.java index 613cc3881e8..b663c5bba63 100644 --- a/jdk/src/share/classes/sun/misc/Signal.java +++ b/jdk/src/share/classes/sun/misc/Signal.java @@ -72,8 +72,8 @@ import java.util.Hashtable; * @since 1.2 */ public final class Signal { - private static Hashtable handlers = new Hashtable(4); - private static Hashtable signals = new Hashtable(4); + private static Hashtable handlers = new Hashtable<>(4); + private static Hashtable signals = new Hashtable<>(4); private int number; private String name; @@ -166,9 +166,9 @@ public final class Signal { throw new IllegalArgumentException ("Signal already used by VM or OS: " + sig); } - signals.put(new Integer(sig.number), sig); + signals.put(sig.number, sig); synchronized (handlers) { - SignalHandler oldHandler = (SignalHandler)handlers.get(sig); + SignalHandler oldHandler = handlers.get(sig); handlers.remove(sig); if (newH == 2) { handlers.put(sig, handler); @@ -200,8 +200,8 @@ public final class Signal { /* Called by the VM to execute Java signal handlers. */ private static void dispatch(final int number) { - final Signal sig = (Signal)signals.get(new Integer(number)); - final SignalHandler handler = (SignalHandler)handlers.get(sig); + final Signal sig = signals.get(number); + final SignalHandler handler = handlers.get(sig); Runnable runnable = new Runnable () { public void run() { diff --git a/jdk/src/share/classes/sun/misc/URLClassPath.java b/jdk/src/share/classes/sun/misc/URLClassPath.java index cee982369c4..eb6b86aecbd 100644 --- a/jdk/src/share/classes/sun/misc/URLClassPath.java +++ b/jdk/src/share/classes/sun/misc/URLClassPath.java @@ -836,10 +836,9 @@ public class URLClassPath { Set visited) { Resource res; - Object[] jarFiles; - boolean done = false; + String[] jarFiles; int count = 0; - LinkedList jarFilesList = null; + LinkedList jarFilesList = null; /* If there no jar files in the index that can potential contain * this resource then return immediately. @@ -848,11 +847,11 @@ public class URLClassPath { return null; do { - jarFiles = jarFilesList.toArray(); int size = jarFilesList.size(); + jarFiles = jarFilesList.toArray(new String[size]); /* loop through the mapped jar file list */ while(count < size) { - String jarName = (String)jarFiles[count++]; + String jarName = jarFiles[count++]; JarLoader newLoader; final URL url; diff --git a/jdk/src/share/classes/sun/misc/Unsafe.java b/jdk/src/share/classes/sun/misc/Unsafe.java index dba16284b36..da7ec279865 100644 --- a/jdk/src/share/classes/sun/misc/Unsafe.java +++ b/jdk/src/share/classes/sun/misc/Unsafe.java @@ -81,7 +81,7 @@ public final class Unsafe { * access to the system properties. */ public static Unsafe getUnsafe() { - Class cc = sun.reflect.Reflection.getCallerClass(2); + Class cc = sun.reflect.Reflection.getCallerClass(2); if (cc.getClassLoader() != null) throw new SecurityException("Unsafe"); return theUnsafe; @@ -616,7 +616,7 @@ public final class Unsafe { * for a given class in one place. */ @Deprecated - public Object staticFieldBase(Class c) { + public Object staticFieldBase(Class c) { Field[] fields = c.getDeclaredFields(); for (int i = 0; i < fields.length; i++) { if (Modifier.isStatic(fields[i].getModifiers())) { @@ -682,7 +682,7 @@ public final class Unsafe { * needed in conjunction with obtaining the static field base of a * class. */ - public native void ensureClassInitialized(Class c); + public native void ensureClassInitialized(Class c); /** * Report the offset of the first element in the storage allocation of a @@ -694,7 +694,7 @@ public final class Unsafe { * @see #getInt(Object, long) * @see #putInt(Object, long, int) */ - public native int arrayBaseOffset(Class arrayClass); + public native int arrayBaseOffset(Class arrayClass); /** The value of {@code arrayBaseOffset(boolean[].class)} */ public static final int ARRAY_BOOLEAN_BASE_OFFSET @@ -743,7 +743,7 @@ public final class Unsafe { * @see #getInt(Object, long) * @see #putInt(Object, long, int) */ - public native int arrayIndexScale(Class arrayClass); + public native int arrayIndexScale(Class arrayClass); /** The value of {@code arrayIndexScale(boolean[].class)} */ public static final int ARRAY_BOOLEAN_INDEX_SCALE @@ -805,11 +805,11 @@ public final class Unsafe { * Tell the VM to define a class, without security checks. By default, the * class loader and protection domain come from the caller's class. */ - public native Class defineClass(String name, byte[] b, int off, int len, - ClassLoader loader, - ProtectionDomain protectionDomain); + public native Class defineClass(String name, byte[] b, int off, int len, + ClassLoader loader, + ProtectionDomain protectionDomain); - public native Class defineClass(String name, byte[] b, int off, int len); + public native Class defineClass(String name, byte[] b, int off, int len); /** * Define a class but do not make it known to the class loader or system dictionary. @@ -827,12 +827,12 @@ public final class Unsafe { * @params data bytes of a class file * @params cpPatches where non-null entries exist, they replace corresponding CP entries in data */ - public native Class defineAnonymousClass(Class hostClass, byte[] data, Object[] cpPatches); + public native Class defineAnonymousClass(Class hostClass, byte[] data, Object[] cpPatches); /** Allocate an instance but do not run any constructor. Initializes the class if it has not yet been. */ - public native Object allocateInstance(Class cls) + public native Object allocateInstance(Class cls) throws InstantiationException; /** Lock the object. It must get unlocked via {@link #monitorExit}. */ diff --git a/jdk/src/share/classes/sun/misc/VM.java b/jdk/src/share/classes/sun/misc/VM.java index e1fb584bb2c..61b3b0fd974 100644 --- a/jdk/src/share/classes/sun/misc/VM.java +++ b/jdk/src/share/classes/sun/misc/VM.java @@ -48,6 +48,7 @@ public class VM { return suspended; } + @SuppressWarnings("deprecation") public static boolean allowThreadSuspension(ThreadGroup g, boolean b) { return g.allowThreadSuspension(b); } diff --git a/jdk/src/share/classes/sun/net/RegisteredDomain.java b/jdk/src/share/classes/sun/net/RegisteredDomain.java index 49c67c2b24b..7e75b321eb6 100644 --- a/jdk/src/share/classes/sun/net/RegisteredDomain.java +++ b/jdk/src/share/classes/sun/net/RegisteredDomain.java @@ -118,8 +118,8 @@ private static Set usStateSet = new HashSet(Arrays.asList("ak", private static Set usSubStateSet = new HashSet(Arrays.asList("state", "lib", "k12", "cc", "tec", "gen", "cog", "mus", "dst")); -private static Map topMap = new HashMap(); -private static Map top3Map = new HashMap(); +private static Map> topMap = new HashMap<>(); +private static Map> top3Map = new HashMap<>(); static { /* @@ -764,7 +764,7 @@ static { */ String str = cname.substring(third + 1); if (third != -1) { - Set set = top3Map.get(s); + Set set = top3Map.get(s); if (set != null) { if (set.contains(str)) { return cname.substring(fourth + 1); @@ -801,7 +801,7 @@ static { /* * XX.MA.US. */ - Set topSet = topMap.get(s); + Set topSet = topMap.get(s); if (topSet != null) { if (topSet.contains(s2)) { return cname.substring(third + 1); diff --git a/jdk/src/share/classes/sun/net/ftp/FtpClientProvider.java b/jdk/src/share/classes/sun/net/ftp/FtpClientProvider.java index 7a09810718c..06deae65817 100644 --- a/jdk/src/share/classes/sun/net/ftp/FtpClientProvider.java +++ b/jdk/src/share/classes/sun/net/ftp/FtpClientProvider.java @@ -27,7 +27,7 @@ package sun.net.ftp; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ServiceConfigurationError; -//import sun.misc.Service; +//import java.util.ServiceLoader; /** * Service provider class for FtpClient. @@ -79,20 +79,22 @@ public abstract class FtpClientProvider { } private static boolean loadProviderAsService() { - // Iterator i = Service.providers(FtpClientProvider.class, - // ClassLoader.getSystemClassLoader()); - // while (i.hasNext()) { - // try { - // provider = (FtpClientProvider) i.next(); - // return true; - // } catch (ServiceConfigurationError sce) { - // if (sce.getCause() instanceof SecurityException) { - // // Ignore, try next provider, if any - // continue; - // } - // throw sce; - // } - // } +// Iterator i = +// ServiceLoader.load(FtpClientProvider.class, +// ClassLoader.getSystemClassLoader()).iterator(); +// +// while (i.hasNext()) { +// try { +// provider = i.next(); +// return true; +// } catch (ServiceConfigurationError sce) { +// if (sce.getCause() instanceof SecurityException) { +// // Ignore, try next provider, if any +// continue; +// } +// throw sce; +// } +// } return false; } diff --git a/jdk/src/share/classes/sun/net/www/protocol/jar/Handler.java b/jdk/src/share/classes/sun/net/www/protocol/jar/Handler.java index 62686c6b99e..8e9f8e3a35f 100644 --- a/jdk/src/share/classes/sun/net/www/protocol/jar/Handler.java +++ b/jdk/src/share/classes/sun/net/www/protocol/jar/Handler.java @@ -123,6 +123,7 @@ public class Handler extends java.net.URLStreamHandler { @Override + @SuppressWarnings("deprecation") protected void parseURL(URL url, String spec, int start, int limit) { String file = null; diff --git a/jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java b/jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java index dd10a721073..2fbc517193c 100644 --- a/jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java +++ b/jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java @@ -57,13 +57,17 @@ public class SocketAdaptor // Timeout "option" value for reads private volatile int timeout = 0; - // ## super will create a useless impl - private SocketAdaptor(SocketChannelImpl sc) { + private SocketAdaptor(SocketChannelImpl sc) throws SocketException { + super((SocketImpl) null); this.sc = sc; } public static Socket create(SocketChannelImpl sc) { - return new SocketAdaptor(sc); + try { + return new SocketAdaptor(sc); + } catch (SocketException e) { + throw new InternalError("Should not reach here"); + } } public SocketChannel getChannel() { diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java b/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java index 5109e132d22..f2a999f51de 100644 --- a/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java +++ b/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java @@ -44,12 +44,16 @@ import java.security.cert.CertStoreSpi; import java.security.cert.CRLSelector; import java.security.cert.X509Certificate; import java.security.cert.X509CRL; +import java.net.Socket; +import java.net.URLConnection; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLEngine; +import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; +import javax.net.ssl.X509ExtendedTrustManager; /** * A CertStore that retrieves an SSL server's certificate chain. @@ -57,31 +61,74 @@ import javax.net.ssl.X509TrustManager; public final class SSLServerCertStore extends CertStoreSpi { private final URI uri; + private final static GetChainTrustManager trustManager; + private final static SSLSocketFactory socketFactory; + private final static HostnameVerifier hostnameVerifier; + + static { + trustManager = new GetChainTrustManager(); + hostnameVerifier = new HostnameVerifier() { + public boolean verify(String hostname, SSLSession session) { + return true; + } + }; + + SSLSocketFactory tempFactory; + try { + SSLContext context = SSLContext.getInstance("SSL"); + context.init(null, new TrustManager[] { trustManager }, null); + tempFactory = context.getSocketFactory(); + } catch (GeneralSecurityException gse) { + tempFactory = null; + } + + socketFactory = tempFactory; + } SSLServerCertStore(URI uri) throws InvalidAlgorithmParameterException { super(null); this.uri = uri; } - public synchronized Collection engineGetCertificates - (CertSelector selector) throws CertStoreException - { + public Collection engineGetCertificates + (CertSelector selector) throws CertStoreException { + try { - SSLContext sc = SSLContext.getInstance("SSL"); - GetChainTrustManager xtm = new GetChainTrustManager(); - sc.init(null, new TrustManager[] { xtm }, null); - HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory()); - HttpsURLConnection.setDefaultHostnameVerifier( - new HostnameVerifier() { - public boolean verify(String hostname, SSLSession session) { - return true; + URLConnection urlConn = uri.toURL().openConnection(); + if (urlConn instanceof HttpsURLConnection) { + if (socketFactory == null) { + throw new CertStoreException( + "No initialized SSLSocketFactory"); + } + + HttpsURLConnection https = (HttpsURLConnection)urlConn; + https.setSSLSocketFactory(socketFactory); + https.setHostnameVerifier(hostnameVerifier); + synchronized (trustManager) { + try { + https.connect(); + return getMatchingCerts( + trustManager.serverChain, selector); + } catch (IOException ioe) { + // If the server certificate has already been + // retrieved, don't mind the connection state. + if (trustManager.exchangedServerCerts) { + return getMatchingCerts( + trustManager.serverChain, selector); + } + + // otherwise, rethrow the exception + throw ioe; + } finally { + trustManager.cleanup(); } - }); - uri.toURL().openConnection().connect(); - return getMatchingCerts(xtm.serverChain, selector); - } catch (GeneralSecurityException | IOException e) { - throw new CertStoreException(e); + } + } + } catch (IOException ioe) { + throw new CertStoreException(ioe); } + + return Collections.emptySet(); } private static List getMatchingCerts @@ -106,37 +153,77 @@ public final class SSLServerCertStore extends CertStoreSpi { throw new UnsupportedOperationException(); } - static synchronized CertStore getInstance(URI uri) + static CertStore getInstance(URI uri) throws InvalidAlgorithmParameterException { return new CS(new SSLServerCertStore(uri), null, "SSLServer", null); } /* - * An X509TrustManager that simply stores a reference to the server's - * certificate chain. + * An X509ExtendedTrustManager that ignores the server certificate + * validation. */ - private static class GetChainTrustManager implements X509TrustManager { - private List serverChain; + private static class GetChainTrustManager + extends X509ExtendedTrustManager { + private List serverChain = + Collections.emptyList(); + private boolean exchangedServerCerts = false; + + @Override public X509Certificate[] getAcceptedIssuers() { - throw new UnsupportedOperationException(); + return new X509Certificate[0]; } + @Override public void checkClientTrusted(X509Certificate[] chain, - String authType) - throws CertificateException - { + String authType) throws CertificateException { + throw new UnsupportedOperationException(); } + @Override + public void checkClientTrusted(X509Certificate[] chain, String authType, + Socket socket) throws CertificateException { + + throw new UnsupportedOperationException(); + } + + @Override + public void checkClientTrusted(X509Certificate[] chain, String authType, + SSLEngine engine) throws CertificateException { + + throw new UnsupportedOperationException(); + } + + @Override public void checkServerTrusted(X509Certificate[] chain, - String authType) - throws CertificateException - { + String authType) throws CertificateException { + + exchangedServerCerts = true; this.serverChain = (chain == null) - ? Collections.emptyList() - : Arrays.asList(chain); + ? Collections.emptyList() + : Arrays.asList(chain); + + } + + @Override + public void checkServerTrusted(X509Certificate[] chain, String authType, + Socket socket) throws CertificateException { + + checkServerTrusted(chain, authType); + } + + @Override + public void checkServerTrusted(X509Certificate[] chain, String authType, + SSLEngine engine) throws CertificateException { + + checkServerTrusted(chain, authType); + } + + void cleanup() { + exchangedServerCerts = false; + serverChain = Collections.emptyList(); } } diff --git a/jdk/src/share/classes/sun/text/CompactByteArray.java b/jdk/src/share/classes/sun/text/CompactByteArray.java index 042d88ff271..d28b1db0356 100644 --- a/jdk/src/share/classes/sun/text/CompactByteArray.java +++ b/jdk/src/share/classes/sun/text/CompactByteArray.java @@ -264,9 +264,9 @@ public final class CompactByteArray implements Cloneable { { try { CompactByteArray other = (CompactByteArray) super.clone(); - other.values = (byte[])values.clone(); - other.indices = (short[])indices.clone(); - if (hashes != null) other.hashes = (int[])hashes.clone(); + other.values = values.clone(); + other.indices = indices.clone(); + if (hashes != null) other.hashes = hashes.clone(); return other; } catch (CloneNotSupportedException e) { throw new InternalError(e); diff --git a/jdk/src/share/classes/sun/text/IntHashtable.java b/jdk/src/share/classes/sun/text/IntHashtable.java index a066d095347..679c710608b 100644 --- a/jdk/src/share/classes/sun/text/IntHashtable.java +++ b/jdk/src/share/classes/sun/text/IntHashtable.java @@ -122,11 +122,11 @@ public final class IntHashtable { // this line just scrambles the bits as each value is added into the // has value. This helps to make sure we affect all the bits and that // the same values in a different order will produce a different hash value - result = (int)(result * scrambler + 1); + result = result * scrambler + 1; result += keyList[i]; } for (int i = 0; i < values.length; ++i) { - result = (int)(result * scrambler + 1); + result = result * scrambler + 1; result += values[i]; } return result; @@ -135,8 +135,8 @@ public final class IntHashtable { public Object clone () throws CloneNotSupportedException { IntHashtable result = (IntHashtable) super.clone(); - values = (int[]) values.clone(); - keyList = (int[])keyList.clone(); + values = values.clone(); + keyList = keyList.clone(); return result; } diff --git a/jdk/src/share/classes/sun/text/bidi/BidiBase.java b/jdk/src/share/classes/sun/text/bidi/BidiBase.java index d6733ceb0a0..a803f8281fd 100644 --- a/jdk/src/share/classes/sun/text/bidi/BidiBase.java +++ b/jdk/src/share/classes/sun/text/bidi/BidiBase.java @@ -1106,7 +1106,7 @@ public class BidiBase { * Assume sizeNeeded>0. * If object != null, then assume size > 0. */ - private Object getMemory(String label, Object array, Class arrayClass, + private Object getMemory(String label, Object array, Class arrayClass, boolean mayAllocate, int sizeNeeded) { int len = Array.getLength(array); @@ -1990,7 +1990,7 @@ public class BidiBase { cell = impTab[oldStateSeq][_prop]; levState.state = GetState(cell); /* isolate the new state */ actionSeq = impAct[GetAction(cell)]; /* isolate the action */ - addLevel = (byte)impTab[levState.state][IMPTABLEVELS_RES]; + addLevel = impTab[levState.state][IMPTABLEVELS_RES]; if (actionSeq != 0) { switch (actionSeq) { @@ -2014,7 +2014,7 @@ public class BidiBase { /* nothing, just clean up */ levState.lastStrongRTL = -1; /* check if we have a pending conditional segment */ - level = (byte)impTab[oldStateSeq][IMPTABLEVELS_RES]; + level = impTab[oldStateSeq][IMPTABLEVELS_RES]; if ((level & 1) != 0 && levState.startON > 0) { /* after ON */ start = levState.startON; /* reset to basic run level */ } @@ -2115,7 +2115,7 @@ public class BidiBase { break; case 11: /* L after L+ON+EN/AN/ON */ - level = (byte)levState.runLevel; + level = levState.runLevel; for (k = start0-1; k >= levState.startON; k--) { if (levels[k] == level+3) { while (levels[k] == level+3) { @@ -2178,7 +2178,7 @@ public class BidiBase { levState.runLevel = levels[start]; levState.impTab = impTabPair.imptab[levState.runLevel & 1]; levState.impAct = impTabPair.impact[levState.runLevel & 1]; - processPropertySeq(levState, (short)sor, start, start); + processPropertySeq(levState, sor, start, start); /* initialize for property state table */ if (dirProps[start] == NSM) { stateImp = (short)(1 + sor); @@ -2230,7 +2230,7 @@ public class BidiBase { } } /* flush possible pending sequence, e.g. ON */ - processPropertySeq(levState, (short)eor, limit, limit); + processPropertySeq(levState, eor, limit, limit); } /* perform (L1) and (X9) ---------------------------------------------------- */ @@ -3484,6 +3484,7 @@ public class BidiBase { } } + @SuppressWarnings("serial") private static AttributedCharacterIterator.Attribute getTextAttribute(String name) { diff --git a/jdk/src/share/classes/sun/text/normalizer/ICUData.java b/jdk/src/share/classes/sun/text/normalizer/ICUData.java index bf6e60ffb83..6163329ed4d 100644 --- a/jdk/src/share/classes/sun/text/normalizer/ICUData.java +++ b/jdk/src/share/classes/sun/text/normalizer/ICUData.java @@ -48,12 +48,12 @@ import java.util.MissingResourceException; */ public final class ICUData { - private static InputStream getStream(final Class root, final String resourceName, boolean required) { + private static InputStream getStream(final Class root, final String resourceName, boolean required) { InputStream i = null; if (System.getSecurityManager() != null) { - i = (InputStream)AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { + i = AccessController.doPrivileged(new PrivilegedAction() { + public InputStream run() { return root.getResourceAsStream(resourceName); } }); diff --git a/jdk/src/share/classes/sun/text/normalizer/NormalizerBase.java b/jdk/src/share/classes/sun/text/normalizer/NormalizerBase.java index 576e67bd978..875d059f156 100644 --- a/jdk/src/share/classes/sun/text/normalizer/NormalizerBase.java +++ b/jdk/src/share/classes/sun/text/normalizer/NormalizerBase.java @@ -886,6 +886,7 @@ public final class NormalizerBase implements Cloneable { * @deprecated ICU 3.2 * @obsolete ICU 3.2 */ + @Deprecated public int setIndex(int index) { setIndexOnly(index); return current(); @@ -899,6 +900,7 @@ public final class NormalizerBase implements Cloneable { * @return The codepoint as an int * @see #startIndex */ + @Deprecated public int getBeginIndex() { return 0; } @@ -911,6 +913,7 @@ public final class NormalizerBase implements Cloneable { * @return The codepoint as an int * @see #endIndex */ + @Deprecated public int getEndIndex() { return endIndex(); } @@ -1235,11 +1238,11 @@ public final class NormalizerBase implements Cloneable { mode, options); if(pNeededToNormalize!=null) { - pNeededToNormalize[0]=(boolean)(destLength!=bufferLength || - Utility.arrayRegionMatches( - buffer,0,dest, - destStart,destLimit - )); + pNeededToNormalize[0]=destLength!=bufferLength || + Utility.arrayRegionMatches( + buffer,0,dest, + destStart,destLimit + ); } } else { /* just copy the source characters */ @@ -1458,10 +1461,10 @@ public final class NormalizerBase implements Cloneable { dest,destStart,destLimit, options); if(pNeededToNormalize!=null) { - pNeededToNormalize[0]=(boolean)(destLength!=bufferLength || - Utility.arrayRegionMatches(buffer,startIndex[0], - dest,destStart, - destLength)); + pNeededToNormalize[0]=destLength!=bufferLength || + Utility.arrayRegionMatches(buffer,startIndex[0], + dest,destStart, + destLength); } } else { /* just copy the source characters */ diff --git a/jdk/src/share/classes/sun/text/normalizer/NormalizerImpl.java b/jdk/src/share/classes/sun/text/normalizer/NormalizerImpl.java index b0b8e371200..8f0c9662a2b 100644 --- a/jdk/src/share/classes/sun/text/normalizer/NormalizerImpl.java +++ b/jdk/src/share/classes/sun/text/normalizer/NormalizerImpl.java @@ -98,11 +98,11 @@ public final class NormalizerImpl { private static final int EXTRA_SHIFT=16; /* norm32 value constants using >16 bits */ - private static final long MIN_SPECIAL = (long)(0xfc000000 & UNSIGNED_INT_MASK); - private static final long SURROGATES_TOP = (long)(0xfff00000 & UNSIGNED_INT_MASK); - private static final long MIN_HANGUL = (long)(0xfff00000 & UNSIGNED_INT_MASK); -// private static final long MIN_JAMO_V = (long)(0xfff20000 & UNSIGNED_INT_MASK); - private static final long JAMO_V_TOP = (long)(0xfff30000 & UNSIGNED_INT_MASK); + private static final long MIN_SPECIAL = 0xfc000000 & UNSIGNED_INT_MASK; + private static final long SURROGATES_TOP = 0xfff00000 & UNSIGNED_INT_MASK; + private static final long MIN_HANGUL = 0xfff00000 & UNSIGNED_INT_MASK; +// private static final long MIN_JAMO_V = 0xfff20000 & UNSIGNED_INT_MASK; + private static final long JAMO_V_TOP = 0xfff30000 & UNSIGNED_INT_MASK; /* indexes[] value names */ @@ -134,7 +134,7 @@ public final class NormalizerImpl { private static final int AUX_COMP_EX_SHIFT = 10; private static final int AUX_NFC_SKIPPABLE_F_SHIFT = 12; - private static final int AUX_MAX_FNC = ((int)1<>CC_SHIFT)&0xFF); + return (int)((norm32>>CC_SHIFT)&0xFF); } public static boolean isFullCompositionExclusion(int c) { if(isFormatVersion_2_1) { int aux =AuxTrieImpl.auxTrie.getCodePointValue(c); - return (boolean)((aux & AUX_COMP_EX_MASK)!=0); + return (aux & AUX_COMP_EX_MASK)!=0; } else { return false; } @@ -2037,7 +2037,7 @@ public final class NormalizerImpl { public static boolean isCanonSafeStart(int c) { if(isFormatVersion_2_1) { int aux = AuxTrieImpl.auxTrie.getCodePointValue(c); - return (boolean)((aux & AUX_UNSAFE_MASK)==0); + return (aux & AUX_UNSAFE_MASK)==0; } else { return false; } @@ -2546,7 +2546,7 @@ public final class NormalizerImpl { // copy these code units all at once if (srcIndex != prevSrc) { - length = (int)(srcIndex - prevSrc); + length = srcIndex - prevSrc; if ((destIndex + length) <= destLimit) { System.arraycopy(src,prevSrc,dest,destIndex,length); } diff --git a/jdk/src/share/classes/sun/text/normalizer/SymbolTable.java b/jdk/src/share/classes/sun/text/normalizer/SymbolTable.java index a1dfab5bd29..95af219f5bc 100644 --- a/jdk/src/share/classes/sun/text/normalizer/SymbolTable.java +++ b/jdk/src/share/classes/sun/text/normalizer/SymbolTable.java @@ -65,6 +65,7 @@ import java.text.ParsePosition; * @draft ICU 2.8 * @deprecated This is a draft API and might change in a future release of ICU. */ +@Deprecated public interface SymbolTable { /** @@ -72,6 +73,7 @@ public interface SymbolTable { * @draft ICU 2.8 * @deprecated This is a draft API and might change in a future release of ICU. */ + @Deprecated static final char SYMBOL_REF = '$'; /** @@ -84,6 +86,7 @@ public interface SymbolTable { * @draft ICU 2.8 * @deprecated This is a draft API and might change in a future release of ICU. */ + @Deprecated char[] lookup(String s); /** @@ -95,6 +98,7 @@ public interface SymbolTable { * @draft ICU 2.8 * @deprecated This is a draft API and might change in a future release of ICU. */ + @Deprecated UnicodeMatcher lookupMatcher(int ch); /** @@ -115,5 +119,6 @@ public interface SymbolTable { * @draft ICU 2.8 * @deprecated This is a draft API and might change in a future release of ICU. */ + @Deprecated String parseReference(String text, ParsePosition pos, int limit); } diff --git a/jdk/src/share/classes/sun/text/normalizer/UnicodeSet.java b/jdk/src/share/classes/sun/text/normalizer/UnicodeSet.java index 569daff4ca6..42f6fdb54b8 100644 --- a/jdk/src/share/classes/sun/text/normalizer/UnicodeSet.java +++ b/jdk/src/share/classes/sun/text/normalizer/UnicodeSet.java @@ -298,7 +298,7 @@ public class UnicodeSet implements UnicodeMatcher { // NOTE: normally the field should be of type SortedSet; but that is missing a public clone!! // is not private so that UnicodeSetIterator can get access - TreeSet strings = new TreeSet(); + TreeSet strings = new TreeSet<>(); /** * The pattern representation of this set. This may not be the @@ -368,7 +368,7 @@ public class UnicodeSet implements UnicodeMatcher { * @stable ICU 2.0 */ public UnicodeSet set(UnicodeSet other) { - list = (int[]) other.list.clone(); + list = other.list.clone(); len = other.len; pat = other.pat; strings = (TreeSet)other.strings.clone(); @@ -524,10 +524,10 @@ public class UnicodeSet implements UnicodeMatcher { } if (includeStrings && strings.size() > 0) { - Iterator it = strings.iterator(); + Iterator it = strings.iterator(); while (it.hasNext()) { result.append('{'); - _appendToPat(result, (String) it.next(), escapeUnprintable); + _appendToPat(result, it.next(), escapeUnprintable); result.append('}'); } } @@ -1180,14 +1180,17 @@ public class UnicodeSet implements UnicodeMatcher { } } syntaxError(chars, "'-' not after char or set"); + break; case '&': if (lastItem == 2 && op == 0) { op = (char) c; continue; } syntaxError(chars, "'&' not after set"); + break; case '^': syntaxError(chars, "'^' not after '['"); + break; case '{': if (op != 0) { syntaxError(chars, "Missing operand after operator"); @@ -1251,6 +1254,7 @@ public class UnicodeSet implements UnicodeMatcher { continue; } syntaxError(chars, "Unquoted '$'"); + break; default: break; } diff --git a/jdk/src/share/classes/sun/text/normalizer/UnicodeSetIterator.java b/jdk/src/share/classes/sun/text/normalizer/UnicodeSetIterator.java index a27df03de3a..53a145c200f 100644 --- a/jdk/src/share/classes/sun/text/normalizer/UnicodeSetIterator.java +++ b/jdk/src/share/classes/sun/text/normalizer/UnicodeSetIterator.java @@ -154,7 +154,7 @@ public class UnicodeSetIterator { if (stringIterator == null) return false; codepoint = IS_STRING; // signal that value is actually a string - string = (String)stringIterator.next(); + string = stringIterator.next(); if (!stringIterator.hasNext()) stringIterator = null; return true; } @@ -203,7 +203,7 @@ public class UnicodeSetIterator { * @internal */ protected int nextElement; - private Iterator stringIterator = null; + private Iterator stringIterator = null; /** * Invariant: stringIterator is null when there are no (more) strings remaining diff --git a/jdk/src/share/classes/sun/text/normalizer/VersionInfo.java b/jdk/src/share/classes/sun/text/normalizer/VersionInfo.java index 44b2e69f347..2f418b00753 100644 --- a/jdk/src/share/classes/sun/text/normalizer/VersionInfo.java +++ b/jdk/src/share/classes/sun/text/normalizer/VersionInfo.java @@ -153,7 +153,7 @@ public final class VersionInfo /** * Map of singletons */ - private static final HashMap MAP_ = new HashMap(); + private static final HashMap MAP_ = new HashMap<>(); /** * Error statement string */ diff --git a/jdk/src/share/classes/sun/tools/attach/HotSpotAttachProvider.java b/jdk/src/share/classes/sun/tools/attach/HotSpotAttachProvider.java index 08535a1fff6..c28dddad9d7 100644 --- a/jdk/src/share/classes/sun/tools/attach/HotSpotAttachProvider.java +++ b/jdk/src/share/classes/sun/tools/attach/HotSpotAttachProvider.java @@ -75,7 +75,7 @@ public abstract class HotSpotAttachProvider extends AttachProvider { new ArrayList(); MonitoredHost host; - Set vms; + Set vms; try { host = MonitoredHost.getMonitoredHost(new HostIdentifier((String)null)); vms = host.activeVms(); @@ -92,31 +92,29 @@ public abstract class HotSpotAttachProvider extends AttachProvider { throw new InternalError(t); // shouldn't happen } - for (Object vmid: vms) { - if (vmid instanceof Integer) { - String pid = vmid.toString(); - String name = pid; // default to pid if name not available - boolean isAttachable = false; - MonitoredVm mvm = null; + for (Integer vmid: vms) { + String pid = vmid.toString(); + String name = pid; // default to pid if name not available + boolean isAttachable = false; + MonitoredVm mvm = null; + try { + mvm = host.getMonitoredVm(new VmIdentifier(pid)); try { - mvm = host.getMonitoredVm(new VmIdentifier(pid)); - try { - isAttachable = MonitoredVmUtil.isAttachable(mvm); - // use the command line as the display name - name = MonitoredVmUtil.commandLine(mvm); - } catch (Exception e) { - } - if (isAttachable) { - result.add(new HotSpotVirtualMachineDescriptor(this, pid, name)); - } - } catch (Throwable t) { - if (t instanceof ThreadDeath) { - throw (ThreadDeath)t; - } - } finally { - if (mvm != null) { - mvm.detach(); - } + isAttachable = MonitoredVmUtil.isAttachable(mvm); + // use the command line as the display name + name = MonitoredVmUtil.commandLine(mvm); + } catch (Exception e) { + } + if (isAttachable) { + result.add(new HotSpotVirtualMachineDescriptor(this, pid, name)); + } + } catch (Throwable t) { + if (t instanceof ThreadDeath) { + throw (ThreadDeath)t; + } + } finally { + if (mvm != null) { + mvm.detach(); } } } diff --git a/jdk/src/share/classes/sun/tools/jinfo/JInfo.java b/jdk/src/share/classes/sun/tools/jinfo/JInfo.java index 9812a1ef565..5a405341685 100644 --- a/jdk/src/share/classes/sun/tools/jinfo/JInfo.java +++ b/jdk/src/share/classes/sun/tools/jinfo/JInfo.java @@ -98,7 +98,7 @@ public class JInfo { } // loads the given class using the system class loader - private static Class loadClass(String name) { + private static Class loadClass(String name) { // // We specify the system clas loader so as to cater for development // environments where this class is on the boot class path but sa-jdi.jar @@ -178,7 +178,7 @@ public class JInfo { // print usage message private static void usage() { - Class c = loadClass("sun.jvm.hotspot.tools.JInfo"); + Class c = loadClass("sun.jvm.hotspot.tools.JInfo"); boolean usageSA = (c != null); System.out.println("Usage:"); diff --git a/jdk/src/share/classes/sun/tools/jmap/JMap.java b/jdk/src/share/classes/sun/tools/jmap/JMap.java index 0fb7b79a7e3..1d68b668fbf 100644 --- a/jdk/src/share/classes/sun/tools/jmap/JMap.java +++ b/jdk/src/share/classes/sun/tools/jmap/JMap.java @@ -198,7 +198,7 @@ public class JMap { } // loads the given class using the system class loader - private static Class loadClass(String name) { + private static Class loadClass(String name) { // // We specify the system clas loader so as to cater for development // environments where this class is on the boot class path but sa-jdi.jar @@ -336,7 +336,7 @@ public class JMap { // returns true if SA is available private static boolean haveSA() { - Class c = loadClass("sun.jvm.hotspot.tools.HeapSummary"); + Class c = loadClass("sun.jvm.hotspot.tools.HeapSummary"); return (c != null); } diff --git a/jdk/src/share/classes/sun/tools/jps/Jps.java b/jdk/src/share/classes/sun/tools/jps/Jps.java index 9611dd3a007..9c653816b30 100644 --- a/jdk/src/share/classes/sun/tools/jps/Jps.java +++ b/jdk/src/share/classes/sun/tools/jps/Jps.java @@ -59,13 +59,13 @@ public class Jps { MonitoredHost.getMonitoredHost(hostId); // get the set active JVMs on the specified host. - Set jvms = monitoredHost.activeVms(); + Set jvms = monitoredHost.activeVms(); - for (Iterator j = jvms.iterator(); j.hasNext(); /* empty */ ) { + for (Integer jvm: jvms) { StringBuilder output = new StringBuilder(); Throwable lastError = null; - int lvmid = ((Integer)j.next()).intValue(); + int lvmid = jvm; output.append(String.valueOf(lvmid)); diff --git a/jdk/src/share/classes/sun/tools/jstack/JStack.java b/jdk/src/share/classes/sun/tools/jstack/JStack.java index 004c2abdfb7..66fc672652c 100644 --- a/jdk/src/share/classes/sun/tools/jstack/JStack.java +++ b/jdk/src/share/classes/sun/tools/jstack/JStack.java @@ -137,7 +137,7 @@ public class JStack { } // Returns sun.jvm.hotspot.tools.JStack if available, otherwise null. - private static Class loadSAClass() { + private static Class loadSAClass() { // // Attempt to load JStack class - we specify the system class // loader so as to cater for development environments where diff --git a/jdk/src/share/classes/sun/tools/serialver/SerialVer.java b/jdk/src/share/classes/sun/tools/serialver/SerialVer.java index 13ff3599609..4b310a81ad7 100644 --- a/jdk/src/share/classes/sun/tools/serialver/SerialVer.java +++ b/jdk/src/share/classes/sun/tools/serialver/SerialVer.java @@ -98,6 +98,7 @@ public class SerialVer extends Applet { classname_t.requestFocus(); } + @SuppressWarnings("deprecation") public boolean action(Event ev, Object obj) { if (ev.target == classname_t) { show((String)ev.arg); @@ -110,6 +111,7 @@ public class SerialVer extends Applet { } + @SuppressWarnings("deprecation") public boolean handleEvent(Event ev) { boolean rc = super.handleEvent(ev); return rc; @@ -206,7 +208,7 @@ public class SerialVer extends Applet { } static String resolveClass(String classname) throws ClassNotFoundException { - Class cl = Class.forName(classname, false, loader); + Class cl = Class.forName(classname, false, loader); ObjectStreamClass desc = ObjectStreamClass.lookup(cl); if (desc != null) { return " static final long serialVersionUID = " + @@ -216,6 +218,10 @@ public class SerialVer extends Applet { } } + @SuppressWarnings("deprecation") + private static void showWindow(Window w) { + w.show(); + } public static void main(String[] args) { boolean show = false; @@ -316,7 +322,7 @@ public class SerialVer extends Applet { f.add("Center", sv); f.pack(); - f.show(); + showWindow(f); } } @@ -362,6 +368,7 @@ class SerialVerFrame extends Frame { /* * Handle a window destroy event by exiting. */ + @SuppressWarnings("deprecation") public boolean handleEvent(Event e) { if (e.id == Event.WINDOW_DESTROY) { exit(0); @@ -371,6 +378,7 @@ class SerialVerFrame extends Frame { /* * Handle an Exit event by exiting. */ + @SuppressWarnings("deprecation") public boolean action(Event ev, Object obj) { if (ev.target == exit_i) { exit(0); @@ -455,11 +463,7 @@ class Res { } try { String message = messageRB.getString(key); - String[] args = new String[3]; - args[0] = a1; - args[1] = a2; - args[2] = a3; - return MessageFormat.format(message, args); + return MessageFormat.format(message, a1, a2, a3); } catch (MissingResourceException e) { throw new Error("Fatal: Resource for serialver is broken. There is no " + key + " key in resource."); } diff --git a/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java b/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java index c45100d7508..349ce56e90e 100644 --- a/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java +++ b/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java @@ -58,7 +58,7 @@ public final class LocaleServiceProviderPool { * A Map that holds singleton instances of this class. Each instance holds a * set of provider implementations of a particular locale sensitive service. */ - private static ConcurrentMap poolOfPools = + private static ConcurrentMap, LocaleServiceProviderPool> poolOfPools = new ConcurrentHashMap<>(); /** @@ -147,6 +147,10 @@ public final class LocaleServiceProviderPool { /** * Lazy loaded set of available locales. * Loading all locales is a very long operation. + * + * We know "providerClasses" contains classes that extends LocaleServiceProvider, + * but generic array creation is not allowed, thus the "unchecked" warning + * is suppressed here. */ private static class AllAvailableLocales { /** @@ -156,7 +160,9 @@ public final class LocaleServiceProviderPool { static final Locale[] allAvailableLocales; static { - Class[] providerClasses = { + @SuppressWarnings("unchecked") + Class[] providerClasses = + (Class[]) new Class[] { java.text.spi.BreakIteratorProvider.class, java.text.spi.CollatorProvider.class, java.text.spi.DateFormatProvider.class, @@ -174,7 +180,7 @@ public final class LocaleServiceProviderPool { all.add(getLookupLocale(locale)); } - for (Class providerClass : providerClasses) { + for (Class providerClass : providerClasses) { LocaleServiceProviderPool pool = LocaleServiceProviderPool.getPool(providerClass); all.addAll(pool.getProviderLocales()); @@ -355,7 +361,6 @@ public final class LocaleServiceProviderPool { } Locale bundleLocale = (bundle != null ? bundle.getLocale() : null); List lookupLocales = getLookupLocales(locale); - P lsp; S providersObj = null; // check whether a provider has an implementation that's closer @@ -375,7 +380,9 @@ public final class LocaleServiceProviderPool { } } if (provLoc.contains(current)) { - lsp = (P)findProvider(current); + // It is safe to assume that findProvider() returns the instance of type P. + @SuppressWarnings("unchecked") + P lsp = (P)findProvider(current); if (lsp != null) { providersObj = getter.getObject(lsp, locale, key, params); if (providersObj != null) { @@ -397,7 +404,9 @@ public final class LocaleServiceProviderPool { // JRE has it. return null; } else { - lsp = (P)findProvider(bundleLocale); + // It is safe to assume that findProvider() returns the instance of type P. + @SuppressWarnings("unchecked") + P lsp = (P)findProvider(bundleLocale); if (lsp != null) { providersObj = getter.getObject(lsp, locale, key, params); if (providersObj != null) { diff --git a/jdk/src/share/classes/sun/util/calendar/BaseCalendar.java b/jdk/src/share/classes/sun/util/calendar/BaseCalendar.java index 21528dc487c..a7e763a0d7c 100644 --- a/jdk/src/share/classes/sun/util/calendar/BaseCalendar.java +++ b/jdk/src/share/classes/sun/util/calendar/BaseCalendar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, 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 @@ -25,7 +25,6 @@ package sun.util.calendar; -import java.util.Locale; import java.util.TimeZone; /** @@ -203,7 +202,7 @@ public abstract class BaseCalendar extends AbstractCalendar { return false; } int dow = bdate.getDayOfWeek(); - if (dow != bdate.FIELD_UNDEFINED && dow != getDayOfWeek(bdate)) { + if (dow != Date.FIELD_UNDEFINED && dow != getDayOfWeek(bdate)) { return false; } @@ -329,7 +328,7 @@ public abstract class BaseCalendar extends AbstractCalendar { } // accepts 0 (December in the previous year) to 12. - private final int getMonthLength(int year, int month) { + private int getMonthLength(int year, int month) { int days = DAYS_IN_MONTH[month]; if (month == FEBRUARY && isLeapYear(year)) { days++; diff --git a/jdk/src/share/classes/sun/util/calendar/CalendarSystem.java b/jdk/src/share/classes/sun/util/calendar/CalendarSystem.java index ac856412519..fdbdcb07099 100644 --- a/jdk/src/share/classes/sun/util/calendar/CalendarSystem.java +++ b/jdk/src/share/classes/sun/util/calendar/CalendarSystem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2011, 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 @@ -25,13 +25,6 @@ package sun.util.calendar; -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.MissingResourceException; -import java.util.ResourceBundle; -import java.util.Set; import java.util.TimeZone; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -99,7 +92,7 @@ public abstract class CalendarSystem { }; private static void initNames() { - ConcurrentMap nameMap = new ConcurrentHashMap(); + ConcurrentMap nameMap = new ConcurrentHashMap<>(); // Associate a calendar name with its class name and the // calendar class name with its date class name. @@ -112,7 +105,7 @@ public abstract class CalendarSystem { synchronized (CalendarSystem.class) { if (!initialized) { names = nameMap; - calendars = new ConcurrentHashMap(); + calendars = new ConcurrentHashMap<>(); initialized = true; } } @@ -164,10 +157,10 @@ public abstract class CalendarSystem { cal = LocalGregorianCalendar.getLocalGregorianCalendar(calendarName); } else { try { - Class cl = Class.forName(className); + Class cl = Class.forName(className); cal = (CalendarSystem) cl.newInstance(); } catch (Exception e) { - throw new RuntimeException("internal error", e); + throw new InternalError(e); } } if (cal == null) { diff --git a/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java b/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java index 99da4cd3bbf..d107a004d63 100644 --- a/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java +++ b/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java @@ -29,7 +29,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.security.AccessController; -import java.security.PrivilegedAction; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.util.ArrayList; @@ -124,8 +123,8 @@ public class LocalGregorianCalendar extends BaseCalendar { new sun.security.action.GetPropertyAction("java.home")); final String fname = homeDir + File.separator + "lib" + File.separator + "calendars.properties"; - calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws IOException { + calendarProps = AccessController.doPrivileged(new PrivilegedExceptionAction() { + public Properties run() throws IOException { Properties props = new Properties(); try (FileInputStream fis = new FileInputStream(fname)) { props.load(fis); @@ -142,7 +141,7 @@ public class LocalGregorianCalendar extends BaseCalendar { if (props == null) { return null; } - List eras = new ArrayList(); + List eras = new ArrayList<>(); StringTokenizer eraTokens = new StringTokenizer(props, ";"); while (eraTokens.hasMoreTokens()) { String items = eraTokens.nextToken().trim(); diff --git a/jdk/src/share/classes/sun/util/calendar/ZoneInfo.java b/jdk/src/share/classes/sun/util/calendar/ZoneInfo.java index b79e7cc3901..975e3ed1087 100644 --- a/jdk/src/share/classes/sun/util/calendar/ZoneInfo.java +++ b/jdk/src/share/classes/sun/util/calendar/ZoneInfo.java @@ -31,7 +31,6 @@ import java.lang.ref.SoftReference; import java.security.AccessController; import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -318,7 +317,7 @@ public class ZoneInfo extends TimeZone { return offset; } - private final int getTransitionIndex(long date, int type) { + private int getTransitionIndex(long date, int type) { int low = 0; int high = transitions.length - 1; @@ -572,7 +571,7 @@ public class ZoneInfo extends TimeZone { List excluded = ZoneInfoFile.getExcludedZones(); if (excluded != null) { // List all zones from the idList and excluded lists - List list = new ArrayList(idList.size() + excluded.size()); + List list = new ArrayList<>(idList.size() + excluded.size()); list.addAll(idList); list.addAll(excluded); idList = list; @@ -592,7 +591,7 @@ public class ZoneInfo extends TimeZone { */ public static String[] getAvailableIDs(int rawOffset) { String[] result; - List matched = new ArrayList(); + List matched = new ArrayList<>(); List IDs = ZoneInfoFile.getZoneIDs(); int[] rawOffsets = ZoneInfoFile.getRawOffsets(); @@ -807,7 +806,7 @@ public class ZoneInfo extends TimeZone { return (checksum == ((ZoneInfo)other).checksum); } - private static SoftReference aliasTable; + private static SoftReference> aliasTable; /** * Returns a Map from alias time zone IDs to their standard @@ -820,7 +819,7 @@ public class ZoneInfo extends TimeZone { public synchronized static Map getAliasTable() { Map aliases = null; - SoftReference cache = aliasTable; + SoftReference> cache = aliasTable; if (cache != null) { aliases = cache.get(); if (aliases != null) { @@ -830,7 +829,7 @@ public class ZoneInfo extends TimeZone { aliases = ZoneInfoFile.getZoneAliases(); if (aliases != null) { - aliasTable = new SoftReference(aliases); + aliasTable = new SoftReference<>(aliases); } return aliases; } diff --git a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java index 891817776aa..2ad72b0e535 100644 --- a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java +++ b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2011, 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 @@ -573,7 +573,7 @@ public class ZoneInfoFile { synchronized static ZoneInfo addToCache(String id, ZoneInfo zi) { if (zoneInfoObjects == null) { - zoneInfoObjects = new HashMap(); + zoneInfoObjects = new HashMap<>(); } else { ZoneInfo zone = zoneInfoObjects.get(id); if (zone != null) { @@ -758,7 +758,7 @@ public class ZoneInfoFile { case TAG_ZoneIDs: { int n = (buf[index++] << 8) + (buf[index++] & 0xFF); - ids = new ArrayList(n); + ids = new ArrayList<>(n); for (int i = 0; i < n; i++) { byte m = buf[index++]; @@ -777,7 +777,7 @@ public class ZoneInfoFile { System.err.println("ZoneInfo: corrupted " + JAVAZM_FILE_NAME); } - zoneIDs = new SoftReference>(ids); + zoneIDs = new SoftReference<>(ids); return ids; } @@ -802,7 +802,7 @@ public class ZoneInfoFile { case TAG_ZoneAliases: { int n = (buf[index++] << 8) + (buf[index++] & 0xFF); - aliases = new HashMap(n); + aliases = new HashMap<>(n); for (int i = 0; i < n; i++) { byte m = buf[index++]; String name = new String(buf, index, m, "UTF-8"); @@ -865,7 +865,7 @@ public class ZoneInfoFile { case TAG_ExcludedZones: { int n = (buf[index++] << 8) + (buf[index++] & 0xFF); - excludeList = new ArrayList(); + excludeList = new ArrayList<>(); for (int i = 0; i < n; i++) { byte m = buf[index++]; String name = new String(buf, index, m, "UTF-8"); @@ -886,7 +886,7 @@ public class ZoneInfoFile { } if (excludeList != null) { - excludedIDs = new SoftReference>(excludeList); + excludedIDs = new SoftReference<>(excludeList); } else { hasNoExcludeList = true; } @@ -935,7 +935,7 @@ public class ZoneInfoFile { System.err.println("ZoneInfo: corrupted " + JAVAZM_FILE_NAME); } - rawOffsetIndices = new SoftReference(indices); + rawOffsetIndices = new SoftReference<>(indices); return indices; } @@ -986,7 +986,7 @@ public class ZoneInfoFile { System.err.println("ZoneInfo: corrupted " + JAVAZM_FILE_NAME); } - rawOffsets = new SoftReference(offsets); + rawOffsets = new SoftReference<>(offsets); return offsets; } @@ -1022,7 +1022,7 @@ public class ZoneInfoFile { return null; } - zoneInfoMappings = new SoftReference(data); + zoneInfoMappings = new SoftReference<>(data); return data; } @@ -1034,8 +1034,8 @@ public class ZoneInfoFile { byte[] buffer = null; try { - buffer = (byte[]) AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws IOException { + buffer = AccessController.doPrivileged(new PrivilegedExceptionAction() { + public byte[] run() throws IOException { File file = new File(ziDir, fileName); if (!file.exists() || !file.isFile()) { return null; @@ -1068,4 +1068,7 @@ public class ZoneInfoFile { } return buffer; } + + private ZoneInfoFile() { + } } diff --git a/jdk/src/share/classes/sun/util/resources/LocaleData.java b/jdk/src/share/classes/sun/util/resources/LocaleData.java index a082a601dd0..ac8fdd27c86 100644 --- a/jdk/src/share/classes/sun/util/resources/LocaleData.java +++ b/jdk/src/share/classes/sun/util/resources/LocaleData.java @@ -137,8 +137,8 @@ public class LocaleData { } private static ResourceBundle getBundle(final String baseName, final Locale locale) { - return (ResourceBundle) AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { + return AccessController.doPrivileged(new PrivilegedAction() { + public ResourceBundle run() { return ResourceBundle. getBundle(baseName, locale, LocaleDataResourceBundleControl.getRBControlInstance()); diff --git a/jdk/src/share/classes/sun/util/resources/OpenListResourceBundle.java b/jdk/src/share/classes/sun/util/resources/OpenListResourceBundle.java index 86a91f87854..f8d48a21378 100644 --- a/jdk/src/share/classes/sun/util/resources/OpenListResourceBundle.java +++ b/jdk/src/share/classes/sun/util/resources/OpenListResourceBundle.java @@ -119,11 +119,12 @@ public abstract class OpenListResourceBundle extends ResourceBundle { * loading. */ private synchronized void loadLookup() { - if (lookup != null) + if (lookup != null) { return; + } Object[][] contents = getContents(); - Map temp = createMap(contents.length); + Map temp = createMap(contents.length); for (int i = 0; i < contents.length; ++i) { // key must be non-null String, value must be non-null String key = (String) contents[i][0]; @@ -140,9 +141,9 @@ public abstract class OpenListResourceBundle extends ResourceBundle { * Lets subclasses provide specialized Map implementations. * Default uses HashMap. */ - protected Map createMap(int size) { - return new HashMap(size); + protected Map createMap(int size) { + return new HashMap<>(size); } - private Map lookup = null; + private Map lookup = null; } diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNamesBundle.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNamesBundle.java index 63601250103..3757ed121a5 100644 --- a/jdk/src/share/classes/sun/util/resources/TimeZoneNamesBundle.java +++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNamesBundle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -80,17 +80,16 @@ public abstract class TimeZoneNamesBundle extends OpenListResourceBundle { int clen = contents.length; String[] tmpobj = new String[clen+1]; tmpobj[0] = key; - for (int i = 0; i < clen; i++) { - tmpobj[i+1] = contents[i]; - } + System.arraycopy(contents, 0, tmpobj, 1, clen); return tmpobj; } /** * Use LinkedHashMap to preserve order of bundle entries. */ - protected Map createMap(int size) { - return new LinkedHashMap(size); + @Override + protected Map createMap(int size) { + return new LinkedHashMap<>(size); } /** diff --git a/jdk/src/share/native/java/io/io_util.c b/jdk/src/share/native/java/io/io_util.c index e17652a69b5..8777ff0f899 100644 --- a/jdk/src/share/native/java/io/io_util.c +++ b/jdk/src/share/native/java/io/io_util.c @@ -44,7 +44,7 @@ readSingle(JNIEnv *env, jobject this, jfieldID fid) { JNU_ThrowIOException(env, "Stream Closed"); return -1; } - nread = (jint)IO_Read(fd, &ret, 1); + nread = IO_Read(fd, &ret, 1); if (nread == 0) { /* EOF */ return -1; } else if (nread == JVM_IO_ERR) { /* error */ @@ -108,7 +108,7 @@ readBytes(JNIEnv *env, jobject this, jbyteArray bytes, JNU_ThrowIOException(env, "Stream Closed"); nread = -1; } else { - nread = (jint)IO_Read(fd, buf, len); + nread = IO_Read(fd, buf, len); if (nread > 0) { (*env)->SetByteArrayRegion(env, bytes, off, nread, (jbyte *)buf); } else if (nread == JVM_IO_ERR) { @@ -137,9 +137,9 @@ writeSingle(JNIEnv *env, jobject this, jint byte, jboolean append, jfieldID fid) return; } if (append == JNI_TRUE) { - n = (jint)IO_Append(fd, &c, 1); + n = IO_Append(fd, &c, 1); } else { - n = (jint)IO_Write(fd, &c, 1); + n = IO_Write(fd, &c, 1); } if (n == JVM_IO_ERR) { JNU_ThrowIOExceptionWithLastError(env, "Write error"); @@ -190,9 +190,9 @@ writeBytes(JNIEnv *env, jobject this, jbyteArray bytes, break; } if (append == JNI_TRUE) { - n = (jint)IO_Append(fd, buf+off, len); + n = IO_Append(fd, buf+off, len); } else { - n = (jint)IO_Write(fd, buf+off, len); + n = IO_Write(fd, buf+off, len); } if (n == JVM_IO_ERR) { JNU_ThrowIOExceptionWithLastError(env, "Write error"); diff --git a/jdk/src/share/native/java/util/zip/Adler32.c b/jdk/src/share/native/java/util/zip/Adler32.c index d7666caaffe..36b5499e28b 100644 --- a/jdk/src/share/native/java/util/zip/Adler32.c +++ b/jdk/src/share/native/java/util/zip/Adler32.c @@ -30,6 +30,7 @@ #include "jni.h" #include "jni_util.h" #include "zlib.h" +#include "jlong.h" #include "java_util_zip_Adler32.h" @@ -53,3 +54,17 @@ Java_java_util_zip_Adler32_updateBytes(JNIEnv *env, jclass cls, jint adler, } return adler; } + + +JNIEXPORT jint JNICALL +Java_java_util_zip_Adler32_updateByteBuffer(JNIEnv *env, jclass cls, jint adler, + jlong address, jint off, jint len) +{ + Bytef *buf = (Bytef *)jlong_to_ptr(address); + if (buf) { + adler = adler32(adler, buf + off, len); + } + return adler; +} + + diff --git a/jdk/src/share/native/java/util/zip/CRC32.c b/jdk/src/share/native/java/util/zip/CRC32.c index 48b665274be..c8cb2dea983 100644 --- a/jdk/src/share/native/java/util/zip/CRC32.c +++ b/jdk/src/share/native/java/util/zip/CRC32.c @@ -58,3 +58,14 @@ JNIEXPORT jint ZIP_CRC32(jint crc, const jbyte *buf, jint len) { return crc32(crc, (Bytef*)buf, len); } + +JNIEXPORT jint JNICALL +Java_java_util_zip_CRC32_updateByteBuffer(JNIEnv *env, jclass cls, jint crc, + jlong address, jint off, jint len) +{ + Bytef *buf = (Bytef *)jlong_to_ptr(address); + if (buf) { + crc = crc32(crc, buf + off, len); + } + return crc; +} diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/gzio.c b/jdk/src/share/native/java/util/zip/zlib-1.2.3/gzio.c deleted file mode 100644 index 2926d93ea3c..00000000000 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/gzio.c +++ /dev/null @@ -1,1050 +0,0 @@ -/* - * 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. - */ - -/* gzio.c -- IO on .gz files - * Copyright (C) 1995-2005 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - * - * Compile this file with -DNO_GZCOMPRESS to avoid the compression code. - */ - -/* @(#) $Id$ */ - -#include - -#include "zutil.h" - -#ifdef NO_DEFLATE /* for compatibility with old definition */ -# define NO_GZCOMPRESS -#endif - -#ifndef NO_DUMMY_DECL -struct internal_state {int dummy;}; /* for buggy compilers */ -#endif - -#ifndef Z_BUFSIZE -# ifdef MAXSEG_64K -# define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */ -# else -# define Z_BUFSIZE 16384 -# endif -#endif -#ifndef Z_PRINTF_BUFSIZE -# define Z_PRINTF_BUFSIZE 4096 -#endif - -#ifdef __MVS__ -# pragma map (fdopen , "\174\174FDOPEN") - FILE *fdopen(int, const char *); -#endif - -#ifndef STDC -extern voidp malloc OF((uInt size)); -extern void free OF((voidpf ptr)); -#endif - -#define ALLOC(size) malloc(size) -#define TRYFREE(p) {if (p) free(p);} - -static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */ - -/* gzip flag byte */ -#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ -#define HEAD_CRC 0x02 /* bit 1 set: header CRC present */ -#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ -#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ -#define COMMENT 0x10 /* bit 4 set: file comment present */ -#define RESERVED 0xE0 /* bits 5..7: reserved */ - -typedef struct gz_stream { - z_stream stream; - int z_err; /* error code for last stream operation */ - int z_eof; /* set if end of input file */ - FILE *file; /* .gz file */ - Byte *inbuf; /* input buffer */ - Byte *outbuf; /* output buffer */ - uLong crc; /* crc32 of uncompressed data */ - char *msg; /* error message */ - char *path; /* path name for debugging only */ - int transparent; /* 1 if input file is not a .gz file */ - char mode; /* 'w' or 'r' */ - z_off_t start; /* start of compressed data in file (header skipped) */ - z_off_t in; /* bytes into deflate or inflate */ - z_off_t out; /* bytes out of deflate or inflate */ - int back; /* one character push-back */ - int last; /* true if push-back is last character */ -} gz_stream; - - -local gzFile gz_open OF((const char *path, const char *mode, int fd)); -local int do_flush OF((gzFile file, int flush)); -local int get_byte OF((gz_stream *s)); -local void check_header OF((gz_stream *s)); -local int destroy OF((gz_stream *s)); -local void putLong OF((FILE *file, uLong x)); -local uLong getLong OF((gz_stream *s)); - -/* =========================================================================== - Opens a gzip (.gz) file for reading or writing. The mode parameter - is as in fopen ("rb" or "wb"). The file is given either by file descriptor - or path name (if fd == -1). - gz_open returns NULL if the file could not be opened or if there was - insufficient memory to allocate the (de)compression state; errno - can be checked to distinguish the two cases (if errno is zero, the - zlib error is Z_MEM_ERROR). -*/ -local gzFile gz_open (path, mode, fd) - const char *path; - const char *mode; - int fd; -{ - int err; - int level = Z_DEFAULT_COMPRESSION; /* compression level */ - int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */ - char *p = (char*)mode; - gz_stream *s; - char fmode[80]; /* copy of mode, without the compression level */ - char *m = fmode; - - if (!path || !mode) return Z_NULL; - - s = (gz_stream *)ALLOC(sizeof(gz_stream)); - if (!s) return Z_NULL; - - s->stream.zalloc = (alloc_func)0; - s->stream.zfree = (free_func)0; - s->stream.opaque = (voidpf)0; - s->stream.next_in = s->inbuf = Z_NULL; - s->stream.next_out = s->outbuf = Z_NULL; - s->stream.avail_in = s->stream.avail_out = 0; - s->file = NULL; - s->z_err = Z_OK; - s->z_eof = 0; - s->in = 0; - s->out = 0; - s->back = EOF; - s->crc = crc32(0L, Z_NULL, 0); - s->msg = NULL; - s->transparent = 0; - - s->path = (char*)ALLOC(strlen(path)+1); - if (s->path == NULL) { - return destroy(s), (gzFile)Z_NULL; - } - strcpy(s->path, path); /* do this early for debugging */ - - s->mode = '\0'; - do { - if (*p == 'r') s->mode = 'r'; - if (*p == 'w' || *p == 'a') s->mode = 'w'; - if (*p >= '0' && *p <= '9') { - level = *p - '0'; - } else if (*p == 'f') { - strategy = Z_FILTERED; - } else if (*p == 'h') { - strategy = Z_HUFFMAN_ONLY; - } else if (*p == 'R') { - strategy = Z_RLE; - } else { - *m++ = *p; /* copy the mode */ - } - } while (*p++ && m != fmode + sizeof(fmode)); - if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL; - - if (s->mode == 'w') { -#ifdef NO_GZCOMPRESS - err = Z_STREAM_ERROR; -#else - err = deflateInit2(&(s->stream), level, - Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy); - /* windowBits is passed < 0 to suppress zlib header */ - - s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE); -#endif - if (err != Z_OK || s->outbuf == Z_NULL) { - return destroy(s), (gzFile)Z_NULL; - } - } else { - s->stream.next_in = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); - - err = inflateInit2(&(s->stream), -MAX_WBITS); - /* windowBits is passed < 0 to tell that there is no zlib header. - * Note that in this case inflate *requires* an extra "dummy" byte - * after the compressed stream in order to complete decompression and - * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are - * present after the compressed stream. - */ - if (err != Z_OK || s->inbuf == Z_NULL) { - return destroy(s), (gzFile)Z_NULL; - } - } - s->stream.avail_out = Z_BUFSIZE; - - errno = 0; - s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode); - - if (s->file == NULL) { - return destroy(s), (gzFile)Z_NULL; - } - if (s->mode == 'w') { - /* Write a very simple .gz header: - */ - fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1], - Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE); - s->start = 10L; - /* We use 10L instead of ftell(s->file) to because ftell causes an - * fflush on some systems. This version of the library doesn't use - * start anyway in write mode, so this initialization is not - * necessary. - */ - } else { - check_header(s); /* skip the .gz header */ - s->start = ftell(s->file) - s->stream.avail_in; - } - - return (gzFile)s; -} - -/* =========================================================================== - Opens a gzip (.gz) file for reading or writing. -*/ -gzFile ZEXPORT gzopen (path, mode) - const char *path; - const char *mode; -{ - return gz_open (path, mode, -1); -} - -/* =========================================================================== - Associate a gzFile with the file descriptor fd. fd is not dup'ed here - to mimic the behavio(u)r of fdopen. -*/ -gzFile ZEXPORT gzdopen (fd, mode) - int fd; - const char *mode; -{ - char name[46]; /* allow for up to 128-bit integers */ - - if (fd < 0) return (gzFile)Z_NULL; - sprintf(name, "", fd); /* for debugging */ - - return gz_open (name, mode, fd); -} - -/* =========================================================================== - * Update the compression level and strategy - */ -int ZEXPORT gzsetparams (file, level, strategy) - gzFile file; - int level; - int strategy; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; - - /* Make room to allow flushing */ - if (s->stream.avail_out == 0) { - - s->stream.next_out = s->outbuf; - if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) { - s->z_err = Z_ERRNO; - } - s->stream.avail_out = Z_BUFSIZE; - } - - return deflateParams (&(s->stream), level, strategy); -} - -/* =========================================================================== - Read a byte from a gz_stream; update next_in and avail_in. Return EOF - for end of file. - IN assertion: the stream s has been sucessfully opened for reading. -*/ -local int get_byte(s) - gz_stream *s; -{ - if (s->z_eof) return EOF; - if (s->stream.avail_in == 0) { - errno = 0; - s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file); - if (s->stream.avail_in == 0) { - s->z_eof = 1; - if (ferror(s->file)) s->z_err = Z_ERRNO; - return EOF; - } - s->stream.next_in = s->inbuf; - } - s->stream.avail_in--; - return *(s->stream.next_in)++; -} - -/* =========================================================================== - Check the gzip header of a gz_stream opened for reading. Set the stream - mode to transparent if the gzip magic header is not present; set s->err - to Z_DATA_ERROR if the magic header is present but the rest of the header - is incorrect. - IN assertion: the stream s has already been created sucessfully; - s->stream.avail_in is zero for the first time, but may be non-zero - for concatenated .gz files. -*/ -local void check_header(s) - gz_stream *s; -{ - int method; /* method byte */ - int flags; /* flags byte */ - uInt len; - int c; - - /* Assure two bytes in the buffer so we can peek ahead -- handle case - where first byte of header is at the end of the buffer after the last - gzip segment */ - len = s->stream.avail_in; - if (len < 2) { - if (len) s->inbuf[0] = s->stream.next_in[0]; - errno = 0; - len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file); - if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO; - s->stream.avail_in += len; - s->stream.next_in = s->inbuf; - if (s->stream.avail_in < 2) { - s->transparent = s->stream.avail_in; - return; - } - } - - /* Peek ahead to check the gzip magic header */ - if (s->stream.next_in[0] != gz_magic[0] || - s->stream.next_in[1] != gz_magic[1]) { - s->transparent = 1; - return; - } - s->stream.avail_in -= 2; - s->stream.next_in += 2; - - /* Check the rest of the gzip header */ - method = get_byte(s); - flags = get_byte(s); - if (method != Z_DEFLATED || (flags & RESERVED) != 0) { - s->z_err = Z_DATA_ERROR; - return; - } - - /* Discard time, xflags and OS code: */ - for (len = 0; len < 6; len++) (void)get_byte(s); - - if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */ - len = (uInt)get_byte(s); - len += ((uInt)get_byte(s))<<8; - /* len is garbage if EOF but the loop below will quit anyway */ - while (len-- != 0 && get_byte(s) != EOF) ; - } - if ((flags & ORIG_NAME) != 0) { /* skip the original file name */ - while ((c = get_byte(s)) != 0 && c != EOF) ; - } - if ((flags & COMMENT) != 0) { /* skip the .gz file comment */ - while ((c = get_byte(s)) != 0 && c != EOF) ; - } - if ((flags & HEAD_CRC) != 0) { /* skip the header crc */ - for (len = 0; len < 2; len++) (void)get_byte(s); - } - s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK; -} - - /* =========================================================================== - * Cleanup then free the given gz_stream. Return a zlib error code. - Try freeing in the reverse order of allocations. - */ -local int destroy (s) - gz_stream *s; -{ - int err = Z_OK; - - if (!s) return Z_STREAM_ERROR; - - TRYFREE(s->msg); - - if (s->stream.state != NULL) { - if (s->mode == 'w') { -#ifdef NO_GZCOMPRESS - err = Z_STREAM_ERROR; -#else - err = deflateEnd(&(s->stream)); -#endif - } else if (s->mode == 'r') { - err = inflateEnd(&(s->stream)); - } - } - if (s->file != NULL && fclose(s->file)) { -#ifdef ESPIPE - if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */ -#endif - err = Z_ERRNO; - } - if (s->z_err < 0) err = s->z_err; - - TRYFREE(s->inbuf); - TRYFREE(s->outbuf); - TRYFREE(s->path); - TRYFREE(s); - return err; -} - -/* =========================================================================== - Reads the given number of uncompressed bytes from the compressed file. - gzread returns the number of bytes actually read (0 for end of file). -*/ -int ZEXPORT gzread (file, buf, len) - gzFile file; - voidp buf; - unsigned len; -{ - gz_stream *s = (gz_stream*)file; - Bytef *start = (Bytef*)buf; /* starting point for crc computation */ - Byte *next_out; /* == stream.next_out but not forced far (for MSDOS) */ - - if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR; - - if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1; - if (s->z_err == Z_STREAM_END) return 0; /* EOF */ - - next_out = (Byte*)buf; - s->stream.next_out = (Bytef*)buf; - s->stream.avail_out = len; - - if (s->stream.avail_out && s->back != EOF) { - *next_out++ = s->back; - s->stream.next_out++; - s->stream.avail_out--; - s->back = EOF; - s->out++; - start++; - if (s->last) { - s->z_err = Z_STREAM_END; - return 1; - } - } - - while (s->stream.avail_out != 0) { - - if (s->transparent) { - /* Copy first the lookahead bytes: */ - uInt n = s->stream.avail_in; - if (n > s->stream.avail_out) n = s->stream.avail_out; - if (n > 0) { - zmemcpy(s->stream.next_out, s->stream.next_in, n); - next_out += n; - s->stream.next_out = next_out; - s->stream.next_in += n; - s->stream.avail_out -= n; - s->stream.avail_in -= n; - } - if (s->stream.avail_out > 0) { - s->stream.avail_out -= - (uInt)fread(next_out, 1, s->stream.avail_out, s->file); - } - len -= s->stream.avail_out; - s->in += len; - s->out += len; - if (len == 0) s->z_eof = 1; - return (int)len; - } - if (s->stream.avail_in == 0 && !s->z_eof) { - - errno = 0; - s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file); - if (s->stream.avail_in == 0) { - s->z_eof = 1; - if (ferror(s->file)) { - s->z_err = Z_ERRNO; - break; - } - } - s->stream.next_in = s->inbuf; - } - s->in += s->stream.avail_in; - s->out += s->stream.avail_out; - s->z_err = inflate(&(s->stream), Z_NO_FLUSH); - s->in -= s->stream.avail_in; - s->out -= s->stream.avail_out; - - if (s->z_err == Z_STREAM_END) { - /* Check CRC and original size */ - s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start)); - start = s->stream.next_out; - - if (getLong(s) != s->crc) { - s->z_err = Z_DATA_ERROR; - } else { - (void)getLong(s); - /* The uncompressed length returned by above getlong() may be - * different from s->out in case of concatenated .gz files. - * Check for such files: - */ - check_header(s); - if (s->z_err == Z_OK) { - inflateReset(&(s->stream)); - s->crc = crc32(0L, Z_NULL, 0); - } - } - } - if (s->z_err != Z_OK || s->z_eof) break; - } - s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start)); - - if (len == s->stream.avail_out && - (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO)) - return -1; - return (int)(len - s->stream.avail_out); -} - - -/* =========================================================================== - Reads one byte from the compressed file. gzgetc returns this byte - or -1 in case of end of file or error. -*/ -int ZEXPORT gzgetc(file) - gzFile file; -{ - unsigned char c; - - return gzread(file, &c, 1) == 1 ? c : -1; -} - - -/* =========================================================================== - Push one byte back onto the stream. -*/ -int ZEXPORT gzungetc(c, file) - int c; - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF; - s->back = c; - s->out--; - s->last = (s->z_err == Z_STREAM_END); - if (s->last) s->z_err = Z_OK; - s->z_eof = 0; - return c; -} - - -/* =========================================================================== - Reads bytes from the compressed file until len-1 characters are - read, or a newline character is read and transferred to buf, or an - end-of-file condition is encountered. The string is then terminated - with a null character. - gzgets returns buf, or Z_NULL in case of error. - - The current implementation is not optimized at all. -*/ -char * ZEXPORT gzgets(file, buf, len) - gzFile file; - char *buf; - int len; -{ - char *b = buf; - if (buf == Z_NULL || len <= 0) return Z_NULL; - - while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ; - *buf = '\0'; - return b == buf && len > 0 ? Z_NULL : b; -} - - -#ifndef NO_GZCOMPRESS -/* =========================================================================== - Writes the given number of uncompressed bytes into the compressed file. - gzwrite returns the number of bytes actually written (0 in case of error). -*/ -int ZEXPORT gzwrite (file, buf, len) - gzFile file; - voidpc buf; - unsigned len; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; - - s->stream.next_in = (Bytef*)buf; - s->stream.avail_in = len; - - while (s->stream.avail_in != 0) { - - if (s->stream.avail_out == 0) { - - s->stream.next_out = s->outbuf; - if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) { - s->z_err = Z_ERRNO; - break; - } - s->stream.avail_out = Z_BUFSIZE; - } - s->in += s->stream.avail_in; - s->out += s->stream.avail_out; - s->z_err = deflate(&(s->stream), Z_NO_FLUSH); - s->in -= s->stream.avail_in; - s->out -= s->stream.avail_out; - if (s->z_err != Z_OK) break; - } - s->crc = crc32(s->crc, (const Bytef *)buf, len); - - return (int)(len - s->stream.avail_in); -} - - -/* =========================================================================== - Converts, formats, and writes the args to the compressed file under - control of the format string, as in fprintf. gzprintf returns the number of - uncompressed bytes actually written (0 in case of error). -*/ -#ifdef STDC -#include - -int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...) -{ - char buf[Z_PRINTF_BUFSIZE]; - va_list va; - int len; - - buf[sizeof(buf) - 1] = 0; - va_start(va, format); -#ifdef NO_vsnprintf -# ifdef HAS_vsprintf_void - (void)vsprintf(buf, format, va); - va_end(va); - for (len = 0; len < sizeof(buf); len++) - if (buf[len] == 0) break; -# else - len = vsprintf(buf, format, va); - va_end(va); -# endif -#else -# ifdef HAS_vsnprintf_void - (void)vsnprintf(buf, sizeof(buf), format, va); - va_end(va); - len = strlen(buf); -# else - len = vsnprintf(buf, sizeof(buf), format, va); - va_end(va); -# endif -#endif - if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0) - return 0; - return gzwrite(file, buf, (unsigned)len); -} -#else /* not ANSI C */ - -int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, - a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) - gzFile file; - const char *format; - int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, - a11, a12, a13, a14, a15, a16, a17, a18, a19, a20; -{ - char buf[Z_PRINTF_BUFSIZE]; - int len; - - buf[sizeof(buf) - 1] = 0; -#ifdef NO_snprintf -# ifdef HAS_sprintf_void - sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); - for (len = 0; len < sizeof(buf); len++) - if (buf[len] == 0) break; -# else - len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); -# endif -#else -# ifdef HAS_snprintf_void - snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); - len = strlen(buf); -# else - len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); -# endif -#endif - if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0) - return 0; - return gzwrite(file, buf, len); -} -#endif - -/* =========================================================================== - Writes c, converted to an unsigned char, into the compressed file. - gzputc returns the value that was written, or -1 in case of error. -*/ -int ZEXPORT gzputc(file, c) - gzFile file; - int c; -{ - unsigned char cc = (unsigned char) c; /* required for big endian systems */ - - return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1; -} - - -/* =========================================================================== - Writes the given null-terminated string to the compressed file, excluding - the terminating null character. - gzputs returns the number of characters written, or -1 in case of error. -*/ -int ZEXPORT gzputs(file, s) - gzFile file; - const char *s; -{ - return gzwrite(file, (char*)s, (unsigned)strlen(s)); -} - - -/* =========================================================================== - Flushes all pending output into the compressed file. The parameter - flush is as in the deflate() function. -*/ -local int do_flush (file, flush) - gzFile file; - int flush; -{ - uInt len; - int done = 0; - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; - - s->stream.avail_in = 0; /* should be zero already anyway */ - - for (;;) { - len = Z_BUFSIZE - s->stream.avail_out; - - if (len != 0) { - if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) { - s->z_err = Z_ERRNO; - return Z_ERRNO; - } - s->stream.next_out = s->outbuf; - s->stream.avail_out = Z_BUFSIZE; - } - if (done) break; - s->out += s->stream.avail_out; - s->z_err = deflate(&(s->stream), flush); - s->out -= s->stream.avail_out; - - /* Ignore the second of two consecutive flushes: */ - if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK; - - /* deflate has finished flushing only when it hasn't used up - * all the available space in the output buffer: - */ - done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END); - - if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break; - } - return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; -} - -int ZEXPORT gzflush (file, flush) - gzFile file; - int flush; -{ - gz_stream *s = (gz_stream*)file; - int err = do_flush (file, flush); - - if (err) return err; - fflush(s->file); - return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; -} -#endif /* NO_GZCOMPRESS */ - -/* =========================================================================== - Sets the starting position for the next gzread or gzwrite on the given - compressed file. The offset represents a number of bytes in the - gzseek returns the resulting offset location as measured in bytes from - the beginning of the uncompressed stream, or -1 in case of error. - SEEK_END is not implemented, returns error. - In this version of the library, gzseek can be extremely slow. -*/ -z_off_t ZEXPORT gzseek (file, offset, whence) - gzFile file; - z_off_t offset; - int whence; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || whence == SEEK_END || - s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) { - return -1L; - } - - if (s->mode == 'w') { -#ifdef NO_GZCOMPRESS - return -1L; -#else - if (whence == SEEK_SET) { - offset -= s->in; - } - if (offset < 0) return -1L; - - /* At this point, offset is the number of zero bytes to write. */ - if (s->inbuf == Z_NULL) { - s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */ - if (s->inbuf == Z_NULL) return -1L; - zmemzero(s->inbuf, Z_BUFSIZE); - } - while (offset > 0) { - uInt size = Z_BUFSIZE; - if (offset < Z_BUFSIZE) size = (uInt)offset; - - size = gzwrite(file, s->inbuf, size); - if (size == 0) return -1L; - - offset -= size; - } - return s->in; -#endif - } - /* Rest of function is for reading only */ - - /* compute absolute position */ - if (whence == SEEK_CUR) { - offset += s->out; - } - if (offset < 0) return -1L; - - if (s->transparent) { - /* map to fseek */ - s->back = EOF; - s->stream.avail_in = 0; - s->stream.next_in = s->inbuf; - if (fseek(s->file, offset, SEEK_SET) < 0) return -1L; - - s->in = s->out = offset; - return offset; - } - - /* For a negative seek, rewind and use positive seek */ - if (offset >= s->out) { - offset -= s->out; - } else if (gzrewind(file) < 0) { - return -1L; - } - /* offset is now the number of bytes to skip. */ - - if (offset != 0 && s->outbuf == Z_NULL) { - s->outbuf = (Byte*)ALLOC(Z_BUFSIZE); - if (s->outbuf == Z_NULL) return -1L; - } - if (offset && s->back != EOF) { - s->back = EOF; - s->out++; - offset--; - if (s->last) s->z_err = Z_STREAM_END; - } - while (offset > 0) { - int size = Z_BUFSIZE; - if (offset < Z_BUFSIZE) size = (int)offset; - - size = gzread(file, s->outbuf, (uInt)size); - if (size <= 0) return -1L; - offset -= size; - } - return s->out; -} - -/* =========================================================================== - Rewinds input file. -*/ -int ZEXPORT gzrewind (file) - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'r') return -1; - - s->z_err = Z_OK; - s->z_eof = 0; - s->back = EOF; - s->stream.avail_in = 0; - s->stream.next_in = s->inbuf; - s->crc = crc32(0L, Z_NULL, 0); - if (!s->transparent) (void)inflateReset(&s->stream); - s->in = 0; - s->out = 0; - return fseek(s->file, s->start, SEEK_SET); -} - -/* =========================================================================== - Returns the starting position for the next gzread or gzwrite on the - given compressed file. This position represents a number of bytes in the - uncompressed data stream. -*/ -z_off_t ZEXPORT gztell (file) - gzFile file; -{ - return gzseek(file, 0L, SEEK_CUR); -} - -/* =========================================================================== - Returns 1 when EOF has previously been detected reading the given - input stream, otherwise zero. -*/ -int ZEXPORT gzeof (file) - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - /* With concatenated compressed files that can have embedded - * crc trailers, z_eof is no longer the only/best indicator of EOF - * on a gz_stream. Handle end-of-stream error explicitly here. - */ - if (s == NULL || s->mode != 'r') return 0; - if (s->z_eof) return 1; - return s->z_err == Z_STREAM_END; -} - -/* =========================================================================== - Returns 1 if reading and doing so transparently, otherwise zero. -*/ -int ZEXPORT gzdirect (file) - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'r') return 0; - return s->transparent; -} - -/* =========================================================================== - Outputs a long in LSB order to the given file -*/ -local void putLong (file, x) - FILE *file; - uLong x; -{ - int n; - for (n = 0; n < 4; n++) { - fputc((int)(x & 0xff), file); - x >>= 8; - } -} - -/* =========================================================================== - Reads a long in LSB order from the given gz_stream. Sets z_err in case - of error. -*/ -local uLong getLong (s) - gz_stream *s; -{ - uLong x = (uLong)get_byte(s); - int c; - - x += ((uLong)get_byte(s))<<8; - x += ((uLong)get_byte(s))<<16; - c = get_byte(s); - if (c == EOF) s->z_err = Z_DATA_ERROR; - x += ((uLong)c)<<24; - return x; -} - -/* =========================================================================== - Flushes all pending output if necessary, closes the compressed file - and deallocates all the (de)compression state. -*/ -int ZEXPORT gzclose (file) - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL) return Z_STREAM_ERROR; - - if (s->mode == 'w') { -#ifdef NO_GZCOMPRESS - return Z_STREAM_ERROR; -#else - if (do_flush (file, Z_FINISH) != Z_OK) - return destroy((gz_stream*)file); - - putLong (s->file, s->crc); - putLong (s->file, (uLong)(s->in & 0xffffffff)); -#endif - } - return destroy((gz_stream*)file); -} - -#ifdef STDC -# define zstrerror(errnum) strerror(errnum) -#else -# define zstrerror(errnum) "" -#endif - -/* =========================================================================== - Returns the error message for the last error which occurred on the - given compressed file. errnum is set to zlib error number. If an - error occurred in the file system and not in the compression library, - errnum is set to Z_ERRNO and the application may consult errno - to get the exact error code. -*/ -const char * ZEXPORT gzerror (file, errnum) - gzFile file; - int *errnum; -{ - char *m; - gz_stream *s = (gz_stream*)file; - - if (s == NULL) { - *errnum = Z_STREAM_ERROR; - return (const char*)ERR_MSG(Z_STREAM_ERROR); - } - *errnum = s->z_err; - if (*errnum == Z_OK) return (const char*)""; - - m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg); - - if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err); - - TRYFREE(s->msg); - s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3); - if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR); - strcpy(s->msg, s->path); - strcat(s->msg, ": "); - strcat(s->msg, m); - return (const char*)s->msg; -} - -/* =========================================================================== - Clear the error and end-of-file flags, and do the same for the real file. -*/ -void ZEXPORT gzclearerr (file) - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL) return; - if (s->z_err != Z_STREAM_END) s->z_err = Z_OK; - s->z_eof = 0; - clearerr(s->file); -} diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/crc32.c.diff b/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/crc32.c.diff deleted file mode 100644 index 6bd57b97321..00000000000 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/crc32.c.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- /home/sherman/TL/zlib-1.2.3_ORG/crc32.c Sun Jun 12 16:56:07 2005 -+++ zcrc32.c Tue Aug 25 14:22:41 2009 -@@ -216,8 +216,8 @@ - #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 - - /* ========================================================================= */ --unsigned long ZEXPORT crc32(crc, buf, len) -- unsigned long crc; -+uLong ZEXPORT crc32(crc, buf, len) -+ uLong crc; - const unsigned char FAR *buf; - unsigned len; - { -@@ -234,9 +234,9 @@ - - endian = 1; - if (*((unsigned char *)(&endian))) -- return crc32_little(crc, buf, len); -+ return (uLong)crc32_little(crc, buf, len); - else -- return crc32_big(crc, buf, len); -+ return (uLong)crc32_big(crc, buf, len); - } - #endif /* BYFOUR */ - crc = crc ^ 0xffffffffUL; diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/inflate.c.diff b/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/inflate.c.diff deleted file mode 100644 index 1280ac80b9c..00000000000 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/inflate.c.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- /home/sherman/TL/zlib-1.2.3_ORG/inflate.c Tue Jun 14 14:50:12 2005 -+++ inflate.c Tue Aug 25 14:22:09 2009 -@@ -1263,7 +1263,7 @@ - z_streamp strm; - { - unsigned len; /* number of bytes to look at or looked at */ -- unsigned long in, out; /* temporary to save total_in and total_out */ -+ long long in, out; /* temporary to save total_in and total_out */ - unsigned char buf[4]; /* to restore bit buffer to byte string */ - struct inflate_state FAR *state; - diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/zconf.h.diff b/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/zconf.h.diff deleted file mode 100644 index 04edcb2d203..00000000000 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/zconf.h.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- /home/sherman/TL/zlib-1.2.3_ORG/zconf.h Fri May 27 23:40:35 2005 -+++ zconf.h Tue Aug 25 14:22:28 2009 -@@ -8,6 +8,9 @@ - #ifndef ZCONF_H - #define ZCONF_H - -+/* for _LP64 */ -+#include -+ - /* - * If you *really* need a unique prefix for all types and library functions, - * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. -@@ -261,7 +264,11 @@ - typedef unsigned char Byte; /* 8 bits */ - #endif - typedef unsigned int uInt; /* 16 bits or more */ -+#ifdef _LP64 -+typedef unsigned int uLong; /* 32 bits or more */ -+#else - typedef unsigned long uLong; /* 32 bits or more */ -+#endif - - #ifdef SMALL_MEDIUM - /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/zlib.h.diff b/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/zlib.h.diff deleted file mode 100644 index 043f4ed774d..00000000000 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/zlib.h.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- /home/sherman/TL/zlib-1.2.3_ORG/zlib.h Sun Jul 17 19:26:49 2005 -+++ zlib.h Tue Aug 25 14:22:50 2009 -@@ -82,11 +82,11 @@ - typedef struct z_stream_s { - Bytef *next_in; /* next input byte */ - uInt avail_in; /* number of bytes available at next_in */ -- uLong total_in; /* total nb of input bytes read so far */ -+ long long total_in; /* total nb of input bytes read so far */ - - Bytef *next_out; /* next output byte should be put there */ - uInt avail_out; /* remaining free space at next_out */ -- uLong total_out; /* total nb of bytes output so far */ -+ long long total_out;/* total nb of bytes output so far */ - - char *msg; /* last error message, NULL if no error */ - struct internal_state FAR *state; /* not visible by applications */ -@@ -1348,7 +1348,7 @@ - - ZEXTERN const char * ZEXPORT zError OF((int)); - ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); --ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); -+ZEXTERN const unsigned long FAR * ZEXPORT get_crc_table OF((void)); - - #ifdef __cplusplus - } diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/ChangeLog b/jdk/src/share/native/java/util/zip/zlib-1.2.5/ChangeLog similarity index 68% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/ChangeLog rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/ChangeLog index 7f6869d3235..f310bb0fcdb 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/ChangeLog +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/ChangeLog @@ -1,6 +1,359 @@ ChangeLog file for zlib +Changes in 1.2.5 (19 Apr 2010) +- Disable visibility attribute in win32/Makefile.gcc [Bar-Lev] +- Default to libdir as sharedlibdir in configure [Nieder] +- Update copyright dates on modified source files +- Update trees.c to be able to generate modified trees.h +- Exit configure for MinGW, suggesting win32/Makefile.gcc + +Changes in 1.2.4.5 (18 Apr 2010) +- Set sharedlibdir in configure [Torok] +- Set LDFLAGS in Makefile.in [Bar-Lev] +- Avoid mkdir objs race condition in Makefile.in [Bowler] +- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays +- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C +- Don't use hidden attribute when it is a warning generator (e.g. Solaris) + +Changes in 1.2.4.4 (18 Apr 2010) +- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [Torok] +- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty +- Try to use bash or ksh regardless of functionality of /bin/sh +- Fix configure incompatibility with NetBSD sh +- Remove attempt to run under bash or ksh since have better NetBSD fix +- Fix win32/Makefile.gcc for MinGW [Bar-Lev] +- Add diagnostic messages when using CROSS_PREFIX in configure +- Added --sharedlibdir option to configure [Weigelt] +- Use hidden visibility attribute when available [Frysinger] + +Changes in 1.2.4.3 (10 Apr 2010) +- Only use CROSS_PREFIX in configure for ar and ranlib if they exist +- Use CROSS_PREFIX for nm [Bar-Lev] +- Assume _LARGEFILE64_SOURCE defined is equivalent to true +- Avoid use of undefined symbols in #if with && and || +- Make *64 prototypes in gzguts.h consistent with functions +- Add -shared load option for MinGW in configure [Bowler] +- Move z_off64_t to public interface, use instead of off64_t +- Remove ! from shell test in configure (not portable to Solaris) +- Change +0 macro tests to -0 for possibly increased portability + +Changes in 1.2.4.2 (9 Apr 2010) +- Add consistent carriage returns to readme.txt's in masmx86 and masmx64 +- Really provide prototypes for *64 functions when building without LFS +- Only define unlink() in minigzip.c if unistd.h not included +- Update README to point to contrib/vstudio project files +- Move projects/vc6 to old/ and remove projects/ +- Include stdlib.h in minigzip.c for setmode() definition under WinCE +- Clean up assembler builds in win32/Makefile.msc [Rowe] +- Include sys/types.h for Microsoft for off_t definition +- Fix memory leak on error in gz_open() +- Symbolize nm as $NM in configure [Weigelt] +- Use TEST_LDSHARED instead of LDSHARED to link test programs [Weigelt] +- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined +- Fix bug in gzeof() to take into account unused input data +- Avoid initialization of structures with variables in puff.c +- Updated win32/README-WIN32.txt [Rowe] + +Changes in 1.2.4.1 (28 Mar 2010) +- Remove the use of [a-z] constructs for sed in configure [gentoo 310225] +- Remove $(SHAREDLIB) from LIBS in Makefile.in [Creech] +- Restore "for debugging" comment on sprintf() in gzlib.c +- Remove fdopen for MVS from gzguts.h +- Put new README-WIN32.txt in win32 [Rowe] +- Add check for shell to configure and invoke another shell if needed +- Fix big fat stinking bug in gzseek() on uncompressed files +- Remove vestigial F_OPEN64 define in zutil.h +- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE +- Avoid errors on non-LFS systems when applications define LFS macros +- Set EXE to ".exe" in configure for MINGW [Kahle] +- Match crc32() in crc32.c exactly to the prototype in zlib.h [Sherrill] +- Add prefix for cross-compilation in win32/makefile.gcc [Bar-Lev] +- Add DLL install in win32/makefile.gcc [Bar-Lev] +- Allow Linux* or linux* from uname in configure [Bar-Lev] +- Allow ldconfig to be redefined in configure and Makefile.in [Bar-Lev] +- Add cross-compilation prefixes to configure [Bar-Lev] +- Match type exactly in gz_load() invocation in gzread.c +- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func +- Provide prototypes for *64 functions when building zlib without LFS +- Don't use -lc when linking shared library on MinGW +- Remove errno.h check in configure and vestigial errno code in zutil.h + +Changes in 1.2.4 (14 Mar 2010) +- Fix VER3 extraction in configure for no fourth subversion +- Update zlib.3, add docs to Makefile.in to make .pdf out of it +- Add zlib.3.pdf to distribution +- Don't set error code in gzerror() if passed pointer is NULL +- Apply destination directory fixes to CMakeLists.txt [Lowman] +- Move #cmakedefine's to a new zconf.in.cmakein +- Restore zconf.h for builds that don't use configure or cmake +- Add distclean to dummy Makefile for convenience +- Update and improve INDEX, README, and FAQ +- Update CMakeLists.txt for the return of zconf.h [Lowman] +- Update contrib/vstudio/vc9 and vc10 [Vollant] +- Change libz.dll.a back to libzdll.a in win32/Makefile.gcc +- Apply license and readme changes to contrib/asm686 [Raiter] +- Check file name lengths and add -c option in minigzip.c [Li] +- Update contrib/amd64 and contrib/masmx86/ [Vollant] +- Avoid use of "eof" parameter in trees.c to not shadow library variable +- Update make_vms.com for removal of zlibdefs.h [Zinser] +- Update assembler code and vstudio projects in contrib [Vollant] +- Remove outdated assembler code contrib/masm686 and contrib/asm586 +- Remove old vc7 and vc8 from contrib/vstudio +- Update win32/Makefile.msc, add ZLIB_VER_SUBREVISION [Rowe] +- Fix memory leaks in gzclose_r() and gzclose_w(), file leak in gz_open() +- Add contrib/gcc_gvmat64 for longest_match and inflate_fast [Vollant] +- Remove *64 functions from win32/zlib.def (they're not 64-bit yet) +- Fix bug in void-returning vsprintf() case in gzwrite.c +- Fix name change from inflate.h in contrib/inflate86/inffas86.c +- Check if temporary file exists before removing in make_vms.com [Zinser] +- Fix make install and uninstall for --static option +- Fix usage of _MSC_VER in gzguts.h and zutil.h [Truta] +- Update readme.txt in contrib/masmx64 and masmx86 to assemble + +Changes in 1.2.3.9 (21 Feb 2010) +- Expunge gzio.c +- Move as400 build information to old +- Fix updates in contrib/minizip and contrib/vstudio +- Add const to vsnprintf test in configure to avoid warnings [Weigelt] +- Delete zconf.h (made by configure) [Weigelt] +- Change zconf.in.h to zconf.h.in per convention [Weigelt] +- Check for NULL buf in gzgets() +- Return empty string for gzgets() with len == 1 (like fgets()) +- Fix description of gzgets() in zlib.h for end-of-file, NULL return +- Update minizip to 1.1 [Vollant] +- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c +- Note in zlib.h that gzerror() should be used to distinguish from EOF +- Remove use of snprintf() from gzlib.c +- Fix bug in gzseek() +- Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant] +- Fix zconf.h generation in CMakeLists.txt [Lowman] +- Improve comments in zconf.h where modified by configure + +Changes in 1.2.3.8 (13 Feb 2010) +- Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer] +- Use z_off64_t in gz_zero() and gz_skip() to match state->skip +- Avoid comparison problem when sizeof(int) == sizeof(z_off64_t) +- Revert to Makefile.in from 1.2.3.6 (live with the clutter) +- Fix missing error return in gzflush(), add zlib.h note +- Add *64 functions to zlib.map [Levin] +- Fix signed/unsigned comparison in gz_comp() +- Use SFLAGS when testing shared linking in configure +- Add --64 option to ./configure to use -m64 with gcc +- Fix ./configure --help to correctly name options +- Have make fail if a test fails [Levin] +- Avoid buffer overrun in contrib/masmx64/gvmat64.asm [Simpson] +- Remove assembler object files from contrib + +Changes in 1.2.3.7 (24 Jan 2010) +- Always gzopen() with O_LARGEFILE if available +- Fix gzdirect() to work immediately after gzopen() or gzdopen() +- Make gzdirect() more precise when the state changes while reading +- Improve zlib.h documentation in many places +- Catch memory allocation failure in gz_open() +- Complete close operation if seek forward in gzclose_w() fails +- Return Z_ERRNO from gzclose_r() if close() fails +- Return Z_STREAM_ERROR instead of EOF for gzclose() being passed NULL +- Return zero for gzwrite() errors to match zlib.h description +- Return -1 on gzputs() error to match zlib.h description +- Add zconf.in.h to allow recovery from configure modification [Weigelt] +- Fix static library permissions in Makefile.in [Weigelt] +- Avoid warnings in configure tests that hide functionality [Weigelt] +- Add *BSD and DragonFly to Linux case in configure [gentoo 123571] +- Change libzdll.a to libz.dll.a in win32/Makefile.gcc [gentoo 288212] +- Avoid access of uninitialized data for first inflateReset2 call [Gomes] +- Keep object files in subdirectories to reduce the clutter somewhat +- Remove default Makefile and zlibdefs.h, add dummy Makefile +- Add new external functions to Z_PREFIX, remove duplicates, z_z_ -> z_ +- Remove zlibdefs.h completely -- modify zconf.h instead + +Changes in 1.2.3.6 (17 Jan 2010) +- Avoid void * arithmetic in gzread.c and gzwrite.c +- Make compilers happier with const char * for gz_error message +- Avoid unused parameter warning in inflate.c +- Avoid signed-unsigned comparison warning in inflate.c +- Indent #pragma's for traditional C +- Fix usage of strwinerror() in glib.c, change to gz_strwinerror() +- Correct email address in configure for system options +- Update make_vms.com and add make_vms.com to contrib/minizip [Zinser] +- Update zlib.map [Brown] +- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Torok] +- Apply various fixes to CMakeLists.txt [Lowman] +- Add checks on len in gzread() and gzwrite() +- Add error message for no more room for gzungetc() +- Remove zlib version check in gzwrite() +- Defer compression of gzprintf() result until need to +- Use snprintf() in gzdopen() if available +- Remove USE_MMAP configuration determination (only used by minigzip) +- Remove examples/pigz.c (available separately) +- Update examples/gun.c to 1.6 + +Changes in 1.2.3.5 (8 Jan 2010) +- Add space after #if in zutil.h for some compilers +- Fix relatively harmless bug in deflate_fast() [Exarevsky] +- Fix same problem in deflate_slow() +- Add $(SHAREDLIBV) to LIBS in Makefile.in [Brown] +- Add deflate_rle() for faster Z_RLE strategy run-length encoding +- Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding +- Change name of "write" variable in inffast.c to avoid library collisions +- Fix premature EOF from gzread() in gzio.c [Brown] +- Use zlib header window size if windowBits is 0 in inflateInit2() +- Remove compressBound() call in deflate.c to avoid linking compress.o +- Replace use of errno in gz* with functions, support WinCE [Alves] +- Provide alternative to perror() in minigzip.c for WinCE [Alves] +- Don't use _vsnprintf on later versions of MSVC [Lowman] +- Add CMake build script and input file [Lowman] +- Update contrib/minizip to 1.1 [Svensson, Vollant] +- Moved nintendods directory from contrib to . +- Replace gzio.c with a new set of routines with the same functionality +- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above +- Update contrib/minizip to 1.1b +- Change gzeof() to return 0 on error instead of -1 to agree with zlib.h + +Changes in 1.2.3.4 (21 Dec 2009) +- Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility +- Update comments in configure and Makefile.in for default --shared +- Fix test -z's in configure [Marquess] +- Build examplesh and minigzipsh when not testing +- Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h +- Import LDFLAGS from the environment in configure +- Fix configure to populate SFLAGS with discovered CFLAGS options +- Adapt make_vms.com to the new Makefile.in [Zinser] +- Add zlib2ansi script for C++ compilation [Marquess] +- Add _FILE_OFFSET_BITS=64 test to make test (when applicable) +- Add AMD64 assembler code for longest match to contrib [Teterin] +- Include options from $SFLAGS when doing $LDSHARED +- Simplify 64-bit file support by introducing z_off64_t type +- Make shared object files in objs directory to work around old Sun cc +- Use only three-part version number for Darwin shared compiles +- Add rc option to ar in Makefile.in for when ./configure not run +- Add -WI,-rpath,. to LDFLAGS for OSF 1 V4* +- Set LD_LIBRARYN32_PATH for SGI IRIX shared compile +- Protect against _FILE_OFFSET_BITS being defined when compiling zlib +- Rename Makefile.in targets allstatic to static and allshared to shared +- Fix static and shared Makefile.in targets to be independent +- Correct error return bug in gz_open() by setting state [Brown] +- Put spaces before ;;'s in configure for better sh compatibility +- Add pigz.c (parallel implementation of gzip) to examples/ +- Correct constant in crc32.c to UL [Leventhal] +- Reject negative lengths in crc32_combine() +- Add inflateReset2() function to work like inflateEnd()/inflateInit2() +- Include sys/types.h for _LARGEFILE64_SOURCE [Brown] +- Correct typo in doc/algorithm.txt [Janik] +- Fix bug in adler32_combine() [Zhu] +- Catch missing-end-of-block-code error in all inflates and in puff + Assures that random input to inflate eventually results in an error +- Added enough.c (calculation of ENOUGH for inftrees.h) to examples/ +- Update ENOUGH and its usage to reflect discovered bounds +- Fix gzerror() error report on empty input file [Brown] +- Add ush casts in trees.c to avoid pedantic runtime errors +- Fix typo in zlib.h uncompress() description [Reiss] +- Correct inflate() comments with regard to automatic header detection +- Remove deprecation comment on Z_PARTIAL_FLUSH (it stays) +- Put new version of gzlog (2.0) in examples with interruption recovery +- Add puff compile option to permit invalid distance-too-far streams +- Add puff TEST command options, ability to read piped input +- Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but + _LARGEFILE64_SOURCE not defined +- Fix Z_FULL_FLUSH to truly erase the past by resetting s->strstart +- Fix deflateSetDictionary() to use all 32K for output consistency +- Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h) +- Clear bytes after deflate lookahead to avoid use of uninitialized data +- Change a limit in inftrees.c to be more transparent to Coverity Prevent +- Update win32/zlib.def with exported symbols from zlib.h +- Correct spelling error in zlib.h [Willem] +- Allow Z_BLOCK for deflate() to force a new block +- Allow negative bits in inflatePrime() to delete existing bit buffer +- Add Z_TREES flush option to inflate() to return at end of trees +- Add inflateMark() to return current state information for random access +- Add Makefile for NintendoDS to contrib [Costa] +- Add -w in configure compile tests to avoid spurious warnings [Beucler] +- Fix typos in zlib.h comments for deflateSetDictionary() +- Fix EOF detection in transparent gzread() [Maier] + +Changes in 1.2.3.3 (2 October 2006) +- Make --shared the default for configure, add a --static option +- Add compile option to permit invalid distance-too-far streams +- Add inflateUndermine() function which is required to enable above +- Remove use of "this" variable name for C++ compatibility [Marquess] +- Add testing of shared library in make test, if shared library built +- Use ftello() and fseeko() if available instead of ftell() and fseek() +- Provide two versions of all functions that use the z_off_t type for + binary compatibility -- a normal version and a 64-bit offset version, + per the Large File Support Extension when _LARGEFILE64_SOURCE is + defined; use the 64-bit versions by default when _FILE_OFFSET_BITS + is defined to be 64 +- Add a --uname= option to configure to perhaps help with cross-compiling + +Changes in 1.2.3.2 (3 September 2006) +- Turn off silly Borland warnings [Hay] +- Use off64_t and define _LARGEFILE64_SOURCE when present +- Fix missing dependency on inffixed.h in Makefile.in +- Rig configure --shared to build both shared and static [Teredesai, Truta] +- Remove zconf.in.h and instead create a new zlibdefs.h file +- Fix contrib/minizip/unzip.c non-encrypted after encrypted [Vollant] +- Add treebuild.xml (see http://treebuild.metux.de/) [Weigelt] + +Changes in 1.2.3.1 (16 August 2006) +- Add watcom directory with OpenWatcom make files [Daniel] +- Remove #undef of FAR in zconf.in.h for MVS [Fedtke] +- Update make_vms.com [Zinser] +- Use -fPIC for shared build in configure [Teredesai, Nicholson] +- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen] +- Use fdopen() (not _fdopen()) for Interix in zutil.h [BŠck] +- Add some FAQ entries about the contrib directory +- Update the MVS question in the FAQ +- Avoid extraneous reads after EOF in gzio.c [Brown] +- Correct spelling of "successfully" in gzio.c [Randers-Pehrson] +- Add comments to zlib.h about gzerror() usage [Brown] +- Set extra flags in gzip header in gzopen() like deflate() does +- Make configure options more compatible with double-dash conventions + [Weigelt] +- Clean up compilation under Solaris SunStudio cc [Rowe, Reinholdtsen] +- Fix uninstall target in Makefile.in [Truta] +- Add pkgconfig support [Weigelt] +- Use $(DESTDIR) macro in Makefile.in [Reinholdtsen, Weigelt] +- Replace set_data_type() with a more accurate detect_data_type() in + trees.c, according to the txtvsbin.txt document [Truta] +- Swap the order of #include and #include "zlib.h" in + gzio.c, example.c and minigzip.c [Truta] +- Shut up annoying VS2005 warnings about standard C deprecation [Rowe, + Truta] (where?) +- Fix target "clean" from win32/Makefile.bor [Truta] +- Create .pdb and .manifest files in win32/makefile.msc [Ziegler, Rowe] +- Update zlib www home address in win32/DLL_FAQ.txt [Truta] +- Update contrib/masmx86/inffas32.asm for VS2005 [Vollant, Van Wassenhove] +- Enable browse info in the "Debug" and "ASM Debug" configurations in + the Visual C++ 6 project, and set (non-ASM) "Debug" as default [Truta] +- Add pkgconfig support [Weigelt] +- Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h, + for use in win32/zlib1.rc [Polushin, Rowe, Truta] +- Add a document that explains the new text detection scheme to + doc/txtvsbin.txt [Truta] +- Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ [Truta] +- Move algorithm.txt into doc/ [Truta] +- Synchronize FAQ with website +- Fix compressBound(), was low for some pathological cases [Fearnley] +- Take into account wrapper variations in deflateBound() +- Set examples/zpipe.c input and output to binary mode for Windows +- Update examples/zlib_how.html with new zpipe.c (also web site) +- Fix some warnings in examples/gzlog.c and examples/zran.c (it seems + that gcc became pickier in 4.0) +- Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain + un-versioned, the patch adds versioning only for symbols introduced in + zlib-1.2.0 or later. It also declares as local those symbols which are + not designed to be exported." [Levin] +- Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure +- Do not initialize global static by default in trees.c, add a response + NO_INIT_GLOBAL_POINTERS to initialize them if needed [Marquess] +- Don't use strerror() in gzio.c under WinCE [Yakimov] +- Don't use errno.h in zutil.h under WinCE [Yakimov] +- Move arguments for AR to its usage to allow replacing ar [Marot] +- Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla [Randers-Pehrson] +- Improve inflateInit() and inflateInit2() documentation +- Fix structure size comment in inflate.h +- Change configure help option from --h* to --help [Santos] + Changes in 1.2.3 (18 July 2005) - Apply security vulnerability fixes to contrib/infback9 as well - Clean up some text files (carriage returns, trailing space) @@ -13,7 +366,7 @@ Changes in 1.2.2.4 (11 July 2005) compile - Fix some spelling errors in comments [Betts] - Correct inflateInit2() error return documentation in zlib.h -- Added zran.c example of compressed data random access to examples +- Add zran.c example of compressed data random access to examples directory, shows use of inflatePrime() - Fix cast for assignments to strm->state in inflate.c and infback.c - Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer] diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/README b/jdk/src/share/native/java/util/zip/zlib-1.2.5/README similarity index 54% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/README rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/README index 758cc50020d..d4219bf889f 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/README +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/README @@ -1,56 +1,52 @@ ZLIB DATA COMPRESSION LIBRARY -zlib 1.2.3 is a general purpose data compression library. All the code is +zlib 1.2.5 is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) -and rfc1952.txt (gzip format). These documents are also available in other -formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html +and rfc1952.txt (gzip format). All functions of the compression library are documented in the file zlib.h -(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example +(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example of the library is given in the file example.c which also tests that the library -is working correctly. Another example is given in the file minigzip.c. The +is working correctly. Another example is given in the file minigzip.c. The compression library itself is composed of all source files except example.c and minigzip.c. To compile all files and run the test program, follow the instructions given at -the top of Makefile. In short "make test; make install" should work for most -machines. For Unix: "./configure; make test; make install". For MSDOS, use one -of the special makefiles such as Makefile.msc. For VMS, use make_vms.com. +the top of Makefile.in. In short "./configure; make test", and if that goes +well, "make install" should work for most flavors of Unix. For Windows, use one +of the special makefiles in win32/ or contrib/vstudio/ . For VMS, use +make_vms.com. Questions about zlib should be sent to , or to Gilles Vollant - for the Windows DLL version. The zlib home page is -http://www.zlib.org or http://www.gzip.org/zlib/ Before reporting a problem, -please check this site to verify that you have the latest version of zlib; -otherwise get the latest version and check whether the problem still exists or -not. + for the Windows DLL version. The zlib home page is +http://zlib.net/ . Before reporting a problem, please check this site to +verify that you have the latest version of zlib; otherwise get the latest +version and check whether the problem still exists or not. -PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html before asking -for help. +PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help. -Mark Nelson wrote an article about zlib for the Jan. 1997 -issue of Dr. Dobb's Journal; a copy of the article is available in -http://dogma.net/markn/articles/zlibtool/zlibtool.htm +Mark Nelson wrote an article about zlib for the Jan. 1997 +issue of Dr. Dobb's Journal; a copy of the article is available at +http://marknelson.us/1997/01/01/zlib-engine/ . -The changes made in version 1.2.3 are documented in the file ChangeLog. +The changes made in version 1.2.5 are documented in the file ChangeLog. -Unsupported third party contributions are provided in directory "contrib". +Unsupported third party contributions are provided in directory contrib/ . -A Java implementation of zlib is available in the Java Development Kit -http://java.sun.com/j2se/1.4.2/docs/api/java/util/zip/package-summary.html -See the zlib home page http://www.zlib.org for details. +zlib is available in Java using the java.util.zip package, documented at +http://java.sun.com/developer/technicalArticles/Programming/compression/ . -A Perl interface to zlib written by Paul Marquess is in the -CPAN (Comprehensive Perl Archive Network) sites -http://www.cpan.org/modules/by-module/Compress/ +A Perl interface to zlib written by Paul Marquess is available +at CPAN (Comprehensive Perl Archive Network) sites, including +http://search.cpan.org/~pmqs/IO-Compress-Zlib/ . A Python interface to zlib written by A.M. Kuchling is available in Python 1.5 and later versions, see -http://www.python.org/doc/lib/module-zlib.html +http://www.python.org/doc/lib/module-zlib.html . -A zlib binding for TCL written by Andreas Kupries is -availlable at http://www.oche.de/~akupries/soft/trf/trf_zip.html +zlib is built into tcl: http://wiki.tcl.tk/4610 . An experimental package to read and write files in .zip format, written on top of zlib by Gilles Vollant , is available in the @@ -74,25 +70,21 @@ Notes for some targets: - zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with other compilers. Use "make test" to check your compiler. -- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers. +- gzdopen is not supported on RISCOS or BEOS. - For PalmOs, see http://palmzlib.sourceforge.net/ -- When building a shared, i.e. dynamic library on Mac OS X, the library must be - installed before testing (do "make install" before "make test"), since the - library location is specified in the library. - Acknowledgments: - The deflate format used by zlib was defined by Phil Katz. The deflate - and zlib specifications were written by L. Peter Deutsch. Thanks to all the - people who reported problems and suggested various improvements in zlib; - they are too numerous to cite here. + The deflate format used by zlib was defined by Phil Katz. The deflate and + zlib specifications were written by L. Peter Deutsch. Thanks to all the + people who reported problems and suggested various improvements in zlib; they + are too numerous to cite here. Copyright notice: - (C) 1995-2004 Jean-loup Gailly and Mark Adler + (C) 1995-2010 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -113,13 +105,11 @@ Copyright notice: Jean-loup Gailly Mark Adler jloup@gzip.org madler@alumni.caltech.edu -If you use the zlib library in a product, we would appreciate *not* -receiving lengthy legal documents to sign. The sources are provided -for free but without warranty of any kind. The library has been -entirely written by Jean-loup Gailly and Mark Adler; it does not -include third-party code. +If you use the zlib library in a product, we would appreciate *not* receiving +lengthy legal documents to sign. The sources are provided for free but without +warranty of any kind. The library has been entirely written by Jean-loup +Gailly and Mark Adler; it does not include third-party code. -If you redistribute modified sources, we would appreciate that you include -in the file ChangeLog history information documenting your changes. Please -read the FAQ for more information on the distribution of modified source -versions. +If you redistribute modified sources, we would appreciate that you include in +the file ChangeLog history information documenting your changes. Please read +the FAQ for more information on the distribution of modified source versions. diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/compress.c b/jdk/src/share/native/java/util/zip/zlib-1.2.5/compress.c similarity index 96% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/compress.c rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/compress.c index 58669987caf..c05285a7700 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/compress.c +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/compress.c @@ -23,7 +23,7 @@ */ /* compress.c -- compress a memory buffer - * Copyright (C) 1995-2003 Jean-loup Gailly. + * Copyright (C) 1995-2005 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -99,5 +99,6 @@ int ZEXPORT compress (dest, destLen, source, sourceLen) uLong ZEXPORT compressBound (sourceLen) uLong sourceLen; { - return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11; + return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + + (sourceLen >> 25) + 13; } diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/crc32.h b/jdk/src/share/native/java/util/zip/zlib-1.2.5/crc32.h similarity index 100% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/crc32.h rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/crc32.h diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/deflate.c b/jdk/src/share/native/java/util/zip/zlib-1.2.5/deflate.c similarity index 89% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/deflate.c rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/deflate.c index ba1661d4b9f..1dce5b0d055 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/deflate.c +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/deflate.c @@ -23,7 +23,7 @@ */ /* deflate.c -- compress data using the deflation algorithm - * Copyright (C) 1995-2005 Jean-loup Gailly. + * Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -76,7 +76,7 @@ #include "deflate.h" const char deflate_copyright[] = - " deflate 1.2.3 Copyright 1995-2005 Jean-loup Gailly "; + " deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -103,19 +103,18 @@ local block_state deflate_fast OF((deflate_state *s, int flush)); #ifndef FASTEST local block_state deflate_slow OF((deflate_state *s, int flush)); #endif +local block_state deflate_rle OF((deflate_state *s, int flush)); +local block_state deflate_huff OF((deflate_state *s, int flush)); local void lm_init OF((deflate_state *s)); local void putShortMSB OF((deflate_state *s, uInt b)); local void flush_pending OF((z_streamp strm)); local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); -#ifndef FASTEST #ifdef ASMV void match_init OF((void)); /* asm code initialization */ uInt longest_match OF((deflate_state *s, IPos cur_match)); #else local uInt longest_match OF((deflate_state *s, IPos cur_match)); #endif -#endif -local uInt longest_match_fast OF((deflate_state *s, IPos cur_match)); #ifdef DEBUG local void check_match OF((deflate_state *s, IPos start, IPos match, @@ -134,11 +133,6 @@ local void check_match OF((deflate_state *s, IPos start, IPos match, #endif /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ -#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) -/* Minimum amount of lookahead, except at the end of the input file. - * See deflate.c for comments about the MIN_MATCH+1. - */ - /* Values for max_lazy_match, good_match and max_chain_length, depending on * the desired pack level (0..9). The values given below have been tuned to * exclude worst case performance for pathological files. Better values may be @@ -312,6 +306,8 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos)); s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos)); + s->high_water = 0; /* nothing written to s->window yet */ + s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); @@ -356,8 +352,8 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) strm->adler = adler32(strm->adler, dictionary, dictLength); if (length < MIN_MATCH) return Z_OK; - if (length > MAX_DIST(s)) { - length = MAX_DIST(s); + if (length > s->w_size) { + length = s->w_size; dictionary += dictLength - length; /* use the tail of the dictionary */ } zmemcpy(s->window, dictionary, length); @@ -459,9 +455,10 @@ int ZEXPORT deflateParams(strm, level, strategy) } func = configuration_table[s->level].func; - if (func != configuration_table[level].func && strm->total_in != 0) { + if ((strategy != s->strategy || func != configuration_table[level].func) && + strm->total_in != 0) { /* Flush the last buffer: */ - err = deflate(strm, Z_PARTIAL_FLUSH); + err = deflate(strm, Z_BLOCK); } if (s->level != level) { s->level = level; @@ -505,33 +502,66 @@ int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain) * resulting from using fixed blocks instead of stored blocks, which deflate * can emit on compressed data for some combinations of the parameters. * - * This function could be more sophisticated to provide closer upper bounds - * for every combination of windowBits and memLevel, as well as wrap. - * But even the conservative upper bound of about 14% expansion does not - * seem onerous for output buffer allocation. + * This function could be more sophisticated to provide closer upper bounds for + * every combination of windowBits and memLevel. But even the conservative + * upper bound of about 14% expansion does not seem onerous for output buffer + * allocation. */ uLong ZEXPORT deflateBound(strm, sourceLen) z_streamp strm; uLong sourceLen; { deflate_state *s; - uLong destLen; + uLong complen, wraplen; + Bytef *str; - /* conservative upper bound */ - destLen = sourceLen + - ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 11; + /* conservative upper bound for compressed data */ + complen = sourceLen + + ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5; - /* if can't get parameters, return conservative bound */ + /* if can't get parameters, return conservative bound plus zlib wrapper */ if (strm == Z_NULL || strm->state == Z_NULL) - return destLen; + return complen + 6; + + /* compute wrapper length */ + s = strm->state; + switch (s->wrap) { + case 0: /* raw deflate */ + wraplen = 0; + break; + case 1: /* zlib wrapper */ + wraplen = 6 + (s->strstart ? 4 : 0); + break; + case 2: /* gzip wrapper */ + wraplen = 18; + if (s->gzhead != Z_NULL) { /* user-supplied gzip header */ + if (s->gzhead->extra != Z_NULL) + wraplen += 2 + s->gzhead->extra_len; + str = s->gzhead->name; + if (str != Z_NULL) + do { + wraplen++; + } while (*str++); + str = s->gzhead->comment; + if (str != Z_NULL) + do { + wraplen++; + } while (*str++); + if (s->gzhead->hcrc) + wraplen += 2; + } + break; + default: /* for compiler happiness */ + wraplen = 6; + } /* if not default parameters, return conservative bound */ - s = strm->state; if (s->w_bits != 15 || s->hash_bits != 8 + 7) - return destLen; + return complen + wraplen; /* default settings: return tight bound for that case */ - return compressBound(sourceLen); + return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + + (sourceLen >> 25) + 13 - 6 + wraplen; } /* ========================================================================= @@ -581,7 +611,7 @@ int ZEXPORT deflate (strm, flush) deflate_state *s; if (strm == Z_NULL || strm->state == Z_NULL || - flush > Z_FINISH || flush < 0) { + flush > Z_BLOCK || flush < 0) { return Z_STREAM_ERROR; } s = strm->state; @@ -605,7 +635,7 @@ int ZEXPORT deflate (strm, flush) put_byte(s, 31); put_byte(s, 139); put_byte(s, 8); - if (s->gzhead == NULL) { + if (s->gzhead == Z_NULL) { put_byte(s, 0); put_byte(s, 0); put_byte(s, 0); @@ -632,7 +662,7 @@ int ZEXPORT deflate (strm, flush) (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? 4 : 0)); put_byte(s, s->gzhead->os & 0xff); - if (s->gzhead->extra != NULL) { + if (s->gzhead->extra != Z_NULL) { put_byte(s, s->gzhead->extra_len & 0xff); put_byte(s, (s->gzhead->extra_len >> 8) & 0xff); } @@ -674,7 +704,7 @@ int ZEXPORT deflate (strm, flush) } #ifdef GZIP if (s->status == EXTRA_STATE) { - if (s->gzhead->extra != NULL) { + if (s->gzhead->extra != Z_NULL) { uInt beg = s->pending; /* start of bytes to update crc */ while (s->gzindex < (s->gzhead->extra_len & 0xffff)) { @@ -702,7 +732,7 @@ int ZEXPORT deflate (strm, flush) s->status = NAME_STATE; } if (s->status == NAME_STATE) { - if (s->gzhead->name != NULL) { + if (s->gzhead->name != Z_NULL) { uInt beg = s->pending; /* start of bytes to update crc */ int val; @@ -733,7 +763,7 @@ int ZEXPORT deflate (strm, flush) s->status = COMMENT_STATE; } if (s->status == COMMENT_STATE) { - if (s->gzhead->comment != NULL) { + if (s->gzhead->comment != Z_NULL) { uInt beg = s->pending; /* start of bytes to update crc */ int val; @@ -811,7 +841,9 @@ int ZEXPORT deflate (strm, flush) (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) { block_state bstate; - bstate = (*(configuration_table[s->level].func))(s, flush); + bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) : + (s->strategy == Z_RLE ? deflate_rle(s, flush) : + (*(configuration_table[s->level].func))(s, flush)); if (bstate == finish_started || bstate == finish_done) { s->status = FINISH_STATE; @@ -832,13 +864,17 @@ int ZEXPORT deflate (strm, flush) if (bstate == block_done) { if (flush == Z_PARTIAL_FLUSH) { _tr_align(s); - } else { /* FULL_FLUSH or SYNC_FLUSH */ + } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */ _tr_stored_block(s, (char*)0, 0L, 0); /* For a full flush, this empty block will be recognized * as a special marker by inflate_sync(). */ if (flush == Z_FULL_FLUSH) { CLEAR_HASH(s); /* forget history */ + if (s->lookahead == 0) { + s->strstart = 0; + s->block_start = 0L; + } } } flush_pending(strm); @@ -1191,12 +1227,13 @@ local uInt longest_match(s, cur_match) return s->lookahead; } #endif /* ASMV */ -#endif /* FASTEST */ + +#else /* FASTEST */ /* --------------------------------------------------------------------------- - * Optimized version for level == 1 or strategy == Z_RLE only + * Optimized version for FASTEST only */ -local uInt longest_match_fast(s, cur_match) +local uInt longest_match(s, cur_match) deflate_state *s; IPos cur_match; /* current match */ { @@ -1249,6 +1286,8 @@ local uInt longest_match_fast(s, cur_match) return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead; } +#endif /* FASTEST */ + #ifdef DEBUG /* =========================================================================== * Check that the match at match_start is indeed a match. @@ -1327,7 +1366,6 @@ local void fill_window(s) later. (Using level 0 permanently is not an optimal usage of zlib, so we don't care about this pathological case.) */ - /* %%% avoid this when Z_RLE */ n = s->hash_size; p = &s->head[n]; do { @@ -1379,27 +1417,61 @@ local void fill_window(s) */ } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0); + + /* If the WIN_INIT bytes after the end of the current data have never been + * written, then zero those bytes in order to avoid memory check reports of + * the use of uninitialized (or uninitialised as Julian writes) bytes by + * the longest match routines. Update the high water mark for the next + * time through here. WIN_INIT is set to MAX_MATCH since the longest match + * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead. + */ + if (s->high_water < s->window_size) { + ulg curr = s->strstart + (ulg)(s->lookahead); + ulg init; + + if (s->high_water < curr) { + /* Previous high water mark below current data -- zero WIN_INIT + * bytes or up to end of window, whichever is less. + */ + init = s->window_size - curr; + if (init > WIN_INIT) + init = WIN_INIT; + zmemzero(s->window + curr, (unsigned)init); + s->high_water = curr + init; + } + else if (s->high_water < (ulg)curr + WIN_INIT) { + /* High water mark at or above current data, but below current data + * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up + * to end of window, whichever is less. + */ + init = (ulg)curr + WIN_INIT - s->high_water; + if (init > s->window_size - s->high_water) + init = s->window_size - s->high_water; + zmemzero(s->window + s->high_water, (unsigned)init); + s->high_water += init; + } + } } /* =========================================================================== * Flush the current block, with given end-of-file flag. * IN assertion: strstart is set to the end of the current match. */ -#define FLUSH_BLOCK_ONLY(s, eof) { \ +#define FLUSH_BLOCK_ONLY(s, last) { \ _tr_flush_block(s, (s->block_start >= 0L ? \ (charf *)&s->window[(unsigned)s->block_start] : \ (charf *)Z_NULL), \ (ulg)((long)s->strstart - s->block_start), \ - (eof)); \ + (last)); \ s->block_start = s->strstart; \ flush_pending(s->strm); \ Tracev((stderr,"[FLUSH]")); \ } /* Same but force premature exit if necessary. */ -#define FLUSH_BLOCK(s, eof) { \ - FLUSH_BLOCK_ONLY(s, eof); \ - if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \ +#define FLUSH_BLOCK(s, last) { \ + FLUSH_BLOCK_ONLY(s, last); \ + if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \ } /* =========================================================================== @@ -1473,7 +1545,7 @@ local block_state deflate_fast(s, flush) deflate_state *s; int flush; { - IPos hash_head = NIL; /* head of the hash chain */ + IPos hash_head; /* head of the hash chain */ int bflush; /* set if current block must be flushed */ for (;;) { @@ -1493,6 +1565,7 @@ local block_state deflate_fast(s, flush) /* Insert the string window[strstart .. strstart+2] in the * dictionary, and set hash_head to the head of the hash chain: */ + hash_head = NIL; if (s->lookahead >= MIN_MATCH) { INSERT_STRING(s, s->strstart, hash_head); } @@ -1505,19 +1578,8 @@ local block_state deflate_fast(s, flush) * of window index 0 (in particular we have to avoid a match * of the string with itself at the start of the input file). */ -#ifdef FASTEST - if ((s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) || - (s->strategy == Z_RLE && s->strstart - hash_head == 1)) { - s->match_length = longest_match_fast (s, hash_head); - } -#else - if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) { - s->match_length = longest_match (s, hash_head); - } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) { - s->match_length = longest_match_fast (s, hash_head); - } -#endif - /* longest_match() or longest_match_fast() sets match_start */ + s->match_length = longest_match (s, hash_head); + /* longest_match() sets match_start */ } if (s->match_length >= MIN_MATCH) { check_match(s, s->strstart, s->match_start, s->match_length); @@ -1579,7 +1641,7 @@ local block_state deflate_slow(s, flush) deflate_state *s; int flush; { - IPos hash_head = NIL; /* head of hash chain */ + IPos hash_head; /* head of hash chain */ int bflush; /* set if current block must be flushed */ /* Process the input block. */ @@ -1600,6 +1662,7 @@ local block_state deflate_slow(s, flush) /* Insert the string window[strstart .. strstart+2] in the * dictionary, and set hash_head to the head of the hash chain: */ + hash_head = NIL; if (s->lookahead >= MIN_MATCH) { INSERT_STRING(s, s->strstart, hash_head); } @@ -1615,12 +1678,8 @@ local block_state deflate_slow(s, flush) * of window index 0 (in particular we have to avoid a match * of the string with itself at the start of the input file). */ - if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) { - s->match_length = longest_match (s, hash_head); - } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) { - s->match_length = longest_match_fast (s, hash_head); - } - /* longest_match() or longest_match_fast() sets match_start */ + s->match_length = longest_match (s, hash_head); + /* longest_match() sets match_start */ if (s->match_length <= 5 && (s->strategy == Z_FILTERED #if TOO_FAR <= 32767 @@ -1698,7 +1757,6 @@ local block_state deflate_slow(s, flush) } #endif /* FASTEST */ -#if 0 /* =========================================================================== * For Z_RLE, simply look for runs of bytes, generate matches only of distance * one. Do not maintain a hash table. (It will be regenerated if this run of @@ -1708,11 +1766,9 @@ local block_state deflate_rle(s, flush) deflate_state *s; int flush; { - int bflush; /* set if current block must be flushed */ - uInt run; /* length of run */ - uInt max; /* maximum length of run */ - uInt prev; /* byte at distance one to match */ - Bytef *scan; /* scan for end of run */ + int bflush; /* set if current block must be flushed */ + uInt prev; /* byte at distance one to match */ + Bytef *scan, *strend; /* scan goes up to strend for length of run */ for (;;) { /* Make sure that we always have enough lookahead, except @@ -1728,23 +1784,33 @@ local block_state deflate_rle(s, flush) } /* See how many times the previous byte repeats */ - run = 0; - if (s->strstart > 0) { /* if there is a previous byte, that is */ - max = s->lookahead < MAX_MATCH ? s->lookahead : MAX_MATCH; + s->match_length = 0; + if (s->lookahead >= MIN_MATCH && s->strstart > 0) { scan = s->window + s->strstart - 1; - prev = *scan++; - do { - if (*scan++ != prev) - break; - } while (++run < max); + prev = *scan; + if (prev == *++scan && prev == *++scan && prev == *++scan) { + strend = s->window + s->strstart + MAX_MATCH; + do { + } while (prev == *++scan && prev == *++scan && + prev == *++scan && prev == *++scan && + prev == *++scan && prev == *++scan && + prev == *++scan && prev == *++scan && + scan < strend); + s->match_length = MAX_MATCH - (int)(strend - scan); + if (s->match_length > s->lookahead) + s->match_length = s->lookahead; + } } /* Emit match if have run of MIN_MATCH or longer, else emit literal */ - if (run >= MIN_MATCH) { - check_match(s, s->strstart, s->strstart - 1, run); - _tr_tally_dist(s, 1, run - MIN_MATCH, bflush); - s->lookahead -= run; - s->strstart += run; + if (s->match_length >= MIN_MATCH) { + check_match(s, s->strstart, s->strstart - 1, s->match_length); + + _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush); + + s->lookahead -= s->match_length; + s->strstart += s->match_length; + s->match_length = 0; } else { /* No match, output a literal byte */ Tracevv((stderr,"%c", s->window[s->strstart])); @@ -1757,4 +1823,36 @@ local block_state deflate_rle(s, flush) FLUSH_BLOCK(s, flush == Z_FINISH); return flush == Z_FINISH ? finish_done : block_done; } -#endif + +/* =========================================================================== + * For Z_HUFFMAN_ONLY, do not look for matches. Do not maintain a hash table. + * (It will be regenerated if this run of deflate switches away from Huffman.) + */ +local block_state deflate_huff(s, flush) + deflate_state *s; + int flush; +{ + int bflush; /* set if current block must be flushed */ + + for (;;) { + /* Make sure that we have a literal to write. */ + if (s->lookahead == 0) { + fill_window(s); + if (s->lookahead == 0) { + if (flush == Z_NO_FLUSH) + return need_more; + break; /* flush the current block */ + } + } + + /* Output a literal byte */ + s->match_length = 0; + Tracevv((stderr,"%c", s->window[s->strstart])); + _tr_tally_lit (s, s->window[s->strstart], bflush); + s->lookahead--; + s->strstart++; + if (bflush) FLUSH_BLOCK(s, 0); + } + FLUSH_BLOCK(s, flush == Z_FINISH); + return flush == Z_FINISH ? finish_done : block_done; +} diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/deflate.h b/jdk/src/share/native/java/util/zip/zlib-1.2.5/deflate.h similarity index 91% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/deflate.h rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/deflate.h index a5f4e643a7a..652be480efd 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/deflate.h +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/deflate.h @@ -23,7 +23,7 @@ */ /* deflate.h -- internal compression state - * Copyright (C) 1995-2004 Jean-loup Gailly + * Copyright (C) 1995-2010 Jean-loup Gailly * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -284,6 +284,13 @@ typedef struct internal_state { * are always zero. */ + ulg high_water; + /* High water mark offset in window for initialized bytes -- bytes above + * this are set to zero in order to avoid memory check warnings when + * longest match routines access bytes past the input. This is then + * updated to the new high water mark. + */ + } FAR deflate_state; /* Output a byte on the stream. @@ -302,14 +309,18 @@ typedef struct internal_state { * distances are limited to MAX_DIST instead of WSIZE. */ +#define WIN_INIT MAX_MATCH +/* Number of bytes after end of data in window to initialize in order to avoid + memory checker errors from longest match routines */ + /* in trees.c */ -void _tr_init OF((deflate_state *s)); -int _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc)); -void _tr_flush_block OF((deflate_state *s, charf *buf, ulg stored_len, - int eof)); -void _tr_align OF((deflate_state *s)); -void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len, - int eof)); +void ZLIB_INTERNAL _tr_init OF((deflate_state *s)); +int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc)); +void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf, + ulg stored_len, int last)); +void ZLIB_INTERNAL _tr_align OF((deflate_state *s)); +void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, + ulg stored_len, int last)); #define d_code(dist) \ ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)]) @@ -322,11 +333,11 @@ void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len, /* Inline versions of _tr_tally for speed: */ #if defined(GEN_TREES_H) || !defined(STDC) - extern uch _length_code[]; - extern uch _dist_code[]; + extern uch ZLIB_INTERNAL _length_code[]; + extern uch ZLIB_INTERNAL _dist_code[]; #else - extern const uch _length_code[]; - extern const uch _dist_code[]; + extern const uch ZLIB_INTERNAL _length_code[]; + extern const uch ZLIB_INTERNAL _dist_code[]; #endif # define _tr_tally_lit(s, c, flush) \ diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.5/gzclose.c b/jdk/src/share/native/java/util/zip/zlib-1.2.5/gzclose.c new file mode 100644 index 00000000000..5cce4b03d2f --- /dev/null +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/gzclose.c @@ -0,0 +1,49 @@ +/* + * 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. + */ + +/* gzclose.c -- zlib gzclose() function + * Copyright (C) 2004, 2010 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#include "gzguts.h" + +/* gzclose() is in a separate file so that it is linked in only if it is used. + That way the other gzclose functions can be used instead to avoid linking in + unneeded compression or decompression routines. */ +int ZEXPORT gzclose(file) + gzFile file; +{ +#ifndef NO_GZCOMPRESS + gz_statep state; + + if (file == NULL) + return Z_STREAM_ERROR; + state = (gz_statep)file; + + return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file); +#else + return gzclose_r(file); +#endif +} diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.5/gzguts.h b/jdk/src/share/native/java/util/zip/zlib-1.2.5/gzguts.h new file mode 100644 index 00000000000..d8fbf1e4c4b --- /dev/null +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/gzguts.h @@ -0,0 +1,156 @@ +/* + * 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. + */ + +/* gzguts.h -- zlib internal header definitions for gz* operations + * Copyright (C) 2004, 2005, 2010 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#ifdef _LARGEFILE64_SOURCE +# ifndef _LARGEFILE_SOURCE +# define _LARGEFILE_SOURCE 1 +# endif +# ifdef _FILE_OFFSET_BITS +# undef _FILE_OFFSET_BITS +# endif +#endif + +#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ) +# define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) +#else +# define ZLIB_INTERNAL +#endif + +#include +#include "zlib.h" +#ifdef STDC +# include +# include +# include +#endif +#include + +#ifdef NO_DEFLATE /* for compatibility with old definition */ +# define NO_GZCOMPRESS +#endif + +#ifdef _MSC_VER +# include +# define vsnprintf _vsnprintf +#endif + +#ifndef local +# define local static +#endif +/* compile with -Dlocal if your debugger can't find static symbols */ + +/* gz* functions always use library allocation functions */ +#ifndef STDC + extern voidp malloc OF((uInt size)); + extern void free OF((voidpf ptr)); +#endif + +/* get errno and strerror definition */ +#if defined UNDER_CE +# include +# define zstrerror() gz_strwinerror((DWORD)GetLastError()) +#else +# ifdef STDC +# include +# define zstrerror() strerror(errno) +# else +# define zstrerror() "stdio error (consult errno)" +# endif +#endif + +/* provide prototypes for these when building zlib without LFS */ +#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0 + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); + ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); + ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); +#endif + +/* default i/o buffer size -- double this for output when reading */ +#define GZBUFSIZE 8192 + +/* gzip modes, also provide a little integrity check on the passed structure */ +#define GZ_NONE 0 +#define GZ_READ 7247 +#define GZ_WRITE 31153 +#define GZ_APPEND 1 /* mode set to GZ_WRITE after the file is opened */ + +/* values for gz_state how */ +#define LOOK 0 /* look for a gzip header */ +#define COPY 1 /* copy input directly */ +#define GZIP 2 /* decompress a gzip stream */ + +/* internal gzip file state data structure */ +typedef struct { + /* used for both reading and writing */ + int mode; /* see gzip modes above */ + int fd; /* file descriptor */ + char *path; /* path or fd for error messages */ + z_off64_t pos; /* current position in uncompressed data */ + unsigned size; /* buffer size, zero if not allocated yet */ + unsigned want; /* requested buffer size, default is GZBUFSIZE */ + unsigned char *in; /* input buffer */ + unsigned char *out; /* output buffer (double-sized when reading) */ + unsigned char *next; /* next output data to deliver or write */ + /* just for reading */ + unsigned have; /* amount of output data unused at next */ + int eof; /* true if end of input file reached */ + z_off64_t start; /* where the gzip data started, for rewinding */ + z_off64_t raw; /* where the raw data started, for seeking */ + int how; /* 0: get header, 1: copy, 2: decompress */ + int direct; /* true if last read direct, false if gzip */ + /* just for writing */ + int level; /* compression level */ + int strategy; /* compression strategy */ + /* seek request */ + z_off64_t skip; /* amount to skip (already rewound if backwards) */ + int seek; /* true if seek request pending */ + /* error information */ + int err; /* error code */ + char *msg; /* error message */ + /* zlib inflate or deflate stream */ + z_stream strm; /* stream structure in-place (not a pointer) */ +} gz_state; +typedef gz_state FAR *gz_statep; + +/* shared functions */ +void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *)); +#if defined UNDER_CE +char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error)); +#endif + +/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t + value -- needed when comparing unsigned to z_off64_t, which is signed + (possible z_off64_t types off_t, off64_t, and long are all signed) */ +#ifdef INT_MAX +# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX) +#else +unsigned ZLIB_INTERNAL gz_intmax OF((void)); +# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax()) +#endif diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.5/gzlib.c b/jdk/src/share/native/java/util/zip/zlib-1.2.5/gzlib.c new file mode 100644 index 00000000000..d285126964b --- /dev/null +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/gzlib.c @@ -0,0 +1,560 @@ +/* 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. + */ + +/* + * Copyright (C) 2004, 2010 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#include "gzguts.h" + +#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 +# define LSEEK lseek64 +#else +# define LSEEK lseek +#endif + +/* Local functions */ +local void gz_reset OF((gz_statep)); +local gzFile gz_open OF((const char *, int, const char *)); + +#if defined UNDER_CE + +/* Map the Windows error number in ERROR to a locale-dependent error message + string and return a pointer to it. Typically, the values for ERROR come + from GetLastError. + + The string pointed to shall not be modified by the application, but may be + overwritten by a subsequent call to gz_strwinerror + + The gz_strwinerror function does not change the current setting of + GetLastError. */ +char ZLIB_INTERNAL *gz_strwinerror (error) + DWORD error; +{ + static char buf[1024]; + + wchar_t *msgbuf; + DWORD lasterr = GetLastError(); + DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM + | FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, + error, + 0, /* Default language */ + (LPVOID)&msgbuf, + 0, + NULL); + if (chars != 0) { + /* If there is an \r\n appended, zap it. */ + if (chars >= 2 + && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') { + chars -= 2; + msgbuf[chars] = 0; + } + + if (chars > sizeof (buf) - 1) { + chars = sizeof (buf) - 1; + msgbuf[chars] = 0; + } + + wcstombs(buf, msgbuf, chars + 1); + LocalFree(msgbuf); + } + else { + sprintf(buf, "unknown win32 error (%ld)", error); + } + + SetLastError(lasterr); + return buf; +} + +#endif /* UNDER_CE */ + +/* Reset gzip file state */ +local void gz_reset(state) + gz_statep state; +{ + if (state->mode == GZ_READ) { /* for reading ... */ + state->have = 0; /* no output data available */ + state->eof = 0; /* not at end of file */ + state->how = LOOK; /* look for gzip header */ + state->direct = 1; /* default for empty file */ + } + state->seek = 0; /* no seek request pending */ + gz_error(state, Z_OK, NULL); /* clear error */ + state->pos = 0; /* no uncompressed data yet */ + state->strm.avail_in = 0; /* no input data yet */ +} + +/* Open a gzip file either by name or file descriptor. */ +local gzFile gz_open(path, fd, mode) + const char *path; + int fd; + const char *mode; +{ + gz_statep state; + + /* allocate gzFile structure to return */ + state = malloc(sizeof(gz_state)); + if (state == NULL) + return NULL; + state->size = 0; /* no buffers allocated yet */ + state->want = GZBUFSIZE; /* requested buffer size */ + state->msg = NULL; /* no error message yet */ + + /* interpret mode */ + state->mode = GZ_NONE; + state->level = Z_DEFAULT_COMPRESSION; + state->strategy = Z_DEFAULT_STRATEGY; + while (*mode) { + if (*mode >= '0' && *mode <= '9') + state->level = *mode - '0'; + else + switch (*mode) { + case 'r': + state->mode = GZ_READ; + break; +#ifndef NO_GZCOMPRESS + case 'w': + state->mode = GZ_WRITE; + break; + case 'a': + state->mode = GZ_APPEND; + break; +#endif + case '+': /* can't read and write at the same time */ + free(state); + return NULL; + case 'b': /* ignore -- will request binary anyway */ + break; + case 'f': + state->strategy = Z_FILTERED; + break; + case 'h': + state->strategy = Z_HUFFMAN_ONLY; + break; + case 'R': + state->strategy = Z_RLE; + break; + case 'F': + state->strategy = Z_FIXED; + default: /* could consider as an error, but just ignore */ + ; + } + mode++; + } + + /* must provide an "r", "w", or "a" */ + if (state->mode == GZ_NONE) { + free(state); + return NULL; + } + + /* save the path name for error messages */ + state->path = malloc(strlen(path) + 1); + if (state->path == NULL) { + free(state); + return NULL; + } + strcpy(state->path, path); + + /* open the file with the appropriate mode (or just use fd) */ + state->fd = fd != -1 ? fd : + open(path, +#ifdef O_LARGEFILE + O_LARGEFILE | +#endif +#ifdef O_BINARY + O_BINARY | +#endif + (state->mode == GZ_READ ? + O_RDONLY : + (O_WRONLY | O_CREAT | ( + state->mode == GZ_WRITE ? + O_TRUNC : + O_APPEND))), + 0666); + if (state->fd == -1) { + free(state->path); + free(state); + return NULL; + } + if (state->mode == GZ_APPEND) + state->mode = GZ_WRITE; /* simplify later checks */ + + /* save the current position for rewinding (only if reading) */ + if (state->mode == GZ_READ) { + state->start = LSEEK(state->fd, 0, SEEK_CUR); + if (state->start == -1) state->start = 0; + } + + /* initialize stream */ + gz_reset(state); + + /* return stream */ + return (gzFile)state; +} + +/* -- see zlib.h -- */ +gzFile ZEXPORT gzopen(path, mode) + const char *path; + const char *mode; +{ + return gz_open(path, -1, mode); +} + +/* -- see zlib.h -- */ +gzFile ZEXPORT gzopen64(path, mode) + const char *path; + const char *mode; +{ + return gz_open(path, -1, mode); +} + +/* -- see zlib.h -- */ +gzFile ZEXPORT gzdopen(fd, mode) + int fd; + const char *mode; +{ + char *path; /* identifier for error messages */ + gzFile gz; + + if (fd == -1 || (path = malloc(7 + 3 * sizeof(int))) == NULL) + return NULL; + sprintf(path, "", fd); /* for debugging */ + gz = gz_open(path, fd, mode); + free(path); + return gz; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzbuffer(file, size) + gzFile file; + unsigned size; +{ + gz_statep state; + + /* get internal structure and check integrity */ + if (file == NULL) + return -1; + state = (gz_statep)file; + if (state->mode != GZ_READ && state->mode != GZ_WRITE) + return -1; + + /* make sure we haven't already allocated memory */ + if (state->size != 0) + return -1; + + /* check and set requested size */ + if (size == 0) + return -1; + state->want = size; + return 0; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzrewind(file) + gzFile file; +{ + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + + /* check that we're reading and that there's no error */ + if (state->mode != GZ_READ || state->err != Z_OK) + return -1; + + /* back up and start over */ + if (LSEEK(state->fd, state->start, SEEK_SET) == -1) + return -1; + gz_reset(state); + return 0; +} + +/* -- see zlib.h -- */ +z_off64_t ZEXPORT gzseek64(file, offset, whence) + gzFile file; + z_off64_t offset; + int whence; +{ + unsigned n; + z_off64_t ret; + gz_statep state; + + /* get internal structure and check integrity */ + if (file == NULL) + return -1; + state = (gz_statep)file; + if (state->mode != GZ_READ && state->mode != GZ_WRITE) + return -1; + + /* check that there's no error */ + if (state->err != Z_OK) + return -1; + + /* can only seek from start or relative to current position */ + if (whence != SEEK_SET && whence != SEEK_CUR) + return -1; + + /* normalize offset to a SEEK_CUR specification */ + if (whence == SEEK_SET) + offset -= state->pos; + else if (state->seek) + offset += state->skip; + state->seek = 0; + + /* if within raw area while reading, just go there */ + if (state->mode == GZ_READ && state->how == COPY && + state->pos + offset >= state->raw) { + ret = LSEEK(state->fd, offset - state->have, SEEK_CUR); + if (ret == -1) + return -1; + state->have = 0; + state->eof = 0; + state->seek = 0; + gz_error(state, Z_OK, NULL); + state->strm.avail_in = 0; + state->pos += offset; + return state->pos; + } + + /* calculate skip amount, rewinding if needed for back seek when reading */ + if (offset < 0) { + if (state->mode != GZ_READ) /* writing -- can't go backwards */ + return -1; + offset += state->pos; + if (offset < 0) /* before start of file! */ + return -1; + if (gzrewind(file) == -1) /* rewind, then skip to offset */ + return -1; + } + + /* if reading, skip what's in output buffer (one less gzgetc() check) */ + if (state->mode == GZ_READ) { + n = GT_OFF(state->have) || (z_off64_t)state->have > offset ? + (unsigned)offset : state->have; + state->have -= n; + state->next += n; + state->pos += n; + offset -= n; + } + + /* request skip (if not zero) */ + if (offset) { + state->seek = 1; + state->skip = offset; + } + return state->pos + offset; +} + +/* -- see zlib.h -- */ +z_off_t ZEXPORT gzseek(file, offset, whence) + gzFile file; + z_off_t offset; + int whence; +{ + z_off64_t ret; + + ret = gzseek64(file, (z_off64_t)offset, whence); + return ret == (z_off_t)ret ? (z_off_t)ret : -1; +} + +/* -- see zlib.h -- */ +z_off64_t ZEXPORT gztell64(file) + gzFile file; +{ + gz_statep state; + + /* get internal structure and check integrity */ + if (file == NULL) + return -1; + state = (gz_statep)file; + if (state->mode != GZ_READ && state->mode != GZ_WRITE) + return -1; + + /* return position */ + return state->pos + (state->seek ? state->skip : 0); +} + +/* -- see zlib.h -- */ +z_off_t ZEXPORT gztell(file) + gzFile file; +{ + z_off64_t ret; + + ret = gztell64(file); + return ret == (z_off_t)ret ? (z_off_t)ret : -1; +} + +/* -- see zlib.h -- */ +z_off64_t ZEXPORT gzoffset64(file) + gzFile file; +{ + z_off64_t offset; + gz_statep state; + + /* get internal structure and check integrity */ + if (file == NULL) + return -1; + state = (gz_statep)file; + if (state->mode != GZ_READ && state->mode != GZ_WRITE) + return -1; + + /* compute and return effective offset in file */ + offset = LSEEK(state->fd, 0, SEEK_CUR); + if (offset == -1) + return -1; + if (state->mode == GZ_READ) /* reading */ + offset -= state->strm.avail_in; /* don't count buffered input */ + return offset; +} + +/* -- see zlib.h -- */ +z_off_t ZEXPORT gzoffset(file) + gzFile file; +{ + z_off64_t ret; + + ret = gzoffset64(file); + return ret == (z_off_t)ret ? (z_off_t)ret : -1; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzeof(file) + gzFile file; +{ + gz_statep state; + + /* get internal structure and check integrity */ + if (file == NULL) + return 0; + state = (gz_statep)file; + if (state->mode != GZ_READ && state->mode != GZ_WRITE) + return 0; + + /* return end-of-file state */ + return state->mode == GZ_READ ? + (state->eof && state->strm.avail_in == 0 && state->have == 0) : 0; +} + +/* -- see zlib.h -- */ +const char * ZEXPORT gzerror(file, errnum) + gzFile file; + int *errnum; +{ + gz_statep state; + + /* get internal structure and check integrity */ + if (file == NULL) + return NULL; + state = (gz_statep)file; + if (state->mode != GZ_READ && state->mode != GZ_WRITE) + return NULL; + + /* return error information */ + if (errnum != NULL) + *errnum = state->err; + return state->msg == NULL ? "" : state->msg; +} + +/* -- see zlib.h -- */ +void ZEXPORT gzclearerr(file) + gzFile file; +{ + gz_statep state; + + /* get internal structure and check integrity */ + if (file == NULL) + return; + state = (gz_statep)file; + if (state->mode != GZ_READ && state->mode != GZ_WRITE) + return; + + /* clear error and end-of-file */ + if (state->mode == GZ_READ) + state->eof = 0; + gz_error(state, Z_OK, NULL); +} + +/* Create an error message in allocated memory and set state->err and + state->msg accordingly. Free any previous error message already there. Do + not try to free or allocate space if the error is Z_MEM_ERROR (out of + memory). Simply save the error message as a static string. If there is an + allocation failure constructing the error message, then convert the error to + out of memory. */ +void ZLIB_INTERNAL gz_error(state, err, msg) + gz_statep state; + int err; + const char *msg; +{ + /* free previously allocated message and clear */ + if (state->msg != NULL) { + if (state->err != Z_MEM_ERROR) + free(state->msg); + state->msg = NULL; + } + + /* set error code, and if no message, then done */ + state->err = err; + if (msg == NULL) + return; + + /* for an out of memory error, save as static string */ + if (err == Z_MEM_ERROR) { + state->msg = (char *)msg; + return; + } + + /* construct error message with path */ + if ((state->msg = malloc(strlen(state->path) + strlen(msg) + 3)) == NULL) { + state->err = Z_MEM_ERROR; + state->msg = (char *)"out of memory"; + return; + } + strcpy(state->msg, state->path); + strcat(state->msg, ": "); + strcat(state->msg, msg); + return; +} + +#ifndef INT_MAX +/* portably return maximum value for an int (when limits.h presumed not + available) -- we need to do this to cover cases where 2's complement not + used, since C standard permits 1's complement and sign-bit representations, + otherwise we could just use ((unsigned)-1) >> 1 */ +unsigned ZLIB_INTERNAL gz_intmax() +{ + unsigned p, q; + + p = 1; + do { + q = p; + p <<= 1; + p++; + } while (p > q); + return q >> 1; +} +#endif diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.5/gzread.c b/jdk/src/share/native/java/util/zip/zlib-1.2.5/gzread.c new file mode 100644 index 00000000000..15e85028cfd --- /dev/null +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/gzread.c @@ -0,0 +1,677 @@ +/* + * 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. + */ + +/* gzread.c -- zlib functions for reading gzip files + * Copyright (C) 2004, 2005, 2010 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#include "gzguts.h" + +/* Local functions */ +local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *)); +local int gz_avail OF((gz_statep)); +local int gz_next4 OF((gz_statep, unsigned long *)); +local int gz_head OF((gz_statep)); +local int gz_decomp OF((gz_statep)); +local int gz_make OF((gz_statep)); +local int gz_skip OF((gz_statep, z_off64_t)); + +/* Use read() to load a buffer -- return -1 on error, otherwise 0. Read from + state->fd, and update state->eof, state->err, and state->msg as appropriate. + This function needs to loop on read(), since read() is not guaranteed to + read the number of bytes requested, depending on the type of descriptor. */ +local int gz_load(state, buf, len, have) + gz_statep state; + unsigned char *buf; + unsigned len; + unsigned *have; +{ + int ret; + + *have = 0; + do { + ret = read(state->fd, buf + *have, len - *have); + if (ret <= 0) + break; + *have += ret; + } while (*have < len); + if (ret < 0) { + gz_error(state, Z_ERRNO, zstrerror()); + return -1; + } + if (ret == 0) + state->eof = 1; + return 0; +} + +/* Load up input buffer and set eof flag if last data loaded -- return -1 on + error, 0 otherwise. Note that the eof flag is set when the end of the input + file is reached, even though there may be unused data in the buffer. Once + that data has been used, no more attempts will be made to read the file. + gz_avail() assumes that strm->avail_in == 0. */ +local int gz_avail(state) + gz_statep state; +{ + z_streamp strm = &(state->strm); + + if (state->err != Z_OK) + return -1; + if (state->eof == 0) { + if (gz_load(state, state->in, state->size, + (unsigned *)&(strm->avail_in)) == -1) + return -1; + strm->next_in = state->in; + } + return 0; +} + +/* Get next byte from input, or -1 if end or error. */ +#define NEXT() ((strm->avail_in == 0 && gz_avail(state) == -1) ? -1 : \ + (strm->avail_in == 0 ? -1 : \ + (strm->avail_in--, *(strm->next_in)++))) + +/* Get a four-byte little-endian integer and return 0 on success and the value + in *ret. Otherwise -1 is returned and *ret is not modified. */ +local int gz_next4(state, ret) + gz_statep state; + unsigned long *ret; +{ + int ch; + unsigned long val; + z_streamp strm = &(state->strm); + + val = NEXT(); + val += (unsigned)NEXT() << 8; + val += (unsigned long)NEXT() << 16; + ch = NEXT(); + if (ch == -1) + return -1; + val += (unsigned long)ch << 24; + *ret = val; + return 0; +} + +/* Look for gzip header, set up for inflate or copy. state->have must be zero. + If this is the first time in, allocate required memory. state->how will be + left unchanged if there is no more input data available, will be set to COPY + if there is no gzip header and direct copying will be performed, or it will + be set to GZIP for decompression, and the gzip header will be skipped so + that the next available input data is the raw deflate stream. If direct + copying, then leftover input data from the input buffer will be copied to + the output buffer. In that case, all further file reads will be directly to + either the output buffer or a user buffer. If decompressing, the inflate + state and the check value will be initialized. gz_head() will return 0 on + success or -1 on failure. Failures may include read errors or gzip header + errors. */ +local int gz_head(state) + gz_statep state; +{ + z_streamp strm = &(state->strm); + int flags; + unsigned len; + + /* allocate read buffers and inflate memory */ + if (state->size == 0) { + /* allocate buffers */ + state->in = malloc(state->want); + state->out = malloc(state->want << 1); + if (state->in == NULL || state->out == NULL) { + if (state->out != NULL) + free(state->out); + if (state->in != NULL) + free(state->in); + gz_error(state, Z_MEM_ERROR, "out of memory"); + return -1; + } + state->size = state->want; + + /* allocate inflate memory */ + state->strm.zalloc = Z_NULL; + state->strm.zfree = Z_NULL; + state->strm.opaque = Z_NULL; + state->strm.avail_in = 0; + state->strm.next_in = Z_NULL; + if (inflateInit2(&(state->strm), -15) != Z_OK) { /* raw inflate */ + free(state->out); + free(state->in); + state->size = 0; + gz_error(state, Z_MEM_ERROR, "out of memory"); + return -1; + } + } + + /* get some data in the input buffer */ + if (strm->avail_in == 0) { + if (gz_avail(state) == -1) + return -1; + if (strm->avail_in == 0) + return 0; + } + + /* look for the gzip magic header bytes 31 and 139 */ + if (strm->next_in[0] == 31) { + strm->avail_in--; + strm->next_in++; + if (strm->avail_in == 0 && gz_avail(state) == -1) + return -1; + if (strm->avail_in && strm->next_in[0] == 139) { + /* we have a gzip header, woo hoo! */ + strm->avail_in--; + strm->next_in++; + + /* skip rest of header */ + if (NEXT() != 8) { /* compression method */ + gz_error(state, Z_DATA_ERROR, "unknown compression method"); + return -1; + } + flags = NEXT(); + if (flags & 0xe0) { /* reserved flag bits */ + gz_error(state, Z_DATA_ERROR, "unknown header flags set"); + return -1; + } + NEXT(); /* modification time */ + NEXT(); + NEXT(); + NEXT(); + NEXT(); /* extra flags */ + NEXT(); /* operating system */ + if (flags & 4) { /* extra field */ + len = (unsigned)NEXT(); + len += (unsigned)NEXT() << 8; + while (len--) + if (NEXT() < 0) + break; + } + if (flags & 8) /* file name */ + while (NEXT() > 0) + ; + if (flags & 16) /* comment */ + while (NEXT() > 0) + ; + if (flags & 2) { /* header crc */ + NEXT(); + NEXT(); + } + /* an unexpected end of file is not checked for here -- it will be + noticed on the first request for uncompressed data */ + + /* set up for decompression */ + inflateReset(strm); + strm->adler = crc32(0L, Z_NULL, 0); + state->how = GZIP; + state->direct = 0; + return 0; + } + else { + /* not a gzip file -- save first byte (31) and fall to raw i/o */ + state->out[0] = 31; + state->have = 1; + } + } + + /* doing raw i/o, save start of raw data for seeking, copy any leftover + input to output -- this assumes that the output buffer is larger than + the input buffer, which also assures space for gzungetc() */ + state->raw = state->pos; + state->next = state->out; + if (strm->avail_in) { + memcpy(state->next + state->have, strm->next_in, strm->avail_in); + state->have += strm->avail_in; + strm->avail_in = 0; + } + state->how = COPY; + state->direct = 1; + return 0; +} + +/* Decompress from input to the provided next_out and avail_out in the state. + If the end of the compressed data is reached, then verify the gzip trailer + check value and length (modulo 2^32). state->have and state->next are set + to point to the just decompressed data, and the crc is updated. If the + trailer is verified, state->how is reset to LOOK to look for the next gzip + stream or raw data, once state->have is depleted. Returns 0 on success, -1 + on failure. Failures may include invalid compressed data or a failed gzip + trailer verification. */ +local int gz_decomp(state) + gz_statep state; +{ + int ret; + unsigned had; + unsigned long crc, len; + z_streamp strm = &(state->strm); + + /* fill output buffer up to end of deflate stream */ + had = strm->avail_out; + do { + /* get more input for inflate() */ + if (strm->avail_in == 0 && gz_avail(state) == -1) + return -1; + if (strm->avail_in == 0) { + gz_error(state, Z_DATA_ERROR, "unexpected end of file"); + return -1; + } + + /* decompress and handle errors */ + ret = inflate(strm, Z_NO_FLUSH); + if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) { + gz_error(state, Z_STREAM_ERROR, + "internal error: inflate stream corrupt"); + return -1; + } + if (ret == Z_MEM_ERROR) { + gz_error(state, Z_MEM_ERROR, "out of memory"); + return -1; + } + if (ret == Z_DATA_ERROR) { /* deflate stream invalid */ + gz_error(state, Z_DATA_ERROR, + strm->msg == NULL ? "compressed data error" : strm->msg); + return -1; + } + } while (strm->avail_out && ret != Z_STREAM_END); + + /* update available output and crc check value */ + state->have = had - strm->avail_out; + state->next = strm->next_out - state->have; + strm->adler = crc32(strm->adler, state->next, state->have); + + /* check gzip trailer if at end of deflate stream */ + if (ret == Z_STREAM_END) { + if (gz_next4(state, &crc) == -1 || gz_next4(state, &len) == -1) { + gz_error(state, Z_DATA_ERROR, "unexpected end of file"); + return -1; + } + if (crc != strm->adler) { + gz_error(state, Z_DATA_ERROR, "incorrect data check"); + return -1; + } + if (len != (strm->total_out & 0xffffffffL)) { + gz_error(state, Z_DATA_ERROR, "incorrect length check"); + return -1; + } + state->how = LOOK; /* ready for next stream, once have is 0 (leave + state->direct unchanged to remember how) */ + } + + /* good decompression */ + return 0; +} + +/* Make data and put in the output buffer. Assumes that state->have == 0. + Data is either copied from the input file or decompressed from the input + file depending on state->how. If state->how is LOOK, then a gzip header is + looked for (and skipped if found) to determine wither to copy or decompress. + Returns -1 on error, otherwise 0. gz_make() will leave state->have as COPY + or GZIP unless the end of the input file has been reached and all data has + been processed. */ +local int gz_make(state) + gz_statep state; +{ + z_streamp strm = &(state->strm); + + if (state->how == LOOK) { /* look for gzip header */ + if (gz_head(state) == -1) + return -1; + if (state->have) /* got some data from gz_head() */ + return 0; + } + if (state->how == COPY) { /* straight copy */ + if (gz_load(state, state->out, state->size << 1, &(state->have)) == -1) + return -1; + state->next = state->out; + } + else if (state->how == GZIP) { /* decompress */ + strm->avail_out = state->size << 1; + strm->next_out = state->out; + if (gz_decomp(state) == -1) + return -1; + } + return 0; +} + +/* Skip len uncompressed bytes of output. Return -1 on error, 0 on success. */ +local int gz_skip(state, len) + gz_statep state; + z_off64_t len; +{ + unsigned n; + + /* skip over len bytes or reach end-of-file, whichever comes first */ + while (len) + /* skip over whatever is in output buffer */ + if (state->have) { + n = GT_OFF(state->have) || (z_off64_t)state->have > len ? + (unsigned)len : state->have; + state->have -= n; + state->next += n; + state->pos += n; + len -= n; + } + + /* output buffer empty -- return if we're at the end of the input */ + else if (state->eof && state->strm.avail_in == 0) + break; + + /* need more data to skip -- load up output buffer */ + else { + /* get more output, looking for header if required */ + if (gz_make(state) == -1) + return -1; + } + return 0; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzread(file, buf, len) + gzFile file; + voidp buf; + unsigned len; +{ + unsigned got, n; + gz_statep state; + z_streamp strm; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + strm = &(state->strm); + + /* check that we're reading and that there's no error */ + if (state->mode != GZ_READ || state->err != Z_OK) + return -1; + + /* since an int is returned, make sure len fits in one, otherwise return + with an error (this avoids the flaw in the interface) */ + if ((int)len < 0) { + gz_error(state, Z_BUF_ERROR, "requested length does not fit in int"); + return -1; + } + + /* if len is zero, avoid unnecessary operations */ + if (len == 0) + return 0; + + /* process a skip request */ + if (state->seek) { + state->seek = 0; + if (gz_skip(state, state->skip) == -1) + return -1; + } + + /* get len bytes to buf, or less than len if at the end */ + got = 0; + do { + /* first just try copying data from the output buffer */ + if (state->have) { + n = state->have > len ? len : state->have; + memcpy(buf, state->next, n); + state->next += n; + state->have -= n; + } + + /* output buffer empty -- return if we're at the end of the input */ + else if (state->eof && strm->avail_in == 0) + break; + + /* need output data -- for small len or new stream load up our output + buffer */ + else if (state->how == LOOK || len < (state->size << 1)) { + /* get more output, looking for header if required */ + if (gz_make(state) == -1) + return -1; + continue; /* no progress yet -- go back to memcpy() above */ + /* the copy above assures that we will leave with space in the + output buffer, allowing at least one gzungetc() to succeed */ + } + + /* large len -- read directly into user buffer */ + else if (state->how == COPY) { /* read directly */ + if (gz_load(state, buf, len, &n) == -1) + return -1; + } + + /* large len -- decompress directly into user buffer */ + else { /* state->how == GZIP */ + strm->avail_out = len; + strm->next_out = buf; + if (gz_decomp(state) == -1) + return -1; + n = state->have; + state->have = 0; + } + + /* update progress */ + len -= n; + buf = (char *)buf + n; + got += n; + state->pos += n; + } while (len); + + /* return number of bytes read into user buffer (will fit in int) */ + return (int)got; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzgetc(file) + gzFile file; +{ + int ret; + unsigned char buf[1]; + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + + /* check that we're reading and that there's no error */ + if (state->mode != GZ_READ || state->err != Z_OK) + return -1; + + /* try output buffer (no need to check for skip request) */ + if (state->have) { + state->have--; + state->pos++; + return *(state->next)++; + } + + /* nothing there -- try gzread() */ + ret = gzread(file, buf, 1); + return ret < 1 ? -1 : buf[0]; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzungetc(c, file) + int c; + gzFile file; +{ + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + + /* check that we're reading and that there's no error */ + if (state->mode != GZ_READ || state->err != Z_OK) + return -1; + + /* process a skip request */ + if (state->seek) { + state->seek = 0; + if (gz_skip(state, state->skip) == -1) + return -1; + } + + /* can't push EOF */ + if (c < 0) + return -1; + + /* if output buffer empty, put byte at end (allows more pushing) */ + if (state->have == 0) { + state->have = 1; + state->next = state->out + (state->size << 1) - 1; + state->next[0] = c; + state->pos--; + return c; + } + + /* if no room, give up (must have already done a gzungetc()) */ + if (state->have == (state->size << 1)) { + gz_error(state, Z_BUF_ERROR, "out of room to push characters"); + return -1; + } + + /* slide output data if needed and insert byte before existing data */ + if (state->next == state->out) { + unsigned char *src = state->out + state->have; + unsigned char *dest = state->out + (state->size << 1); + while (src > state->out) + *--dest = *--src; + state->next = dest; + } + state->have++; + state->next--; + state->next[0] = c; + state->pos--; + return c; +} + +/* -- see zlib.h -- */ +char * ZEXPORT gzgets(file, buf, len) + gzFile file; + char *buf; + int len; +{ + unsigned left, n; + char *str; + unsigned char *eol; + gz_statep state; + + /* check parameters and get internal structure */ + if (file == NULL || buf == NULL || len < 1) + return NULL; + state = (gz_statep)file; + + /* check that we're reading and that there's no error */ + if (state->mode != GZ_READ || state->err != Z_OK) + return NULL; + + /* process a skip request */ + if (state->seek) { + state->seek = 0; + if (gz_skip(state, state->skip) == -1) + return NULL; + } + + /* copy output bytes up to new line or len - 1, whichever comes first -- + append a terminating zero to the string (we don't check for a zero in + the contents, let the user worry about that) */ + str = buf; + left = (unsigned)len - 1; + if (left) do { + /* assure that something is in the output buffer */ + if (state->have == 0) { + if (gz_make(state) == -1) + return NULL; /* error */ + if (state->have == 0) { /* end of file */ + if (buf == str) /* got bupkus */ + return NULL; + break; /* got something -- return it */ + } + } + + /* look for end-of-line in current output buffer */ + n = state->have > left ? left : state->have; + eol = memchr(state->next, '\n', n); + if (eol != NULL) + n = (unsigned)(eol - state->next) + 1; + + /* copy through end-of-line, or remainder if not found */ + memcpy(buf, state->next, n); + state->have -= n; + state->next += n; + state->pos += n; + left -= n; + buf += n; + } while (left && eol == NULL); + + /* found end-of-line or out of space -- terminate string and return it */ + buf[0] = 0; + return str; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzdirect(file) + gzFile file; +{ + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return 0; + state = (gz_statep)file; + + /* check that we're reading */ + if (state->mode != GZ_READ) + return 0; + + /* if the state is not known, but we can find out, then do so (this is + mainly for right after a gzopen() or gzdopen()) */ + if (state->how == LOOK && state->have == 0) + (void)gz_head(state); + + /* return 1 if reading direct, 0 if decompressing a gzip stream */ + return state->direct; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzclose_r(file) + gzFile file; +{ + int ret; + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return Z_STREAM_ERROR; + state = (gz_statep)file; + + /* check that we're reading */ + if (state->mode != GZ_READ) + return Z_STREAM_ERROR; + + /* free memory and close file */ + if (state->size) { + inflateEnd(&(state->strm)); + free(state->out); + free(state->in); + } + gz_error(state, Z_OK, NULL); + free(state->path); + ret = close(state->fd); + free(state); + return ret ? Z_ERRNO : Z_OK; +} diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.5/gzwrite.c b/jdk/src/share/native/java/util/zip/zlib-1.2.5/gzwrite.c new file mode 100644 index 00000000000..bff643e0667 --- /dev/null +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/gzwrite.c @@ -0,0 +1,555 @@ +/* + * 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. + */ + +/* gzwrite.c -- zlib functions for writing gzip files + * Copyright (C) 2004, 2005, 2010 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#include "gzguts.h" + +/* Local functions */ +local int gz_init OF((gz_statep)); +local int gz_comp OF((gz_statep, int)); +local int gz_zero OF((gz_statep, z_off64_t)); + +/* Initialize state for writing a gzip file. Mark initialization by setting + state->size to non-zero. Return -1 on failure or 0 on success. */ +local int gz_init(state) + gz_statep state; +{ + int ret; + z_streamp strm = &(state->strm); + + /* allocate input and output buffers */ + state->in = malloc(state->want); + state->out = malloc(state->want); + if (state->in == NULL || state->out == NULL) { + if (state->out != NULL) + free(state->out); + if (state->in != NULL) + free(state->in); + gz_error(state, Z_MEM_ERROR, "out of memory"); + return -1; + } + + /* allocate deflate memory, set up for gzip compression */ + strm->zalloc = Z_NULL; + strm->zfree = Z_NULL; + strm->opaque = Z_NULL; + ret = deflateInit2(strm, state->level, Z_DEFLATED, + 15 + 16, 8, state->strategy); + if (ret != Z_OK) { + free(state->in); + gz_error(state, Z_MEM_ERROR, "out of memory"); + return -1; + } + + /* mark state as initialized */ + state->size = state->want; + + /* initialize write buffer */ + strm->avail_out = state->size; + strm->next_out = state->out; + state->next = strm->next_out; + return 0; +} + +/* Compress whatever is at avail_in and next_in and write to the output file. + Return -1 if there is an error writing to the output file, otherwise 0. + flush is assumed to be a valid deflate() flush value. If flush is Z_FINISH, + then the deflate() state is reset to start a new gzip stream. */ +local int gz_comp(state, flush) + gz_statep state; + int flush; +{ + int ret, got; + unsigned have; + z_streamp strm = &(state->strm); + + /* allocate memory if this is the first time through */ + if (state->size == 0 && gz_init(state) == -1) + return -1; + + /* run deflate() on provided input until it produces no more output */ + ret = Z_OK; + do { + /* write out current buffer contents if full, or if flushing, but if + doing Z_FINISH then don't write until we get to Z_STREAM_END */ + if (strm->avail_out == 0 || (flush != Z_NO_FLUSH && + (flush != Z_FINISH || ret == Z_STREAM_END))) { + have = (unsigned)(strm->next_out - state->next); + if (have && ((got = write(state->fd, state->next, have)) < 0 || + (unsigned)got != have)) { + gz_error(state, Z_ERRNO, zstrerror()); + return -1; + } + if (strm->avail_out == 0) { + strm->avail_out = state->size; + strm->next_out = state->out; + } + state->next = strm->next_out; + } + + /* compress */ + have = strm->avail_out; + ret = deflate(strm, flush); + if (ret == Z_STREAM_ERROR) { + gz_error(state, Z_STREAM_ERROR, + "internal error: deflate stream corrupt"); + return -1; + } + have -= strm->avail_out; + } while (have); + + /* if that completed a deflate stream, allow another to start */ + if (flush == Z_FINISH) + deflateReset(strm); + + /* all done, no errors */ + return 0; +} + +/* Compress len zeros to output. Return -1 on error, 0 on success. */ +local int gz_zero(state, len) + gz_statep state; + z_off64_t len; +{ + int first; + unsigned n; + z_streamp strm = &(state->strm); + + /* consume whatever's left in the input buffer */ + if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) + return -1; + + /* compress len zeros (len guaranteed > 0) */ + first = 1; + while (len) { + n = GT_OFF(state->size) || (z_off64_t)state->size > len ? + (unsigned)len : state->size; + if (first) { + memset(state->in, 0, n); + first = 0; + } + strm->avail_in = n; + strm->next_in = state->in; + state->pos += n; + if (gz_comp(state, Z_NO_FLUSH) == -1) + return -1; + len -= n; + } + return 0; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzwrite(file, buf, len) + gzFile file; + voidpc buf; + unsigned len; +{ + unsigned put = len; + unsigned n; + gz_statep state; + z_streamp strm; + + /* get internal structure */ + if (file == NULL) + return 0; + state = (gz_statep)file; + strm = &(state->strm); + + /* check that we're writing and that there's no error */ + if (state->mode != GZ_WRITE || state->err != Z_OK) + return 0; + + /* since an int is returned, make sure len fits in one, otherwise return + with an error (this avoids the flaw in the interface) */ + if ((int)len < 0) { + gz_error(state, Z_BUF_ERROR, "requested length does not fit in int"); + return 0; + } + + /* if len is zero, avoid unnecessary operations */ + if (len == 0) + return 0; + + /* allocate memory if this is the first time through */ + if (state->size == 0 && gz_init(state) == -1) + return 0; + + /* check for seek request */ + if (state->seek) { + state->seek = 0; + if (gz_zero(state, state->skip) == -1) + return 0; + } + + /* for small len, copy to input buffer, otherwise compress directly */ + if (len < state->size) { + /* copy to input buffer, compress when full */ + do { + if (strm->avail_in == 0) + strm->next_in = state->in; + n = state->size - strm->avail_in; + if (n > len) + n = len; + memcpy(strm->next_in + strm->avail_in, buf, n); + strm->avail_in += n; + state->pos += n; + buf = (char *)buf + n; + len -= n; + if (len && gz_comp(state, Z_NO_FLUSH) == -1) + return 0; + } while (len); + } + else { + /* consume whatever's left in the input buffer */ + if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) + return 0; + + /* directly compress user buffer to file */ + strm->avail_in = len; + strm->next_in = (voidp)buf; + state->pos += len; + if (gz_comp(state, Z_NO_FLUSH) == -1) + return 0; + } + + /* input was all buffered or compressed (put will fit in int) */ + return (int)put; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzputc(file, c) + gzFile file; + int c; +{ + unsigned char buf[1]; + gz_statep state; + z_streamp strm; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + strm = &(state->strm); + + /* check that we're writing and that there's no error */ + if (state->mode != GZ_WRITE || state->err != Z_OK) + return -1; + + /* check for seek request */ + if (state->seek) { + state->seek = 0; + if (gz_zero(state, state->skip) == -1) + return -1; + } + + /* try writing to input buffer for speed (state->size == 0 if buffer not + initialized) */ + if (strm->avail_in < state->size) { + if (strm->avail_in == 0) + strm->next_in = state->in; + strm->next_in[strm->avail_in++] = c; + state->pos++; + return c; + } + + /* no room in buffer or not initialized, use gz_write() */ + buf[0] = c; + if (gzwrite(file, buf, 1) != 1) + return -1; + return c; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzputs(file, str) + gzFile file; + const char *str; +{ + int ret; + unsigned len; + + /* write string */ + len = (unsigned)strlen(str); + ret = gzwrite(file, str, len); + return ret == 0 && len != 0 ? -1 : ret; +} + +#ifdef STDC +#include + +/* -- see zlib.h -- */ +int ZEXPORTVA gzprintf (gzFile file, const char *format, ...) +{ + int size, len; + gz_statep state; + z_streamp strm; + va_list va; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + strm = &(state->strm); + + /* check that we're writing and that there's no error */ + if (state->mode != GZ_WRITE || state->err != Z_OK) + return 0; + + /* make sure we have some buffer space */ + if (state->size == 0 && gz_init(state) == -1) + return 0; + + /* check for seek request */ + if (state->seek) { + state->seek = 0; + if (gz_zero(state, state->skip) == -1) + return 0; + } + + /* consume whatever's left in the input buffer */ + if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) + return 0; + + /* do the printf() into the input buffer, put length in len */ + size = (int)(state->size); + state->in[size - 1] = 0; + va_start(va, format); +#ifdef NO_vsnprintf +# ifdef HAS_vsprintf_void + (void)vsprintf(state->in, format, va); + va_end(va); + for (len = 0; len < size; len++) + if (state->in[len] == 0) break; +# else + len = vsprintf(state->in, format, va); + va_end(va); +# endif +#else +# ifdef HAS_vsnprintf_void + (void)vsnprintf(state->in, size, format, va); + va_end(va); + len = strlen(state->in); +# else + len = vsnprintf((char *)(state->in), size, format, va); + va_end(va); +# endif +#endif + + /* check that printf() results fit in buffer */ + if (len <= 0 || len >= (int)size || state->in[size - 1] != 0) + return 0; + + /* update buffer and position, defer compression until needed */ + strm->avail_in = (unsigned)len; + strm->next_in = state->in; + state->pos += len; + return len; +} + +#else /* !STDC */ + +/* -- see zlib.h -- */ +int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, + a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) + gzFile file; + const char *format; + int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, + a11, a12, a13, a14, a15, a16, a17, a18, a19, a20; +{ + int size, len; + gz_statep state; + z_streamp strm; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + strm = &(state->strm); + + /* check that we're writing and that there's no error */ + if (state->mode != GZ_WRITE || state->err != Z_OK) + return 0; + + /* make sure we have some buffer space */ + if (state->size == 0 && gz_init(state) == -1) + return 0; + + /* check for seek request */ + if (state->seek) { + state->seek = 0; + if (gz_zero(state, state->skip) == -1) + return 0; + } + + /* consume whatever's left in the input buffer */ + if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) + return 0; + + /* do the printf() into the input buffer, put length in len */ + size = (int)(state->size); + state->in[size - 1] = 0; +#ifdef NO_snprintf +# ifdef HAS_sprintf_void + sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); + for (len = 0; len < size; len++) + if (state->in[len] == 0) break; +# else + len = sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); +# endif +#else +# ifdef HAS_snprintf_void + snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); + len = strlen(state->in); +# else + len = snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); +# endif +#endif + + /* check that printf() results fit in buffer */ + if (len <= 0 || len >= (int)size || state->in[size - 1] != 0) + return 0; + + /* update buffer and position, defer compression until needed */ + strm->avail_in = (unsigned)len; + strm->next_in = state->in; + state->pos += len; + return len; +} + +#endif + +/* -- see zlib.h -- */ +int ZEXPORT gzflush(file, flush) + gzFile file; + int flush; +{ + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + + /* check that we're writing and that there's no error */ + if (state->mode != GZ_WRITE || state->err != Z_OK) + return Z_STREAM_ERROR; + + /* check flush parameter */ + if (flush < 0 || flush > Z_FINISH) + return Z_STREAM_ERROR; + + /* check for seek request */ + if (state->seek) { + state->seek = 0; + if (gz_zero(state, state->skip) == -1) + return -1; + } + + /* compress remaining data with requested flush */ + gz_comp(state, flush); + return state->err; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzsetparams(file, level, strategy) + gzFile file; + int level; + int strategy; +{ + gz_statep state; + z_streamp strm; + + /* get internal structure */ + if (file == NULL) + return Z_STREAM_ERROR; + state = (gz_statep)file; + strm = &(state->strm); + + /* check that we're writing and that there's no error */ + if (state->mode != GZ_WRITE || state->err != Z_OK) + return Z_STREAM_ERROR; + + /* if no change is requested, then do nothing */ + if (level == state->level && strategy == state->strategy) + return Z_OK; + + /* check for seek request */ + if (state->seek) { + state->seek = 0; + if (gz_zero(state, state->skip) == -1) + return -1; + } + + /* change compression parameters for subsequent input */ + if (state->size) { + /* flush previous input with previous parameters before changing */ + if (strm->avail_in && gz_comp(state, Z_PARTIAL_FLUSH) == -1) + return state->err; + deflateParams(strm, level, strategy); + } + state->level = level; + state->strategy = strategy; + return Z_OK; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzclose_w(file) + gzFile file; +{ + int ret = 0; + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return Z_STREAM_ERROR; + state = (gz_statep)file; + + /* check that we're writing */ + if (state->mode != GZ_WRITE) + return Z_STREAM_ERROR; + + /* check for seek request */ + if (state->seek) { + state->seek = 0; + ret += gz_zero(state, state->skip); + } + + /* flush, free memory, and close file */ + ret += gz_comp(state, Z_FINISH); + (void)deflateEnd(&(state->strm)); + free(state->out); + free(state->in); + gz_error(state, Z_OK, NULL); + free(state->path); + ret += close(state->fd); + free(state); + return ret ? Z_ERRNO : Z_OK; +} diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/infback.c b/jdk/src/share/native/java/util/zip/zlib-1.2.5/infback.c similarity index 89% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/infback.c rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/infback.c index 3fc03f840b4..783274e4c26 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/infback.c +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/infback.c @@ -23,7 +23,7 @@ */ /* infback.c -- inflate using a call-back interface - * Copyright (C) 1995-2005 Mark Adler + * Copyright (C) 1995-2009 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -79,7 +79,7 @@ int stream_size; state->wbits = windowBits; state->wsize = 1U << windowBits; state->window = window; - state->write = 0; + state->wnext = 0; state->whave = 0; return Z_OK; } @@ -277,7 +277,7 @@ void FAR *out_desc; unsigned bits; /* bits in bit buffer */ unsigned copy; /* number of stored or match bytes to copy */ unsigned char FAR *from; /* where to copy match bytes from */ - code this; /* current decoding table entry */ + code here; /* current decoding table entry */ code last; /* parent table entry */ unsigned len; /* length to copy for repeats, bits to drop */ int ret; /* return code */ @@ -413,19 +413,19 @@ void FAR *out_desc; state->have = 0; while (state->have < state->nlen + state->ndist) { for (;;) { - this = state->lencode[BITS(state->lenbits)]; - if ((unsigned)(this.bits) <= bits) break; + here = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(here.bits) <= bits) break; PULLBYTE(); } - if (this.val < 16) { - NEEDBITS(this.bits); - DROPBITS(this.bits); - state->lens[state->have++] = this.val; + if (here.val < 16) { + NEEDBITS(here.bits); + DROPBITS(here.bits); + state->lens[state->have++] = here.val; } else { - if (this.val == 16) { - NEEDBITS(this.bits + 2); - DROPBITS(this.bits); + if (here.val == 16) { + NEEDBITS(here.bits + 2); + DROPBITS(here.bits); if (state->have == 0) { strm->msg = (char *)"invalid bit length repeat"; state->mode = BAD; @@ -435,16 +435,16 @@ void FAR *out_desc; copy = 3 + BITS(2); DROPBITS(2); } - else if (this.val == 17) { - NEEDBITS(this.bits + 3); - DROPBITS(this.bits); + else if (here.val == 17) { + NEEDBITS(here.bits + 3); + DROPBITS(here.bits); len = 0; copy = 3 + BITS(3); DROPBITS(3); } else { - NEEDBITS(this.bits + 7); - DROPBITS(this.bits); + NEEDBITS(here.bits + 7); + DROPBITS(here.bits); len = 0; copy = 11 + BITS(7); DROPBITS(7); @@ -462,7 +462,16 @@ void FAR *out_desc; /* handle error breaks in while */ if (state->mode == BAD) break; - /* build code tables */ + /* check for end-of-block code (better have one) */ + if (state->lens[256] == 0) { + strm->msg = (char *)"invalid code -- missing end-of-block"; + state->mode = BAD; + break; + } + + /* build code tables -- note: do not change the lenbits or distbits + values here (9 and 6) without reading the comments in inftrees.h + concerning the ENOUGH constants, which depend on those values */ state->next = state->codes; state->lencode = (code const FAR *)(state->next); state->lenbits = 9; @@ -498,28 +507,28 @@ void FAR *out_desc; /* get a literal, length, or end-of-block code */ for (;;) { - this = state->lencode[BITS(state->lenbits)]; - if ((unsigned)(this.bits) <= bits) break; + here = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(here.bits) <= bits) break; PULLBYTE(); } - if (this.op && (this.op & 0xf0) == 0) { - last = this; + if (here.op && (here.op & 0xf0) == 0) { + last = here; for (;;) { - this = state->lencode[last.val + + here = state->lencode[last.val + (BITS(last.bits + last.op) >> last.bits)]; - if ((unsigned)(last.bits + this.bits) <= bits) break; + if ((unsigned)(last.bits + here.bits) <= bits) break; PULLBYTE(); } DROPBITS(last.bits); } - DROPBITS(this.bits); - state->length = (unsigned)this.val; + DROPBITS(here.bits); + state->length = (unsigned)here.val; /* process literal */ - if (this.op == 0) { - Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? + if (here.op == 0) { + Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? "inflate: literal '%c'\n" : - "inflate: literal 0x%02x\n", this.val)); + "inflate: literal 0x%02x\n", here.val)); ROOM(); *put++ = (unsigned char)(state->length); left--; @@ -528,21 +537,21 @@ void FAR *out_desc; } /* process end of block */ - if (this.op & 32) { + if (here.op & 32) { Tracevv((stderr, "inflate: end of block\n")); state->mode = TYPE; break; } /* invalid code */ - if (this.op & 64) { + if (here.op & 64) { strm->msg = (char *)"invalid literal/length code"; state->mode = BAD; break; } /* length code -- get extra bits, if any */ - state->extra = (unsigned)(this.op) & 15; + state->extra = (unsigned)(here.op) & 15; if (state->extra != 0) { NEEDBITS(state->extra); state->length += BITS(state->extra); @@ -552,30 +561,30 @@ void FAR *out_desc; /* get distance code */ for (;;) { - this = state->distcode[BITS(state->distbits)]; - if ((unsigned)(this.bits) <= bits) break; + here = state->distcode[BITS(state->distbits)]; + if ((unsigned)(here.bits) <= bits) break; PULLBYTE(); } - if ((this.op & 0xf0) == 0) { - last = this; + if ((here.op & 0xf0) == 0) { + last = here; for (;;) { - this = state->distcode[last.val + + here = state->distcode[last.val + (BITS(last.bits + last.op) >> last.bits)]; - if ((unsigned)(last.bits + this.bits) <= bits) break; + if ((unsigned)(last.bits + here.bits) <= bits) break; PULLBYTE(); } DROPBITS(last.bits); } - DROPBITS(this.bits); - if (this.op & 64) { + DROPBITS(here.bits); + if (here.op & 64) { strm->msg = (char *)"invalid distance code"; state->mode = BAD; break; } - state->offset = (unsigned)this.val; + state->offset = (unsigned)here.val; /* get distance extra bits, if any */ - state->extra = (unsigned)(this.op) & 15; + state->extra = (unsigned)(here.op) & 15; if (state->extra != 0) { NEEDBITS(state->extra); state->offset += BITS(state->extra); diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inffast.c b/jdk/src/share/native/java/util/zip/zlib-1.2.5/inffast.c similarity index 84% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/inffast.c rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/inffast.c index eaffa05735e..e6a05723be4 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inffast.c +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/inffast.c @@ -23,7 +23,7 @@ */ /* inffast.c -- fast decoding - * Copyright (C) 1995-2004 Mark Adler + * Copyright (C) 1995-2008, 2010 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -88,7 +88,7 @@ requires strm->avail_out >= 258 for each loop to avoid checking for output space. */ -void inflate_fast(strm, start) +void ZLIB_INTERNAL inflate_fast(strm, start) z_streamp strm; unsigned start; /* inflate()'s starting value for strm->avail_out */ { @@ -103,7 +103,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ #endif unsigned wsize; /* window size or zero if not using window */ unsigned whave; /* valid bytes in the window */ - unsigned write; /* window write index */ + unsigned wnext; /* window write index */ unsigned char FAR *window; /* allocated sliding window, if wsize != 0 */ unsigned long hold; /* local strm->hold */ unsigned bits; /* local strm->bits */ @@ -111,7 +111,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ code const FAR *dcode; /* local strm->distcode */ unsigned lmask; /* mask for first level of length codes */ unsigned dmask; /* mask for first level of distance codes */ - code this; /* retrieved table entry */ + code here; /* retrieved table entry */ unsigned op; /* code bits, operation, extra bits, or */ /* window position, window bytes to copy */ unsigned len; /* match length, unused bytes */ @@ -130,7 +130,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ #endif wsize = state->wsize; whave = state->whave; - write = state->write; + wnext = state->wnext; window = state->window; hold = state->hold; bits = state->bits; @@ -148,20 +148,20 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ hold += (unsigned long)(PUP(in)) << bits; bits += 8; } - this = lcode[hold & lmask]; + here = lcode[hold & lmask]; dolen: - op = (unsigned)(this.bits); + op = (unsigned)(here.bits); hold >>= op; bits -= op; - op = (unsigned)(this.op); + op = (unsigned)(here.op); if (op == 0) { /* literal */ - Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? + Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? "inflate: literal '%c'\n" : - "inflate: literal 0x%02x\n", this.val)); - PUP(out) = (unsigned char)(this.val); + "inflate: literal 0x%02x\n", here.val)); + PUP(out) = (unsigned char)(here.val); } else if (op & 16) { /* length base */ - len = (unsigned)(this.val); + len = (unsigned)(here.val); op &= 15; /* number of extra bits */ if (op) { if (bits < op) { @@ -179,14 +179,14 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ hold += (unsigned long)(PUP(in)) << bits; bits += 8; } - this = dcode[hold & dmask]; + here = dcode[hold & dmask]; dodist: - op = (unsigned)(this.bits); + op = (unsigned)(here.bits); hold >>= op; bits -= op; - op = (unsigned)(this.op); + op = (unsigned)(here.op); if (op & 16) { /* distance base */ - dist = (unsigned)(this.val); + dist = (unsigned)(here.val); op &= 15; /* number of extra bits */ if (bits < op) { hold += (unsigned long)(PUP(in)) << bits; @@ -211,12 +211,34 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ if (dist > op) { /* see if copy from window */ op = dist - op; /* distance back in window */ if (op > whave) { - strm->msg = (char *)"invalid distance too far back"; - state->mode = BAD; - break; + if (state->sane) { + strm->msg = + (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } +#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR + if (len <= op - whave) { + do { + PUP(out) = 0; + } while (--len); + continue; + } + len -= op - whave; + do { + PUP(out) = 0; + } while (--op > whave); + if (op == 0) { + from = out - dist; + do { + PUP(out) = PUP(from); + } while (--len); + continue; + } +#endif } from = window - OFF; - if (write == 0) { /* very common case */ + if (wnext == 0) { /* very common case */ from += wsize - op; if (op < len) { /* some from window */ len -= op; @@ -226,17 +248,17 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ from = out - dist; /* rest from output */ } } - else if (write < op) { /* wrap around window */ - from += wsize + write - op; - op -= write; + else if (wnext < op) { /* wrap around window */ + from += wsize + wnext - op; + op -= wnext; if (op < len) { /* some from end of window */ len -= op; do { PUP(out) = PUP(from); } while (--op); from = window - OFF; - if (write < len) { /* some from start of window */ - op = write; + if (wnext < len) { /* some from start of window */ + op = wnext; len -= op; do { PUP(out) = PUP(from); @@ -246,7 +268,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ } } else { /* contiguous in window */ - from += write - op; + from += wnext - op; if (op < len) { /* some from window */ len -= op; do { @@ -283,7 +305,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ } } else if ((op & 64) == 0) { /* 2nd level distance code */ - this = dcode[this.val + (hold & ((1U << op) - 1))]; + here = dcode[here.val + (hold & ((1U << op) - 1))]; goto dodist; } else { @@ -293,7 +315,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ } } else if ((op & 64) == 0) { /* 2nd level length code */ - this = lcode[this.val + (hold & ((1U << op) - 1))]; + here = lcode[here.val + (hold & ((1U << op) - 1))]; goto dolen; } else if (op & 32) { /* end-of-block */ @@ -329,7 +351,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe): - Using bit fields for code structure - Different op definition to avoid & for extra bits (do & for table bits) - - Three separate decoding do-loops for direct, window, and write == 0 + - Three separate decoding do-loops for direct, window, and wnext == 0 - Special case for distance > 1 copies to do overlapped load and store copy - Explicit branch predictions (based on measured branch probabilities) - Deferring match copy and interspersed it with decoding subsequent codes diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inffast.h b/jdk/src/share/native/java/util/zip/zlib-1.2.5/inffast.h similarity index 92% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/inffast.h rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/inffast.h index c45d08755ff..b8da8bb757a 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inffast.h +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/inffast.h @@ -23,7 +23,7 @@ */ /* inffast.h -- header to use inffast.c - * Copyright (C) 1995-2003 Mark Adler + * Copyright (C) 1995-2003, 2010 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -32,4 +32,4 @@ subject to change. Applications should only use zlib.h. */ -void inflate_fast OF((z_streamp strm, unsigned start)); +void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start)); diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inffixed.h b/jdk/src/share/native/java/util/zip/zlib-1.2.5/inffixed.h similarity index 100% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/inffixed.h rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/inffixed.h diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inflate.c b/jdk/src/share/native/java/util/zip/zlib-1.2.5/inflate.c similarity index 87% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/inflate.c rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/inflate.c index caf1ad076fe..98e210a8f65 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inflate.c +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/inflate.c @@ -23,7 +23,7 @@ */ /* inflate.c -- zlib decompression - * Copyright (C) 1995-2005 Mark Adler + * Copyright (C) 1995-2010 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -69,7 +69,7 @@ * - Rearrange window copies in inflate_fast() for speed and simplification * - Unroll last copy for window match in inflate_fast() * - Use local copies of window variables in inflate_fast() for speed - * - Pull out common write == 0 case for speed in inflate_fast() + * - Pull out common wnext == 0 case for speed in inflate_fast() * - Make op and len in inflate_fast() unsigned for consistency * - Add FAR to lcode and dcode declarations in inflate_fast() * - Simplified bad distance check in inflate_fast() @@ -141,28 +141,52 @@ z_streamp strm; state->head = Z_NULL; state->wsize = 0; state->whave = 0; - state->write = 0; + state->wnext = 0; state->hold = 0; state->bits = 0; state->lencode = state->distcode = state->next = state->codes; + state->sane = 1; + state->back = -1; Tracev((stderr, "inflate: reset\n")); return Z_OK; } -int ZEXPORT inflatePrime(strm, bits, value) +int ZEXPORT inflateReset2(strm, windowBits) z_streamp strm; -int bits; -int value; +int windowBits; { + int wrap; struct inflate_state FAR *state; + /* get the state */ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; - if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR; - value &= (1L << bits) - 1; - state->hold += value << state->bits; - state->bits += bits; - return Z_OK; + + /* extract wrap request from windowBits parameter */ + if (windowBits < 0) { + wrap = 0; + windowBits = -windowBits; + } + else { + wrap = (windowBits >> 4) + 1; +#ifdef GUNZIP + if (windowBits < 48) + windowBits &= 15; +#endif + } + + /* set number of window bits, free window if different */ + if (windowBits && (windowBits < 8 || windowBits > 15)) + return Z_STREAM_ERROR; + if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) { + ZFREE(strm, state->window); + state->window = Z_NULL; + } + + /* update state and reset the rest of it */ + state->wrap = wrap; + state->wbits = (unsigned)windowBits; + return inflateReset(strm); } int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size) @@ -171,6 +195,7 @@ int windowBits; const char *version; int stream_size; { + int ret; struct inflate_state FAR *state; if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || @@ -188,24 +213,13 @@ int stream_size; if (state == Z_NULL) return Z_MEM_ERROR; Tracev((stderr, "inflate: allocated\n")); strm->state = (struct internal_state FAR *)state; - if (windowBits < 0) { - state->wrap = 0; - windowBits = -windowBits; - } - else { - state->wrap = (windowBits >> 4) + 1; -#ifdef GUNZIP - if (windowBits < 48) windowBits &= 15; -#endif - } - if (windowBits < 8 || windowBits > 15) { + state->window = Z_NULL; + ret = inflateReset2(strm, windowBits); + if (ret != Z_OK) { ZFREE(strm, state); strm->state = Z_NULL; - return Z_STREAM_ERROR; } - state->wbits = (unsigned)windowBits; - state->window = Z_NULL; - return inflateReset(strm); + return ret; } int ZEXPORT inflateInit_(strm, version, stream_size) @@ -216,6 +230,27 @@ int stream_size; return inflateInit2_(strm, DEF_WBITS, version, stream_size); } +int ZEXPORT inflatePrime(strm, bits, value) +z_streamp strm; +int bits; +int value; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (bits < 0) { + state->hold = 0; + state->bits = 0; + return Z_OK; + } + if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR; + value &= (1L << bits) - 1; + state->hold += value << state->bits; + state->bits += bits; + return Z_OK; +} + /* Return state with length and distance decoding tables and index sizes set to fixed code decoding. Normally this returns fixed tables from inffixed.h. @@ -364,7 +399,7 @@ unsigned out; /* if window not in use yet, initialize */ if (state->wsize == 0) { state->wsize = 1U << state->wbits; - state->write = 0; + state->wnext = 0; state->whave = 0; } @@ -372,22 +407,22 @@ unsigned out; copy = out - strm->avail_out; if (copy >= state->wsize) { zmemcpy(state->window, strm->next_out - state->wsize, state->wsize); - state->write = 0; + state->wnext = 0; state->whave = state->wsize; } else { - dist = state->wsize - state->write; + dist = state->wsize - state->wnext; if (dist > copy) dist = copy; - zmemcpy(state->window + state->write, strm->next_out - copy, dist); + zmemcpy(state->window + state->wnext, strm->next_out - copy, dist); copy -= dist; if (copy) { zmemcpy(state->window, strm->next_out - copy, copy); - state->write = copy; + state->wnext = copy; state->whave = state->wsize; } else { - state->write += dist; - if (state->write == state->wsize) state->write = 0; + state->wnext += dist; + if (state->wnext == state->wsize) state->wnext = 0; if (state->whave < state->wsize) state->whave += dist; } } @@ -588,7 +623,7 @@ int flush; unsigned in, out; /* save starting available input and output */ unsigned copy; /* number of stored or match bytes to copy */ unsigned char FAR *from; /* where to copy match bytes from */ - code this; /* current decoding table entry */ + code here; /* current decoding table entry */ code last; /* parent table entry */ unsigned len; /* length to copy for repeats, bits to drop */ int ret; /* return code */ @@ -643,7 +678,9 @@ int flush; } DROPBITS(4); len = BITS(4) + 8; - if (len > state->wbits) { + if (state->wbits == 0) + state->wbits = len; + else if (len > state->wbits) { strm->msg = (char *)"invalid window size"; state->mode = BAD; break; @@ -795,7 +832,7 @@ int flush; strm->adler = state->check = adler32(0L, Z_NULL, 0); state->mode = TYPE; case TYPE: - if (flush == Z_BLOCK) goto inf_leave; + if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave; case TYPEDO: if (state->last) { BYTEBITS(); @@ -815,7 +852,11 @@ int flush; fixedtables(state); Tracev((stderr, "inflate: fixed codes block%s\n", state->last ? " (last)" : "")); - state->mode = LEN; /* decode codes */ + state->mode = LEN_; /* decode codes */ + if (flush == Z_TREES) { + DROPBITS(2); + goto inf_leave; + } break; case 2: /* dynamic block */ Tracev((stderr, "inflate: dynamic codes block%s\n", @@ -840,6 +881,9 @@ int flush; Tracev((stderr, "inflate: stored length %u\n", state->length)); INITBITS(); + state->mode = COPY_; + if (flush == Z_TREES) goto inf_leave; + case COPY_: state->mode = COPY; case COPY: copy = state->length; @@ -900,19 +944,19 @@ int flush; case CODELENS: while (state->have < state->nlen + state->ndist) { for (;;) { - this = state->lencode[BITS(state->lenbits)]; - if ((unsigned)(this.bits) <= bits) break; + here = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(here.bits) <= bits) break; PULLBYTE(); } - if (this.val < 16) { - NEEDBITS(this.bits); - DROPBITS(this.bits); - state->lens[state->have++] = this.val; + if (here.val < 16) { + NEEDBITS(here.bits); + DROPBITS(here.bits); + state->lens[state->have++] = here.val; } else { - if (this.val == 16) { - NEEDBITS(this.bits + 2); - DROPBITS(this.bits); + if (here.val == 16) { + NEEDBITS(here.bits + 2); + DROPBITS(here.bits); if (state->have == 0) { strm->msg = (char *)"invalid bit length repeat"; state->mode = BAD; @@ -922,16 +966,16 @@ int flush; copy = 3 + BITS(2); DROPBITS(2); } - else if (this.val == 17) { - NEEDBITS(this.bits + 3); - DROPBITS(this.bits); + else if (here.val == 17) { + NEEDBITS(here.bits + 3); + DROPBITS(here.bits); len = 0; copy = 3 + BITS(3); DROPBITS(3); } else { - NEEDBITS(this.bits + 7); - DROPBITS(this.bits); + NEEDBITS(here.bits + 7); + DROPBITS(here.bits); len = 0; copy = 11 + BITS(7); DROPBITS(7); @@ -949,7 +993,16 @@ int flush; /* handle error breaks in while */ if (state->mode == BAD) break; - /* build code tables */ + /* check for end-of-block code (better have one) */ + if (state->lens[256] == 0) { + strm->msg = (char *)"invalid code -- missing end-of-block"; + state->mode = BAD; + break; + } + + /* build code tables -- note: do not change the lenbits or distbits + values here (9 and 6) without reading the comments in inftrees.h + concerning the ENOUGH constants, which depend on those values */ state->next = state->codes; state->lencode = (code const FAR *)(state->next); state->lenbits = 9; @@ -970,88 +1023,102 @@ int flush; break; } Tracev((stderr, "inflate: codes ok\n")); + state->mode = LEN_; + if (flush == Z_TREES) goto inf_leave; + case LEN_: state->mode = LEN; case LEN: if (have >= 6 && left >= 258) { RESTORE(); inflate_fast(strm, out); LOAD(); + if (state->mode == TYPE) + state->back = -1; break; } + state->back = 0; for (;;) { - this = state->lencode[BITS(state->lenbits)]; - if ((unsigned)(this.bits) <= bits) break; + here = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(here.bits) <= bits) break; PULLBYTE(); } - if (this.op && (this.op & 0xf0) == 0) { - last = this; + if (here.op && (here.op & 0xf0) == 0) { + last = here; for (;;) { - this = state->lencode[last.val + + here = state->lencode[last.val + (BITS(last.bits + last.op) >> last.bits)]; - if ((unsigned)(last.bits + this.bits) <= bits) break; + if ((unsigned)(last.bits + here.bits) <= bits) break; PULLBYTE(); } DROPBITS(last.bits); + state->back += last.bits; } - DROPBITS(this.bits); - state->length = (unsigned)this.val; - if ((int)(this.op) == 0) { - Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? + DROPBITS(here.bits); + state->back += here.bits; + state->length = (unsigned)here.val; + if ((int)(here.op) == 0) { + Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? "inflate: literal '%c'\n" : - "inflate: literal 0x%02x\n", this.val)); + "inflate: literal 0x%02x\n", here.val)); state->mode = LIT; break; } - if (this.op & 32) { + if (here.op & 32) { Tracevv((stderr, "inflate: end of block\n")); + state->back = -1; state->mode = TYPE; break; } - if (this.op & 64) { + if (here.op & 64) { strm->msg = (char *)"invalid literal/length code"; state->mode = BAD; break; } - state->extra = (unsigned)(this.op) & 15; + state->extra = (unsigned)(here.op) & 15; state->mode = LENEXT; case LENEXT: if (state->extra) { NEEDBITS(state->extra); state->length += BITS(state->extra); DROPBITS(state->extra); + state->back += state->extra; } Tracevv((stderr, "inflate: length %u\n", state->length)); + state->was = state->length; state->mode = DIST; case DIST: for (;;) { - this = state->distcode[BITS(state->distbits)]; - if ((unsigned)(this.bits) <= bits) break; + here = state->distcode[BITS(state->distbits)]; + if ((unsigned)(here.bits) <= bits) break; PULLBYTE(); } - if ((this.op & 0xf0) == 0) { - last = this; + if ((here.op & 0xf0) == 0) { + last = here; for (;;) { - this = state->distcode[last.val + + here = state->distcode[last.val + (BITS(last.bits + last.op) >> last.bits)]; - if ((unsigned)(last.bits + this.bits) <= bits) break; + if ((unsigned)(last.bits + here.bits) <= bits) break; PULLBYTE(); } DROPBITS(last.bits); + state->back += last.bits; } - DROPBITS(this.bits); - if (this.op & 64) { + DROPBITS(here.bits); + state->back += here.bits; + if (here.op & 64) { strm->msg = (char *)"invalid distance code"; state->mode = BAD; break; } - state->offset = (unsigned)this.val; - state->extra = (unsigned)(this.op) & 15; + state->offset = (unsigned)here.val; + state->extra = (unsigned)(here.op) & 15; state->mode = DISTEXT; case DISTEXT: if (state->extra) { NEEDBITS(state->extra); state->offset += BITS(state->extra); DROPBITS(state->extra); + state->back += state->extra; } #ifdef INFLATE_STRICT if (state->offset > state->dmax) { @@ -1060,11 +1127,6 @@ int flush; break; } #endif - if (state->offset > state->whave + out - left) { - strm->msg = (char *)"invalid distance too far back"; - state->mode = BAD; - break; - } Tracevv((stderr, "inflate: distance %u\n", state->offset)); state->mode = MATCH; case MATCH: @@ -1072,12 +1134,32 @@ int flush; copy = out - left; if (state->offset > copy) { /* copy from window */ copy = state->offset - copy; - if (copy > state->write) { - copy -= state->write; + if (copy > state->whave) { + if (state->sane) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } +#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR + Trace((stderr, "inflate.c too far\n")); + copy -= state->whave; + if (copy > state->length) copy = state->length; + if (copy > left) copy = left; + left -= copy; + state->length -= copy; + do { + *put++ = 0; + } while (--copy); + if (state->length == 0) state->mode = LEN; + break; +#endif + } + if (copy > state->wnext) { + copy -= state->wnext; from = state->window + (state->wsize - copy); } else - from = state->window + (state->write - copy); + from = state->window + (state->wnext - copy); if (copy > state->length) copy = state->length; } else { /* copy from output */ @@ -1170,7 +1252,8 @@ int flush; strm->adler = state->check = UPDATE(state->check, strm->next_out - out, out); strm->data_type = state->bits + (state->last ? 64 : 0) + - (state->mode == TYPE ? 128 : 0); + (state->mode == TYPE ? 128 : 0) + + (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0); if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK) ret = Z_BUF_ERROR; return ret; @@ -1287,7 +1370,7 @@ int ZEXPORT inflateSync(strm) z_streamp strm; { unsigned len; /* number of bytes to look at or looked at */ - long long in, out; /* temporary to save total_in and total_out */ + long long in, out; /* temporary to save total_in and total_out */ unsigned char buf[4]; /* to restore bit buffer to byte string */ struct inflate_state FAR *state; @@ -1390,3 +1473,32 @@ z_streamp source; dest->state = (struct internal_state FAR *)copy; return Z_OK; } + +int ZEXPORT inflateUndermine(strm, subvert) +z_streamp strm; +int subvert; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + state->sane = !subvert; +#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR + return Z_OK; +#else + state->sane = 1; + return Z_DATA_ERROR; +#endif +} + +long ZEXPORT inflateMark(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16; + state = (struct inflate_state FAR *)strm->state; + return ((long)(state->back) << 16) + + (state->mode == COPY ? state->length : + (state->mode == MATCH ? state->was - state->length : 0)); +} diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inflate.h b/jdk/src/share/native/java/util/zip/zlib-1.2.5/inflate.h similarity index 85% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/inflate.h rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/inflate.h index 11a5b08d832..090cb8a792f 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inflate.h +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/inflate.h @@ -23,7 +23,7 @@ */ /* inflate.h -- internal inflate state definition - * Copyright (C) 1995-2004 Mark Adler + * Copyright (C) 1995-2009 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -56,11 +56,13 @@ typedef enum { TYPE, /* i: waiting for type bits, including last-flag bit */ TYPEDO, /* i: same, but skip check to exit inflate on new block */ STORED, /* i: waiting for stored size (length and complement) */ + COPY_, /* i/o: same as COPY below, but only first time in */ COPY, /* i/o: waiting for input or output to copy stored block */ TABLE, /* i: waiting for dynamic block table lengths */ LENLENS, /* i: waiting for code length code lengths */ CODELENS, /* i: waiting for length/lit and distance code lengths */ - LEN, /* i: waiting for length/lit code */ + LEN_, /* i: same as LEN below, but only first time in */ + LEN, /* i: waiting for length/lit/eob code */ LENEXT, /* i: waiting for length extra bits */ DIST, /* i: waiting for distance code */ DISTEXT, /* i: waiting for distance extra bits */ @@ -77,19 +79,21 @@ typedef enum { /* State transitions between above modes - - (most modes can go to the BAD or MEM mode -- not shown for clarity) + (most modes can go to BAD or MEM on error -- not shown for clarity) Process header: - HEAD -> (gzip) or (zlib) - (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME - NAME -> COMMENT -> HCRC -> TYPE + HEAD -> (gzip) or (zlib) or (raw) + (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT -> + HCRC -> TYPE (zlib) -> DICTID or TYPE DICTID -> DICT -> TYPE + (raw) -> TYPEDO Read deflate blocks: - TYPE -> STORED or TABLE or LEN or CHECK - STORED -> COPY -> TYPE - TABLE -> LENLENS -> CODELENS -> LEN - Read deflate codes: + TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK + STORED -> COPY_ -> COPY -> TYPE + TABLE -> LENLENS -> CODELENS -> LEN_ + LEN_ -> LEN + Read deflate codes in fixed or dynamic block: LEN -> LENEXT or LIT or TYPE LENEXT -> DIST -> DISTEXT -> MATCH -> LEN LIT -> LEN @@ -97,7 +101,7 @@ typedef enum { CHECK -> LENGTH -> DONE */ -/* state maintained between inflate() calls. Approximately 7K bytes. */ +/* state maintained between inflate() calls. Approximately 10K bytes. */ struct inflate_state { inflate_mode mode; /* current inflate mode */ int last; /* true if processing last block */ @@ -112,7 +116,7 @@ struct inflate_state { unsigned wbits; /* log base 2 of requested window size */ unsigned wsize; /* window size or zero if not using window */ unsigned whave; /* valid bytes in the window */ - unsigned write; /* window write index */ + unsigned wnext; /* window write index */ unsigned char FAR *window; /* allocated sliding window, if needed */ /* bit accumulator */ unsigned long hold; /* input bit accumulator */ @@ -136,4 +140,7 @@ struct inflate_state { unsigned short lens[320]; /* temporary storage for code lengths */ unsigned short work[288]; /* work area for code table building */ code codes[ENOUGH]; /* space for code tables */ + int sane; /* if false, allow invalid distance too far */ + int back; /* bits back of last unprocessed length/lit */ + unsigned was; /* initial length of match */ }; diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inftrees.c b/jdk/src/share/native/java/util/zip/zlib-1.2.5/inftrees.c similarity index 89% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/inftrees.c rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/inftrees.c index 0abd61066d1..9842631ccdf 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inftrees.c +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/inftrees.c @@ -23,7 +23,7 @@ */ /* inftrees.c -- generate Huffman trees for efficient decoding - * Copyright (C) 1995-2005 Mark Adler + * Copyright (C) 1995-2010 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -33,7 +33,7 @@ #define MAXBITS 15 const char inflate_copyright[] = - " inflate 1.2.3 Copyright 1995-2005 Mark Adler "; + " inflate 1.2.5 Copyright 1995-2010 Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -53,7 +53,7 @@ const char inflate_copyright[] = table index bits. It will differ if the request is greater than the longest code or if it is less than the shortest code. */ -int inflate_table(type, lens, codes, table, bits, work) +int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work) codetype type; unsigned short FAR *lens; unsigned codes; @@ -74,7 +74,7 @@ unsigned short FAR *work; unsigned fill; /* index for replicating entries */ unsigned low; /* low bits for current root entry */ unsigned mask; /* mask for low root bits */ - code this; /* table entry for duplication */ + code here; /* table entry for duplication */ code FAR *next; /* next available space in table */ const unsigned short FAR *base; /* base value table to use */ const unsigned short FAR *extra; /* extra bits table to use */ @@ -86,7 +86,7 @@ unsigned short FAR *work; 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, - 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196}; + 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 73, 195}; static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, @@ -139,15 +139,15 @@ unsigned short FAR *work; if (count[max] != 0) break; if (root > max) root = max; if (max == 0) { /* no symbols to code at all */ - this.op = (unsigned char)64; /* invalid code marker */ - this.bits = (unsigned char)1; - this.val = (unsigned short)0; - *(*table)++ = this; /* make a table to force an error */ - *(*table)++ = this; + here.op = (unsigned char)64; /* invalid code marker */ + here.bits = (unsigned char)1; + here.val = (unsigned short)0; + *(*table)++ = here; /* make a table to force an error */ + *(*table)++ = here; *bits = 1; return 0; /* no symbols, but wait for decoding to report error */ } - for (min = 1; min <= MAXBITS; min++) + for (min = 1; min < max; min++) if (count[min] != 0) break; if (root < min) root = min; @@ -190,11 +190,10 @@ unsigned short FAR *work; entered in the tables. used keeps track of how many table entries have been allocated from the - provided *table space. It is checked when a LENS table is being made - against the space in *table, ENOUGH, minus the maximum space needed by - the worst case distance code, MAXD. This should never happen, but the - sufficiency of ENOUGH has not been proven exhaustively, hence the check. - This assumes that when type == LENS, bits == 9. + provided *table space. It is checked for LENS and DIST tables against + the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in + the initial root table size constants. See the comments in inftrees.h + for more information. sym increments through all symbols, and the loop terminates when all codes of length max, i.e. all codes, have been processed. This @@ -233,24 +232,25 @@ unsigned short FAR *work; mask = used - 1; /* mask for comparing low */ /* check available table space */ - if (type == LENS && used >= ENOUGH - MAXD) + if ((type == LENS && used >= ENOUGH_LENS) || + (type == DISTS && used >= ENOUGH_DISTS)) return 1; /* process all codes and make table entries */ for (;;) { /* create table entry */ - this.bits = (unsigned char)(len - drop); + here.bits = (unsigned char)(len - drop); if ((int)(work[sym]) < end) { - this.op = (unsigned char)0; - this.val = work[sym]; + here.op = (unsigned char)0; + here.val = work[sym]; } else if ((int)(work[sym]) > end) { - this.op = (unsigned char)(extra[work[sym]]); - this.val = base[work[sym]]; + here.op = (unsigned char)(extra[work[sym]]); + here.val = base[work[sym]]; } else { - this.op = (unsigned char)(32 + 64); /* end of block */ - this.val = 0; + here.op = (unsigned char)(32 + 64); /* end of block */ + here.val = 0; } /* replicate for those indices with low len bits equal to huff */ @@ -259,7 +259,7 @@ unsigned short FAR *work; min = fill; /* save offset to next table */ do { fill -= incr; - next[(huff >> drop) + fill] = this; + next[(huff >> drop) + fill] = here; } while (fill != 0); /* backwards increment the len-bit code huff */ @@ -301,7 +301,8 @@ unsigned short FAR *work; /* check for enough space */ used += 1U << curr; - if (type == LENS && used >= ENOUGH - MAXD) + if ((type == LENS && used >= ENOUGH_LENS) || + (type == DISTS && used >= ENOUGH_DISTS)) return 1; /* point entry in root table to sub-table */ @@ -319,20 +320,20 @@ unsigned short FAR *work; through high index bits. When the current sub-table is filled, the loop drops back to the root table to fill in any remaining entries there. */ - this.op = (unsigned char)64; /* invalid code marker */ - this.bits = (unsigned char)(len - drop); - this.val = (unsigned short)0; + here.op = (unsigned char)64; /* invalid code marker */ + here.bits = (unsigned char)(len - drop); + here.val = (unsigned short)0; while (huff != 0) { /* when done with sub-table, drop back to root table */ if (drop != 0 && (huff & mask) != low) { drop = 0; len = root; next = *table; - this.bits = (unsigned char)len; + here.bits = (unsigned char)len; } /* put invalid code marker in table */ - next[huff >> drop] = this; + next[huff >> drop] = here; /* backwards increment the len-bit code huff */ incr = 1U << (len - 1); diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inftrees.h b/jdk/src/share/native/java/util/zip/zlib-1.2.5/inftrees.h similarity index 74% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/inftrees.h rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/inftrees.h index 8642e0da181..77326a7f038 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inftrees.h +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/inftrees.h @@ -23,7 +23,7 @@ */ /* inftrees.h -- header to use inftrees.c - * Copyright (C) 1995-2005 Mark Adler + * Copyright (C) 1995-2005, 2010 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -59,21 +59,28 @@ typedef struct { 01000000 - invalid code */ -/* Maximum size of dynamic tree. The maximum found in a long but non- - exhaustive search was 1444 code structures (852 for length/literals - and 592 for distances, the latter actually the result of an - exhaustive search). The true maximum is not known, but the value - below is more than safe. */ -#define ENOUGH 2048 -#define MAXD 592 +/* Maximum size of the dynamic table. The maximum number of code structures is + 1444, which is the sum of 852 for literal/length codes and 592 for distance + codes. These values were found by exhaustive searches using the program + examples/enough.c found in the zlib distribtution. The arguments to that + program are the number of symbols, the initial root table size, and the + maximum bit length of a code. "enough 286 9 15" for literal/length codes + returns returns 852, and "enough 30 6 15" for distance codes returns 592. + The initial root table size (9 or 6) is found in the fifth argument of the + inflate_table() calls in inflate.c and infback.c. If the root table size is + changed, then these maximum sizes would be need to be recalculated and + updated. */ +#define ENOUGH_LENS 852 +#define ENOUGH_DISTS 592 +#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS) -/* Type of code to build for inftable() */ +/* Type of code to build for inflate_table() */ typedef enum { CODES, LENS, DISTS } codetype; -extern int inflate_table OF((codetype type, unsigned short FAR *lens, +int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens, unsigned codes, code FAR * FAR *table, unsigned FAR *bits, unsigned short FAR *work)); diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/ChangeLog_java b/jdk/src/share/native/java/util/zip/zlib-1.2.5/patches/ChangeLog_java similarity index 71% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/ChangeLog_java rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/patches/ChangeLog_java index 068a0aaf881..8d6957f9941 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/ChangeLog_java +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/patches/ChangeLog_java @@ -12,5 +12,8 @@ (4)updated zlib.h (to support > 4G zipfile): total_in/out: uLong -> long long -(5)updated upinflate.c/inflateSync() +(5)updated inflate.c/inflateSync() unsigned long in, out; --> long long in, out; + +(6)updated compress.c/uncompr.c + *destLen = stream.total_out; --> *destLen = (uLong)stream.total_out; diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/trees.c b/jdk/src/share/native/java/util/zip/zlib-1.2.5/trees.c similarity index 94% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/trees.c rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/trees.c index 7d09e2ead51..04da4d709f3 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/trees.c +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/trees.c @@ -23,7 +23,8 @@ */ /* trees.c -- output deflated data using Huffman coding - * Copyright (C) 1995-2005 Jean-loup Gailly + * Copyright (C) 1995-2010 Jean-loup Gailly + * detect_data_type() function provided freely by Cosmin Truta, 2006 * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -176,7 +177,7 @@ local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes, int blcodes)); local void compress_block OF((deflate_state *s, ct_data *ltree, ct_data *dtree)); -local void set_data_type OF((deflate_state *s)); +local int detect_data_type OF((deflate_state *s)); local unsigned bi_reverse OF((unsigned value, int length)); local void bi_windup OF((deflate_state *s)); local void bi_flush OF((deflate_state *s)); @@ -227,12 +228,12 @@ local void send_bits(s, value, length) * unused bits in value. */ if (s->bi_valid > (int)Buf_size - length) { - s->bi_buf |= (value << s->bi_valid); + s->bi_buf |= (ush)value << s->bi_valid; put_short(s, s->bi_buf); s->bi_buf = (ush)value >> (Buf_size - s->bi_valid); s->bi_valid += length - Buf_size; } else { - s->bi_buf |= value << s->bi_valid; + s->bi_buf |= (ush)value << s->bi_valid; s->bi_valid += length; } } @@ -242,12 +243,12 @@ local void send_bits(s, value, length) { int len = length;\ if (s->bi_valid > (int)Buf_size - len) {\ int val = value;\ - s->bi_buf |= (val << s->bi_valid);\ + s->bi_buf |= (ush)val << s->bi_valid;\ put_short(s, s->bi_buf);\ s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\ s->bi_valid += len - Buf_size;\ } else {\ - s->bi_buf |= (value) << s->bi_valid;\ + s->bi_buf |= (ush)(value) << s->bi_valid;\ s->bi_valid += len;\ }\ } @@ -274,11 +275,13 @@ local void tr_static_init() if (static_init_done) return; /* For some embedded targets, global variables are not initialized: */ +#ifdef NO_INIT_GLOBAL_POINTERS static_l_desc.static_tree = static_ltree; static_l_desc.extra_bits = extra_lbits; static_d_desc.static_tree = static_dtree; static_d_desc.extra_bits = extra_dbits; static_bl_desc.extra_bits = extra_blbits; +#endif /* Initialize the mapping length (0..255) -> length code (0..28) */ length = 0; @@ -372,13 +375,14 @@ void gen_trees_header() static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5)); } - fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n"); + fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n"); for (i = 0; i < DIST_CODE_LEN; i++) { fprintf(header, "%2u%s", _dist_code[i], SEPARATOR(i, DIST_CODE_LEN-1, 20)); } - fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n"); + fprintf(header, + "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n"); for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) { fprintf(header, "%2u%s", _length_code[i], SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20)); @@ -403,7 +407,7 @@ void gen_trees_header() /* =========================================================================== * Initialize the tree data structures for a new zlib stream. */ -void _tr_init(s) +void ZLIB_INTERNAL _tr_init(s) deflate_state *s; { tr_static_init(); @@ -888,13 +892,13 @@ local void send_all_trees(s, lcodes, dcodes, blcodes) /* =========================================================================== * Send a stored block */ -void _tr_stored_block(s, buf, stored_len, eof) +void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last) deflate_state *s; charf *buf; /* input block */ ulg stored_len; /* length of input block */ - int eof; /* true if this is the last block for a file */ + int last; /* one if this is the last block for a file */ { - send_bits(s, (STORED_BLOCK<<1)+eof, 3); /* send block type */ + send_bits(s, (STORED_BLOCK<<1)+last, 3); /* send block type */ #ifdef DEBUG s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L; s->compressed_len += (stored_len + 4) << 3; @@ -913,7 +917,7 @@ void _tr_stored_block(s, buf, stored_len, eof) * To simplify the code, we assume the worst case of last real code encoded * on one bit only. */ -void _tr_align(s) +void ZLIB_INTERNAL _tr_align(s) deflate_state *s; { send_bits(s, STATIC_TREES<<1, 3); @@ -942,11 +946,11 @@ void _tr_align(s) * Determine the best encoding for the current block: dynamic trees, static * trees or store, and output the encoded block to the zip file. */ -void _tr_flush_block(s, buf, stored_len, eof) +void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) deflate_state *s; charf *buf; /* input block, or NULL if too old */ ulg stored_len; /* length of input block */ - int eof; /* true if this is the last block for a file */ + int last; /* one if this is the last block for a file */ { ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ int max_blindex = 0; /* index of last bit length code of non zero freq */ @@ -955,8 +959,8 @@ void _tr_flush_block(s, buf, stored_len, eof) if (s->level > 0) { /* Check if the file is binary or text */ - if (stored_len > 0 && s->strm->data_type == Z_UNKNOWN) - set_data_type(s); + if (s->strm->data_type == Z_UNKNOWN) + s->strm->data_type = detect_data_type(s); /* Construct the literal and distance trees */ build_tree(s, (tree_desc *)(&(s->l_desc))); @@ -1002,20 +1006,20 @@ void _tr_flush_block(s, buf, stored_len, eof) * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to * transform a block into a stored block. */ - _tr_stored_block(s, buf, stored_len, eof); + _tr_stored_block(s, buf, stored_len, last); #ifdef FORCE_STATIC } else if (static_lenb >= 0) { /* force static trees */ #else } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) { #endif - send_bits(s, (STATIC_TREES<<1)+eof, 3); + send_bits(s, (STATIC_TREES<<1)+last, 3); compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree); #ifdef DEBUG s->compressed_len += 3 + s->static_len; #endif } else { - send_bits(s, (DYN_TREES<<1)+eof, 3); + send_bits(s, (DYN_TREES<<1)+last, 3); send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1, max_blindex+1); compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree); @@ -1029,21 +1033,21 @@ void _tr_flush_block(s, buf, stored_len, eof) */ init_block(s); - if (eof) { + if (last) { bi_windup(s); #ifdef DEBUG s->compressed_len += 7; /* align on byte boundary */ #endif } Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3, - s->compressed_len-7*eof)); + s->compressed_len-7*last)); } /* =========================================================================== * Save the match info and tally the frequency counts. Return true if * the current block must be flushed. */ -int _tr_tally (s, dist, lc) +int ZLIB_INTERNAL _tr_tally (s, dist, lc) deflate_state *s; unsigned dist; /* distance of matched string */ unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ @@ -1142,24 +1146,45 @@ local void compress_block(s, ltree, dtree) } /* =========================================================================== - * Set the data type to BINARY or TEXT, using a crude approximation: - * set it to Z_TEXT if all symbols are either printable characters (33 to 255) - * or white spaces (9 to 13, or 32); or set it to Z_BINARY otherwise. + * Check if the data type is TEXT or BINARY, using the following algorithm: + * - TEXT if the two conditions below are satisfied: + * a) There are no non-portable control characters belonging to the + * "black list" (0..6, 14..25, 28..31). + * b) There is at least one printable character belonging to the + * "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255). + * - BINARY otherwise. + * - The following partially-portable control characters form a + * "gray list" that is ignored in this detection algorithm: + * (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}). * IN assertion: the fields Freq of dyn_ltree are set. */ -local void set_data_type(s) +local int detect_data_type(s) deflate_state *s; { + /* black_mask is the bit mask of black-listed bytes + * set bits 0..6, 14..25, and 28..31 + * 0xf3ffc07f = binary 11110011111111111100000001111111 + */ + unsigned long black_mask = 0xf3ffc07fUL; int n; - for (n = 0; n < 9; n++) + /* Check for non-textual ("black-listed") bytes. */ + for (n = 0; n <= 31; n++, black_mask >>= 1) + if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0)) + return Z_BINARY; + + /* Check for textual ("white-listed") bytes. */ + if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0 + || s->dyn_ltree[13].Freq != 0) + return Z_TEXT; + for (n = 32; n < LITERALS; n++) if (s->dyn_ltree[n].Freq != 0) - break; - if (n == 9) - for (n = 14; n < 32; n++) - if (s->dyn_ltree[n].Freq != 0) - break; - s->strm->data_type = (n == 32) ? Z_TEXT : Z_BINARY; + return Z_TEXT; + + /* There are no "black-listed" or "white-listed" bytes: + * this stream either is empty or has tolerated ("gray-listed") bytes only. + */ + return Z_BINARY; } /* =========================================================================== diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/trees.h b/jdk/src/share/native/java/util/zip/zlib-1.2.5/trees.h similarity index 98% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/trees.h rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/trees.h index 35de4b0e31e..5cbff5cb0a3 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/trees.h +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/trees.h @@ -94,7 +94,7 @@ local const ct_data static_dtree[D_CODES] = { {{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}} }; -const uch _dist_code[DIST_CODE_LEN] = { +const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = { 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, @@ -123,7 +123,7 @@ const uch _dist_code[DIST_CODE_LEN] = { 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29 }; -const uch _length_code[MAX_MATCH-MIN_MATCH+1]= { +const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= { 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/uncompr.c b/jdk/src/share/native/java/util/zip/zlib-1.2.5/uncompr.c similarity index 95% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/uncompr.c rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/uncompr.c index d2e4ef4c97e..e71d018f8d0 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/uncompr.c +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/uncompr.c @@ -23,7 +23,7 @@ */ /* uncompr.c -- decompress a memory buffer - * Copyright (C) 1995-2003 Jean-loup Gailly. + * Copyright (C) 1995-2003, 2010 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -40,8 +40,6 @@ been saved previously by the compressor and transmitted to the decompressor by some mechanism outside the scope of this compression library.) Upon exit, destLen is the actual size of the compressed buffer. - This function can be used to decompress a whole file at once if the - input file is mmap'ed. uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR if there was not enough room in the output diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zadler32.c b/jdk/src/share/native/java/util/zip/zlib-1.2.5/zadler32.c similarity index 88% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/zadler32.c rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/zadler32.c index 6bb56f3519c..c4465e1d6ed 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zadler32.c +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/zadler32.c @@ -23,14 +23,17 @@ */ /* adler32.c -- compute the Adler-32 checksum of a data stream - * Copyright (C) 1995-2004 Mark Adler + * Copyright (C) 1995-2007 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ /* @(#) $Id$ */ -#define ZLIB_INTERNAL -#include "zlib.h" +#include "zutil.h" + +#define local static + +local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2); #define BASE 65521UL /* largest prime smaller than 65536 */ #define NMAX 5552 @@ -149,10 +152,10 @@ uLong ZEXPORT adler32(adler, buf, len) } /* ========================================================================= */ -uLong ZEXPORT adler32_combine(adler1, adler2, len2) +local uLong adler32_combine_(adler1, adler2, len2) uLong adler1; uLong adler2; - z_off_t len2; + z_off64_t len2; { unsigned long sum1; unsigned long sum2; @@ -165,9 +168,26 @@ uLong ZEXPORT adler32_combine(adler1, adler2, len2) MOD(sum2); sum1 += (adler2 & 0xffff) + BASE - 1; sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; - if (sum1 > BASE) sum1 -= BASE; - if (sum1 > BASE) sum1 -= BASE; - if (sum2 > (BASE << 1)) sum2 -= (BASE << 1); - if (sum2 > BASE) sum2 -= BASE; + if (sum1 >= BASE) sum1 -= BASE; + if (sum1 >= BASE) sum1 -= BASE; + if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1); + if (sum2 >= BASE) sum2 -= BASE; return sum1 | (sum2 << 16); } + +/* ========================================================================= */ +uLong ZEXPORT adler32_combine(adler1, adler2, len2) + uLong adler1; + uLong adler2; + z_off_t len2; +{ + return adler32_combine_(adler1, adler2, len2); +} + +uLong ZEXPORT adler32_combine64(adler1, adler2, len2) + uLong adler1; + uLong adler2; + z_off64_t len2; +{ + return adler32_combine_(adler1, adler2, len2); +} diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zconf.h b/jdk/src/share/native/java/util/zip/zlib-1.2.5/zconf.h similarity index 68% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/zconf.h rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/zconf.h index e7c3f51917a..78f162cfd6a 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zconf.h +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/zconf.h @@ -23,7 +23,7 @@ */ /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2005 Jean-loup Gailly. + * Copyright (C) 1995-2010 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -38,52 +38,124 @@ /* * If you *really* need a unique prefix for all types and library functions, * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. + * Even better than compiling with -DZ_PREFIX would be to use configure to set + * this permanently in zconf.h using "./configure --zprefix". */ -#ifdef Z_PREFIX -# define deflateInit_ z_deflateInit_ -# define deflate z_deflate -# define deflateEnd z_deflateEnd -# define inflateInit_ z_inflateInit_ -# define inflate z_inflate -# define inflateEnd z_inflateEnd -# define deflateInit2_ z_deflateInit2_ -# define deflateSetDictionary z_deflateSetDictionary -# define deflateCopy z_deflateCopy -# define deflateReset z_deflateReset -# define deflateParams z_deflateParams -# define deflateBound z_deflateBound -# define deflatePrime z_deflatePrime -# define inflateInit2_ z_inflateInit2_ -# define inflateSetDictionary z_inflateSetDictionary -# define inflateSync z_inflateSync -# define inflateSyncPoint z_inflateSyncPoint -# define inflateCopy z_inflateCopy -# define inflateReset z_inflateReset -# define inflateBack z_inflateBack -# define inflateBackEnd z_inflateBackEnd +#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ + +/* all linked symbols */ +# define _dist_code z__dist_code +# define _length_code z__length_code +# define _tr_align z__tr_align +# define _tr_flush_block z__tr_flush_block +# define _tr_init z__tr_init +# define _tr_stored_block z__tr_stored_block +# define _tr_tally z__tr_tally +# define adler32 z_adler32 +# define adler32_combine z_adler32_combine +# define adler32_combine64 z_adler32_combine64 # define compress z_compress # define compress2 z_compress2 # define compressBound z_compressBound -# define uncompress z_uncompress -# define adler32 z_adler32 # define crc32 z_crc32 +# define crc32_combine z_crc32_combine +# define crc32_combine64 z_crc32_combine64 +# define deflate z_deflate +# define deflateBound z_deflateBound +# define deflateCopy z_deflateCopy +# define deflateEnd z_deflateEnd +# define deflateInit2_ z_deflateInit2_ +# define deflateInit_ z_deflateInit_ +# define deflateParams z_deflateParams +# define deflatePrime z_deflatePrime +# define deflateReset z_deflateReset +# define deflateSetDictionary z_deflateSetDictionary +# define deflateSetHeader z_deflateSetHeader +# define deflateTune z_deflateTune +# define deflate_copyright z_deflate_copyright # define get_crc_table z_get_crc_table +# define gz_error z_gz_error +# define gz_intmax z_gz_intmax +# define gz_strwinerror z_gz_strwinerror +# define gzbuffer z_gzbuffer +# define gzclearerr z_gzclearerr +# define gzclose z_gzclose +# define gzclose_r z_gzclose_r +# define gzclose_w z_gzclose_w +# define gzdirect z_gzdirect +# define gzdopen z_gzdopen +# define gzeof z_gzeof +# define gzerror z_gzerror +# define gzflush z_gzflush +# define gzgetc z_gzgetc +# define gzgets z_gzgets +# define gzoffset z_gzoffset +# define gzoffset64 z_gzoffset64 +# define gzopen z_gzopen +# define gzopen64 z_gzopen64 +# define gzprintf z_gzprintf +# define gzputc z_gzputc +# define gzputs z_gzputs +# define gzread z_gzread +# define gzrewind z_gzrewind +# define gzseek z_gzseek +# define gzseek64 z_gzseek64 +# define gzsetparams z_gzsetparams +# define gztell z_gztell +# define gztell64 z_gztell64 +# define gzungetc z_gzungetc +# define gzwrite z_gzwrite +# define inflate z_inflate +# define inflateBack z_inflateBack +# define inflateBackEnd z_inflateBackEnd +# define inflateBackInit_ z_inflateBackInit_ +# define inflateCopy z_inflateCopy +# define inflateEnd z_inflateEnd +# define inflateGetHeader z_inflateGetHeader +# define inflateInit2_ z_inflateInit2_ +# define inflateInit_ z_inflateInit_ +# define inflateMark z_inflateMark +# define inflatePrime z_inflatePrime +# define inflateReset z_inflateReset +# define inflateReset2 z_inflateReset2 +# define inflateSetDictionary z_inflateSetDictionary +# define inflateSync z_inflateSync +# define inflateSyncPoint z_inflateSyncPoint +# define inflateUndermine z_inflateUndermine +# define inflate_copyright z_inflate_copyright +# define inflate_fast z_inflate_fast +# define inflate_table z_inflate_table +# define uncompress z_uncompress # define zError z_zError +# define zcalloc z_zcalloc +# define zcfree z_zcfree +# define zlibCompileFlags z_zlibCompileFlags +# define zlibVersion z_zlibVersion -# define alloc_func z_alloc_func -# define free_func z_free_func -# define in_func z_in_func -# define out_func z_out_func +/* all zlib typedefs in zlib.h and zconf.h */ # define Byte z_Byte -# define uInt z_uInt -# define uLong z_uLong # define Bytef z_Bytef +# define alloc_func z_alloc_func # define charf z_charf +# define free_func z_free_func +# define gzFile z_gzFile +# define gz_header z_gz_header +# define gz_headerp z_gz_headerp +# define in_func z_in_func # define intf z_intf +# define out_func z_out_func +# define uInt z_uInt # define uIntf z_uIntf +# define uLong z_uLong # define uLongf z_uLongf -# define voidpf z_voidpf # define voidp z_voidp +# define voidpc z_voidpc +# define voidpf z_voidpf + +/* all zlib structs in zlib.h and zconf.h */ +# define gz_header_s z_gz_header_s +# define internal_state z_internal_state + #endif #if defined(__MSDOS__) && !defined(MSDOS) @@ -315,49 +387,73 @@ typedef uLong FAR uLongf; typedef Byte *voidp; #endif -#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ -# include /* for off_t */ -# include /* for SEEK_* and off_t */ -# ifdef VMS -# include /* for off_t */ -# endif -# define z_off_t off_t +#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ +# define Z_HAVE_UNISTD_H #endif + +#ifdef STDC +# include /* for off_t */ +#endif + +/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and + * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even + * though the former does not conform to the LFS document), but considering + * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as + * equivalently requesting no 64-bit operations + */ +#if -_LARGEFILE64_SOURCE - -1 == 1 +# undef _LARGEFILE64_SOURCE +#endif + +#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) +# include /* for SEEK_* and off_t */ +# ifdef VMS +# include /* for off_t */ +# endif +# ifndef z_off_t +# define z_off_t off_t +# endif +#endif + #ifndef SEEK_SET # define SEEK_SET 0 /* Seek from beginning of file. */ # define SEEK_CUR 1 /* Seek from current position. */ # define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ #endif + #ifndef z_off_t # define z_off_t long #endif +#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 +# define z_off64_t off64_t +#else +# define z_off64_t z_off_t +#endif + #if defined(__OS400__) # define NO_vsnprintf #endif #if defined(__MVS__) # define NO_vsnprintf -# ifdef FAR -# undef FAR -# endif #endif /* MVS linker does not support external names larger than 8 bytes */ #if defined(__MVS__) -# pragma map(deflateInit_,"DEIN") -# pragma map(deflateInit2_,"DEIN2") -# pragma map(deflateEnd,"DEEND") -# pragma map(deflateBound,"DEBND") -# pragma map(inflateInit_,"ININ") -# pragma map(inflateInit2_,"ININ2") -# pragma map(inflateEnd,"INEND") -# pragma map(inflateSync,"INSY") -# pragma map(inflateSetDictionary,"INSEDI") -# pragma map(compressBound,"CMBND") -# pragma map(inflate_table,"INTABL") -# pragma map(inflate_fast,"INFA") -# pragma map(inflate_copyright,"INCOPY") + #pragma map(deflateInit_,"DEIN") + #pragma map(deflateInit2_,"DEIN2") + #pragma map(deflateEnd,"DEEND") + #pragma map(deflateBound,"DEBND") + #pragma map(inflateInit_,"ININ") + #pragma map(inflateInit2_,"ININ2") + #pragma map(inflateEnd,"INEND") + #pragma map(inflateSync,"INSY") + #pragma map(inflateSetDictionary,"INSEDI") + #pragma map(compressBound,"CMBND") + #pragma map(inflate_table,"INTABL") + #pragma map(inflate_fast,"INFA") + #pragma map(inflate_copyright,"INCOPY") #endif #endif /* ZCONF_H */ diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zcrc32.c b/jdk/src/share/native/java/util/zip/zlib-1.2.5/zcrc32.c similarity index 95% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/zcrc32.c rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/zcrc32.c index 0fd9a92c05e..0eb5b64f110 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zcrc32.c +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/zcrc32.c @@ -23,7 +23,7 @@ */ /* crc32.c -- compute the CRC-32 of a data stream - * Copyright (C) 1995-2005 Mark Adler + * Copyright (C) 1995-2006, 2010 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h * * Thanks to Rodney Brown for his contribution of faster @@ -77,7 +77,7 @@ /* Definitions for doing the crc four data bytes at a time. */ #ifdef BYFOUR -# define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \ +# define REV(w) ((((w)>>24)&0xff)+(((w)>>8)&0xff00)+ \ (((w)&0xff00)<<8)+(((w)&0xff)<<24)) local unsigned long crc32_little OF((unsigned long, const unsigned char FAR *, unsigned)); @@ -92,6 +92,8 @@ local unsigned long gf2_matrix_times OF((unsigned long *mat, unsigned long vec)); local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat)); +local uLong crc32_combine_(uLong crc1, uLong crc2, z_off64_t len2); + #ifdef DYNAMIC_CRC_TABLE @@ -243,7 +245,7 @@ const unsigned long FAR * ZEXPORT get_crc_table() uLong ZEXPORT crc32(crc, buf, len) uLong crc; const unsigned char FAR *buf; - unsigned len; + uInt len; { if (buf == Z_NULL) return 0UL; @@ -391,22 +393,22 @@ local void gf2_matrix_square(square, mat) } /* ========================================================================= */ -uLong ZEXPORT crc32_combine(crc1, crc2, len2) +local uLong crc32_combine_(crc1, crc2, len2) uLong crc1; uLong crc2; - z_off_t len2; + z_off64_t len2; { int n; unsigned long row; unsigned long even[GF2_DIM]; /* even-power-of-two zeros operator */ unsigned long odd[GF2_DIM]; /* odd-power-of-two zeros operator */ - /* degenerate case */ - if (len2 == 0) + /* degenerate case (also disallow negative lengths) */ + if (len2 <= 0) return crc1; /* put operator for one zero bit in odd */ - odd[0] = 0xedb88320UL; /* CRC-32 polynomial */ + odd[0] = 0xedb88320UL; /* CRC-32 polynomial */ row = 1; for (n = 1; n < GF2_DIM; n++) { odd[n] = row; @@ -445,3 +447,20 @@ uLong ZEXPORT crc32_combine(crc1, crc2, len2) crc1 ^= crc2; return crc1; } + +/* ========================================================================= */ +uLong ZEXPORT crc32_combine(crc1, crc2, len2) + uLong crc1; + uLong crc2; + z_off_t len2; +{ + return crc32_combine_(crc1, crc2, len2); +} + +uLong ZEXPORT crc32_combine64(crc1, crc2, len2) + uLong crc1; + uLong crc2; + z_off64_t len2; +{ + return crc32_combine_(crc1, crc2, len2); +} diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zlib.h b/jdk/src/share/native/java/util/zip/zlib-1.2.5/zlib.h similarity index 51% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/zlib.h rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/zlib.h index 518b31a24ec..b847c100bdf 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zlib.h +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/zlib.h @@ -23,9 +23,9 @@ */ /* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.2.3, July 18th, 2005 + version 1.2.5, April 19th, 2010 - Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler + Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -61,41 +61,44 @@ extern "C" { #endif -#define ZLIB_VERSION "1.2.3" -#define ZLIB_VERNUM 0x1230 +#define ZLIB_VERSION "1.2.5" +#define ZLIB_VERNUM 0x1250 +#define ZLIB_VER_MAJOR 1 +#define ZLIB_VER_MINOR 2 +#define ZLIB_VER_REVISION 5 +#define ZLIB_VER_SUBREVISION 0 /* - The 'zlib' compression library provides in-memory compression and - decompression functions, including integrity checks of the uncompressed - data. This version of the library supports only one compression method - (deflation) but other algorithms will be added later and will have the same - stream interface. + The 'zlib' compression library provides in-memory compression and + decompression functions, including integrity checks of the uncompressed data. + This version of the library supports only one compression method (deflation) + but other algorithms will be added later and will have the same stream + interface. - Compression can be done in a single step if the buffers are large - enough (for example if an input file is mmap'ed), or can be done by - repeated calls of the compression function. In the latter case, the - application must provide more input and/or consume the output + Compression can be done in a single step if the buffers are large enough, + or can be done by repeated calls of the compression function. In the latter + case, the application must provide more input and/or consume the output (providing more output space) before each call. - The compressed data format used by default by the in-memory functions is + The compressed data format used by default by the in-memory functions is the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped around a deflate stream, which is itself documented in RFC 1951. - The library also supports reading and writing files in gzip (.gz) format + The library also supports reading and writing files in gzip (.gz) format with an interface similar to that of stdio using the functions that start with "gz". The gzip format is different from the zlib format. gzip is a gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. - This library can optionally read and write gzip streams in memory as well. + This library can optionally read and write gzip streams in memory as well. - The zlib format was designed to be compact and fast for use in memory + The zlib format was designed to be compact and fast for use in memory and on communications channels. The gzip format was designed for single- file compression on file systems, has a larger header than zlib to maintain directory information, and uses a different, slower check method than zlib. - The library does not install any signal handler. The decoder checks - the consistency of the compressed data, so the library should never - crash even in case of corrupted input. + The library does not install any signal handler. The decoder checks + the consistency of the compressed data, so the library should never crash + even in case of corrupted input. */ typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); @@ -150,45 +153,45 @@ typedef struct gz_header_s { typedef gz_header FAR *gz_headerp; /* - The application must update next_in and avail_in when avail_in has - dropped to zero. It must update next_out and avail_out when avail_out - has dropped to zero. The application must initialize zalloc, zfree and - opaque before calling the init function. All other fields are set by the - compression library and must not be updated by the application. + The application must update next_in and avail_in when avail_in has dropped + to zero. It must update next_out and avail_out when avail_out has dropped + to zero. The application must initialize zalloc, zfree and opaque before + calling the init function. All other fields are set by the compression + library and must not be updated by the application. - The opaque value provided by the application will be passed as the first - parameter for calls of zalloc and zfree. This can be useful for custom - memory management. The compression library attaches no meaning to the + The opaque value provided by the application will be passed as the first + parameter for calls of zalloc and zfree. This can be useful for custom + memory management. The compression library attaches no meaning to the opaque value. - zalloc must return Z_NULL if there is not enough memory for the object. + zalloc must return Z_NULL if there is not enough memory for the object. If zlib is used in a multi-threaded application, zalloc and zfree must be thread safe. - On 16-bit systems, the functions zalloc and zfree must be able to allocate - exactly 65536 bytes, but will not be required to allocate more than this - if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, - pointers returned by zalloc for objects of exactly 65536 bytes *must* - have their offset normalized to zero. The default allocation function - provided by this library ensures this (see zutil.c). To reduce memory - requirements and avoid any allocation of 64K objects, at the expense of - compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h). + On 16-bit systems, the functions zalloc and zfree must be able to allocate + exactly 65536 bytes, but will not be required to allocate more than this if + the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, pointers + returned by zalloc for objects of exactly 65536 bytes *must* have their + offset normalized to zero. The default allocation function provided by this + library ensures this (see zutil.c). To reduce memory requirements and avoid + any allocation of 64K objects, at the expense of compression ratio, compile + the library with -DMAX_WBITS=14 (see zconf.h). - The fields total_in and total_out can be used for statistics or - progress reports. After compression, total_in holds the total size of - the uncompressed data and may be saved for use in the decompressor - (particularly if the decompressor wants to decompress everything in - a single step). + The fields total_in and total_out can be used for statistics or progress + reports. After compression, total_in holds the total size of the + uncompressed data and may be saved for use in the decompressor (particularly + if the decompressor wants to decompress everything in a single step). */ /* constants */ #define Z_NO_FLUSH 0 -#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */ +#define Z_PARTIAL_FLUSH 1 #define Z_SYNC_FLUSH 2 #define Z_FULL_FLUSH 3 #define Z_FINISH 4 #define Z_BLOCK 5 +#define Z_TREES 6 /* Allowed flush values; see deflate() and inflate() below for details */ #define Z_OK 0 @@ -200,8 +203,8 @@ typedef gz_header FAR *gz_headerp; #define Z_MEM_ERROR (-4) #define Z_BUF_ERROR (-5) #define Z_VERSION_ERROR (-6) -/* Return codes for the compression/decompression functions. Negative - * values are errors, positive values are used for special but normal events. +/* Return codes for the compression/decompression functions. Negative values + * are errors, positive values are used for special but normal events. */ #define Z_NO_COMPRESSION 0 @@ -231,119 +234,140 @@ typedef gz_header FAR *gz_headerp; #define zlib_version zlibVersion() /* for compatibility with versions < 1.0.2 */ + /* basic functions */ ZEXTERN const char * ZEXPORT zlibVersion OF((void)); /* The application can compare zlibVersion and ZLIB_VERSION for consistency. - If the first character differs, the library code actually used is - not compatible with the zlib.h header file used by the application. - This check is automatically made by deflateInit and inflateInit. + If the first character differs, the library code actually used is not + compatible with the zlib.h header file used by the application. This check + is automatically made by deflateInit and inflateInit. */ /* ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); - Initializes the internal stream state for compression. The fields - zalloc, zfree and opaque must be initialized before by the caller. - If zalloc and zfree are set to Z_NULL, deflateInit updates them to - use default allocation functions. + Initializes the internal stream state for compression. The fields + zalloc, zfree and opaque must be initialized before by the caller. If + zalloc and zfree are set to Z_NULL, deflateInit updates them to use default + allocation functions. The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: - 1 gives best speed, 9 gives best compression, 0 gives no compression at - all (the input data is simply copied a block at a time). - Z_DEFAULT_COMPRESSION requests a default compromise between speed and - compression (currently equivalent to level 6). + 1 gives best speed, 9 gives best compression, 0 gives no compression at all + (the input data is simply copied a block at a time). Z_DEFAULT_COMPRESSION + requests a default compromise between speed and compression (currently + equivalent to level 6). - deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_STREAM_ERROR if level is not a valid compression level, + deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_STREAM_ERROR if level is not a valid compression level, or Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible - with the version assumed by the caller (ZLIB_VERSION). - msg is set to null if there is no error message. deflateInit does not - perform any compression: this will be done by deflate(). + with the version assumed by the caller (ZLIB_VERSION). msg is set to null + if there is no error message. deflateInit does not perform any compression: + this will be done by deflate(). */ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); /* deflate compresses as much data as possible, and stops when the input - buffer becomes empty or the output buffer becomes full. It may introduce some - output latency (reading input without producing any output) except when + buffer becomes empty or the output buffer becomes full. It may introduce + some output latency (reading input without producing any output) except when forced to flush. - The detailed semantics are as follows. deflate performs one or both of the + The detailed semantics are as follows. deflate performs one or both of the following actions: - Compress more input starting at next_in and update next_in and avail_in - accordingly. If not all input can be processed (because there is not + accordingly. If not all input can be processed (because there is not enough room in the output buffer), next_in and avail_in are updated and processing will resume at this point for the next call of deflate(). - Provide more output starting at next_out and update next_out and avail_out - accordingly. This action is forced if the parameter flush is non zero. + accordingly. This action is forced if the parameter flush is non zero. Forcing flush frequently degrades the compression ratio, so this parameter - should be set only when necessary (in interactive applications). - Some output may be provided even if flush is not set. + should be set only when necessary (in interactive applications). Some + output may be provided even if flush is not set. - Before the call of deflate(), the application should ensure that at least - one of the actions is possible, by providing more input and/or consuming - more output, and updating avail_in or avail_out accordingly; avail_out - should never be zero before the call. The application can consume the - compressed output when it wants, for example when the output buffer is full - (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK - and with zero avail_out, it must be called again after making room in the - output buffer because there might be more output pending. + Before the call of deflate(), the application should ensure that at least + one of the actions is possible, by providing more input and/or consuming more + output, and updating avail_in or avail_out accordingly; avail_out should + never be zero before the call. The application can consume the compressed + output when it wants, for example when the output buffer is full (avail_out + == 0), or after each call of deflate(). If deflate returns Z_OK and with + zero avail_out, it must be called again after making room in the output + buffer because there might be more output pending. Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to - decide how much data to accumualte before producing output, in order to + decide how much data to accumulate before producing output, in order to maximize compression. If the parameter flush is set to Z_SYNC_FLUSH, all pending output is flushed to the output buffer and the output is aligned on a byte boundary, so - that the decompressor can get all input data available so far. (In particular - avail_in is zero after the call if enough output space has been provided - before the call.) Flushing may degrade compression for some compression - algorithms and so it should be used only when necessary. + that the decompressor can get all input data available so far. (In + particular avail_in is zero after the call if enough output space has been + provided before the call.) Flushing may degrade compression for some + compression algorithms and so it should be used only when necessary. This + completes the current deflate block and follows it with an empty stored block + that is three bits plus filler bits to the next byte, followed by four bytes + (00 00 ff ff). + + If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the + output buffer, but the output is not aligned to a byte boundary. All of the + input data so far will be available to the decompressor, as for Z_SYNC_FLUSH. + This completes the current deflate block and follows it with an empty fixed + codes block that is 10 bits long. This assures that enough bytes are output + in order for the decompressor to finish the block before the empty fixed code + block. + + If flush is set to Z_BLOCK, a deflate block is completed and emitted, as + for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to + seven bits of the current block are held to be written as the next byte after + the next deflate block is completed. In this case, the decompressor may not + be provided enough bits at this point in order to complete decompression of + the data provided so far to the compressor. It may need to wait for the next + block to be emitted. This is for advanced applications that need to control + the emission of deflate blocks. If flush is set to Z_FULL_FLUSH, all output is flushed as with Z_SYNC_FLUSH, and the compression state is reset so that decompression can restart from this point if previous compressed data has been damaged or if - random access is desired. Using Z_FULL_FLUSH too often can seriously degrade + random access is desired. Using Z_FULL_FLUSH too often can seriously degrade compression. If deflate returns with avail_out == 0, this function must be called again with the same value of the flush parameter and more output space (updated avail_out), until the flush is complete (deflate returns with non-zero - avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that + avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that avail_out is greater than six to avoid repeated flush markers due to avail_out == 0 on return. If the parameter flush is set to Z_FINISH, pending input is processed, - pending output is flushed and deflate returns with Z_STREAM_END if there - was enough output space; if deflate returns with Z_OK, this function must be + pending output is flushed and deflate returns with Z_STREAM_END if there was + enough output space; if deflate returns with Z_OK, this function must be called again with Z_FINISH and more output space (updated avail_out) but no - more input data, until it returns with Z_STREAM_END or an error. After - deflate has returned Z_STREAM_END, the only possible operations on the - stream are deflateReset or deflateEnd. + more input data, until it returns with Z_STREAM_END or an error. After + deflate has returned Z_STREAM_END, the only possible operations on the stream + are deflateReset or deflateEnd. Z_FINISH can be used immediately after deflateInit if all the compression - is to be done in a single step. In this case, avail_out must be at least - the value returned by deflateBound (see below). If deflate does not return + is to be done in a single step. In this case, avail_out must be at least the + value returned by deflateBound (see below). If deflate does not return Z_STREAM_END, then it must be called again as described above. deflate() sets strm->adler to the adler32 checksum of all input read so far (that is, total_in bytes). deflate() may update strm->data_type if it can make a good guess about - the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered - binary. This field is only for information purposes and does not affect - the compression algorithm in any manner. + the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered + binary. This field is only for information purposes and does not affect the + compression algorithm in any manner. deflate() returns Z_OK if some progress has been made (more input processed or more output produced), Z_STREAM_END if all input has been consumed and all output has been produced (only when flush is set to Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example - if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible - (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not + if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible + (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not fatal, and deflate() can be called again with more input and more output space to continue compressing. */ @@ -352,13 +376,13 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); /* All dynamically allocated data structures for this stream are freed. - This function discards any unprocessed input and does not flush any - pending output. + This function discards any unprocessed input and does not flush any pending + output. deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state was inconsistent, Z_DATA_ERROR if the stream was freed - prematurely (some input or output was discarded). In the error case, - msg may be set but then points to a static string (which must not be + prematurely (some input or output was discarded). In the error case, msg + may be set but then points to a static string (which must not be deallocated). */ @@ -366,10 +390,10 @@ ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); /* ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); - Initializes the internal stream state for decompression. The fields + Initializes the internal stream state for decompression. The fields next_in, avail_in, zalloc, zfree and opaque must be initialized before by - the caller. If next_in is not Z_NULL and avail_in is large enough (the exact - value depends on the compression method), inflateInit determines the + the caller. If next_in is not Z_NULL and avail_in is large enough (the + exact value depends on the compression method), inflateInit determines the compression method from the zlib header and allocates all data structures accordingly; otherwise the allocation will be deferred to the first call of inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to @@ -377,95 +401,108 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_VERSION_ERROR if the zlib library version is incompatible with the - version assumed by the caller. msg is set to null if there is no error - message. inflateInit does not perform any decompression apart from reading - the zlib header if present: this will be done by inflate(). (So next_in and - avail_in may be modified, but next_out and avail_out are unchanged.) + version assumed by the caller, or Z_STREAM_ERROR if the parameters are + invalid, such as a null pointer to the structure. msg is set to null if + there is no error message. inflateInit does not perform any decompression + apart from possibly reading the zlib header if present: actual decompression + will be done by inflate(). (So next_in and avail_in may be modified, but + next_out and avail_out are unused and unchanged.) The current implementation + of inflateInit() does not process any header information -- that is deferred + until inflate() is called. */ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); /* inflate decompresses as much data as possible, and stops when the input - buffer becomes empty or the output buffer becomes full. It may introduce + buffer becomes empty or the output buffer becomes full. It may introduce some output latency (reading input without producing any output) except when forced to flush. - The detailed semantics are as follows. inflate performs one or both of the + The detailed semantics are as follows. inflate performs one or both of the following actions: - Decompress more input starting at next_in and update next_in and avail_in - accordingly. If not all input can be processed (because there is not - enough room in the output buffer), next_in is updated and processing - will resume at this point for the next call of inflate(). + accordingly. If not all input can be processed (because there is not + enough room in the output buffer), next_in is updated and processing will + resume at this point for the next call of inflate(). - Provide more output starting at next_out and update next_out and avail_out - accordingly. inflate() provides as much output as possible, until there - is no more input data or no more space in the output buffer (see below - about the flush parameter). + accordingly. inflate() provides as much output as possible, until there is + no more input data or no more space in the output buffer (see below about + the flush parameter). - Before the call of inflate(), the application should ensure that at least - one of the actions is possible, by providing more input and/or consuming - more output, and updating the next_* and avail_* values accordingly. - The application can consume the uncompressed output when it wants, for - example when the output buffer is full (avail_out == 0), or after each - call of inflate(). If inflate returns Z_OK and with zero avail_out, it - must be called again after making room in the output buffer because there - might be more output pending. + Before the call of inflate(), the application should ensure that at least + one of the actions is possible, by providing more input and/or consuming more + output, and updating the next_* and avail_* values accordingly. The + application can consume the uncompressed output when it wants, for example + when the output buffer is full (avail_out == 0), or after each call of + inflate(). If inflate returns Z_OK and with zero avail_out, it must be + called again after making room in the output buffer because there might be + more output pending. - The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, - Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much - output as possible to the output buffer. Z_BLOCK requests that inflate() stop - if and when it gets to the next deflate block boundary. When decoding the - zlib or gzip format, this will cause inflate() to return immediately after - the header and before the first block. When doing a raw inflate, inflate() - will go ahead and process the first block, and will return when it gets to - the end of that block, or when it runs out of data. + The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH, + Z_BLOCK, or Z_TREES. Z_SYNC_FLUSH requests that inflate() flush as much + output as possible to the output buffer. Z_BLOCK requests that inflate() + stop if and when it gets to the next deflate block boundary. When decoding + the zlib or gzip format, this will cause inflate() to return immediately + after the header and before the first block. When doing a raw inflate, + inflate() will go ahead and process the first block, and will return when it + gets to the end of that block, or when it runs out of data. The Z_BLOCK option assists in appending to or combining deflate streams. Also to assist in this, on return inflate() will set strm->data_type to the - number of unused bits in the last byte taken from strm->next_in, plus 64 - if inflate() is currently decoding the last block in the deflate stream, - plus 128 if inflate() returned immediately after decoding an end-of-block - code or decoding the complete header up to just before the first byte of the - deflate stream. The end-of-block will not be indicated until all of the - uncompressed data from that block has been written to strm->next_out. The - number of unused bits may in general be greater than seven, except when - bit 7 of data_type is set, in which case the number of unused bits will be - less than eight. + number of unused bits in the last byte taken from strm->next_in, plus 64 if + inflate() is currently decoding the last block in the deflate stream, plus + 128 if inflate() returned immediately after decoding an end-of-block code or + decoding the complete header up to just before the first byte of the deflate + stream. The end-of-block will not be indicated until all of the uncompressed + data from that block has been written to strm->next_out. The number of + unused bits may in general be greater than seven, except when bit 7 of + data_type is set, in which case the number of unused bits will be less than + eight. data_type is set as noted here every time inflate() returns for all + flush options, and so can be used to determine the amount of currently + consumed input in bits. + + The Z_TREES option behaves as Z_BLOCK does, but it also returns when the + end of each deflate block header is reached, before any actual data in that + block is decoded. This allows the caller to determine the length of the + deflate block header for later use in random access within a deflate block. + 256 is added to the value of strm->data_type when inflate() returns + immediately after reaching the end of the deflate block header. inflate() should normally be called until it returns Z_STREAM_END or an - error. However if all decompression is to be performed in a single step - (a single call of inflate), the parameter flush should be set to - Z_FINISH. In this case all pending input is processed and all pending - output is flushed; avail_out must be large enough to hold all the - uncompressed data. (The size of the uncompressed data may have been saved - by the compressor for this purpose.) The next operation on this stream must - be inflateEnd to deallocate the decompression state. The use of Z_FINISH - is never required, but can be used to inform inflate that a faster approach - may be used for the single inflate() call. + error. However if all decompression is to be performed in a single step (a + single call of inflate), the parameter flush should be set to Z_FINISH. In + this case all pending input is processed and all pending output is flushed; + avail_out must be large enough to hold all the uncompressed data. (The size + of the uncompressed data may have been saved by the compressor for this + purpose.) The next operation on this stream must be inflateEnd to deallocate + the decompression state. The use of Z_FINISH is never required, but can be + used to inform inflate that a faster approach may be used for the single + inflate() call. In this implementation, inflate() always flushes as much output as possible to the output buffer, and always uses the faster approach on the - first call. So the only effect of the flush parameter in this implementation + first call. So the only effect of the flush parameter in this implementation is on the return value of inflate(), as noted below, or when it returns early - because Z_BLOCK is used. + because Z_BLOCK or Z_TREES is used. If a preset dictionary is needed after this call (see inflateSetDictionary below), inflate sets strm->adler to the adler32 checksum of the dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise it sets strm->adler to the adler32 checksum of all output produced so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described - below. At the end of the stream, inflate() checks that its computed adler32 + below. At the end of the stream, inflate() checks that its computed adler32 checksum is equal to that saved by the compressor and returns Z_STREAM_END only if the checksum is correct. - inflate() will decompress and check either zlib-wrapped or gzip-wrapped - deflate data. The header type is detected automatically. Any information - contained in the gzip header is not retained, so applications that need that - information should instead use raw inflate, see inflateInit2() below, or - inflateBack() and perform their own processing of the gzip header and - trailer. + inflate() can decompress and check either zlib-wrapped or gzip-wrapped + deflate data. The header type is detected automatically, if requested when + initializing with inflateInit2(). Any information contained in the gzip + header is not retained, so applications that need that information should + instead use raw inflate, see inflateInit2() below, or inflateBack() and + perform their own processing of the gzip header and trailer. inflate() returns Z_OK if some progress has been made (more input processed or more output produced), Z_STREAM_END if the end of the compressed data has @@ -473,27 +510,28 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); preset dictionary is needed at this point, Z_DATA_ERROR if the input data was corrupted (input stream not conforming to the zlib format or incorrect check value), Z_STREAM_ERROR if the stream structure was inconsistent (for example - if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory, + next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR if no progress is possible or if there was not enough room in the - output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and + output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and inflate() can be called again with more input and more output space to - continue decompressing. If Z_DATA_ERROR is returned, the application may then - call inflateSync() to look for a good compression block if a partial recovery - of the data is desired. + continue decompressing. If Z_DATA_ERROR is returned, the application may + then call inflateSync() to look for a good compression block if a partial + recovery of the data is desired. */ ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); /* All dynamically allocated data structures for this stream are freed. - This function discards any unprocessed input and does not flush any - pending output. + This function discards any unprocessed input and does not flush any pending + output. inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state - was inconsistent. In the error case, msg may be set but then points to a + was inconsistent. In the error case, msg may be set but then points to a static string (which must not be deallocated). */ + /* Advanced functions */ /* @@ -508,55 +546,57 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, int memLevel, int strategy)); - This is another version of deflateInit with more compression options. The - fields next_in, zalloc, zfree and opaque must be initialized before by - the caller. + This is another version of deflateInit with more compression options. The + fields next_in, zalloc, zfree and opaque must be initialized before by the + caller. - The method parameter is the compression method. It must be Z_DEFLATED in + The method parameter is the compression method. It must be Z_DEFLATED in this version of the library. The windowBits parameter is the base two logarithm of the window size - (the size of the history buffer). It should be in the range 8..15 for this - version of the library. Larger values of this parameter result in better - compression at the expense of memory usage. The default value is 15 if + (the size of the history buffer). It should be in the range 8..15 for this + version of the library. Larger values of this parameter result in better + compression at the expense of memory usage. The default value is 15 if deflateInit is used instead. - windowBits can also be -8..-15 for raw deflate. In this case, -windowBits - determines the window size. deflate() will then generate raw deflate data + windowBits can also be -8..-15 for raw deflate. In this case, -windowBits + determines the window size. deflate() will then generate raw deflate data with no zlib header or trailer, and will not compute an adler32 check value. - windowBits can also be greater than 15 for optional gzip encoding. Add + windowBits can also be greater than 15 for optional gzip encoding. Add 16 to windowBits to write a simple gzip header and trailer around the - compressed data instead of a zlib wrapper. The gzip header will have no - file name, no extra data, no comment, no modification time (set to zero), - no header crc, and the operating system will be set to 255 (unknown). If a + compressed data instead of a zlib wrapper. The gzip header will have no + file name, no extra data, no comment, no modification time (set to zero), no + header crc, and the operating system will be set to 255 (unknown). If a gzip stream is being written, strm->adler is a crc32 instead of an adler32. The memLevel parameter specifies how much memory should be allocated - for the internal compression state. memLevel=1 uses minimum memory but - is slow and reduces compression ratio; memLevel=9 uses maximum memory - for optimal speed. The default value is 8. See zconf.h for total memory - usage as a function of windowBits and memLevel. + for the internal compression state. memLevel=1 uses minimum memory but is + slow and reduces compression ratio; memLevel=9 uses maximum memory for + optimal speed. The default value is 8. See zconf.h for total memory usage + as a function of windowBits and memLevel. - The strategy parameter is used to tune the compression algorithm. Use the + The strategy parameter is used to tune the compression algorithm. Use the value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no string match), or Z_RLE to limit match distances to one (run-length - encoding). Filtered data consists mostly of small values with a somewhat - random distribution. In this case, the compression algorithm is tuned to - compress them better. The effect of Z_FILTERED is to force more Huffman + encoding). Filtered data consists mostly of small values with a somewhat + random distribution. In this case, the compression algorithm is tuned to + compress them better. The effect of Z_FILTERED is to force more Huffman coding and less string matching; it is somewhat intermediate between - Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as - Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy - parameter only affects the compression ratio but not the correctness of the - compressed output even if it is not set appropriately. Z_FIXED prevents the - use of dynamic Huffman codes, allowing for a simpler decoder for special - applications. + Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as + fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data. The + strategy parameter only affects the compression ratio but not the + correctness of the compressed output even if it is not set appropriately. + Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler + decoder for special applications. - deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid - method). msg is set to null if there is no error message. deflateInit2 does - not perform any compression: this will be done by deflate(). + deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid + method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is + incompatible with the version assumed by the caller (ZLIB_VERSION). msg is + set to null if there is no error message. deflateInit2 does not perform any + compression: this will be done by deflate(). */ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, @@ -564,37 +604,37 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, uInt dictLength)); /* Initializes the compression dictionary from the given byte sequence - without producing any compressed output. This function must be called - immediately after deflateInit, deflateInit2 or deflateReset, before any - call of deflate. The compressor and decompressor must use exactly the same + without producing any compressed output. This function must be called + immediately after deflateInit, deflateInit2 or deflateReset, before any call + of deflate. The compressor and decompressor must use exactly the same dictionary (see inflateSetDictionary). The dictionary should consist of strings (byte sequences) that are likely to be encountered later in the data to be compressed, with the most commonly - used strings preferably put towards the end of the dictionary. Using a + used strings preferably put towards the end of the dictionary. Using a dictionary is most useful when the data to be compressed is short and can be predicted with good accuracy; the data can then be compressed better than with the default empty dictionary. Depending on the size of the compression data structures selected by deflateInit or deflateInit2, a part of the dictionary may in effect be - discarded, for example if the dictionary is larger than the window size in - deflate or deflate2. Thus the strings most likely to be useful should be - put at the end of the dictionary, not at the front. In addition, the - current implementation of deflate will use at most the window size minus - 262 bytes of the provided dictionary. + discarded, for example if the dictionary is larger than the window size + provided in deflateInit or deflateInit2. Thus the strings most likely to be + useful should be put at the end of the dictionary, not at the front. In + addition, the current implementation of deflate will use at most the window + size minus 262 bytes of the provided dictionary. Upon return of this function, strm->adler is set to the adler32 value of the dictionary; the decompressor may later use this value to determine - which dictionary has been used by the compressor. (The adler32 value + which dictionary has been used by the compressor. (The adler32 value applies to the whole dictionary even if only a subset of the dictionary is actually used by the compressor.) If a raw deflate was requested, then the adler32 value is not computed and strm->adler is not set. deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a - parameter is invalid (such as NULL dictionary) or the stream state is + parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is inconsistent (for example if deflate has already been called for this stream - or if the compression method is bsort). deflateSetDictionary does not + or if the compression method is bsort). deflateSetDictionary does not perform any compression: this will be done by deflate(). */ @@ -605,26 +645,26 @@ ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, This function can be useful when several compression strategies will be tried, for example when there are several ways of pre-processing the input - data with a filter. The streams that will be discarded should then be freed + data with a filter. The streams that will be discarded should then be freed by calling deflateEnd. Note that deflateCopy duplicates the internal - compression state which can be quite large, so this strategy is slow and - can consume lots of memory. + compression state which can be quite large, so this strategy is slow and can + consume lots of memory. deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_STREAM_ERROR if the source stream state was inconsistent - (such as zalloc being NULL). msg is left unchanged in both source and + (such as zalloc being Z_NULL). msg is left unchanged in both source and destination. */ ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); /* This function is equivalent to deflateEnd followed by deflateInit, - but does not free and reallocate all the internal compression state. - The stream will keep the same compression level and any other attributes - that may have been set by deflateInit2. + but does not free and reallocate all the internal compression state. The + stream will keep the same compression level and any other attributes that + may have been set by deflateInit2. - deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being NULL). + deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being Z_NULL). */ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, @@ -634,18 +674,18 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, Dynamically update the compression level and compression strategy. The interpretation of level and strategy is as in deflateInit2. This can be used to switch between compression and straight copy of the input data, or - to switch to a different kind of input data requiring a different - strategy. If the compression level is changed, the input available so far - is compressed with the old level (and may be flushed); the new level will - take effect only at the next call of deflate(). + to switch to a different kind of input data requiring a different strategy. + If the compression level is changed, the input available so far is + compressed with the old level (and may be flushed); the new level will take + effect only at the next call of deflate(). Before the call of deflateParams, the stream state must be set as for - a call of deflate(), since the currently available input may have to - be compressed and flushed. In particular, strm->avail_out must be non-zero. + a call of deflate(), since the currently available input may have to be + compressed and flushed. In particular, strm->avail_out must be non-zero. deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source - stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR - if strm->avail_out was zero. + stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if + strm->avail_out was zero. */ ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm, @@ -669,9 +709,10 @@ ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, uLong sourceLen)); /* deflateBound() returns an upper bound on the compressed size after - deflation of sourceLen bytes. It must be called after deflateInit() - or deflateInit2(). This would be used to allocate an output buffer - for deflation in a single pass, and so would be called before deflate(). + deflation of sourceLen bytes. It must be called after deflateInit() or + deflateInit2(), and after deflateSetHeader(), if used. This would be used + to allocate an output buffer for deflation in a single pass, and so would be + called before deflate(). */ ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, @@ -679,21 +720,21 @@ ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, int value)); /* deflatePrime() inserts bits in the deflate output stream. The intent - is that this function is used to start off the deflate output with the - bits leftover from a previous deflate stream when appending to it. As such, - this function can only be used for raw deflate, and must be used before the - first deflate() call after a deflateInit2() or deflateReset(). bits must be - less than or equal to 16, and that many of the least significant bits of - value will be inserted in the output. + is that this function is used to start off the deflate output with the bits + leftover from a previous deflate stream when appending to it. As such, this + function can only be used for raw deflate, and must be used before the first + deflate() call after a deflateInit2() or deflateReset(). bits must be less + than or equal to 16, and that many of the least significant bits of value + will be inserted in the output. - deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source + deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source stream state was inconsistent. */ ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm, gz_headerp head)); /* - deflateSetHeader() provides gzip header information for when a gzip + deflateSetHeader() provides gzip header information for when a gzip stream is requested by deflateInit2(). deflateSetHeader() may be called after deflateInit2() or deflateReset() and before the first call of deflate(). The text, time, os, extra field, name, and comment information @@ -706,11 +747,11 @@ ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm, 1.3.x) do not support header crc's, and will report that it is a "multi-part gzip file" and give up. - If deflateSetHeader is not used, the default gzip header has text false, + If deflateSetHeader is not used, the default gzip header has text false, the time set to zero, and os set to 255, with no extra, name, or comment fields. The gzip header is returned to the default state by deflateReset(). - deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source stream state was inconsistent. */ @@ -718,43 +759,50 @@ ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm, ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, int windowBits)); - This is another version of inflateInit with an extra parameter. The + This is another version of inflateInit with an extra parameter. The fields next_in, avail_in, zalloc, zfree and opaque must be initialized before by the caller. The windowBits parameter is the base two logarithm of the maximum window size (the size of the history buffer). It should be in the range 8..15 for - this version of the library. The default value is 15 if inflateInit is used - instead. windowBits must be greater than or equal to the windowBits value + this version of the library. The default value is 15 if inflateInit is used + instead. windowBits must be greater than or equal to the windowBits value provided to deflateInit2() while compressing, or it must be equal to 15 if - deflateInit2() was not used. If a compressed stream with a larger window + deflateInit2() was not used. If a compressed stream with a larger window size is given as input, inflate() will return with the error code Z_DATA_ERROR instead of trying to allocate a larger window. - windowBits can also be -8..-15 for raw inflate. In this case, -windowBits - determines the window size. inflate() will then process raw deflate data, + windowBits can also be zero to request that inflate use the window size in + the zlib header of the compressed stream. + + windowBits can also be -8..-15 for raw inflate. In this case, -windowBits + determines the window size. inflate() will then process raw deflate data, not looking for a zlib or gzip header, not generating a check value, and not - looking for any check values for comparison at the end of the stream. This + looking for any check values for comparison at the end of the stream. This is for use with other formats that use the deflate compressed data format - such as zip. Those formats provide their own check values. If a custom + such as zip. Those formats provide their own check values. If a custom format is developed using the raw deflate format for compressed data, it is recommended that a check value such as an adler32 or a crc32 be applied to the uncompressed data as is done in the zlib, gzip, and zip formats. For - most applications, the zlib format should be used as is. Note that comments + most applications, the zlib format should be used as is. Note that comments above on the use in deflateInit2() applies to the magnitude of windowBits. - windowBits can also be greater than 15 for optional gzip decoding. Add + windowBits can also be greater than 15 for optional gzip decoding. Add 32 to windowBits to enable zlib and gzip decoding with automatic header detection, or add 16 to decode only the gzip format (the zlib format will - return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is - a crc32 instead of an adler32. + return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is a + crc32 instead of an adler32. inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg - is set to null if there is no error message. inflateInit2 does not perform - any decompression apart from reading the zlib header if present: this will - be done by inflate(). (So next_in and avail_in may be modified, but next_out - and avail_out are unchanged.) + memory, Z_VERSION_ERROR if the zlib library version is incompatible with the + version assumed by the caller, or Z_STREAM_ERROR if the parameters are + invalid, such as a null pointer to the structure. msg is set to null if + there is no error message. inflateInit2 does not perform any decompression + apart from possibly reading the zlib header if present: actual decompression + will be done by inflate(). (So next_in and avail_in may be modified, but + next_out and avail_out are unused and unchanged.) The current implementation + of inflateInit2() does not process any header information -- that is + deferred until inflate() is called. */ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, @@ -762,8 +810,8 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, uInt dictLength)); /* Initializes the decompression dictionary from the given uncompressed byte - sequence. This function must be called immediately after a call of inflate, - if that call returned Z_NEED_DICT. The dictionary chosen by the compressor + sequence. This function must be called immediately after a call of inflate, + if that call returned Z_NEED_DICT. The dictionary chosen by the compressor can be determined from the adler32 value returned by that call of inflate. The compressor and decompressor must use exactly the same dictionary (see deflateSetDictionary). For raw inflate, this function can be called @@ -772,26 +820,26 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, dictionary that was used for compression is provided. inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a - parameter is invalid (such as NULL dictionary) or the stream state is + parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the - expected one (incorrect adler32 value). inflateSetDictionary does not + expected one (incorrect adler32 value). inflateSetDictionary does not perform any decompression: this will be done by subsequent calls of inflate(). */ ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); /* - Skips invalid compressed data until a full flush point (see above the - description of deflate with Z_FULL_FLUSH) can be found, or until all - available input is skipped. No output is provided. + Skips invalid compressed data until a full flush point (see above the + description of deflate with Z_FULL_FLUSH) can be found, or until all + available input is skipped. No output is provided. - inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR - if no more input was provided, Z_DATA_ERROR if no flush point has been found, - or Z_STREAM_ERROR if the stream structure was inconsistent. In the success - case, the application may save the current current value of total_in which - indicates where valid compressed data was found. In the error case, the - application may repeatedly call inflateSync, providing more input each time, - until success or end of the input data. + inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR + if no more input was provided, Z_DATA_ERROR if no flush point has been + found, or Z_STREAM_ERROR if the stream structure was inconsistent. In the + success case, the application may save the current current value of total_in + which indicates where valid compressed data was found. In the error case, + the application may repeatedly call inflateSync, providing more input each + time, until success or end of the input data. */ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, @@ -806,18 +854,30 @@ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_STREAM_ERROR if the source stream state was inconsistent - (such as zalloc being NULL). msg is left unchanged in both source and + (such as zalloc being Z_NULL). msg is left unchanged in both source and destination. */ ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); /* This function is equivalent to inflateEnd followed by inflateInit, - but does not free and reallocate all the internal decompression state. - The stream will keep attributes that may have been set by inflateInit2. + but does not free and reallocate all the internal decompression state. The + stream will keep attributes that may have been set by inflateInit2. - inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being NULL). + inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being Z_NULL). +*/ + +ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm, + int windowBits)); +/* + This function is the same as inflateReset, but it also permits changing + the wrap and window size requests. The windowBits parameter is interpreted + the same as it is for inflateInit2. + + inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being Z_NULL), or if + the windowBits parameter is invalid. */ ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm, @@ -825,54 +885,87 @@ ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm, int value)); /* This function inserts bits in the inflate input stream. The intent is - that this function is used to start inflating at a bit position in the - middle of a byte. The provided bits will be used before any bytes are used - from next_in. This function should only be used with raw inflate, and - should be used before the first inflate() call after inflateInit2() or - inflateReset(). bits must be less than or equal to 16, and that many of the - least significant bits of value will be inserted in the input. + that this function is used to start inflating at a bit position in the + middle of a byte. The provided bits will be used before any bytes are used + from next_in. This function should only be used with raw inflate, and + should be used before the first inflate() call after inflateInit2() or + inflateReset(). bits must be less than or equal to 16, and that many of the + least significant bits of value will be inserted in the input. - inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source + If bits is negative, then the input stream bit buffer is emptied. Then + inflatePrime() can be called again to put bits in the buffer. This is used + to clear out bits leftover after feeding inflate a block description prior + to feeding inflate codes. + + inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source stream state was inconsistent. */ +ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm)); +/* + This function returns two values, one in the lower 16 bits of the return + value, and the other in the remaining upper bits, obtained by shifting the + return value down 16 bits. If the upper value is -1 and the lower value is + zero, then inflate() is currently decoding information outside of a block. + If the upper value is -1 and the lower value is non-zero, then inflate is in + the middle of a stored block, with the lower value equaling the number of + bytes from the input remaining to copy. If the upper value is not -1, then + it is the number of bits back from the current bit position in the input of + the code (literal or length/distance pair) currently being processed. In + that case the lower value is the number of bytes already emitted for that + code. + + A code is being processed if inflate is waiting for more input to complete + decoding of the code, or if it has completed decoding but is waiting for + more output space to write the literal or match data. + + inflateMark() is used to mark locations in the input data for random + access, which may be at bit positions, and to note those cases where the + output of a code may span boundaries of random access blocks. The current + location in the input stream can be determined from avail_in and data_type + as noted in the description for the Z_BLOCK flush parameter for inflate. + + inflateMark returns the value noted above or -1 << 16 if the provided + source stream state was inconsistent. +*/ + ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm, gz_headerp head)); /* - inflateGetHeader() requests that gzip header information be stored in the + inflateGetHeader() requests that gzip header information be stored in the provided gz_header structure. inflateGetHeader() may be called after inflateInit2() or inflateReset(), and before the first call of inflate(). As inflate() processes the gzip stream, head->done is zero until the header is completed, at which time head->done is set to one. If a zlib stream is being decoded, then head->done is set to -1 to indicate that there will be - no gzip header information forthcoming. Note that Z_BLOCK can be used to - force inflate() to return immediately after header processing is complete - and before any actual data is decompressed. + no gzip header information forthcoming. Note that Z_BLOCK or Z_TREES can be + used to force inflate() to return immediately after header processing is + complete and before any actual data is decompressed. - The text, time, xflags, and os fields are filled in with the gzip header + The text, time, xflags, and os fields are filled in with the gzip header contents. hcrc is set to true if there is a header CRC. (The header CRC - was valid if done is set to one.) If extra is not Z_NULL, then extra_max + was valid if done is set to one.) If extra is not Z_NULL, then extra_max contains the maximum number of bytes to write to extra. Once done is true, extra_len contains the actual extra field length, and extra contains the extra field, or that field truncated if extra_max is less than extra_len. If name is not Z_NULL, then up to name_max characters are written there, terminated with a zero unless the length is greater than name_max. If comment is not Z_NULL, then up to comm_max characters are written there, - terminated with a zero unless the length is greater than comm_max. When - any of extra, name, or comment are not Z_NULL and the respective field is - not present in the header, then that field is set to Z_NULL to signal its + terminated with a zero unless the length is greater than comm_max. When any + of extra, name, or comment are not Z_NULL and the respective field is not + present in the header, then that field is set to Z_NULL to signal its absence. This allows the use of deflateSetHeader() with the returned structure to duplicate the header. However if those fields are set to allocated memory, then the application will need to save those pointers elsewhere so that they can be eventually freed. - If inflateGetHeader is not used, then the header information is simply + If inflateGetHeader is not used, then the header information is simply discarded. The header is always checked for validity, including the header CRC if present. inflateReset() will reset the process to discard the header information. The application would need to call inflateGetHeader() again to retrieve the header from the next gzip stream. - inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source stream state was inconsistent. */ @@ -893,9 +986,9 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, See inflateBack() for the usage of these routines. inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of - the paramaters are invalid, Z_MEM_ERROR if the internal state could not - be allocated, or Z_VERSION_ERROR if the version of the library does not - match the version of the header file. + the paramaters are invalid, Z_MEM_ERROR if the internal state could not be + allocated, or Z_VERSION_ERROR if the version of the library does not match + the version of the header file. */ typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *)); @@ -915,15 +1008,15 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, inflateBackInit() must be called first to allocate the internal state and to initialize the state with the user-provided window buffer. inflateBack() may then be used multiple times to inflate a complete, raw - deflate stream with each call. inflateBackEnd() is then called to free - the allocated state. + deflate stream with each call. inflateBackEnd() is then called to free the + allocated state. A raw deflate stream is one with no zlib or gzip header or trailer. This routine would normally be used in a utility that reads zip or gzip files and writes out uncompressed files. The utility would decode the - header and process the trailer on its own, hence this routine expects - only the raw deflate stream to decompress. This is different from the - normal behavior of inflate(), which expects either a zlib or gzip header and + header and process the trailer on its own, hence this routine expects only + the raw deflate stream to decompress. This is different from the normal + behavior of inflate(), which expects either a zlib or gzip header and trailer around the deflate stream. inflateBack() uses two subroutines supplied by the caller that are then @@ -949,7 +1042,7 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in must also be initialized, and then if strm->avail_in is not zero, input will - initially be taken from strm->next_in[0 .. strm->avail_in - 1]. + initially be taken from strm->next_in[0 .. strm->avail_in - 1]. The in_desc and out_desc parameters of inflateBack() is passed as the first parameter of in() and out() respectively when they are called. These @@ -959,15 +1052,15 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, On return, inflateBack() will set strm->next_in and strm->avail_in to pass back any unused input that was provided by the last in() call. The return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR - if in() or out() returned an error, Z_DATA_ERROR if there was a format - error in the deflate stream (in which case strm->msg is set to indicate the - nature of the error), or Z_STREAM_ERROR if the stream was not properly - initialized. In the case of Z_BUF_ERROR, an input or output error can be - distinguished using strm->next_in which will be Z_NULL only if in() returned - an error. If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to - out() returning non-zero. (in() will always be called before out(), so - strm->next_in is assured to be defined if out() returns non-zero.) Note - that inflateBack() cannot return Z_OK. + if in() or out() returned an error, Z_DATA_ERROR if there was a format error + in the deflate stream (in which case strm->msg is set to indicate the nature + of the error), or Z_STREAM_ERROR if the stream was not properly initialized. + In the case of Z_BUF_ERROR, an input or output error can be distinguished + using strm->next_in which will be Z_NULL only if in() returned an error. If + strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning + non-zero. (in() will always be called before out(), so strm->next_in is + assured to be defined if out() returns non-zero.) Note that inflateBack() + cannot return Z_OK. */ ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); @@ -1023,23 +1116,22 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); /* utility functions */ /* - The following utility functions are implemented on top of the - basic stream-oriented functions. To simplify the interface, some - default options are assumed (compression level and memory usage, - standard memory allocation functions). The source code of these - utility functions can easily be modified if you need special options. + The following utility functions are implemented on top of the basic + stream-oriented functions. To simplify the interface, some default options + are assumed (compression level and memory usage, standard memory allocation + functions). The source code of these utility functions can be modified if + you need special options. */ ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen)); /* Compresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total - size of the destination buffer, which must be at least the value returned - by compressBound(sourceLen). Upon exit, destLen is the actual size of the + the byte length of the source buffer. Upon entry, destLen is the total size + of the destination buffer, which must be at least the value returned by + compressBound(sourceLen). Upon exit, destLen is the actual size of the compressed buffer. - This function can be used to compress a whole file at once if the - input file is mmap'ed. + compress returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR if there was not enough room in the output buffer. @@ -1049,11 +1141,11 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen, int level)); /* - Compresses the source buffer into the destination buffer. The level + Compresses the source buffer into the destination buffer. The level parameter has the same meaning as in deflateInit. sourceLen is the byte - length of the source buffer. Upon entry, destLen is the total size of the + length of the source buffer. Upon entry, destLen is the total size of the destination buffer, which must be at least the value returned by - compressBound(sourceLen). Upon exit, destLen is the actual size of the + compressBound(sourceLen). Upon exit, destLen is the actual size of the compressed buffer. compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough @@ -1064,22 +1156,20 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen)); /* compressBound() returns an upper bound on the compressed size after - compress() or compress2() on sourceLen bytes. It would be used before - a compress() or compress2() call to allocate the destination buffer. + compress() or compress2() on sourceLen bytes. It would be used before a + compress() or compress2() call to allocate the destination buffer. */ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen)); /* Decompresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total - size of the destination buffer, which must be large enough to hold the - entire uncompressed data. (The size of the uncompressed data must have - been saved previously by the compressor and transmitted to the decompressor - by some mechanism outside the scope of this compression library.) - Upon exit, destLen is the actual size of the compressed buffer. - This function can be used to decompress a whole file at once if the - input file is mmap'ed. + the byte length of the source buffer. Upon entry, destLen is the total size + of the destination buffer, which must be large enough to hold the entire + uncompressed data. (The size of the uncompressed data must have been saved + previously by the compressor and transmitted to the decompressor by some + mechanism outside the scope of this compression library.) Upon exit, destLen + is the actual size of the uncompressed buffer. uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR if there was not enough room in the output @@ -1087,136 +1177,199 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, */ -typedef voidp gzFile; + /* gzip file access functions */ -ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); /* - Opens a gzip (.gz) file for reading or writing. The mode parameter - is as in fopen ("rb" or "wb") but can also include a compression level - ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for - Huffman only compression as in "wb1h", or 'R' for run-length encoding - as in "wb1R". (See the description of deflateInit2 for more information - about the strategy parameter.) + This library supports reading and writing files in gzip (.gz) format with + an interface similar to that of stdio, using the functions that start with + "gz". The gzip format is different from the zlib format. gzip is a gzip + wrapper, documented in RFC 1952, wrapped around a deflate stream. +*/ + +typedef voidp gzFile; /* opaque gzip file descriptor */ + +/* +ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); + + Opens a gzip (.gz) file for reading or writing. The mode parameter is as + in fopen ("rb" or "wb") but can also include a compression level ("wb9") or + a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only + compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F' + for fixed code compression as in "wb9F". (See the description of + deflateInit2 for more information about the strategy parameter.) Also "a" + can be used instead of "w" to request that the gzip stream that will be + written be appended to the file. "+" will result in an error, since reading + and writing to the same gzip file is not supported. gzopen can be used to read a file which is not in gzip format; in this case gzread will directly read from the file without decompression. - gzopen returns NULL if the file could not be opened or if there was - insufficient memory to allocate the (de)compression state; errno - can be checked to distinguish the two cases (if errno is zero, the - zlib error is Z_MEM_ERROR). */ + gzopen returns NULL if the file could not be opened, if there was + insufficient memory to allocate the gzFile state, or if an invalid mode was + specified (an 'r', 'w', or 'a' was not provided, or '+' was provided). + errno can be checked to determine if the reason gzopen failed was that the + file could not be opened. +*/ -ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); +ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); /* - gzdopen() associates a gzFile with the file descriptor fd. File - descriptors are obtained from calls like open, dup, creat, pipe or - fileno (in the file has been previously opened with fopen). - The mode parameter is as in gzopen. - The next call of gzclose on the returned gzFile will also close the - file descriptor fd, just like fclose(fdopen(fd), mode) closes the file - descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode). - gzdopen returns NULL if there was insufficient memory to allocate - the (de)compression state. + gzdopen associates a gzFile with the file descriptor fd. File descriptors + are obtained from calls like open, dup, creat, pipe or fileno (if the file + has been previously opened with fopen). The mode parameter is as in gzopen. + + The next call of gzclose on the returned gzFile will also close the file + descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor + fd. If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd, + mode);. The duplicated descriptor should be saved to avoid a leak, since + gzdopen does not close fd if it fails. + + gzdopen returns NULL if there was insufficient memory to allocate the + gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not + provided, or '+' was provided), or if fd is -1. The file descriptor is not + used until the next gz* read, write, seek, or close operation, so gzdopen + will not detect if fd is invalid (unless fd is -1). +*/ + +ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size)); +/* + Set the internal buffer size used by this library's functions. The + default buffer size is 8192 bytes. This function must be called after + gzopen() or gzdopen(), and before any other calls that read or write the + file. The buffer memory allocation is always deferred to the first read or + write. Two buffers are allocated, either both of the specified size when + writing, or one of the specified size and the other twice that size when + reading. A larger buffer size of, for example, 64K or 128K bytes will + noticeably increase the speed of decompression (reading). + + The new buffer size also affects the maximum length for gzprintf(). + + gzbuffer() returns 0 on success, or -1 on failure, such as being called + too late. */ ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); /* - Dynamically update the compression level or strategy. See the description + Dynamically update the compression level or strategy. See the description of deflateInit2 for the meaning of these parameters. + gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not opened for writing. */ -ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); +ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); /* - Reads the given number of uncompressed bytes from the compressed file. - If the input file was not in gzip format, gzread copies the given number - of bytes into the buffer. - gzread returns the number of uncompressed bytes actually read (0 for - end of file, -1 for error). */ + Reads the given number of uncompressed bytes from the compressed file. If + the input file was not in gzip format, gzread copies the given number of + bytes into the buffer. -ZEXTERN int ZEXPORT gzwrite OF((gzFile file, - voidpc buf, unsigned len)); -/* - Writes the given number of uncompressed bytes into the compressed file. - gzwrite returns the number of uncompressed bytes actually written - (0 in case of error). + After reaching the end of a gzip stream in the input, gzread will continue + to read, looking for another gzip stream, or failing that, reading the rest + of the input file directly without decompression. The entire input file + will be read if gzread is called until it returns less than the requested + len. + + gzread returns the number of uncompressed bytes actually read, less than + len for end of file, or -1 for error. */ -ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); +ZEXTERN int ZEXPORT gzwrite OF((gzFile file, + voidpc buf, unsigned len)); /* - Converts, formats, and writes the args to the compressed file under - control of the format string, as in fprintf. gzprintf returns the number of - uncompressed bytes actually written (0 in case of error). The number of - uncompressed bytes written is limited to 4095. The caller should assure that - this limit is not exceeded. If it is exceeded, then gzprintf() will return - return an error (0) with nothing written. In this case, there may also be a - buffer overflow with unpredictable consequences, which is possible only if - zlib was compiled with the insecure functions sprintf() or vsprintf() - because the secure snprintf() or vsnprintf() functions were not available. + Writes the given number of uncompressed bytes into the compressed file. + gzwrite returns the number of uncompressed bytes written or 0 in case of + error. +*/ + +ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); +/* + Converts, formats, and writes the arguments to the compressed file under + control of the format string, as in fprintf. gzprintf returns the number of + uncompressed bytes actually written, or 0 in case of error. The number of + uncompressed bytes written is limited to 8191, or one less than the buffer + size given to gzbuffer(). The caller should assure that this limit is not + exceeded. If it is exceeded, then gzprintf() will return an error (0) with + nothing written. In this case, there may also be a buffer overflow with + unpredictable consequences, which is possible only if zlib was compiled with + the insecure functions sprintf() or vsprintf() because the secure snprintf() + or vsnprintf() functions were not available. This can be determined using + zlibCompileFlags(). */ ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); /* - Writes the given null-terminated string to the compressed file, excluding + Writes the given null-terminated string to the compressed file, excluding the terminating null character. - gzputs returns the number of characters written, or -1 in case of error. + + gzputs returns the number of characters written, or -1 in case of error. */ ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); /* - Reads bytes from the compressed file until len-1 characters are read, or - a newline character is read and transferred to buf, or an end-of-file - condition is encountered. The string is then terminated with a null - character. - gzgets returns buf, or Z_NULL in case of error. + Reads bytes from the compressed file until len-1 characters are read, or a + newline character is read and transferred to buf, or an end-of-file + condition is encountered. If any characters are read or if len == 1, the + string is terminated with a null character. If no characters are read due + to an end-of-file or len < 1, then the buffer is left untouched. + + gzgets returns buf which is a null-terminated string, or it returns NULL + for end-of-file or in case of error. If there was an error, the contents at + buf are indeterminate. */ -ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); +ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); /* - Writes c, converted to an unsigned char, into the compressed file. - gzputc returns the value that was written, or -1 in case of error. + Writes c, converted to an unsigned char, into the compressed file. gzputc + returns the value that was written, or -1 in case of error. */ -ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); +ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); /* - Reads one byte from the compressed file. gzgetc returns this byte - or -1 in case of end of file or error. + Reads one byte from the compressed file. gzgetc returns this byte or -1 + in case of end of file or error. */ -ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); +ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); /* - Push one character back onto the stream to be read again later. - Only one character of push-back is allowed. gzungetc() returns the - character pushed, or -1 on failure. gzungetc() will fail if a - character has been pushed but not read yet, or if c is -1. The pushed - character will be discarded if the stream is repositioned with gzseek() - or gzrewind(). + Push one character back onto the stream to be read as the first character + on the next read. At least one character of push-back is allowed. + gzungetc() returns the character pushed, or -1 on failure. gzungetc() will + fail if c is -1, and may fail if a character has been pushed but not read + yet. If gzungetc is used immediately after gzopen or gzdopen, at least the + output buffer size of pushed characters is allowed. (See gzbuffer above.) + The pushed character will be discarded if the stream is repositioned with + gzseek() or gzrewind(). */ -ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); +ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); /* - Flushes all pending output into the compressed file. The parameter - flush is as in the deflate() function. The return value is the zlib - error number (see function gzerror below). gzflush returns Z_OK if - the flush parameter is Z_FINISH and all output could be flushed. - gzflush should be called only when strictly necessary because it can - degrade compression. + Flushes all pending output into the compressed file. The parameter flush + is as in the deflate() function. The return value is the zlib error number + (see function gzerror below). gzflush is only permitted when writing. + + If the flush parameter is Z_FINISH, the remaining data is written and the + gzip stream is completed in the output. If gzwrite() is called again, a new + gzip stream will be started in the output. gzread() is able to read such + concatented gzip streams. + + gzflush should be called only when strictly necessary because it will + degrade compression if called too often. */ -ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, - z_off_t offset, int whence)); /* - Sets the starting position for the next gzread or gzwrite on the - given compressed file. The offset represents a number of bytes in the - uncompressed data stream. The whence parameter is defined as in lseek(2); +ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, + z_off_t offset, int whence)); + + Sets the starting position for the next gzread or gzwrite on the given + compressed file. The offset represents a number of bytes in the + uncompressed data stream. The whence parameter is defined as in lseek(2); the value SEEK_END is not supported. + If the file is opened for reading, this function is emulated but can be - extremely slow. If the file is opened for writing, only forward seeks are + extremely slow. If the file is opened for writing, only forward seeks are supported; gzseek then compresses a sequence of zeroes up to the new starting position. - gzseek returns the resulting offset location as measured in bytes from + gzseek returns the resulting offset location as measured in bytes from the beginning of the uncompressed stream, or -1 in case of error, in particular if the file is opened for writing and the new starting position would be before the current position. @@ -1226,68 +1379,127 @@ ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); /* Rewinds the given file. This function is supported only for reading. - gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) + gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) */ -ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); /* - Returns the starting position for the next gzread or gzwrite on the - given compressed file. This position represents a number of bytes in the - uncompressed data stream. +ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); - gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) + Returns the starting position for the next gzread or gzwrite on the given + compressed file. This position represents a number of bytes in the + uncompressed data stream, and is zero when starting, even if appending or + reading a gzip stream from the middle of a file using gzdopen(). + + gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) +*/ + +/* +ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file)); + + Returns the current offset in the file being read or written. This offset + includes the count of bytes that precede the gzip stream, for example when + appending or when using gzdopen() for reading. When reading, the offset + does not include as yet unused buffered input. This information can be used + for a progress indicator. On error, gzoffset() returns -1. */ ZEXTERN int ZEXPORT gzeof OF((gzFile file)); /* - Returns 1 when EOF has previously been detected reading the given - input stream, otherwise zero. + Returns true (1) if the end-of-file indicator has been set while reading, + false (0) otherwise. Note that the end-of-file indicator is set only if the + read tried to go past the end of the input, but came up short. Therefore, + just like feof(), gzeof() may return false even if there is no more data to + read, in the event that the last read request was for the exact number of + bytes remaining in the input file. This will happen if the input file size + is an exact multiple of the buffer size. + + If gzeof() returns true, then the read functions will return no more data, + unless the end-of-file indicator is reset by gzclearerr() and the input file + has grown since the previous end of file was detected. */ ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); /* - Returns 1 if file is being read directly without decompression, otherwise - zero. + Returns true (1) if file is being copied directly while reading, or false + (0) if file is a gzip stream being decompressed. This state can change from + false to true while reading the input file if the end of a gzip stream is + reached, but is followed by data that is not another gzip stream. + + If the input file is empty, gzdirect() will return true, since the input + does not contain a gzip stream. + + If gzdirect() is used immediately after gzopen() or gzdopen() it will + cause buffers to be allocated to allow reading the file to determine if it + is a gzip file. Therefore if gzbuffer() is used, it should be called before + gzdirect(). */ ZEXTERN int ZEXPORT gzclose OF((gzFile file)); /* - Flushes all pending output if necessary, closes the compressed file - and deallocates all the (de)compression state. The return value is the zlib - error number (see function gzerror below). + Flushes all pending output if necessary, closes the compressed file and + deallocates the (de)compression state. Note that once file is closed, you + cannot call gzerror with file, since its structures have been deallocated. + gzclose must not be called more than once on the same file, just as free + must not be called more than once on the same allocation. + + gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a + file operation error, or Z_OK on success. +*/ + +ZEXTERN int ZEXPORT gzclose_r OF((gzFile file)); +ZEXTERN int ZEXPORT gzclose_w OF((gzFile file)); +/* + Same as gzclose(), but gzclose_r() is only for use when reading, and + gzclose_w() is only for use when writing or appending. The advantage to + using these instead of gzclose() is that they avoid linking in zlib + compression or decompression code that is not used when only reading or only + writing respectively. If gzclose() is used, then both compression and + decompression code will be included the application when linking to a static + zlib library. */ ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); /* - Returns the error message for the last error which occurred on the - given compressed file. errnum is set to zlib error number. If an - error occurred in the file system and not in the compression library, - errnum is set to Z_ERRNO and the application may consult errno - to get the exact error code. + Returns the error message for the last error which occurred on the given + compressed file. errnum is set to zlib error number. If an error occurred + in the file system and not in the compression library, errnum is set to + Z_ERRNO and the application may consult errno to get the exact error code. + + The application must not modify the returned string. Future calls to + this function may invalidate the previously returned string. If file is + closed, then the string previously returned by gzerror will no longer be + available. + + gzerror() should be used to distinguish errors from end-of-file for those + functions above that do not distinguish those cases in their return values. */ ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); /* - Clears the error and end-of-file flags for file. This is analogous to the - clearerr() function in stdio. This is useful for continuing to read a gzip + Clears the error and end-of-file flags for file. This is analogous to the + clearerr() function in stdio. This is useful for continuing to read a gzip file that is being written concurrently. */ + /* checksum functions */ /* These functions are not related to compression but are exported - anyway because they might be useful in applications using the - compression library. + anyway because they might be useful in applications using the compression + library. */ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); /* Update a running Adler-32 checksum with the bytes buf[0..len-1] and - return the updated checksum. If buf is NULL, this function returns - the required initial value for the checksum. - An Adler-32 checksum is almost as reliable as a CRC32 but can be computed - much faster. Usage example: + return the updated checksum. If buf is Z_NULL, this function returns the + required initial value for the checksum. + + An Adler-32 checksum is almost as reliable as a CRC32 but can be computed + much faster. + + Usage example: uLong adler = adler32(0L, Z_NULL, 0); @@ -1297,9 +1509,10 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); if (adler != original_adler) error(); */ +/* ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, z_off_t len2)); -/* + Combine two Adler-32 checksums into one. For two sequences of bytes, seq1 and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of @@ -1309,9 +1522,11 @@ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); /* Update a running CRC-32 with the bytes buf[0..len-1] and return the - updated CRC-32. If buf is NULL, this function returns the required initial - value for the for the crc. Pre- and post-conditioning (one's complement) is - performed within this function so it shouldn't be done by the application. + updated CRC-32. If buf is Z_NULL, this function returns the required + initial value for the for the crc. Pre- and post-conditioning (one's + complement) is performed within this function so it shouldn't be done by the + application. + Usage example: uLong crc = crc32(0L, Z_NULL, 0); @@ -1322,9 +1537,9 @@ ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); if (crc != original_crc) error(); */ +/* ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); -/* Combine two CRC-32 check values into one. For two sequences of bytes, seq1 and seq2 with lengths len1 and len2, CRC-32 check values were calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32 @@ -1363,16 +1578,57 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream)) #define inflateBackInit(strm, windowBits, window) \ inflateBackInit_((strm), (windowBits), (window), \ - ZLIB_VERSION, sizeof(z_stream)) + ZLIB_VERSION, sizeof(z_stream)) - -#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) - struct internal_state {int dummy;}; /* hack for buggy compilers */ +/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or + * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if + * both are true, the application gets the *64 functions, and the regular + * functions are changed to 64 bits) -- in case these are set on systems + * without large file support, _LFS64_LARGEFILE must also be true + */ +#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); + ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); + ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); + ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t)); + ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t)); #endif +#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0 +# define gzopen gzopen64 +# define gzseek gzseek64 +# define gztell gztell64 +# define gzoffset gzoffset64 +# define adler32_combine adler32_combine64 +# define crc32_combine crc32_combine64 +# ifdef _LARGEFILE64_SOURCE + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); + ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); + ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile)); + ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); + ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); +# endif +#else + ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *)); + ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int)); + ZEXTERN z_off_t ZEXPORT gztell OF((gzFile)); + ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile)); + ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); + ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); +#endif + +/* hack for buggy compilers */ +#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) + struct internal_state {int dummy;}; +#endif + +/* undocumented functions */ ZEXTERN const char * ZEXPORT zError OF((int)); -ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); +ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp)); ZEXTERN const unsigned long FAR * ZEXPORT get_crc_table OF((void)); +ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int)); #ifdef __cplusplus } diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.c b/jdk/src/share/native/java/util/zip/zlib-1.2.5/zutil.c similarity index 91% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.c rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/zutil.c index 24cb60a7b9c..041aa973179 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.c +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/zutil.c @@ -23,7 +23,7 @@ */ /* zutil.c -- target dependent utility functions for the compression library - * Copyright (C) 1995-2005 Jean-loup Gailly. + * Copyright (C) 1995-2005, 2010 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -58,25 +58,25 @@ uLong ZEXPORT zlibCompileFlags() uLong flags; flags = 0; - switch (sizeof(uInt)) { + switch ((int)(sizeof(uInt))) { case 2: break; case 4: flags += 1; break; case 8: flags += 2; break; default: flags += 3; } - switch (sizeof(uLong)) { + switch ((int)(sizeof(uLong))) { case 2: break; case 4: flags += 1 << 2; break; case 8: flags += 2 << 2; break; default: flags += 3 << 2; } - switch (sizeof(voidpf)) { + switch ((int)(sizeof(voidpf))) { case 2: break; case 4: flags += 1 << 4; break; case 8: flags += 2 << 4; break; default: flags += 3 << 4; } - switch (sizeof(z_off_t)) { + switch ((int)(sizeof(z_off_t))) { case 2: break; case 4: flags += 1 << 6; break; case 8: flags += 2 << 6; break; @@ -141,9 +141,9 @@ uLong ZEXPORT zlibCompileFlags() # ifndef verbose # define verbose 0 # endif -int z_verbose = verbose; +int ZLIB_INTERNAL z_verbose = verbose; -void z_error (m) +void ZLIB_INTERNAL z_error (m) char *m; { fprintf(stderr, "%s\n", m); @@ -170,7 +170,7 @@ const char * ZEXPORT zError(err) #ifndef HAVE_MEMCPY -void zmemcpy(dest, source, len) +void ZLIB_INTERNAL zmemcpy(dest, source, len) Bytef* dest; const Bytef* source; uInt len; @@ -181,7 +181,7 @@ void zmemcpy(dest, source, len) } while (--len != 0); } -int zmemcmp(s1, s2, len) +int ZLIB_INTERNAL zmemcmp(s1, s2, len) const Bytef* s1; const Bytef* s2; uInt len; @@ -194,7 +194,7 @@ int zmemcmp(s1, s2, len) return 0; } -void zmemzero(dest, len) +void ZLIB_INTERNAL zmemzero(dest, len) Bytef* dest; uInt len; { @@ -237,7 +237,7 @@ local ptr_table table[MAX_PTR]; * a protected system like OS/2. Use Microsoft C instead. */ -voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) +voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) { voidpf buf = opaque; /* just to make some compilers happy */ ulg bsize = (ulg)items*size; @@ -261,7 +261,7 @@ voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) return buf; } -void zcfree (voidpf opaque, voidpf ptr) +void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) { int n; if (*(ush*)&ptr != 0) { /* object < 64K */ @@ -296,13 +296,13 @@ void zcfree (voidpf opaque, voidpf ptr) # define _hfree hfree #endif -voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) +voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size) { if (opaque) opaque = 0; /* to make compiler happy */ return _halloc((long)items, size); } -void zcfree (voidpf opaque, voidpf ptr) +void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) { if (opaque) opaque = 0; /* to make compiler happy */ _hfree(ptr); @@ -321,7 +321,7 @@ extern voidp calloc OF((uInt items, uInt size)); extern void free OF((voidpf ptr)); #endif -voidpf zcalloc (opaque, items, size) +voidpf ZLIB_INTERNAL zcalloc (opaque, items, size) voidpf opaque; unsigned items; unsigned size; @@ -331,7 +331,7 @@ voidpf zcalloc (opaque, items, size) (voidpf)calloc(items, size); } -void zcfree (opaque, ptr) +void ZLIB_INTERNAL zcfree (opaque, ptr) voidpf opaque; voidpf ptr; { diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.h b/jdk/src/share/native/java/util/zip/zlib-1.2.5/zutil.h similarity index 82% rename from jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.h rename to jdk/src/share/native/java/util/zip/zlib-1.2.5/zutil.h index 0a2ec6ce442..1c4e8d38fe5 100644 --- a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.h +++ b/jdk/src/share/native/java/util/zip/zlib-1.2.5/zutil.h @@ -23,7 +23,7 @@ */ /* zutil.h -- internal interface and configuration of the compression library - * Copyright (C) 1995-2005 Jean-loup Gailly. + * Copyright (C) 1995-2010 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -37,31 +37,21 @@ #ifndef ZUTIL_H #define ZUTIL_H -#define ZLIB_INTERNAL +#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ) +# define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) +#else +# define ZLIB_INTERNAL +#endif + #include "zlib.h" #ifdef STDC -# ifndef _WIN32_WCE +# if !(defined(_WIN32_WCE) && defined(_MSC_VER)) # include # endif # include # include #endif -#ifdef NO_ERRNO_H -# ifdef _WIN32_WCE - /* The Microsoft C Run-Time Library for Windows CE doesn't have - * errno. We define it as a global variable to simplify porting. - * Its value is always 0 and should not be used. We rename it to - * avoid conflict with other libraries that use the same workaround. - */ -# define errno z_errno -# endif - extern int errno; -#else -# ifndef _WIN32_WCE -# include -# endif -#endif #ifndef local # define local static @@ -113,7 +103,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32)) # define OS_CODE 0x00 # if defined(__TURBOC__) || defined(__BORLANDC__) -# if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) +# if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) /* Allow compilation with ANSI keywords only enabled */ void _Cdecl farfree( void *block ); void *_Cdecl farmalloc( unsigned long nbytes ); @@ -142,7 +132,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #ifdef OS2 # define OS_CODE 0x06 # ifdef M_I86 - #include +# include # endif #endif @@ -175,7 +165,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # define fdopen(fd,mode) NULL /* No fdopen() */ #endif -#if (defined(_MSC_VER) && (_MSC_VER > 600)) +#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX # if defined(_WIN32_WCE) # define fdopen(fd,mode) NULL /* No fdopen() */ # ifndef _PTRDIFF_T_DEFINED @@ -187,6 +177,18 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # endif #endif +#if defined(__BORLANDC__) + #pragma warn -8004 + #pragma warn -8008 + #pragma warn -8066 +#endif + +/* provide prototypes for these when building zlib without LFS */ +#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0 + ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); + ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); +#endif + /* common defaults */ #ifndef OS_CODE @@ -220,9 +222,10 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # endif # ifdef WIN32 /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ -# if !defined(vsnprintf) && !defined(NO_vsnprintf) && (!defined(_MSC_VER) || (_MSC_VER < 1500)) - /* Only needed before Visual Studio 2008 */ -# define vsnprintf _vsnprintf +# if !defined(vsnprintf) && !defined(NO_vsnprintf) +# if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 ) +# define vsnprintf _vsnprintf +# endif # endif # endif # ifdef __SASC @@ -257,16 +260,16 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # define zmemzero(dest, len) memset(dest, 0, len) # endif #else - extern void zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); - extern int zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len)); - extern void zmemzero OF((Bytef* dest, uInt len)); + void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); + int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len)); + void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len)); #endif /* Diagnostic functions */ #ifdef DEBUG # include - extern int z_verbose; - extern void z_error OF((char *m)); + extern int ZLIB_INTERNAL z_verbose; + extern void ZLIB_INTERNAL z_error OF((char *m)); # define Assert(cond,msg) {if(!(cond)) z_error(msg);} # define Trace(x) {if (z_verbose>=0) fprintf x ;} # define Tracev(x) {if (z_verbose>0) fprintf x ;} @@ -283,8 +286,9 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #endif -voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size)); -void zcfree OF((voidpf opaque, voidpf ptr)); +voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items, + unsigned size)); +void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr)); #define ZALLOC(strm, items, size) \ (*((strm)->zalloc))((strm)->opaque, (items), (size)) diff --git a/jdk/src/solaris/classes/sun/java2d/x11/X11Renderer.java b/jdk/src/solaris/classes/sun/java2d/x11/X11Renderer.java index c25d7abade4..f335781bffb 100644 --- a/jdk/src/solaris/classes/sun/java2d/x11/X11Renderer.java +++ b/jdk/src/solaris/classes/sun/java2d/x11/X11Renderer.java @@ -299,7 +299,7 @@ public class X11Renderer implements private void doPath(SunGraphics2D sg2d, Shape s, boolean isFill) { Path2D.Float p2df; int transx, transy; - if (sg2d.transformState <= sg2d.TRANSFORM_INT_TRANSLATE) { + if (sg2d.transformState <= SunGraphics2D.TRANSFORM_INT_TRANSLATE) { if (s instanceof Path2D.Float) { p2df = (Path2D.Float)s; } else { @@ -323,10 +323,10 @@ public class X11Renderer implements } public void draw(SunGraphics2D sg2d, Shape s) { - if (sg2d.strokeState == sg2d.STROKE_THIN) { + if (sg2d.strokeState == SunGraphics2D.STROKE_THIN) { // Delegate to drawPolygon() if possible... if (s instanceof Polygon && - sg2d.transformState < sg2d.TRANSFORM_TRANSLATESCALE) + sg2d.transformState < SunGraphics2D.TRANSFORM_TRANSLATESCALE) { Polygon p = (Polygon) s; drawPolygon(sg2d, p.xpoints, p.ypoints, p.npoints); @@ -336,7 +336,7 @@ public class X11Renderer implements // Otherwise we will use drawPath() for // high-quality thin paths. doPath(sg2d, s, false); - } else if (sg2d.strokeState < sg2d.STROKE_CUSTOM) { + } else if (sg2d.strokeState < SunGraphics2D.STROKE_CUSTOM) { // REMIND: X11 can handle uniform scaled wide lines // and dashed lines itself if we set the appropriate // XGC attributes (TBD). @@ -360,10 +360,10 @@ public class X11Renderer implements } public void fill(SunGraphics2D sg2d, Shape s) { - if (sg2d.strokeState == sg2d.STROKE_THIN) { + if (sg2d.strokeState == SunGraphics2D.STROKE_THIN) { // Delegate to fillPolygon() if possible... if (s instanceof Polygon && - sg2d.transformState < sg2d.TRANSFORM_TRANSLATESCALE) + sg2d.transformState < SunGraphics2D.TRANSFORM_TRANSLATESCALE) { Polygon p = (Polygon) s; fillPolygon(sg2d, p.xpoints, p.ypoints, p.npoints); @@ -378,7 +378,7 @@ public class X11Renderer implements AffineTransform at; int transx, transy; - if (sg2d.transformState < sg2d.TRANSFORM_TRANSLATESCALE) { + if (sg2d.transformState < SunGraphics2D.TRANSFORM_TRANSLATESCALE) { // Transform (translation) will be done by XFillSpans at = null; transx = sg2d.transX; diff --git a/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java b/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java index 24513aa1af3..d9d883a0e52 100644 --- a/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java +++ b/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java @@ -295,9 +295,9 @@ public abstract class X11SurfaceData extends XSurfaceData { public void validatePipe(SunGraphics2D sg2d) { if (sg2d.antialiasHint != SunHints.INTVAL_ANTIALIAS_ON && - sg2d.paintState <= sg2d.PAINT_ALPHACOLOR && - (sg2d.compositeState <= sg2d.COMP_ISCOPY || - sg2d.compositeState == sg2d.COMP_XOR)) + sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR && + (sg2d.compositeState <= SunGraphics2D.COMP_ISCOPY || + sg2d.compositeState == SunGraphics2D.COMP_XOR)) { if (x11txpipe == null) { /* @@ -315,7 +315,7 @@ public abstract class X11SurfaceData extends XSurfaceData { return; } - if (sg2d.clipState == sg2d.CLIP_SHAPE) { + if (sg2d.clipState == SunGraphics2D.CLIP_SHAPE) { // Do this to init textpipe correctly; we will override the // other non-text pipes below // REMIND: we should clean this up eventually instead of @@ -329,7 +329,7 @@ public abstract class X11SurfaceData extends XSurfaceData { case SunHints.INTVAL_TEXT_ANTIALIAS_OFF: // Use X11 pipe even if DGA is available since DGA // text slows everything down when mixed with X11 calls - if (sg2d.compositeState == sg2d.COMP_ISCOPY) { + if (sg2d.compositeState == SunGraphics2D.COMP_ISCOPY) { sg2d.textpipe = x11textpipe; } else { sg2d.textpipe = solidTextRenderer; @@ -353,7 +353,7 @@ public abstract class X11SurfaceData extends XSurfaceData { case SunHints.INTVAL_TEXT_ANTIALIAS_OFF: // Use X11 pipe even if DGA is available since DGA // text slows everything down when mixed with X11 calls - if (sg2d.compositeState == sg2d.COMP_ISCOPY) { + if (sg2d.compositeState == SunGraphics2D.COMP_ISCOPY) { sg2d.textpipe = x11textpipe; } else { sg2d.textpipe = solidTextRenderer; @@ -370,10 +370,10 @@ public abstract class X11SurfaceData extends XSurfaceData { } } - if (sg2d.transformState >= sg2d.TRANSFORM_TRANSLATESCALE) { + if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) { sg2d.drawpipe = x11txpipe; sg2d.fillpipe = x11txpipe; - } else if (sg2d.strokeState != sg2d.STROKE_THIN){ + } else if (sg2d.strokeState != SunGraphics2D.STROKE_THIN){ sg2d.drawpipe = x11txpipe; sg2d.fillpipe = x11pipe; } else { @@ -398,8 +398,8 @@ public abstract class X11SurfaceData extends XSurfaceData { } public RenderLoops getRenderLoops(SunGraphics2D sg2d) { - if (sg2d.paintState <= sg2d.PAINT_ALPHACOLOR && - sg2d.compositeState <= sg2d.COMP_ISCOPY) + if (sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR && + sg2d.compositeState <= SunGraphics2D.COMP_ISCOPY) { return solidloops; } @@ -488,7 +488,7 @@ public abstract class X11SurfaceData extends XSurfaceData { makePipes(); } CompositeType comptype = sg2d.imageComp; - if (sg2d.transformState < sg2d.TRANSFORM_TRANSLATESCALE && + if (sg2d.transformState < SunGraphics2D.TRANSFORM_TRANSLATESCALE && (CompositeType.SrcOverNoEa.equals(comptype) || CompositeType.SrcNoEa.equals(comptype))) { diff --git a/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c b/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c index f41409b051e..57882b6a473 100644 --- a/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c +++ b/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c @@ -996,7 +996,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_getpwnam0(JNIEnv* env, jclass this, if (res != 0 || p == NULL || p->pw_name == NULL || *(p->pw_name) == '\0') { /* not found or error */ - if (errno != 0 && errno != ENOENT) + if (errno != 0 && errno != ENOENT && errno != ESRCH) throwUnixException(env, errno); } else { uid = p->pw_uid; @@ -1042,7 +1042,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_getgrnam0(JNIEnv* env, jclass this, retry = 0; if (res != 0 || g == NULL || g->gr_name == NULL || *(g->gr_name) == '\0') { /* not found or error */ - if (errno != 0 && errno != ENOENT) { + if (errno != 0 && errno != ENOENT && errno != ESRCH) { if (errno == ERANGE) { /* insufficient buffer size so need larger buffer */ buflen += ENT_BUF_SIZE; diff --git a/jdk/src/windows/native/java/io/io_util_md.c b/jdk/src/windows/native/java/io/io_util_md.c index 345f95588b9..787617e4895 100644 --- a/jdk/src/windows/native/java/io/io_util_md.c +++ b/jdk/src/windows/native/java/io/io_util_md.c @@ -478,7 +478,7 @@ handleSetLength(jlong fd, jlong length) { } JNIEXPORT -size_t +jint handleRead(jlong fd, void *buf, jint len) { DWORD read = 0; @@ -499,10 +499,10 @@ handleRead(jlong fd, void *buf, jint len) } return -1; } - return read; + return (jint)read; } -static size_t writeInternal(jlong fd, const void *buf, jint len, jboolean append) +static jint writeInternal(jlong fd, const void *buf, jint len, jboolean append) { BOOL result = 0; DWORD written = 0; @@ -527,16 +527,16 @@ static size_t writeInternal(jlong fd, const void *buf, jint len, jboolean append if ((h == INVALID_HANDLE_VALUE) || (result == 0)) { return -1; } - return (size_t)written; + return (jint)written; } JNIEXPORT -size_t handleWrite(jlong fd, const void *buf, jint len) { +jint handleWrite(jlong fd, const void *buf, jint len) { return writeInternal(fd, buf, len, JNI_FALSE); } JNIEXPORT -size_t handleAppend(jlong fd, const void *buf, jint len) { +jint handleAppend(jlong fd, const void *buf, jint len) { return writeInternal(fd, buf, len, JNI_TRUE); } diff --git a/jdk/src/windows/native/java/io/io_util_md.h b/jdk/src/windows/native/java/io/io_util_md.h index d979970ede0..392b8c30784 100644 --- a/jdk/src/windows/native/java/io/io_util_md.h +++ b/jdk/src/windows/native/java/io/io_util_md.h @@ -39,9 +39,9 @@ void fileOpen(JNIEnv *env, jobject this, jstring path, jfieldID fid, int flags); int handleAvailable(jlong fd, jlong *pbytes); JNIEXPORT int handleSync(jlong fd); int handleSetLength(jlong fd, jlong length); -JNIEXPORT size_t handleRead(jlong fd, void *buf, jint len); -JNIEXPORT size_t handleWrite(jlong fd, const void *buf, jint len); -JNIEXPORT size_t handleAppend(jlong fd, const void *buf, jint len); +JNIEXPORT jint handleRead(jlong fd, void *buf, jint len); +JNIEXPORT jint handleWrite(jlong fd, const void *buf, jint len); +JNIEXPORT jint handleAppend(jlong fd, const void *buf, jint len); jint handleClose(JNIEnv *env, jobject this, jfieldID fid); jlong handleLseek(jlong fd, jlong offset, jint whence); diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index 0860daf7086..5e0d3743a01 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -400,8 +400,8 @@ java/io/File/Basic.java windows-all # 6963118 java/nio/channels/Selector/Wakeup.java windows-all -# 7076700 -java/nio/channels/SocketChannel/AdaptSocket.java generic-all +# 7052549 +java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java windows-all ############################################################################ diff --git a/jdk/test/java/lang/String/CaseInsensitiveComparator.java b/jdk/test/java/lang/String/CaseInsensitiveComparator.java new file mode 100644 index 00000000000..0393932157a --- /dev/null +++ b/jdk/test/java/lang/String/CaseInsensitiveComparator.java @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2011, 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. + * + * 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. + */ + +/* + * This test tests that the String.CaseInsensitiveComparator.readResolve method + * deserializes String.CASE_INSENSITIVE_ORDER into an object which satisfies the + * equals method. + * + * @test + * @bug 5035850 + * @summary Test for String.CaseInsensitiveComparator.readResolve + */ + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; + +public class CaseInsensitiveComparator { + public static void main(String[] args) throws Exception { + Object result; + + try (ByteArrayOutputStream outBuffer = new ByteArrayOutputStream(); + ObjectOutputStream out = new ObjectOutputStream(outBuffer)) + { + out.writeObject(String.CASE_INSENSITIVE_ORDER); + out.close(); + + try (ByteArrayInputStream inBuffer = new ByteArrayInputStream(outBuffer.toByteArray()); + ObjectInputStream in = new ObjectInputStream(inBuffer)) + { + result = in.readObject(); + } + } + + if (!String.CASE_INSENSITIVE_ORDER.equals(result)) { + throw new Exception("Value restored from serial form does not equal original!"); + } + + if (!result.equals(String.CASE_INSENSITIVE_ORDER)) { + throw new Exception("Value restored from serial form does not equal original!"); + } + + if (String.CASE_INSENSITIVE_ORDER != result) { + throw new Exception("Value restored from serial form does not equal original!"); + } + } +} diff --git a/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java b/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java index 32b6c837733..9442f9b5408 100644 --- a/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java +++ b/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java @@ -63,7 +63,9 @@ public class Basic { testRead3(); testWrite1(); testWrite2(); - testTimeout(); + // skip timeout tests until 7052549 is fixed + if (!System.getProperty("os.name").startsWith("Windows")) + testTimeout(); testShutdown(); } diff --git a/jdk/test/java/util/MissingFormatArgumentException/GetFormatSpecifier.java b/jdk/test/java/util/MissingFormatArgumentException/GetFormatSpecifier.java new file mode 100644 index 00000000000..24722cf7397 --- /dev/null +++ b/jdk/test/java/util/MissingFormatArgumentException/GetFormatSpecifier.java @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2011, 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. + * + * 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. + */ + +/* + * @test + * @bug 5063455 + * @summary Unit test for MissingFormatArgumentException.getFormatSpecifier + * @author Brandon Passanisi + */ +import java.util.MissingFormatArgumentException; + +public class GetFormatSpecifier { + + static void fail(String s) { + throw new RuntimeException(s); + } + + public static void main(String[] args) { + + // Use the format specifier below, which should throw a + // MissingFormatArgumentException. Then, use getFormatSpecifier() + // to make sure the returned value equals the original format string. + final String formatSpecifier = "%1$5.3s"; + try { + String formatResult = String.format(formatSpecifier); + fail("MissingFormatArgumentException not thrown."); + } catch (MissingFormatArgumentException ex) { + final String returnedFormatSpecifier = ex.getFormatSpecifier(); + if (!returnedFormatSpecifier.equals(formatSpecifier)) { + fail("The specified format specifier: " + formatSpecifier + + " does not match the value from getFormatSpecifier(): " + + returnedFormatSpecifier); + } + } + } +} diff --git a/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.java b/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.java deleted file mode 100644 index bdaf7dbd99f..00000000000 --- a/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.java +++ /dev/null @@ -1,176 +0,0 @@ -/* - * Copyright (c) 2007, 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. - * - * 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. - */ -/* - * - */ - -/* - * This class is used by ExpirationTest.sh. See the timing information in - * the shell script. - */ - -import java.util.*; - -public class ExpirationTest { - static final Locale AUSTRIA = new Locale("de", "AT"); - static String format; - static String fileType; - - public static void main(String[] args) { - // If -latency is specified, try sleeping for 3 seconds 3 - // times to see its latency. If the latency is too large, then - // the program exits with 2. (See sleep()) - if ("-latency".equals(args[0])) { - System.out.print("Checking latency... "); - for (int i = 0; i < 3; i++) { - sleep(3); - } - System.out.println("done"); - System.exit(0); - } - - format = args[0]; - fileType = args[1]; - - Locale loc = Locale.getDefault(); - try { - Locale.setDefault(Locale.JAPAN); - ResourceBundle.Control control = new TestControl(); - ResourceBundle rb = ResourceBundle.getBundle("ExpirationData", Locale.GERMAN, - control); - check(rb.getString("data"), "German"); - - rb = ResourceBundle.getBundle("ExpirationData", AUSTRIA, control); - check(rb.getString("january"), "Januar"); - - // Wait until the instance gets expired in the cache in 7 seconds. - sleep(7); - - // At this point, it should be determined that reloading is not needed. - rb = ResourceBundle.getBundle("ExpirationData", Locale.GERMAN, control); - check(rb.getString("data"), "German"); - - rb = ResourceBundle.getBundle("ExpirationData", AUSTRIA, control); - check(rb.getString("january"), "Januar"); - - // Wait until the instance in the cache gets expired again and - // ExpirationData_de gets updated. - // 33 = 40 - 7 (See the timing chart in ExpirationTest.sh) - sleep(33); - - // At this point, getBundle must reload the updated - // ExpirationData_de and ExpirationData_de_AT must be - // avaible. - - rb = ResourceBundle.getBundle("ExpirationData", Locale.GERMAN, control); - try { - check(rb.getString("data"), "Deutsch"); - } catch (RuntimeException e) { - if (format.equals("class")) { - // Class loader doesn't load updated classes. - System.out.println("Known class limitation: " + e.getMessage()); - } - } - - rb = ResourceBundle.getBundle("ExpirationData", AUSTRIA, control); - try { - check(rb.getString("january"), "J\u00e4nner"); - } catch (RuntimeException e) { - if (fileType.equals("jar")) { - // Jar doesn't load new entries. - System.out.println("Known jar limitation: " + e.getMessage()); - } else { - throw e; - } - } - } finally { - Locale.setDefault(loc); - } - } - - private static void check(String s, String expected) { - String time = getTime(); - if (!s.equals(expected)) { - throw new RuntimeException("got '" + s + "', expected '" + expected + "' at " - + time); - } - System.out.println("ExpirationTest: got '" + s + "' at " + time); - } - - private static void sleep(int seconds) { - long millis = seconds * 1000; - long start = System.currentTimeMillis(); - try { - Thread.sleep(millis); - } catch (InterruptedException e) { - } - long end = System.currentTimeMillis(); - long latency = end - start - millis; - // If the latecy is more than 1% of the requested sleep time, - // then give up the testing. - if (latency > millis/100) { - System.err.printf("Latency is too large: slept for %d [ms], " - + "expected %d [ms] latency rate: %+.2f%% (expected not more than 1%%)%n" - + "exiting...%n", - end - start, millis, (double)latency*100.0/millis); - System.exit(2); - } - } - - private static final String getTime() { - return new Date().toString().substring(11, 19); - } - - private static class TestControl extends ResourceBundle.Control { - @Override - public long getTimeToLive(String name, Locale loc) { - return 5000; // 5 seconds - } - - @Override - public ResourceBundle newBundle(String name, Locale loc, - String fmt, ClassLoader cl, boolean reload) - throws IllegalAccessException, InstantiationException, java.io.IOException { - ResourceBundle bundle = super.newBundle(name, loc, fmt, cl, reload); - if (bundle != null) { - System.out.println("newBundle: " + (reload ? "**re" : "") - + "loaded '" + toName(name, loc , fmt) + "' at " + getTime()); - } - return bundle; - } - - @Override - public boolean needsReload(String name, Locale loc, - String fmt, ClassLoader cl, - ResourceBundle rb, long time) { - boolean b = super.needsReload(name, loc, fmt, cl, rb, time); - System.out.println("needsReload: '" + b + "' for " + toName(name, loc, fmt) - + " at " + getTime()); - return b; - } - - private String toName(String name, Locale loc, String fmt) { - return toResourceName(toBundleName(name, loc), fmt.substring(5)); - } - } -} diff --git a/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh b/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh deleted file mode 100644 index e798bf9330d..00000000000 --- a/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh +++ /dev/null @@ -1,331 +0,0 @@ -# -# Copyright (c) 2007, 2010, 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. -# -# 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. -# -# @test -# @bug 4212439 5102289 6272156 -# @summary Tests for expiration control and reloading expired resource bundles. -# @build ExpirationTest -# @run shell/timeout=300 ExpirationTest.sh - -# -# Timings of the test sequence -# -# 0 5 7 10 20 40 [seconds] -# +---------+----+------+------//------+------//------+-- -# g X g X U g [event] -# -# 0 g - java starts; the first getBundle call gets "German"; -# sleep for 7 sec -# 5 X - the bundle expires (every 5 seconds) -# 7 g - java wakes up; the second getBundle call still gets "German"; -# sleep for 33 sec -# 10 X - the bundle expires in the cache -# 20 U - shell script updates DE and add AT -# 40 g - java wakes up; third getBundle call; gets "Deutsch" -# -# event: g - getBundle, X - eXpire, U - Update -# -# -# ExpirationTest.java uses 3 exit values. -# 0 - passed -# 1 - failed -# 2 - can't proceed due to slow platform -# - -# Check environment variables -if [ "x$TESTJAVA" = "x" ]; then - 1>&2 echo "No TESTJAVA defined. exiting..." - exit 1 -fi - -# Make sure that this test is run in C locale -LANG=C -export LANG -LC_ALL= -export LC_ALL - -: ${TESTCLASSES:=.} - -# YES if the platform has %s support in date -HAS_S=NO - -case "`uname`" in -Windows* | CYGWIN* ) - DEL=";" - ;; -SunOS) - DEL=":" - ;; -Linux) - DEL=":" - HAS_S=YES - ;; -esac - -# Interval until resources are updated -INTERVAL=20 - -DATA=ExpirationData - -ROOT=${DATA}.properties -JA=${DATA}_ja.properties -DE=${DATA}_de.properties -AT=${DATA}_de_AT.properties - -JARFILE=data.jar - -createProperties() { - rm -f ${DATA}*.properties - echo "data: English" > $ROOT - (echo "data: Japanese"; echo "january: 1gatsu") > $JA - (echo "data: German"; echo "january: Januar") > $DE - echo "Properties files have been created at `date +%T`" -} - -createJar() { - if [ "$FORMAT" = "properties" ]; then - createProperties - F="${DATA}*.properties" - else - createClasses - F="-C classes ${ROOT}.class -C classes ${JA}.class -C classes ${DE}.class" - fi - ${TESTJAVA}/bin/jar cf $JARFILE $F - ${TESTJAVA}/bin/jar tvf $JARFILE - rm -f ${DATA}*.properties - echo "Jar created at `date +%T`" -} - -createClasses() { - rm -f ${DATA}*.java - rm -rf classes - mkdir classes - createJava $ROOT English - createJava $JA Japanese - createJava $DE German Januar - ${TESTJAVA}/bin/javac -d classes ${ROOT}.java ${JA}.java ${DE}.java - echo "Created" classes/*.class "at `date +%T`" -} - -createJava() { - (echo " -import java.util.*; - -public class $1 extends ListResourceBundle { - public Object[][] getContents() { - return new Object[][] { - { \"data\", \"$2\" }," - if [ "x$3" != "x" ]; then - echo " { \"january\", \"$3\" }," - fi -echo " }; - } -}") >$1.java -} - -updateDEaddAT() { - rm -f $DE - (echo "data=Deutsch"; echo "january=Januar") > $DE - # add de_AT - echo "january=J\u00e4nner" > $AT - echo "Updated '"${DE}"' and added '"${AT}"' at `date +%T`" -} - -updateClassDEaddClassAT() { - rm -f $DE.java classes/$DE.class - createJava $DE Deutsch Januar - ${TESTJAVA}/bin/javac -d classes ${DE}.java - createJava $AT Deutsch "J\\u00e4nner" - ${TESTJAVA}/bin/javac -d classes ${AT}.java - echo "Updated '"${DE}"' class and added '"${AT}"' class at `date +%T`" -} - -updateJar() { - if [ "$FORMAT" = "properties" ]; then - updateDEaddAT - F="$DE $AT" - else - updateClassDEaddClassAT - F="-C classes ${DE}.class -C classes ${AT}.class" - fi - ${TESTJAVA}/bin/jar uf $JARFILE $F - rm -f $DE $AT - echo "Updated '"${JARFILE}"' at `date +%T`" - ${TESTJAVA}/bin/jar tvf $JARFILE -} - -getSeconds() { - if [ "$HAS_S" = "YES" ]; then - date '+%s' - else - # Returns an approximation of the offset from the Epoch in - # seconds. - date -u '+%Y %j %H %M %S' | \ - awk '{d=($1-1970)*365.2425; print int(((((((d+$2-1)*24)+$3)*60)+$3)*60)+$5);}' - fi -} - -# -# Execute $1 and check how long it takes -# -timedExec() { - S=`getSeconds` - eval $1 - E=`getSeconds` - D=`expr $E - $S` - # - # If this machine is too slow, give up the further testing. - # - if [ "$D" -gt $2 ]; then - 1>&2 echo "This machine took $D seconds to prepare test data," \ - "which is too slow to proceed. Exiting..." - exit 0 - fi - unset S - unset E - unset D -} - -checkStatus() { - if [ $1 = 0 ]; then - echo "$2: PASSED" - elif [ $1 != 2 ]; then - echo "$2: FAILED" - exit 1 - else - # Just we should't proceed to avoid timing issues. - exit 0 - fi -} - -# -# Before starting tests, check the latency with Thread.sleep(). -# -${TESTJAVA}/bin/java -cp "${TESTCLASSES}${DEL}." ExpirationTest -latency -STATUS=$? -if [ $STATUS = 2 ]; then - exit 0 -fi - -# -# Tests for properties -# -FORMAT=properties - -# -# Test with plain files (properties) -# -echo "Starting test with properties files at `date +%T`" - -# -# Creates properties files -# -timedExec createProperties 10 - -# -# Execute a child process which will update files in $INTERVAL seconds. -# -(sleep $INTERVAL; updateDEaddAT; exit 0) & - -${TESTJAVA}/bin/java -cp "${TESTCLASSES}${DEL}." ExpirationTest properties file -STATUS=$? -wait -checkStatus $STATUS "Test with properties files" - -# -# Test with jar file if jar is available (properties) -# -if [ -x ${TESTJAVA}/bin/jar ] || [ -x ${TESTJAVA}/bin/jar.exe ]; then - HASJAR=YES -else - HASJAR=NO -fi - -if [ $HASJAR = YES ]; then - echo "" - echo "Starting test with a jar file (properties) at `date +%T`" - - # - # Create a jar files with properties - # - timedExec createJar 10 - - (sleep $INTERVAL; updateJar; exit 0) & - ${TESTJAVA}/bin/java -cp "${TESTCLASSES}${DEL}${JARFILE}" ExpirationTest properties jar - STATUS=$? - wait - checkStatus $STATUS "Test with a jar file (properties)" -fi - -# -# Test for classes -# - -# Note: class-based resource bundles can't be reloaded due to the -# cache support in class loaders. So the results of the test cases -# below are not checked. (Test cases always pass.) - -# If there's no javac available, then give up the test with -# class-based properties. -if [ ! -x ${TESTJAVA}/bin/javac ] && [ ! -x ${TESTJAVA}/bin/javac.exe ]; then - exit 0 -fi - -rm -f ${DATA}*.properties $JARFILE - -FORMAT=class -ROOT=`basename $ROOT .properties` -JA=`basename $JA .properties` -DE=`basename $DE .properties` -AT=`basename $AT .properties` - -echo "" -echo "Starting test with class files at `date +%T`" - -# -# Create class files -# -timedExec createClasses 10 - -(sleep $INTERVAL; updateClassDEaddClassAT; exit 0) & -${TESTJAVA}/bin/java -cp "${TESTCLASSES}${DEL}classes" ExpirationTest class file -STATUS=$? -wait -checkStatus $STATUS "Test with class files" - -if [ $HASJAR = YES ]; then - echo "" - echo "Starting test with a jar file (class) at `date +%T`" - - # - # Create a jar file with class files - # - timedExec createJar 10 - - (sleep $INTERVAL; updateJar; exit 0) & - ${TESTJAVA}/bin/java -cp "${TESTCLASSES}${DEL}${JARFILE}" ExpirationTest class jar - STATUS=$? - wait - checkStatus $STATUS "Test with a jar file (class)" -fi - -exit 0 diff --git a/jdk/test/java/util/zip/DeInflate.java b/jdk/test/java/util/zip/DeInflate.java new file mode 100644 index 00000000000..c3ca7acf71f --- /dev/null +++ b/jdk/test/java/util/zip/DeInflate.java @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2011, 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. + * + * 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. + */ + +/** + * @test + * @bug 7110149 + * @summary Test basic deflater & inflater functionality + */ + +import java.io.*; +import java.util.*; +import java.util.zip.*; + +public class DeInflate { + + static void check(Deflater compresser, byte[] in, int len, + byte[] out1, byte[] out2, boolean nowrap) + throws Throwable + { + Arrays.fill(out1, (byte)0); + Arrays.fill(out2, (byte)0); + + compresser.setInput(in, 0, len); + compresser.finish(); + int m = compresser.deflate(out1); + + Inflater decompresser = new Inflater(nowrap); + decompresser.setInput(out1, 0, m); + int n = decompresser.inflate(out2); + + if (n != len || + !Arrays.equals(Arrays.copyOf(in, len), Arrays.copyOf(out2, len)) || + decompresser.inflate(out2) != 0) { + System.out.printf("m=%d, n=%d, len=%d, eq=%b%n", + m, n, len, Arrays.equals(in, out2)); + throw new RuntimeException("De/inflater failed:" + compresser); + } + } + + public static void main(String[] args) throws Throwable { + byte[] dataIn = new byte[1024 * 512]; + new Random().nextBytes(dataIn); + byte[] dataOut1 = new byte[dataIn.length + 1024]; + byte[] dataOut2 = new byte[dataIn.length]; + boolean wrap[] = new boolean[] { false, true }; + + for (int level = Deflater.DEFAULT_COMPRESSION; + level <= Deflater.BEST_COMPRESSION; level++) { + System.out.print("level=" + level + ", strategy= "); + for (int strategy = Deflater.DEFAULT_STRATEGY; + strategy <= Deflater.HUFFMAN_ONLY; strategy++) { + System.out.print(" " + strategy + " nowrap["); + for (int dowrap = 0; dowrap <= 1; dowrap++) { + System.out.print(" " + wrap[dowrap]); + for (int i = 0; i < 5; i++) { + Deflater def = new Deflater(level, wrap[dowrap]); + if (strategy != Deflater.DEFAULT_STRATEGY) { + def.setStrategy(strategy); + // The first invocation after setLevel/Strategy() + // with a different level/stragety returns 0, if + // there is no need to flush out anything for the + // previous setting/"data", this is tricky and + // appears un-documented. + def.deflate(dataOut2); + } + int len = (i == 0)? dataIn.length + : new Random().nextInt(dataIn.length); + check(def, dataIn, len, dataOut1, dataOut2, wrap[dowrap]); + } + } + System.out.print("] "); + } + System.out.println(); + } + } +} diff --git a/jdk/test/java/util/zip/TimeChecksum.java b/jdk/test/java/util/zip/TimeChecksum.java new file mode 100644 index 00000000000..cc81f1e7592 --- /dev/null +++ b/jdk/test/java/util/zip/TimeChecksum.java @@ -0,0 +1,205 @@ +/* + * Copyright (c) 2011, 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. + * + * 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. + */ + + +/* @test + * @bug 7109837 + * @summary Test Adler32/CRC32.update(ByteBuffer) + */ + +import java.util.*; +import java.util.zip.*; +import java.nio.*; + +public class TimeChecksum { + + static long time(Adler32 adler32, byte[] data, int iters, int len) { + long start_t = System.nanoTime(); + for (int i = 0; i < iters; i++) { + adler32.reset(); + adler32.update(data, 0, len); + } + long t = System.nanoTime() - start_t; + System.out.printf("%,12d", t / len); + return t; + } + + static long time(Adler32 adler32, ByteBuffer buf, int iters) { + long start_t = System.nanoTime(); + for (int i = 0; i < iters; i++) { + adler32.reset(); + buf.mark(); + adler32.update(buf); + buf.reset(); + } + long t = System.nanoTime() - start_t; + System.out.printf("%,12d", t / buf.remaining()); + return t; + } + + static void testPosLimit(Adler32 adler32, ByteBuffer buf) { + int pos = buf.position(); + int limit = buf.limit(); + adler32.update(buf); + if (limit != buf.position() || limit != buf.limit()) { + System.out.printf("%nFAILED: pos,limit=(%d, %d), expected (%d, %d)%n", + buf.position(), buf.limit(), limit, limit); + throw new RuntimeException(); + } + buf.position(pos); + } + + static long time(CRC32 crc32, byte[] data, int iters, int len) { + long start_t = System.nanoTime(); + for (int i = 0; i < iters; i++) { + crc32.reset(); + crc32.update(data, 0, len); + } + long t = System.nanoTime() - start_t; + System.out.printf("%,12d", t / len); + return t; + } + + static long time(CRC32 crc32, ByteBuffer buf, int iters) { + long start_t = System.nanoTime(); + for (int i = 0; i < iters; i++) { + crc32.reset(); + buf.mark(); + crc32.update(buf); + buf.reset(); + } + long t = System.nanoTime() - start_t; + System.out.printf("%,12d", t / buf.remaining()); + return t; + } + + static void testPosLimit(CRC32 crc32, ByteBuffer buf) { + int pos = buf.position(); + int limit = buf.limit(); + crc32.update(buf); + if (limit != buf.position() || limit != buf.limit()) { + System.out.printf("%nFAILED: pos,limit=(%d, %d), expected (%d, %d)%n", + buf.position(), buf.limit(), limit, limit); + throw new RuntimeException(); + } + buf.position(pos); + } + + public static void main(String[] args) { + int len = 1024 * 32; + int iters = 1; + if (args.length != 0 && "-benchmark".equals(args[0])) + iters = 100000; + Adler32 adler32 = new Adler32(); + CRC32 crc32 = new CRC32(); + Random rdm = new Random(); + byte[] data = new byte[len]; + new Random().nextBytes(data); + ByteBuffer buf; + + System.out.println("---------- Adler32 ----------"); + System.out.print("Warmup..."); + time(adler32, data, iters, len); + time(adler32, ByteBuffer.wrap(data), iters); + buf = ByteBuffer.allocateDirect(len); + buf.put(data, 0, len); + buf.flip(); + time(adler32, buf, iters); + System.out.println("\n"); + + System.out.println("Length byte[](ns/len) ByteBuffer(direct) ByteBuffer"); + for (int testlen = 1; testlen < data.length; testlen <<= 1) { + System.out.print(testlen + "\t"); + long baT = time(adler32, data, iters, testlen); + long baV = adler32.getValue(); + System.out.print("\t"); + + buf = ByteBuffer.allocateDirect(testlen); + buf.put(data, 0, testlen); + buf.flip(); + long bbdT = time(adler32, buf, iters); + long bbdV = adler32.getValue(); + if (baV != bbdV) { + System.out.printf("%nFAILED: baV=%x,bbdV=%x%n", baV, bbdV); + throw new RuntimeException(); + } + System.out.printf(" (%.2f)", (float)bbdT/baT); + testPosLimit(adler32, buf); + + buf = ByteBuffer.allocate(testlen); + buf.put(data, 0, testlen); + buf.flip(); + long bbT = time(adler32, buf, iters); + long bbV = adler32.getValue(); + if (baV != bbV) { + System.out.printf("%nFAILED: baV=%x,bbV=%x%n", baV, bbV); + throw new RuntimeException(); + } + testPosLimit(adler32, buf); + System.out.printf(" (%.2f) checksum=%x%n", (float)bbT/baT, bbV); + } + + System.out.println("\n---------- CRC32 ----------"); + System.out.print("Warmup..."); + time(crc32, data, iters, len); + time(crc32, ByteBuffer.wrap(data), iters); + buf = ByteBuffer.allocateDirect(len); + buf.put(data, 0, len); + buf.flip(); + time(crc32, buf, iters); + System.out.println("\n"); + + + System.out.println("Length byte[](ns/len) ByteBuffer(direct) ByteBuffer"); + for (int testlen = 1; testlen < data.length; testlen <<= 1) { + System.out.print(testlen + "\t"); + long baT = time(crc32, data, iters, testlen); + long baV = crc32.getValue(); + System.out.print("\t"); + + buf = ByteBuffer.allocateDirect(testlen); + buf.put(data, 0, testlen); + buf.flip(); + long bbdT = time(crc32, buf, iters); + long bbdV = crc32.getValue(); + if (baV != bbdV) { + System.out.printf("%nFAILED: baV=%x,bbdV=%x%n", baV, bbdV); + throw new RuntimeException(); + } + System.out.printf(" (%.2f)", (float)bbdT/baT); + testPosLimit(crc32, buf); + + buf = ByteBuffer.allocate(testlen); + buf.put(data, 0, testlen); + buf.flip(); + long bbT = time(crc32, buf, iters); + long bbV = crc32.getValue(); + if (baV != bbV) { + System.out.printf("%nFAILED: baV=%x,bbV=%x%n", baV, bbV); + throw new RuntimeException(); + } + testPosLimit(crc32, buf); + System.out.printf(" (%.2f) checksum=%x%n", (float)bbT / baT, bbV); + } + } +} diff --git a/jdk/test/java/util/zip/ZipFile/ClearStaleZipFileInputStreams.java b/jdk/test/java/util/zip/ZipFile/ClearStaleZipFileInputStreams.java index 4c05fa56bb3..d1be7dc9cc6 100644 --- a/jdk/test/java/util/zip/ZipFile/ClearStaleZipFileInputStreams.java +++ b/jdk/test/java/util/zip/ZipFile/ClearStaleZipFileInputStreams.java @@ -63,11 +63,9 @@ public class ClearStaleZipFileInputStreams { File.createTempFile("test-data" + compression, ".zip"); tempZipFile.deleteOnExit(); - ZipOutputStream zos = - new ZipOutputStream(new FileOutputStream(tempZipFile)); - zos.setLevel(compression); - - try { + try (FileOutputStream fos = new FileOutputStream(tempZipFile); + ZipOutputStream zos = new ZipOutputStream(fos)) { + zos.setLevel(compression); for (int i = 0; i < ZIP_ENTRY_NUM; i++) { String text = "Entry" + i; ZipEntry entry = new ZipEntry(text); @@ -78,33 +76,47 @@ public class ClearStaleZipFileInputStreams { zos.closeEntry(); } } - } finally { - zos.close(); } return tempZipFile; } - private static void startGcInducingThread(final int sleepMillis) { - final Thread gcInducingThread = new Thread() { - public void run() { - while (true) { - System.gc(); - try { - Thread.sleep(sleepMillis); - } catch (InterruptedException e) { } + private static final class GcInducingThread extends Thread { + private final int sleepMillis; + private boolean keepRunning = true; + + public GcInducingThread(final int sleepMillis) { + this.sleepMillis = sleepMillis; + } + + public synchronized void run() { + while (keepRunning) { + System.gc(); + try { + wait(sleepMillis); + } catch (InterruptedException e) { + System.out.println("GCing thread unexpectedly interrupted"); + return; } } - }; + } - gcInducingThread.setDaemon(true); - gcInducingThread.start(); + public synchronized void shutDown() { + keepRunning = false; + notifyAll(); + } } public static void main(String[] args) throws Exception { - startGcInducingThread(500); - runTest(ZipOutputStream.DEFLATED); - runTest(ZipOutputStream.STORED); + GcInducingThread gcThread = new GcInducingThread(500); + gcThread.start(); + try { + runTest(ZipOutputStream.DEFLATED); + runTest(ZipOutputStream.STORED); + } finally { + gcThread.shutDown(); + gcThread.join(); + } } private static void runTest(int compression) throws Exception { @@ -113,21 +125,16 @@ public class ClearStaleZipFileInputStreams { System.out.println("Testing with a zip file with compression level = " + compression); File f = createTestFile(compression); - try { - ZipFile zf = new ZipFile(f); - try { - Set refSet = createTransientInputStreams(zf, rq); + try (ZipFile zf = new ZipFile(f)) { + Set refSet = createTransientInputStreams(zf, rq); - System.out.println("Waiting for 'stale' input streams from ZipFile to be GC'd ..."); - System.out.println("(The test will hang on failure)"); - while (false == refSet.isEmpty()) { - refSet.remove(rq.remove()); - } - System.out.println("Test PASSED."); - System.out.println(); - } finally { - zf.close(); + System.out.println("Waiting for 'stale' input streams from ZipFile to be GC'd ..."); + System.out.println("(The test will hang on failure)"); + while (false == refSet.isEmpty()) { + refSet.remove(rq.remove()); } + System.out.println("Test PASSED."); + System.out.println(); } finally { f.delete(); } diff --git a/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java b/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java index 3892054c2d0..83485d5f134 100644 --- a/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java +++ b/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java @@ -154,8 +154,7 @@ public class Basic { /* run javac */ static void compile(String... args) { debug("Running: javac " + Arrays.toString(args)); - com.sun.tools.javac.Main compiler = new com.sun.tools.javac.Main(); - if (compiler.compile(args) != 0) { + if (com.sun.tools.javac.Main.compile(args) != 0) { throw new RuntimeException("javac failed: args=" + Arrays.toString(args)); } } @@ -259,7 +258,7 @@ public class Basic { URLClassLoader loader = getLoader(baseURL); httpServer.reset(); - Class messageServiceClass = null; + Class messageServiceClass = null; try { messageServiceClass = loader.loadClass(serviceClass); } catch (ClassNotFoundException cnfe) { @@ -267,7 +266,7 @@ public class Basic { throw new RuntimeException("Error in test: " + cnfe); } - Iterator> iterator = sun.misc.Service.providers(messageServiceClass, loader); + Iterator iterator = sun.misc.Service.providers(messageServiceClass, loader); if (expectToFind && !iterator.hasNext()) { debug(messageServiceClass + " NOT found."); return false; @@ -301,7 +300,7 @@ public class Basic { URLClassLoader loader = getLoader(baseURL); httpServer.reset(); - Class messageServiceClass = null; + Class messageServiceClass = null; try { messageServiceClass = loader.loadClass(serviceClass); } catch (ClassNotFoundException cnfe) { @@ -309,7 +308,7 @@ public class Basic { throw new RuntimeException("Error in test: " + cnfe); } - Iterator> iterator = (ServiceLoader.load(messageServiceClass, loader)).iterator(); + Iterator iterator = (ServiceLoader.load(messageServiceClass, loader)).iterator(); if (expectToFind && !iterator.hasNext()) { debug(messageServiceClass + " NOT found."); return false; @@ -345,7 +344,7 @@ public class Basic { URLClassLoader loader = getLoader(baseURL); httpServer.reset(); - Class ADotAKlass = null; + Class ADotAKlass = null; try { ADotAKlass = loader.loadClass("a.A"); } catch (ClassNotFoundException cnfe) { diff --git a/jdk/test/sun/security/krb5/auto/CrossRealm.java b/jdk/test/sun/security/krb5/auto/CrossRealm.java index ecaafedaa62..21927b6f8a8 100644 --- a/jdk/test/sun/security/krb5/auto/CrossRealm.java +++ b/jdk/test/sun/security/krb5/auto/CrossRealm.java @@ -65,7 +65,6 @@ public class CrossRealm implements CallbackHandler { "forwardable=true", "[domain_realm]", ".snake.hole=SNAKE.HOLE"); - new File("krb5-localkdc.conf").deleteOnExit(); System.setProperty("java.security.krb5.conf", "krb5-localkdc.conf"); } @@ -73,7 +72,6 @@ public class CrossRealm implements CallbackHandler { Security.setProperty("auth.login.defaultCallbackHandler", "CrossRealm"); System.setProperty("java.security.auth.login.config", "jaas-localkdc.conf"); System.setProperty("javax.security.auth.useSubjectCredsOnly", "false"); - new File("jaas-localkdc.conf").deleteOnExit(); FileOutputStream fos = new FileOutputStream("jaas-localkdc.conf"); fos.write(("com.sun.security.jgss.krb5.initiate {\n" + " com.sun.security.auth.module.Krb5LoginModule\n" + diff --git a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java b/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java index aab6b92137e..19f3355ce09 100644 --- a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java +++ b/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java @@ -178,7 +178,6 @@ public class HttpNegotiateServer { " com.sun.security.auth.module.Krb5LoginModule required;\n};\n" ).getBytes()); fos.close(); - f.deleteOnExit(); HttpServer h1 = httpd("Negotiate", false, "HTTP/" + WEB_HOST + "@" + REALM_WEB, KRB5_TAB); diff --git a/jdk/test/sun/security/krb5/auto/KDC.java b/jdk/test/sun/security/krb5/auto/KDC.java index 9d924f6e8d4..13cad02b954 100644 --- a/jdk/test/sun/security/krb5/auto/KDC.java +++ b/jdk/test/sun/security/krb5/auto/KDC.java @@ -1071,7 +1071,6 @@ public class KDC { } cache.update(credentials); cache.save(); - new File(ccache).deleteOnExit(); } return result; diff --git a/jdk/test/sun/security/krb5/auto/OkAsDelegateXRealm.java b/jdk/test/sun/security/krb5/auto/OkAsDelegateXRealm.java index e5c7527cc5b..7d855996839 100644 --- a/jdk/test/sun/security/krb5/auto/OkAsDelegateXRealm.java +++ b/jdk/test/sun/security/krb5/auto/OkAsDelegateXRealm.java @@ -109,9 +109,6 @@ public class OkAsDelegateXRealm implements CallbackHandler { System.setProperty("java.security.auth.login.config", "jaas-localkdc.conf"); - new File("krb5-localkdc.conf").deleteOnExit(); - new File("localkdc.ktab").deleteOnExit(); - new File("jaas-localkdc.conf").deleteOnExit(); Config.refresh(); Context c = Context.fromJAAS("com.sun.security.jgss.krb5.initiate"); diff --git a/jdk/test/sun/security/krb5/auto/OneKDC.java b/jdk/test/sun/security/krb5/auto/OneKDC.java index 79a883017e3..76841af8fd2 100644 --- a/jdk/test/sun/security/krb5/auto/OneKDC.java +++ b/jdk/test/sun/security/krb5/auto/OneKDC.java @@ -76,8 +76,6 @@ public class OneKDC extends KDC { Config.refresh(); writeKtab(KTAB); - new File(KRB5_CONF).deleteOnExit(); - new File(KTAB).deleteOnExit(); } /** @@ -114,7 +112,6 @@ public class OneKDC extends KDC { " isInitiator=false;\n};\n" ).getBytes()); fos.close(); - f.deleteOnExit(); Security.setProperty("auth.login.defaultCallbackHandler", "OneKDC$CallbackForClient"); } diff --git a/jdk/test/sun/security/krb5/auto/SSL.java b/jdk/test/sun/security/krb5/auto/SSL.java index eca535051fc..496097bbc8c 100644 --- a/jdk/test/sun/security/krb5/auto/SSL.java +++ b/jdk/test/sun/security/krb5/auto/SSL.java @@ -96,7 +96,6 @@ public class SSL { " storeKey=true;\n};\n" ).getBytes()); fos.close(); - f.deleteOnExit(); Context c; final Context s = Context.fromJAAS("ssl"); diff --git a/jdk/test/sun/security/krb5/auto/W83.java b/jdk/test/sun/security/krb5/auto/W83.java index 5c5e9af5cb3..8ac419b5774 100644 --- a/jdk/test/sun/security/krb5/auto/W83.java +++ b/jdk/test/sun/security/krb5/auto/W83.java @@ -52,8 +52,6 @@ public class W83 { Config.refresh(); kdc.writeKtab(OneKDC.KTAB); - new File(OneKDC.KRB5_CONF).deleteOnExit(); - new File(OneKDC.KTAB).deleteOnExit(); KeyTab ktab = KeyTab.getInstance(OneKDC.KTAB); for (int etype: EType.getBuiltInDefaults()) { diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngineResult/Deserialize.java b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngineResult/Deserialize.java index e92c494909e..af116cd3b4d 100644 --- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngineResult/Deserialize.java +++ b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngineResult/Deserialize.java @@ -42,7 +42,6 @@ public class Deserialize { SSLEngineResult.Status obj = SSLEngineResult.Status.OK; File file = new File("deserial-test-file"); - file.deleteOnExit(); ObjectOutputStream oos = new ObjectOutputStream( new FileOutputStream(file)); diff --git a/langtools/.hgtags b/langtools/.hgtags index 5f0471bbe3a..bdd213cf593 100644 --- a/langtools/.hgtags +++ b/langtools/.hgtags @@ -136,3 +136,4 @@ f6c783e18bdf4d46a0ab273868afebbf32600ff7 jdk8-b10 f2d6ed25857dfa7f269ac66e13666d648cb988c6 jdk8-b12 ae25163501bc7477cd907e26a006a6f1b05fdb6d jdk8-b13 58f1325d72b2bacc901f5189ee5e4e81e81ea657 jdk8-b14 +07599bd780cab1f40da7915e1dc6774629b0cf8c jdk8-b15 diff --git a/langtools/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java b/langtools/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java new file mode 100644 index 00000000000..61ae45aef87 --- /dev/null +++ b/langtools/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2011, 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.source.tree; + +import java.util.List; + +/** + * A tree node for a lambda expression. + * + * For example: + * 
    + *   ()->{}
+ *   (List ls)->ls.size()
+ *   (x,y)-> { return x + y; }
+ *
    + */ +public interface LambdaExpressionTree extends ExpressionTree { + + /** + * Lambda expressions come in two forms: (i) expression lambdas, whose body + * is an expression, and (ii) statement lambdas, whose body is a block + */ + public enum BodyKind { + /** enum constant for expression lambdas */ + EXPRESSION, + /** enum constant for statement lambdas */ + STATEMENT; + } + + List getParameters(); + Tree getBody(); + BodyKind getBodyKind(); +} diff --git a/langtools/src/share/classes/com/sun/source/tree/MemberReferenceTree.java b/langtools/src/share/classes/com/sun/source/tree/MemberReferenceTree.java new file mode 100644 index 00000000000..68efd16dc36 --- /dev/null +++ b/langtools/src/share/classes/com/sun/source/tree/MemberReferenceTree.java @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2011, 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.source.tree; + +import java.util.List; + +import javax.lang.model.element.Name; + +/** + * A tree node for a member reference expression. + * + * For example: + * 
    + *   expression # [ identifier | new ]
+ *
    + * + * @see JSR 292 + */ +public interface MemberReferenceTree extends ExpressionTree { + + /** + * There are two kinds of member references: (i) method references and + * (ii) constructor references + */ + public enum ReferenceMode { + /** enum constant for method references */ + INVOKE, + /** enum constant for constructor references */ + NEW + } + ReferenceMode getMode(); + ExpressionTree getQualifierExpression(); + Name getName(); + List getTypeArguments(); +} diff --git a/langtools/src/share/classes/com/sun/source/tree/Tree.java b/langtools/src/share/classes/com/sun/source/tree/Tree.java index 5e26c18936c..a558e9e5999 100644 --- a/langtools/src/share/classes/com/sun/source/tree/Tree.java +++ b/langtools/src/share/classes/com/sun/source/tree/Tree.java @@ -131,6 +131,11 @@ public interface Tree { */ MEMBER_SELECT(MemberSelectTree.class), + /** + * Used for instances of {@link MemberReferenceTree}. + */ + MEMBER_REFERENCE(MemberReferenceTree.class), + /** * Used for instances of {@link ForLoopTree}. */ @@ -186,6 +191,11 @@ public interface Tree { */ NEW_CLASS(NewClassTree.class), + /** + * Used for instances of {@link LambdaExpressionTree}. + */ + LAMBDA_EXPRESSION(LambdaExpressionTree.class), + /** * Used for instances of {@link ParenthesizedTree}. */ diff --git a/langtools/src/share/classes/com/sun/source/tree/TreeVisitor.java b/langtools/src/share/classes/com/sun/source/tree/TreeVisitor.java index ffaf0c3e563..dd3cfcbf699 100644 --- a/langtools/src/share/classes/com/sun/source/tree/TreeVisitor.java +++ b/langtools/src/share/classes/com/sun/source/tree/TreeVisitor.java @@ -85,9 +85,11 @@ public interface TreeVisitor { R visitModifiers(ModifiersTree node, P p); R visitNewArray(NewArrayTree node, P p); R visitNewClass(NewClassTree node, P p); + R visitLambdaExpression(LambdaExpressionTree node, P p); R visitParenthesized(ParenthesizedTree node, P p); R visitReturn(ReturnTree node, P p); R visitMemberSelect(MemberSelectTree node, P p); + R visitMemberReference(MemberReferenceTree node, P p); R visitEmptyStatement(EmptyStatementTree node, P p); R visitSwitch(SwitchTree node, P p); R visitSynchronized(SynchronizedTree node, P p); diff --git a/langtools/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java b/langtools/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java index fc406b457d7..04e69161b4e 100644 --- a/langtools/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java +++ b/langtools/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java @@ -172,6 +172,10 @@ public class SimpleTreeVisitor implements TreeVisitor { return defaultAction(node, p); } + public R visitLambdaExpression(LambdaExpressionTree node, P p) { + return defaultAction(node, p); + } + public R visitParenthesized(ParenthesizedTree node, P p) { return defaultAction(node, p); } @@ -208,6 +212,10 @@ public class SimpleTreeVisitor implements TreeVisitor { return defaultAction(node, p); } + public R visitMemberReference(MemberReferenceTree node, P p) { + return defaultAction(node, p); + } + public R visitIdentifier(IdentifierTree node, P p) { return defaultAction(node, p); } diff --git a/langtools/src/share/classes/com/sun/source/util/TreeScanner.java b/langtools/src/share/classes/com/sun/source/util/TreeScanner.java index e87189dcc3c..3619f31358e 100644 --- a/langtools/src/share/classes/com/sun/source/util/TreeScanner.java +++ b/langtools/src/share/classes/com/sun/source/util/TreeScanner.java @@ -285,6 +285,12 @@ public class TreeScanner implements TreeVisitor { return r; } + public R visitLambdaExpression(LambdaExpressionTree node, P p) { + R r = scan(node.getParameters(), p); + r = scanAndReduce(node.getBody(), p, r); + return r; + } + public R visitParenthesized(ParenthesizedTree node, P p) { return scan(node.getExpression(), p); } @@ -333,6 +339,12 @@ public class TreeScanner implements TreeVisitor { return scan(node.getExpression(), p); } + public R visitMemberReference(MemberReferenceTree node, P p) { + R r = scan(node.getQualifierExpression(), p); + r = scanAndReduce(node.getTypeArguments(), p, r); + return r; + } + public R visitIdentifier(IdentifierTree node, P p) { return null; } diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java b/langtools/src/share/classes/com/sun/tools/javac/code/Source.java index 2a0948cec9c..d4695989a40 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Source.java @@ -194,6 +194,12 @@ public enum Source { public boolean allowObjectToPrimitiveCast() { return compareTo(JDK1_7) >= 0; } + public boolean allowLambda() { + return compareTo(JDK1_8) >= 0; + } + public boolean allowMethodReferences() { + return compareTo(JDK1_8) >= 0; + } public static SourceVersion toSourceVersion(Source source) { switch(source) { case JDK1_2: diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java index ebecb033566..deb9484bc50 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java @@ -1975,6 +1975,16 @@ public class Attr extends JCTree.Visitor { result = check(tree, owntype, VAL, pkind, pt); } + @Override + public void visitLambda(JCLambda that) { + throw new UnsupportedOperationException("Lambda expression not supported yet"); + } + + @Override + public void visitReference(JCMemberReference that) { + throw new UnsupportedOperationException("Member references not supported yet"); + } + public void visitParens(JCParens tree) { Type owntype = attribTree(tree.expr, env, pkind, pt); result = check(tree, owntype, pkind, pkind, pt); diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java b/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java index f9ce7a251de..f0945389e70 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java @@ -637,6 +637,10 @@ public class JavaTokenizer { lexError(pos, "unclosed.str.lit"); } break loop; + case '#': + reader.scanChar(); + tk = TokenKind.HASH; + break loop; default: if (isSpecial(reader.ch)) { scanOperator(); diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java index f2f49ae3bca..81d6680b11f 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java @@ -27,6 +27,8 @@ package com.sun.tools.javac.parser; import java.util.*; +import com.sun.source.tree.MemberReferenceTree.ReferenceMode; + import com.sun.tools.javac.code.*; import com.sun.tools.javac.parser.Tokens.*; import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle; @@ -110,6 +112,10 @@ public class JavacParser implements Parser { this.allowDiamond = source.allowDiamond(); this.allowMulticatch = source.allowMulticatch(); this.allowStringFolding = fac.options.getBoolean("allowStringFolding", true); + this.allowLambda = source.allowLambda() && + fac.options.isSet("allowLambda"); + this.allowMethodReferences = source.allowMethodReferences() && + fac.options.isSet("allowMethodReferences"); this.keepDocComments = keepDocComments; docComments = keepDocComments ? new HashMap() : null; this.keepLineMap = keepLineMap; @@ -166,6 +172,14 @@ public class JavacParser implements Parser { */ boolean allowStringFolding; + /** Switch: should we recognize lambda expressions? + */ + boolean allowLambda; + + /** Switch: should we allow method/constructor references? + */ + boolean allowMethodReferences; + /** Switch: should we keep docComments? */ boolean keepDocComments; @@ -203,6 +217,30 @@ public class JavacParser implements Parser { token = S.token(); } + protected boolean peekToken(TokenKind tk) { + return S.token(1).kind == tk; + } + + protected boolean peekToken(TokenKind tk1, TokenKind tk2) { + return S.token(1).kind == tk1 && + S.token(2).kind == tk2; + } + + protected boolean peekToken(TokenKind tk1, TokenKind tk2, TokenKind tk3) { + return S.token(1).kind == tk1 && + S.token(2).kind == tk2 && + S.token(3).kind == tk3; + } + + protected boolean peekToken(TokenKind... kinds) { + for (int lookahead = 0 ; lookahead < kinds.length ; lookahead++) { + if (S.token(lookahead + 1).kind != kinds[lookahead]) { + return false; + } + } + return true; + } + /* ---------- error recovery -------------- */ private JCErroneous errorTree; @@ -749,7 +787,7 @@ public class JavacParser implements Parser { top++; topOp = token; nextToken(); - odStack[top] = (topOp.kind == INSTANCEOF) ? parseType() : term3(); + odStack[top] = (topOp.kind == INSTANCEOF) ? parseType() : term3NoParams(); while (top > 0 && prec(topOp.kind) >= prec(token.kind)) { odStack[top-1] = makeOp(topOp.pos, topOp.kind, odStack[top-1], odStack[top]); @@ -849,7 +887,10 @@ public class JavacParser implements Parser { * | [TypeArguments] THIS [Arguments] * | [TypeArguments] SUPER SuperSuffix * | NEW [TypeArguments] Creator + * | "(" Arguments ")" "->" ( Expression | Block ) + * | Ident "->" ( Expression | Block ) * | Ident { "." Ident } + * | Expression3 MemberReferenceSuffix * [ "[" ( "]" BracketsOpt "." CLASS | Expression "]" ) * | Arguments * | "." ( CLASS | THIS | [TypeArguments] SUPER Arguments | NEW [TypeArguments] InnerCreator ) @@ -890,60 +931,87 @@ public class JavacParser implements Parser { mode = EXPR; t = literal(names.hyphen, pos); } else { - t = term3(); + t = term3NoParams(); return F.at(pos).Unary(unoptag(tk), t); } } else return illegal(); break; case LPAREN: if (typeArgs == null && (mode & EXPR) != 0) { - nextToken(); - mode = EXPR | TYPE | NOPARAMS; - t = term3(); - if ((mode & TYPE) != 0 && token.kind == LT) { - // Could be a cast to a parameterized type - JCTree.Tag op = JCTree.Tag.LT; - int pos1 = token.pos; + if (peekToken(FINAL) || + peekToken(RPAREN) || + peekToken(IDENTIFIER, COMMA) || + peekToken(IDENTIFIER, RPAREN, ARROW)) { + //implicit n-ary lambda + t = lambdaExpressionOrStatement(true, peekToken(FINAL), pos); + break; + } else { nextToken(); - mode &= (EXPR | TYPE); - mode |= TYPEARG; - JCExpression t1 = term3(); - if ((mode & TYPE) != 0 && - (token.kind == COMMA || token.kind == GT)) { - mode = TYPE; - ListBuffer args = new ListBuffer(); - args.append(t1); - while (token.kind == COMMA) { - nextToken(); - args.append(typeArgument()); - } - accept(GT); - t = toP(F.at(pos1).TypeApply(t, args.toList())); - checkGenerics(); - while (token.kind == DOT) { - nextToken(); + mode = EXPR | TYPE; + t = term3NoParams(); + if ((mode & TYPE) != 0 && token.kind == LT) { + // Could be a cast to a parameterized type + JCTree.Tag op = JCTree.Tag.LT; + int pos1 = token.pos; + nextToken(); + mode &= (EXPR | TYPE); + mode |= TYPEARG; + JCExpression t1 = term3(); + if ((mode & TYPE) != 0 && + (token.kind == COMMA || token.kind == GT)) { mode = TYPE; - t = toP(F.at(token.pos).Select(t, ident())); - t = typeArgumentsOpt(t); + ListBuffer args = new ListBuffer(); + args.append(t1); + while (token.kind == COMMA) { + nextToken(); + args.append(typeArgument()); + } + accept(GT); + t = toP(F.at(pos1).TypeApply(t, args.toList())); + checkGenerics(); + mode = EXPR | TYPE; //could be a lambda or a method ref or a cast to a type + t = term3Rest(t, typeArgs); + if (token.kind == IDENTIFIER || token.kind == ELLIPSIS) { + //explicit lambda (w/ generic type) + mode = EXPR; + JCModifiers mods = F.at(token.pos).Modifiers(Flags.PARAMETER); + if (token.kind == ELLIPSIS) { + mods.flags = Flags.VARARGS; + t = to(F.at(token.pos).TypeArray(t)); + nextToken(); + } + t = lambdaExpressionOrStatement(variableDeclaratorId(mods, t), pos); + break; + } + } else { + Assert.check((mode & EXPR) != 0); + mode = EXPR; + JCExpression e = term2Rest(t1, TreeInfo.shiftPrec); + t = F.at(pos1).Binary(op, t, e); + t = termRest(term1Rest(term2Rest(t, TreeInfo.orPrec))); } - t = bracketsOpt(toP(t)); - } else if ((mode & EXPR) != 0) { + } else if ((mode & TYPE) != 0 && + (token.kind == IDENTIFIER || token.kind == ELLIPSIS)) { + //explicit lambda (w/ non-generic type) mode = EXPR; - JCExpression e = term2Rest(t1, TreeInfo.shiftPrec); - t = F.at(pos1).Binary(op, t, e); - t = termRest(term1Rest(term2Rest(t, TreeInfo.orPrec))); + JCModifiers mods = F.at(token.pos).Modifiers(Flags.PARAMETER); + if (token.kind == ELLIPSIS) { + mods.flags = Flags.VARARGS; + t = to(F.at(token.pos).TypeArray(t)); + nextToken(); + } + t = lambdaExpressionOrStatement(variableDeclaratorId(mods, t), pos); + break; } else { - accept(GT); + t = termRest(term1Rest(term2Rest(t, TreeInfo.orPrec))); } } - else { - t = termRest(term1Rest(term2Rest(t, TreeInfo.orPrec))); - } + accept(RPAREN); lastmode = mode; mode = EXPR; if ((lastmode & EXPR) == 0) { - JCExpression t1 = term3(); + JCExpression t1 = term3NoParams(); return F.at(pos).TypeCast(t, t1); } else if ((lastmode & TYPE) != 0) { switch (token.kind) { @@ -953,14 +1021,16 @@ public class JavacParser implements Parser { case INTLITERAL: case LONGLITERAL: case FLOATLITERAL: case DOUBLELITERAL: case CHARLITERAL: case STRINGLITERAL: case TRUE: case FALSE: case NULL: - case NEW: case IDENTIFIER: case ASSERT: case ENUM: + case NEW: case IDENTIFIER: case ASSERT: case ENUM: case BYTE: case SHORT: case CHAR: case INT: case LONG: case FLOAT: case DOUBLE: case BOOLEAN: case VOID: - JCExpression t1 = term3(); + JCExpression t1 = term3NoParams(); return F.at(pos).TypeCast(t, t1); } } - } else return illegal(); + } else { + return illegal(); + } t = toP(F.at(pos).Parens(t)); break; case THIS: @@ -1003,75 +1073,122 @@ public class JavacParser implements Parser { break; case IDENTIFIER: case ASSERT: case ENUM: if (typeArgs != null) return illegal(); - t = toP(F.at(token.pos).Ident(ident())); - loop: while (true) { - pos = token.pos; - switch (token.kind) { - case LBRACKET: - nextToken(); - if (token.kind == RBRACKET) { + if ((mode & EXPR) != 0 && peekToken(ARROW)) { + t = lambdaExpressionOrStatement(false, false, pos); + } else { + t = toP(F.at(token.pos).Ident(ident())); + loop: while (true) { + pos = token.pos; + switch (token.kind) { + case LBRACKET: nextToken(); - t = bracketsOpt(t); - t = toP(F.at(pos).TypeArray(t)); - t = bracketsSuffix(t); - } else { + if (token.kind == RBRACKET) { + nextToken(); + t = bracketsOpt(t); + t = toP(F.at(pos).TypeArray(t)); + t = bracketsSuffix(t); + } else { + if ((mode & EXPR) != 0) { + mode = EXPR; + JCExpression t1 = term(); + t = to(F.at(pos).Indexed(t, t1)); + } + accept(RBRACKET); + } + break loop; + case LPAREN: if ((mode & EXPR) != 0) { mode = EXPR; - JCExpression t1 = term(); - t = to(F.at(pos).Indexed(t, t1)); - } - accept(RBRACKET); - } - break loop; - case LPAREN: - if ((mode & EXPR) != 0) { - mode = EXPR; - t = arguments(typeArgs, t); - typeArgs = null; - } - break loop; - case DOT: - nextToken(); - int oldmode = mode; - mode &= ~NOPARAMS; - typeArgs = typeArgumentsOpt(EXPR); - mode = oldmode; - if ((mode & EXPR) != 0) { - switch (token.kind) { - case CLASS: - if (typeArgs != null) return illegal(); - mode = EXPR; - t = to(F.at(pos).Select(t, names._class)); - nextToken(); - break loop; - case THIS: - if (typeArgs != null) return illegal(); - mode = EXPR; - t = to(F.at(pos).Select(t, names._this)); - nextToken(); - break loop; - case SUPER: - mode = EXPR; - t = to(F.at(pos).Select(t, names._super)); - t = superSuffix(typeArgs, t); + t = arguments(typeArgs, t); typeArgs = null; - break loop; - case NEW: - if (typeArgs != null) return illegal(); - mode = EXPR; - int pos1 = token.pos; - nextToken(); - if (token.kind == LT) typeArgs = typeArguments(false); - t = innerCreator(pos1, typeArgs, t); - typeArgs = null; - break loop; } + break loop; + case DOT: + nextToken(); + int oldmode = mode; + mode &= ~NOPARAMS; + typeArgs = typeArgumentsOpt(EXPR); + mode = oldmode; + if ((mode & EXPR) != 0) { + switch (token.kind) { + case CLASS: + if (typeArgs != null) return illegal(); + mode = EXPR; + t = to(F.at(pos).Select(t, names._class)); + nextToken(); + break loop; + case THIS: + if (typeArgs != null) return illegal(); + mode = EXPR; + t = to(F.at(pos).Select(t, names._this)); + nextToken(); + break loop; + case SUPER: + mode = EXPR; + t = to(F.at(pos).Select(t, names._super)); + t = superSuffix(typeArgs, t); + typeArgs = null; + break loop; + case NEW: + if (typeArgs != null) return illegal(); + mode = EXPR; + int pos1 = token.pos; + nextToken(); + if (token.kind == LT) typeArgs = typeArguments(false); + t = innerCreator(pos1, typeArgs, t); + typeArgs = null; + break loop; + } + } + // typeArgs saved for next loop iteration. + t = toP(F.at(pos).Select(t, ident())); + break; +// case LT: +// if ((mode & (TYPE | NOPARAMS)) == 0) { +// //could be an unbound method reference whose qualifier +// //is a generic type i.e. A#m +// mode = EXPR | TYPE; +// JCTree.Tag op = JCTree.Tag.LT; +// int pos1 = token.pos; +// nextToken(); +// mode |= EXPR | TYPE | TYPEARG; +// JCExpression t1 = term3(); +// if ((mode & TYPE) != 0 && +// (token.kind == COMMA || token.kind == GT)) { +// mode = TYPE; +// ListBuffer args = new ListBuffer(); +// args.append(t1); +// while (token.kind == COMMA) { +// nextToken(); +// args.append(typeArgument()); +// } +// accept(GT); +// t = toP(F.at(pos1).TypeApply(t, args.toList())); +// checkGenerics(); +// while (token.kind == DOT) { +// nextToken(); +// mode = TYPE; +// t = toP(F.at(token.pos).Select(t, ident())); +// t = typeArgumentsOpt(t); +// } +// if (token.kind != HASH) { +// //method reference expected here +// t = illegal(); +// } +// mode = EXPR; +// break; +// } else if ((mode & EXPR) != 0) { +// //rollback - it was a binary expression +// mode = EXPR; +// JCExpression e = term2Rest(t1, TreeInfo.shiftPrec); +// t = F.at(pos1).Binary(op, t, e); +// t = termRest(term1Rest(term2Rest(t, TreeInfo.orPrec))); +// } +// } +// break loop; + default: + break loop; } - // typeArgs saved for next loop iteration. - t = toP(F.at(pos).Select(t, ident())); - break; - default: - break loop; } } if (typeArgs != null) illegal(); @@ -1105,6 +1222,19 @@ public class JavacParser implements Parser { default: return illegal(); } + return term3Rest(t, typeArgs); + } + + JCExpression term3NoParams() { + try { + mode |= NOPARAMS; + return term3(); + } finally { + mode &= ~NOPARAMS; + } + } + + JCExpression term3Rest(JCExpression t, List typeArgs) { if (typeArgs != null) illegal(); while (true) { int pos1 = token.pos; @@ -1149,6 +1279,11 @@ public class JavacParser implements Parser { t = argumentsOpt(typeArgs, typeArgumentsOpt(t)); typeArgs = null; } + } else if ((mode & EXPR) != 0 && token.kind == HASH) { + mode = EXPR; + if (typeArgs != null) return illegal(); + accept(HASH); + t = memberReferenceSuffix(pos1, t); } else { break; } @@ -1162,12 +1297,59 @@ public class JavacParser implements Parser { return toP(t); } + JCExpression lambdaExpressionOrStatement(JCVariableDecl firstParam, int pos) { + ListBuffer params = new ListBuffer(); + params.append(firstParam); + JCVariableDecl lastParam = firstParam; + while ((lastParam.mods.flags & Flags.VARARGS) == 0 && token.kind == COMMA) { + nextToken(); + params.append(lastParam = formalParameter()); + } + accept(RPAREN); + return lambdaExpressionOrStatementRest(params.toList(), pos); + } + + JCExpression lambdaExpressionOrStatement(boolean hasParens, boolean explicitParams, int pos) { + List params = explicitParams ? + formalParameters() : + implicitParameters(hasParens); + + return lambdaExpressionOrStatementRest(params, pos); + } + + JCExpression lambdaExpressionOrStatementRest(List args, int pos) { + if (token.kind != ARROW) { + //better error recovery + return F.at(pos).Erroneous(args); + } + + checkLambda(); + accept(ARROW); + + return token.kind == LBRACE ? + lambdaStatement(args, pos, pos) : + lambdaExpression(args, pos); + } + + JCExpression lambdaStatement(List args, int pos, int pos2) { + JCBlock block = block(pos2, 0); + return toP(F.at(pos).Lambda(args, block)); + } + + JCExpression lambdaExpression(List args, int pos) { + JCTree expr = parseExpression(); + return toP(F.at(pos).Lambda(args, expr)); + } + /** SuperSuffix = Arguments | "." [TypeArguments] Ident [Arguments] */ JCExpression superSuffix(List typeArgs, JCExpression t) { nextToken(); if (token.kind == LPAREN || typeArgs != null) { t = arguments(typeArgs, t); + } else if (token.kind == HASH) { + if (typeArgs != null) return illegal(); + t = memberReferenceSuffix(t); } else { int pos = token.pos; accept(DOT); @@ -1377,6 +1559,36 @@ public class JavacParser implements Parser { return t; } + /** + * MemberReferenceSuffix = "#" [TypeArguments] Ident + * | "#" [TypeArguments] "new" + */ + JCExpression memberReferenceSuffix(JCExpression t) { + int pos1 = token.pos; + accept(HASH); + return memberReferenceSuffix(pos1, t); + } + + JCExpression memberReferenceSuffix(int pos1, JCExpression t) { + checkMethodReferences(); + mode = EXPR; + List typeArgs = null; + if (token.kind == LT) { + typeArgs = typeArguments(false); + } + Name refName = null; + ReferenceMode refMode = null; + if (token.kind == NEW) { + refMode = ReferenceMode.NEW; + refName = names.init; + nextToken(); + } else { + refMode = ReferenceMode.INVOKE; + refName = ident(); + } + return toP(F.at(t.getStartPosition()).Reference(refMode, refName, t, typeArgs)); + } + /** Creator = Qualident [TypeArguments] ( ArrayCreatorRest | ClassCreatorRest ) */ JCExpression creator(int newpos, List typeArgs) { @@ -2392,7 +2604,7 @@ public class JavacParser implements Parser { * @param mods The modifiers starting the class declaration * @param dc The documentation comment for the class, or null. */ - JCClassDecl classDeclaration(JCModifiers mods, String dc) { + protected JCClassDecl classDeclaration(JCModifiers mods, String dc) { int pos = token.pos; accept(CLASS); Name name = ident(); @@ -2421,7 +2633,7 @@ public class JavacParser implements Parser { * @param mods The modifiers starting the interface declaration * @param dc The documentation comment for the interface, or null. */ - JCClassDecl interfaceDeclaration(JCModifiers mods, String dc) { + protected JCClassDecl interfaceDeclaration(JCModifiers mods, String dc) { int pos = token.pos; accept(INTERFACE); Name name = ident(); @@ -2444,7 +2656,7 @@ public class JavacParser implements Parser { * @param mods The modifiers starting the enum declaration * @param dc The documentation comment for the enum, or null. */ - JCClassDecl enumDeclaration(JCModifiers mods, String dc) { + protected JCClassDecl enumDeclaration(JCModifiers mods, String dc) { int pos = token.pos; accept(ENUM); Name name = ident(); @@ -2666,7 +2878,7 @@ public class JavacParser implements Parser { * ConstructorDeclaratorRest = * "(" FormalParameterListOpt ")" [THROWS TypeList] MethodBody */ - JCTree methodDeclaratorRest(int pos, + protected JCTree methodDeclaratorRest(int pos, JCModifiers mods, JCExpression type, Name name, @@ -2779,6 +2991,24 @@ public class JavacParser implements Parser { return params.toList(); } + List implicitParameters(boolean hasParens) { + if (hasParens) { + accept(LPAREN); + } + ListBuffer params = new ListBuffer(); + if (token.kind != RPAREN && token.kind != ARROW) { + params.append(implicitParameter()); + while (token.kind == COMMA) { + nextToken(); + params.append(implicitParameter()); + } + } + if (hasParens) { + accept(RPAREN); + } + return params.toList(); + } + JCModifiers optFinal(long flags) { JCModifiers mods = modifiersOpt(); checkNoMods(mods.flags & ~(Flags.FINAL | Flags.DEPRECATED)); @@ -2801,6 +3031,11 @@ public class JavacParser implements Parser { return variableDeclaratorId(mods, type); } + protected JCVariableDecl implicitParameter() { + JCModifiers mods = F.at(token.pos).Modifiers(Flags.PARAMETER); + return variableDeclaratorId(mods, null); + } + /* ---------- auxiliary methods -------------- */ void error(int pos, String key, Object ... args) { @@ -3024,6 +3259,18 @@ public class JavacParser implements Parser { allowTWR = true; } } + void checkLambda() { + if (!allowLambda) { + log.error(token.pos, "lambda.not.supported.in.source", source.name); + allowLambda = true; + } + } + void checkMethodReferences() { + if (!allowMethodReferences) { + log.error(token.pos, "method.references.not.supported.in.source", source.name); + allowMethodReferences = true; + } + } /* * a functional source tree and end position mappings diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/Lexer.java b/langtools/src/share/classes/com/sun/tools/javac/parser/Lexer.java index 57d7a985e63..ed428f83803 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/parser/Lexer.java +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Lexer.java @@ -49,6 +49,11 @@ public interface Lexer { */ Token token(); + /** + * Return token with given lookahead. + */ + Token token(int lookahead); + /** * Return the last character position of the previous token. */ diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java b/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java index 41f50cb0110..93b2e8adecf 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java @@ -26,8 +26,9 @@ package com.sun.tools.javac.parser; import java.nio.*; +import java.util.List; +import java.util.ArrayList; -import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.Position.LineMap; import com.sun.tools.javac.parser.JavaTokenizer.*; @@ -53,6 +54,10 @@ public class Scanner implements Lexer { */ private Token prevToken; + /** Buffer of saved tokens (used during lookahead) + */ + private List savedTokens = new ArrayList(); + private JavaTokenizer tokenizer; /** * Create a scanner from the input array. This method might @@ -80,16 +85,35 @@ public class Scanner implements Lexer { } public Token token() { - return token; + return token(0); } + public Token token(int lookahead) { + if (lookahead == 0) { + return token; + } else { + ensureLookahead(lookahead); + return savedTokens.get(lookahead - 1); + } + } + //where + private void ensureLookahead(int lookahead) { + for (int i = savedTokens.size() ; i < lookahead ; i ++) { + savedTokens.add(tokenizer.readToken()); + } + } + public Token prevToken() { return prevToken; } public void nextToken() { prevToken = token; - token = tokenizer.readToken(); + if (!savedTokens.isEmpty()) { + token = savedTokens.remove(0); + } else { + token = tokenizer.readToken(); + } } public Token split() { diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/Tokens.java b/langtools/src/share/classes/com/sun/tools/javac/parser/Tokens.java index db2e1ec3c63..402e6db0eca 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/parser/Tokens.java +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Tokens.java @@ -176,6 +176,8 @@ public class Tokens { TRUE("true", Tag.NAMED), FALSE("false", Tag.NAMED), NULL("null", Tag.NAMED), + ARROW("->"), + HASH("#"), LPAREN("("), RPAREN(")"), LBRACE("{"), diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties index 75a2aaf1a33..14f1d6052bd 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties @@ -1945,6 +1945,16 @@ compiler.err.string.switch.not.supported.in.source=\ strings in switch are not supported in -source {0}\n\ (use -source 7 or higher to enable strings in switch) +# 0: string +compiler.err.lambda.not.supported.in.source=\ + lambda expressions are not supported in -source {0}\n\ + (use -source 8 or higher to enable lambda expressions) + +# 0: string +compiler.err.method.references.not.supported.in.source=\ + method references are not supported in -source {0}\n\ + (use -source 8 or higher to enable method references) + ######################################## # Diagnostics for verbose resolution # used by Resolve (debug only) diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java b/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java index 9fd4055e4eb..59fc37e158a 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java @@ -41,6 +41,8 @@ import com.sun.tools.javac.code.Scope.*; import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.parser.EndPosTable; import com.sun.source.tree.*; +import com.sun.source.tree.LambdaExpressionTree.BodyKind; +import com.sun.source.tree.MemberReferenceTree.ReferenceMode; import static com.sun.tools.javac.code.BoundKind.*; import static com.sun.tools.javac.tree.JCTree.Tag.*; @@ -198,6 +200,10 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { */ NEWARRAY, + /** Lambda expression, of type Lambda. + */ + LAMBDA, + /** Parenthesized subexpressions, of type Parens. */ PARENS, @@ -222,6 +228,10 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { */ SELECT, + /** Member references, of type Reference. + */ + REFERENCE, + /** Simple identifiers, of type Ident. */ IDENT, @@ -1486,6 +1496,56 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { } } + /** + * A lambda expression. + */ + public static class JCLambda extends JCExpression implements LambdaExpressionTree { + + public List params; + public JCTree body; + public Type targetType; + public boolean canCompleteNormally = true; + public List inferredThrownTypes; + + public JCLambda(List params, + JCTree body) { + this.params = params; + this.body = body; + } + @Override + public Tag getTag() { + return LAMBDA; + } + @Override + public void accept(Visitor v) { + v.visitLambda(this); + } + @Override + public R accept(TreeVisitor v, D d) { + return v.visitLambdaExpression(this, d); + } + public Kind getKind() { + return Kind.LAMBDA_EXPRESSION; + } + public JCTree getBody() { + return body; + } + public java.util.List getParameters() { + return params; + } + @Override + public JCLambda setType(Type type) { + super.setType(type); + return this; + } + @Override + public BodyKind getBodyKind() { + return body.hasTag(BLOCK) ? + BodyKind.STATEMENT : + BodyKind.EXPRESSION; + } + } + /** * A parenthesized subexpression ( ... ) */ @@ -1746,6 +1806,46 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { } } + /** + * Selects a member expression. + */ + public static class JCMemberReference extends JCExpression implements MemberReferenceTree { + public ReferenceMode mode; + public Name name; + public JCExpression expr; + public List typeargs; + public Type targetType; + public Symbol sym; + + protected JCMemberReference(ReferenceMode mode, Name name, JCExpression expr, List typeargs) { + this.mode = mode; + this.name = name; + this.expr = expr; + this.typeargs = typeargs; + } + @Override + public void accept(Visitor v) { v.visitReference(this); } + + public Kind getKind() { return Kind.MEMBER_REFERENCE; } + @Override + public ReferenceMode getMode() { return mode; } + @Override + public JCExpression getQualifierExpression() { return expr; } + @Override + public Name getName() { return name; } + @Override + public List getTypeArguments() { return typeargs; } + + @Override + public R accept(TreeVisitor v, D d) { + return v.visitMemberReference(this, d); + } + @Override + public Tag getTag() { + return REFERENCE; + } + } + /** * An identifier * @param idname the name @@ -2271,6 +2371,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { public void visitApply(JCMethodInvocation that) { visitTree(that); } public void visitNewClass(JCNewClass that) { visitTree(that); } public void visitNewArray(JCNewArray that) { visitTree(that); } + public void visitLambda(JCLambda that) { visitTree(that); } public void visitParens(JCParens that) { visitTree(that); } public void visitAssign(JCAssign that) { visitTree(that); } public void visitAssignop(JCAssignOp that) { visitTree(that); } @@ -2280,6 +2381,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { public void visitTypeTest(JCInstanceOf that) { visitTree(that); } public void visitIndexed(JCArrayAccess that) { visitTree(that); } public void visitSelect(JCFieldAccess that) { visitTree(that); } + public void visitReference(JCMemberReference that) { visitTree(that); } public void visitIdent(JCIdent that) { visitTree(that); } public void visitLiteral(JCLiteral that) { visitTree(that); } public void visitTypeIdent(JCPrimitiveTypeTree that) { visitTree(that); } diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java b/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java index e781fd130e6..824fa599ff7 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java @@ -28,6 +28,8 @@ package com.sun.tools.javac.tree; import java.io.*; import java.util.*; +import com.sun.source.tree.MemberReferenceTree.ReferenceMode; + import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.List; import com.sun.tools.javac.code.*; @@ -907,6 +909,17 @@ public class Pretty extends JCTree.Visitor { } } + public void visitLambda(JCLambda tree) { + try { + print("("); + printExprs(tree.params); + print(")->"); + printExpr(tree.body); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + public void visitParens(JCParens tree) { try { print("("); @@ -1052,6 +1065,21 @@ public class Pretty extends JCTree.Visitor { } } + public void visitReference(JCMemberReference tree) { + try { + printExpr(tree.expr); + print("#"); + if (tree.typeargs != null) { + print("<"); + printExprs(tree.typeargs); + print(">"); + } + print(tree.getMode() == ReferenceMode.INVOKE ? tree.name : "new"); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + public void visitIdent(JCIdent tree) { try { print(tree.name); diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java index 158abc4f161..f8efaa32018 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java @@ -271,6 +271,13 @@ public class TreeCopier

    implements TreeVisitor { return M.at(t.pos).NewClass(encl, typeargs, clazz, args, def); } + public JCTree visitLambdaExpression(LambdaExpressionTree node, P p) { + JCLambda t = (JCLambda) node; + List params = copy(t.params, p); + JCTree body = copy(t.body, p); + return M.at(t.pos).Lambda(params, body); + } + public JCTree visitParenthesized(ParenthesizedTree node, P p) { JCParens t = (JCParens) node; JCExpression expr = copy(t.expr, p); @@ -289,6 +296,13 @@ public class TreeCopier

    implements TreeVisitor { return M.at(t.pos).Select(selected, t.name); } + public JCTree visitMemberReference(MemberReferenceTree node, P p) { + JCMemberReference t = (JCMemberReference) node; + JCExpression expr = copy(t.expr, p); + List typeargs = copy(t.typeargs, p); + return M.at(t.pos).Reference(t.mode, t.name, expr, typeargs); + } + public JCTree visitEmptyStatement(EmptyStatementTree node, P p) { JCSkip t = (JCSkip) node; return M.at(t.pos).Skip(); diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java index d47d7a79ff1..00eef07509f 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java @@ -227,6 +227,34 @@ public class TreeInfo { } } + /** + * Return true if the AST corresponds to a static select of the kind A.B + */ + public static boolean isStaticSelector(JCTree base, Names names) { + if (base == null) + return false; + switch (base.getTag()) { + case IDENT: + JCIdent id = (JCIdent)base; + return id.name != names._this && + id.name != names._super && + isStaticSym(base); + case SELECT: + return isStaticSym(base) && + isStaticSelector(((JCFieldAccess)base).selected, names); + case TYPEAPPLY: + return true; + default: + return false; + } + } + //where + private static boolean isStaticSym(JCTree tree) { + Symbol sym = symbol(tree); + return (sym.kind == Kinds.TYP || + sym.kind == Kinds.PCK); + } + /** Return true if a tree represents the null literal. */ public static boolean isNull(JCTree tree) { if (!tree.hasTag(LITERAL)) diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java index 7f673023def..6191f4b8875 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java @@ -351,6 +351,14 @@ public class TreeMaker implements JCTree.Factory { return tree; } + public JCLambda Lambda(List params, + JCTree body) + { + JCLambda tree = new JCLambda(params, body); + tree.pos = pos; + return tree; + } + public JCParens Parens(JCExpression expr) { JCParens tree = new JCParens(expr); tree.pos = pos; @@ -405,6 +413,13 @@ public class TreeMaker implements JCTree.Factory { return tree; } + public JCMemberReference Reference(JCMemberReference.ReferenceMode mode, Name name, + JCExpression expr, List typeargs) { + JCMemberReference tree = new JCMemberReference(mode, name, expr, typeargs); + tree.pos = pos; + return tree; + } + public JCIdent Ident(Name name) { JCIdent tree = new JCIdent(name, null); tree.pos = pos; diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java index 19619665d76..9a7c321f368 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java @@ -212,6 +212,11 @@ public class TreeScanner extends Visitor { scan(tree.elems); } + public void visitLambda(JCLambda tree) { + scan(tree.body); + scan(tree.params); + } + public void visitParens(JCParens tree) { scan(tree.expr); } @@ -254,6 +259,11 @@ public class TreeScanner extends Visitor { scan(tree.selected); } + public void visitReference(JCMemberReference tree) { + scan(tree.expr); + scan(tree.typeargs); + } + public void visitIdent(JCIdent tree) { } diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java index f024a287bd9..2bc9c7a1290 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java @@ -282,6 +282,12 @@ public class TreeTranslator extends JCTree.Visitor { result = tree; } + public void visitLambda(JCLambda tree) { + tree.params = translate(tree.params); + tree.body = translate(tree.body); + result = tree; + } + public void visitNewArray(JCNewArray tree) { tree.elemtype = translate(tree.elemtype); tree.dims = translate(tree.dims); @@ -340,6 +346,11 @@ public class TreeTranslator extends JCTree.Visitor { result = tree; } + public void visitReference(JCMemberReference tree) { + tree.expr = translate(tree.expr); + result = tree; + } + public void visitIdent(JCIdent tree) { result = tree; } diff --git a/langtools/test/tools/javac/T7120266.java b/langtools/test/tools/javac/T7120266.java new file mode 100644 index 00000000000..f33db025bfc --- /dev/null +++ b/langtools/test/tools/javac/T7120266.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2011, 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. + * + * 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. + */ + +/* + * @test + * @bug 7120266 + * @summary javac fails to compile hotspot code + * @compile T7120266.java + */ + +class T7120266 { + void test(int i, int len) { that(i < len, "oopmap"); } + void that(boolean b, String s) { }; +} diff --git a/langtools/test/tools/javac/diags/examples/CatchWithoutTry.java b/langtools/test/tools/javac/diags/examples/CatchWithoutTry.java index 2fa70700636..51eebedb014 100644 --- a/langtools/test/tools/javac/diags/examples/CatchWithoutTry.java +++ b/langtools/test/tools/javac/diags/examples/CatchWithoutTry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011, 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 @@ -23,7 +23,6 @@ // key: compiler.err.catch.without.try // key: compiler.err.expected -// key: compiler.err.not.stmt class CatchWithoutTry { void m() { diff --git a/langtools/test/tools/javac/diags/examples/IllegalChar.java b/langtools/test/tools/javac/diags/examples/IllegalChar.java index 003a7b0ece1..28bf82700e0 100644 --- a/langtools/test/tools/javac/diags/examples/IllegalChar.java +++ b/langtools/test/tools/javac/diags/examples/IllegalChar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011, 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 @@ -24,5 +24,5 @@ // key: compiler.err.illegal.char class IllegalChar { - int i = #; + int i = `; } diff --git a/langtools/test/tools/javac/diags/examples/LambdaNotSupported.java b/langtools/test/tools/javac/diags/examples/LambdaNotSupported.java new file mode 100644 index 00000000000..ea57fe4740d --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/LambdaNotSupported.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2011, 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. + * + * 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. + */ + +// key: compiler.err.lambda.not.supported.in.source +// options: -source 7 -Xlint:-options + +class LambdaNotSupported { + S s = ()->{}; +} diff --git a/langtools/test/tools/javac/diags/examples/MethodReferencesNotSupported.java b/langtools/test/tools/javac/diags/examples/MethodReferencesNotSupported.java new file mode 100644 index 00000000000..df3198008b0 --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/MethodReferencesNotSupported.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2011, 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. + * + * 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. + */ + +// key: compiler.err.method.references.not.supported.in.source +// options: -source 7 -Xlint:-options + +class MethodReferencesNotSupported { + S s = A#foo; +} diff --git a/langtools/test/tools/javac/diags/examples/NotAStatement.java b/langtools/test/tools/javac/diags/examples/NotAStatement.java new file mode 100644 index 00000000000..39af85a8335 --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/NotAStatement.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2010, 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. + * + * 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. + */ + +// key: compiler.err.not.stmt + +class NotAStatement { + void m() { + x + 1; + } +} diff --git a/langtools/test/tools/javac/generics/rare/6665356/T6665356.out b/langtools/test/tools/javac/generics/rare/6665356/T6665356.out index 62a62e63925..4994352df4b 100644 --- a/langtools/test/tools/javac/generics/rare/6665356/T6665356.out +++ b/langtools/test/tools/javac/generics/rare/6665356/T6665356.out @@ -1,5 +1,5 @@ T6665356.java:17:37: compiler.err.improperly.formed.type.param.missing T6665356.java:18:40: compiler.err.improperly.formed.type.inner.raw.param -T6665356.java:26:23: compiler.err.improperly.formed.type.param.missing +T6665356.java:26:22: compiler.err.improperly.formed.type.param.missing T6665356.java:27:25: compiler.err.improperly.formed.type.inner.raw.param 4 errors diff --git a/langtools/test/tools/javac/lambda/LambdaParserTest.java b/langtools/test/tools/javac/lambda/LambdaParserTest.java new file mode 100644 index 00000000000..b686013aa5b --- /dev/null +++ b/langtools/test/tools/javac/lambda/LambdaParserTest.java @@ -0,0 +1,276 @@ +/* + * Copyright (c) 2011, 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. + * + * 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. + */ + +/* + * @test + * @bug 7115050 + * @summary Add parser support for lambda expressions + */ + +import com.sun.source.util.JavacTask; +import java.net.URI; +import java.util.Arrays; +import javax.tools.Diagnostic; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.SimpleJavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; + +public class LambdaParserTest { + + static int checkCount = 0; + + enum LambdaKind { + NILARY_EXPR("()->x"), + NILARY_STMT("()->{ return x; }"), + ONEARY_SHORT_EXPR("x->x"), + ONEARY_SHORT_STMT("x->{ return x; }"), + ONEARY_EXPR("(#M1 #T1 x)->x"), + ONEARY_STMT("(#M1 #T1 x)->{ return x; }"), + TWOARY_EXPR("(#M1 #T1 x, #M2 #T2 y)->x"), + TWOARY_STMT("(#M1 #T1 x, #M2 #T2 y)->{ return x; }"); + + String lambdaTemplate; + + LambdaKind(String lambdaTemplate) { + this.lambdaTemplate = lambdaTemplate; + } + + String getLambdaString(LambdaParameterKind pk1, LambdaParameterKind pk2, + ModifierKind mk1, ModifierKind mk2) { + return lambdaTemplate.replaceAll("#M1", mk1.modifier) + .replaceAll("#M2", mk2.modifier) + .replaceAll("#T1", pk1.parameterType) + .replaceAll("#T2", pk2.parameterType); + } + + int arity() { + switch (this) { + case NILARY_EXPR: + case NILARY_STMT: return 0; + case ONEARY_SHORT_EXPR: + case ONEARY_SHORT_STMT: + case ONEARY_EXPR: + case ONEARY_STMT: return 1; + case TWOARY_EXPR: + case TWOARY_STMT: return 2; + default: throw new AssertionError("Invalid lambda kind " + this); + } + } + + boolean isShort() { + return this == ONEARY_SHORT_EXPR || + this == ONEARY_SHORT_STMT; + } + } + + enum LambdaParameterKind { + IMPLICIT(""), + EXPLIICT_SIMPLE("A"), + EXPLICIT_VARARGS("A..."), + EXPLICIT_GENERIC1("A"), + EXPLICIT_GENERIC3("A"); + + String parameterType; + + LambdaParameterKind(String parameterType) { + this.parameterType = parameterType; + } + + boolean explicit() { + return this != IMPLICIT; + } + } + + enum ModifierKind { + NONE(""), + FINAL("final"), + PUBLIC("public"); + + String modifier; + + ModifierKind(String modifier) { + this.modifier = modifier; + } + + boolean compatibleWith(LambdaParameterKind pk) { + switch (this) { + case PUBLIC: return false; + case FINAL: return pk != LambdaParameterKind.IMPLICIT; + case NONE: return true; + default: throw new AssertionError("Invalid modifier kind " + this); + } + } + } + + enum ExprKind { + NONE("#L#S"), + SINGLE_PAREN1("(#L#S)"), + SINGLE_PAREN2("(#L)#S"), + DOUBLE_PAREN1("((#L#S))"), + DOUBLE_PAREN2("((#L)#S)"), + DOUBLE_PAREN3("((#L))#S"); + + String expressionTemplate; + + ExprKind(String expressionTemplate) { + this.expressionTemplate = expressionTemplate; + } + + String expressionString(LambdaParameterKind pk1, LambdaParameterKind pk2, + ModifierKind mk1, ModifierKind mk2, LambdaKind lk, SubExprKind sk) { + return expressionTemplate.replaceAll("#L", lk.getLambdaString(pk1, pk2, mk1, mk2)) + .replaceAll("#S", sk.subExpression); + } + } + + enum SubExprKind { + NONE(""), + SELECT_FIELD(".f"), + SELECT_METHOD(".f()"), + SELECT_NEW(".new Foo()"), + POSTINC("++"), + POSTDEC("--"); + + String subExpression; + + SubExprKind(String subExpression) { + this.subExpression = subExpression; + } + } + + public static void main(String... args) throws Exception { + + //create default shared JavaCompiler - reused across multiple compilations + JavaCompiler comp = ToolProvider.getSystemJavaCompiler(); + StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null); + + for (LambdaKind lk : LambdaKind.values()) { + for (LambdaParameterKind pk1 : LambdaParameterKind.values()) { + if (lk.arity() < 1 && pk1 != LambdaParameterKind.IMPLICIT) continue; + for (LambdaParameterKind pk2 : LambdaParameterKind.values()) { + if (lk.arity() < 2 && pk2 != LambdaParameterKind.IMPLICIT) continue; + for (ModifierKind mk1 : ModifierKind.values()) { + if (mk1 != ModifierKind.NONE && lk.isShort()) continue; + if (lk.arity() < 1 && mk1 != ModifierKind.NONE) continue; + for (ModifierKind mk2 : ModifierKind.values()) { + if (lk.arity() < 2 && mk2 != ModifierKind.NONE) continue; + for (SubExprKind sk : SubExprKind.values()) { + for (ExprKind ek : ExprKind.values()) { + new LambdaParserTest(pk1, pk2, mk1, mk2, lk, sk, ek) + .run(comp, fm); + } + } + } + } + } + } + } + System.out.println("Total check executed: " + checkCount); + } + + LambdaParameterKind pk1; + LambdaParameterKind pk2; + ModifierKind mk1; + ModifierKind mk2; + LambdaKind lk; + SubExprKind sk; + ExprKind ek; + JavaSource source; + DiagnosticChecker diagChecker; + + LambdaParserTest(LambdaParameterKind pk1, LambdaParameterKind pk2, ModifierKind mk1, + ModifierKind mk2, LambdaKind lk, SubExprKind sk, ExprKind ek) { + this.pk1 = pk1; + this.pk2 = pk2; + this.mk1 = mk1; + this.mk2 = mk2; + this.lk = lk; + this.sk = sk; + this.ek = ek; + this.source = new JavaSource(); + this.diagChecker = new DiagnosticChecker(); + } + + class JavaSource extends SimpleJavaFileObject { + + String template = "class Test {\n" + + " SAM s = #E;\n" + + "}"; + + String source; + + public JavaSource() { + super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE); + source = template.replaceAll("#E", ek.expressionString(pk1, pk2, mk1, mk2, lk, sk)); + } + + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) { + return source; + } + } + + void run(JavaCompiler tool, StandardJavaFileManager fm) throws Exception { + JavacTask ct = (JavacTask)tool.getTask(null, fm, diagChecker, + Arrays.asList("-XDallowLambda"), null, Arrays.asList(source)); + try { + ct.parse(); + } catch (Throwable ex) { + throw new AssertionError("Error thron when parsing the following source:\n" + source.getCharContent(true)); + } + check(); + } + + void check() { + checkCount++; + + boolean errorExpected = (lk.arity() > 0 && !mk1.compatibleWith(pk1)) || + (lk.arity() > 1 && !mk2.compatibleWith(pk2)); + + if (lk.arity() == 2 && + (pk1.explicit() != pk2.explicit() || + pk1 == LambdaParameterKind.EXPLICIT_VARARGS)) { + errorExpected = true; + } + + if (errorExpected != diagChecker.errorFound) { + throw new Error("invalid diagnostics for source:\n" + + source.getCharContent(true) + + "\nFound error: " + diagChecker.errorFound + + "\nExpected error: " + errorExpected); + } + } + + static class DiagnosticChecker implements javax.tools.DiagnosticListener { + + boolean errorFound; + + public void report(Diagnostic diagnostic) { + if (diagnostic.getKind() == Diagnostic.Kind.ERROR) { + errorFound = true; + } + } + } +} diff --git a/langtools/test/tools/javac/lambda/MethodReferenceParserTest.java b/langtools/test/tools/javac/lambda/MethodReferenceParserTest.java new file mode 100644 index 00000000000..00f7f33923d --- /dev/null +++ b/langtools/test/tools/javac/lambda/MethodReferenceParserTest.java @@ -0,0 +1,234 @@ +/* + * Copyright (c) 2011, 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. + * + * 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. + */ + +/* + * @test + * @bug 7115052 + * @ignore 7120266 + * @summary Add parser support for method references + */ + +import com.sun.source.util.JavacTask; +import java.net.URI; +import java.util.Arrays; +import javax.tools.Diagnostic; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.SimpleJavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; + +public class MethodReferenceParserTest { + + static int checkCount = 0; + + enum ReferenceKind { + METHOD_REF("#Q##Gm"), + CONSTRUCTOR_REF("#Q##Gnew"), + ERR_SUPER("#Q##Gsuper"), + ERR_METH0("#Q##Gm()"), + ERR_METH1("#Q##Gm(X)"), + ERR_CONSTR0("#Q##Gnew()"), + ERR_CONSTR1("#Q##Gnew(X)"); + + String referenceTemplate; + + ReferenceKind(String referenceTemplate) { + this.referenceTemplate = referenceTemplate; + } + + String getReferenceString(QualifierKind qk, GenericKind gk) { + return referenceTemplate + .replaceAll("#Q", qk.qualifier) + .replaceAll("#G", gk.typeParameters); + } + + boolean erroneous() { + switch (this) { + case ERR_SUPER: + case ERR_METH0: + case ERR_METH1: + case ERR_CONSTR0: + case ERR_CONSTR1: + return true; + default: return false; + } + } + } + + enum GenericKind { + NONE(""), + ONE(""), + TWO(""); + + String typeParameters; + + GenericKind(String typeParameters) { + this.typeParameters = typeParameters; + } + } + + enum QualifierKind { + THIS("this"), + SUPER("super"), + NEW("new Foo()"), + METHOD("m()"), + FIELD("a.f"), + UBOUND_SIMPLE("A"), + UNBOUND_GENERIC1("A"), + UNBOUND_GENERIC2("A"), + UNBOUND_GENERIC3("A"); + + String qualifier; + + QualifierKind(String qualifier) { + this.qualifier = qualifier; + } + } + + enum ExprKind { + NONE("#R#S"), + SINGLE_PAREN1("(#R#S)"), + SINGLE_PAREN2("(#R)#S"), + DOUBLE_PAREN1("((#R#S))"), + DOUBLE_PAREN2("((#R)#S)"), + DOUBLE_PAREN3("((#R))#S"); + + String expressionTemplate; + + ExprKind(String expressionTemplate) { + this.expressionTemplate = expressionTemplate; + } + + String expressionString(ReferenceKind rk, QualifierKind qk, GenericKind gk, SubExprKind sk) { + return expressionTemplate + .replaceAll("#R", rk.getReferenceString(qk, gk)) + .replaceAll("#S", sk.subExpression); + } + } + + enum SubExprKind { + NONE(""), + SELECT_FIELD(".f"), + SELECT_METHOD(".f()"), + SELECT_NEW(".new Foo()"), + POSTINC("++"), + POSTDEC("--"); + + String subExpression; + + SubExprKind(String subExpression) { + this.subExpression = subExpression; + } + } + + public static void main(String... args) throws Exception { + + //create default shared JavaCompiler - reused across multiple compilations + JavaCompiler comp = ToolProvider.getSystemJavaCompiler(); + StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null); + + for (ReferenceKind rk : ReferenceKind.values()) { + for (QualifierKind qk : QualifierKind.values()) { + for (GenericKind gk : GenericKind.values()) { + for (SubExprKind sk : SubExprKind.values()) { + for (ExprKind ek : ExprKind.values()) { + new MethodReferenceParserTest(rk, qk, gk, sk, ek).run(comp, fm); + } + } + } + } + } + System.out.println("Total check executed: " + checkCount); + } + + ReferenceKind rk; + QualifierKind qk; + GenericKind gk; + SubExprKind sk; + ExprKind ek; + JavaSource source; + DiagnosticChecker diagChecker; + + MethodReferenceParserTest(ReferenceKind rk, QualifierKind qk, GenericKind gk, SubExprKind sk, ExprKind ek) { + this.rk = rk; + this.qk = qk; + this.gk = gk; + this.sk = sk; + this.ek = ek; + this.source = new JavaSource(); + this.diagChecker = new DiagnosticChecker(); + } + + class JavaSource extends SimpleJavaFileObject { + + String template = "class Test {\n" + + " SAM s = #E;\n" + + "}"; + + String source; + + public JavaSource() { + super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE); + source = template.replaceAll("#E", ek.expressionString(rk, qk, gk, sk)); + } + + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) { + return source; + } + } + + void run(JavaCompiler tool, StandardJavaFileManager fm) throws Exception { + JavacTask ct = (JavacTask)tool.getTask(null, fm, diagChecker, + Arrays.asList("-XDallowMethodReferences"), null, Arrays.asList(source)); + try { + ct.parse(); + } catch (Throwable ex) { + throw new AssertionError("Error thrown when parsing the following source:\n" + source.getCharContent(true)); + } + check(); + } + + void check() { + checkCount++; + + if (diagChecker.errorFound != rk.erroneous()) { + throw new Error("invalid diagnostics for source:\n" + + source.getCharContent(true) + + "\nFound error: " + diagChecker.errorFound + + "\nExpected error: " + rk.erroneous()); + } + } + + static class DiagnosticChecker implements javax.tools.DiagnosticListener { + + boolean errorFound; + + public void report(Diagnostic diagnostic) { + if (diagnostic.getKind() == Diagnostic.Kind.ERROR) { + errorFound = true; + } + } + } +} diff --git a/langtools/test/tools/javac/parser/netbeans/JavacParserTest.java b/langtools/test/tools/javac/parser/JavacParserTest.java similarity index 78% rename from langtools/test/tools/javac/parser/netbeans/JavacParserTest.java rename to langtools/test/tools/javac/parser/JavacParserTest.java index 79ce2132d02..7cfd0070ab8 100644 --- a/langtools/test/tools/javac/parser/netbeans/JavacParserTest.java +++ b/langtools/test/tools/javac/parser/JavacParserTest.java @@ -25,13 +25,14 @@ * @test * @bug 7073631 * @summary tests error and diagnostics positions - * @author jan.lahoda@oracle.com + * @author Jan Lahoda */ import com.sun.source.tree.BinaryTree; import com.sun.source.tree.BlockTree; import com.sun.source.tree.ClassTree; import com.sun.source.tree.CompilationUnitTree; +import com.sun.source.tree.ErroneousTree; import com.sun.source.tree.ExpressionStatementTree; import com.sun.source.tree.ExpressionTree; import com.sun.source.tree.MethodInvocationTree; @@ -49,6 +50,7 @@ import com.sun.tools.javac.api.JavacTaskImpl; import com.sun.tools.javac.tree.JCTree; import java.io.IOException; import java.net.URI; +import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; import java.util.List; @@ -81,6 +83,34 @@ public class JavacParserTest extends TestCase { return text; } } + /* + * converts Windows to Unix style LFs for comparing strings + */ + private String normalize(String in) { + return in.replace(System.getProperty("line.separator"), "\n"); + } + + public CompilationUnitTree getCompilationUnitTree(String code) throws IOException { + + JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null, + null, Arrays.asList(new MyFileObject(code))); + CompilationUnitTree cut = ct.parse().iterator().next(); + return cut; + } + + public List getErroneousTreeValues(ErroneousTree node) { + + List values = new ArrayList<>(); + if (node.getErrorTrees() != null) { + for (Tree t : node.getErrorTrees()) { + values.add(t.toString()); + } + } else { + throw new RuntimeException("ERROR: No Erroneous tree " + + "has been created."); + } + return values; + } public void testPositionForSuperConstructorCalls() throws IOException { assert tool != null; @@ -97,22 +127,28 @@ public class JavacParserTest extends TestCase { ExpressionStatementTree es = (ExpressionStatementTree) method.getBody().getStatements().get(0); + final int esStartPos = code.indexOf(es.toString()); + final int esEndPos = esStartPos + es.toString().length(); assertEquals("testPositionForSuperConstructorCalls", - 72 - 24, pos.getStartPosition(cut, es)); + esStartPos, pos.getStartPosition(cut, es)); assertEquals("testPositionForSuperConstructorCalls", - 80 - 24, pos.getEndPosition(cut, es)); + esEndPos, pos.getEndPosition(cut, es)); MethodInvocationTree mit = (MethodInvocationTree) es.getExpression(); + final int mitStartPos = code.indexOf(mit.toString()); + final int mitEndPos = mitStartPos + mit.toString().length(); assertEquals("testPositionForSuperConstructorCalls", - 72 - 24, pos.getStartPosition(cut, mit)); + mitStartPos, pos.getStartPosition(cut, mit)); assertEquals("testPositionForSuperConstructorCalls", - 79 - 24, pos.getEndPosition(cut, mit)); + mitEndPos, pos.getEndPosition(cut, mit)); + final int methodStartPos = mitStartPos; + final int methodEndPos = methodStartPos + mit.getMethodSelect().toString().length(); assertEquals("testPositionForSuperConstructorCalls", - 72 - 24, pos.getStartPosition(cut, mit.getMethodSelect())); + methodStartPos, pos.getStartPosition(cut, mit.getMethodSelect())); assertEquals("testPositionForSuperConstructorCalls", - 77 - 24, pos.getEndPosition(cut, mit.getMethodSelect())); + methodEndPos, pos.getEndPosition(cut, mit.getMethodSelect())); } @@ -158,24 +194,21 @@ public class JavacParserTest extends TestCase { public void testPreferredPositionForBinaryOp() throws IOException { - String code = "package test; public class Test {" + - "private void test() {" + - "Object o = null; boolean b = o != null && o instanceof String;" + - "} private Test() {}}"; - - JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null, - null, Arrays.asList(new MyFileObject(code))); - CompilationUnitTree cut = ct.parse().iterator().next(); + String code = "package test; public class Test {" + + "private void test() {" + + "Object o = null; boolean b = o != null && o instanceof String;" + + "} private Test() {}}"; + CompilationUnitTree cut = getCompilationUnitTree(code); ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0); MethodTree method = (MethodTree) clazz.getMembers().get(0); VariableTree condSt = (VariableTree) method.getBody().getStatements().get(1); BinaryTree cond = (BinaryTree) condSt.getInitializer(); JCTree condJC = (JCTree) cond; - - assertEquals("testNewClassWithEnclosing", - 117 - 24, condJC.pos); + int condStartPos = code.indexOf("&&"); + assertEquals("testPreferredPositionForBinaryOp", + condStartPos, condJC.pos); } public void testPositionBrokenSource126732a() throws IOException { @@ -599,9 +632,7 @@ public class JavacParserTest extends TestCase { final String code = "package t; class Test { " + "{ try (java.io.InputStream in = null) { } } }"; - JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null, - null, Arrays.asList(new MyFileObject(code))); - CompilationUnitTree cut = ct.parse().iterator().next(); + CompilationUnitTree cut = getCompilationUnitTree(code); new TreeScanner() { @Override @@ -622,9 +653,7 @@ public class JavacParserTest extends TestCase { final String code = "package t; class Test { " + "{ java.io.InputStream in = null; } }"; - JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null, - null, Arrays.asList(new MyFileObject(code))); - CompilationUnitTree cut = ct.parse().iterator().next(); + CompilationUnitTree cut = getCompilationUnitTree(code); new TreeScanner() { @@ -640,6 +669,138 @@ public class JavacParserTest extends TestCase { }.scan(cut, null); } + // expected erroneous tree: int x = y;(ERROR); + public void testOperatorMissingError() throws IOException { + + String code = "package test; public class ErrorTest { " + + "void method() { int x = y z } }"; + CompilationUnitTree cut = getCompilationUnitTree(code); + final List values = new ArrayList<>(); + final List expectedValues = + new ArrayList<>(Arrays.asList("[z]")); + + new TreeScanner() { + + @Override + public Void visitErroneous(ErroneousTree node, Void p) { + + values.add(getErroneousTreeValues(node).toString()); + return null; + + } + }.scan(cut, null); + + assertEquals("testSwitchError: The Erroneous tree " + + "error values: " + values + + " do not match expected error values: " + + expectedValues, values, expectedValues); + } + + //expected erroneous tree: String s = (ERROR); + public void testMissingParenthesisError() throws IOException { + + String code = "package test; public class ErrorTest { " + + "void f() {String s = new String; } }"; + CompilationUnitTree cut = getCompilationUnitTree(code); + final List values = new ArrayList<>(); + final List expectedValues = + new ArrayList<>(Arrays.asList("[new String()]")); + + new TreeScanner() { + + @Override + public Void visitErroneous(ErroneousTree node, Void p) { + + values.add(getErroneousTreeValues(node).toString()); + return null; + } + }.scan(cut, null); + + assertEquals("testSwitchError: The Erroneous tree " + + "error values: " + values + + " do not match expected error values: " + + expectedValues, values, expectedValues); + } + + //expected erroneous tree: package test; (ERROR)(ERROR) + public void testMissingClassError() throws IOException { + + String code = "package Test; clas ErrorTest { " + + "void f() {String s = new String(); } }"; + CompilationUnitTree cut = getCompilationUnitTree(code); + final List values = new ArrayList<>(); + final List expectedValues = + new ArrayList<>(Arrays.asList("[, clas]", "[]")); + + new TreeScanner() { + + @Override + public Void visitErroneous(ErroneousTree node, Void p) { + + values.add(getErroneousTreeValues(node).toString()); + return null; + } + }.scan(cut, null); + + assertEquals("testSwitchError: The Erroneous tree " + + "error values: " + values + + " do not match expected error values: " + + expectedValues, values, expectedValues); + } + + //expected erroneous tree: void m1(int i) {(ERROR);{(ERROR);} + public void testSwitchError() throws IOException { + + String code = "package test; public class ErrorTest { " + + "int numDays; void m1(int i) { switchh {i} { case 1: " + + "numDays = 31; break; } } }"; + CompilationUnitTree cut = getCompilationUnitTree(code); + final List values = new ArrayList<>(); + final List expectedValues = + new ArrayList<>(Arrays.asList("[switchh]", "[i]")); + + new TreeScanner() { + + @Override + public Void visitErroneous(ErroneousTree node, Void p) { + + values.add(getErroneousTreeValues(node).toString()); + return null; + } + }.scan(cut, null); + + assertEquals("testSwitchError: The Erroneous tree " + + "error values: " + values + + " do not match expected error values: " + + expectedValues, values, expectedValues); + } + + //expected erroneous tree: class ErrorTest {(ERROR) + public void testMethodError() throws IOException { + + String code = "package Test; class ErrorTest { " + + "static final void f) {String s = new String(); } }"; + CompilationUnitTree cut = getCompilationUnitTree(code); + final List values = new ArrayList<>(); + final List expectedValues = + new ArrayList<>(Arrays.asList("[\nstatic final void f();]")); + + new TreeScanner() { + + @Override + public Void visitErroneous(ErroneousTree node, Void p) { + + values.add(normalize(getErroneousTreeValues(node).toString())); + return null; + } + }.scan(cut, null); + + assertEquals("testMethodError: The Erroneous tree " + + "error value: " + values + + " does not match expected error values: " + + expectedValues, values, expectedValues); + } + void testsNotWorking() throws IOException { // Fails with nb-javac, needs further investigation @@ -661,7 +822,13 @@ public class JavacParserTest extends TestCase { testStartPositionForMethodWithoutModifiers(); testVarPos(); testVariableInIfThen3(); + testMissingExponent(); testTryResourcePos(); + testOperatorMissingError(); + testMissingParenthesisError(); + testMissingClassError(); + testSwitchError(); + testMethodError(); } public static void main(String... args) throws IOException { diff --git a/langtools/test/tools/javac/quid/T6999438.out b/langtools/test/tools/javac/quid/T6999438.out index cd6266895d1..04fdcfae97f 100644 --- a/langtools/test/tools/javac/quid/T6999438.out +++ b/langtools/test/tools/javac/quid/T6999438.out @@ -1,4 +1,4 @@ -T6999438.java:8:9: compiler.err.illegal.char: 35 +T6999438.java:8:8: compiler.err.expected: token.identifier T6999438.java:8:10: compiler.err.illegal.start.of.type T6999438.java:8:25: compiler.err.expected: token.identifier T6999438.java:8:26: compiler.err.expected: ';'