From bfcd1c06173673225785b8065cddcaf931eea382 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Tue, 13 May 2014 12:34:41 +0000
Subject: [PATCH] Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@95621 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../td/gwtservice/shared/tr/ColumnData.java   | 23 ++++++++-
 .../shared/tr/RelationshipData.java           | 49 +++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/RelationshipData.java

diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnData.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnData.java
index 47a0ddb..1b88c5d 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnData.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnData.java
@@ -27,7 +27,10 @@ public class ColumnData implements Serializable {
 	protected TRId trId;
 	protected boolean viewColumn;
 	protected ColumnViewData columnViewData;
-
+	
+	// Relationship for Dimension and Timedimension columns
+	protected RelationshipData relationship;
+	
 	// validation columns that validate this column
 	protected ArrayList<String> validationColumnReferences;
 
@@ -35,7 +38,13 @@ public class ColumnData implements Serializable {
 	protected boolean validationColumn;
 	// if this is a validation column then contains the columns validated
 	protected ArrayList<String> validatedColumns;
-
+	
+	
+	public ColumnData(){
+		
+	}
+	
+	
 	public String getColumnId() {
 		return columnId;
 	}
@@ -149,6 +158,14 @@ public class ColumnData implements Serializable {
 		this.locale = locale;
 	}
 
+	public RelationshipData getRelationship() {
+		return relationship;
+	}
+
+	public void setRelationship(RelationshipData relationship) {
+		this.relationship = relationship;
+	}
+
 	@Override
 	public String toString() {
 		return "ColumnData [id=" + id + ", columnId=" + columnId + ", name="
@@ -156,10 +173,12 @@ public class ColumnData implements Serializable {
 				+ ", dataTypeName=" + dataTypeName + ", label=" + label
 				+ ", locale=" + locale + ", trId=" + trId + ", viewColumn="
 				+ viewColumn + ", columnViewData=" + columnViewData
+				+ ", relationship=" + relationship
 				+ ", validationColumnReferences=" + validationColumnReferences
 				+ ", validationColumn=" + validationColumn
 				+ ", validatedColumns=" + validatedColumns + "]";
 	}
 
 	
+	
 }
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/RelationshipData.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/RelationshipData.java
new file mode 100644
index 0000000..561eb29
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/RelationshipData.java
@@ -0,0 +1,49 @@
+package org.gcube.portlets.user.td.gwtservice.shared.tr;
+
+import java.io.Serializable;
+
+/**
+ * Implements the realtionship for Dimension and TimeDimension columns
+ * 
+ * @author "Giancarlo Panichi"
+ * 
+ */
+public class RelationshipData implements Serializable {
+
+	private static final long serialVersionUID = 897893891284145975L;
+
+	String targetColumnId;
+	Long targetTableId;
+
+	public RelationshipData() {
+
+	}
+
+	public RelationshipData(String targetColumnId, Long targetTableId) {
+		this.targetColumnId=targetColumnId;
+		this.targetTableId=targetTableId;
+	}
+
+	public String getTargetColumnId() {
+		return targetColumnId;
+	}
+
+	public void setTargetColumnId(String targetColumnId) {
+		this.targetColumnId = targetColumnId;
+	}
+
+	public Long getTargetTableId() {
+		return targetTableId;
+	}
+
+	public void setTargetTableId(Long targetTableId) {
+		this.targetTableId = targetTableId;
+	}
+
+	@Override
+	public String toString() {
+		return "RelationshipData [targetColumnId=" + targetColumnId
+				+ ", targetTableId=" + targetTableId + "]";
+	}
+
+}