poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kiwiwi...@apache.org
Subject svn commit: r1689777 [6/6] - in /poi/branches/common_sl: ./ src/examples/src/org/apache/poi/xslf/usermodel/ src/examples/src/org/apache/poi/xslf/usermodel/tutorial/ src/java/org/apache/poi/ddf/ src/java/org/apache/poi/util/ src/ooxml/java/org/apache/po...
Date Wed, 08 Jul 2015 00:09:35 GMT
Added: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/AutoNumberingScheme.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/AutoNumberingScheme.java?rev=1689777&view=auto
==============================================================================
--- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/AutoNumberingScheme.java
(added)
+++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/AutoNumberingScheme.java
Wed Jul  8 00:09:34 2015
@@ -0,0 +1,287 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  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.
+==================================================================== */
+
+package org.apache.poi.sl.usermodel;
+
+public enum AutoNumberingScheme {
+    /** Lowercase alphabetic character enclosed in parentheses. Example: (a), (b), (c), ...
*/
+    alphaLcParenBoth(0x0008, 1),
+    /** Uppercase alphabetic character enclosed in parentheses. Example: (A), (B), (C), ...
*/
+    alphaUcParenBoth(0x000A, 2),
+    /** Lowercase alphabetic character followed by a closing parenthesis. Example: a), b),
c), ... */
+    alphaLcParenRight(0x0009, 3),
+    /** Uppercase alphabetic character followed by a closing parenthesis. Example: A), B),
C), ... */
+    alphaUcParenRight(0x000B, 4),
+    /** Lowercase Latin character followed by a period. Example: a., b., c., ... */
+    alphaLcPeriod(0x0000, 5),
+    /** Uppercase Latin character followed by a period. Example: A., B., C., ... */
+    alphaUcPeriod(0x0001, 6),
+    /** Arabic numeral enclosed in parentheses. Example: (1), (2), (3), ... */
+    arabicParenBoth(0x000C, 7),
+    /** Arabic numeral followed by a closing parenthesis. Example: 1), 2), 3), ... */
+    arabicParenRight(0x0002, 8),
+    /** Arabic numeral followed by a period. Example: 1., 2., 3., ... */
+    arabicPeriod(0x0003, 9),
+    /** Arabic numeral. Example: 1, 2, 3, ... */
+    arabicPlain(0x000D, 10),
+    /** Lowercase Roman numeral enclosed in parentheses. Example: (i), (ii), (iii), ... */
+    romanLcParenBoth(0x0004, 11),
+    /** Uppercase Roman numeral enclosed in parentheses. Example: (I), (II), (III), ... */
+    romanUcParenBoth(0x000E, 12),
+    /** Lowercase Roman numeral followed by a closing parenthesis. Example: i), ii), iii),
... */
+    romanLcParenRight(0x0005, 13),
+    /** Uppercase Roman numeral followed by a closing parenthesis. Example: I), II), III),
.... */
+    romanUcParenRight(0x000F, 14),
+    /** Lowercase Roman numeral followed by a period. Example: i., ii., iii., ... */
+    romanLcPeriod(0x0006, 15),
+    /** Uppercase Roman numeral followed by a period. Example: I., II., III., ... */
+    romanUcPeriod(0x0007, 16),
+    /** Double byte circle numbers. */
+    circleNumDbPlain(0x0012, 17),
+    /** Wingdings black circle numbers. */
+    circleNumWdBlackPlain(0x0014, 18),
+    /** Wingdings white circle numbers. */
+    circleNumWdWhitePlain(0x0013, 19),
+    /** Double-byte Arabic numbers with double-byte period. */
+    arabicDbPeriod(0x001D, 20),
+    /** Double-byte Arabic numbers. */
+    arabicDbPlain(0x001C, 21),
+    /** Simplified Chinese with single-byte period. */
+    ea1ChsPeriod(0x0011, 22),
+    /** Simplified Chinese. */
+    ea1ChsPlain(0x0010, 23),
+    /** Traditional Chinese with single-byte period. */
+    ea1ChtPeriod(0x0015, 24),
+    /** Traditional Chinese. */
+    ea1ChtPlain(0x0014, 25),
+    /** Japanese with double-byte period. */
+    ea1JpnChsDbPeriod(0x0026, 26),
+    /** Japanese/Korean. */
+    ea1JpnKorPlain(0x001A, 27),
+    /** Japanese/Korean with single-byte period. */
+    ea1JpnKorPeriod(0x001B, 28),
+    /** Bidi Arabic 1 (AraAlpha) with ANSI minus symbol. */
+    arabic1Minus(0x0017, 29),
+    /** Bidi Arabic 2 (AraAbjad) with ANSI minus symbol. */
+    arabic2Minus(0x0018, 30),
+    /** Bidi Hebrew 2 with ANSI minus symbol. */
+    hebrew2Minus(0x0019, 31),
+    /** Thai alphabetic character followed by a period. */
+    thaiAlphaPeriod(0x001E, 32),
+    /** Thai alphabetic character followed by a closing parenthesis. */
+    thaiAlphaParenRight(0x001F, 33),
+    /** Thai alphabetic character enclosed by parentheses. */
+    thaiAlphaParenBoth(0x0020, 34),
+    /** Thai numeral followed by a period. */
+    thaiNumPeriod(0x0021, 35),
+    /** Thai numeral followed by a closing parenthesis. */
+    thaiNumParenRight(0x0022, 36),
+    /** Thai numeral enclosed in parentheses. */
+    thaiNumParenBoth(0x0023, 37),
+    /** Hindi alphabetic character followed by a period. */
+    hindiAlphaPeriod(0x0024, 38),
+    /** Hindi numeric character followed by a period. */
+    hindiNumPeriod(0x0025, 39),
+    /** Hindi numeric character followed by a closing parenthesis. */
+    hindiNumParenRight(0x0027, 40),
+    /** Hindi alphabetic character followed by a period. */
+    hindiAlpha1Period(0x0027, 41);
+
+    public final int nativeId, ooxmlId;
+
+    AutoNumberingScheme(int nativeId, int ooxmlId) {
+        this.nativeId = nativeId;
+        this.ooxmlId = ooxmlId;
+    }
+
+    public static AutoNumberingScheme forNativeID(int nativeId) {
+        for (AutoNumberingScheme ans : values()) {
+            if (ans.nativeId == nativeId) return ans;
+        }
+        return null;
+    }
+
+    public static AutoNumberingScheme forOoxmlID(int ooxmlId) {
+        for (AutoNumberingScheme ans : values()) {
+            if (ans.ooxmlId == ooxmlId) return ans;
+        }
+        return null;
+    }
+
+    public String getDescription() {
+        switch (this) {
+        case alphaLcPeriod          : return "Lowercase Latin character followed by a period.
Example: a., b., c., ...";
+        case alphaUcPeriod          : return "Uppercase Latin character followed by a period.
Example: A., B., C., ...";
+        case arabicParenRight       : return "Arabic numeral followed by a closing parenthesis.
Example: 1), 2), 3), ...";
+        case arabicPeriod           : return "Arabic numeral followed by a period. Example:
1., 2., 3., ...";
+        case romanLcParenBoth       : return "Lowercase Roman numeral enclosed in parentheses.
Example: (i), (ii), (iii), ...";
+        case romanLcParenRight      : return "Lowercase Roman numeral followed by a closing
parenthesis. Example: i), ii), iii), ...";
+        case romanLcPeriod          : return "Lowercase Roman numeral followed by a period.
Example: i., ii., iii., ...";
+        case romanUcPeriod          : return "Uppercase Roman numeral followed by a period.
Example: I., II., III., ...";
+        case alphaLcParenBoth       : return "Lowercase alphabetic character enclosed in
parentheses. Example: (a), (b), (c), ...";
+        case alphaLcParenRight      : return "Lowercase alphabetic character followed by
a closing parenthesis. Example: a), b), c), ...";
+        case alphaUcParenBoth       : return "Uppercase alphabetic character enclosed in
parentheses. Example: (A), (B), (C), ...";
+        case alphaUcParenRight      : return "Uppercase alphabetic character followed by
a closing parenthesis. Example: A), B), C), ...";
+        case arabicParenBoth        : return "Arabic numeral enclosed in parentheses. Example:
(1), (2), (3), ...";
+        case arabicPlain            : return "Arabic numeral. Example: 1, 2, 3, ...";
+        case romanUcParenBoth       : return "Uppercase Roman numeral enclosed in parentheses.
Example: (I), (II), (III), ...";
+        case romanUcParenRight      : return "Uppercase Roman numeral followed by a closing
parenthesis. Example: I), II), III), ...";
+        case ea1ChsPlain            : return "Simplified Chinese.";
+        case ea1ChsPeriod           : return "Simplified Chinese with single-byte period.";
+        case circleNumDbPlain       : return "Double byte circle numbers.";
+        case circleNumWdWhitePlain  : return "Wingdings white circle numbers.";
+        case circleNumWdBlackPlain  : return "Wingdings black circle numbers.";
+        case ea1ChtPlain            : return "Traditional Chinese.";
+        case ea1ChtPeriod           : return "Traditional Chinese with single-byte period.";
+        case arabic1Minus           : return "Bidi Arabic 1 (AraAlpha) with ANSI minus symbol.";
+        case arabic2Minus           : return "Bidi Arabic 2 (AraAbjad) with ANSI minus symbol.";
+        case hebrew2Minus           : return "Bidi Hebrew 2 with ANSI minus symbol.";
+        case ea1JpnKorPlain         : return "Japanese/Korean.";
+        case ea1JpnKorPeriod        : return "Japanese/Korean with single-byte period.";
+        case arabicDbPlain          : return "Double-byte Arabic numbers.";
+        case arabicDbPeriod         : return "Double-byte Arabic numbers with double-byte
period.";
+        case thaiAlphaPeriod        : return "Thai alphabetic character followed by a period.";
+        case thaiAlphaParenRight    : return "Thai alphabetic character followed by a closing
parenthesis.";
+        case thaiAlphaParenBoth     : return "Thai alphabetic character enclosed by parentheses.";
+        case thaiNumPeriod          : return "Thai numeral followed by a period.";
+        case thaiNumParenRight      : return "Thai numeral followed by a closing parenthesis.";
+        case thaiNumParenBoth       : return "Thai numeral enclosed in parentheses.";
+        case hindiAlphaPeriod       : return "Hindi alphabetic character followed by a period.";
+        case hindiNumPeriod         : return "Hindi numeric character followed by a period.";
+        case ea1JpnChsDbPeriod      : return "Japanese with double-byte period.";
+        case hindiNumParenRight     : return "Hindi numeric character followed by a closing
parenthesis.";
+        case hindiAlpha1Period      : return "Hindi alphabetic character followed by a period.";
+        default                     : return "Unknown Numbered Scheme";
+        }
+    }
+
+    public String format(int value) {
+        String index = formatIndex(value);
+        String cased = formatCase(index);
+        String seperated = formatSeperator(cased);
+        return seperated;
+    }
+
+    private String formatSeperator(String cased) {
+        String name = name().toLowerCase();
+        if (name.contains("plain")) return cased;
+        if (name.contains("parenright")) return cased+")";
+        if (name.contains("parenboth")) return "("+cased+")";
+        if (name.contains("period")) return cased+".";
+        if (name.contains("minus")) return cased+"-"; // ???
+        return cased;
+    }
+
+    private String formatCase(String index) {
+        String name = name().toLowerCase();
+        if (name.contains("lc")) return index.toLowerCase();
+        if (name.contains("uc")) return index.toUpperCase();
+        return index;
+    }
+
+    private static final String ARABIC_LIST = "0123456789";
+    private static final String ALPHA_LIST = "abcdefghijklmnopqrstuvwxyz";
+    private static final String WINGDINGS_WHITE_LIST =
+            "\u0080\u0081\u0082\u0083\u0084\u0085\u0086\u0087\u0088\u0089";
+    private static final String WINGDINGS_BLACK_LIST =
+            "\u008B\u008C\u008D\u008E\u008F\u0090\u0091\u0092\u0093\u0094";
+    private static final String CIRCLE_DB_LIST =
+            "\u2776\u2777\u2778\u2779\u277A\u277B\u277C\u277D\u277E";
+
+    private String formatIndex(int value) {
+        String name = name().toLowerCase();
+        if (name.startsWith("roman")) {
+            return formatRomanIndex(value);
+        } else if (name.startsWith("arabic") && !name.contains("db")) {
+            return getIndexedList(value, ARABIC_LIST, false);
+        } else if (name.startsWith("alpha")) {
+            return getIndexedList(value, ALPHA_LIST, true);
+        } else if (name.contains("WdWhite")) {
+            return (value == 10) ? "\u008A"
+                : getIndexedList(value, WINGDINGS_WHITE_LIST, false);
+        } else if (name.contains("WdBlack")) {
+            return (value == 10) ? "\u0095"
+                : getIndexedList(value, WINGDINGS_BLACK_LIST, false);
+        } else if (name.contains("NumDb")) {
+            return (value == 10) ? "\u277F"
+                : getIndexedList(value, CIRCLE_DB_LIST, true);
+        } else {
+            return "?";
+        }
+    }
+
+    private static String getIndexedList(int val, String list, boolean oneBased) {
+        StringBuilder sb = new StringBuilder();
+        addIndexedChar(val, list, oneBased, sb);
+        return sb.toString();
+    }
+
+    private static void addIndexedChar(int val, String list, boolean oneBased, StringBuilder
sb) {
+        if (oneBased) val -= 1;
+        final int len = list.length();
+        if (val >= len) {
+            addIndexedChar(val/len, list, oneBased, sb);
+        }
+        sb.append(list.charAt(val%len));
+    }
+
+
+    private String formatRomanIndex(int value) {
+        //M (1000), CM (900), D (500), CD (400), C (100), XC (90), L (50), XL (40), X (10),
IX (9), V (5), IV (4) and I (1).
+        final int[] VALUES = new int[]{1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4,
1};
+        final String[] ROMAN = new String[]{"M", "CM", "D", "CD", "C", "XC", "L", "XL", "X",
"IX", "V", "IV", "I"};
+        final String conciseList[][] = {
+            {"XLV", "VL"}, //45
+            {"XCV", "VC"}, //95
+            {"CDL", "LD"}, //450
+            {"CML", "LM"}, //950
+            {"CMVC", "LMVL"}, //995
+            {"CDXC", "LDXL"}, //490
+            {"CDVC", "LDVL"}, //495
+            {"CMXC", "LMXL"}, //990
+            {"XCIX", "VCIV"}, //99
+            {"XLIX", "VLIV"}, //49
+            {"XLIX", "IL"}, //49
+            {"XCIX", "IC"}, //99
+            {"CDXC", "XD"}, //490
+            {"CDVC", "XDV"}, //495
+            {"CDIC", "XDIX"}, //499
+            {"LMVL", "XMV"}, //995
+            {"CMIC", "XMIX"}, //999
+            {"CMXC", "XM"}, // 990
+            {"XDV", "VD"},  //495
+            {"XDIX", "VDIV"}, //499
+            {"XMV", "VM"}, // 995
+            {"XMIX", "VMIV"}, //999
+            {"VDIV", "ID"}, //499
+            {"VMIV", "IM"} //999
+        };
+
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 13; i++) {
+            while (value >= VALUES[i]) {
+                value -= VALUES[i];
+                sb.append(ROMAN[i]);
+            }
+        }
+        String result = sb.toString();
+        for (String cc[] : conciseList) {
+            result = result.replace(cc[0], cc[1]);
+        }
+        return result;
+    }
+}
\ No newline at end of file

Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/TextParagraph.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/TextParagraph.java?rev=1689777&r1=1689776&r2=1689777&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/TextParagraph.java
(original)
+++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/TextParagraph.java
Wed Jul  8 00:09:34 2015
@@ -114,6 +114,13 @@ public interface TextParagraph<T extends
          */
         Double getBulletFontSize();
         Color getBulletFontColor();
