src/share/classes/com/sun/security/auth/NTSid.java

rev 1461 : 6987827: security/util/Resources.java needs improvement
Reviewed-by: valeriep

*** 1,7 ****
  /*
!  * Copyright (c) 1999, 2003, 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
--- 1,7 ----
  /*
!  * Copyright (c) 1999, 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.  Oracle designates this
*** 71,89 ****
       */
      public NTSid (String stringSid) {
          if (stringSid == null) {
              java.text.MessageFormat form = new java.text.MessageFormat
                  (sun.security.util.ResourcesMgr.getString
!                         ("invalid null input: value",
                          "sun.security.util.AuthResources"));
              Object[] source = {"stringSid"};
              throw new NullPointerException(form.format(source));
          }
          if (stringSid.length() == 0) {
              throw new IllegalArgumentException
                  (sun.security.util.ResourcesMgr.getString
!                         ("Invalid NTSid value",
                          "sun.security.util.AuthResources"));
          }
          sid = new String(stringSid);
      }
  
--- 71,89 ----
       */
      public NTSid (String stringSid) {
          if (stringSid == null) {
              java.text.MessageFormat form = new java.text.MessageFormat
                  (sun.security.util.ResourcesMgr.getString
!                         ("invalid.null.input.value",
                          "sun.security.util.AuthResources"));
              Object[] source = {"stringSid"};
              throw new NullPointerException(form.format(source));
          }
          if (stringSid.length() == 0) {
              throw new IllegalArgumentException
                  (sun.security.util.ResourcesMgr.getString
!                         ("Invalid.NTSid.value",
                          "sun.security.util.AuthResources"));
          }
          sid = new String(stringSid);
      }
  
*** 106,116 ****
       * @return a string representation of this <code>NTSid</code>.
       */
      public String toString() {
          java.text.MessageFormat form = new java.text.MessageFormat
                  (sun.security.util.ResourcesMgr.getString
!                         ("NTSid: name",
                          "sun.security.util.AuthResources"));
          Object[] source = {sid};
          return form.format(source);
      }
  
--- 106,116 ----
       * @return a string representation of this <code>NTSid</code>.
       */
      public String toString() {
          java.text.MessageFormat form = new java.text.MessageFormat
                  (sun.security.util.ResourcesMgr.getString
!                         ("NTSid.name",
                          "sun.security.util.AuthResources"));
          Object[] source = {sid};
          return form.format(source);
      }