Make SuperCodec package private again.

FXMisc · Jun 10, 2016 · 290a4e7 · 290a4e7
1 parent 7b17145
commit 290a4e7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/StyleClassedTextArea.java b/richtextfx/src/main/java/org/fxmisc/richtext/StyleClassedTextArea.java
@@ -4,7 +4,6 @@
 import java.util.Collections;
 
 import org.fxmisc.richtext.model.Codec;
-import org.fxmisc.richtext.model.SuperCodec;
 import org.fxmisc.richtext.model.EditableStyledDocument;
 import org.fxmisc.richtext.model.SimpleEditableStyledDocument;
 
@@ -22,8 +21,8 @@ public StyleClassedTextArea(EditableStyledDocument<Collection<String>, Collectio
         );
 
         setStyleCodecs(
-                SuperCodec.upCast(SuperCodec.collectionListCodec(Codec.STRING_CODEC)),
-                SuperCodec.upCast(SuperCodec.collectionListCodec(Codec.STRING_CODEC))
+                Codec.collectionCodec(Codec.STRING_CODEC),
+                Codec.collectionCodec(Codec.STRING_CODEC)
         );
     }
     public StyleClassedTextArea(boolean preserveStyle) {

diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/model/Codec.java b/richtextfx/src/main/java/org/fxmisc/richtext/model/Codec.java
@@ -3,6 +3,7 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 
@@ -64,6 +65,10 @@ static <T> Codec<List<T>> listCodec(Codec<T> elemCodec) {
         return SuperCodec.collectionListCodec(elemCodec);
     }
 
+    static <T> Codec<Collection<T>> collectionCodec(Codec<T> elemCodec) {
+        return SuperCodec.upCast(SuperCodec.collectionListCodec(elemCodec));
+    }
+
     static <T> Codec<Optional<T>> optionalCodec(Codec<T> elemCodec) {
         return new Codec<Optional<T>>() {
 

diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/model/SuperCodec.java b/richtextfx/src/main/java/org/fxmisc/richtext/model/SuperCodec.java
@@ -7,7 +7,7 @@
 import java.util.Collection;
 import java.util.List;
 
-public interface SuperCodec<S, T extends S> extends Codec<T> {
+interface SuperCodec<S, T extends S> extends Codec<T> {
     void encodeSuper(DataOutputStream os, S s) throws IOException;
 
     @Override