[PORTAL-7] Features and repairs from 1707

This merges latest changes made to Raptor and other features.

Change-Id: I3a58f88e988ddadf52e1c0c782cdccd2b2ecf5e9
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

1 files changed, 16 insertions, 7 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model/definition/wizard/ColumnEditJSON.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model/definition/wizard/ColumnEditJSON.java
index 4e08a697..7f203d36 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model/definition/wizard/ColumnEditJSON.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model/definition/wizard/ColumnEditJSON.java
@@ -1,6 +1,6 @@
 /*-
  * ================================================================================
- * eCOMP Portal SDK
+ * ECOMP Portal SDK
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property
  * ================================================================================
@@ -34,10 +34,24 @@ public class ColumnEditJSON implements WizardJSON {
 	private String drilldownURL;
 	private String drilldownParams;
 	private String drilldownType;
+	private String errorMessage;
+	private String errorStackTrace;
 	
 	public String getTabId() {
 		return tabId;
 	}
+	public String getErrorMessage() {
+		return errorMessage;
+	}
+	public void setErrorMessage(String errorMessage) {
+		this.errorMessage = errorMessage;
+	}
+	public String getErrorStackTrace() {
+		return errorStackTrace;
+	}
+	public void setErrorStackTrace(String errorStackTrace) {
+		this.errorStackTrace = errorStackTrace;
+	}
 	public void setTabId(String tabId) {
 		this.tabId = tabId;
 	}
@@ -101,10 +115,5 @@ public class ColumnEditJSON implements WizardJSON {
 	public void setDrilldownType(String drilldownType) {
 		this.drilldownType = drilldownType;
 	}
-	
-	
-	
-	
-	
-	
+
 }