You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/04/07 06:32:47 UTC
[isis] branch master updated: ISIS-2994: remove the '3' in bootstrap class/package names (2)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new e90f376347 ISIS-2994: remove the '3' in bootstrap class/package names (2)
e90f376347 is described below
commit e90f37634778345172b2c5b3f621fd89e3e053ff
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 7 08:32:41 2022 +0200
ISIS-2994: remove the '3' in bootstrap class/package names (2)
---
.../layout/{bs3/BS3GridPanel.html => bs/BSGridPanel.html} | 0
.../layout/{bs3/BS3GridPanel.java => bs/BSGridPanel.java} | 12 ++++++------
.../Bs3GridPanelFactory.java => bs/BSGridPanelFactory.java} | 12 ++++++------
.../ui/components/layout/{bs3 => bs}/clearfix/ClearFix.html | 0
.../ui/components/layout/{bs3 => bs}/clearfix/ClearFix.java | 2 +-
.../wicket/ui/components/layout/{bs3 => bs}/col/Col.html | 0
.../wicket/ui/components/layout/{bs3 => bs}/col/Col.java | 6 +++---
.../col/RepeatingViewWithDynamicallyVisibleContent.java | 2 +-
.../wicket/ui/components/layout/{bs3 => bs}/row/Row.html | 0
.../wicket/ui/components/layout/{bs3 => bs}/row/Row.java | 8 ++++----
.../ui/components/layout/{bs3 => bs}/tabs/TabGroupPanel.java | 2 +-
.../ui/components/layout/{bs3 => bs}/tabs/TabPanel.html | 0
.../ui/components/layout/{bs3 => bs}/tabs/TabPanel.java | 6 +++---
.../ui/components/widgets/linkandlabel/ActionLink.java | 4 ++--
.../wicket/ui/panels/HasDynamicallyVisibleContent.java | 4 ++--
.../components/ComponentFactoryRegistrarDefault.java | 4 ++--
16 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.html
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.html
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.java
similarity index 87%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.java
index 7eaf402e1e..8c42739921 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.components.layout.bs3;
+package org.apache.isis.viewer.wicket.ui.components.layout.bs;
import java.util.Optional;
@@ -32,13 +32,13 @@ import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionMixedIn;
import org.apache.isis.core.metamodel.util.Facets;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.viewer.wicket.ui.components.layout.bs3.row.Row;
+import org.apache.isis.viewer.wicket.ui.components.layout.bs.row.Row;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
import lombok.val;
-public class BS3GridPanel
+public class BSGridPanel
extends PanelAbstract<ManagedObject, EntityModel> {
private static final long serialVersionUID = 1L;
@@ -47,7 +47,7 @@ extends PanelAbstract<ManagedObject, EntityModel> {
private final BSGrid bs3Page;
- public static Optional<BS3GridPanel> extraContentForMixin(final String id, final ActionModel actionModel) {
+ public static Optional<BSGridPanel> extraContentForMixin(final String id, final ActionModel actionModel) {
final ObjectAction action = actionModel.getAction();
if(action instanceof ObjectActionMixedIn) {
final ObjectActionMixedIn actionMixedIn = (ObjectActionMixedIn) action;
@@ -61,7 +61,7 @@ extends PanelAbstract<ManagedObject, EntityModel> {
val commonContext = actionModel.getCommonContext();
val entityModelForMixin =
EntityModel.ofAdapter(commonContext, targetAdapterForMixin);
- return new BS3GridPanel(id, entityModelForMixin, bs3Grid);
+ return new BSGridPanel(id, entityModelForMixin, bs3Grid);
});
}
@@ -70,7 +70,7 @@ extends PanelAbstract<ManagedObject, EntityModel> {
}
- public BS3GridPanel(final String id, final EntityModel entityModel, final BSGrid bs3Grid) {
+ public BSGridPanel(final String id, final EntityModel entityModel, final BSGrid bs3Grid) {
super(id, entityModel);
this.bs3Page = bs3Grid;
buildGui();
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Bs3GridPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanelFactory.java
similarity index 85%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Bs3GridPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanelFactory.java
index 9dc336ce84..0ef1d43d22 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Bs3GridPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanelFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.components.layout.bs3;
+package org.apache.isis.viewer.wicket.ui.components.layout.bs;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
@@ -30,14 +30,14 @@ import org.apache.isis.viewer.wicket.ui.components.entity.EntityComponentFactory
import lombok.val;
/**
- * {@link ComponentFactory} for {@link BS3GridPanel}.
+ * {@link ComponentFactory} for {@link BSGridPanel}.
*/
-public class Bs3GridPanelFactory extends EntityComponentFactoryAbstract {
+public class BSGridPanelFactory extends EntityComponentFactoryAbstract {
private static final long serialVersionUID = 1L;
- public Bs3GridPanelFactory() {
- super(ComponentType.ENTITY, BS3GridPanel.class);
+ public BSGridPanelFactory() {
+ super(ComponentType.ENTITY, BSGridPanel.class);
}
@Override protected ApplicationAdvice appliesTo(final IModel<?> model) {
@@ -59,7 +59,7 @@ public class Bs3GridPanelFactory extends EntityComponentFactoryAbstract {
val objectSpec = entityModel.getTypeOfSpecification();
return Facets.bootstrapGrid(objectSpec, objectAdapter)
- .map(grid->new BS3GridPanel(id, entityModel, grid))
+ .map(grid->new BSGridPanel(id, entityModel, grid))
.orElseThrow(); // empty case guarded against by appliesTo(...) above
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/clearfix/ClearFix.html
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/clearfix/ClearFix.html
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/clearfix/ClearFix.java
similarity index 96%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/clearfix/ClearFix.java
index 042d401a62..095f7c8843 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/clearfix/ClearFix.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.components.layout.bs3.clearfix;
+package org.apache.isis.viewer.wicket.ui.components.layout.bs.clearfix;
import org.apache.wicket.markup.html.WebMarkupContainer;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/col/Col.html
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/col/Col.html
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/col/Col.java
similarity index 98%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/col/Col.java
index a55668ead1..ed7010af18 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/col/Col.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.components.layout.bs3.col;
+package org.apache.isis.viewer.wicket.ui.components.layout.bs.col;
import java.util.List;
import java.util.function.Predicate;
@@ -43,8 +43,8 @@ import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.AdditionalLinksPanel;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.LinkAndLabelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.fieldset.PropertyGroup;
-import org.apache.isis.viewer.wicket.ui.components.layout.bs3.row.Row;
-import org.apache.isis.viewer.wicket.ui.components.layout.bs3.tabs.TabGroupPanel;
+import org.apache.isis.viewer.wicket.ui.components.layout.bs.row.Row;
+import org.apache.isis.viewer.wicket.ui.components.layout.bs.tabs.TabGroupPanel;
import org.apache.isis.viewer.wicket.ui.panels.HasDynamicallyVisibleContent;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.WktComponents;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/RepeatingViewWithDynamicallyVisibleContent.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/col/RepeatingViewWithDynamicallyVisibleContent.java
similarity index 96%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/RepeatingViewWithDynamicallyVisibleContent.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/col/RepeatingViewWithDynamicallyVisibleContent.java
index a276132748..b7ff9eab2f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/RepeatingViewWithDynamicallyVisibleContent.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/col/RepeatingViewWithDynamicallyVisibleContent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.components.layout.bs3.col;
+package org.apache.isis.viewer.wicket.ui.components.layout.bs.col;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/row/Row.html
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/row/Row.html
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/row/Row.java
similarity index 91%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/row/Row.java
index 91d698a047..887ecd4e7c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/row/Row.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.components.layout.bs3.row;
+package org.apache.isis.viewer.wicket.ui.components.layout.bs.row;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -26,9 +26,9 @@ import org.apache.isis.applib.layout.grid.bootstrap.BSRow;
import org.apache.isis.applib.layout.grid.bootstrap.BSRowContent;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.viewer.wicket.ui.components.layout.bs3.clearfix.ClearFix;
-import org.apache.isis.viewer.wicket.ui.components.layout.bs3.col.Col;
-import org.apache.isis.viewer.wicket.ui.components.layout.bs3.col.RepeatingViewWithDynamicallyVisibleContent;
+import org.apache.isis.viewer.wicket.ui.components.layout.bs.clearfix.ClearFix;
+import org.apache.isis.viewer.wicket.ui.components.layout.bs.col.Col;
+import org.apache.isis.viewer.wicket.ui.components.layout.bs.col.RepeatingViewWithDynamicallyVisibleContent;
import org.apache.isis.viewer.wicket.ui.panels.HasDynamicallyVisibleContent;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.WktComponents;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java
similarity index 98%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java
index 36ea072345..888e8aed7f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.components.layout.bs3.tabs;
+package org.apache.isis.viewer.wicket.ui.components.layout.bs.tabs;
import java.util.ArrayList;
import java.util.List;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.html
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.html
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.java
similarity index 93%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.java
index 6cc79207f4..670698bcfa 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.components.layout.bs3.tabs;
+package org.apache.isis.viewer.wicket.ui.components.layout.bs.tabs;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -25,8 +25,8 @@ import org.apache.isis.applib.layout.grid.bootstrap.BSTab;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.viewer.wicket.model.hints.HasUiHintDisambiguator;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.viewer.wicket.ui.components.layout.bs3.col.RepeatingViewWithDynamicallyVisibleContent;
-import org.apache.isis.viewer.wicket.ui.components.layout.bs3.row.Row;
+import org.apache.isis.viewer.wicket.ui.components.layout.bs.col.RepeatingViewWithDynamicallyVisibleContent;
+import org.apache.isis.viewer.wicket.ui.components.layout.bs.row.Row;
import org.apache.isis.viewer.wicket.ui.panels.HasDynamicallyVisibleContent;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.WktComponents;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
index 73bfaf31f9..1f3f0823ad 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
@@ -42,7 +42,7 @@ import org.apache.isis.viewer.wicket.model.util.PageParameterUtils;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.components.actions.ActionParametersPanel;
-import org.apache.isis.viewer.wicket.ui.components.layout.bs3.BS3GridPanel;
+import org.apache.isis.viewer.wicket.ui.components.layout.bs.BSGridPanel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FrameFragment;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.isis.viewer.wicket.ui.panels.FormExecutorDefault;
@@ -231,7 +231,7 @@ extends IndicatingAjaxLink<ManagedObject> {
castTo(ActionPromptWithExtraContent.class, actionPrompt)
.ifPresent(promptWithExtraContent->{
- BS3GridPanel.extraContentForMixin(promptWithExtraContent.getExtraContentId(), actionModel)
+ BSGridPanel.extraContentForMixin(promptWithExtraContent.getExtraContentId(), actionModel)
.ifPresent(gridPanel->promptWithExtraContent.setExtraContentPanel(gridPanel, target));
});
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java
index da67f4be90..771005083b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java
@@ -18,14 +18,14 @@
*/
package org.apache.isis.viewer.wicket.ui.panels;
-import org.apache.isis.viewer.wicket.ui.components.layout.bs3.col.Col;
+import org.apache.isis.viewer.wicket.ui.components.layout.bs.col.Col;
/**
* Implemented by all Wicket UI components that contain other content which may or
* may not be visible, eg per user, or per imperative hideXxx() method.
*
* <p>
- * The {@link Col}, {@link org.apache.isis.viewer.wicket.ui.components.layout.bs3.row.Row} etc components that implement this interface cascade their visibility up to their parent component; so for example if a tabpanel contains a tab that contains a single fieldset that contains a single property, and that property is invisible, then the entire tab is invisible.
+ * The {@link Col}, {@link org.apache.isis.viewer.wicket.ui.components.layout.bs.row.Row} etc components that implement this interface cascade their visibility up to their parent component; so for example if a tabpanel contains a tab that contains a single fieldset that contains a single property, and that property is invisible, then the entire tab is invisible.
* </p>
*/
public interface HasDynamicallyVisibleContent {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
index b8e774c63c..910d070049 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
@@ -58,7 +58,7 @@ import org.apache.isis.viewer.wicket.ui.components.entity.icontitle.EntityIconAn
import org.apache.isis.viewer.wicket.ui.components.entity.icontitle.EntityIconTitleAndCopyLinkPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.footer.FooterPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.header.HeaderPanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.layout.bs3.Bs3GridPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.layout.bs.BSGridPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.property.PropertyEditFormPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.property.PropertyEditPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.ComponentFactoryScalarAbstract;
@@ -178,7 +178,7 @@ public class ComponentFactoryRegistrarDefault implements ComponentFactoryRegistr
protected void addComponentFactoriesForEntity(final ComponentFactoryList componentFactories) {
// top level
- componentFactories.add(new Bs3GridPanelFactory());
+ componentFactories.add(new BSGridPanelFactory());
// lower-level
componentFactories.add(new EntityIconAndTitlePanelFactory());