From: Dennis S. <dso...@us...> - 2009-09-29 03:37:33
|
Update of /cvsroot/jibx/core/build/src/org/jibx/custom/classes In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21183/src/org/jibx/custom/classes Modified Files: GlobalCustom.java Log Message: Correctly handle classes in default package. Index: GlobalCustom.java =================================================================== RCS file: /cvsroot/jibx/core/build/src/org/jibx/custom/classes/GlobalCustom.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GlobalCustom.java 5 Feb 2009 11:26:39 -0000 1.4 --- GlobalCustom.java 29 Sep 2009 03:37:23 -0000 1.5 *************** *** 309,316 **** public boolean isClassUsed(String type) { int split = type.lastIndexOf('.'); ! if (split < 0) { ! split = 0; ! } ! PackageCustom pack = (PackageCustom)m_packageMap.get(type.substring(0, split)); if (pack == null) { return false; --- 309,313 ---- public boolean isClassUsed(String type) { int split = type.lastIndexOf('.'); ! PackageCustom pack = (PackageCustom)m_packageMap.get(split < 0 ? "" : type.substring(0, split)); if (pack == null) { return false; *************** *** 328,335 **** public ClassCustom getClassCustomization(String type) { int split = type.lastIndexOf('.'); ! if (split < 0) { ! split = 0; ! } ! PackageCustom pack = (PackageCustom)m_packageMap.get(type.substring(0, split)); if (pack == null) { return null; --- 325,329 ---- public ClassCustom getClassCustomization(String type) { int split = type.lastIndexOf('.'); ! PackageCustom pack = (PackageCustom)m_packageMap.get(split < 0 ? "" : type.substring(0, split)); if (pack == null) { return null; *************** *** 350,357 **** private ClassCustom buildClassCustomization(String type) { int split = type.lastIndexOf('.'); ! if (split < 0) { ! split = 0; ! } ! PackageCustom pack = getPackage(type.substring(0, split)); ClassCustom clas = pack.addClassCustomization(type.substring(split + 1)); return clas; --- 344,348 ---- private ClassCustom buildClassCustomization(String type) { int split = type.lastIndexOf('.'); ! PackageCustom pack = split < 0 ? getPackage("") : getPackage(type.substring(0, split)); ClassCustom clas = pack.addClassCustomization(type.substring(split + 1)); return clas; *************** *** 590,597 **** String name = buildFullName(contain, ctx); int split = name.lastIndexOf('.'); ! if (split < 0) { ! split = 0; ! } ! PackageCustom pack = global.getPackage(name.substring(0, split)); pack.fixNamespace(); String simple = name.substring(split + 1); --- 581,585 ---- String name = buildFullName(contain, ctx); int split = name.lastIndexOf('.'); ! PackageCustom pack = global.getPackage(split < 0 ? "" : name.substring(0, split)); pack.fixNamespace(); String simple = name.substring(split + 1); |