[PORTAL-7] Rebase

This rebasing includes common libraries and common overlays projects
abstraction of components

Change-Id: Ia1efa4deacdc5701e6205104ac021a6c80ed60ba
Signed-off-by: st782s <statta@research.att.com>

1 files changed, 0 insertions, 80 deletions

diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model/search/SearchResultJSON.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model/search/SearchResultJSON.java
deleted file mode 100644
index 00e18f12..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model/search/SearchResultJSON.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.model.search;
-
-import java.util.ArrayList;
-
-public class SearchResultJSON{
-
-	public ArrayList<SearchResultColumn> searchResultColumns = new ArrayList<SearchResultColumn>();
-	
-	public ArrayList<SearchResultRow> searchResultRows = new ArrayList<SearchResultRow>();
-
-
-
-
-
-
-	public ArrayList<SearchResultColumn> getSearchResultColumns() {
-		return searchResultColumns;
-	}
-
-	public void setSearchResultColumns(ArrayList<SearchResultColumn> searchResultColumns) {
-		this.searchResultColumns = searchResultColumns;
-	}
-
-	public ArrayList<SearchResultRow> getSearchResultRows() {
-		return searchResultRows;
-	}
-
-	public void setSearchResultRows(ArrayList<SearchResultRow> searchResultRows) {
-		this.searchResultRows = searchResultRows;
-	}
-
-	public void addColumn(SearchResultColumn column) {
-		searchResultColumns.add(column);
-	} // addColumn
-
-	public SearchResultColumn getColumn(int index) {
-		return (SearchResultColumn) searchResultColumns.get(index);
-	} // getColumn
-
-	public int getNumColumns() {
-		return searchResultColumns.size();
-	} // getNumColumns
-
-	public int getNumRows() {
-		return searchResultRows.size();
-	} // getNumRows
-
-	public SearchResultRow getRow(int index) {
-		return (SearchResultRow) searchResultRows.get(index);
-	} // getRow
-
-
-	private String nvl(String s) {
-		return (s == null) ? "" : s;
-	}
-
-	private String nvl(String s, String sDefault) {
-		return nvl(s).equals("") ? sDefault : s;
-	}
-
-} // SearchResultJSON