converted non-ascii characters to unicode to keep compilers on UTF-8 systems quiet

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@712543 13f79535-47bb-0310-9956-ffa450edef68

src/examples/src/org/apache/poi/hpsf/examples/ModifyDocumentSummaryInformation.java

@@ -173,7 +173,7 @@ public class ModifyDocumentSummaryInformation
         
         /* Insert some custom properties into the container. */
         customProperties.put("Key 1", "Value 1");
-        customProperties.put("Schlüssel 2", "Wert 2");
+        customProperties.put("Schl\u00fcssel 2", "Wert 2");
         customProperties.put("Sample Number", new Integer(12345));
         customProperties.put("Sample Boolean", new Boolean(true));
         customProperties.put("Sample Date", new Date());

src/java/org/apache/poi/hssf/record/CRNCountRecord.java

@@ -19,7 +19,7 @@ package org.apache.poi.hssf.record;
 
 import org.apache.poi.util.LittleEndian;
 /**
- * XCT – CRN Count <P>
+ * XCT - CRN Count <P>
  *
  * REFERENCE:  5.114<P>
  *

src/java/org/apache/poi/hssf/util/RKUtil.java

@@ -22,7 +22,7 @@ package org.apache.poi.hssf.util;
  *
  * @author Andrew C. Oliver (acoliver at apache dot org)
  * @author Glen Stampoultzis (glens at apache.org)
- * @author Rolf-Jürgen Moll
+ * @author Rolf-J\u00f6rgen Moll
  *
  * @see org.apache.poi.hssf.record.MulRKRecord
  * @see org.apache.poi.hssf.record.RKRecord

src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java

@@ -100,7 +100,7 @@ public class ExtractorFactory {
 		if(corePart.getContentType().equals(XSSFRelation.WORKBOOK.getContentType())) {
 			return new XSSFExcelExtractor(pkg);
 		}
-		if(corePart.getContentType().equals(XWPFRelation.MAIN_CONTENT_TYPE)) {
+		if(corePart.getContentType().equals(XWPFRelation.DOCUMENT.getContentType())) {
 			return new XWPFWordExtractor(pkg);
 		}
 		if(corePart.getContentType().equals(XSLFSlideShow.MAIN_CONTENT_TYPE)) {

src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColor.java

@@ -121,23 +121,23 @@ public class XSSFColor {
      * <blockquote>
      * <pre>
      * If (tint &lt; 0)
-     * Lum’ = Lum * (1.0 + tint)
+     * Lum' = Lum * (1.0 + tint)
      *
      * For example: Lum = 200; tint = -0.5; Darken 50%
-     * Lum‘ = 200 * (0.5) =&gt; 100
+     * Lum' = 200 * (0.5) =&gt; 100
      * For example: Lum = 200; tint = -1.0; Darken 100% (make black)
-     * Lum‘ = 200 * (1.0-1.0) =&gt; 0
+     * Lum' = 200 * (1.0-1.0) =&gt; 0
      * If (tint &gt; 0)
-     * Lum‘ = Lum * (1.0-tint) + (HLSMAX – HLSMAX * (1.0-tint))
+     * Lum' = Lum * (1.0-tint) + (HLSMAX - HLSMAX * (1.0-tint))
      * For example: Lum = 100; tint = 0.75; Lighten 75%
      *
-     * Lum‘ = 100 * (1-.75) + (HLSMAX – HLSMAX*(1-.75))
-     * = 100 * .25 + (255 – 255 * .25)
-     * = 25 + (255 – 63) = 25 + 192 = 217
+     * Lum' = 100 * (1-.75) + (HLSMAX - HLSMAX*(1-.75))
+     * = 100 * .25 + (255 - 255 * .25)
+     * = 25 + (255 - 63) = 25 + 192 = 217
      * For example: Lum = 100; tint = 1.0; Lighten 100% (make white)
-     * Lum‘ = 100 * (1-1) + (HLSMAX – HLSMAX*(1-1))
-     * = 100 * 0 + (255 – 255 * 0)
-     * = 0 + (255 – 0) = 255
+     * Lum' = 100 * (1-1) + (HLSMAX - HLSMAX*(1-1))
+     * = 100 * 0 + (255 - 255 * 0)
+     * = 0 + (255 - 0) = 255
      * </pre>
      * </blockquote>
      *
@@ -166,23 +166,23 @@ public class XSSFColor {
      * <blockquote>
      * <pre>
      * If (tint &lt; 0)
-     * Lum’ = Lum * (1.0 + tint)
+     * Lum' = Lum * (1.0 + tint)
      *
      * For example: Lum = 200; tint = -0.5; Darken 50%
-     * Lum‘ = 200 * (0.5) =&gt; 100
+     * Lum' = 200 * (0.5) =&gt; 100
      * For example: Lum = 200; tint = -1.0; Darken 100% (make black)
-     * Lum‘ = 200 * (1.0-1.0) =&gt; 0
+     * Lum' = 200 * (1.0-1.0) =&gt; 0
      * If (tint &gt; 0)
-     * Lum‘ = Lum * (1.0-tint) + (HLSMAX – HLSMAX * (1.0-tint))
+     * Lum' = Lum * (1.0-tint) + (HLSMAX - HLSMAX * (1.0-tint))
      * For example: Lum = 100; tint = 0.75; Lighten 75%
      *
-     * Lum‘ = 100 * (1-.75) + (HLSMAX – HLSMAX*(1-.75))
-     * = 100 * .25 + (255 – 255 * .25)
-     * = 25 + (255 – 63) = 25 + 192 = 217
+     * Lum' = 100 * (1-.75) + (HLSMAX - HLSMAX*(1-.75))
+     * = 100 * .25 + (255 - 255 * .25)
+     * = 25 + (255 - 63) = 25 + 192 = 217
      * For example: Lum = 100; tint = 1.0; Lighten 100% (make white)
-     * Lum‘ = 100 * (1-1) + (HLSMAX – HLSMAX*(1-1))
-     * = 100 * 0 + (255 – 255 * 0)
-     * = 0 + (255 – 0) = 255
+     * Lum' = 100 * (1-1) + (HLSMAX - HLSMAX*(1-1))
+     * = 100 * 0 + (255 - 255 * 0)
+     * = 0 + (255 - 0) = 255
      * </pre>
      * </blockquote>
      *

src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFactory.java

@@ -46,7 +46,7 @@ public class XSSFFactory extends POIXMLFactory  {
     }
 
     public POIXMLDocumentPart createDocumentPart(PackageRelationship rel, PackagePart part){
-        XSSFRelation descriptor = XSSFRelation.getInstance(rel.getRelationshipType());
+        POIXMLRelation descriptor = XSSFRelation.getInstance(rel.getRelationshipType());
         if(descriptor == null || descriptor.getRelationClass() == null){
             logger.log(POILogger.DEBUG, "using default POIXMLDocumentPart for " + rel.getRelationshipType());
             return new POIXMLDocumentPart(part, rel);

src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java

@@ -344,7 +344,7 @@ public class XSSFPrintSetup implements PrintSetup {
     }
 
     /**
-     * Use the printerÕs defaults settings for page setup values and don't use the default values
+     * Use the printer's defaults settings for page setup values and don't use the default values
      * specified in the schema. For example, if dpi is not present or specified in the XML, the
      * application shall not assume 600dpi as specified in the schema as a default and instead
      * shall let the printer specify the default dpi.

src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java

@@ -1360,9 +1360,9 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
      * <pre>
      * 10 - 10%
      * 20 - 20%
-     * …
+     * ...
      * 100 - 100%
-     * …
+     * ...
      * 400 - 400%
      * </pre>
      *

src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java

@@ -110,7 +110,7 @@ public class XWPFDocument extends POIXMLDocument {
 
             for(POIXMLDocumentPart p : getRelations()){
                 String relation = p.getPackageRelationship().getRelationshipType();
-                if(relation.equals(XWPFRelation.COMMENT_RELATION_TYPE)){
+                if(relation.equals(XWPFRelation.COMMENT.getRelation())){
                     CommentsDocument cmntdoc = CommentsDocument.Factory.parse(p.getPackagePart().getInputStream());
                     for(CTComment ctcomment : cmntdoc.getComments().getCommentArray()) {
                         comments.add(new XWPFComment(ctcomment));
@@ -130,7 +130,7 @@ public class XWPFDocument extends POIXMLDocument {
         // TODO: make me optional/separated in private function
         try	{
             Iterator <PackageRelationship> relIter =
-                getPackagePart().getRelationshipsByType(XWPFRelation.HYPERLINK_RELATION_TYPE).iterator();
+                getPackagePart().getRelationshipsByType(XWPFRelation.HYPERLINK.getRelation()).iterator();
             while(relIter.hasNext()) {
                 PackageRelationship rel = relIter.next();
                 hyperlinks.add(new XWPFHyperlink(rel.getId(), rel.getTargetURI().toString()));
@@ -257,7 +257,7 @@ public class XWPFDocument extends POIXMLDocument {
     public CTStyles getStyle() throws XmlException, IOException {
         PackagePart[] parts;
         try {
-            parts = getRelatedByType(XWPFRelation.STYLES_RELATION_TYPE);
+            parts = getRelatedByType(XWPFRelation.STYLES.getRelation());
         } catch(InvalidFormatException e) {
             throw new IllegalStateException(e);
         }

src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java

@@ -26,15 +26,6 @@ import java.util.HashMap;
  * @author Yegor Kozlov
  */
 public class XWPFRelation extends POIXMLRelation {
-    public static final String MAIN_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml";
-    public static final String HEADER_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml";
-    public static final String HEADER_RELATION_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header";
-    public static final String FOOTER_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml";
-    public static final String FOOTER_RELATION_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer";
-    public static final String STYLES_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml";
-    public static final String STYLES_RELATION_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles";
-    public static final String HYPERLINK_RELATION_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
-    public static final String COMMENT_RELATION_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments";
 
     /**
      * A map to lookup POIXMLRelation by its relation type
@@ -72,6 +63,30 @@ public class XWPFRelation extends POIXMLRelation {
             "/word/webSettings.xml",
             null
     );
+    public static final XWPFRelation HEADER = new XWPFRelation(
+            "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml",
+            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header",
+            "/word/header#.xml",
+            null
+    );
+    public static final XWPFRelation FOOTER = new XWPFRelation(
+            "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml",
+            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer",
+            "/word/footer#.xml",
+            null
+    );
+    public static final XWPFRelation HYPERLINK = new XWPFRelation(
+            null,
+            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink",
+            null,
+            null
+    );
+    public static final XWPFRelation COMMENT = new XWPFRelation(
+            null,
+            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments",
+            null,
+            null
+    );
 
 
     private XWPFRelation(String type, String rel, String defaultName, Class<? extends POIXMLDocumentPart> cls) {

src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java

@@ -22,7 +22,7 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.STOnOff;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTText;
 
 /**
- * XWPFRun object  defines a region of text with a common set of properties
+ * XWPFRun object defines a region of text with a common set of properties
  *
  * @author Yegor Kozlov
  */

src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java

@@ -51,7 +51,7 @@ public class TestXWPFDocument extends TestCase {
 		
 		boolean found = false;
 		for(PackagePart part : pack.getParts()) {
-			if(part.getContentType().equals(XWPFRelation.MAIN_CONTENT_TYPE)) {
+			if(part.getContentType().equals(XWPFRelation.DOCUMENT.getContentType())) {
 				found = true;
 			}
 			System.out.println(part);

src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java

@@ -44,7 +44,7 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
  * Basing on: src/examples/src/org/apache/poi/hpsf/examples/ModifyDocumentSummaryInformation.java
  * This class tests reading and writing of meta data. No actual document is created. All information
  * is stored in a virtal document in a ByteArrayOutputStream
- * @author Matthias Günter
+ * @author Matthias G\u00fcnter
  * @since 2006-03-03
  * @version $Id: TestEmptyProperties.java 353563 2004-06-22 16:16:33Z klute $
  */
@@ -286,7 +286,7 @@ public class TestMetaDataIPI extends TestCase{
      
      /* Insert some custom properties into the container. */
      customProperties.put("Key1", "Value1");
-     customProperties.put("Schlüssel2", "Wert2");
+     customProperties.put("Schl�ssel2", "Wert2");
      customProperties.put("Sample Integer", new Integer(12345));
      customProperties.put("Sample Boolean", new Boolean(true));
      Date date=new Date();
@@ -325,8 +325,8 @@ public class TestMetaDataIPI extends TestCase{
      /* Insert some custom properties into the container. */
      String a1=(String) customProperties.get("Key1");
      assertEquals("Key1","Value1",a1);
-     String a2=(String) customProperties.get("Schlüssel2");
-     assertEquals("Schlüssel2","Wert2",a2);
+     String a2=(String) customProperties.get("Schl�ssel2");
+     assertEquals("Schl�ssel2","Wert2",a2);
      Integer a3=(Integer) customProperties.get("Sample Integer");
      assertEquals("Sample Number",new Integer(12345),a3);
      Boolean a4=(Boolean) customProperties.get("Sample Boolean");
@@ -431,7 +431,7 @@ public void testTwo(){
     String a1=(String) customProperties.get(k1);
     assertEquals("Key1",p1,a1);
     String a2=(String) customProperties.get(k2);
-    assertEquals("Schlüssel2",p2,a2);
+    assertEquals("Schl�ssel2",p2,a2);
     Integer a3=(Integer) customProperties.get("Sample Number");
     assertEquals("Sample Number",new Integer(12345),a3);
     Boolean a4=(Boolean) customProperties.get("Sample Boolean");
@@ -450,7 +450,7 @@ public void testTwo(){
  */
 public String strangize(String s){
 	 StringBuffer sb=new StringBuffer();
-	 String[] umlaute= {"ä","ü","ö","Ü","$","Ö","Ü","É","Ö","@","ç","&"};
+	 String[] umlaute= {"�","�","�","�","$","�","�","�","�","@","�","&"};
 	 char j=0;
 	 Random rand=new Random();
 	 for (int i=0;i<5;i++){
@@ -544,7 +544,7 @@ public void testThree(){
    String a1=(String) customProperties.get(k1);
    assertEquals("Key1",p1,a1);
    String a2=(String) customProperties.get(k2);
-   assertEquals("Schlüssel2",p2,a2);
+   assertEquals("Schl�ssel2",p2,a2);
    Integer a3=(Integer) customProperties.get("Sample Number");
    assertEquals("Sample Number",new Integer(12345),a3);
    Boolean a4=(Boolean) customProperties.get("Sample Boolean");
@@ -577,7 +577,7 @@ public void testThree(){
    public String strangizeU(String s){
 	  
    	 StringBuffer sb=new StringBuffer();
-   	 String[] umlaute= {"ä","ü","ö","Ü","$","Ö","Ü","É","Ö","@","ç","&"};
+   	 String[] umlaute= {"�","�","�","�","$","�","�","�","�","@","�","&"};
    	 char j=0;
    	 Random rand=new Random();
    	 for (int i=0;i<5;i++){
@@ -592,7 +592,7 @@ public void testThree(){
    		 sb.append(umlaute[rand.nextInt(umlaute.length)]);
    		 sb.append("<");
    	 }
-   	 sb.append("äöü\uD840\uDC00");
+   	 sb.append("���\uD840\uDC00");
    	 return sb.toString();
    }
    /**
@@ -668,7 +668,7 @@ public void testThree(){
 	   String a1=(String) customProperties.get(k1);
 	   assertEquals("Key1",p1,a1);
 	   String a2=(String) customProperties.get(k2);
-	   assertEquals("Schlüssel2",p2,a2);
+	   assertEquals("Schl�ssel2",p2,a2);
        Integer a3=(Integer) customProperties.get("Sample Number");
 	   assertEquals("Sample Number",new Integer(12345),a3);
 	   Boolean a4=(Boolean) customProperties.get("Sample Boolean");

src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java

@@ -351,10 +351,10 @@ public class TestWriteWellKnown extends TestCase
         CustomProperties customProperties = dsi.getCustomProperties();
         if (customProperties == null)
             customProperties = new CustomProperties();
-        customProperties.put("Schlüssel ä",    "Wert ä");
-        customProperties.put("Schlüssel äö",   "Wert äö");
-        customProperties.put("Schlüssel äöü",  "Wert äöü");
-        customProperties.put("Schlüssel äöüß", "Wert äöüß");
+        customProperties.put("Schl\u00fcssel �",    "Wert �");
+        customProperties.put("Schl\u00fcssel ��",   "Wert ��");
+        customProperties.put("Schl\u00fcssel ���",  "Wert ���");
+        customProperties.put("Schl\u00fcssel ����", "Wert ����");
         customProperties.put("positive_Integer", POSITIVE_INTEGER);
         customProperties.put("positive_Long", POSITIVE_LONG);
         customProperties.put("positive_Double", POSITIVE_DOUBLE);
@@ -440,10 +440,10 @@ public class TestWriteWellKnown extends TestCase
         final CustomProperties cps = dsi.getCustomProperties();
         assertEquals(customProperties, cps);
         assertNull(cps.get("No value available"));
-        assertEquals("Wert ä", cps.get("Schlüssel ä"));
-        assertEquals("Wert äö", cps.get("Schlüssel äö"));
-        assertEquals("Wert äöü", cps.get("Schlüssel äöü"));
-        assertEquals("Wert äöüß", cps.get("Schlüssel äöüß"));
+        assertEquals("Wert �", cps.get("Schl\u00fcssel �"));
+        assertEquals("Wert ��", cps.get("Schl\u00fcssel ��"));
+        assertEquals("Wert ���", cps.get("Schl\u00fcssel ���"));
+        assertEquals("Wert ����", cps.get("Schl\u00fcssel ����"));
         assertEquals(POSITIVE_INTEGER, cps.get("positive_Integer"));
         assertEquals(POSITIVE_LONG, cps.get("positive_Long"));
         assertEquals(POSITIVE_DOUBLE, cps.get("positive_Double"));
@@ -665,7 +665,7 @@ public class TestWriteWellKnown extends TestCase
      */
     public void testCustomerProperties()
     {
-        final String KEY = "Schlüssel ä";
+        final String KEY = "Schl\u00fcssel �";
         final String VALUE_1 = "Wert 1";
         final String VALUE_2 = "Wert 2";
 
@@ -705,7 +705,7 @@ public class TestWriteWellKnown extends TestCase
     {
         final int ID_1 = 2;
         final int ID_2 = 3;
-        final String NAME_1 = "Schlüssel ä";
+        final String NAME_1 = "Schl\u00fcssel �";
         final String VALUE_1 = "Wert 1";
         final Map dictionary = new HashMap();