Warnings Cleanup in java.util. (original) (raw)

Michael Barker mikeb01 at gmail.com
Thu Dec 1 16:11:46 PST 2011

• Previous message: Warnings Cleanup in java.util.
• Next message: Warnings Cleanup in java.util.
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Trying once more with a .txt extension. If that fails I'll inline the patch.

Mike.

On Fri, Dec 2, 2011 at 12:06 AM, Michael Barker <mikeb01 at gmail.com> wrote:

Looks like the list software has stripped off the attachments from my previous mail (my outbox shows them attached).

Here's a second attempt. On Thu, Dec 1, 2011 at 11:58 PM, Michael Barker <mikeb01 at gmail.com> wrote: Hi,

Here is the output of our (unfortunately short) hack session.  There are warnings fixed in 4 files.  A patch is included in each.  Mostly just generics and deprecation warnings. Regards, Michael Barker. Contributor/UserId: mikeb2701 -------------- next part -------------- diff -r 43a630f11af6 src/share/classes/java/util/jar/JarFile.java --- a/src/share/classes/java/util/jar/JarFile.java Wed Nov 30 13:11:16 2011 -0800 +++ b/src/share/classes/java/util/jar/JarFile.java Thu Dec 01 23:50:32 2011 +0000 @@ -183,7 +183,7 @@ } else { man = new Manifest(super.getInputStream(manEntry)); }

•            manRef = new SoftReference(man);

•            manRef = new SoftReference<Manifest>(man);
         }
     }
     return man;

