Restructure

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/PeoplePartWriterImpl.java

@@ -10,7 +10,8 @@ import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Component;
 import scot.carricksoftware.grantswriter.domains.people.Person;
 import scot.carricksoftware.grantswriter.services.people.PersonService;
-import scot.carricksoftware.grantswriter.writer.latex.sections.PersonSection;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.sections.PersonSection;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.headers.PeoplePartHeader;
 
 import java.util.List;
 

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/PeoplePartHeader.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/headers/PeoplePartHeader.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.parts.people;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.headers;
 
 public interface PeoplePartHeader {
     void write();

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/PeoplePartHeaderImpl.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/headers/PeoplePartHeaderImpl.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.parts.people;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.headers;
 
 import org.springframework.stereotype.Component;
 import scot.carricksoftware.grantswriter.writer.latex.LatexPartHeader;

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/PersonSectionHeader.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/headers/PersonSectionHeader.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.parts.people;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.headers;
 
 
 import scot.carricksoftware.grantswriter.domains.people.Person;

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/PersonSectionHeaderImpl.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/headers/PersonSectionHeaderImpl.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.parts.people;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.headers;
 
 import org.springframework.stereotype.Component;
 import scot.carricksoftware.grantswriter.writer.latex.LatexSectionHeader;

src/main/java/scot/carricksoftware/grantswriter/writer/latex/sections/PersonSection.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/sections/PersonSection.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.sections;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.sections;
 
 import scot.carricksoftware.grantswriter.domains.people.Person;
 

src/main/java/scot/carricksoftware/grantswriter/writer/latex/sections/PersonSectionImpl.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/sections/PersonSectionImpl.java

@@ -3,11 +3,13 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.sections;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.sections;
 
 import org.springframework.stereotype.Component;
-import scot.carricksoftware.grantswriter.writer.latex.parts.people.PersonSectionHeader;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.headers.PersonSectionHeader;
 import scot.carricksoftware.grantswriter.domains.people.Person;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.PersonSubSectionReferencesWriter;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.PersonSubSectionTimeLineWriter;
 
 @Component
 public class PersonSectionImpl implements PersonSection {

src/main/java/scot/carricksoftware/grantswriter/writer/latex/sections/PersonSubSectionReferencesWriter.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/PersonSubSectionReferencesWriter.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.sections;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections;
 
 import scot.carricksoftware.grantswriter.domains.people.Person;
 

src/main/java/scot/carricksoftware/grantswriter/writer/latex/sections/PersonSubSectionReferencesWriterImpl.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/PersonSubSectionReferencesWriterImpl.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.sections;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections;
 
 import org.springframework.stereotype.Component;
 import scot.carricksoftware.grantswriter.domains.people.Person;

src/main/java/scot/carricksoftware/grantswriter/writer/latex/sections/PersonSubSectionTimeLineWriter.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/PersonSubSectionTimeLineWriter.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.sections;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections;
 
 import scot.carricksoftware.grantswriter.domains.people.Person;
 

src/main/java/scot/carricksoftware/grantswriter/writer/latex/sections/PersonSubSectionTimeLineWriterImpl.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/PersonSubSectionTimeLineWriterImpl.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.sections;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections;
 
 import org.springframework.stereotype.Component;
 import scot.carricksoftware.grantswriter.domains.people.Person;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/PeoplePartWriterTest.java

@@ -12,10 +12,10 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grantswriter.domains.people.Person;
 import scot.carricksoftware.grantswriter.services.people.PersonService;
-import scot.carricksoftware.grantswriter.writer.latex.parts.people.PeoplePartHeader;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.headers.PeoplePartHeader;
 import scot.carricksoftware.grantswriter.writer.latex.parts.people.PeoplePartWriter;
 import scot.carricksoftware.grantswriter.writer.latex.parts.people.PeoplePartWriterImpl;
-import scot.carricksoftware.grantswriter.writer.latex.sections.PersonSection;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.sections.PersonSection;
 
 import java.util.ArrayList;
 import java.util.List;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/PeoplePartWriterHeaderTest.java → src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/headers/PeoplePartWriterHeaderTest.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.parts.people;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.headers;
 
 
 import org.junit.jupiter.api.BeforeEach;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/PersonSectionHeaderTest.java → src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/headers/PersonSectionHeaderTest.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.parts.people;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.headers;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/sections/PersonSectionTest.java → src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/sections/PersonSectionTest.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.sections;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.sections;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -11,7 +11,9 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grantswriter.domains.people.Person;
-import scot.carricksoftware.grantswriter.writer.latex.parts.people.PersonSectionHeader;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.headers.PersonSectionHeader;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.PersonSubSectionReferencesWriter;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.PersonSubSectionTimeLineWriter;
 
 import static org.mockito.Mockito.verify;
 

src/test/java/scot/carricksoftware/grantswriter/writer/latex/sections/PersonSubSectionReferencesWriterTest.java → src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/sections/PersonSubSectionReferencesWriterTest.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.sections;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.sections;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -12,6 +12,8 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grantswriter.domains.people.Person;
 import scot.carricksoftware.grantswriter.writer.latex.LatexSubSectionHeader;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.PersonSubSectionReferencesWriter;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.PersonSubSectionReferencesWriterImpl;
 
 import static org.mockito.Mockito.verify;
 

src/test/java/scot/carricksoftware/grantswriter/writer/latex/sections/PersonSubSectionTimeLineWriterTest.java → src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/PersonSubSectionTimeLineWriterTest.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.sections;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -12,6 +12,7 @@ import scot.carricksoftware.grantswriter.writer.latex.LatexSubSectionHeader;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+
 class PersonSubSectionTimeLineWriterTest {
 
     private PersonSubSectionTimeLineWriter writer;
@@ -25,7 +26,7 @@ class PersonSubSectionTimeLineWriterTest {
     }
 
     @Test
-    void constructTest() {
+    void constructorTest() {
         assertNotNull(writer);
     }
 }