Author: nick
Date: Tue Feb 23 22:10:20 2016
New Revision: 1731975
URL: http://svn.apache.org/viewvc?rev=1731975&view=rev
Log:
Pull out http://schemas.openxmlformats.org/spreadsheetml/2006/main to a re-used
constant
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java?rev=1731975&r1=1731974&r2=1731975&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
Tue Feb 23 22:10:20 2016
@@ -16,6 +16,8 @@
==================================================================== */
package org.apache.poi.xssf.eventusermodel;
+import static org.apache.poi.xssf.usermodel.XSSFRelation.SPREADSHEETML_NS;
+
import java.util.LinkedList;
import java.util.Queue;
@@ -41,7 +43,7 @@ import org.xml.sax.helpers.DefaultHandle
*/
public class XSSFSheetXMLHandler extends DefaultHandler {
private static final POILogger logger =
POILogFactory.getLogger(XSSFSheetXMLHandler.class);
- static final String SPREADSHEETML_NS =
"http://schemas.openxmlformats.org/spreadsheetml/2006/main";;
+
/**
* These are the different kinds of cells we support.
* We keep track of the current one between
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java?rev=1731975&r1=1731974&r2=1731975&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
Tue Feb 23 22:10:20 2016
@@ -18,6 +18,7 @@
package org.apache.poi.xssf.model;
import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
+import static org.apache.poi.xssf.usermodel.XSSFRelation.SPREADSHEETML_NS;
import java.io.IOException;
import java.io.InputStream;
@@ -37,7 +38,6 @@ import org.openxmlformats.schemas.spread
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSst;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.SstDocument;
-
/**
* Table of strings shared across all sheets in a workbook.
* <p>
@@ -58,9 +58,6 @@ import org.openxmlformats.schemas.spread
* The shared string table contains all the necessary information for
displaying the string: the text, formatting
* properties, and phonetic properties (for East Asian languages).
* </p>
- *
- * @author Nick Birch
- * @author Yegor Kozlov
*/
public class SharedStringsTable extends POIXMLDocumentPart {
@@ -94,7 +91,7 @@ public class SharedStringsTable extends
options.put( XmlOptions.SAVE_INNER );
options.put( XmlOptions.SAVE_AGGRESSIVE_NAMESPACES );
options.put( XmlOptions.SAVE_USE_DEFAULT_NAMESPACE );
- options.setSaveImplicitNamespaces(Collections.singletonMap("",
"http://schemas.openxmlformats.org/spreadsheetml/2006/main";));
+ options.setSaveImplicitNamespaces(Collections.singletonMap("",
SPREADSHEETML_NS));
}
public SharedStringsTable() {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java?rev=1731975&r1=1731974&r2=1731975&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
Tue Feb 23 22:10:20 2016
@@ -44,7 +44,8 @@ import org.apache.poi.xssf.model.StylesT
import org.apache.poi.xssf.model.ThemesTable;
/**
- *
+ * Defines namespaces, content types and normal file names / naming
+ * patterns, for the well-known XSSF format parts.
*/
public final class XSSFRelation extends POIXMLRelation {
@@ -350,6 +351,8 @@ public final class XSSFRelation extends
"/xl/ctrlProps/ctrlProp#.xml",
null
);
+
+ public static final String SPREADSHEETML_NS =
"http://schemas.openxmlformats.org/spreadsheetml/2006/main";;
private XSSFRelation(String type, String rel, String defaultName, Class<?
extends POIXMLDocumentPart> cls) {
super(type, rel, defaultName, cls);
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java?rev=1731975&r1=1731974&r2=1731975&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
Tue Feb 23 22:10:20 2016
@@ -17,6 +17,7 @@
package org.apache.poi.xssf.extractor;
+import static org.apache.poi.xssf.usermodel.XSSFRelation.SPREADSHEETML_NS;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -39,11 +40,6 @@ import org.apache.poi.xssf.usermodel.XSS
import org.junit.Test;
import org.xml.sax.SAXException;
-/**
- *
- * @author Roberto Manicardi
- *
- */
public class TestXSSFImportFromXML {
@Test
@@ -102,7 +98,7 @@ public class TestXSSFImportFromXML {
String cellC8 = "c8";
String cellC9 = "c9";
- String testXML = "<ns1:MapInfo
xmlns:ns1=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\";
SelectionNamespaces=\"\">" +
+ String testXML = "<ns1:MapInfo
xmlns:ns1=\""+SPREADSHEETML_NS+"\" SelectionNamespaces=\"\">" +
"<ns1:Schema ID=\""+cellC6+"\"
SchemaRef=\"a\" />"+
"<ns1:Schema ID=\""+cellC7+"\"
SchemaRef=\"b\" />"+
"<ns1:Schema ID=\""+cellC8+"\"
SchemaRef=\"c\" />"+
@@ -147,7 +143,7 @@ public class TestXSSFImportFromXML {
int count = 21;
String testXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"
standalone=\"yes\" ?>"+
- "<ns1:table
xmlns:ns1=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\";
id=\""+id+"\" displayName=\""+displayName+"\" ref=\""+ref+"\">"+
+ "<ns1:table
xmlns:ns1=\""+SPREADSHEETML_NS+"\" id=\""+id+"\"
displayName=\""+displayName+"\" ref=\""+ref+"\">"+
"<ns1:tableColumns
count=\""+count+"\" />"+
"</ns1:table>\u0000";
XSSFMap map = wb.getMapInfo().getXSSFMapByName("table_mapping");
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java?rev=1731975&r1=1731974&r2=1731975&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java
Tue Feb 23 22:10:20 2016
@@ -17,6 +17,7 @@
package org.apache.poi.xssf.usermodel;
+import static org.apache.poi.xssf.usermodel.XSSFRelation.SPREADSHEETML_NS;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
@@ -146,7 +147,7 @@ public final class TestXSSFComment exten
CTComment ctComment = comment.getCTComment();
XmlObject[] obj = ctComment.selectPath(
- "declare namespace
w='http://schemas.openxmlformats.org/spreadsheetml/2006/main' .//w:text");
+ "declare namespace w='"+SPREADSHEETML_NS+"' .//w:text");
assertEquals(1, obj.length);
assertEquals(TEST_RICHTEXTSTRING, comment.getString().getString());
@@ -164,7 +165,7 @@ public final class TestXSSFComment exten
//check the low-level stuff
comment.setString(richText);
obj = ctComment.selectPath(
- "declare namespace
w='http://schemas.openxmlformats.org/spreadsheetml/2006/main' .//w:text");
+ "declare namespace w='"+SPREADSHEETML_NS+"' .//w:text");
assertEquals(1, obj.length);
assertSame(comment.getString(), richText);
//check that the rich text is set in the comment
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
