Merge "removed unwanted codes in ChartJSON comp"

1 files changed, 2 insertions, 114 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartJSON.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartJSON.java
index cbb06c77..f3066f96 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartJSON.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartJSON.java
@@ -33,7 +33,6 @@
  *
  * ============LICENSE_END============================================
  *
- * 
  */
 package org.onap.portalsdk.analytics.model.runtime;
 
@@ -43,15 +42,7 @@ class Row {
 	private String displayValue;
 	private String dataType;
 	private String colId;
-	//private boolean visible;
 	
-	
-	/*public boolean isVisible() {
-		return visible;
-	}
-	public void setVisible(boolean visible) {
-		this.visible = visible;
-	}*/
 	public String getDisplayValue() {
 		return displayValue;
 	}
@@ -153,24 +144,6 @@ public class ChartJSON {
 	private String secondaryAxisLabel;
 	private String minRange;
 	private String maxRange;
-	//private int topMargin;
-	//private int bottomMargin;
-	//private int leftMargin;
-	//private int rightMargin;
-	
-	/*private boolean showMaxMin;
-	private boolean showLegend;
-	private boolean showControls;
-	private String topMargin;
-	private String bottomMargin;
-	private String leftMargin;
-	private String rightMargin;
-	private String subType;
-	private boolean stacked;
-	private boolean horizontalBar;
-	private boolean barRealTimeAxis;
-	private boolean barReduceXAxisLabels;
-	private boolean timeAxis;*/
 	
 	public String getReportID() {
 		return reportID;
@@ -268,85 +241,7 @@ public class ChartJSON {
 	public void setShowTitle(boolean showTitle) {
 		this.showTitle = showTitle;
 	}	
-	/*public boolean isShowMaxMin() {
-		return showMaxMin;
-	}
-	public void setShowMaxMin(boolean showMaxMin) {
-		this.showMaxMin = showMaxMin;
-	}
-	public boolean isShowLegend() {
-		return showLegend;
-	}
-	public void setShowLegend(boolean showLegend) {
-		this.showLegend = showLegend;
-	}
-	public boolean isShowControls() {
-		return showControls;
-	}
-	public void setShowControls(boolean showControls) {
-		this.showControls = showControls;
-	}
-	public String getTopMargin() {
-		return topMargin;
-	}
-	public void setTopMargin(String topMargin) {
-		this.topMargin = topMargin;
-	}
-	public String getBottomMargin() {
-		return bottomMargin;
-	}
-	public void setBottomMargin(String bottomMargin) {
-		this.bottomMargin = bottomMargin;
-	}
-	public String getLeftMargin() {
-		return leftMargin;
-	}
-	public void setLeftMargin(String leftMargin) {
-		this.leftMargin = leftMargin;
-	}
-	public String getRightMargin() {
-		return rightMargin;
-	}
-	public void setRightMargin(String rightMargin) {
-		this.rightMargin = rightMargin;
-	}
-
-	public String getSubType() {
-		return subType;
-	}
-	public void setSubType(String subType) {
-		this.subType = subType;
-	}
-	public boolean isStacked() {
-		return stacked;
-	}
-	public void setStacked(boolean stacked) {
-		this.stacked = stacked;
-	}
-	public boolean isHorizontalBar() {
-		return horizontalBar;
-	}
-	public void setHorizontalBar(boolean horizontalBar) {
-		this.horizontalBar = horizontalBar;
-	}
-	public boolean isBarRealTimeAxis() {
-		return barRealTimeAxis;
-	}
-	public void setBarRealTimeAxis(boolean barRealTimeAxis) {
-		this.barRealTimeAxis = barRealTimeAxis;
-	}
-	public boolean isBarReduceXAxisLabels() {
-		return barReduceXAxisLabels;
-	}
-	public void setBarReduceXAxisLabels(boolean barReduceXAxisLabels) {
-		this.barReduceXAxisLabels = barReduceXAxisLabels;
-	}
-	public boolean isTimeAxis() {
-		return timeAxis;
-	}
-	public void setTimeAxis(boolean timeAxis) {
-		this.timeAxis = timeAxis;
-	}*/
+	
 	public ChartTypeJSON getChartTypeJSON() {
 		return chartTypeJSON;
 	}
@@ -398,12 +293,6 @@ public class ChartJSON {
 	public void setMaxRange(String maxRange) {
 		this.maxRange = maxRange;
 	}
-	/*public ArrayList<Row> getRowList() {
-		return rowList;
-	}
-	public void setRowList(ArrayList<Row> rowList) {
-		this.rowList = rowList;
-	}*/
 	
 	public ArrayList<ArrayList<Row>> getWholeList() {
 		return wholeList;
@@ -411,8 +300,7 @@ public class ChartJSON {
 	public void setWholeList(ArrayList<ArrayList<Row>> wholeList) {
 		this.wholeList = wholeList;
 	}	
-	//private ArrayList<ColumnHeader> reportDataColumns;
-	//private ArrayList<Map<String,Object>> reportDataRows;
+
 	public ArrayList<ChartColumnJSON> getChartColumnJSONList() {
 		return chartColumnJSONList;
 	}