From 2089c7351dbe66e1bdb1071efdb81d9e3f6b349e Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sun, 3 Jan 2016 11:10:45 +0000
Subject: Rename document elements to drop Element suffix

---
 src/main/java/org/zwobble/mammoth/Mammoth.java     |  6 ++---
 .../mammoth/documents/DocumentElementVisitor.java  |  6 ++---
 .../org/zwobble/mammoth/documents/Paragraph.java   | 27 ++++++++++++++++++++++
 .../mammoth/documents/ParagraphElement.java        | 27 ----------------------
 .../java/org/zwobble/mammoth/documents/Run.java    | 20 ++++++++++++++++
 .../org/zwobble/mammoth/documents/RunElement.java  | 20 ----------------
 .../java/org/zwobble/mammoth/documents/Text.java   | 18 +++++++++++++++
 .../org/zwobble/mammoth/documents/TextElement.java | 18 ---------------
 .../org/zwobble/mammoth/docx/BodyXmlReader.java    |  8 +++----
 9 files changed, 75 insertions(+), 75 deletions(-)
 create mode 100644 src/main/java/org/zwobble/mammoth/documents/Paragraph.java
 delete mode 100644 src/main/java/org/zwobble/mammoth/documents/ParagraphElement.java
 create mode 100644 src/main/java/org/zwobble/mammoth/documents/Run.java
 delete mode 100644 src/main/java/org/zwobble/mammoth/documents/RunElement.java
 create mode 100644 src/main/java/org/zwobble/mammoth/documents/Text.java
 delete mode 100644 src/main/java/org/zwobble/mammoth/documents/TextElement.java

(limited to 'src/main/java/org')

