Merge branch 'master' of https://github.com/SpagoBILabs/SpagoBI

SpagoBIDAO/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
+  <runtime name="Apache Tomcat v7.0 (3)"/>
   <fixed facet="java"/>
   <fixed facet="jst.utility"/>
   <installed facet="jst.utility" version="1.0"/>

SpagoBIDAO/src/main/java/it/eng/spagobi/analiticalmodel/document/bo/BIObject.java

@@ -131,6 +131,11 @@ public class BIObject implements Serializable, Cloneable {
 	private Integer docVersion = null; // defines the version of template if is different by the default (last version)
 
 	private String parametersRegion = null;
+
+	private String stateCodeStr = null;
+	private String lockedByUser = null;
+
+	private List<OutputParameter> outputParameters = new ArrayList();
 
 	/**
 	 * Gets the id.
@@ -826,4 +831,30 @@ public BIObject clone() {
 		return clone;
 	}
 
+
+	@JsonGetter
+	public String getStateCodeStr() {
+		return stateCodeStr;
+	}
+
+	@JsonIgnore
+	public void setStateCodeStr(String stateCodeStr) {
+		this.stateCodeStr = stateCodeStr;
+	}
+
+	public String getLockedByUser() {
+		return lockedByUser;
+	}
+
+	public void setLockedByUser(String lockedByUser) {
+		this.lockedByUser = lockedByUser;
+	}
+
+	public void setOutputParameters(List<OutputParameter> outputParameters) {
+		this.outputParameters = outputParameters;
+	}
+
+	public List<OutputParameter> getOutputParameters() {
+		return outputParameters;
+	}
 }

SpagoBIDAO/src/main/java/it/eng/spagobi/analiticalmodel/document/bo/OutputParameter.java

@@ -0,0 +1,130 @@
+/*
+ * Knowage, Open Source Business Intelligence suite
+ * Copyright (C) 2016 Engineering Ingegneria Informatica S.p.A.
+ * 
+ * Knowage is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Knowage is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package it.eng.spagobi.analiticalmodel.document.bo;
+
+import it.eng.spagobi.commons.bo.Domain;
+
+import java.io.Serializable;
+
+public class OutputParameter implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 
+	 */
+	private Integer id;
+	private String name;
+	/**
+	 * domainCd = PAR_TYPE
+	 */
+	private Domain type;
+	private Integer biObjectId;
+	private String formatCode;
+	private String formatValue;
+
+	/**
+	 * @return the id
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * @param id
+	 *            the id to set
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * @param name
+	 *            the name to set
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * @return the biObjectId
+	 */
+	public Integer getBiObjectId() {
+		return biObjectId;
+	}
+
+	/**
+	 * @param biObjectId
+	 *            the biObjectId to set
+	 */
+	public void setBiObjectId(Integer biObjectId) {
+		this.biObjectId = biObjectId;
+	}
+
+	/**
+	 * @return the formatCode
+	 */
+	public String getFormatCode() {
+		return formatCode;
+	}
+
+	/**
+	 * @param formatCode
+	 *            the formatCode to set
+	 */
+	public void setFormatCode(String formatCode) {
+		this.formatCode = formatCode;
+	}
+
+	/**
+	 * @return the formatValue
+	 */
+	public String getFormatValue() {
+		return formatValue;
+	}
+
+	/**
+	 * @param formatValue
+	 *            the formatValue to set
+	 */
+	public void setFormatValue(String formatValue) {
+		this.formatValue = formatValue;
+	}
+
+	/**
+	 * @return the type
+	 */
+	public Domain getType() {
+		return type;
+	}
+
+	/**
+	 * @param type
+	 *            the type to set
+	 */
+	public void setType(Domain type) {
+		this.type = type;
+	}
+
+}