From 5e40ac3815e1830d23f1ca9ae95809a13360f175 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Sun, 6 Aug 2023 12:57:34 +0100
Subject: [PATCH] Move AbstractControl one level up

- Relates #813
---
 .../component/view/control/{cell => }/AbstractControl.java     | 3 +--
 .../shell/component/view/control/AbstractView.java             | 1 -
 .../shell/component/view/control/cell/AbstractCell.java        | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename spring-shell-core/src/main/java/org/springframework/shell/component/view/control/{cell => }/AbstractControl.java (97%)

diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/cell/AbstractControl.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AbstractControl.java
similarity index 97%
rename from spring-shell-core/src/main/java/org/springframework/shell/component/view/control/cell/AbstractControl.java
rename to spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AbstractControl.java
index 1c7abf9a..592fbb8a 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/cell/AbstractControl.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AbstractControl.java
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.shell.component.view.control.cell;
+package org.springframework.shell.component.view.control;
 
 import java.util.Optional;
 
 import org.jline.utils.AttributedStyle;
 
 import org.springframework.lang.Nullable;
-import org.springframework.shell.component.view.control.Control;
 import org.springframework.shell.component.view.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 0cfa6ad6..2b95faf1 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
@@ -27,7 +27,6 @@ import reactor.core.Disposables;
 
 import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
-import org.springframework.shell.component.view.control.cell.AbstractControl;
 import org.springframework.shell.component.view.event.EventLoop;
 import org.springframework.shell.component.view.event.KeyBindingConsumer;
 import org.springframework.shell.component.view.event.KeyBindingConsumerArgs;
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/cell/AbstractCell.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/cell/AbstractCell.java
index 8413cbd3..3e9f3eca 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/cell/AbstractCell.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/cell/AbstractCell.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.shell.component.view.control.cell;
 
+import org.springframework.shell.component.view.control.AbstractControl;
 import org.springframework.shell.component.view.control.Cell;
 
 public abstract class AbstractCell<T> extends AbstractControl implements Cell<T> {