diff --git a/src/main/java/org/zwobble/mammoth/Mammoth.java b/src/main/java/org/zwobble/mammoth/Mammoth.java
index c639634..de0c45e 100644
--- a/src/main/java/org/zwobble/mammoth/Mammoth.java
+++ b/src/main/java/org/zwobble/mammoth/Mammoth.java
@@ -58,7 +58,7 @@ public class Mammoth {
     private static String convertToHtml(DocumentElement element) {
         return element.accept(new DocumentElementVisitor<String>() {
             @Override
-            public String visit(ParagraphElement paragraph) {
+            public String visit(Paragraph paragraph) {
                 String content = convertChildrenToHtml(paragraph);
                 if (content.isEmpty()) {
                     return "";
@@ -68,12 +68,12 @@ public class Mammoth {
             }
 
             @Override
-            public String visit(RunElement run) {
+            public String visit(Run run) {
                 return convertChildrenToHtml(run);
             }
 
             @Override
-            public String visit(TextElement text) {
+            public String visit(Text text) {
                 return text.getValue();
             }
         });
diff --git a/src/main/java/org/zwobble/mammoth/documents/DocumentElementVisitor.java b/src/main/java/org/zwobble/mammoth/documents/DocumentElementVisitor.java
index bb41ff2..5554f65 100644
--- a/src/main/java/org/zwobble/mammoth/documents/DocumentElementVisitor.java
+++ b/src/main/java/org/zwobble/mammoth/documents/DocumentElementVisitor.java
@@ -1,7 +1,7 @@
 package org.zwobble.mammoth.documents;
 
 public interface DocumentElementVisitor<T> {
-    T visit(ParagraphElement paragraph);
-    T visit(RunElement run);
-    T visit(TextElement text);
+    T visit(Paragraph paragraph);
+    T visit(Run run);
+    T visit(Text text);
 }
diff --git a/src/main/java/org/zwobble/mammoth/documents/Paragraph.java b/src/main/java/org/zwobble/mammoth/documents/Paragraph.java
new file mode 100644
index 0000000..901eb81
--- /dev/null
+++ b/src/main/java/org/zwobble/mammoth/documents/Paragraph.java
@@ -0,0 +1,27 @@
+package org.zwobble.mammoth.documents;
+
+import java.util.List;
+import java.util.Optional;
+
+public class Paragraph implements DocumentElement, HasChildren {
+    private final Optional<Style> style;
+    private final List<DocumentElement> children;
+
+    public Paragraph(Optional<Style> style, List<DocumentElement> children) {
+        this.style = style;
+        this.children = children;
+    }
+
+    public Optional<Style> getStyle() {
+        return style;
+    }
+
+    public List<DocumentElement> getChildren() {
+        return children;
+    }
+
+    @Override
+    public <T> T accept(DocumentElementVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/src/main/java/org/zwobble/mammoth/documents/ParagraphElement.java b/src/main/java/org/zwobble/mammoth/documents/ParagraphElement.java
deleted file mode 100644
index 15c2b85..0000000
--- a/src/main/java/org/zwobble/mammoth/documents/ParagraphElement.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.zwobble.mammoth.documents;
-
-import java.util.List;
-import java.util.Optional;
-
-public class ParagraphElement implements DocumentElement, HasChildren {
-    private final Optional<Style> style;
-    private final List<DocumentElement> children;
-
-    public ParagraphElement(Optional<Style> style, List<DocumentElement> children) {
-        this.style = style;
-        this.children = children;
-    }
-
-    public Optional<Style> getStyle() {
-        return style;
-    }
-
-    public List<DocumentElement> getChildren() {
-        return children;
-    }
-
-    @Override
-    public <T> T accept(DocumentElementVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
diff --git a/src/main/java/org/zwobble/mammoth/documents/Run.java b/src/main/java/org/zwobble/mammoth/documents/Run.java
new file mode 100644
index 0000000..9a41730
--- /dev/null
+++ b/src/main/java/org/zwobble/mammoth/documents/Run.java
@@ -0,0 +1,20 @@
+package org.zwobble.mammoth.documents;
+
+import java.util.List;
+
+public class Run implements DocumentElement, HasChildren {
+    private final List<DocumentElement> children;
+
+    public Run(List<DocumentElement> children) {
+        this.children = children;
+    }
+
+    public List<DocumentElement> getChildren() {
+        return children;
+    }
+
+    @Override
+    public <T> T accept(DocumentElementVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/src/main/java/org/zwobble/mammoth/documents/RunElement.java b/src/main/java/org/zwobble/mammoth/documents/RunElement.java
deleted file mode 100644
index f33eca3..0000000
--- a/src/main/java/org/zwobble/mammoth/documents/RunElement.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.zwobble.mammoth.documents;
-
-import java.util.List;
-
-public class RunElement implements DocumentElement, HasChildren {
-    private final List<DocumentElement> children;
-
-    public RunElement(List<DocumentElement> children) {
-        this.children = children;
-    }
-
-    public List<DocumentElement> getChildren() {
-        return children;
-    }
-
-    @Override
-    public <T> T accept(DocumentElementVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
diff --git a/src/main/java/org/zwobble/mammoth/documents/Text.java b/src/main/java/org/zwobble/mammoth/documents/Text.java
new file mode 100644
index 0000000..20a7d6e
--- /dev/null
+++ b/src/main/java/org/zwobble/mammoth/documents/Text.java
@@ -0,0 +1,18 @@
+package org.zwobble.mammoth.documents;
+
+public class Text implements DocumentElement {
+    private final String value;
+
+    public Text(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public <T> T accept(DocumentElementVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+}
diff --git a/src/main/java/org/zwobble/mammoth/documents/TextElement.java b/src/main/java/org/zwobble/mammoth/documents/TextElement.java
deleted file mode 100644
index 00281d0..0000000
--- a/src/main/java/org/zwobble/mammoth/documents/TextElement.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.zwobble.mammoth.documents;
-
-public class TextElement implements DocumentElement {
-    private final String value;
-
-    public TextElement(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public <T> T accept(DocumentElementVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-}
diff --git a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
index fdfb692..a61e4dd 100644
--- a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
@@ -23,9 +23,9 @@ public class BodyXmlReader {
     public List<DocumentElement> readElement(XmlElement element) {
         switch (element.getName()) {
             case "w:t":
-                return ImmutableList.of(new TextElement(element.innerText()));
+                return ImmutableList.of(new Text(element.innerText()));
             case "w:r":
-                return ImmutableList.of(new RunElement(readElements(element.children())));
+                return ImmutableList.of(new Run(readElements(element.children())));
             case "w:p":
                 return ImmutableList.of(readParagraph(element));
 
@@ -46,8 +46,8 @@ public class BodyXmlReader {
                     this::readElement)));
     }
 
-    private ParagraphElement readParagraph(XmlElement element) {
-        return new ParagraphElement(readParagraphStyle(element), readElements(element.children()));
+    private Paragraph readParagraph(XmlElement element) {
+        return new Paragraph(readParagraphStyle(element), readElements(element.children()));
     }
 
     private Optional<Style> readParagraphStyle(XmlElement paragraph) {
-- 
cgit v1.2.3