From b566b0f76514edba113cac1245bea4136aa33f07 Mon Sep 17 00:00:00 2001
From: Dolan <dolan_miu@hotmail.com>
Date: Tue, 25 Jun 2019 01:58:09 +0100
Subject: [PATCH] Simplify multiple addXXX methods into a single add method for
 Footer

---
 src/file/footer-wrapper.spec.ts | 16 ++++++----------
 src/file/footer-wrapper.ts      | 12 ++++--------
 src/file/footer/footer.ts       | 10 ++--------
 src/file/header-wrapper.spec.ts |  4 ++--
 src/file/header-wrapper.ts      |  2 +-
 5 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/file/footer-wrapper.spec.ts b/src/file/footer-wrapper.spec.ts
index 37121f0813..882e47fadf 100644
--- a/src/file/footer-wrapper.spec.ts
+++ b/src/file/footer-wrapper.spec.ts
@@ -7,21 +7,19 @@ import { Paragraph } from "./paragraph";
 import { Table } from "./table";
 
 describe("FooterWrapper", () => {
-    describe("#addParagraph", () => {
+    describe("#add", () => {
         it("should call the underlying footer's addParagraph", () => {
             const file = new FooterWrapper(new Media(), 1);
-            const spy = sinon.spy(file.Footer, "addParagraph");
-            file.addParagraph(new Paragraph({}));
+            const spy = sinon.spy(file.Footer, "add");
+            file.add(new Paragraph({}));
 
             expect(spy.called).to.equal(true);
         });
-    });
 
-    describe("#addTable", () => {
         it("should call the underlying footer's addParagraph", () => {
             const file = new FooterWrapper(new Media(), 1);
-            const spy = sinon.spy(file.Footer, "addTable");
-            file.addTable(
+            const spy = sinon.spy(file.Footer, "add");
+            file.add(
                 new Table({
                     rows: 1,
                     columns: 1,
@@ -30,12 +28,10 @@ describe("FooterWrapper", () => {
 
             expect(spy.called).to.equal(true);
         });
-    });
 
-    describe("#addImage", () => {
         it("should call the underlying footer's addImage", () => {
             const file = new FooterWrapper(new Media(), 1);
-            const spy = sinon.spy(file.Footer, "addParagraph");
+            const spy = sinon.spy(file.Footer, "add");
             // tslint:disable-next-line:no-any
             file.addImage({} as any);
 
diff --git a/src/file/footer-wrapper.ts b/src/file/footer-wrapper.ts
index b2d5e503f4..ebd0610a23 100644
--- a/src/file/footer-wrapper.ts
+++ b/src/file/footer-wrapper.ts
@@ -22,16 +22,12 @@ export class FooterWrapper {
         this.relationships = new Relationships();
     }
 
-    public addParagraph(paragraph: Paragraph): void {
-        this.footer.addParagraph(paragraph);
-    }
-
-    public addTable(table: Table): void {
-        this.footer.addTable(table);
+    public add(item: Paragraph | Table): void {
+        this.footer.add(item);
     }
 
     public addImage(image: Image): FooterWrapper {
-        this.footer.addParagraph(image.Paragraph);
+        this.footer.add(image.Paragraph);
         return this;
     }
 
@@ -47,7 +43,7 @@ export class FooterWrapper {
     ): Paragraph {
         const image = Media.addImage(this, buffer, width, height, drawingOptions);
         const paragraph = new Paragraph(image);
-        this.addParagraph(paragraph);
+        this.add(paragraph);
 
         return paragraph;
     }
diff --git a/src/file/footer/footer.ts b/src/file/footer/footer.ts
index bd2a76bd96..cfac9b8d9a 100644
--- a/src/file/footer/footer.ts
+++ b/src/file/footer/footer.ts
@@ -36,13 +36,7 @@ export class Footer extends InitializableXmlComponent {
         return this.refId;
     }
 
-    public addParagraph(paragraph: Paragraph): Footer {
-        this.root.push(paragraph);
-
-        return this;
-    }
-
-    public addTable(table: Table): void {
-        this.root.push(table);
+    public add(item: Paragraph | Table): void {
+        this.root.push(item);
     }
 }
diff --git a/src/file/header-wrapper.spec.ts b/src/file/header-wrapper.spec.ts
index 0640ca41f5..0d10b5818a 100644
--- a/src/file/header-wrapper.spec.ts
+++ b/src/file/header-wrapper.spec.ts
@@ -10,7 +10,7 @@ describe("HeaderWrapper", () => {
     describe("#add", () => {
         it("should call the underlying header's addChildElement for Paragraph", () => {
             const wrapper = new HeaderWrapper(new Media(), 1);
-            const spy = sinon.spy(wrapper.Header, "addChildElement");
+            const spy = sinon.spy(wrapper.Header, "add");
             wrapper.add(new Paragraph({}));
 
             expect(spy.called).to.equal(true);
@@ -18,7 +18,7 @@ describe("HeaderWrapper", () => {
 
         it("should call the underlying header's addChildElement for Table", () => {
             const wrapper = new HeaderWrapper(new Media(), 1);
-            const spy = sinon.spy(wrapper.Header, "addChildElement");
+            const spy = sinon.spy(wrapper.Header, "add");
             wrapper.add(
                 new Table({
                     rows: 1,
diff --git a/src/file/header-wrapper.ts b/src/file/header-wrapper.ts
index bd445dbe9f..58826ec03b 100644
--- a/src/file/header-wrapper.ts
+++ b/src/file/header-wrapper.ts
@@ -23,7 +23,7 @@ export class HeaderWrapper {
     }
 
     public add(item: Paragraph | Table): HeaderWrapper {
-        this.header.addChildElement(item);
+        this.header.add(item);
 
         return this;
     }