details: https://code.openbravo.com/erp/devel/pi/rev/3e4580cd8156 changeset: 22785:3e4580cd8156 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu Mar 27 17:53:22 2014 +0530 summary: Related to Issue 26095 : Code review changes
Updated copyright information to Openbravo public license Updated printPagePopUpDownloadAndRefresh from protected to private method. diffstat: src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 4 +- src/org/openbravo/base/secureApp/PopUp_DownloadAndRefresh.html | 28 ++++++--- src/org/openbravo/base/secureApp/PopUp_DownloadAndRefresh.xml | 29 ++++++--- 3 files changed, 38 insertions(+), 23 deletions(-) diffs (93 lines): diff -r 55729aa70aed -r 3e4580cd8156 src/org/openbravo/base/secureApp/HttpSecureAppServlet.java --- a/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java Thu Mar 27 13:01:21 2014 +0100 +++ b/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java Thu Mar 27 17:53:22 2014 +0530 @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2001-2013 Openbravo S.L.U. + * Copyright (C) 2001-2014 Openbravo S.L.U. * Licensed under the Apache Software License version 2.0 * 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 @@ -1244,7 +1244,7 @@ data, exportParameters, false); } - protected void renderJR(VariablesSecureApp variables, HttpServletResponse response, + private void renderJR(VariablesSecureApp variables, HttpServletResponse response, String strReportName, String strFileName, String strOutputType, HashMap<String, Object> designParameters, JRDataSource data, Map<Object, Object> exportParameters, boolean forceRefresh) throws ServletException { diff -r 55729aa70aed -r 3e4580cd8156 src/org/openbravo/base/secureApp/PopUp_DownloadAndRefresh.html --- a/src/org/openbravo/base/secureApp/PopUp_DownloadAndRefresh.html Thu Mar 27 13:01:21 2014 +0100 +++ b/src/org/openbravo/base/secureApp/PopUp_DownloadAndRefresh.html Thu Mar 27 17:53:22 2014 +0530 @@ -1,14 +1,21 @@ -<!-- - ************************************************************************************ - * Copyright (C) 2014 Openbravo S.L.U. - * Licensed under the Apache Software License version 2.0 - * 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. - ************************************************************************************ ---> +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.0 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo SLU + * All portions are Copyright (C) 2014 Openbravo SLU + * All Rights Reserved. + * Contributor(s): + ************************************************************************* + */ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> diff -r 55729aa70aed -r 3e4580cd8156 src/org/openbravo/base/secureApp/PopUp_DownloadAndRefresh.xml --- a/src/org/openbravo/base/secureApp/PopUp_DownloadAndRefresh.xml Thu Mar 27 13:01:21 2014 +0100 +++ b/src/org/openbravo/base/secureApp/PopUp_DownloadAndRefresh.xml Thu Mar 27 17:53:22 2014 +0530 @@ -1,15 +1,21 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ************************************************************************************ - * Copyright (C) 2014 Openbravo S.L.U. - * Licensed under the Apache Software License version 2.0 - * 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. - ************************************************************************************ ---> +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.0 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo SLU + * All portions are Copyright (C) 2014 Openbravo SLU + * All Rights Reserved. + * Contributor(s): + ************************************************************************* + */ <REPORT> <TEMPLATE file="PopUp_DownloadAndRefresh.html"/> <PARAMETER id="paramHref" name="href" attribute="onload" replace="xx"/> ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
