exo-jcr SVN: r3035 - core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-09-01 03:48:47 -0400 (Wed, 01 Sep 2010)
New Revision: 3035
Modified:
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java
Log:
EXOJCR-886: Replace StringBuffer with StringBuilder in OpenOfficeDocumentReader
Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java 2010-09-01 07:42:48 UTC (rev 3034)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java 2010-09-01 07:48:47 UTC (rev 3035)
@@ -216,13 +216,13 @@
private class OpenOfficeContentHandler extends DefaultHandler
{
- private StringBuffer content;
+ private StringBuilder content;
private boolean appendChar;
public OpenOfficeContentHandler()
{
- content = new StringBuffer();
+ content = new StringBuilder();
appendChar = false;
}
@@ -265,12 +265,12 @@
private QName curPropertyName;
- private StringBuffer curPropertyValue;
+ private StringBuilder curPropertyValue;
public OpenOfficeMetaHandler()
{
props = new Properties();
- curPropertyValue = new StringBuffer();
+ curPropertyValue = new StringBuilder();
}
public Properties getProperties()
@@ -301,7 +301,7 @@
if (curPropertyName != null)
{
props.put(curPropertyName, curPropertyValue.toString());
- curPropertyValue = new StringBuffer();
+ curPropertyValue = new StringBuilder();
curPropertyName = null;
}
}
13 years, 8 months
- 1
- 0
exo-jcr SVN: r3034 - core/branches/2.3.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-09-01 03:42:48 -0400 (Wed, 01 Sep 2010)
New Revision: 3034
Modified:
core/branches/2.3.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java
Log:
EXOJCR-886: Replace StringBuffer with StringBuilder in OpenOfficeDocumentReader
Modified: core/branches/2.3.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java
===================================================================
--- core/branches/2.3.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java 2010-09-01 06:14:41 UTC (rev 3033)
+++ core/branches/2.3.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java 2010-09-01 07:42:48 UTC (rev 3034)
@@ -216,13 +216,13 @@
private class OpenOfficeContentHandler extends DefaultHandler
{
- private StringBuffer content;
+ private StringBuilder content;
private boolean appendChar;
public OpenOfficeContentHandler()
{
- content = new StringBuffer();
+ content = new StringBuilder();
appendChar = false;
}
@@ -265,12 +265,12 @@
private QName curPropertyName;
- private StringBuffer curPropertyValue;
+ private StringBuilder curPropertyValue;
public OpenOfficeMetaHandler()
{
props = new Properties();
- curPropertyValue = new StringBuffer();
+ curPropertyValue = new StringBuilder();
}
public Properties getProperties()
@@ -301,7 +301,7 @@
if (curPropertyName != null)
{
props.put(curPropertyName, curPropertyValue.toString());
- curPropertyValue = new StringBuffer();
+ curPropertyValue = new StringBuilder();
curPropertyName = null;
}
}
13 years, 8 months
- 1
- 0
exo-jcr SVN: r3033 - in core: trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test and 1 other directory.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2010-09-01 02:14:41 -0400 (Wed, 01 Sep 2010)
New Revision: 3033
Modified:
core/branches/2.3.x/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestPropertiesExtracting.java
core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestPropertiesExtracting.java
Log:
EXOJCR-886: fixing tests related to date-property extraction
Modified: core/branches/2.3.x/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestPropertiesExtracting.java
===================================================================
--- core/branches/2.3.x/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestPropertiesExtracting.java 2010-08-31 15:00:44 UTC (rev 3032)
+++ core/branches/2.3.x/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestPropertiesExtracting.java 2010-09-01 06:14:41 UTC (rev 3033)
@@ -25,6 +25,7 @@
import java.io.InputStream;
import java.util.Calendar;
+import java.util.Date;
import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
@@ -68,17 +69,12 @@
{
Properties props = service.getDocumentReader("application/msword").getProperties(is);
Properties etalon = new Properties();
- Calendar date = Calendar.getInstance();
- date.setTimeInMillis(0);
- date.set(2010, 7, 31, 12, 31, 0);
-
etalon.put(DCMetaData.TITLE, "test-Title");
- etalon.put(DCMetaData.DATE, date.getTime());
+ etalon.put(DCMetaData.DATE, new Date(1283247060000L));
etalon.put(DCMetaData.SUBJECT, "test-Subject");
etalon.put(DCMetaData.CREATOR, "Max Yakimenko");
etalon.put(DCMetaData.CONTRIBUTOR, "Max Yakimenko");
etalon.put(DCMetaData.DESCRIPTION, "test-Comments");
-
evalProps(etalon, props);
}
finally
@@ -94,11 +90,8 @@
{
Properties props = service.getDocumentReader("application/powerpoint").getProperties(is);
Properties etalon = new Properties();
- Calendar date = Calendar.getInstance();
- date.setTimeInMillis(41);
- date.set(2010, 7, 31, 12, 34, 15);
etalon.put(DCMetaData.TITLE, "test-Title");
- etalon.put(DCMetaData.DATE, date.getTime());
+ etalon.put(DCMetaData.DATE, new Date(1283247255041L));
etalon.put(DCMetaData.SUBJECT, "test-Subject");
etalon.put(DCMetaData.CREATOR, "Max Yakimenko");
etalon.put(DCMetaData.CONTRIBUTOR, "Max Yakimenko");
@@ -118,12 +111,8 @@
{
Properties props = service.getDocumentReader("application/excel").getProperties(is);
Properties etalon = new Properties();
- Calendar date = Calendar.getInstance();
- date.setTimeInMillis(0);
- date.set(2010, 7, 31, 12, 34, 53);
-
etalon.put(DCMetaData.TITLE, "test-Title");
- etalon.put(DCMetaData.DATE, date.getTime());
+ etalon.put(DCMetaData.DATE, new Date(1283247293000L));
etalon.put(DCMetaData.SUBJECT, "test-Subject");
etalon.put(DCMetaData.CREATOR, "KHANH NGUYEN GIA");
etalon.put(DCMetaData.CONTRIBUTOR, "Max Yakimenko");
@@ -255,6 +244,10 @@
Map.Entry prop = (Map.Entry)it.next();
Object tval = testedProps.get(prop.getKey());
assertNotNull(prop.getKey() + " property not founded. ", tval);
+ if (tval instanceof Date)
+ {
+ System.out.println("was:" + ((Date)tval).getTime() + " expected: " + ((Date)prop.getValue()).getTime());
+ }
assertEquals(prop.getKey() + " property value is incorrect", prop.getValue(), tval);
}
assertEquals("size is incorrect", etalon.size(), testedProps.size());
Modified: core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestPropertiesExtracting.java
===================================================================
--- core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestPropertiesExtracting.java 2010-08-31 15:00:44 UTC (rev 3032)
+++ core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestPropertiesExtracting.java 2010-09-01 06:14:41 UTC (rev 3033)
@@ -25,6 +25,7 @@
import java.io.InputStream;
import java.util.Calendar;
+import java.util.Date;
import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
@@ -68,17 +69,12 @@
{
Properties props = service.getDocumentReader("application/msword").getProperties(is);
Properties etalon = new Properties();
- Calendar date = Calendar.getInstance();
- date.setTimeInMillis(0);
- date.set(2010, 7, 31, 12, 31, 0);
-
etalon.put(DCMetaData.TITLE, "test-Title");
- etalon.put(DCMetaData.DATE, date.getTime());
+ etalon.put(DCMetaData.DATE, new Date(1283247060000L));
etalon.put(DCMetaData.SUBJECT, "test-Subject");
etalon.put(DCMetaData.CREATOR, "Max Yakimenko");
etalon.put(DCMetaData.CONTRIBUTOR, "Max Yakimenko");
etalon.put(DCMetaData.DESCRIPTION, "test-Comments");
-
evalProps(etalon, props);
}
finally
@@ -94,11 +90,8 @@
{
Properties props = service.getDocumentReader("application/powerpoint").getProperties(is);
Properties etalon = new Properties();
- Calendar date = Calendar.getInstance();
- date.setTimeInMillis(41);
- date.set(2010, 7, 31, 12, 34, 15);
etalon.put(DCMetaData.TITLE, "test-Title");
- etalon.put(DCMetaData.DATE, date.getTime());
+ etalon.put(DCMetaData.DATE, new Date(1283247255041L));
etalon.put(DCMetaData.SUBJECT, "test-Subject");
etalon.put(DCMetaData.CREATOR, "Max Yakimenko");
etalon.put(DCMetaData.CONTRIBUTOR, "Max Yakimenko");
@@ -118,12 +111,8 @@
{
Properties props = service.getDocumentReader("application/excel").getProperties(is);
Properties etalon = new Properties();
- Calendar date = Calendar.getInstance();
- date.setTimeInMillis(0);
- date.set(2010, 7, 31, 12, 34, 53);
-
etalon.put(DCMetaData.TITLE, "test-Title");
- etalon.put(DCMetaData.DATE, date.getTime());
+ etalon.put(DCMetaData.DATE, new Date(1283247293000L));
etalon.put(DCMetaData.SUBJECT, "test-Subject");
etalon.put(DCMetaData.CREATOR, "KHANH NGUYEN GIA");
etalon.put(DCMetaData.CONTRIBUTOR, "Max Yakimenko");
@@ -227,7 +216,6 @@
try
{
Properties props = service.getDocumentReader("application/vnd.oasis.opendocument.text").getProperties(is);
- printProps(props);
Properties etalon = new Properties();
Calendar date = Calendar.getInstance();
date.setTimeInMillis(0);
@@ -248,17 +236,6 @@
}
}
- private void printProps(Properties props)
- {
- Iterator it = props.entrySet().iterator();
- props.toString();
- while (it.hasNext())
- {
- Map.Entry entry = (Map.Entry)it.next();
- System.out.println(" " + entry.getKey() + " -> [" + entry.getValue() + "]");
- }
- }
-
private void evalProps(Properties etalon, Properties testedProps)
{
Iterator it = etalon.entrySet().iterator();
13 years, 8 months
- 1
- 0