refactor: re-org of projects

examples/src/main/java/org/codejive/twinkle/demos/BouncingTwinkleDemo.java

@@ -17,12 +17,12 @@
 import org.codejive.twinkle.ansi.Style;
 import org.codejive.twinkle.ansi.util.AnsiTricks;
 import org.codejive.twinkle.ansi.util.Fluent;
+import org.codejive.twinkle.screen.Buffer;
+import org.codejive.twinkle.screen.io.PrintBufferWriter;
+import org.codejive.twinkle.screen.util.FrameCounter;
 import org.codejive.twinkle.shapes.Borders;
-import org.codejive.twinkle.text.Buffer;
-import org.codejive.twinkle.text.io.PrintBufferWriter;
-import org.codejive.twinkle.text.util.FrameCounter;
-import org.codejive.twinkle.text.util.Size;
-import org.codejive.twinkle.text.util.Sizer;
+import org.codejive.twinkle.text.Size;
+import org.codejive.twinkle.text.Sizer;
 
 class BouncingTwinkleDemo {
 

pom.xml

@@ -19,8 +19,8 @@
     </properties>
 
     <modules>
-        <module>twinkle-ansi</module>
         <module>twinkle-text</module>
+        <module>twinkle-screen</module>
         <module>twinkle-shapes</module>
         <module>examples</module>
     </modules>

twinkle-ansi/pom.xml → twinkle-screen/pom.xml

@@ -11,10 +11,19 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>twinkle-ansi</artifactId>
+    <artifactId>twinkle-screen</artifactId>
     <packaging>jar</packaging>
 
-    <description>Generic ANSI support</description>
+    <description>Screen manipulation for terminals</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.codejive.twinkle</groupId>
+            <artifactId>twinkle-text</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 
 </project>
 

twinkle-text/src/main/java/org/codejive/twinkle/text/Buffer.java → twinkle-screen/src/main/java/org/codejive/twinkle/screen/Buffer.java

@@ -1,17 +1,17 @@
-package org.codejive.twinkle.text;
+package org.codejive.twinkle.screen;
 
 import java.io.IOException;
 import java.util.Objects;
 import org.codejive.twinkle.ansi.Ansi;
 import org.codejive.twinkle.ansi.Style;
 import org.codejive.twinkle.ansi.util.Printable;
-import org.codejive.twinkle.text.io.BufferWriter;
-import org.codejive.twinkle.text.io.PrintBufferWriter;
-import org.codejive.twinkle.text.util.Hyperlink;
-import org.codejive.twinkle.text.util.Rect;
-import org.codejive.twinkle.text.util.Size;
-import org.codejive.twinkle.text.util.StyledIterator;
-import org.codejive.twinkle.text.util.Unicode;
+import org.codejive.twinkle.screen.io.BufferWriter;
+import org.codejive.twinkle.screen.io.PrintBufferWriter;
+import org.codejive.twinkle.screen.util.Rect;
+import org.codejive.twinkle.text.Hyperlink;
+import org.codejive.twinkle.text.Size;
+import org.codejive.twinkle.text.StyledIterator;
+import org.codejive.twinkle.text.Unicode;
 import org.jspecify.annotations.NonNull;
 
 public class Buffer implements Printable, RenderTarget {

twinkle-text/src/main/java/org/codejive/twinkle/text/RenderTarget.java → twinkle-screen/src/main/java/org/codejive/twinkle/screen/RenderTarget.java

@@ -1,7 +1,7 @@
-package org.codejive.twinkle.text;
+package org.codejive.twinkle.screen;
 
-import org.codejive.twinkle.text.util.Size;
-import org.codejive.twinkle.text.util.StyledIterator;
+import org.codejive.twinkle.text.Size;
+import org.codejive.twinkle.text.StyledIterator;
 import org.jspecify.annotations.NonNull;
 
 public interface RenderTarget {

twinkle-text/src/main/java/org/codejive/twinkle/text/SwappableBuffer.java → twinkle-screen/src/main/java/org/codejive/twinkle/screen/SwappableBuffer.java

@@ -1,9 +1,9 @@
-package org.codejive.twinkle.text;
+package org.codejive.twinkle.screen;
 
-import org.codejive.twinkle.text.io.PrintBufferWriter;
-import org.codejive.twinkle.text.io.SwappableBufferWriter;
-import org.codejive.twinkle.text.util.Rect;
-import org.codejive.twinkle.text.util.Size;
+import org.codejive.twinkle.screen.io.PrintBufferWriter;
+import org.codejive.twinkle.screen.io.SwappableBufferWriter;
+import org.codejive.twinkle.screen.util.Rect;
+import org.codejive.twinkle.text.Size;
 import org.jspecify.annotations.NonNull;
 
 /**

twinkle-text/src/main/java/org/codejive/twinkle/text/io/BufferWriter.java → twinkle-screen/src/main/java/org/codejive/twinkle/screen/io/BufferWriter.java

@@ -1,15 +1,15 @@
-package org.codejive.twinkle.text.io;
+package org.codejive.twinkle.screen.io;
 
 import static org.codejive.twinkle.ansi.Constants.*;
 
 import java.io.Writer;
 import org.codejive.twinkle.ansi.Ansi;
 import org.codejive.twinkle.ansi.Style;
-import org.codejive.twinkle.text.Buffer;
-import org.codejive.twinkle.text.Buffer.LinkPrintOption;
-import org.codejive.twinkle.text.util.Hyperlink;
-import org.codejive.twinkle.text.util.SequenceDecoder;
-import org.codejive.twinkle.text.util.Size;
+import org.codejive.twinkle.screen.Buffer;
+import org.codejive.twinkle.screen.Buffer.LinkPrintOption;
+import org.codejive.twinkle.text.Hyperlink;
+import org.codejive.twinkle.text.SequenceDecoder;
+import org.codejive.twinkle.text.Size;
 import org.jspecify.annotations.NonNull;
 
 public class BufferWriter extends Writer {

twinkle-text/src/main/java/org/codejive/twinkle/text/io/PrintBufferWriter.java → twinkle-screen/src/main/java/org/codejive/twinkle/screen/io/PrintBufferWriter.java

@@ -1,11 +1,11 @@
-package org.codejive.twinkle.text.io;
+package org.codejive.twinkle.screen.io;
 
 import java.io.PrintWriter;
 import org.codejive.twinkle.ansi.Style;
 import org.codejive.twinkle.ansi.util.AnsiTricks;
 import org.codejive.twinkle.ansi.util.Fluent;
-import org.codejive.twinkle.text.Buffer;
-import org.codejive.twinkle.text.util.Size;
+import org.codejive.twinkle.screen.Buffer;
+import org.codejive.twinkle.text.Size;
 import org.jspecify.annotations.NonNull;
 
 public class PrintBufferWriter extends PrintWriter {

twinkle-text/src/main/java/org/codejive/twinkle/text/io/SwappableBufferWriter.java → twinkle-screen/src/main/java/org/codejive/twinkle/screen/io/SwappableBufferWriter.java

@@ -1,12 +1,12 @@
-package org.codejive.twinkle.text.io;
+package org.codejive.twinkle.screen.io;
 
 import static org.codejive.twinkle.ansi.Constants.CSI;
 import static org.codejive.twinkle.ansi.Constants.SCREEN_RESTORE;
 import static org.codejive.twinkle.ansi.Constants.SCREEN_RESTORE_ALT;
 import static org.codejive.twinkle.ansi.Constants.SCREEN_SAVE;
 import static org.codejive.twinkle.ansi.Constants.SCREEN_SAVE_ALT;
 
-import org.codejive.twinkle.text.SwappableBuffer;
+import org.codejive.twinkle.screen.SwappableBuffer;
 import org.jspecify.annotations.NonNull;
 
 public class SwappableBufferWriter extends BufferWriter {

twinkle-text/src/main/java/org/codejive/twinkle/text/util/FrameCounter.java → twinkle-screen/src/main/java/org/codejive/twinkle/screen/util/FrameCounter.java

@@ -1,4 +1,4 @@
-package org.codejive.twinkle.text.util;
+package org.codejive.twinkle.screen.util;
 
 public class FrameCounter {
     private int frameCount;

twinkle-text/src/main/java/org/codejive/twinkle/text/util/Rect.java → twinkle-screen/src/main/java/org/codejive/twinkle/screen/util/Rect.java

@@ -1,5 +1,6 @@
-package org.codejive.twinkle.text.util;
+package org.codejive.twinkle.screen.util;
 
+import org.codejive.twinkle.text.Size;
 import org.jspecify.annotations.NonNull;
 
 public class Rect extends Size implements Sized {

twinkle-text/src/main/java/org/codejive/twinkle/text/util/Sized.java → twinkle-screen/src/main/java/org/codejive/twinkle/screen/util/Sized.java

@@ -1,5 +1,6 @@
-package org.codejive.twinkle.text.util;
+package org.codejive.twinkle.screen.util;
 
+import org.codejive.twinkle.text.Size;
 import org.jspecify.annotations.NonNull;
 
 public interface Sized {

twinkle-text/src/test/java/org/codejive/twinkle/text/TestBuffer.java → twinkle-screen/src/test/java/org/codejive/twinkle/text/TestBuffer.java

@@ -6,8 +6,8 @@
 import org.codejive.twinkle.ansi.Color;
 import org.codejive.twinkle.ansi.Constants;
 import org.codejive.twinkle.ansi.Style;
-import org.codejive.twinkle.text.io.PrintBufferWriter;
-import org.codejive.twinkle.text.util.Size;
+import org.codejive.twinkle.screen.Buffer;
+import org.codejive.twinkle.screen.io.PrintBufferWriter;
 import org.junit.jupiter.api.Test;
 
 public class TestBuffer {

twinkle-text/src/test/java/org/codejive/twinkle/text/TestSwappableBuffer.java → twinkle-screen/src/test/java/org/codejive/twinkle/text/TestSwappableBuffer.java

@@ -4,7 +4,8 @@
 import static org.codejive.twinkle.ansi.Constants.*;
 
 import org.codejive.twinkle.ansi.Style;
-import org.codejive.twinkle.text.io.PrintBufferWriter;
+import org.codejive.twinkle.screen.SwappableBuffer;
+import org.codejive.twinkle.screen.io.PrintBufferWriter;
 import org.junit.jupiter.api.Test;
 
 public class TestSwappableBuffer {

twinkle-text/src/test/java/org/codejive/twinkle/text/io/TestBufferWriter.java → twinkle-screen/src/test/java/org/codejive/twinkle/text/io/TestBufferWriter.java

@@ -5,7 +5,8 @@
 import org.codejive.twinkle.ansi.Ansi;
 import org.codejive.twinkle.ansi.Color;
 import org.codejive.twinkle.ansi.Style;
-import org.codejive.twinkle.text.Buffer;
+import org.codejive.twinkle.screen.Buffer;
+import org.codejive.twinkle.screen.io.PrintBufferWriter;
 import org.junit.jupiter.api.Test;
 
 public class TestBufferWriter {

twinkle-text/src/test/java/org/codejive/twinkle/text/io/TestSwappableBufferWriter.java → twinkle-screen/src/test/java/org/codejive/twinkle/text/io/TestSwappableBufferWriter.java

@@ -7,7 +7,8 @@
 
 import org.codejive.twinkle.ansi.Ansi;
 import org.codejive.twinkle.ansi.Style;
-import org.codejive.twinkle.text.SwappableBuffer;
+import org.codejive.twinkle.screen.SwappableBuffer;
+import org.codejive.twinkle.screen.io.PrintBufferWriter;
 import org.junit.jupiter.api.Test;
 
 public class TestSwappableBufferWriter {

twinkle-shapes/pom.xml

@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>org.codejive.twinkle</groupId>
-            <artifactId>twinkle-text</artifactId>
+            <artifactId>twinkle-screen</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>

twinkle-shapes/src/main/java/org/codejive/twinkle/shapes/Borders.java

@@ -2,10 +2,10 @@
 
 import org.codejive.twinkle.ansi.Style;
 import org.codejive.twinkle.ansi.util.Printable;
+import org.codejive.twinkle.screen.Buffer;
+import org.codejive.twinkle.screen.Buffer.StylePrintOption;
+import org.codejive.twinkle.screen.RenderTarget;
 import org.codejive.twinkle.shapes.util.Draw;
-import org.codejive.twinkle.text.Buffer;
-import org.codejive.twinkle.text.Buffer.StylePrintOption;
-import org.codejive.twinkle.text.RenderTarget;
 import org.jspecify.annotations.NonNull;
 
 public class Borders implements Printable {

twinkle-shapes/src/main/java/org/codejive/twinkle/shapes/util/Draw.java

@@ -1,7 +1,7 @@
 package org.codejive.twinkle.shapes.util;
 
-import org.codejive.twinkle.text.RenderTarget;
-import org.codejive.twinkle.text.RenderTarget.PrintOption;
+import org.codejive.twinkle.screen.RenderTarget;
+import org.codejive.twinkle.screen.RenderTarget.PrintOption;
 
 public class Draw {
 

twinkle-text/pom.xml

@@ -14,16 +14,7 @@
     <artifactId>twinkle-text</artifactId>
     <packaging>jar</packaging>
 
-    <description>Text manipulation</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.codejive.twinkle</groupId>
-            <artifactId>twinkle-ansi</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
+    <description>Text manipulation for terminals</description>
 
 </project>
 

twinkle-text/src/main/java/org/codejive/twinkle/text/util/Hyperlink.java → twinkle-text/src/main/java/org/codejive/twinkle/text/Hyperlink.java

@@ -1,4 +1,4 @@
-package org.codejive.twinkle.text.util;
+package org.codejive.twinkle.text;
 
 import static org.codejive.twinkle.ansi.Constants.*;
 

twinkle-text/src/main/java/org/codejive/twinkle/text/util/SequenceDecoder.java → twinkle-text/src/main/java/org/codejive/twinkle/text/SequenceDecoder.java

@@ -1,4 +1,4 @@
-package org.codejive.twinkle.text.util;
+package org.codejive.twinkle.text;
 
 import org.codejive.twinkle.ansi.Constants;
 

twinkle-text/src/main/java/org/codejive/twinkle/text/util/SequenceIterator.java → twinkle-text/src/main/java/org/codejive/twinkle/text/SequenceIterator.java

@@ -1,4 +1,4 @@
-package org.codejive.twinkle.text.util;
+package org.codejive.twinkle.text;
 
 import java.io.IOException;
 import java.io.PushbackReader;

twinkle-text/src/main/java/org/codejive/twinkle/text/util/Size.java → twinkle-text/src/main/java/org/codejive/twinkle/text/Size.java

@@ -1,4 +1,4 @@
-package org.codejive.twinkle.text.util;
+package org.codejive.twinkle.text;
 
 import java.util.Objects;
 import org.jspecify.annotations.NonNull;

twinkle-text/src/main/java/org/codejive/twinkle/text/util/Sizer.java → twinkle-text/src/main/java/org/codejive/twinkle/text/Sizer.java

@@ -1,4 +1,4 @@
-package org.codejive.twinkle.text.util;
+package org.codejive.twinkle.text;
 
 public class Sizer {
     /**

twinkle-text/src/main/java/org/codejive/twinkle/text/util/StyledIterator.java → twinkle-text/src/main/java/org/codejive/twinkle/text/StyledIterator.java

@@ -1,4 +1,4 @@
-package org.codejive.twinkle.text.util;
+package org.codejive.twinkle.text;
 
 import java.io.Reader;
 import java.util.NoSuchElementException;

twinkle-text/src/main/java/org/codejive/twinkle/text/util/Unicode.java → twinkle-text/src/main/java/org/codejive/twinkle/text/Unicode.java

@@ -1,4 +1,4 @@
-package org.codejive.twinkle.text.util;
+package org.codejive.twinkle.text;
 
 public class Unicode {
 

twinkle-text/src/test/java/org/codejive/twinkle/text/util/TestSequenceDecoder.java → twinkle-text/src/test/java/org/codejive/twinkle/text/TestSequenceDecoder.java

@@ -1,4 +1,4 @@
-package org.codejive.twinkle.text.util;
+package org.codejive.twinkle.text;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

twinkle-text/src/test/java/org/codejive/twinkle/text/util/TestSequenceIterator.java → twinkle-text/src/test/java/org/codejive/twinkle/text/TestSequenceIterator.java

@@ -1,4 +1,4 @@
-package org.codejive.twinkle.text.util;
+package org.codejive.twinkle.text;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

twinkle-text/src/test/java/org/codejive/twinkle/text/util/TestSizer.java → twinkle-text/src/test/java/org/codejive/twinkle/text/TestSizer.java

@@ -1,4 +1,4 @@
-package org.codejive.twinkle.text.util;
+package org.codejive.twinkle.text;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

twinkle-text/src/test/java/org/codejive/twinkle/text/util/TestStyledIterator.java → twinkle-text/src/test/java/org/codejive/twinkle/text/TestStyledIterator.java

@@ -1,4 +1,4 @@
-package org.codejive.twinkle.text.util;
+package org.codejive.twinkle.text;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

twinkle-text/src/test/java/org/codejive/twinkle/text/util/TestUnicode.java → twinkle-text/src/test/java/org/codejive/twinkle/text/TestUnicode.java

@@ -1,4 +1,4 @@
-package org.codejive.twinkle.text.util;
+package org.codejive.twinkle.text;
 
 import static org.assertj.core.api.Assertions.assertThat;