diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/TerminalUI.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/TerminalUI.java index 54719890..3d7f42ed 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/TerminalUI.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/TerminalUI.java @@ -44,9 +44,9 @@ import org.springframework.shell.component.view.event.KeyHandler.KeyHandlerResul import org.springframework.shell.component.view.event.MouseEvent; import org.springframework.shell.component.view.event.MouseHandler; import org.springframework.shell.component.view.event.MouseHandler.MouseHandlerResult; -import org.springframework.shell.component.view.geom.Rectangle; import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.DefaultScreen; +import org.springframework.shell.geom.Rectangle; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AbstractControl.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AbstractControl.java index 592fbb8a..6e5fb011 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AbstractControl.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AbstractControl.java @@ -20,7 +20,7 @@ import java.util.Optional; import org.jline.utils.AttributedStyle; import org.springframework.lang.Nullable; -import org.springframework.shell.component.view.geom.Rectangle; +import org.springframework.shell.geom.Rectangle; import org.springframework.shell.style.ThemeResolver; import org.springframework.shell.style.ThemeResolver.ResolvedValues; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AbstractView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AbstractView.java index d3b81dee..f159fb4f 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AbstractView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AbstractView.java @@ -37,9 +37,9 @@ import org.springframework.shell.component.view.event.MouseBindingConsumer; import org.springframework.shell.component.view.event.MouseBindingConsumerArgs; import org.springframework.shell.component.view.event.MouseEvent; import org.springframework.shell.component.view.event.MouseHandler; -import org.springframework.shell.component.view.geom.Rectangle; import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; +import org.springframework.shell.geom.Rectangle; /** * Base implementation of a {@link View} and its parent interface diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AppView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AppView.java index d9e42491..5162d49c 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AppView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AppView.java @@ -19,9 +19,9 @@ import org.springframework.shell.component.view.event.KeyEvent; import org.springframework.shell.component.view.event.KeyEvent.Key; import org.springframework.shell.component.view.event.KeyHandler; import org.springframework.shell.component.view.event.MouseHandler; -import org.springframework.shell.component.view.geom.Rectangle; import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; +import org.springframework.shell.geom.Rectangle; import org.springframework.shell.style.ThemeResolver; import org.springframework.util.Assert; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/BoxView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/BoxView.java index 79d84aae..5a30d53a 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/BoxView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/BoxView.java @@ -18,10 +18,10 @@ package org.springframework.shell.component.view.control; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.shell.component.view.geom.HorizontalAlign; -import org.springframework.shell.component.view.geom.Rectangle; -import org.springframework.shell.component.view.geom.VerticalAlign; import org.springframework.shell.component.view.screen.Screen; +import org.springframework.shell.geom.HorizontalAlign; +import org.springframework.shell.geom.Rectangle; +import org.springframework.shell.geom.VerticalAlign; import org.springframework.shell.style.StyleSettings; import org.springframework.util.StringUtils; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ButtonView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ButtonView.java index f0885eb3..767ce942 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ButtonView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ButtonView.java @@ -19,13 +19,13 @@ import org.springframework.shell.component.view.event.KeyEvent.Key; import org.springframework.shell.component.view.event.KeyHandler; import org.springframework.shell.component.view.event.MouseEvent; import org.springframework.shell.component.view.event.MouseHandler; -import org.springframework.shell.component.view.geom.Dimension; -import org.springframework.shell.component.view.geom.HorizontalAlign; -import org.springframework.shell.component.view.geom.Rectangle; -import org.springframework.shell.component.view.geom.VerticalAlign; import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.Screen.Writer; +import org.springframework.shell.geom.Dimension; +import org.springframework.shell.geom.HorizontalAlign; +import org.springframework.shell.geom.Rectangle; +import org.springframework.shell.geom.VerticalAlign; import org.springframework.shell.style.StyleSettings; /** diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/Control.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/Control.java index 912d7a54..a9f7b640 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/Control.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/Control.java @@ -16,8 +16,8 @@ package org.springframework.shell.component.view.control; import org.springframework.lang.Nullable; -import org.springframework.shell.component.view.geom.Rectangle; import org.springframework.shell.component.view.screen.Screen; +import org.springframework.shell.geom.Rectangle; import org.springframework.shell.style.ThemeResolver; /** diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/DialogView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/DialogView.java index e80e8854..cda7859e 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/DialogView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/DialogView.java @@ -23,10 +23,10 @@ import org.springframework.shell.component.view.control.ButtonView.ButtonViewSel import org.springframework.shell.component.view.event.EventLoop; import org.springframework.shell.component.view.event.MouseHandler; import org.springframework.shell.component.view.event.MouseHandler.MouseHandlerResult; -import org.springframework.shell.component.view.geom.Rectangle; import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.Screen.Writer; +import org.springframework.shell.geom.Rectangle; import org.springframework.shell.style.StyleSettings; /** diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/GridView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/GridView.java index 2953ee42..bdebbf33 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/GridView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/GridView.java @@ -27,8 +27,8 @@ import org.slf4j.LoggerFactory; import org.springframework.shell.component.view.event.KeyHandler; import org.springframework.shell.component.view.event.MouseHandler; import org.springframework.shell.component.view.event.MouseHandler.MouseHandlerResult; -import org.springframework.shell.component.view.geom.Rectangle; import org.springframework.shell.component.view.screen.Screen; +import org.springframework.shell.geom.Rectangle; import org.springframework.util.Assert; /** diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/InputView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/InputView.java index de2cd152..f38cbfba 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/InputView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/InputView.java @@ -21,10 +21,10 @@ import java.util.stream.Collectors; import org.springframework.shell.component.view.event.KeyEvent; import org.springframework.shell.component.view.event.KeyEvent.Key; import org.springframework.shell.component.view.event.KeyHandler; -import org.springframework.shell.component.view.geom.Position; -import org.springframework.shell.component.view.geom.Rectangle; import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; +import org.springframework.shell.geom.Position; +import org.springframework.shell.geom.Rectangle; /** * {@code InputView} is used as a text input. diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ListView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ListView.java index 7a802fbd..0fe973a9 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ListView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ListView.java @@ -28,10 +28,10 @@ import org.springframework.lang.Nullable; import org.springframework.shell.component.view.control.cell.ListCell; import org.springframework.shell.component.view.event.KeyEvent.Key; import org.springframework.shell.component.view.event.MouseEvent; -import org.springframework.shell.component.view.geom.Rectangle; import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.ScreenItem; +import org.springframework.shell.geom.Rectangle; import org.springframework.shell.style.StyleSettings; import org.springframework.util.Assert; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/MenuBarView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/MenuBarView.java index 9002e813..b3416423 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/MenuBarView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/MenuBarView.java @@ -31,10 +31,10 @@ import org.springframework.shell.component.view.event.KeyEvent.Key; import org.springframework.shell.component.view.event.KeyHandler; import org.springframework.shell.component.view.event.MouseEvent; import org.springframework.shell.component.view.event.MouseHandler; -import org.springframework.shell.component.view.geom.Dimension; -import org.springframework.shell.component.view.geom.Rectangle; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.Screen.Writer; +import org.springframework.shell.geom.Dimension; +import org.springframework.shell.geom.Rectangle; import org.springframework.shell.component.view.screen.ScreenItem; import org.springframework.shell.style.StyleSettings; import org.springframework.shell.style.ThemeResolver; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/MenuView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/MenuView.java index a0346183..2cb686cb 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/MenuView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/MenuView.java @@ -28,11 +28,11 @@ import org.slf4j.LoggerFactory; import org.springframework.lang.Nullable; import org.springframework.shell.component.view.event.KeyEvent.Key; import org.springframework.shell.component.view.event.MouseEvent; -import org.springframework.shell.component.view.geom.Dimension; -import org.springframework.shell.component.view.geom.Rectangle; import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.Screen.Writer; +import org.springframework.shell.geom.Dimension; +import org.springframework.shell.geom.Rectangle; import org.springframework.shell.style.StyleSettings; import org.springframework.shell.component.view.screen.ScreenItem; import org.springframework.util.Assert; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/StatusBarView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/StatusBarView.java index f484d284..d83fb650 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/StatusBarView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/StatusBarView.java @@ -25,10 +25,10 @@ import org.slf4j.LoggerFactory; import org.springframework.shell.component.view.event.MouseEvent; import org.springframework.shell.component.view.event.MouseHandler; -import org.springframework.shell.component.view.geom.Rectangle; import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.Screen.Writer; +import org.springframework.shell.geom.Rectangle; import org.springframework.shell.style.StyleSettings; /** diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/WindowView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/WindowView.java index 1cc7a896..4fd589a8 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/WindowView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/WindowView.java @@ -15,8 +15,8 @@ */ package org.springframework.shell.component.view.control; -import org.springframework.shell.component.view.geom.Rectangle; import org.springframework.shell.component.view.screen.Screen; +import org.springframework.shell.geom.Rectangle; import org.springframework.shell.style.StyleSettings; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/cell/AbstractListCell.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/cell/AbstractListCell.java index cbc3d7ae..b48d2cb8 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/cell/AbstractListCell.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/cell/AbstractListCell.java @@ -16,9 +16,9 @@ package org.springframework.shell.component.view.control.cell; import org.springframework.shell.component.view.control.ListView.ItemStyle; -import org.springframework.shell.component.view.geom.Rectangle; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.Screen.Writer; +import org.springframework.shell.geom.Rectangle; import org.springframework.shell.style.StyleSettings; import org.springframework.util.StringUtils; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/screen/DefaultScreen.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/screen/DefaultScreen.java index b8a6986d..4e3c9a9e 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/screen/DefaultScreen.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/screen/DefaultScreen.java @@ -26,10 +26,10 @@ import org.jline.utils.AttributedStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.shell.component.view.geom.HorizontalAlign; -import org.springframework.shell.component.view.geom.Position; -import org.springframework.shell.component.view.geom.Rectangle; -import org.springframework.shell.component.view.geom.VerticalAlign; +import org.springframework.shell.geom.HorizontalAlign; +import org.springframework.shell.geom.Position; +import org.springframework.shell.geom.Rectangle; +import org.springframework.shell.geom.VerticalAlign; import org.springframework.util.Assert; /** diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/screen/Screen.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/screen/Screen.java index ebf7eed9..2eb8b56a 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/screen/Screen.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/screen/Screen.java @@ -16,10 +16,10 @@ package org.springframework.shell.component.view.screen; import org.springframework.lang.Nullable; -import org.springframework.shell.component.view.geom.HorizontalAlign; -import org.springframework.shell.component.view.geom.Position; -import org.springframework.shell.component.view.geom.Rectangle; -import org.springframework.shell.component.view.geom.VerticalAlign; +import org.springframework.shell.geom.HorizontalAlign; +import org.springframework.shell.geom.Position; +import org.springframework.shell.geom.Rectangle; +import org.springframework.shell.geom.VerticalAlign; /** * {@code Screen} is representing a virtual area which is sitting between a user diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/geom/Dimension.java b/spring-shell-core/src/main/java/org/springframework/shell/geom/Dimension.java similarity index 93% rename from spring-shell-core/src/main/java/org/springframework/shell/component/view/geom/Dimension.java rename to spring-shell-core/src/main/java/org/springframework/shell/geom/Dimension.java index 80597676..21b190f3 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/geom/Dimension.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/geom/Dimension.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.shell.component.view.geom; +package org.springframework.shell.geom; /** * Record representing dimensions {@code width} and {@code height}. diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/geom/HorizontalAlign.java b/spring-shell-core/src/main/java/org/springframework/shell/geom/HorizontalAlign.java similarity index 92% rename from spring-shell-core/src/main/java/org/springframework/shell/component/view/geom/HorizontalAlign.java rename to spring-shell-core/src/main/java/org/springframework/shell/geom/HorizontalAlign.java index fc0c3578..41532249 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/geom/HorizontalAlign.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/geom/HorizontalAlign.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.shell.component.view.geom; +package org.springframework.shell.geom; public enum HorizontalAlign { LEFT, CENTER, RIGHT, diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/geom/Position.java b/spring-shell-core/src/main/java/org/springframework/shell/geom/Position.java similarity index 92% rename from spring-shell-core/src/main/java/org/springframework/shell/component/view/geom/Position.java rename to spring-shell-core/src/main/java/org/springframework/shell/geom/Position.java index 3189713c..79d54f1c 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/geom/Position.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/geom/Position.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.shell.component.view.geom; +package org.springframework.shell.geom; /** * Record representing position {@code x} and {@code y}. diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/geom/Rectangle.java b/spring-shell-core/src/main/java/org/springframework/shell/geom/Rectangle.java similarity index 96% rename from spring-shell-core/src/main/java/org/springframework/shell/component/view/geom/Rectangle.java rename to spring-shell-core/src/main/java/org/springframework/shell/geom/Rectangle.java index 29bf4e0e..7a8bfd7e 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/geom/Rectangle.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/geom/Rectangle.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.shell.component.view.geom; +package org.springframework.shell.geom; /** * Record representing coordinates {@code x}, {@code y} and its {@code width} diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/geom/VerticalAlign.java b/spring-shell-core/src/main/java/org/springframework/shell/geom/VerticalAlign.java similarity index 92% rename from spring-shell-core/src/main/java/org/springframework/shell/component/view/geom/VerticalAlign.java rename to spring-shell-core/src/main/java/org/springframework/shell/geom/VerticalAlign.java index 4d8142b1..e3e9d521 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/geom/VerticalAlign.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/geom/VerticalAlign.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.shell.component.view.geom; +package org.springframework.shell.geom; public enum VerticalAlign { TOP, CENTER, BOTTOM diff --git a/spring-shell-core/src/test/java/org/springframework/shell/component/view/ScreenAssert.java b/spring-shell-core/src/test/java/org/springframework/shell/component/view/ScreenAssert.java index 7a73d381..131e2a76 100644 --- a/spring-shell-core/src/test/java/org/springframework/shell/component/view/ScreenAssert.java +++ b/spring-shell-core/src/test/java/org/springframework/shell/component/view/ScreenAssert.java @@ -21,10 +21,10 @@ import java.util.List; import org.assertj.core.api.AbstractAssert; import org.jline.utils.AttributedString; -import org.springframework.shell.component.view.geom.Position; import org.springframework.shell.component.view.screen.DisplayLines; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.ScreenItem; +import org.springframework.shell.geom.Position; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-shell-core/src/test/java/org/springframework/shell/component/view/ScreenAssertTests.java b/spring-shell-core/src/test/java/org/springframework/shell/component/view/ScreenAssertTests.java index a1728501..4f9300df 100644 --- a/spring-shell-core/src/test/java/org/springframework/shell/component/view/ScreenAssertTests.java +++ b/spring-shell-core/src/test/java/org/springframework/shell/component/view/ScreenAssertTests.java @@ -18,12 +18,12 @@ package org.springframework.shell.component.view; import org.assertj.core.api.AssertProvider; import org.junit.jupiter.api.Test; -import org.springframework.shell.component.view.geom.Rectangle; import org.springframework.shell.component.view.screen.Color; import org.springframework.shell.component.view.screen.DefaultScreen; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.ScreenItem; import org.springframework.shell.component.view.screen.Screen.Writer; +import org.springframework.shell.geom.Rectangle; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; diff --git a/spring-shell-core/src/test/java/org/springframework/shell/component/view/control/ListViewTests.java b/spring-shell-core/src/test/java/org/springframework/shell/component/view/control/ListViewTests.java index 2207e00d..40d53483 100644 --- a/spring-shell-core/src/test/java/org/springframework/shell/component/view/control/ListViewTests.java +++ b/spring-shell-core/src/test/java/org/springframework/shell/component/view/control/ListViewTests.java @@ -35,9 +35,9 @@ import org.springframework.shell.component.view.event.KeyHandler.KeyHandlerResul import org.springframework.shell.component.view.event.MouseEvent; import org.springframework.shell.component.view.event.MouseHandler; import org.springframework.shell.component.view.event.MouseHandler.MouseHandlerResult; -import org.springframework.shell.component.view.geom.Rectangle; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.Screen.Writer; +import org.springframework.shell.geom.Rectangle; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-shell-core/src/test/java/org/springframework/shell/component/view/geom/RectangleTests.java b/spring-shell-core/src/test/java/org/springframework/shell/component/view/geom/RectangleTests.java index 96735acc..1d5ffebb 100644 --- a/spring-shell-core/src/test/java/org/springframework/shell/component/view/geom/RectangleTests.java +++ b/spring-shell-core/src/test/java/org/springframework/shell/component/view/geom/RectangleTests.java @@ -17,6 +17,8 @@ package org.springframework.shell.component.view.geom; import org.junit.jupiter.api.Test; +import org.springframework.shell.geom.Rectangle; + import static org.assertj.core.api.Assertions.assertThat; class RectangleTests { diff --git a/spring-shell-core/src/test/java/org/springframework/shell/component/view/screen/ScreenTests.java b/spring-shell-core/src/test/java/org/springframework/shell/component/view/screen/ScreenTests.java index fd99e31f..62b56e43 100644 --- a/spring-shell-core/src/test/java/org/springframework/shell/component/view/screen/ScreenTests.java +++ b/spring-shell-core/src/test/java/org/springframework/shell/component/view/screen/ScreenTests.java @@ -18,10 +18,10 @@ package org.springframework.shell.component.view.screen; import org.junit.jupiter.api.Test; import org.springframework.shell.component.view.control.AbstractViewTests; -import org.springframework.shell.component.view.geom.HorizontalAlign; -import org.springframework.shell.component.view.geom.Rectangle; -import org.springframework.shell.component.view.geom.VerticalAlign; import org.springframework.shell.component.view.screen.Screen.Writer; +import org.springframework.shell.geom.HorizontalAlign; +import org.springframework.shell.geom.Rectangle; +import org.springframework.shell.geom.VerticalAlign; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/spring-shell-docs/src/test/java/org/springframework/shell/docs/ListViewSnippets.java b/spring-shell-docs/src/test/java/org/springframework/shell/docs/ListViewSnippets.java index 0da41145..dc0dc8db 100644 --- a/spring-shell-docs/src/test/java/org/springframework/shell/docs/ListViewSnippets.java +++ b/spring-shell-docs/src/test/java/org/springframework/shell/docs/ListViewSnippets.java @@ -20,9 +20,9 @@ import java.util.List; import org.springframework.shell.component.view.control.ListView; import org.springframework.shell.component.view.control.ListView.ItemStyle; import org.springframework.shell.component.view.control.cell.AbstractListCell; -import org.springframework.shell.component.view.geom.Rectangle; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.Screen.Writer; +import org.springframework.shell.geom.Rectangle; public class ListViewSnippets { diff --git a/spring-shell-docs/src/test/java/org/springframework/shell/docs/TerminalUiSnippets.java b/spring-shell-docs/src/test/java/org/springframework/shell/docs/TerminalUiSnippets.java index 18ecd9d0..d1786bd1 100644 --- a/spring-shell-docs/src/test/java/org/springframework/shell/docs/TerminalUiSnippets.java +++ b/spring-shell-docs/src/test/java/org/springframework/shell/docs/TerminalUiSnippets.java @@ -22,9 +22,9 @@ import org.springframework.shell.component.view.TerminalUI; import org.springframework.shell.component.view.control.BoxView; import org.springframework.shell.component.view.event.EventLoop; import org.springframework.shell.component.view.event.KeyEvent.Key; -import org.springframework.shell.component.view.geom.HorizontalAlign; -import org.springframework.shell.component.view.geom.VerticalAlign; import org.springframework.shell.component.view.message.ShellMessageBuilder; +import org.springframework.shell.geom.HorizontalAlign; +import org.springframework.shell.geom.VerticalAlign; class TerminalUiSnippets { diff --git a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/Catalog.java b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/Catalog.java index 9795bf09..8a112466 100644 --- a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/Catalog.java +++ b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/Catalog.java @@ -49,12 +49,12 @@ import org.springframework.shell.component.view.event.EventLoop; import org.springframework.shell.component.view.event.KeyEvent; import org.springframework.shell.component.view.event.KeyEvent.Key; import org.springframework.shell.component.view.event.KeyEvent.KeyMask; -import org.springframework.shell.component.view.geom.HorizontalAlign; -import org.springframework.shell.component.view.geom.Rectangle; -import org.springframework.shell.component.view.geom.VerticalAlign; import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.Screen.Writer; +import org.springframework.shell.geom.HorizontalAlign; +import org.springframework.shell.geom.Rectangle; +import org.springframework.shell.geom.VerticalAlign; import org.springframework.shell.component.view.screen.ScreenItem; import org.springframework.shell.samples.catalog.scenario.Scenario; import org.springframework.shell.samples.catalog.scenario.ScenarioComponent; diff --git a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/box/DrawFunctionScenario.java b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/box/DrawFunctionScenario.java index 0976f066..9adaed49 100644 --- a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/box/DrawFunctionScenario.java +++ b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/box/DrawFunctionScenario.java @@ -17,8 +17,8 @@ package org.springframework.shell.samples.catalog.scenario.box; import org.springframework.shell.component.view.control.BoxView; import org.springframework.shell.component.view.control.View; -import org.springframework.shell.component.view.geom.HorizontalAlign; -import org.springframework.shell.component.view.geom.VerticalAlign; +import org.springframework.shell.geom.HorizontalAlign; +import org.springframework.shell.geom.VerticalAlign; import org.springframework.shell.samples.catalog.scenario.AbstractScenario; import org.springframework.shell.samples.catalog.scenario.Scenario; import org.springframework.shell.samples.catalog.scenario.ScenarioComponent; diff --git a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/box/SimpleBoxViewScenario.java b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/box/SimpleBoxViewScenario.java index fb4ba32c..b557813b 100644 --- a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/box/SimpleBoxViewScenario.java +++ b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/box/SimpleBoxViewScenario.java @@ -17,9 +17,9 @@ package org.springframework.shell.samples.catalog.scenario.box; import org.springframework.shell.component.view.control.BoxView; import org.springframework.shell.component.view.control.View; -import org.springframework.shell.component.view.geom.HorizontalAlign; import org.springframework.shell.component.view.screen.Color; import org.springframework.shell.component.view.screen.ScreenItem; +import org.springframework.shell.geom.HorizontalAlign; import org.springframework.shell.samples.catalog.scenario.AbstractScenario; import org.springframework.shell.samples.catalog.scenario.Scenario; import org.springframework.shell.samples.catalog.scenario.ScenarioComponent; diff --git a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/other/ClockScenario.java b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/other/ClockScenario.java index 5dc89853..ab474808 100644 --- a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/other/ClockScenario.java +++ b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/other/ClockScenario.java @@ -28,12 +28,12 @@ import org.springframework.shell.component.view.control.BoxView; import org.springframework.shell.component.view.control.View; import org.springframework.shell.component.view.event.EventLoop; import org.springframework.shell.component.view.event.KeyEvent.Key; -import org.springframework.shell.component.view.geom.HorizontalAlign; -import org.springframework.shell.component.view.geom.Rectangle; -import org.springframework.shell.component.view.geom.VerticalAlign; import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.message.ShellMessageHeaderAccessor; import org.springframework.shell.component.view.message.StaticShellMessageHeaderAccessor; +import org.springframework.shell.geom.HorizontalAlign; +import org.springframework.shell.geom.Rectangle; +import org.springframework.shell.geom.VerticalAlign; import org.springframework.shell.samples.catalog.scenario.AbstractScenario; import org.springframework.shell.samples.catalog.scenario.Scenario; import org.springframework.shell.samples.catalog.scenario.ScenarioComponent; diff --git a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/other/DialogScenario.java b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/other/DialogScenario.java index d53b463c..88390b6d 100644 --- a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/other/DialogScenario.java +++ b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/other/DialogScenario.java @@ -19,8 +19,8 @@ import org.springframework.shell.component.view.control.BoxView; import org.springframework.shell.component.view.control.ButtonView; import org.springframework.shell.component.view.control.DialogView; import org.springframework.shell.component.view.control.View; -import org.springframework.shell.component.view.geom.HorizontalAlign; -import org.springframework.shell.component.view.geom.VerticalAlign; +import org.springframework.shell.geom.HorizontalAlign; +import org.springframework.shell.geom.VerticalAlign; import org.springframework.shell.samples.catalog.scenario.AbstractScenario; import org.springframework.shell.samples.catalog.scenario.Scenario; import org.springframework.shell.samples.catalog.scenario.ScenarioComponent; diff --git a/spring-shell-samples/spring-shell-sample-commands/src/main/java/org/springframework/shell/samples/standard/ComponentUiCommands.java b/spring-shell-samples/spring-shell-sample-commands/src/main/java/org/springframework/shell/samples/standard/ComponentUiCommands.java index 4dfd0491..4086b127 100644 --- a/spring-shell-samples/spring-shell-sample-commands/src/main/java/org/springframework/shell/samples/standard/ComponentUiCommands.java +++ b/spring-shell-samples/spring-shell-sample-commands/src/main/java/org/springframework/shell/samples/standard/ComponentUiCommands.java @@ -20,8 +20,8 @@ import org.springframework.shell.component.ViewComponent; import org.springframework.shell.component.view.TerminalUI; import org.springframework.shell.component.view.control.BoxView; import org.springframework.shell.component.view.control.InputView; -import org.springframework.shell.component.view.geom.HorizontalAlign; -import org.springframework.shell.component.view.geom.VerticalAlign; +import org.springframework.shell.geom.HorizontalAlign; +import org.springframework.shell.geom.VerticalAlign; import org.springframework.shell.standard.AbstractShellComponent; @Command