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:36:47 UTC
[isis] branch master updated: ISIS-2994: remove the '3' in bootstrap class/package names (3)
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 02d33d540f ISIS-2994: remove the '3' in bootstrap class/package names (3)
02d33d540f is described below
commit 02d33d540f5738510a281f3ed1aa2410c5deabdc
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 7 08:36:40 2022 +0200
ISIS-2994: remove the '3' in bootstrap class/package names (3)
---
.../isis/applib/layout/grid/bootstrap/BSGrid.java | 162 ++++++++++-----------
.../isis/applib/layout/grid/bootstrap/BSTab.java | 8 +-
.../applib/layout/grid/bootstrap/package-info.java | 2 +-
.../layout/menubars/bootstrap/BSMenuBars.java | 36 ++---
.../BS3ColTest.java => bootstrap/BSColTest.java} | 32 ++--
.../{bootstrap3 => bootstrap}/SizeSpanTest.java | 2 +-
.../BSMenuBars_roundtrip_Test.java} | 4 +-
.../bootstrap3/GridSystemServiceBootstrap.java | 60 ++++----
.../services/grid/bootstrap3/_GridModel.java | 66 ++++-----
.../services/grid/GridXmlRoundtripTest.java | 28 ++--
.../javafx/ui/components/object/ObjectViewFx.java | 6 +-
.../vaadin/ui/components/object/ObjectViewVaa.java | 6 +-
.../common/model/gridlayout/UiGridLayout.java | 32 ++--
.../restfulobjects/applib/RestfulMediaType.java | 8 +-
.../serviceactions/ServiceActionsPanel.java | 2 +-
.../serviceactions/TertiaryActionsPanel.java | 2 +-
.../ui/components/layout/bs/BSGridPanel.java | 16 +-
.../ui/components/layout/bs/clearfix/ClearFix.java | 10 +-
.../wicket/ui/components/layout/bs/col/Col.java | 42 +++---
.../wicket/ui/components/layout/bs/row/Row.java | 22 +--
.../components/layout/bs/tabs/TabGroupPanel.java | 16 +-
.../ui/components/layout/bs/tabs/TabPanel.java | 26 ++--
22 files changed, 294 insertions(+), 294 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/BSGrid.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/BSGrid.java
index 9ce2131067..f050a2794f 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/BSGrid.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/BSGrid.java
@@ -114,88 +114,88 @@ public class BSGrid extends GridAbstract implements BSElement, Dto, BSRowOwner {
public interface Visitor extends Grid.Visitor {
- void preVisit(final BSGrid bs3Grid);
- void visit(final BSGrid bs3Grid);
- void postVisit(final BSGrid bs3Grid);
- void preVisit(final BSRow bs3Row);
- void visit(final BSRow bs3Row);
- void postVisit(final BSRow bs3Row);
- void preVisit(final BSCol bs3Col);
- void visit(final BSCol bs3Col);
- void postVisit(final BSCol bs3Col);
- void visit(final BSClearFix bs3ClearFix);
- void preVisit(final BSTabGroup bs3TabGroup);
- void visit(final BSTabGroup bs3TabGroup);
- void postVisit(final BSTabGroup bs3TabGroup);
- void preVisit(final BSTab bs3Tab);
- void visit(final BSTab bs3Tab);
- void postVisit(final BSTab bs3Tab);
+ void preVisit(final BSGrid bsGrid);
+ void visit(final BSGrid bsGrid);
+ void postVisit(final BSGrid bsGrid);
+ void preVisit(final BSRow bsRow);
+ void visit(final BSRow bsRow);
+ void postVisit(final BSRow bsRow);
+ void preVisit(final BSCol bsCol);
+ void visit(final BSCol bsCol);
+ void postVisit(final BSCol bsCol);
+ void visit(final BSClearFix bsClearFix);
+ void preVisit(final BSTabGroup bsTabGroup);
+ void visit(final BSTabGroup bsTabGroup);
+ void postVisit(final BSTabGroup bsTabGroup);
+ void preVisit(final BSTab bsTab);
+ void visit(final BSTab bsTab);
+ void postVisit(final BSTab bsTab);
}
public static class VisitorAdapter extends Grid.VisitorAdapter implements Visitor {
- @Override public void preVisit(final BSGrid bs3Grid) { }
- @Override public void visit(final BSGrid bs3Grid) { }
- @Override public void postVisit(final BSGrid bs3Grid) { }
+ @Override public void preVisit(final BSGrid bsGrid) { }
+ @Override public void visit(final BSGrid bsGrid) { }
+ @Override public void postVisit(final BSGrid bsGrid) { }
- @Override public void preVisit(final BSRow bs3Row) { }
- @Override public void visit(final BSRow bs3Row) { }
- @Override public void postVisit(final BSRow bs3Row) { }
+ @Override public void preVisit(final BSRow bsRow) { }
+ @Override public void visit(final BSRow bsRow) { }
+ @Override public void postVisit(final BSRow bsRow) { }
- @Override public void preVisit(final BSCol bs3Col) { }
- @Override public void visit(final BSCol bs3Col) { }
- @Override public void postVisit(final BSCol bs3Col) { }
+ @Override public void preVisit(final BSCol bsCol) { }
+ @Override public void visit(final BSCol bsCol) { }
+ @Override public void postVisit(final BSCol bsCol) { }
- @Override public void visit(final BSClearFix bs3ClearFix) { }
+ @Override public void visit(final BSClearFix bsClearFix) { }
- @Override public void preVisit(final BSTabGroup bs3TabGroup) { }
- @Override public void visit(final BSTabGroup bs3TabGroup) { }
- @Override public void postVisit(final BSTabGroup bs3TabGroup) { }
+ @Override public void preVisit(final BSTabGroup bsTabGroup) { }
+ @Override public void visit(final BSTabGroup bsTabGroup) { }
+ @Override public void postVisit(final BSTabGroup bsTabGroup) { }
- @Override public void preVisit(final BSTab bs3Tab) { }
- @Override public void visit(final BSTab bs3Tab) { }
- @Override public void postVisit(final BSTab bs3Tab) { }
+ @Override public void preVisit(final BSTab bsTab) { }
+ @Override public void visit(final BSTab bsTab) { }
+ @Override public void postVisit(final BSTab bsTab) { }
}
@Override
public void visit(final Grid.Visitor visitor) {
- final BSGrid.Visitor bs3Visitor = asBs3Visitor(visitor);
- bs3Visitor.preVisit(this);
- bs3Visitor.visit(this);
+ final BSGrid.Visitor bsVisitor = asBs3Visitor(visitor);
+ bsVisitor.preVisit(this);
+ bsVisitor.visit(this);
traverseRows(this, visitor);
- bs3Visitor.postVisit(this);
+ bsVisitor.postVisit(this);
}
protected void traverseRows(final BSRowOwner rowOwner, final Grid.Visitor visitor) {
- final BSGrid.Visitor bs3Visitor = asBs3Visitor(visitor);
+ final BSGrid.Visitor bsVisitor = asBs3Visitor(visitor);
final List<BSRow> rows = rowOwner.getRows();
- for (BSRow bs3Row : new ArrayList<>(rows)) {
- bs3Row.setOwner(this);
- bs3Visitor.preVisit(bs3Row);
- bs3Visitor.visit(bs3Row);
- traverseCols(visitor, bs3Row);
- bs3Visitor.postVisit(bs3Row);
+ for (BSRow bsRow : new ArrayList<>(rows)) {
+ bsRow.setOwner(this);
+ bsVisitor.preVisit(bsRow);
+ bsVisitor.visit(bsRow);
+ traverseCols(visitor, bsRow);
+ bsVisitor.postVisit(bsRow);
}
}
- private void traverseCols(final Grid.Visitor visitor, final BSRow bs3Row) {
- final BSGrid.Visitor bs3Visitor = asBs3Visitor(visitor);
- final List<BSRowContent> cols = bs3Row.getCols();
+ private void traverseCols(final Grid.Visitor visitor, final BSRow bsRow) {
+ final BSGrid.Visitor bsVisitor = asBs3Visitor(visitor);
+ final List<BSRowContent> cols = bsRow.getCols();
for (BSRowContent rowContent : new ArrayList<>(cols)) {
- rowContent.setOwner(bs3Row);
+ rowContent.setOwner(bsRow);
if(rowContent instanceof BSCol) {
- final BSCol bs3Col = (BSCol) rowContent;
- bs3Visitor.preVisit(bs3Col);
- bs3Visitor.visit(bs3Col);
- traverseDomainObject(bs3Col, visitor);
- traverseTabGroups(bs3Col, visitor);
- traverseActions(bs3Col, visitor);
- traverseFieldSets(bs3Col, visitor);
- traverseCollections(bs3Col, visitor);
- traverseRows(bs3Col, visitor);
- bs3Visitor.postVisit(bs3Col);
+ final BSCol bsCol = (BSCol) rowContent;
+ bsVisitor.preVisit(bsCol);
+ bsVisitor.visit(bsCol);
+ traverseDomainObject(bsCol, visitor);
+ traverseTabGroups(bsCol, visitor);
+ traverseActions(bsCol, visitor);
+ traverseFieldSets(bsCol, visitor);
+ traverseCollections(bsCol, visitor);
+ traverseRows(bsCol, visitor);
+ bsVisitor.postVisit(bsCol);
} else if (rowContent instanceof BSClearFix) {
- final BSClearFix bs3ClearFix = (BSClearFix) rowContent;
- bs3Visitor.visit(bs3ClearFix);
+ final BSClearFix bsClearFix = (BSClearFix) rowContent;
+ bsVisitor.visit(bsClearFix);
} else {
throw new IllegalStateException(
"Unrecognized implementation of BSRowContent, " + rowContent);
@@ -203,40 +203,40 @@ public class BSGrid extends GridAbstract implements BSElement, Dto, BSRowOwner {
}
}
- private void traverseDomainObject(final BSCol bs3Col, final Grid.Visitor visitor) {
- final DomainObjectLayoutData domainObject = bs3Col.getDomainObject();
+ private void traverseDomainObject(final BSCol bsCol, final Grid.Visitor visitor) {
+ final DomainObjectLayoutData domainObject = bsCol.getDomainObject();
if(domainObject == null) {
return;
}
- domainObject.setOwner(bs3Col);
+ domainObject.setOwner(bsCol);
visitor.visit(domainObject);
}
private void traverseTabGroups(
- final BSTabGroupOwner bs3TabGroupOwner,
+ final BSTabGroupOwner bsTabGroupOwner,
final Grid.Visitor visitor) {
- final BSGrid.Visitor bs3Visitor = asBs3Visitor(visitor);
- final List<BSTabGroup> tabGroups = bs3TabGroupOwner.getTabGroups();
- for (BSTabGroup bs3TabGroup : new ArrayList<>(tabGroups)) {
- bs3TabGroup.setOwner(bs3TabGroupOwner);
- bs3Visitor.preVisit(bs3TabGroup);
- bs3Visitor.visit(bs3TabGroup);
- traverseTabs(bs3TabGroup, visitor);
- bs3Visitor.postVisit(bs3TabGroup);
+ final BSGrid.Visitor bsVisitor = asBs3Visitor(visitor);
+ final List<BSTabGroup> tabGroups = bsTabGroupOwner.getTabGroups();
+ for (BSTabGroup bsTabGroup : new ArrayList<>(tabGroups)) {
+ bsTabGroup.setOwner(bsTabGroupOwner);
+ bsVisitor.preVisit(bsTabGroup);
+ bsVisitor.visit(bsTabGroup);
+ traverseTabs(bsTabGroup, visitor);
+ bsVisitor.postVisit(bsTabGroup);
}
}
private void traverseTabs(
- final BSTabOwner bs3TabOwner,
+ final BSTabOwner bsTabOwner,
final Grid.Visitor visitor) {
- final BSGrid.Visitor bs3Visitor = asBs3Visitor(visitor);
- final List<BSTab> tabs = bs3TabOwner.getTabs();
+ final BSGrid.Visitor bsVisitor = asBs3Visitor(visitor);
+ final List<BSTab> tabs = bsTabOwner.getTabs();
for (BSTab tab : new ArrayList<>(tabs)) {
- tab.setOwner(bs3TabOwner);
- bs3Visitor.preVisit(tab);
- bs3Visitor.visit(tab);
+ tab.setOwner(bsTabOwner);
+ bsVisitor.preVisit(tab);
+ bsVisitor.visit(tab);
traverseRows(tab, visitor);
- bs3Visitor.postVisit(tab);
+ bsVisitor.postVisit(tab);
}
}
@@ -287,9 +287,9 @@ public class BSGrid extends GridAbstract implements BSElement, Dto, BSRowOwner {
visit(new BSGrid.VisitorAdapter() {
@Override
- public void visit(final BSRow bs3Row) {
- final String id = bs3Row.getId();
- divsByCssId.put(id, bs3Row);
+ public void visit(final BSRow bsRow) {
+ final String id = bsRow.getId();
+ divsByCssId.put(id, bsRow);
}
});
return divsByCssId;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/BSTab.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/BSTab.java
index c72cf49aaf..06d7059469 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/BSTab.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/BSTab.java
@@ -117,15 +117,15 @@ public class BSTab extends BSElementAbstract implements BSRowOwner {
* 'foundContent' flag.
*/
@Override
- public void preVisit(final BSTab bs3Tab) {
- if(bs3Tab == thisBs3Tab) {
+ public void preVisit(final BSTab bsTab) {
+ if(bsTab == thisBs3Tab) {
foundContent.set(false);
visitingTheNode.set(true);
}
}
- @Override public void postVisit(final BSTab bs3Tab) {
- if(bs3Tab == thisBs3Tab) {
+ @Override public void postVisit(final BSTab bsTab) {
+ if(bsTab == thisBs3Tab) {
visitingTheNode.set(false);
}
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/package-info.java
index 7e48f7041b..eac2ef543a 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/package-info.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/package-info.java
@@ -32,6 +32,6 @@
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
xmlns = {
@javax.xml.bind.annotation.XmlNs(
- namespaceURI = "http://isis.apache.org/applib/layout/grid/bootstrap3", prefix = "bs3")
+ namespaceURI = "http://isis.apache.org/applib/layout/grid/bootstrap3", prefix = "bs")
})
package org.apache.isis.applib.layout.grid.bootstrap;
\ No newline at end of file
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap/BSMenuBars.java b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap/BSMenuBars.java
index ec77c858c8..0db74e401a 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap/BSMenuBars.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap/BSMenuBars.java
@@ -158,29 +158,29 @@ public class BSMenuBars extends org.apache.isis.applib.layout.menubars.MenuBarsA
private void traverseMenuBar(final BSMenuBar menuBar, final Consumer<ServiceActionLayoutData> visitor) {
- final Visitor bs3Visitor = visitor instanceof Visitor ? (Visitor) visitor : null;
+ final Visitor bsVisitor = visitor instanceof Visitor ? (Visitor) visitor : null;
- if(bs3Visitor != null) {
- bs3Visitor.preVisit(menuBar);
- bs3Visitor.visit(menuBar);
+ if(bsVisitor != null) {
+ bsVisitor.preVisit(menuBar);
+ bsVisitor.visit(menuBar);
}
for (BSMenu menu : menuBar.getMenus()) {
traverseMenu(menu, visitor);
}
- if(bs3Visitor != null) {
- bs3Visitor.postVisit(menuBar);
+ if(bsVisitor != null) {
+ bsVisitor.postVisit(menuBar);
}
}
private void traverseMenu(final BSMenu menu, final Consumer<ServiceActionLayoutData> visitor) {
- final Visitor bs3Visitor = visitor instanceof Visitor ? (Visitor) visitor : null;
+ final Visitor bsVisitor = visitor instanceof Visitor ? (Visitor) visitor : null;
- if(bs3Visitor != null) {
- bs3Visitor.preVisit(menu);
- bs3Visitor.visit(menu);
+ if(bsVisitor != null) {
+ bsVisitor.preVisit(menu);
+ bsVisitor.visit(menu);
}
final List<BSMenuSection> sections = menu.getSections();
@@ -188,17 +188,17 @@ public class BSMenuBars extends org.apache.isis.applib.layout.menubars.MenuBarsA
traverseSection(section, visitor);
}
- if(bs3Visitor != null) {
- bs3Visitor.postVisit(menu);
+ if(bsVisitor != null) {
+ bsVisitor.postVisit(menu);
}
}
private void traverseSection(final BSMenuSection section, final Consumer<ServiceActionLayoutData> visitor) {
- final Visitor bs3Visitor = visitor instanceof Visitor ? (Visitor) visitor : null;
- if(bs3Visitor != null) {
- bs3Visitor.preVisit(section);
- bs3Visitor.visit(section);
+ final Visitor bsVisitor = visitor instanceof Visitor ? (Visitor) visitor : null;
+ if(bsVisitor != null) {
+ bsVisitor.preVisit(section);
+ bsVisitor.visit(section);
}
final List<ServiceActionLayoutData> actions = section.getServiceActions();
@@ -206,8 +206,8 @@ public class BSMenuBars extends org.apache.isis.applib.layout.menubars.MenuBarsA
visitor.accept(action);
}
- if(bs3Visitor != null) {
- bs3Visitor.postVisit(section);
+ if(bsVisitor != null) {
+ bsVisitor.postVisit(section);
}
}
diff --git a/api/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ColTest.java b/api/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap/BSColTest.java
similarity index 68%
rename from api/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ColTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap/BSColTest.java
index 0418b924a1..67558cdef4 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ColTest.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap/BSColTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.layout.grid.bootstrap3;
+package org.apache.isis.applib.layout.grid.bootstrap;
import org.junit.Before;
import org.junit.Test;
@@ -29,39 +29,39 @@ import org.apache.isis.applib.layout.grid.bootstrap.BSCol;
import org.apache.isis.applib.layout.grid.bootstrap.Size;
import org.apache.isis.applib.layout.grid.bootstrap.SizeSpan;
-public class BS3ColTest {
+public class BSColTest {
- BSCol bs3Col;
+ BSCol bsCol;
@Before
public void setUp() throws Exception {
- bs3Col = new BSCol();
+ bsCol = new BSCol();
}
@Test
public void size_and_span() throws Exception {
- bs3Col.setSize(Size.MD);
- bs3Col.setSpan(4);
+ bsCol.setSize(Size.MD);
+ bsCol.setSpan(4);
- assertThat(bs3Col.toCssClass(), is(equalTo("col-md-4")));
+ assertThat(bsCol.toCssClass(), is(equalTo("col-md-4")));
}
@Test
public void extra_css_class() throws Exception {
- bs3Col.setSize(Size.SM);
- bs3Col.setSpan(8);
- bs3Col.setCssClass("foobar");
+ bsCol.setSize(Size.SM);
+ bsCol.setSpan(8);
+ bsCol.setCssClass("foobar");
- assertThat(bs3Col.toCssClass(), is(equalTo("col-sm-8 foobar")));
+ assertThat(bsCol.toCssClass(), is(equalTo("col-sm-8 foobar")));
}
@Test
public void with_additional_classes() throws Exception {
- bs3Col.setSize(Size.SM);
- bs3Col.setSpan(6);
+ bsCol.setSize(Size.SM);
+ bsCol.setSpan(6);
- bs3Col.getSizeSpans().add(SizeSpan.with(Size.MD, 5));
- bs3Col.getSizeSpans().add(SizeSpan.offset(Size.MD, 2));
+ bsCol.getSizeSpans().add(SizeSpan.with(Size.MD, 5));
+ bsCol.getSizeSpans().add(SizeSpan.offset(Size.MD, 2));
- assertThat(bs3Col.toCssClass(), is(equalTo("col-sm-6 col-md-5 offset-2")));
+ assertThat(bsCol.toCssClass(), is(equalTo("col-sm-6 col-md-5 offset-2")));
}
}
\ No newline at end of file
diff --git a/api/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpanTest.java b/api/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap/SizeSpanTest.java
similarity index 96%
rename from api/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpanTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap/SizeSpanTest.java
index db2a42c01e..38dc4a3e44 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpanTest.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap/SizeSpanTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.layout.grid.bootstrap3;
+package org.apache.isis.applib.layout.grid.bootstrap;
import org.junit.Before;
import org.junit.Test;
diff --git a/api/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java b/api/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap/BSMenuBars_roundtrip_Test.java
similarity index 96%
rename from api/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java
rename to api/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap/BSMenuBars_roundtrip_Test.java
index 0c29e4c274..995887b7c4 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap/BSMenuBars_roundtrip_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.applib.layout.menubars.bootstrap3;
+package org.apache.isis.applib.layout.menubars.bootstrap;
import org.junit.After;
import org.junit.Before;
@@ -31,7 +31,7 @@ import org.apache.isis.applib.layout.menubars.bootstrap.BSMenuSection;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.jaxb.JaxbService.Simple;
-public class BS3MenuBars_roundtrip_Test {
+public class BSMenuBars_roundtrip_Test {
private JaxbService jaxbService;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java
index a88d6d7b27..a536c78b89 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java
@@ -133,7 +133,7 @@ extends GridSystemServiceAbstract<BSGrid> {
.map(xml -> gridReader.loadGrid(xml))
.filter(BSGrid.class::isInstance)
.map(BSGrid.class::cast)
- .map(bs3Grid -> withDomainClass(bs3Grid, domainClass))
+ .map(bsGrid -> withDomainClass(bsGrid, domainClass))
.orElseGet(() -> fallback(domainClass))
;
} catch (final Exception e) {
@@ -146,10 +146,10 @@ extends GridSystemServiceAbstract<BSGrid> {
// which *really* shouldn't happen
//
private BSGrid fallback(final Class<?> domainClass) {
- final BSGrid bs3Grid = withDomainClass(new BSGrid(), domainClass);
+ final BSGrid bsGrid = withDomainClass(new BSGrid(), domainClass);
final BSRow headerRow = new BSRow();
- bs3Grid.getRows().add(headerRow);
+ bsGrid.getRows().add(headerRow);
final BSCol headerRowCol = new BSCol();
headerRowCol.setSpan(12);
headerRowCol.setUnreferencedActions(true);
@@ -157,7 +157,7 @@ extends GridSystemServiceAbstract<BSGrid> {
headerRow.getCols().add(headerRowCol);
final BSRow propsRow = new BSRow();
- bs3Grid.getRows().add(propsRow);
+ bsGrid.getRows().add(propsRow);
// if no layout hints
addFieldSetsToColumn(propsRow, 4, Arrays.asList("General"), true);
@@ -167,12 +167,12 @@ extends GridSystemServiceAbstract<BSGrid> {
col.setSpan(12);
propsRow.getCols().add(col);
- return bs3Grid;
+ return bsGrid;
}
- private static BSGrid withDomainClass(final BSGrid bs3Grid, final Class<?> domainClass) {
- bs3Grid.setDomainClass(domainClass);
- return bs3Grid;
+ private static BSGrid withDomainClass(final BSGrid bsGrid, final Class<?> domainClass) {
+ bsGrid.setDomainClass(domainClass);
+ return bsGrid;
}
static void addFieldSetsToColumn(
@@ -204,18 +204,18 @@ extends GridSystemServiceAbstract<BSGrid> {
final Grid grid,
final Class<?> domainClass) {
- val bs3Grid = (BSGrid) grid;
+ val bsGrid = (BSGrid) grid;
val objectSpec = specificationLoader.specForTypeElseFail(domainClass);
val oneToOneAssociationById = ObjectMember.mapById(objectSpec.streamProperties(MixedIn.INCLUDED));
val oneToManyAssociationById = ObjectMember.mapById(objectSpec.streamCollections(MixedIn.INCLUDED));
val objectActionById = ObjectMember.mapById(objectSpec.streamRuntimeActions(MixedIn.INCLUDED));
- val propertyLayoutDataById = bs3Grid.getAllPropertiesById();
- val collectionLayoutDataById = bs3Grid.getAllCollectionsById();
- val actionLayoutDataById = bs3Grid.getAllActionsById();
+ val propertyLayoutDataById = bsGrid.getAllPropertiesById();
+ val collectionLayoutDataById = bsGrid.getAllCollectionsById();
+ val actionLayoutDataById = bsGrid.getAllActionsById();
- val gridModelIfValid = _GridModel.createFrom(bs3Grid);
+ val gridModelIfValid = _GridModel.createFrom(bsGrid);
if(!gridModelIfValid.isPresent()) { // only present if valid
return false;
}
@@ -335,18 +335,18 @@ extends GridSystemServiceAbstract<BSGrid> {
final List<String> sortedMissingCollectionIds =
_Lists.map(sortedCollections, ObjectAssociation::getId);
- final BSTabGroup bs3TabGroup = gridModel.getTabGroupForUnreferencedCollectionsRef();
- if(bs3TabGroup != null) {
+ final BSTabGroup bsTabGroup = gridModel.getTabGroupForUnreferencedCollectionsRef();
+ if(bsTabGroup != null) {
addCollectionsTo(
- bs3TabGroup,
+ bsTabGroup,
sortedMissingCollectionIds,
objectSpec,
layoutDataFactory::createCollectionLayoutData);
} else {
- final BSCol bs3Col = gridModel.getColForUnreferencedCollectionsRef();
- if(bs3Col != null) {
+ final BSCol bsCol = gridModel.getColForUnreferencedCollectionsRef();
+ if(bsCol != null) {
addCollectionsTo(
- bs3Col,
+ bsCol,
sortedMissingCollectionIds,
layoutDataFactory::createCollectionLayoutData,
collectionLayoutDataById::put);
@@ -451,10 +451,10 @@ extends GridSystemServiceAbstract<BSGrid> {
}
if(!missingActionIds.isEmpty()) {
- final BSCol bs3Col = gridModel.getColForUnreferencedActionsRef();
- if(bs3Col != null) {
+ final BSCol bsCol = gridModel.getColForUnreferencedActionsRef();
+ if(bsCol != null) {
addActionsTo(
- bs3Col,
+ bsCol,
missingActionIds,
layoutDataFactory::createActionLayoutData,
actionLayoutDataById::put);
@@ -515,18 +515,18 @@ extends GridSystemServiceAbstract<BSGrid> {
final Function<String, CollectionLayoutData> layoutFactory) {
for (final String collectionId : collectionIds) {
- final BSTab bs3Tab = new BSTab();
+ final BSTab bsTab = new BSTab();
val feature = objectSpec.getCollectionElseFail(collectionId);
val featureCanonicalFriendlyName = feature.getCanonicalFriendlyName();
- bs3Tab.setName(featureCanonicalFriendlyName);
- tabGroup.getTabs().add(bs3Tab);
- bs3Tab.setOwner(tabGroup);
+ bsTab.setName(featureCanonicalFriendlyName);
+ tabGroup.getTabs().add(bsTab);
+ bsTab.setOwner(tabGroup);
final BSRow tabRow = new BSRow();
- tabRow.setOwner(bs3Tab);
- bs3Tab.getRows().add(tabRow);
+ tabRow.setOwner(bsTab);
+ bsTab.getRows().add(tabRow);
final BSCol tabRowCol = new BSCol();
tabRowCol.setSpan(12);
@@ -540,14 +540,14 @@ extends GridSystemServiceAbstract<BSGrid> {
}
protected void addActionsTo(
- final BSCol bs3Col,
+ final BSCol bsCol,
final Collection<String> actionIds,
final Function<String, ActionLayoutData> layoutFactory,
final BiConsumer<String, ActionLayoutData> onNewLayoutData) {
for (String actionId : actionIds) {
val actionLayoutData = layoutFactory.apply(actionId);
- addActionTo(bs3Col, actionLayoutData);
+ addActionTo(bsCol, actionLayoutData);
onNewLayoutData.accept(actionId, actionLayoutData);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/_GridModel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/_GridModel.java
index 2d3a16db90..ece0266483 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/_GridModel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/_GridModel.java
@@ -75,40 +75,40 @@ final class _GridModel {
* - ensure that all Ids are different<br>
* - ensure that there is exactly one col with the
* unreferencedActions, unreferencedProperties and unreferencedCollections attribute set.
- * @param bs3Grid
+ * @param bsGrid
* @return empty if not valid
*/
- public static Optional<_GridModel> createFrom(BSGrid bs3Grid) {
+ public static Optional<_GridModel> createFrom(BSGrid bsGrid) {
val gridModel = new _GridModel();
- bs3Grid.visit(new BSGrid.VisitorAdapter(){
+ bsGrid.visit(new BSGrid.VisitorAdapter(){
@Override
- public void visit(final BSRow bs3Row) {
- final String id = bs3Row.getId();
+ public void visit(final BSRow bsRow) {
+ final String id = bsRow.getId();
if(id == null) {
return;
}
if(gridModel.contains(id)) {
- bs3Row.setMetadataError("There is another element in the grid with this id: " + id);
+ bsRow.setMetadataError("There is another element in the grid with this id: " + id);
gridModel.gridErrorsDetected = true;
return;
}
- gridModel.putRow(id, bs3Row);
+ gridModel.putRow(id, bsRow);
}
@Override
- public void visit(final BSCol bs3Col) {
- final String id = bs3Col.getId();
+ public void visit(final BSCol bsCol) {
+ final String id = bsCol.getId();
if(id == null) {
return;
}
if(gridModel.contains(id)) {
- bs3Col.setMetadataError("There is another element in the grid with this id: " + id);
+ bsCol.setMetadataError("There is another element in the grid with this id: " + id);
gridModel.gridErrorsDetected = true;
return;
}
- gridModel.putCol(id, bs3Col);
+ gridModel.putCol(id, bsCol);
}
@Override
@@ -133,26 +133,26 @@ final class _GridModel {
return Optional.empty();
}
- bs3Grid.visit(new BSGrid.VisitorAdapter(){
+ bsGrid.visit(new BSGrid.VisitorAdapter(){
@Override
- public void visit(final BSCol bs3Col) {
- if(isSet(bs3Col.isUnreferencedActions())) {
+ public void visit(final BSCol bsCol) {
+ if(isSet(bsCol.isUnreferencedActions())) {
if(gridModel.colForUnreferencedActionsRef != null) {
- bs3Col.setMetadataError("More than one col with 'unreferencedActions' attribute set");
+ bsCol.setMetadataError("More than one col with 'unreferencedActions' attribute set");
} else if(gridModel.fieldSetForUnreferencedActionsRef != null) {
- bs3Col.setMetadataError("Already found a fieldset with 'unreferencedActions' attribute set");
+ bsCol.setMetadataError("Already found a fieldset with 'unreferencedActions' attribute set");
} else {
- gridModel.colForUnreferencedActionsRef=bs3Col;
+ gridModel.colForUnreferencedActionsRef=bsCol;
}
}
- if(isSet(bs3Col.isUnreferencedCollections())) {
+ if(isSet(bsCol.isUnreferencedCollections())) {
if(gridModel.colForUnreferencedCollectionsRef != null) {
- bs3Col.setMetadataError("More than one col with 'unreferencedCollections' attribute set");
+ bsCol.setMetadataError("More than one col with 'unreferencedCollections' attribute set");
} else if(gridModel.tabGroupForUnreferencedCollectionsRef != null) {
- bs3Col.setMetadataError("Already found a tabgroup with 'unreferencedCollections' attribute set");
+ bsCol.setMetadataError("Already found a tabgroup with 'unreferencedCollections' attribute set");
} else {
- gridModel.colForUnreferencedCollectionsRef = bs3Col;
+ gridModel.colForUnreferencedCollectionsRef = bsCol;
}
}
}
@@ -178,27 +178,27 @@ final class _GridModel {
}
@Override
- public void visit(final BSTabGroup bs3TabGroup) {
- if(isSet(bs3TabGroup.isUnreferencedCollections())) {
+ public void visit(final BSTabGroup bsTabGroup) {
+ if(isSet(bsTabGroup.isUnreferencedCollections())) {
if(gridModel.tabGroupForUnreferencedCollectionsRef != null) {
- bs3TabGroup.setMetadataError("More than one tabgroup with 'unreferencedCollections' attribute set");
+ bsTabGroup.setMetadataError("More than one tabgroup with 'unreferencedCollections' attribute set");
} else if(gridModel.colForUnreferencedCollectionsRef != null) {
- bs3TabGroup.setMetadataError("Already found a column with 'unreferencedCollections' attribute set");
+ bsTabGroup.setMetadataError("Already found a column with 'unreferencedCollections' attribute set");
} else {
- gridModel.tabGroupForUnreferencedCollectionsRef = bs3TabGroup;
+ gridModel.tabGroupForUnreferencedCollectionsRef = bsTabGroup;
}
}
}
});
if(gridModel.colForUnreferencedActionsRef == null && gridModel.fieldSetForUnreferencedActionsRef == null) {
- bs3Grid.getMetadataErrors().add("No column and also no fieldset found with the 'unreferencedActions' attribute set");
+ bsGrid.getMetadataErrors().add("No column and also no fieldset found with the 'unreferencedActions' attribute set");
}
if(gridModel.fieldSetForUnreferencedPropertiesRef == null) {
- bs3Grid.getMetadataErrors().add("No fieldset found with the 'unreferencedProperties' attribute set");
+ bsGrid.getMetadataErrors().add("No fieldset found with the 'unreferencedProperties' attribute set");
}
if(gridModel.colForUnreferencedCollectionsRef == null && gridModel.tabGroupForUnreferencedCollectionsRef == null) {
- bs3Grid.getMetadataErrors().add("No column and also no tabgroup found with the 'unreferencedCollections' attribute set");
+ bsGrid.getMetadataErrors().add("No column and also no tabgroup found with the 'unreferencedCollections' attribute set");
}
final boolean hasErrors =
@@ -212,12 +212,12 @@ final class _GridModel {
}
- private void putRow(String id, BSRow bs3Row) {
- rows.put(id, bs3Row);
+ private void putRow(String id, BSRow bsRow) {
+ rows.put(id, bsRow);
allIds.add(id);
}
- private void putCol(String id, BSCol bs3Col) {
- cols.put(id, bs3Col);
+ private void putCol(String id, BSCol bsCol) {
+ cols.put(id, bsCol);
allIds.add(id);
}
private void putFieldSet(String id, FieldSet fieldSet) {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridXmlRoundtripTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridXmlRoundtripTest.java
index 4fd262b9f0..0d90bb929a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridXmlRoundtripTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridXmlRoundtripTest.java
@@ -60,11 +60,11 @@ extends MetaModelTestAbstract {
@Test
void happy_case() throws Exception {
- final BSGrid bs3Grid = new BSGrid();
+ final BSGrid bsGrid = new BSGrid();
// header
final BSRow headerRow = new BSRow();
- bs3Grid.getRows().add(headerRow);
+ bsGrid.getRows().add(headerRow);
final BSCol headerCol = new BSCol();
headerRow.getCols().add(headerCol);
headerCol.setSpan(12);
@@ -79,7 +79,7 @@ extends MetaModelTestAbstract {
// content
final BSRow contentRow = new BSRow();
- bs3Grid.getRows().add(contentRow);
+ bsGrid.getRows().add(contentRow);
final BSCol contentCol = new BSCol();
contentRow.getCols().add(contentCol);
@@ -88,13 +88,13 @@ extends MetaModelTestAbstract {
// a tabgroup containing a 'Common' tab
final BSTabGroup tabGroup = new BSTabGroup();
contentCol.getTabGroups().add(tabGroup);
- BSTab bs3Tab = new BSTab();
- tabGroup.getTabs().add(bs3Tab);
- bs3Tab.setName("Common");
+ BSTab bsTab = new BSTab();
+ tabGroup.getTabs().add(bsTab);
+ bsTab.setName("Common");
// with a left col...
final BSRow tabRow = new BSRow();
- bs3Tab.getRows().add(tabRow);
+ bsTab.getRows().add(tabRow);
final BSCol tabLeftCol = new BSCol();
tabRow.getCols().add(tabLeftCol);
tabLeftCol.setSpan(6);
@@ -127,24 +127,24 @@ extends MetaModelTestAbstract {
tabRightCol.getCollections().add(similarToColl);
similarToColl.setId("similarTo");
- final String schemaLocations = gridServiceDefault.tnsAndSchemaLocation(bs3Grid);
- String xml = jaxbService.toXml(bs3Grid,
+ final String schemaLocations = gridServiceDefault.tnsAndSchemaLocation(bsGrid);
+ String xml = jaxbService.toXml(bsGrid,
_Maps.unmodifiable(Marshaller.JAXB_SCHEMA_LOCATION, schemaLocations));
println(xml);
- BSGrid bs3Pageroundtripped = jaxbService.fromXml(BSGrid.class, xml);
- String xmlRoundtripped = jaxbService.toXml(bs3Pageroundtripped,
+ BSGrid bsPageroundtripped = jaxbService.fromXml(BSGrid.class, xml);
+ String xmlRoundtripped = jaxbService.toXml(bsPageroundtripped,
_Maps.unmodifiable(Marshaller.JAXB_SCHEMA_LOCATION, schemaLocations));
assertThat(xml, is(equalTo(xmlRoundtripped)));
println("==========");
- dumpXsd(bs3Grid);
+ dumpXsd(bsGrid);
}
- protected void dumpXsd(final BSGrid bs3Page) {
- Map<String, String> schemas = jaxbService.toXsd(bs3Page, IsisSchemas.INCLUDE);
+ protected void dumpXsd(final BSGrid bsPage) {
+ Map<String, String> schemas = jaxbService.toXsd(bsPage, IsisSchemas.INCLUDE);
for (Map.Entry<String, String> entry : schemas.entrySet()) {
println(entry.getKey() + ":");
println(entry.getValue());
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/object/ObjectViewFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/object/ObjectViewFx.java
index 387158db1d..cec9f7985d 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/object/ObjectViewFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/object/ObjectViewFx.java
@@ -99,18 +99,18 @@ public class ObjectViewFx extends VBox {
}
@Override
- protected Pane newRow(final Pane container, final BSRow bs3Row) {
+ protected Pane newRow(final Pane container, final BSRow bsRow) {
val uiRow = _fx.newFlowPane(container);
return uiRow;
}
@Override
- protected Pane newCol(final Pane container, final BSCol bs3col) {
+ protected Pane newCol(final Pane container, final BSCol bscol) {
val uiCol = _fx.newVBox(container);
// note: also account for insets and padding, assuming that 98% seems reasonable
- double realtiveWidthWithRespectToContainer = bs3col.getSpan()*0.98/12;
+ double realtiveWidthWithRespectToContainer = bscol.getSpan()*0.98/12;
uiCol.prefWidthProperty().bind(
container.widthProperty().multiply(realtiveWidthWithRespectToContainer));
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java
index 09d9dee0fa..f6387a23fd 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java
@@ -106,7 +106,7 @@ public class ObjectViewVaa extends VerticalLayout {
}
@Override
- protected HasComponents newRow(final HasComponents container, final BSRow bs3Row) {
+ protected HasComponents newRow(final HasComponents container, final BSRow bsRow) {
val uiRow = _vaa.add(container, new FlexLayout());
uiRow.setWidthFull();
@@ -123,11 +123,11 @@ public class ObjectViewVaa extends VerticalLayout {
}
@Override
- protected HasComponents newCol(final HasComponents container, final BSCol bs3col) {
+ protected HasComponents newCol(final HasComponents container, final BSCol bscol) {
val uiCol = _vaa.add(container, new VerticalLayout());
- final int span = bs3col.getSpan();
+ final int span = bscol.getSpan();
((FlexLayout)container).setFlexGrow(span, uiCol);
val widthEm = String.format("%dem", span * 3); // 1em ~ 16px
uiCol.setWidth(null); // clear preset width style
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/gridlayout/UiGridLayout.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/gridlayout/UiGridLayout.java
index 19bc78d1c8..b7a3062531 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/gridlayout/UiGridLayout.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/gridlayout/UiGridLayout.java
@@ -71,9 +71,9 @@ public class UiGridLayout {
// recursively visit the grid
gridData.get()
- .ifPresent(bs3Grid->{
- for(val bs3Row: bs3Grid.getRows()) {
- visitRow(bs3Row, visitor.rootContainer, visitor);
+ .ifPresent(bsGrid->{
+ for(val bsRow: bsGrid.getRows()) {
+ visitRow(bsRow, visitor.rootContainer, visitor);
}
});
@@ -114,17 +114,17 @@ public class UiGridLayout {
return bSGrid;
}
- private <C, T> void visitRow(final BSRow bs3Row, final C container, final Visitor<C, T> visitor) {
+ private <C, T> void visitRow(final BSRow bsRow, final C container, final Visitor<C, T> visitor) {
- val uiRow = visitor.newRow(container, bs3Row);
+ val uiRow = visitor.newRow(container, bsRow);
- for(val bs3RowContent: bs3Row.getCols()) {
- if(bs3RowContent instanceof BSCol) {
+ for(val bsRowContent: bsRow.getCols()) {
+ if(bsRowContent instanceof BSCol) {
- visitCol((BSCol) bs3RowContent, uiRow, visitor);
+ visitCol((BSCol) bsRowContent, uiRow, visitor);
- } else if (bs3RowContent instanceof BSClearFix) {
- visitor.onClearfix(uiRow, (BSClearFix) bs3RowContent);
+ } else if (bsRowContent instanceof BSClearFix) {
+ visitor.onClearfix(uiRow, (BSClearFix) bsRowContent);
} else {
throw new IllegalStateException("Unrecognized implementation of BSRowContent");
}
@@ -159,8 +159,8 @@ public class UiGridLayout {
}
if(hasRows) {
- for(val bs3Row: bSCol.getRows()) {
- visitRow(bs3Row, uiCol, visitor);
+ for(val bsRow: bSCol.getRows()) {
+ visitRow(bsRow, uiCol, visitor);
}
}
@@ -172,15 +172,15 @@ public class UiGridLayout {
private <C, T> void visitTabGroup(final BSTabGroup bS3ColTabGroup, final C container, final Visitor<C, T> visitor) {
val uiTabGroup = visitor.newTabGroup(container, bS3ColTabGroup);
- for(val bs3Tab: bS3ColTabGroup.getTabs()) {
- visitTab(bs3Tab, uiTabGroup, visitor);
+ for(val bsTab: bS3ColTabGroup.getTabs()) {
+ visitTab(bsTab, uiTabGroup, visitor);
}
}
private <C, T> void visitTab(final BSTab bSTab, final T container, final Visitor<C, T> visitor) {
val uiTab = visitor.newTab(container, bSTab);
- for(val bs3Row: bSTab.getRows()) {
- visitRow(bs3Row, uiTab, visitor);
+ for(val bsRow: bSTab.getRows()) {
+ visitRow(bsRow, uiTab, visitor);
}
}
diff --git a/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java
index 24a83b5441..57dc0a5e76 100644
--- a/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java
+++ b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java
@@ -61,11 +61,11 @@ public final class RestfulMediaType {
public static final String APPLICATION_JSON_TYPE_ACTION_RESULT = JSON_BASE + "type-action-result" + DQ;
private static final String XML_BASE = "application/xml" + ";profile=" + DQ + PROFILE_PARAM_PREFIX;
- public static final String APPLICATION_XML_LAYOUT_BS3 = XML_BASE + "layout-bs3" + DQ;
- public static final String APPLICATION_JSON_LAYOUT_BS3 = JSON_BASE + "layout-bs3" + DQ;
+ public static final String APPLICATION_XML_LAYOUT_BS3 = XML_BASE + "layout-bs" + DQ;
+ public static final String APPLICATION_JSON_LAYOUT_BS3 = JSON_BASE + "layout-bs" + DQ;
- public static final String APPLICATION_XML_OBJECT_LAYOUT_BS3 = XML_BASE + "object-layout-bs3" + DQ;
- public static final String APPLICATION_JSON_OBJECT_LAYOUT_BS3 = JSON_BASE + "object-layout-bs3" + DQ;
+ public static final String APPLICATION_XML_OBJECT_LAYOUT_BS3 = XML_BASE + "object-layout-bs" + DQ;
+ public static final String APPLICATION_JSON_OBJECT_LAYOUT_BS3 = JSON_BASE + "object-layout-bs" + DQ;
public static final String APPLICATION_JSON_LAYOUT_MENUBARS = JSON_BASE + "layout-menubars" + DQ;
public static final String APPLICATION_XML_LAYOUT_MENUBARS = XML_BASE + "layout-menubars" + DQ;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
index bd672322fb..38be38b214 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
@@ -37,7 +37,7 @@ import lombok.val;
*
* <p>
* The multi-level sub menu support is borrowed from
- * <a href="http://bootsnipp.com/snippets/featured/multi-level-dropdown-menu-bs3">Bootsnip</a>
+ * <a href="http://bootsnipp.com/snippets/featured/multi-level-dropdown-menu-bs">Bootsnip</a>
* </p>
*/
public class ServiceActionsPanel extends MenuActionPanel {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
index d633afd7e0..e41d7ec92b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
@@ -31,7 +31,7 @@ import lombok.val;
*
* <p>
* The multi-level sub menu support is borrowed from
- * <a href="http://bootsnipp.com/snippets/featured/multi-level-dropdown-menu-bs3">Bootsnip</a>
+ * <a href="http://bootsnipp.com/snippets/featured/multi-level-dropdown-menu-bs">Bootsnip</a>
* </p>
*/
public class TertiaryActionsPanel extends MenuActionPanel {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.java
index 8c42739921..bf6ba3b81b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.java
@@ -45,7 +45,7 @@ extends PanelAbstract<ManagedObject, EntityModel> {
private static final String ID_ROWS = "rows";
- private final BSGrid bs3Page;
+ private final BSGrid bsPage;
public static Optional<BSGridPanel> extraContentForMixin(final String id, final ActionModel actionModel) {
final ObjectAction action = actionModel.getAction();
@@ -57,11 +57,11 @@ extends PanelAbstract<ManagedObject, EntityModel> {
val targetAdapterForMixin = action.realTargetAdapter(actionModel.getActionOwner());
return Facets.bootstrapGrid(mixinSpec, targetAdapterForMixin)
- .map(bs3Grid->{
+ .map(bsGrid->{
val commonContext = actionModel.getCommonContext();
val entityModelForMixin =
EntityModel.ofAdapter(commonContext, targetAdapterForMixin);
- return new BSGridPanel(id, entityModelForMixin, bs3Grid);
+ return new BSGridPanel(id, entityModelForMixin, bsGrid);
});
}
@@ -70,21 +70,21 @@ extends PanelAbstract<ManagedObject, EntityModel> {
}
- public BSGridPanel(final String id, final EntityModel entityModel, final BSGrid bs3Grid) {
+ public BSGridPanel(final String id, final EntityModel entityModel, final BSGrid bsGrid) {
super(id, entityModel);
- this.bs3Page = bs3Grid;
+ this.bsPage = bsGrid;
buildGui();
}
private void buildGui() {
- Wkt.cssAppend(this, bs3Page.getCssClass());
+ Wkt.cssAppend(this, bsPage.getCssClass());
final RepeatingView rv = new RepeatingView(ID_ROWS);
- for(final BSRow bs3Row: this.bs3Page.getRows()) {
+ for(final BSRow bsRow: this.bsPage.getRows()) {
final String id = rv.newChildId();
- final WebMarkupContainer row = new Row(id, getModel(), bs3Row);
+ final WebMarkupContainer row = new Row(id, getModel(), bsRow);
rv.add(row);
}
add(rv);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/clearfix/ClearFix.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/clearfix/ClearFix.java
index 095f7c8843..93e18ae93e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/clearfix/ClearFix.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/clearfix/ClearFix.java
@@ -33,15 +33,15 @@ extends PanelAbstract<ManagedObject, EntityModel> {
private static final String ID_COL = "clearfix";
- private final BSClearFix bs3ClearFix;
+ private final BSClearFix bsClearFix;
public ClearFix(
final String id,
final EntityModel entityModel,
- final BSClearFix bs3ClearFix) {
+ final BSClearFix bsClearFix) {
super(id, entityModel);
- this.bs3ClearFix = bs3ClearFix;
+ this.bsClearFix = bsClearFix;
buildGui();
}
@@ -49,10 +49,10 @@ extends PanelAbstract<ManagedObject, EntityModel> {
private void buildGui() {
setRenderBodyOnly(true);
- Wkt.cssAppend(this, bs3ClearFix.getCssClass());
+ Wkt.cssAppend(this, bsClearFix.getCssClass());
final WebMarkupContainer div = new WebMarkupContainer(ID_COL);
- Wkt.cssAppend(div, bs3ClearFix.toCssClass());
+ Wkt.cssAppend(div, bsClearFix.toCssClass());
this.addOrReplace(div);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/col/Col.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/col/Col.java
index ed7010af18..0358a3cbf9 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/col/Col.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/col/Col.java
@@ -65,15 +65,15 @@ implements HasDynamicallyVisibleContent {
private static final String ID_FIELD_SETS = "fieldSets";
private static final String ID_COLLECTIONS = "collections";
- private final BSCol bs3Col;
+ private final BSCol bsCol;
public Col(
final String id,
- final EntityModel entityModel, final BSCol bs3Col) {
+ final EntityModel entityModel, final BSCol bsCol) {
super(id, entityModel);
- this.bs3Col = bs3Col;
+ this.bsCol = bsCol;
buildGui();
}
@@ -82,17 +82,17 @@ implements HasDynamicallyVisibleContent {
setRenderBodyOnly(true);
- if(bs3Col.getSpan() == 0) {
+ if(bsCol.getSpan() == 0) {
WktComponents.permanentlyHide(this, ID_COL);
return;
}
final WebMarkupContainer div = new WebMarkupContainer(ID_COL);
- Wkt.cssAppend(div, bs3Col.toCssClass());
+ Wkt.cssAppend(div, bsCol.toCssClass());
// icon/title
- final DomainObjectLayoutData domainObject = bs3Col.getDomainObject();
+ final DomainObjectLayoutData domainObject = bsCol.getDomainObject();
final WebMarkupContainer actionOwner;
final String actionIdToUse;
@@ -120,7 +120,7 @@ implements HasDynamicallyVisibleContent {
// actions
// (rendering depends on whether also showing the icon/title)
- final List<ActionLayoutData> actionLayoutDataList = bs3Col.getActions();
+ final List<ActionLayoutData> actionLayoutDataList = bsCol.getActions();
val visibleActions = _NullSafe.stream(actionLayoutDataList)
.filter(actionLayoutData -> actionLayoutData.getMetadataError() == null)
@@ -144,7 +144,7 @@ implements HasDynamicallyVisibleContent {
// rows
- final List<BSRow> rows = _Lists.newArrayList(this.bs3Col.getRows());
+ final List<BSRow> rows = _Lists.newArrayList(this.bsCol.getRows());
if(!rows.isEmpty()) {
final RepeatingViewWithDynamicallyVisibleContent rowsRv = buildRows(ID_ROWS, rows);
div.add(rowsRv);
@@ -156,10 +156,10 @@ implements HasDynamicallyVisibleContent {
// tab groups
final List<BSTabGroup> tabGroupsWithNonEmptyTabs =
- _NullSafe.stream(bs3Col.getTabGroups())
+ _NullSafe.stream(bsCol.getTabGroups())
.filter(_NullSafe::isPresent)
- .filter(bs3TabGroup ->
- _NullSafe.stream(bs3TabGroup.getTabs())
+ .filter(bsTabGroup ->
+ _NullSafe.stream(bsTabGroup.getTabs())
.anyMatch(BSTab.Predicates.notEmpty())
)
.collect(Collectors.toList());
@@ -168,10 +168,10 @@ implements HasDynamicallyVisibleContent {
final RepeatingViewWithDynamicallyVisibleContent tabGroupRv =
new RepeatingViewWithDynamicallyVisibleContent(ID_TAB_GROUPS);
- for (BSTabGroup bs3TabGroup : tabGroupsWithNonEmptyTabs) {
+ for (BSTabGroup bsTabGroup : tabGroupsWithNonEmptyTabs) {
final String id = tabGroupRv.newChildId();
- final List<BSTab> tabs = _NullSafe.stream(bs3TabGroup.getTabs())
+ final List<BSTab> tabs = _NullSafe.stream(bsTabGroup.getTabs())
.filter(BSTab.Predicates.notEmpty())
.collect(Collectors.toList());
@@ -180,17 +180,17 @@ implements HasDynamicallyVisibleContent {
// shouldn't occur; previously have filtered these out
throw new IllegalStateException("Cannot render tabGroup with no tabs");
case 1:
- if(bs3TabGroup.isCollapseIfOne() == null || bs3TabGroup.isCollapseIfOne()) {
- final BSTab bs3Tab = tabs.get(0);
+ if(bsTabGroup.isCollapseIfOne() == null || bsTabGroup.isCollapseIfOne()) {
+ final BSTab bsTab = tabs.get(0);
// render the rows of the one-and-only tab of this tab group.
- final List<BSRow> tabRows = bs3Tab.getRows();
+ final List<BSRow> tabRows = bsTab.getRows();
final RepeatingViewWithDynamicallyVisibleContent rowsRv = buildRows(id, tabRows);
tabGroupRv.add(rowsRv);
break;
}
// else fall through...
default:
- final WebMarkupContainer tabGroup = new TabGroupPanel(id, getModel(), bs3TabGroup);
+ final WebMarkupContainer tabGroup = new TabGroupPanel(id, getModel(), bsTabGroup);
tabGroupRv.add(tabGroup);
break;
@@ -207,7 +207,7 @@ implements HasDynamicallyVisibleContent {
// fieldsets
final List<FieldSet> fieldSetsWithProperties =
- _NullSafe.stream(bs3Col.getFieldSets())
+ _NullSafe.stream(bsCol.getFieldSets())
.filter(_NullSafe::isPresent)
.filter(fieldSet -> ! _NullSafe.isEmpty(fieldSet.getProperties()))
.collect(Collectors.toList());
@@ -232,7 +232,7 @@ implements HasDynamicallyVisibleContent {
// collections
final List<CollectionLayoutData> collections =
- _NullSafe.stream(bs3Col.getCollections())
+ _NullSafe.stream(bsCol.getCollections())
.filter(
new Predicate<CollectionLayoutData>() {
@Override
@@ -286,9 +286,9 @@ implements HasDynamicallyVisibleContent {
final RepeatingViewWithDynamicallyVisibleContent rowRv =
new RepeatingViewWithDynamicallyVisibleContent(owningId);
- for(final BSRow bs3Row: rows) {
+ for(final BSRow bsRow: rows) {
final String id = rowRv.newChildId();
- final Row row = new Row(id, getModel(), bs3Row);
+ final Row row = new Row(id, getModel(), bsRow);
rowRv.add(row);
}
return rowRv;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/row/Row.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/row/Row.java
index 887ecd4e7c..2fbe16afdc 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/row/Row.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/row/Row.java
@@ -42,16 +42,16 @@ implements HasDynamicallyVisibleContent {
private static final String ID_ROW_CONTENTS = "rowContents";
- private final BSRow bs3Row;
+ private final BSRow bsRow;
public Row(
final String id,
final EntityModel entityModel,
- final BSRow bs3Row) {
+ final BSRow bsRow) {
super(id, entityModel);
- this.bs3Row = bs3Row;
+ this.bsRow = bsRow;
buildGui();
}
@@ -61,22 +61,22 @@ implements HasDynamicallyVisibleContent {
final RepeatingViewWithDynamicallyVisibleContent rv =
new RepeatingViewWithDynamicallyVisibleContent(ID_ROW_CONTENTS);
- for(final BSRowContent bs3RowContent: bs3Row.getCols()) {
+ for(final BSRowContent bsRowContent: bsRow.getCols()) {
final String id = rv.newChildId();
final WebMarkupContainer rowContent;
- if(bs3RowContent instanceof BSCol) {
+ if(bsRowContent instanceof BSCol) {
- final BSCol bs3Col = (BSCol) bs3RowContent;
- final Col col = new Col(id, getModel(), bs3Col);
+ final BSCol bsCol = (BSCol) bsRowContent;
+ final Col col = new Col(id, getModel(), bsCol);
visible = visible || col.isVisible();
rowContent = col;
- } else if (bs3RowContent instanceof BSClearFix) {
- final BSClearFix bs3ClearFix = (BSClearFix) bs3RowContent;
- rowContent = new ClearFix(id, getModel(), bs3ClearFix);
+ } else if (bsRowContent instanceof BSClearFix) {
+ final BSClearFix bsClearFix = (BSClearFix) bsRowContent;
+ rowContent = new ClearFix(id, getModel(), bsClearFix);
} else {
throw new IllegalStateException("Unrecognized implementation of BSRowContent");
}
@@ -87,7 +87,7 @@ implements HasDynamicallyVisibleContent {
final WebMarkupContainer panel = this;
if(visible) {
Wkt.cssAppend(panel, "row");
- Wkt.cssAppend(panel, bs3Row.getCssClass());
+ Wkt.cssAppend(panel, bsRow.getCssClass());
panel.add(rv);
} else {
WktComponents.permanentlyHide(panel, rv.getId());
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java
index 888e8aed7f..6c064aa399 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java
@@ -51,22 +51,22 @@ implements HasDynamicallyVisibleContent {
private final ComponentHintKey selectedTabHintKey;
private final EntityModel entityModel;
- private static List<ITab> tabsFor(final EntityModel entityModel, final BSTabGroup bs3TabGroup) {
+ private static List<ITab> tabsFor(final EntityModel entityModel, final BSTabGroup bsTabGroup) {
final List<ITab> tabs = new ArrayList<>();
- final List<BSTab> tablist = _NullSafe.stream(bs3TabGroup.getTabs())
+ final List<BSTab> tablist = _NullSafe.stream(bsTabGroup.getTabs())
.filter(BSTab.Predicates.notEmpty())
.collect(Collectors.toList());
- for (val bs3Tab : tablist) {
- val repeatingViewWithDynamicallyVisibleContent = TabPanel.newRows(entityModel, bs3Tab);
- String tabName = bs3Tab.getName();
+ for (val bsTab : tablist) {
+ val repeatingViewWithDynamicallyVisibleContent = TabPanel.newRows(entityModel, bsTab);
+ String tabName = bsTab.getName();
tabs.add(new AbstractTab(Model.of(tabName)) {
private static final long serialVersionUID = 1L;
@Override
public Panel getPanel(final String panelId) {
- return new TabPanel(panelId, entityModel, bs3Tab, repeatingViewWithDynamicallyVisibleContent);
+ return new TabPanel(panelId, entityModel, bsTab, repeatingViewWithDynamicallyVisibleContent);
}
@Override
@@ -78,8 +78,8 @@ implements HasDynamicallyVisibleContent {
return tabs;
}
- public TabGroupPanel(final String id, final EntityModel entityModel, final BSTabGroup bs3TabGroup) {
- super(id, tabsFor(entityModel, bs3TabGroup));
+ public TabGroupPanel(final String id, final EntityModel entityModel, final BSTabGroup bsTabGroup) {
+ super(id, tabsFor(entityModel, bsTabGroup));
this.entityModel = entityModel;
this.selectedTabHintKey = ComponentHintKey.create(entityModel.getCommonContext(), this, SESSION_ATTR_SELECTED_TAB);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.java
index 670698bcfa..a179c69b97 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.java
@@ -41,17 +41,17 @@ implements HasUiHintDisambiguator, HasDynamicallyVisibleContent {
private static final String ID_TAB_PANEL = "tabPanel";
private static final String ID_ROWS = "rows";
- private final BSTab bs3Tab;
+ private final BSTab bsTab;
- public TabPanel(final String id, final EntityModel model, final BSTab bs3Tab) {
- this(id, model, bs3Tab, null);
+ public TabPanel(final String id, final EntityModel model, final BSTab bsTab) {
+ this(id, model, bsTab, null);
}
- public TabPanel(final String id, final EntityModel model, final BSTab bs3Tab, final RepeatingViewWithDynamicallyVisibleContent repeatingViewWithDynamicallyVisibleContent) {
+ public TabPanel(final String id, final EntityModel model, final BSTab bsTab, final RepeatingViewWithDynamicallyVisibleContent repeatingViewWithDynamicallyVisibleContent) {
super(id);
- this.bs3Tab = bs3Tab;
- buildGui(model, bs3Tab, repeatingViewWithDynamicallyVisibleContent);
+ this.bsTab = bsTab;
+ buildGui(model, bsTab, repeatingViewWithDynamicallyVisibleContent);
}
/**
@@ -60,20 +60,20 @@ implements HasUiHintDisambiguator, HasDynamicallyVisibleContent {
*/
@Override
public String getHintDisambiguator() {
- return bs3Tab.getName();
+ return bsTab.getName();
}
- protected void buildGui(final EntityModel model, final BSTab bs3Tab, final RepeatingViewWithDynamicallyVisibleContent rvIfAny) {
+ protected void buildGui(final EntityModel model, final BSTab bsTab, final RepeatingViewWithDynamicallyVisibleContent rvIfAny) {
final WebMarkupContainer div = new WebMarkupContainer(ID_TAB_PANEL);
- final RepeatingViewWithDynamicallyVisibleContent rv = rvIfAny != null ? rvIfAny : newRows(model, bs3Tab);
+ final RepeatingViewWithDynamicallyVisibleContent rv = rvIfAny != null ? rvIfAny : newRows(model, bsTab);
div.add(rv);
visible = visible || rv.isVisible();
final WebMarkupContainer panel = this;
if(visible) {
- Wkt.cssAppend(panel, bs3Tab.getCssClass());
+ Wkt.cssAppend(panel, bsTab.getCssClass());
panel.add(div);
} else {
WktComponents.permanentlyHide(panel, div.getId());
@@ -81,12 +81,12 @@ implements HasUiHintDisambiguator, HasDynamicallyVisibleContent {
}
- public static RepeatingViewWithDynamicallyVisibleContent newRows(final EntityModel model, final BSTab bs3Tab) {
+ public static RepeatingViewWithDynamicallyVisibleContent newRows(final EntityModel model, final BSTab bsTab) {
final RepeatingViewWithDynamicallyVisibleContent rv = new RepeatingViewWithDynamicallyVisibleContent(ID_ROWS);
- for(final BSRow bs3Row: bs3Tab.getRows()) {
+ for(final BSRow bsRow: bsTab.getRows()) {
final String newChildId = rv.newChildId();
- final Row row = new Row(newChildId, model, bs3Row);
+ final Row row = new Row(newChildId, model, bsRow);
rv.add(row);
}
return rv;