+        
+        AutoNumberingScheme getAutoNumberingScheme();
+        /**
+         * Index (1-based) of the first auto number value, or null if auto numbering scheme
+         * wasn't assigned.
+         */
+        Integer getAutoNumberingStartAt();
     }
 
     /**
@@ -218,13 +225,28 @@ public interface TextParagraph<T extends
      *  or null, if unset
      */
     Double getIndent();
-
+    
     /**
      * Specifies the indent size that will be applied to the first line of text in the paragraph.
  
      * 
      * @param indent the indent (in points) applied to the first line of text in the paragraph
      */
     void setIndent(Double indent);
+
+
+    /**
+     * @return the text level of this paragraph (0-based). Default is 0.
+     */    
+    int getIndentLevel();
+
+    /**
+     * Specifies the particular level text properties that this paragraph will follow.
+     * The value for this attribute formats the text according to the corresponding level
+     * paragraph properties defined in the SlideMaster.
+     *
+     * @param level the level (0 ... 4)
+     */
+    void setIndentLevel(int level);
     
     /**
      * Returns the vertical line spacing that is to be used within a paragraph.

Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java?rev=1689777&r1=1689776&r2=1689777&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
(original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
Wed Jul  8 00:09:34 2015
@@ -369,20 +369,20 @@ public final class TestExtractor extends
     }
 
     public void testTable() throws Exception{
-        ppe = new PowerPointExtractor(slTests.openResourceAsStream("54111.ppt"));
-        String text = ppe.getText();
-        String target = "TH Cell 1\tTH Cell 2\tTH Cell 3\tTH Cell 4\n"+
-                         "Row 1, Cell 1\tRow 1, Cell 2\tRow 1, Cell 3\tRow 1, Cell 4\n"+
  
-                         "Row 2, Cell 1\tRow 2, Cell 2\tRow 2, Cell 3\tRow 2, Cell 4\n"+
-                         "Row 3, Cell 1\tRow 3, Cell 2\tRow 3, Cell 3\tRow 3, Cell 4\n"+
-                         "Row 4, Cell 1\tRow 4, Cell 2\tRow 4, Cell 3\tRow 4, Cell 4\n"+

-                         "Row 5, Cell 1\tRow 5, Cell 2\tRow 5, Cell 3\tRow 5, Cell 4\n";
-        assertTrue(text.contains(target));
+//        ppe = new PowerPointExtractor(slTests.openResourceAsStream("54111.ppt"));
+//        String text = ppe.getText();
+//        String target = "TH Cell 1\tTH Cell 2\tTH Cell 3\tTH Cell 4\n"+
+//                         "Row 1, Cell 1\tRow 1, Cell 2\tRow 1, Cell 3\tRow 1, Cell 4\n"+
  
+//                         "Row 2, Cell 1\tRow 2, Cell 2\tRow 2, Cell 3\tRow 2, Cell 4\n"+
+//                         "Row 3, Cell 1\tRow 3, Cell 2\tRow 3, Cell 3\tRow 3, Cell 4\n"+
+//                         "Row 4, Cell 1\tRow 4, Cell 2\tRow 4, Cell 3\tRow 4, Cell 4\n"+

+//                         "Row 5, Cell 1\tRow 5, Cell 2\tRow 5, Cell 3\tRow 5, Cell 4\n";
+//        assertTrue(text.contains(target));
 
         ppe = new PowerPointExtractor(slTests.openResourceAsStream("54722.ppt"));
-        text = ppe.getText();
+        String text = ppe.getText();
 
-        target = "this\tText\tis\twithin\ta\n"+
+        String target = "this\tText\tis\twithin\ta\n"+
                 "table\t1\t2\t3\t4";
         assertTrue(text.contains(target));
     }    

Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java?rev=1689777&r1=1689776&r2=1689777&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java
(original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java
Wed Jul  8 00:09:34 2015
@@ -27,6 +27,7 @@ import org.apache.poi.POIDataSamples;
 import org.apache.poi.hslf.model.textproperties.TextPFException9;
 import org.apache.poi.hslf.model.textproperties.TextPropCollection;
 import org.apache.poi.hslf.record.*;
+import org.apache.poi.sl.usermodel.AutoNumberingScheme;
 import org.junit.Test;
 
 
@@ -61,9 +62,9 @@ public final class TestNumberedList {
 		assertTrue(4 == autoNumbers[0].getAutoNumberStartNumber());
 		assertNull(autoNumbers[1].getAutoNumberStartNumber());
 		assertTrue(3 == autoNumbers[2].getAutoNumberStartNumber());
-		assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicPeriod == autoNumbers[0].getAutoNumberScheme());
+		assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbers[0].getAutoNumberScheme());
 		assertNull(autoNumbers[1].getAutoNumberScheme());
-		assertTrue(TextAutoNumberSchemeEnum.ANM_AlphaLcParenRight == autoNumbers[2].getAutoNumberScheme());
+		assertTrue(AutoNumberingScheme.alphaLcParenRight == autoNumbers[2].getAutoNumberScheme());
 			
 		List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
 		assertEquals(2, textParass.size());
@@ -103,9 +104,9 @@ public final class TestNumberedList {
 		assertTrue(9 == autoNumbers[0].getAutoNumberStartNumber());
 		assertNull(autoNumbers[1].getAutoNumberStartNumber());
 		assertTrue(3 == autoNumbers[2].getAutoNumberStartNumber());
-		assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicParenRight == autoNumbers[0].getAutoNumberScheme());
+		assertTrue(AutoNumberingScheme.arabicParenRight == autoNumbers[0].getAutoNumberScheme());
 		assertNull(autoNumbers[1].getAutoNumberScheme());
-		assertTrue(TextAutoNumberSchemeEnum.ANM_AlphaUcPeriod == autoNumbers[2].getAutoNumberScheme());
+		assertTrue(AutoNumberingScheme.alphaUcPeriod == autoNumbers[2].getAutoNumberScheme());
 
 		final List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
 		assertEquals(2, textParass.size());

Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java?rev=1689777&r1=1689776&r2=1689777&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java
(original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java
Wed Jul  8 00:09:34 2015
@@ -27,6 +27,7 @@ import org.apache.poi.POIDataSamples;
 import org.apache.poi.hslf.model.textproperties.TextPFException9;
 import org.apache.poi.hslf.model.textproperties.TextPropCollection;
 import org.apache.poi.hslf.record.*;
+import org.apache.poi.sl.usermodel.AutoNumberingScheme;
 import org.junit.Test;
 
 
@@ -62,11 +63,11 @@ public final class TestNumberedList2 {
 		final TextPFException9[] autoNumbersOfTextBox0 = numberedListInfoForTextBox0.getAutoNumberTypes();
 		assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getfBulletHasAutoNumber());
 		assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getAutoNumberStartNumber());//Default
value = 1 will be used 
-		assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
+		assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
 		final TextPFException9[] autoNumbersOfTextBox1 = numberedListInfoForTextBox1.getAutoNumberTypes();
 		assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox1[0].getfBulletHasAutoNumber());
 		assertEquals(Short.valueOf((short)6), autoNumbersOfTextBox1[0].getAutoNumberStartNumber());//Default
value = 1 will be used 
-		assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicPeriod == autoNumbersOfTextBox1[0].getAutoNumberScheme());
+		assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox1[0].getAutoNumberScheme());
 
 		
 		List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
@@ -97,7 +98,7 @@ public final class TestNumberedList2 {
 		final TextPFException9[] autoNumbersOfTextBox = numberedListInfoForTextBox.getAutoNumberTypes();
 		assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox[0].getfBulletHasAutoNumber());
 		assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox[0].getAutoNumberStartNumber());//Default
value = 1 will be used 
-		assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicPeriod == autoNumbersOfTextBox[0].getAutoNumberScheme());
+		assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox[0].getAutoNumberScheme());
 			
 		List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
 		assertEquals(3, textParass.size());

Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java?rev=1689777&r1=1689776&r2=1689777&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java
(original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java
Wed Jul  8 00:09:34 2015
@@ -27,6 +27,7 @@ import org.apache.poi.POIDataSamples;
 import org.apache.poi.hslf.model.textproperties.TextPFException9;
 import org.apache.poi.hslf.model.textproperties.TextPropCollection;
 import org.apache.poi.hslf.record.*;
+import org.apache.poi.sl.usermodel.AutoNumberingScheme;
 import org.junit.Test;
 
 
@@ -60,7 +61,7 @@ public final class TestNumberedList3 {
 		final TextPFException9[] autoNumbersOfTextBox0 = numberedListInfoForTextBox.getAutoNumberTypes();
 		assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getfBulletHasAutoNumber());
 		assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getAutoNumberStartNumber());//Default
value = 1 will be used 
-		assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
+		assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
 		
 		final List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
 		assertEquals(3, textParass.size());
@@ -77,7 +78,7 @@ public final class TestNumberedList3 {
 		assertEquals(1, autoNumbers.length);
 		assertEquals(Short.valueOf((short)1), autoNumbers[0].getfBulletHasAutoNumber());
 		assertEquals(Short.valueOf((short)1), autoNumbers[0].getAutoNumberStartNumber());//Default
value = 1 will be used 
-		assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
+		assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
 		
 		int chCovered = 0;
 		for (HSLFTextParagraph htp : textParass.get(1)) {

Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java?rev=1689777&r1=1689776&r2=1689777&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java
(original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java
Wed Jul  8 00:09:34 2015
@@ -22,6 +22,7 @@ import static org.junit.Assert.*;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.*;
+import java.lang.reflect.Constructor;
 import java.util.*;
 
 import javax.imageio.ImageIO;
@@ -33,7 +34,6 @@ import org.apache.poi.sl.draw.Drawable;
 import org.apache.poi.sl.usermodel.Slide;
 import org.apache.poi.sl.usermodel.SlideShow;
 import org.apache.poi.util.JvmBugs;
-import org.apache.poi.xslf.usermodel.XMLSlideShow;
 import org.junit.Test;
 
 /**
@@ -145,8 +145,8 @@ public final class TestPicture {
 //            "54542_cropped_bitmap.pptx",
 //            "54541_cropped_bitmap.ppt",
 //            "54541_cropped_bitmap2.ppt",
-//            "alterman_security.ppt",
-            "alterman_security2.pptx",
+            "alterman_security.ppt",
+//            "alterman_security3.pptx",
         };
         
         BitSet pages = new BitSet();
@@ -154,7 +154,14 @@ public final class TestPicture {
         
         for (String file : files) {
             InputStream is = _slTests.openResourceAsStream(file);
-            SlideShow ss = file.endsWith("pptx") ? new XMLSlideShow(is) : new HSLFSlideShow(is);
+            SlideShow ss;
+            if (file.endsWith("pptx")) {
+                Class<?> cls = Class.forName("org.apache.poi.xslf.usermodel.XMLSlideShow");
+                Constructor<?> ct = cls.getDeclaredConstructor(InputStream.class);
+                ss = (SlideShow)ct.newInstance(is);
+            } else {
+                ss = new HSLFSlideShow(is);
+            }
             is.close();
             
             boolean debugOut = false;



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message