Rename document elements to drop Element suffix

6 files changed, 16 insertions, 16 deletions

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/ParagraphElement.java b/src/main/java/org/zwobble/mammoth/documents/Paragraph.java
index 15c2b85..901eb81 100644
--- a/src/main/java/org/zwobble/mammoth/documents/ParagraphElement.java
+++ b/src/main/java/org/zwobble/mammoth/documents/Paragraph.java
@@ -3,11 +3,11 @@ package org.zwobble.mammoth.documents;
 import java.util.List;
 import java.util.Optional;
 
-public class ParagraphElement implements DocumentElement, HasChildren {
+public class Paragraph implements DocumentElement, HasChildren {
     private final Optional<Style> style;
     private final List<DocumentElement> children;
 
-    public ParagraphElement(Optional<Style> style, List<DocumentElement> children) {
+    public Paragraph(Optional<Style> style, List<DocumentElement> children) {
         this.style = style;
         this.children = children;
     }
diff --git a/src/main/java/org/zwobble/mammoth/documents/RunElement.java b/src/main/java/org/zwobble/mammoth/documents/Run.java
index f33eca3..9a41730 100644
--- a/src/main/java/org/zwobble/mammoth/documents/RunElement.java
+++ b/src/main/java/org/zwobble/mammoth/documents/Run.java
@@ -2,10 +2,10 @@ package org.zwobble.mammoth.documents;
 
 import java.util.List;
 
-public class RunElement implements DocumentElement, HasChildren {
+public class Run implements DocumentElement, HasChildren {
     private final List<DocumentElement> children;
 
-    public RunElement(List<DocumentElement> children) {
+    public Run(List<DocumentElement> children) {
         this.children = children;
     }
 
diff --git a/src/main/java/org/zwobble/mammoth/documents/TextElement.java b/src/main/java/org/zwobble/mammoth/documents/Text.java
index 00281d0..20a7d6e 100644
--- a/src/main/java/org/zwobble/mammoth/documents/TextElement.java
+++ b/src/main/java/org/zwobble/mammoth/documents/Text.java
@@ -1,9 +1,9 @@
 package org.zwobble.mammoth.documents;
 
-public class TextElement implements DocumentElement {
+public class Text implements DocumentElement {
     private final String value;
 
-    public TextElement(String value) {
+    public Text(String value) {
         this.value = value;
     }
 
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) {