From: <ro...@us...> - 2009-05-14 11:54:15
|
Revision: 212 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=212&view=rev Author: roekens Date: 2009-05-14 11:54:08 +0000 (Thu, 14 May 2009) Log Message: ----------- - added cobertura dependencies to enable site generation - bugfixing and code polishing Modified Paths: -------------- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilderBean.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DeleteReferenceVisitor.java trunk/cse-ip/sc-mapper/pom.xml Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilderBean.java =================================================================== --- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilderBean.java 2009-05-14 11:22:07 UTC (rev 211) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilderBean.java 2009-05-14 11:54:08 UTC (rev 212) @@ -73,7 +73,7 @@ @Override public void setEventTime(Date eventTime) { - this.eventTime = eventTime; + this.eventTime = new Date(eventTime.getTime()); } @Override Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java =================================================================== --- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-05-14 11:22:07 UTC (rev 211) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-05-14 11:54:08 UTC (rev 212) @@ -155,22 +155,23 @@ visitor.visit(this); } + @Override + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof Account)) { + return false; + } + if (this.getId() == null) { + return super.equals( other ); + } + else { + return this.getId().equals(((Account)other).getId()); + } + } + @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof Account)) { - return false; - } - if (this.getId() == null) { - return false; - } else { - return this.getId().equals(((Account) obj).getId()); - } - } - - @Override public int hashCode() { if (this.getId() == null) { return super.hashCode(); Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java =================================================================== --- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-05-14 11:22:07 UTC (rev 211) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-05-14 11:54:08 UTC (rev 212) @@ -167,5 +167,20 @@ visitor.visit(this); } + @Override + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof Category)) { + return false; + } + if (this.getId() == null) { + return super.equals( other ); + } + else { + return this.getId().equals(((Category)other).getId()); + } + } } Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DeleteReferenceVisitor.java =================================================================== --- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DeleteReferenceVisitor.java 2009-05-14 11:22:07 UTC (rev 211) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DeleteReferenceVisitor.java 2009-05-14 11:54:08 UTC (rev 212) @@ -32,7 +32,8 @@ public DeleteReferenceVisitor(Entity persistentTarget, Entity associatedTarget, ReferenceType type) { this.type = type; this.persistentTarget = persistentTarget; - this.associatedTarget = associatedTarget; + //FIXME check if needed +// this.associatedTarget = associatedTarget; } @Override Modified: trunk/cse-ip/sc-mapper/pom.xml =================================================================== --- trunk/cse-ip/sc-mapper/pom.xml 2009-05-14 11:22:07 UTC (rev 211) +++ trunk/cse-ip/sc-mapper/pom.xml 2009-05-14 11:54:08 UTC (rev 212) @@ -83,6 +83,10 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>cobertura</groupId> + <artifactId>cobertura</artifactId> + </dependency> </dependencies> <build> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |