surveyforge-svn

[SurveyForge-svn] SF.net SVN: surveyforge: [54] trunk/surveyforge-core/src/main/java/org/ surveyforge/core/metadata/DataElement.java

[<ja...@us...>]

Revision: 54
          http://svn.sourceforge.net/surveyforge/?rev=54&view=rev
Author:   javism
Date:     2006-09-13 02:58:06 -0700 (Wed, 13 Sep 2006)

Log Message:
-----------
Converted to abstract and added a new Constructor for supporting the creation on RegisterDataElements linked to a ConceptualDataElement

Modified Paths:
--------------
    trunk/surveyforge-core/src/main/java/org/surveyforge/core/metadata/DataElement.java

Modified: trunk/surveyforge-core/src/main/java/org/surveyforge/core/metadata/DataElement.java
===================================================================
--- trunk/surveyforge-core/src/main/java/org/surveyforge/core/metadata/DataElement.java	2006-09-13 06:58:55 UTC (rev 53)
+++ trunk/surveyforge-core/src/main/java/org/surveyforge/core/metadata/DataElement.java	2006-09-13 09:58:06 UTC (rev 54)
@@ -47,7 +47,7 @@
  */
 @Entity
 @Table(uniqueConstraints = {@UniqueConstraint(columnNames = {"identifier", "register_id"})})
-public class DataElement implements Serializable
+public abstract class DataElement implements Serializable
   {
   private static final long serialVersionUID  = 0L;
 
@@ -90,6 +90,11 @@
   protected DataElement( )
     {}
 
+  protected DataElement( String identifier )
+    {
+    this.setIdentifier( identifier );
+    }
+
   /**
    * @param valueDomain
    * @param identifier


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SurveyForge-svn] SF.net SVN: surveyforge: [61] trunk/surveyforge-core/src/main/java/org/ surveyforge/core/metadata/DataElement.java

[<jg...@us...>]

Revision: 61
          http://svn.sourceforge.net/surveyforge/?rev=61&view=rev
Author:   jgongo
Date:     2006-09-20 02:33:34 -0700 (Wed, 20 Sep 2006)

Log Message:
-----------
Added toString method

Modified Paths:
--------------
    trunk/surveyforge-core/src/main/java/org/surveyforge/core/metadata/DataElement.java

Modified: trunk/surveyforge-core/src/main/java/org/surveyforge/core/metadata/DataElement.java
===================================================================
--- trunk/surveyforge-core/src/main/java/org/surveyforge/core/metadata/DataElement.java	2006-09-20 09:32:53 UTC (rev 60)
+++ trunk/surveyforge-core/src/main/java/org/surveyforge/core/metadata/DataElement.java	2006-09-20 09:33:34 UTC (rev 61)
@@ -80,7 +80,7 @@
   /**  */
   @ManyToOne(cascade = {CascadeType.ALL})
   @JoinColumn(name = "valueDomain_id")
-  private AbstractValueDomain       valueDomain;
+  private AbstractValueDomain      valueDomain;
   /**  */
   @ManyToOne(cascade = {CascadeType.ALL})
   @JoinColumn(name = "variableStructure_id", insertable = false, updatable = false)
@@ -250,10 +250,8 @@
       if( !this.getComponentElements( ).contains( componentElement ) )
         {
         if( componentElement.getVariableStructure( ) != null && !componentElement.getVariableStructure( ).equals( this ) )
-          {
           componentElement.getVariableStructure( ).removeElement( componentElement );
-          componentElement.variableStructure = this;
-          }
+        componentElement.variableStructure = this;
         this.componentElements.add( componentElement );
         }
       else
@@ -362,4 +360,21 @@
     {
     return this.getIdentifier( ).hashCode( ) ^ (this.getVariableStructure( ) == null ? 0 : this.getVariableStructure( ).hashCode( ));
     }
+
+  @Override
+  public String toString( )
+    {
+    StringBuffer dataElementString = new StringBuffer( );
+    dataElementString.append( '|' ).append( this.getIdentifier( ) );
+    if( !this.getComponentElements( ).isEmpty( ) )
+      {
+      dataElementString.append( ':' );
+      for( DataElement componentElement : this.getComponentElements( ) )
+        dataElementString.append( componentElement.toString( ) );
+      }
+
+    dataElementString.append( "|" );
+
+    return dataElementString.toString( );
+    }
   }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.