Author: tchemit Date: 2010-05-18 20:04:03 +0200 (Tue, 18 May 2010) New Revision: 1921 Url: http://nuiton.org/repositories/revision/jaxx/1921 Log: - clean code - Evolution #626: generate generics on overriden object Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java 2010-05-18 17:59:37 UTC (rev 1920) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java 2010-05-18 18:04:03 UTC (rev 1921) @@ -147,18 +147,6 @@ return child; } -// public void setChild(CompiledObject child) { -// this.child = child; -// } -// -// public String getConstraints() { -// return constraints; -// } -// -// public void setConstraints(String constraints) { -// this.constraints = constraints; -// } - public String getChildJavaCode() { return childJavaCode; } @@ -167,14 +155,6 @@ this.childJavaCode = childJavaCode; } -// public String getDelegateCode() { -// return delegateCode; -// } -// -// public void setDelegateCode(String delegateCode) { -// this.delegateCode = delegateCode; -// } - public void addToAdditionCode(StringBuffer buffer, boolean isRootObject) { //TC-20091026 do not prefix if on root object String prefix; @@ -255,7 +235,7 @@ throw new NullPointerException(); } this.objectClass = objectClass; - this.childs = new ArrayList<ChildRef>(); + childs = new ArrayList<ChildRef>(); } public static boolean isValidID(String id) { @@ -397,16 +377,17 @@ String result = javaCode; if (isOverride()) { // handle cases where object is overridden to be a different class - result = "((" + JAXXCompiler.getCanonicalName(getObjectClass()) + ") " + javaCode + ")"; + result = "((" + JAXXCompiler.getCanonicalName(this) + ") " + javaCode + ")"; } return result; } public String getJavaCodeForProperty(String property) { - if (!override) { + if (!isOverride()) { return javaCode; } - String result = "((" + JAXXCompiler.getCanonicalName(getObjectClass()) + ") " + javaCode + ")"; + String result = "((" + JAXXCompiler.getCanonicalName(this) + ") " + javaCode + ")"; +// String result = "((" + JAXXCompiler.getCanonicalName(getObjectClass()) + ") " + javaCode + ")"; String methodName = StringUtils.capitalize(property); try { @@ -501,8 +482,8 @@ */ public void appendInitializationCode(String code) { if (!code.isEmpty()) { - this.initializationCode.append(code); - this.initializationCode.append(JAXXCompiler.getLineSeparator()); + initializationCode.append(code); + initializationCode.append(JAXXCompiler.getLineSeparator()); } } @@ -515,8 +496,8 @@ */ public void appendAdditionCode(String code) { if (!code.isEmpty()) { - this.additionCode.append(code); - this.additionCode.append(JAXXCompiler.getLineSeparator()); + additionCode.append(code); + additionCode.append(JAXXCompiler.getLineSeparator()); } } @@ -594,7 +575,7 @@ compiler.registerEventHandler(handler); eventHandlers.add(handler); - if (getJavaCode().indexOf(".") != -1) { + if (getJavaCode().contains(".")) { // object lives in another JAXX file and consequently its initialization code won't be output compiler.appendInitializerCode(getInitializationCode(handler, compiler)); } @@ -714,12 +695,12 @@ public void finalizeCompiler(JAXXCompiler compiler) { - List<CompiledObject.ChildRef> refList = getChilds(); + List<ChildRef> refList = getChilds(); if (refList != null && !refList.isEmpty()) { // compute additionCode for all childs StringBuffer buffer = new StringBuffer(); for (ChildRef childRef : refList) { - childRef.addToAdditionCode(buffer, compiler.getRootObject() == this); + childRef.addToAdditionCode(buffer, equals(compiler.getRootObject())); } additionCode = buffer.append(additionCode); }