Author: nfilotto Date: 2010-09-01 12:56:51 -0400 (Wed, 01 Sep 2010) New Revision: 3045 Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/HTMLDocumentReader.java core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java Log: EXOJCR-886: Re-add the constructor with InitParams in HTMLDocumentReader to remain backward compatible, make this constructor deprecated and remove useless variables and imports Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/HTMLDocumentReader.java =================================================================== --- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/HTMLDocumentReader.java 2010-09-01 16:47:25 UTC (rev 3044) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/HTMLDocumentReader.java 2010-09-01 16:56:51 UTC (rev 3045) @@ -18,6 +18,7 @@ */ package org.exoplatform.services.document.impl; +import org.exoplatform.container.xml.InitParams; import org.exoplatform.services.document.DocumentReadException; import org.htmlparser.Parser; import org.htmlparser.beans.StringBean; @@ -39,14 +40,21 @@ /** * Initializes a newly created object for text/html files format parsing. - * + * @deprecated Use the default constructor instead * @param params the container parameters. */ - public HTMLDocumentReader() + public HTMLDocumentReader(InitParams params) { } /** + * Initializes a newly created object for text/html files format parsing. + */ + public HTMLDocumentReader() + { + } + + /** * Get the text/html,application/x-groovy+html mime type. * * @return The string with text/html,application/x-groovy+html mime type. Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java =================================================================== --- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java 2010-09-01 16:47:25 UTC (rev 3044) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java 2010-09-01 16:56:51 UTC (rev 3045) @@ -18,11 +18,8 @@ */ package org.exoplatform.services.document.impl; -import org.apache.poi.POIXMLDocument; -import org.apache.poi.POIXMLPropertiesTextExtractor; import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.openxml4j.exceptions.OpenXML4JRuntimeException; -import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFCellStyle; import org.apache.poi.xssf.usermodel.XSSFRow; @@ -84,8 +81,6 @@ try { wb = new XSSFWorkbook(is); - OPCPackage pkg; - } catch (IOException e) { Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java =================================================================== --- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java 2010-09-01 16:47:25 UTC (rev 3044) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java 2010-09-01 16:56:51 UTC (rev 3045) @@ -21,8 +21,6 @@ import org.apache.poi.POIXMLDocument; import org.apache.poi.POIXMLPropertiesTextExtractor; import org.apache.poi.POIXMLProperties.CoreProperties; -import org.apache.poi.POIXMLProperties.CustomProperties; -import org.apache.poi.POIXMLProperties.ExtendedProperties; import org.apache.poi.hpsf.MarkUnsupportedException; import org.apache.poi.hpsf.NoPropertySetStreamException; import org.apache.poi.hpsf.PropertySet;