@@ -233,7 +233,7 @@ * Returns an enumeration of the zip file entries. */ public Enumeration entries() {

•    final Enumeration enum_ = super.entries();

•    final Enumeration<? extends ZipEntry> enum_ = super.entries();
     return new Enumeration<JarEntry>() {
         public boolean hasMoreElements() {
             return enum_.hasMoreElements();

@@ -608,7 +608,7 @@ }

     // screen out entries which are never signed

•    final Enumeration enum_ = super.entries();

•    final Enumeration<? extends ZipEntry> enum_ = super.entries();
     return new Enumeration<JarEntry>() {
  
         ZipEntry entry;

@@ -649,7 +649,7 @@ * JAR file has no signed content. Is there a non-signing * code source? */

•    Enumeration unsigned = unsignedEntryNames();

•    Enumeration<String> unsigned = unsignedEntryNames();
     if (unsigned.hasMoreElements()) {
         return new CodeSource[]{JarVerifier.getUnsignedCS(url)};
     } else {

@@ -658,7 +658,7 @@ }

 private Enumeration<String> unsignedEntryNames() {

•    final Enumeration entries = entries();

•    final Enumeration<JarEntry> entries = entries();
     return new Enumeration<String>() {
  
         String name;

-------------- next part -------------- diff -r 43a630f11af6 src/share/classes/java/util/logging/LogManager.java --- a/src/share/classes/java/util/logging/LogManager.java Wed Nov 30 13:11:16 2011 -0800 +++ b/src/share/classes/java/util/logging/LogManager.java Thu Dec 01 23:51:52 2011 +0000 @@ -179,10 +179,10 @@ cname = System.getProperty("java.util.logging.manager"); if (cname != null) { try {

•                            Class clz = ClassLoader.getSystemClassLoader().loadClass(cname);

•                            Class<?> clz = ClassLoader.getSystemClassLoader().loadClass(cname);
                             manager = (LogManager) clz.newInstance();
                         } catch (ClassNotFoundException ex) {

•                            Class clz = Thread.currentThread().getContextClassLoader().loadClass(cname);

•                            Class<?> clz = Thread.currentThread().getContextClassLoader().loadClass(cname);
                             manager = (LogManager) clz.newInstance();
                         }
                     }

@@ -200,8 +200,8 @@

                 // Adding the global Logger. Doing so in the Logger.<clinit>
                 // would deadlock with the LogManager.<clinit>.

•                Logger.global.setLogManager(manager);

•                manager.addLogger(Logger.global);

•                Logger.getGlobal().setLogManager(manager);

•                manager.addLogger(Logger.getGlobal());
  
                 // We don't call readConfiguration() here, as we may be running
                 // very early in the JVM startup sequence.  Instead readConfiguration

@@ -415,7 +415,7 @@ for (int i = 0; i < names.length; i++) { String word = names[i]; try {

•                    Class   clz = ClassLoader.getSystemClassLoader().loadClass(word);

•                    Class<?>   clz = ClassLoader.getSystemClassLoader().loadClass(word);
                     Handler hdl = (Handler) clz.newInstance();
                     try {
                         // Check if there is a property defining the

@@ -782,11 +782,11 @@ // responsibility to initialize the logging configuration, by // calling readConfiguration(InputStream) with a suitable stream. try {

•                Class clz = ClassLoader.getSystemClassLoader().loadClass(cname);

•                Class<?> clz = ClassLoader.getSystemClassLoader().loadClass(cname);
                 clz.newInstance();
                 return;
             } catch (ClassNotFoundException ex) {

•                Class clz = Thread.currentThread().getContextClassLoader().loadClass(cname);

•                Class<?> clz = Thread.currentThread().getContextClassLoader().loadClass(cname);
                 clz.newInstance();
                 return;
             }

@@ -837,9 +837,9 @@ // the global handlers, if they haven't been initialized yet. initializedGlobalHandlers = true; }

•    Enumeration enum_ = getLoggerNames();

•    Enumeration<String> enum_ = getLoggerNames();
     while (enum_.hasMoreElements()) {

•        String name = (String)enum_.nextElement();

•        String name = enum_.nextElement();
         resetLogger(name);
     }

  } @@ -926,7 +926,7 @@ for (int i = 0; i < names.length; i++) { String word = names[i]; try {

•            Class clz = ClassLoader.getSystemClassLoader().loadClass(word);

•            Class<?> clz = ClassLoader.getSystemClassLoader().loadClass(word);
             clz.newInstance();
         } catch (Exception ex) {
             System.err.println("Can't load config class \"" + word + "\"");

@@ -1024,7 +1024,7 @@ String val = getProperty(name); try { if (val != null) {

•            Class clz = ClassLoader.getSystemClassLoader().loadClass(val);

•            Class<?> clz = ClassLoader.getSystemClassLoader().loadClass(val);
             return (Filter) clz.newInstance();
         }
     } catch (Exception ex) {

@@ -1045,7 +1045,7 @@ String val = getProperty(name); try { if (val != null) {

•            Class clz = ClassLoader.getSystemClassLoader().loadClass(val);

•            Class<?> clz = ClassLoader.getSystemClassLoader().loadClass(val);
             return (Formatter) clz.newInstance();
         }
     } catch (Exception ex) {

@@ -1163,9 +1163,9 @@ // Private method to be called when the configuration has // changed to apply any level settings to any pre-existing loggers. synchronized private void setLevelsOnExistingLoggers() {

•    Enumeration enum_ = props.propertyNames();

•    while (enum_.hasMoreElements()) {

•        String key = (String)enum_.nextElement();

•    Iterator<String> it_ = props.stringPropertyNames().iterator();

•    while (it_.hasNext()) {

•        String key = it_.next();
         if (!key.endsWith(".level")) {
             // Not a level definition.
             continue;

-------------- next part -------------- diff -r 43a630f11af6 src/share/classes/java/util/prefs/Preferences.java --- a/src/share/classes/java/util/prefs/Preferences.java Wed Nov 30 13:11:16 2011 -0800 +++ b/src/share/classes/java/util/prefs/Preferences.java Thu Dec 01 23:51:06 2011 +0000 @@ -413,7 +413,7 @@ * @throws IllegalArgumentException if the package has node preferences * node associated with it. */

• private static String nodeName(Class c) {

• private static String nodeName(Class<?> c) { if (c.isArray()) throw new IllegalArgumentException( "Arrays have no associated preferences node.");

-------------- next part -------------- diff -r 43a630f11af6 src/share/classes/java/util/prefs/XmlSupport.java --- a/src/share/classes/java/util/prefs/XmlSupport.java Wed Nov 30 13:11:16 2011 -0800 +++ b/src/share/classes/java/util/prefs/XmlSupport.java Thu Dec 01 23:51:21 2011 +0000 @@ -106,7 +106,7 @@ xmlRoot.setAttribute("type", (p.isUserNode() ? "user" : "system"));

     // Get bottom-up list of nodes from p to root, excluding root

•    List ancestors = new ArrayList();

•    List<Preferences> ancestors = new ArrayList<>();
  
     for (Preferences kid = p, dad = kid.parent(); dad != null;
                                kid = dad, dad = kid.parent()) {

@@ -116,7 +116,7 @@ for (int i=ancestors.size()-1; i >= 0; i--) { e.appendChild(doc.createElement("map")); e = (Element) e.appendChild(doc.createElement("node"));

•        e.setAttribute("name", ((Preferences)ancestors.get(i)).name());

•        e.setAttribute("name", ancestors.get(i).name());
     }
     putPreferencesInXml(e, doc, p, subTree);

@@ -339,17 +339,17 @@ * @throws IOException if writing to the specified output stream * results in an IOException. */

• static void exportMap(OutputStream os, Map map) throws IOException {

• static void exportMap(OutputStream os, Map<String, String> map) throws IOException { Document doc = createPrefsDoc("map"); Element xmlMap = doc.getDocumentElement( ) ; xmlMap.setAttribute("MAP_XML_VERSION", MAP_XML_VERSION);

•    for (Iterator i = map.entrySet().iterator(); i.hasNext(); ) {

•        Map.Entry e = (Map.Entry) i.next();

•    for (Iterator<Map.Entry<String, String>> i = map.entrySet().iterator(); i.hasNext(); ) {

•        Map.Entry<String, String> e = i.next();
         Element xe = (Element)
             xmlMap.appendChild(doc.createElement("entry"));

•        xe.setAttribute("key",   (String) e.getKey());

•        xe.setAttribute("value", (String) e.getValue());

•        xe.setAttribute("key",   e.getKey());

•        xe.setAttribute("value", e.getValue());
     }
  
     writeDoc(doc, os);

@@ -368,7 +368,7 @@ * @throws InvalidPreferencesFormatException Data on input stream does not * constitute a valid XML document with the mandated document type. */

• static void importMap(InputStream is, Map m)

• static void importMap(InputStream is, Map<String, String> m) throws IOException, InvalidPreferencesFormatException { try {

• Previous message: Warnings Cleanup in java.util.
• Next message: Warnings Cleanup in java.util.
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the jdk8-dev mailing list