Mercurial > jdk8-mips64-public > jaxws / file diff

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java	Thu Apr 04 19:05:24 2013 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java	Tue Apr 09 14:51:13 2013 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -31,6 +31,7 @@
    1.11  import java.net.URLDecoder;
    1.12  import java.nio.ByteBuffer;
    1.13  import java.util.*;
    1.14 +import java.util.logging.Level;
    1.15  import java.util.logging.Logger;
    1.16  
    1.17  /**
    1.18 @@ -104,7 +105,7 @@
    1.19       * @return attachemnt part
    1.20       */
    1.21      public MIMEPart getPart(int index) {
    1.22 -        LOGGER.fine("index="+index);
    1.23 +        LOGGER.log(Level.FINE, "index={0}", index);
    1.24          MIMEPart part = (index < partsList.size()) ? partsList.get(index) : null;
    1.25          if (parsed && part == null) {
    1.26              throw new MIMEParsingException("There is no "+index+" attachment part ");
    1.27 @@ -114,7 +115,7 @@
    1.28              part = new MIMEPart(this);
    1.29              partsList.add(index, part);
    1.30          }
    1.31 -        LOGGER.fine("Got attachment at index="+index+" attachment="+part);
    1.32 +        LOGGER.log(Level.FINE, "Got attachment at index={0} attachment={1}", new Object[]{index, part});
    1.33          return part;
    1.34      }
    1.35  
    1.36 @@ -128,7 +129,7 @@
    1.37       * @return attachemnt part
    1.38       */
    1.39      public MIMEPart getPart(String contentId) {
    1.40 -        LOGGER.fine("Content-ID="+contentId);
    1.41 +        LOGGER.log(Level.FINE, "Content-ID={0}", contentId);
    1.42          MIMEPart part = getDecodedCidPart(contentId);
    1.43          if (parsed && part == null) {
    1.44              throw new MIMEParsingException("There is no attachment part with Content-ID = "+contentId);
    1.45 @@ -138,7 +139,7 @@
    1.46              part = new MIMEPart(this, contentId);
    1.47              partsMap.put(contentId, part);
    1.48          }
    1.49 -        LOGGER.fine("Got attachment for Content-ID="+contentId+" attachment="+part);
    1.50 +        LOGGER.log(Level.FINE, "Got attachment for Content-ID={0} attachment={1}", new Object[]{contentId, part});
    1.51          return part;
    1.52      }
    1.53  
    1.54 @@ -162,7 +163,7 @@
    1.55      /**
    1.56       * Parses the whole MIME message eagerly
    1.57       */
    1.58 -    public void parseAll() {
    1.59 +    public final void parseAll() {
    1.60          while(makeProgress()) {
    1.61              // Nothing to do
    1.62          }
    1.63 @@ -184,15 +185,15 @@
    1.64  
    1.65          switch(event.getEventType()) {
    1.66              case START_MESSAGE :
    1.67 -                LOGGER.fine("MIMEEvent="+MIMEEvent.EVENT_TYPE.START_MESSAGE);
    1.68 +                LOGGER.log(Level.FINE, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.START_MESSAGE);
    1.69                  break;
    1.70  
    1.71              case START_PART :
    1.72 -                LOGGER.fine("MIMEEvent="+MIMEEvent.EVENT_TYPE.START_PART);
    1.73 +                LOGGER.log(Level.FINE, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.START_PART);
    1.74                  break;
    1.75  
    1.76              case HEADERS :
    1.77 -                LOGGER.fine("MIMEEvent="+MIMEEvent.EVENT_TYPE.HEADERS);
    1.78 +                LOGGER.log(Level.FINE, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.HEADERS);
    1.79                  MIMEEvent.Headers headers = (MIMEEvent.Headers)event;
    1.80                  InternetHeaders ih = headers.getHeaders();
    1.81                  List<String> cids = ih.getHeader("content-id");
    1.82 @@ -219,20 +220,20 @@
    1.83                  break;
    1.84  
    1.85              case CONTENT :
    1.86 -                LOGGER.finer("MIMEEvent="+MIMEEvent.EVENT_TYPE.CONTENT);
    1.87 +                LOGGER.log(Level.FINER, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.CONTENT);
    1.88                  MIMEEvent.Content content = (MIMEEvent.Content)event;
    1.89                  ByteBuffer buf = content.getData();
    1.90                  currentPart.addBody(buf);
    1.91                  break;
    1.92  
    1.93              case END_PART :
    1.94 -                LOGGER.fine("MIMEEvent="+MIMEEvent.EVENT_TYPE.END_PART);
    1.95 +                LOGGER.log(Level.FINE, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.END_PART);
    1.96                  currentPart.doneParsing();
    1.97                  ++currentIndex;
    1.98                  break;
    1.99  
   1.100              case END_MESSAGE :
   1.101 -                LOGGER.fine("MIMEEvent="+MIMEEvent.EVENT_TYPE.END_MESSAGE);
   1.102 +                LOGGER.log(Level.FINE, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.END_MESSAGE);
   1.103                  parsed = true;
   1.104                  try {
   1.105                      in.close();