# HG changeset patch # User naoto # Date 1459296991 25200 # Tue Mar 29 17:16:31 2016 -0700 # Node ID 6e03edf7e6750f40ccc1fe0d510606598322a1c3 # Parent 380afcaf1507dc3a38679af8f1038f74cb2ea058 [mq]: 8153041 diff --git a/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java b/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java --- a/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java +++ b/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -786,10 +786,10 @@ return keyName; } - private String getTarget(String qName, String path, String calType, String context, String width) { - // qName + private String getTarget(String path, String calType, String context, String width) { + // Target qName int lastSlash = path.lastIndexOf('/'); - qName = path.substring(lastSlash+1); + String qName = path.substring(lastSlash+1); int bracket = qName.indexOf('['); if (bracket != -1) { qName = qName.substring(0, bracket); @@ -885,7 +885,7 @@ String[] tmp = keyName.split(",", 3); String calType = currentCalendarType.lname(); String src = calType+"."+tmp[0]; - String target = getTarget(containerqName, + String target = getTarget( entry.getKey(), calType, tmp[1].length()>0 ? tmp[1] : currentContext,