You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/06/16 22:53:30 UTC

[causeway] 04/09: CAUSEWAY-3395: removes TabDemo from demo app

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git

commit b5457d846abc5ecabcc88be04a9625d3d8fb95be
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jun 16 19:45:52 2023 +0100

    CAUSEWAY-3395: removes TabDemo from demo app
---
 .../java/demoapp/dom/featured/FeaturedMenu.java    | 12 ---
 .../featured/layout/tabs/TabDemo-description.adoc  |  8 --
 .../demoapp/dom/featured/layout/tabs/TabDemo.java  | 91 --------------------
 .../dom/featured/layout/tabs/TabDemo.layout.xml    | 99 ----------------------
 4 files changed, 210 deletions(-)

diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java
index 7b70f397d6..c5abfe4a6e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java
@@ -43,7 +43,6 @@ import lombok.val;
 import demoapp.dom.featured.customui.GeoapifyClient;
 import demoapp.dom.featured.customui.Zoom;
 import demoapp.dom.featured.layout.tooltip.TooltipPage;
-import demoapp.dom.featured.layout.tabs.TabDemo;
 
 @Named("demo.FeaturedMenu")
 @DomainService(
@@ -72,17 +71,6 @@ public class FeaturedMenu {
     }
 
 
-    @Action
-    @ActionLayout(
-            cssClassFa="fa-bolt",
-            describedAs="Opens the Tabs-Demo page.",
-            hidden = Where.EVERYWHERE               // TODO: not sure this is particularly valuable
-    )
-    public TabDemo tabDemo(){
-        return factoryService.viewModel(new TabDemo());
-    }
-
-
 
 //tag::whereInTheWorldAction[]
     @Inject private GeoapifyClient geoapifyClient;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo-description.adoc
deleted file mode 100644
index cf204ed971..0000000000
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo-description.adoc
+++ /dev/null
@@ -1,8 +0,0 @@
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-(since 1.x)
-
-//TODO
-
-See the sources for this demo here:
-link:${SOURCES_DEMO}/demoapp/dom/tabs[sources]
\ No newline at end of file
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.java
deleted file mode 100644
index 9e667351d6..0000000000
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package demoapp.dom.featured.layout.tabs;
-
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.apache.causeway.applib.annotation.Action;
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.DomainObjectLayout;
-import org.apache.causeway.applib.annotation.Editing;
-import org.apache.causeway.applib.annotation.MemberSupport;
-import org.apache.causeway.applib.annotation.Nature;
-import org.apache.causeway.applib.annotation.ObjectSupport;
-import org.apache.causeway.applib.annotation.Property;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
-@Named("demo.TabDemo")
-@DomainObject(nature=Nature.VIEW_MODEL)
-@DomainObjectLayout(cssClassFa="fa-bolt")
-@XmlRootElement(name = "root")
-@XmlType
-@XmlAccessorType(XmlAccessType.FIELD)
-@NoArgsConstructor
-public class TabDemo implements HasAsciiDocDescription {
-
-    @ObjectSupport public String title() {
-        return "Tab Demo";
-    }
-
-    // -- HIDE
-
-    @Action
-    public TabDemo doHideField(){
-        hidden = true;
-        return this;
-    }
-
-    @Action
-    public TabDemo doShowField(){
-        hidden = false;
-        return this;
-    }
-
-    // -- DEMO FIELD 1
-
-    @Getter @Setter private String field1 = "field 1";
-    @MemberSupport public boolean hideField1() {
-        return hidden;
-    }
-
-    // -- DEMO FIELD 2-4
-
-    @Getter @Setter private String field2 = "field 2";
-
-    @Property(editing = Editing.ENABLED)
-    @Getter @Setter private String field3 = "field 3";
-
-    @Property(editing = Editing.ENABLED)
-    @Getter @Setter private String field4 = "field 4";
-
-    // ---
-
-    private boolean hidden = false;
-
-
-}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.layout.xml
deleted file mode 100644
index dc8d8ec6e8..0000000000
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.layout.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-	license agreements. See the NOTICE file distributed with this work for additional
-	information regarding copyright ownership. The ASF licenses this file to
-	you under the Apache License, Version 2.0 (the "License"); you may not use
-	this file except in compliance with the License. You may obtain a copy of
-	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
-	by applicable law or agreed to in writing, software distributed under the
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-	OF ANY KIND, either express or implied. See the License for the specific
-	language governing permissions and limitations under the License. -->
-<bs3:grid xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
-          xmlns:cpt="https://causeway.apache.org/applib/layout/component"
->
-    <bs3:row>
-        <bs3:col span="10" unreferencedActions="true">
-            <cpt:domainObject />
-            <cpt:action id="doHideField"/>
-            <cpt:action id="doShowField"/>
-        </bs3:col>
-        <bs3:col span="2">
-            <cpt:fieldSet name="" id="sources" />
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="6">
-
-        	<bs3:tabGroup>
-				<bs3:tab name="Tab 1">
-					<bs3:row>
-						<bs3:col span="12">
-							<cpt:fieldSet id="fs1" name="Hideable Field">
-								<cpt:property id="field1"/>
-							</cpt:fieldSet>
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-
-				<bs3:tab name="Tab 2">
-					<bs3:row>
-						<bs3:col span="12">
-							<cpt:fieldSet id="fs2"> <!-- unnamed fieldset -->
-								<cpt:property id="field2"/>
-							</cpt:fieldSet>
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-
-				<bs3:tab name="Tab 3">
-					<bs3:row>
-						<bs3:col span="12">
-							<cpt:fieldSet id="fs3" name="Fieldset 3">
-								<cpt:property id="field3"/>
-							</cpt:fieldSet>
-							<cpt:fieldSet id="fs4" name="Fieldset 4">
-								<cpt:property id="field4"/>
-							</cpt:fieldSet>
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-
-			</bs3:tabGroup>
-			<bs3:row>
-				<bs3:col span="12">
-					<cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-				</bs3:col>
-			</bs3:row>
-
-
-<!--         	<cpt:fieldSet name="Tabs" id="tabs"> -->
-<!--                 <cpt:property id="field"/> -->
-<!--             </cpt:fieldSet> -->
-
-        </bs3:col>
-        <bs3:col span="6">
-
-			<cpt:fieldSet name="Description" id="description" >
-				<cpt:action id="clearHints" position="PANEL" />
-				<cpt:action id="rebuildMetamodel" position="PANEL"/>
-				<cpt:action id="downloadLayout"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="inspectMetamodel"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="downloadMetamodelXml"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="downloadJdoMetamodel"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="recentExecutions"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="recentAuditTrailEntries"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="impersonateWithRoles"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="openRestApi" position="PANEL_DROPDOWN" />
-				<cpt:property id="description"/>
-			</cpt:fieldSet>
-
-        </bs3:col>
-    </bs3:row>
-	<bs3:row>
-		<bs3:col span="12" unreferencedCollections="true"/>
-	</bs3:row>
-
-
-</bs3:grid>