make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java

rev 13973 : [mq]: 8153041

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 2015, 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) 2012, 2016, 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
*** 784,797 ****
          }
  
          return keyName;
      }
  
!     private String getTarget(String qName, String path, String calType, String context, String width) {
!         // qName
          int lastSlash = path.lastIndexOf('/');
!         qName = path.substring(lastSlash+1);
          int bracket = qName.indexOf('[');
          if (bracket != -1) {
              qName = qName.substring(0, bracket);
          }
  
--- 784,797 ----
          }
  
          return keyName;
      }
  
!     private String getTarget(String path, String calType, String context, String width) {
!         // Target qName
          int lastSlash = path.lastIndexOf('/');
!         String qName = path.substring(lastSlash+1);
          int bracket = qName.indexOf('[');
          if (bracket != -1) {
              qName = qName.substring(0, bracket);
          }
  
*** 883,893 ****
              if (!keyNames.isEmpty()) {
                  for (String keyName : keyNames) {
                      String[] tmp = keyName.split(",", 3);
                      String calType = currentCalendarType.lname();
                      String src = calType+"."+tmp[0];
!                     String target = getTarget(containerqName,
                                  entry.getKey(),
                                  calType,
                                  tmp[1].length()>0 ? tmp[1] : currentContext,
                                  tmp[2].length()>0 ? tmp[2] : currentWidth);
                      if (target.substring(target.lastIndexOf('.')+1).equals(containerqName)) {
--- 883,893 ----
              if (!keyNames.isEmpty()) {
                  for (String keyName : keyNames) {
                      String[] tmp = keyName.split(",", 3);
                      String calType = currentCalendarType.lname();
                      String src = calType+"."+tmp[0];
!                     String target = getTarget(
                                  entry.getKey(),
                                  calType,
                                  tmp[1].length()>0 ? tmp[1] : currentContext,
                                  tmp[2].length()>0 ? tmp[2] : currentWidth);
                      if (target.substring(target.lastIndexOf('.')+1).equals(containerqName)) {