Move TSizeConstraint into new package

diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
index 6523cfa0eab33e244cd39d54bfbfbcc350b9e9a1..cbca857d01fc79770bfb04de9b35b96f1b224878 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
+++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
@@ -23,6 +23,7 @@ import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.library.BasicLibrary;
 import be.nikiroo.fanfix.output.BasicOutput.OutputType;
 import be.nikiroo.fanfix.reader.Reader;
 import be.nikiroo.fanfix.library.BasicLibrary;
 import be.nikiroo.fanfix.output.BasicOutput.OutputType;
 import be.nikiroo.fanfix.reader.Reader;

+import be.nikiroo.jexer.TSizeConstraint;

 
 /**
  * The library window, that will list all the (filtered) stories available in
 
 /**
  * The library window, that will list all the (filtered) stories available in

diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
index 79840b9d20071b418c16b8022558d708de3c5699..6ab92347420ddd7ee9d80fa934e8ceed8f88b1b2 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
+++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
@@ -19,6 +19,7 @@ import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Paragraph;
 import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.data.Paragraph;
 import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
 import be.nikiroo.fanfix.data.Story;

+import be.nikiroo.jexer.TSizeConstraint;

 import be.nikiroo.jexer.TTable;
 import be.nikiroo.utils.StringUtils;
 
 import be.nikiroo.jexer.TTable;
 import be.nikiroo.utils.StringUtils;
 

diff --git a/src/be/nikiroo/fanfix/reader/tui/TSizeConstraint.java b/src/be/nikiroo/jexer/TSizeConstraint.java
similarity index 91%
rename from src/be/nikiroo/fanfix/reader/tui/TSizeConstraint.java
rename to src/be/nikiroo/jexer/TSizeConstraint.java
index 859a6c35de170fd805a2d9e12b84850da02d97f5..39daa20655abe0c14ac56f077af9d0e159d9ff06 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/tui/TSizeConstraint.java
+++ b/src/be/nikiroo/jexer/TSizeConstraint.java
@@ -1,4 +1,4 @@
-package be.nikiroo.fanfix.reader.tui;
+package be.nikiroo.jexer;

 
 import java.util.List;
 
 
 import java.util.List;
 


@@ -54,12 +54,12 @@ public class TSizeConstraint {
        }
 
        // coordinates < 0 = from the other side, x2 or y2 = 0 = max size
        }
 
        // coordinates < 0 = from the other side, x2 or y2 = 0 = max size

-       static void setSize(List<TSizeConstraint> sizeConstraints, TWidget child,
+       static public void setSize(List<TSizeConstraint> sizeConstraints, TWidget child,

                        Integer x1, Integer y1, Integer x2, Integer y2) {
                sizeConstraints.add(new TSizeConstraint(child, x1, y1, x2, y2));
        }
 
                        Integer x1, Integer y1, Integer x2, Integer y2) {
                sizeConstraints.add(new TSizeConstraint(child, x1, y1, x2, y2));
        }
 

-       static void resize(List<TSizeConstraint> sizeConstraints) {
+       static public void resize(List<TSizeConstraint> sizeConstraints) {

                for (TSizeConstraint sizeConstraint : sizeConstraints) {
                        TWidget widget = sizeConstraint.getWidget();
                        Integer x1 = sizeConstraint.getX1();
                for (TSizeConstraint sizeConstraint : sizeConstraints) {
                        TWidget widget = sizeConstraint.getWidget();
                        Integer x1 = sizeConstraint.getX1();