src/java.base/share/classes/sun/util/locale/LanguageTag.java

rev 51919 : 8215281: Use String.isEmpty() when applicable in java.base
Reviewed-by: dfuchs, alanb

*** 210,220 ****
          tag.parsePrivateuse(itr, sts);
  
          if (!itr.isDone() && !sts.isError()) {
              String s = itr.current();
              sts.errorIndex = itr.currentStart();
!             if (s.length() == 0) {
                  sts.errorMsg = "Empty subtag";
              } else {
                  sts.errorMsg = "Invalid subtag: " + s;
              }
          }
--- 210,220 ----
          tag.parsePrivateuse(itr, sts);
  
          if (!itr.isDone() && !sts.isError()) {
              String s = itr.current();
              sts.errorIndex = itr.currentStart();
!             if (s.isEmpty()) {
                  sts.errorMsg = "Empty subtag";
              } else {
                  sts.errorMsg = "Invalid subtag: " + s;
              }
          }
*** 452,462 ****
          if (tag.language.equals("no") && tag.region.equals("NO") && variant.equals("NY")) {
              tag.language = "nn";
              variant = "";
          }
  
!         if (variant.length() > 0) {
              List<String> variants = null;
              StringTokenIterator varitr = new StringTokenIterator(variant, BaseLocale.SEP);
              while (!varitr.isDone()) {
                  String var = varitr.current();
                  if (!isVariant(var)) {
--- 452,462 ----
          if (tag.language.equals("no") && tag.region.equals("NO") && variant.equals("NY")) {
              tag.language = "nn";
              variant = "";
          }
  
!         if (!variant.isEmpty()) {
              List<String> variants = null;
              StringTokenIterator varitr = new StringTokenIterator(variant, BaseLocale.SEP);
              while (!varitr.isDone()) {
                  String var = varitr.current();
                  if (!isVariant(var)) {
*** 525,535 ****
  
          if (privateuse != null) {
              tag.privateuse = privateuse;
          }
  
!         if (tag.language.length() == 0 && (hasSubtag || privateuse == null)) {
              // use lang "und" when 1) no language is available AND
              // 2) any of other subtags other than private use are available or
              // no private use tag is available
              tag.language = UNDETERMINED;
          }
--- 525,535 ----
  
          if (privateuse != null) {
              tag.privateuse = privateuse;
          }
  
!         if (tag.language.isEmpty() && (hasSubtag || privateuse == null)) {
              // use lang "und" when 1) no language is available AND
              // 2) any of other subtags other than private use are available or
              // no private use tag is available
              tag.language = UNDETERMINED;
          }
*** 710,731 ****
  
      @Override
      public String toString() {
          StringBuilder sb = new StringBuilder();
  
!         if (language.length() > 0) {
              sb.append(language);
  
              for (String extlang : extlangs) {
                  sb.append(SEP).append(extlang);
              }
  
!             if (script.length() > 0) {
                  sb.append(SEP).append(script);
              }
  
!             if (region.length() > 0) {
                  sb.append(SEP).append(region);
              }
  
              for (String variant : variants) {
                  sb.append(SEP).append(variant);
--- 710,731 ----
  
      @Override
      public String toString() {
          StringBuilder sb = new StringBuilder();
  
!         if (!language.isEmpty()) {
              sb.append(language);
  
              for (String extlang : extlangs) {
                  sb.append(SEP).append(extlang);
              }
  
!             if (!script.isEmpty()) {
                  sb.append(SEP).append(script);
              }
  
!             if (!region.isEmpty()) {
                  sb.append(SEP).append(region);
              }
  
              for (String variant : variants) {
                  sb.append(SEP).append(variant);
*** 733,743 ****
  
              for (String extension : extensions) {
                  sb.append(SEP).append(extension);
              }
          }
!         if (privateuse.length() > 0) {
              if (sb.length() > 0) {
                  sb.append(SEP);
              }
              sb.append(privateuse);
          }
--- 733,743 ----
  
              for (String extension : extensions) {
                  sb.append(SEP).append(extension);
              }
          }
!         if (!privateuse.isEmpty()) {
              if (sb.length() > 0) {
                  sb.append(SEP);
              }
              sb.append(privateuse);
          }