|
From: <jg...@us...> - 2006-10-09 14:25:36
|
Revision: 81
http://svn.sourceforge.net/surveyforge/?rev=81&view=rev
Author: jgongo
Date: 2006-10-09 07:25:26 -0700 (Mon, 09 Oct 2006)
Log Message:
-----------
Several changes to make public API more friendly
Modified Paths:
--------------
trunk/surveyforge-core/src/main/java/org/surveyforge/core/data/Data.java
trunk/surveyforge-core/src/main/java/org/surveyforge/core/data/ObjectData.java
trunk/surveyforge-core/src/main/java/org/surveyforge/core/data/RegisterData.java
Modified: trunk/surveyforge-core/src/main/java/org/surveyforge/core/data/Data.java
===================================================================
--- trunk/surveyforge-core/src/main/java/org/surveyforge/core/data/Data.java 2006-10-09 13:10:55 UTC (rev 80)
+++ trunk/surveyforge-core/src/main/java/org/surveyforge/core/data/Data.java 2006-10-09 14:25:26 UTC (rev 81)
@@ -50,8 +50,8 @@
@Entity
public class Data implements Serializable
{
- private static final long serialVersionUID = 0L;
-
+ private static final long serialVersionUID = -2555299258079055098L;
+
@SuppressWarnings("unused")
@Id
@Column(length = 50)
@@ -75,7 +75,7 @@
private boolean answered;
private boolean applicable;
- @ManyToOne(cascade = {CascadeType.ALL})
+ @ManyToOne
@JoinColumn(name = "enclosingData_id", insertable = false, updatable = false)
private Data enclosingData;
Modified: trunk/surveyforge-core/src/main/java/org/surveyforge/core/data/ObjectData.java
===================================================================
--- trunk/surveyforge-core/src/main/java/org/surveyforge/core/data/ObjectData.java 2006-10-09 13:10:55 UTC (rev 80)
+++ trunk/surveyforge-core/src/main/java/org/surveyforge/core/data/ObjectData.java 2006-10-09 14:25:26 UTC (rev 81)
@@ -56,7 +56,7 @@
/**
* @param registerData The registerData to set.
*/
- public void setRegisterData( RegisterData registerData )
+ protected void setRegisterData( RegisterData registerData )
{
if( registerData != null )
{
Modified: trunk/surveyforge-core/src/main/java/org/surveyforge/core/data/RegisterData.java
===================================================================
--- trunk/surveyforge-core/src/main/java/org/surveyforge/core/data/RegisterData.java 2006-10-09 13:10:55 UTC (rev 80)
+++ trunk/surveyforge-core/src/main/java/org/surveyforge/core/data/RegisterData.java 2006-10-09 14:25:26 UTC (rev 81)
@@ -60,7 +60,7 @@
@javax.persistence.Version
private int lockingVersion;
- @OneToOne
+ @OneToOne(fetch = FetchType.LAZY)
private Register register;
@OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL})
@@ -100,34 +100,37 @@
/**
* @param objectData The objectData to .
*/
- protected void addObjectData( ObjectData objectData )
+ public void addObjectData( ObjectData objectData )
{
- if( objectData != null )
- {
- if( this.register.getKey( ).size( ) == 0 ) throw new IllegalArgumentException( );
- ArrayList<Integer> illegalList = new ArrayList<Integer>( );
- // TODO: Check validation rules and throw Exceptions if needed
+ if( objectData.getRegisterData( ) != null ) objectData.getRegisterData( ).removeObjectData( objectData );
+ // TODO: Add data validation
+ this.objectData.add( objectData );
+ }
- if( this.register.getComponentElements( ).size( ) != objectData.getComponentData( ).size( ) )
- throw new IllegalArgumentException( );
- int index = 0;
- for( Data data : objectData.getComponentData( ) )
- {
- if( !this.register.getComponentElements( ).get( index ).getValueDomain( ).isValid( data.getData( ) ) )
- illegalList.add( index ); // TODO: Elaborate on this Exception
- index++;
- }
- if( illegalList.size( ) == 0 ) this.objectData.add( objectData );
- }
+ /**
+ * @param objectData
+ */
+ public void checkObjectData( ObjectData objectData )
+ {
+ // TODO: Check validation rules and throw Exceptions if needed
- else
- throw new NullPointerException( );
+ // TODO: Later activate this, deactivated to test load/save
+ // if( this.register.getKey( ).size( ) == 0 ) throw new IllegalArgumentException( );
+ // if( this.register.getComponentElements( ).size( ) != objectData.getComponentData( ).size( ) )
+ // throw new IllegalArgumentException( );
+ // int index = 0;
+ // for( Data data : objectData.getComponentData( ) )
+ // {
+ // if( !this.register.getComponentElements( ).get( index ).getValueDomain( ).isValid( data.getData( ) ) )
+ // illegalList.add( index ); // TODO: Elaborate on this Exception
+ // index++;
+ // }
}
/**
* @param objectData The objectData to .
*/
- protected void removeObjectData( ObjectData objectData )
+ public void removeObjectData( ObjectData objectData )
{
if( objectData != null )
this.objectData.remove( objectData );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|