Moving menu model to API

cuioss · Jul 19, 2023 · 19fc376 · 19fc376
1 parent cfd7cf7
commit 19fc376
Show file tree

Hide file tree

Showing 24 changed files with 43 additions and 36 deletions.
diff --git a/...tstrap/menu/model/NavigationMenuItem.java → ...onents/model/menu/NavigationMenuItem.java b/...tstrap/menu/model/NavigationMenuItem.java → ...onents/model/menu/NavigationMenuItem.java
@@ -1,4 +1,4 @@
-package de.cuioss.jsf.bootstrap.menu.model;
+package de.cuioss.jsf.api.components.model.menu;
 
 import java.io.Serializable;
 

diff --git a/...nu/model/NavigationMenuItemContainer.java → ...del/menu/NavigationMenuItemContainer.java b/...nu/model/NavigationMenuItemContainer.java → ...del/menu/NavigationMenuItemContainer.java
@@ -1,4 +1,4 @@
-package de.cuioss.jsf.bootstrap.menu.model;
+package de.cuioss.jsf.api.components.model.menu;
 
 import java.util.List;
 

diff --git a/...odel/NavigationMenuItemContainerImpl.java → ...menu/NavigationMenuItemContainerImpl.java b/...odel/NavigationMenuItemContainerImpl.java → ...menu/NavigationMenuItemContainerImpl.java
@@ -1,4 +1,4 @@
-package de.cuioss.jsf.bootstrap.menu.model;
+package de.cuioss.jsf.api.components.model.menu;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...del/NavigationMenuItemExternalSingle.java → ...enu/NavigationMenuItemExternalSingle.java b/...del/NavigationMenuItemExternalSingle.java → ...enu/NavigationMenuItemExternalSingle.java
@@ -1,4 +1,4 @@
-package de.cuioss.jsf.bootstrap.menu.model;
+package de.cuioss.jsf.api.components.model.menu;
 
 /**
  * @author Matthias Walliczek

diff --git a/...NavigationMenuItemExternalSingleImpl.java → ...NavigationMenuItemExternalSingleImpl.java b/...NavigationMenuItemExternalSingleImpl.java → ...NavigationMenuItemExternalSingleImpl.java
@@ -1,4 +1,4 @@
-package de.cuioss.jsf.bootstrap.menu.model;
+package de.cuioss.jsf.api.components.model.menu;
 
 import javax.faces.context.FacesContext;
 

diff --git a/...ap/menu/model/NavigationMenuItemImpl.java → ...ts/model/menu/NavigationMenuItemImpl.java b/...ap/menu/model/NavigationMenuItemImpl.java → ...ts/model/menu/NavigationMenuItemImpl.java
@@ -1,4 +1,4 @@
-package de.cuioss.jsf.bootstrap.menu.model;
+package de.cuioss.jsf.api.components.model.menu;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...nu/model/NavigationMenuItemSeparator.java → ...del/menu/NavigationMenuItemSeparator.java b/...nu/model/NavigationMenuItemSeparator.java → ...del/menu/NavigationMenuItemSeparator.java
@@ -1,4 +1,4 @@
-package de.cuioss.jsf.bootstrap.menu.model;
+package de.cuioss.jsf.api.components.model.menu;
 
 /**
  * Represents menu separator. There is no need to create different instances of this class,

diff --git a/...odel/NavigationMenuItemSeparatorImpl.java → ...menu/NavigationMenuItemSeparatorImpl.java b/...odel/NavigationMenuItemSeparatorImpl.java → ...menu/NavigationMenuItemSeparatorImpl.java
@@ -1,4 +1,4 @@
-package de.cuioss.jsf.bootstrap.menu.model;
+package de.cuioss.jsf.api.components.model.menu;
 
 import lombok.EqualsAndHashCode;
 import lombok.ToString;

diff --git a/.../menu/model/NavigationMenuItemSingle.java → .../model/menu/NavigationMenuItemSingle.java b/.../menu/model/NavigationMenuItemSingle.java → .../model/menu/NavigationMenuItemSingle.java
@@ -1,4 +1,4 @@
-package de.cuioss.jsf.bootstrap.menu.model;
+package de.cuioss.jsf.api.components.model.menu;
 
 import java.util.Map;
 

diff --git a/...u/model/NavigationMenuItemSingleImpl.java → ...el/menu/NavigationMenuItemSingleImpl.java b/...u/model/NavigationMenuItemSingleImpl.java → ...el/menu/NavigationMenuItemSingleImpl.java
@@ -1,4 +1,4 @@
-package de.cuioss.jsf.bootstrap.menu.model;
+package de.cuioss.jsf.api.components.model.menu;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...nu/model/NavigationMenuLabelProvider.java → ...del/menu/NavigationMenuLabelProvider.java b/...nu/model/NavigationMenuLabelProvider.java → ...del/menu/NavigationMenuLabelProvider.java
@@ -1,4 +1,4 @@
-package de.cuioss.jsf.bootstrap.menu.model;
+package de.cuioss.jsf.api.components.model.menu;
 
 /**
  * @author Sven Haag

diff --git a/...sf/bootstrap/menu/model/package-info.java → ...i/components/model/menu/package-info.java b/...sf/bootstrap/menu/model/package-info.java → ...i/components/model/menu/package-info.java
@@ -4,4 +4,4 @@
  * @author Oliver Wolff
  *
  */
