1. Stephen McKamey
  2. duel

Commits

Stephen McKamey  committed 7ca19f8

- minor tweaks to improve code portability

  • Participants
  • Parent commits 3460ecd
  • Branches default

Comments (0)

Files changed (3)

File src/org/duelengine/duel/codedom/CodeTypeDeclaration.java

View file
  • Ignore whitespace
 	private AccessModifierType access;
 	private Class<?> baseType;
 	private String typeName;
-	private String namespace;
+	private String typeNS;
 	private final List<CodeMember> members = new ArrayList<CodeMember>();
 
 	public CodeTypeDeclaration() {
 		this.access = AccessModifierType.DEFAULT;
 	}
 
-	public CodeTypeDeclaration(AccessModifierType access, String namespace, String typeName, Class<?> baseType, CodeMember... members) {
+	public CodeTypeDeclaration(AccessModifierType access, String typeNS, String typeName, Class<?> baseType, CodeMember... members) {
 		this.baseType = (baseType != null) ? baseType : Object.class;
 		this.access = (access != null) ? access : AccessModifierType.DEFAULT;
-		this.namespace = namespace;
+		this.typeNS = typeNS;
 		this.typeName = typeName;
 
 		if (members != null) {
 	}
 
 	public void setNamespace(String value) {
-		this.namespace = value;
+		this.typeNS = value;
 	}
 
 	public String getNamespace() {
-		return this.namespace;
+		return this.typeNS;
 	}
 
 	/**
 			return false;
 		}
 
-		if (this.namespace == null ? that.namespace != null : !this.namespace.equals(that.namespace)) {
+		if (this.typeNS == null ? that.typeNS != null : !this.typeNS.equals(that.typeNS)) {
 			return false;
 		}
 
 		if (this.baseType != null) {
 			hash = hash * HASH_PRIME + this.baseType.hashCode();
 		}
-		if (this.namespace != null) {
-			hash = hash * HASH_PRIME + this.namespace.hashCode();
+		if (this.typeNS != null) {
+			hash = hash * HASH_PRIME + this.typeNS.hashCode();
 		}
 		if (this.typeName != null) {
 			hash = hash * HASH_PRIME + this.typeName.hashCode();

File src/org/duelengine/duel/codegen/CodeDOMUtility.java

View file
  • Ignore whitespace
 	// static class
 	private CodeDOMUtility() {}
 
-	public static CodeTypeDeclaration createViewType(String namespace, String typeName, CodeMember... members) {
+	public static CodeTypeDeclaration createViewType(String typeNS, String typeName, CodeMember... members) {
 		CodeTypeDeclaration viewType = new CodeTypeDeclaration(
 			AccessModifierType.PUBLIC,
-			namespace,
+			typeNS,
 			typeName,
 			DuelView.class);
 

File src/org/duelengine/duel/rs/ViewResult.java

View file
  • Ignore whitespace
  */
 public class ViewResult implements StreamingOutput {
 	
-	private final String DEFAULT_ENCODING = "utf-8";
+	private final String DEFAULT_ENCODING = "UTF-8";
 
 	private final DuelContext context;
 	private final DuelView view;