You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2008/01/08 22:19:51 UTC
svn commit: r610160 - in /poi/trunk/src/scratchpad:
src/org/apache/poi/hslf/model/TextRun.java
testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
Author: nick
Date: Tue Jan 8 13:19:51 2008
New Revision: 610160
URL: http://svn.apache.org/viewvc?rev=610160&view=rev
Log:
Make a start on supporting adding new text to a hslf textrun
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/TextRun.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/TextRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/TextRun.java?rev=610160&r1=610159&r2=610160&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/TextRun.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/TextRun.java Tue Jan 8 13:19:51 2008
@@ -20,6 +20,7 @@
package org.apache.poi.hslf.model;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.Vector;
@@ -252,9 +253,81 @@
// Update methods follow
+
+ /**
+ * Adds the supplied text onto the end of the TextRun,
+ * creating a new RichTextRun (returned) for it to
+ * sit in.
+ */
+ public RichTextRun appendText(String s) {
+ // We will need a StyleTextProp atom
+ ensureStyleAtomPresent();
+
+ // First up, append the text
+ int oldSize = getRawText().length();
+ storeText(
+ getRawText() + s
+ );
+
+ // If either of the previous styles overran
+ // the text by one, we need to shuffle that
+ // extra character onto the new ones
+ Iterator it = _styleAtom.getParagraphStyles().iterator();
+ int pLen = 0;
+ while(it.hasNext()) {
+ TextPropCollection tpc = (TextPropCollection)it.next();
+ pLen += tpc.getCharactersCovered();
+ }
+ it = _styleAtom.getCharacterStyles().iterator();
+ int cLen = 0;
+ while(it.hasNext()) {
+ TextPropCollection tpc = (TextPropCollection)it.next();
+ cLen += tpc.getCharactersCovered();
+ }
+ int pOverRun = pLen - oldSize;
+ int cOverRun = cLen - oldSize;
+
+ if(pOverRun > 0) {
+ TextPropCollection tpc = (TextPropCollection)
+ _styleAtom.getParagraphStyles().getLast();
+ tpc.updateTextSize(
+ tpc.getCharactersCovered() - pOverRun
+ );
+ }
+ if(cOverRun > 0) {
+ TextPropCollection tpc = (TextPropCollection)
+ _styleAtom.getCharacterStyles().getLast();
+ tpc.updateTextSize(
+ tpc.getCharactersCovered() - cOverRun
+ );
+ }
+
+ // Next, add the styles for its
+ // paragraph and characters
+ TextPropCollection newPTP =
+ _styleAtom.addParagraphTextPropCollection(s.length()+pOverRun);
+ TextPropCollection newCTP =
+ _styleAtom.addCharacterTextPropCollection(s.length()+cOverRun);
+
+ // Now, create the new RichTextRun
+ RichTextRun nr = new RichTextRun(
+ this, oldSize, s.length(),
+ newPTP, newCTP, false, false
+ );
+
+ // Add the new RichTextRun onto our list
+ RichTextRun[] newRuns = new RichTextRun[_rtRuns.length+1];
+ System.arraycopy(_rtRuns, 0, newRuns, 0, _rtRuns.length);
+ newRuns[newRuns.length-1] = nr;
+ _rtRuns = newRuns;
+
+ // And return the new run to the caller
+ return nr;
+ }
/**
- * Saves the given string to the records. Doesn't touch the stylings.
+ * Saves the given string to the records. Doesn't
+ * touch the stylings.
*/
private void storeText(String s) {
// Remove a single trailing \n, as there is an implicit one at the
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java?rev=610160&r1=610159&r2=610160&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java Tue Jan 8 13:19:51 2008
@@ -16,16 +16,22 @@
*/
package org.apache.poi.hslf.usermodel;
-import java.io.*;
-import java.awt.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+
+import junit.framework.TestCase;
import org.apache.poi.hslf.HSLFSlideShow;
-import org.apache.poi.hslf.model.*;
+import org.apache.poi.hslf.model.Slide;
+import org.apache.poi.hslf.model.SlideMaster;
+import org.apache.poi.hslf.model.TextBox;
+import org.apache.poi.hslf.model.TextRun;
import org.apache.poi.hslf.record.Record;
import org.apache.poi.hslf.record.SlideListWithText;
-import junit.framework.TestCase;
-
/**
* Test that the friendly getters and setters on RichTextRun
* behave as expected.
@@ -548,5 +554,76 @@
assertEquals(50, rt.getTextOffset());
assertEquals(0, rt.getBulletOffset());
assertEquals('\u263A', rt.getBulletChar());
+ }
+
+ public void testAddText() throws Exception {
+ FileInputStream is = new FileInputStream(new File(System.getProperty("HSLF.testdata.path"), "bullets.ppt"));
+ SlideShow ppt = new SlideShow(is);
+ is.close();
+ assertTrue("No Exceptions while reading file", true);
+
+ RichTextRun rt;
+ TextRun[] txt;
+ Slide[] slides = ppt.getSlides();
+
+ assertEquals(2, slides.length);
+ txt = slides[0].getTextRuns();
+ assertEquals(2, txt.length);
+
+ assertEquals("Title text", txt[0].getRawText());
+ assertEquals(1, txt[0].getRichTextRuns().length);
+ rt = txt[0].getRichTextRuns()[0];
+ assertFalse(rt.isBullet());
+
+ // Add some new text
+ txt[0].appendText("Foo! I'm new!");
+ assertEquals(2, txt[0].getRichTextRuns().length);
+
+ rt = txt[0].getRichTextRuns()[0];
+ assertFalse(rt.isBold());
+ assertEquals("Title text", rt.getText());
+ rt = txt[0].getRichTextRuns()[1];
+ assertFalse(rt.isBold());
+ assertEquals("Foo! I'm new!", rt.getText());
+ rt.setBold(true);
+
+ // And some more
+ txt[0].appendText("Me too!");
+ assertEquals(3, txt[0].getRichTextRuns().length);
+ rt = txt[0].getRichTextRuns()[0];
+ assertFalse(rt.isBold());
+ assertEquals("Title text", rt.getText());
+ rt = txt[0].getRichTextRuns()[1];
+ assertTrue(rt.isBold());
+ assertEquals("Foo! I'm new!", rt.getText());
+ rt = txt[0].getRichTextRuns()[2];
+ assertFalse(rt.isBold());
+ assertEquals("Me too!", rt.getText());
+
+ // Save and re-open
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ ppt.write(out);
+ out.close();
+
+ ppt = new SlideShow(new ByteArrayInputStream(out.toByteArray()));
+ slides = ppt.getSlides();
+
+ assertEquals(2, slides.length);
+
+ txt = slides[0].getTextRuns();
+ assertEquals(2, txt.length);
+ assertEquals(3, txt[0].getRichTextRuns().length);
+ rt = txt[0].getRichTextRuns()[0];
+ assertFalse(rt.isBold());
+ assertEquals("Title text", rt.getText());
+ rt = txt[0].getRichTextRuns()[1];
+ assertTrue(rt.isBold());
+ assertEquals("Foo! I'm new!", rt.getText());
+ rt = txt[0].getRichTextRuns()[2];
+ assertFalse(rt.isBold());
+ assertEquals("Me too!", rt.getText());
+
+// FileOutputStream fout = new FileOutputStream("/tmp/foo.ppt");
+// ppt.write(fout);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org