-package de.cuioss.jsf.bootstrap.menu.model;
+package de.cuioss.jsf.api.components.model.menu;
diff --git a/.../NavigationMenuItemContainerImplTest.java → .../NavigationMenuItemContainerImplTest.java b/.../NavigationMenuItemContainerImplTest.java → .../NavigationMenuItemContainerImplTest.java
@@ -1,5 +1,6 @@
-package de.cuioss.jsf.bootstrap.menu.model;
+package de.cuioss.jsf.api.components.model.menu;
 
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemContainerImpl;
 import de.cuioss.test.valueobjects.ValueObjectTest;
 import de.cuioss.test.valueobjects.api.contracts.VerifyConstructor;
 import de.cuioss.test.valueobjects.api.generator.PropertyGenerator;

diff --git a/...nu/model/NavigationMenuItemGenerator.java → ...del/menu/NavigationMenuItemGenerator.java b/...nu/model/NavigationMenuItemGenerator.java → ...del/menu/NavigationMenuItemGenerator.java
@@ -1,9 +1,13 @@
-package de.cuioss.jsf.bootstrap.menu.model;
+package de.cuioss.jsf.api.components.model.menu;
 
 import static de.cuioss.tools.collect.CollectionLiterals.immutableList;
 
 import java.util.List;
 
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItem;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemContainerImpl;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemSeparatorImpl;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemSingleImpl;
 import de.cuioss.test.generator.Generators;
 import de.cuioss.test.generator.TypedGenerator;
 

diff --git a/.../NavigationMenuItemSeparatorImplTest.java → .../NavigationMenuItemSeparatorImplTest.java b/.../NavigationMenuItemSeparatorImplTest.java → .../NavigationMenuItemSeparatorImplTest.java
@@ -1,5 +1,6 @@
-package de.cuioss.jsf.bootstrap.menu.model;
+package de.cuioss.jsf.api.components.model.menu;
 
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemSeparatorImpl;
 import de.cuioss.test.valueobjects.ValueObjectTest;
 import de.cuioss.test.valueobjects.api.contracts.VerifyConstructor;
 import de.cuioss.test.valueobjects.api.generator.PropertyGenerator;

diff --git a/...del/NavigationMenuItemSingleImplTest.java → ...enu/NavigationMenuItemSingleImplTest.java b/...del/NavigationMenuItemSingleImplTest.java → ...enu/NavigationMenuItemSingleImplTest.java
@@ -1,5 +1,6 @@
-package de.cuioss.jsf.bootstrap.menu.model;
+package de.cuioss.jsf.api.components.model.menu;
 
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemSingleImpl;
 import de.cuioss.test.valueobjects.ValueObjectTest;
 import de.cuioss.test.valueobjects.api.contracts.VerifyConstructor;
 import de.cuioss.test.valueobjects.api.generator.PropertyGenerator;

