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 2015/02/05 18:35:09 UTC
svn commit: r1657634 - in /poi/trunk/src:
ooxml/java/org/apache/poi/xwpf/usermodel/
scratchpad/src/org/apache/poi/wp/usermodel/
Author: nick
Date: Thu Feb 5 17:35:09 2015
New Revision: 1657634
URL: http://svn.apache.org/r1657634
Log:
More common HWPF/XWPF interfaces
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunBody.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
poi/trunk/src/scratchpad/src/org/apache/poi/wp/usermodel/CharacterRun.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunBody.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunBody.java?rev=1657634&r1=1657633&r2=1657634&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunBody.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunBody.java Thu Feb 5 17:35:09 2015
@@ -17,10 +17,13 @@
package org.apache.poi.xwpf.usermodel;
import org.apache.poi.POIXMLDocumentPart;
+import org.apache.poi.wp.usermodel.Paragraph;
/**
* Simple interface describing both {@link XWPFParagraph}
* and {@link XWPFSDT}
+ *
+ * TODO Should this be based on / extend {@link Paragraph}?
*/
public interface IRunBody {
public XWPFDocument getDocument();
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java?rev=1657634&r1=1657633&r2=1657634&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java Thu Feb 5 17:35:09 2015
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.util.Internal;
+import org.apache.poi.wp.usermodel.Paragraph;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlObject;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTAbstractNum;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java?rev=1657634&r1=1657633&r2=1657634&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java Thu Feb 5 17:35:09 2015
@@ -965,10 +965,16 @@ public class XWPFRun implements ISDTCont
}
/**
+ * Returns the string version of the text
+ */
+ public String toString() {
+ return text();
+ }
+ /**
* Returns the string version of the text, with tabs and
* carriage returns in place of their xml equivalents.
*/
- public String toString() {
+ public String text() {
StringBuffer text = new StringBuffer();
// Grab the text and tabs of the text run
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/wp/usermodel/CharacterRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/wp/usermodel/CharacterRun.java?rev=1657634&r1=1657633&r2=1657634&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/wp/usermodel/CharacterRun.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/wp/usermodel/CharacterRun.java Thu Feb 5 17:35:09 2015
@@ -20,7 +20,7 @@ package org.apache.poi.wp.usermodel;
/**
* This class represents a run of text that share common properties.
*/
-public interface CharacterRun {// extends Range {
+public interface CharacterRun {
public boolean isBold();
public void setBold(boolean bold);
@@ -33,23 +33,6 @@ public interface CharacterRun {// extend
public boolean isCapitalized();
public void setCapitalized(boolean caps);
-/*
- public boolean isFldVanished();
- public void setFldVanish(boolean fldVanish);
-
- public boolean isOutlined();
- public void setOutline(boolean outlined);
-
- public boolean isVanished();
- public void setVanished(boolean vanish);
-
- public boolean isMarkedDeleted();
- public void markDeleted(boolean mark);
-
- public boolean isMarkedInserted();
- public void markInserted(boolean mark);
-*/
-
public boolean isStrikeThrough();
public void setStrikeThrough(boolean strike);
public boolean isDoubleStrikeThrough();
@@ -70,6 +53,16 @@ public interface CharacterRun {// extend
public int getCharacterSpacing();
public void setCharacterSpacing(int twips);
+ public int getKerning();
+ public void setKerning(int kern);
+
+ public String getFontName();
+
+ /**
+ * @return The text of the run, including any tabs/spaces/etc
+ */
+ public String text();
+
// HWPF uses indexes, XWPF special
// public int getUnderlineCode();
// public void setUnderlineCode(int kul);
@@ -86,8 +79,21 @@ public interface CharacterRun {// extend
// public int getColor();
// public void setColor(int color);
- public int getKerning();
- public void setKerning(int kern);
+ // TODO Review these, and add to XWPFRun if possible
+/*
+ public boolean isFldVanished();
+ public void setFldVanish(boolean fldVanish);
+
+ public boolean isOutlined();
+ public void setOutline(boolean outlined);
+
+ public boolean isVanished();
+ public void setVanished(boolean vanish);
- public String getFontName();
+ public boolean isMarkedDeleted();
+ public void markDeleted(boolean mark);
+
+ public boolean isMarkedInserted();
+ public void markInserted(boolean mark);
+*/
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org