diff --git a/src/main/java/cokr/xit/fims/cmmn/Pstn.java b/src/main/java/cokr/xit/fims/cmmn/Pstn.java deleted file mode 100644 index 338f1ff1..00000000 --- a/src/main/java/cokr/xit/fims/cmmn/Pstn.java +++ /dev/null @@ -1,20 +0,0 @@ -package cokr.xit.fims.cmmn; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class Pstn { - public Pstn(float left, float top){ - this.left = left; - this.top = top; - } - - private float left; - private float top; - - public float[] to2Float() { - return new float[] { this.left, this.top }; - } -} diff --git a/src/main/java/cokr/xit/fims/cmmn/PstnAndSize.java b/src/main/java/cokr/xit/fims/cmmn/PstnAndSize.java deleted file mode 100644 index 59f6a77b..00000000 --- a/src/main/java/cokr/xit/fims/cmmn/PstnAndSize.java +++ /dev/null @@ -1,75 +0,0 @@ -package cokr.xit.fims.cmmn; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class PstnAndSize { - public PstnAndSize(float left, float top, float width, float height){ - this.left = left; - this.top = top; - this.width = width; - this.height = height; - } - - public PstnAndSize(Pstn pstn, Size size){ - this.left = pstn.getLeft(); - this.top = pstn.getTop(); - this.width = size.getWidth(); - this.height = size.getHeight(); - } - - public PstnAndSize(Pstn pstn, float width, float height){ - this.left = pstn.getLeft(); - this.top = pstn.getTop(); - this.width = width; - this.height = height; - } - - public PstnAndSize(float left, float top, Size size){ - this.left = left; - this.top = top; - this.width = size.getWidth(); - this.height = size.getHeight(); - } - - private float left; - private float top; - private float width; - private float height; - - public Pstn getPstn() { - return new Pstn(this.left, this.top); - } - public Size getSize() { - return new Size(this.width, this.height); - } - - public float[] to4Float() { - return new float[] { this.left, this.top, this.width, this.height }; - } - - public PstnAndSize x2Width() { - this.width = this.width * 2.0f; - return this; - } - public PstnAndSize x2Height() { - this.height = this.height * 2.0f; - return this; - } - - public PstnAndSize transXY(float transX, float transY) { - this.left = this.left * transX; - this.top = this.top * transY; - this.width = this.width * transX; - this.height = this.height * transY; - return this; - } - - public PstnAndSize addPstn(Pstn pstn) { - this.left = this.left + pstn.getLeft(); - this.top = this.top + pstn.getTop(); - return this; - } -} diff --git a/src/main/java/cokr/xit/fims/cmmn/Size.java b/src/main/java/cokr/xit/fims/cmmn/Size.java deleted file mode 100644 index 2eb74b3d..00000000 --- a/src/main/java/cokr/xit/fims/cmmn/Size.java +++ /dev/null @@ -1,20 +0,0 @@ -package cokr.xit.fims.cmmn; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class Size { - public Size(float width, float height){ - this.width = width; - this.height = height; - } - - private float width; - private float height; - - public float[] to2Float() { - return new float[] { this.width, this.height }; - } -} diff --git a/src/main/java/cokr/xit/fims/cmmn/pdf/print/DefaultOtptArtclStng.java b/src/main/java/cokr/xit/fims/cmmn/pdf/print/DefaultOtptArtclStng.java index 2171964a..e9795981 100644 --- a/src/main/java/cokr/xit/fims/cmmn/pdf/print/DefaultOtptArtclStng.java +++ b/src/main/java/cokr/xit/fims/cmmn/pdf/print/DefaultOtptArtclStng.java @@ -1,7 +1,7 @@ package cokr.xit.fims.cmmn.pdf.print; +import cokr.xit.applib.Pstn; import cokr.xit.fims.cmmn.PredefinedSet; -import cokr.xit.fims.cmmn.Pstn; import lombok.Getter; import lombok.Setter;