diff --git a/...cui-jsf-bootstrap/src/main/java/de/cuioss/jsf/bootstrap/menu/NavigationMenuComponent.java b/...cui-jsf-bootstrap/src/main/java/de/cuioss/jsf/bootstrap/menu/NavigationMenuComponent.java
@@ -8,13 +8,13 @@
 import javax.faces.component.FacesComponent;
 
 import de.cuioss.jsf.api.components.base.AbstractBaseCuiComponent;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItem;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemContainer;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemSeparator;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemSingle;
 import de.cuioss.jsf.api.components.partial.ModelProvider;
 import de.cuioss.jsf.api.components.util.CuiState;
 import de.cuioss.jsf.bootstrap.BootstrapFamily;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItem;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemContainer;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemSeparator;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemSingle;
 
 /**
  * Holder of bootstrap conform navigation menu component model.

diff --git a/...bootstrap/src/main/java/de/cuioss/jsf/bootstrap/menu/NavigationMenuContainerRenderer.java b/...bootstrap/src/main/java/de/cuioss/jsf/bootstrap/menu/NavigationMenuContainerRenderer.java
@@ -9,12 +9,12 @@
 
 import de.cuioss.jsf.api.components.html.AttributeName;
 import de.cuioss.jsf.api.components.html.Node;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemContainer;
 import de.cuioss.jsf.api.components.renderer.DecoratingResponseWriter;
 import de.cuioss.jsf.bootstrap.BootstrapFamily;
 import de.cuioss.jsf.bootstrap.CssBootstrap;
 import de.cuioss.jsf.bootstrap.CssCuiBootstrap;
 import de.cuioss.jsf.bootstrap.icon.IconComponent;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemContainer;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 

diff --git a/...trap/src/main/java/de/cuioss/jsf/bootstrap/menu/NavigationMenuExternalSingleRenderer.java b/...trap/src/main/java/de/cuioss/jsf/bootstrap/menu/NavigationMenuExternalSingleRenderer.java
@@ -9,12 +9,12 @@
 
 import de.cuioss.jsf.api.components.html.AttributeName;
 import de.cuioss.jsf.api.components.html.Node;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemExternalSingle;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemSingle;
 import de.cuioss.jsf.api.components.renderer.DecoratingResponseWriter;
 import de.cuioss.jsf.bootstrap.BootstrapFamily;
 import de.cuioss.jsf.bootstrap.CssCuiBootstrap;
 import de.cuioss.jsf.bootstrap.icon.IconComponent;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemExternalSingle;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemSingle;
 import lombok.experimental.UtilityClass;
 
 /**

diff --git a/.../cui-jsf-bootstrap/src/main/java/de/cuioss/jsf/bootstrap/menu/NavigationMenuRenderer.java b/.../cui-jsf-bootstrap/src/main/java/de/cuioss/jsf/bootstrap/menu/NavigationMenuRenderer.java
@@ -7,14 +7,14 @@
 import javax.faces.render.FacesRenderer;
 import javax.faces.render.Renderer;
 
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItem;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemContainer;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemExternalSingle;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemSeparator;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemSingle;
 import de.cuioss.jsf.api.components.renderer.BaseDecoratorRenderer;
 import de.cuioss.jsf.api.components.renderer.DecoratingResponseWriter;
 import de.cuioss.jsf.bootstrap.BootstrapFamily;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItem;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemContainer;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemExternalSingle;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemSeparator;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemSingle;
 import de.cuioss.tools.string.Joiner;
 
 /**

diff --git a/...bootstrap/src/main/java/de/cuioss/jsf/bootstrap/menu/NavigationMenuSeparatorRenderer.java b/...bootstrap/src/main/java/de/cuioss/jsf/bootstrap/menu/NavigationMenuSeparatorRenderer.java
@@ -5,9 +5,9 @@
 import javax.faces.render.Renderer;
 
 import de.cuioss.jsf.api.components.html.Node;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemSeparator;
 import de.cuioss.jsf.api.components.renderer.DecoratingResponseWriter;
 import de.cuioss.jsf.bootstrap.CssBootstrap;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemSeparator;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 

diff --git a/...sf-bootstrap/src/main/java/de/cuioss/jsf/bootstrap/menu/NavigationMenuSingleRenderer.java b/...sf-bootstrap/src/main/java/de/cuioss/jsf/bootstrap/menu/NavigationMenuSingleRenderer.java
@@ -11,11 +11,11 @@
 
 import de.cuioss.jsf.api.components.html.AttributeName;
 import de.cuioss.jsf.api.components.html.Node;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemSingle;
 import de.cuioss.jsf.api.components.renderer.DecoratingResponseWriter;
 import de.cuioss.jsf.bootstrap.BootstrapFamily;
 import de.cuioss.jsf.bootstrap.CssCuiBootstrap;
 import de.cuioss.jsf.bootstrap.icon.IconComponent;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemSingle;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 

diff --git a/...jsf-bootstrap/src/test/java/de/cuioss/jsf/bootstrap/menu/NavigationMenuComponentTest.java b/...jsf-bootstrap/src/test/java/de/cuioss/jsf/bootstrap/menu/NavigationMenuComponentTest.java
@@ -8,7 +8,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemSingleImpl;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemSingleImpl;
 import de.cuioss.jsf.test.CoreJsfTestConfiguration;
 import de.cuioss.test.jsf.component.AbstractUiComponentTest;
 import de.cuioss.test.jsf.config.JsfTestConfiguration;

diff --git a/...-jsf-bootstrap/src/test/java/de/cuioss/jsf/bootstrap/menu/NavigationMenuRendererTest.java b/...-jsf-bootstrap/src/test/java/de/cuioss/jsf/bootstrap/menu/NavigationMenuRendererTest.java
@@ -14,16 +14,16 @@
 import de.cuioss.jsf.api.components.html.AttributeName;
 import de.cuioss.jsf.api.components.html.HtmlTreeBuilder;
 import de.cuioss.jsf.api.components.html.Node;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemContainer;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemContainerImpl;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemExternalSingleImpl;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemSeparatorImpl;
+import de.cuioss.jsf.api.components.model.menu.NavigationMenuItemSingleImpl;
 import de.cuioss.jsf.api.components.partial.IconProvider;
 import de.cuioss.jsf.bootstrap.CssBootstrap;
 import de.cuioss.jsf.bootstrap.CssCuiBootstrap;
 import de.cuioss.jsf.bootstrap.icon.IconComponent;
 import de.cuioss.jsf.bootstrap.icon.IconRenderer;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemContainer;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemContainerImpl;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemExternalSingleImpl;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemSeparatorImpl;
-import de.cuioss.jsf.bootstrap.menu.model.NavigationMenuItemSingleImpl;
 import de.cuioss.jsf.test.CoreJsfTestConfiguration;
 import de.cuioss.test.jsf.config.ComponentConfigurator;
 import de.cuioss.test.jsf.config.JsfTestConfiguration;