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 2020/01/21 13:21:12 UTC
[isis] branch master updated: ISIS-2270: replace references to
FactoryService#instantiate (demo)
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 edd8c30 ISIS-2270: replace references to FactoryService#instantiate (demo)
edd8c30 is described below
commit edd8c3031ad3347035f685b783f198d1188c4ae8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 21 14:21:00 2020 +0100
ISIS-2270: replace references to FactoryService#instantiate (demo)
---
.../runtimeservices/homepage/HomePageResolverServiceDefault.java | 4 ++--
.../src/main/java/demoapp/dom/actions/async/AsyncActionMenu.java | 2 +-
.../java/demoapp/dom/actions/depargs/DependentArgsActionMenu.java | 2 +-
examples/demo/src/main/java/demoapp/dom/error/ErrorMenu.java | 2 +-
.../demo/src/main/java/demoapp/dom/events/EventsDemoMenu.java | 2 +-
examples/demo/src/main/java/demoapp/dom/jee/JeeMenu.java | 2 +-
examples/demo/src/main/java/demoapp/dom/tabs/TabMenu.java | 2 +-
examples/demo/src/main/java/demoapp/dom/tooltip/TooltipMenu.java | 2 +-
examples/demo/src/main/java/demoapp/dom/tree/TreeDemoMenu.java | 2 +-
.../demo/src/main/java/demoapp/dom/types/FeaturedTypesMenu.java | 8 ++++----
10 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/homepage/HomePageResolverServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/homepage/HomePageResolverServiceDefault.java
index b67daba..6a2bb2c 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/homepage/HomePageResolverServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/homepage/HomePageResolverServiceDefault.java
@@ -136,7 +136,7 @@ public class HomePageResolverServiceDefault implements HomePageResolverService {
@Action
public Object homePage() {
- val viewModelPojo = factoryService.instantiate(viewModelType);
+ val viewModelPojo = factoryService.viewModel(viewModelType);
return viewModelPojo;
}
@@ -189,7 +189,7 @@ public class HomePageResolverServiceDefault implements HomePageResolverService {
final ManagedObject adapterForHomePageActionDeclaringPojo;
if(spec.isViewModel()) {
- val viewModelPojo = factoryService.instantiate(spec.getCorrespondingClass());
+ val viewModelPojo = factoryService.viewModel(spec.getCorrespondingClass());
adapterForHomePageActionDeclaringPojo = ManagedObject.of(spec, viewModelPojo);
} else if(spec.isManagedBean()) {
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionMenu.java b/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionMenu.java
index 095cc8d..86a7148 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionMenu.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionMenu.java
@@ -38,7 +38,7 @@ public class AsyncActionMenu {
@Action
@ActionLayout(cssClassFa="fa-bolt")
public AsyncActionDemo asyncActions(){
- val demo = factoryService.instantiate(AsyncActionDemo.class);
+ val demo = factoryService.viewModel(AsyncActionDemo.class);
demo.initDefaults();
return demo;
}
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionMenu.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionMenu.java
index cb1426f..eefd323 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionMenu.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionMenu.java
@@ -38,7 +38,7 @@ public class DependentArgsActionMenu {
@Action
@ActionLayout(cssClassFa="fa-bolt")
public DependentArgsActionDemo dependentArgsActions(){
- val demo = factoryService.instantiate(DependentArgsActionDemo.class);
+ val demo = factoryService.viewModel(DependentArgsActionDemo.class);
demo.initDefaults();
return demo;
}
diff --git a/examples/demo/src/main/java/demoapp/dom/error/ErrorMenu.java b/examples/demo/src/main/java/demoapp/dom/error/ErrorMenu.java
index 5c1d3d5..1e14a9c 100644
--- a/examples/demo/src/main/java/demoapp/dom/error/ErrorMenu.java
+++ b/examples/demo/src/main/java/demoapp/dom/error/ErrorMenu.java
@@ -38,7 +38,7 @@ public class ErrorMenu {
@Action
@ActionLayout(cssClassFa="fa-bolt")
public ErrorDemo errorHandling(){
- val demo = factoryService.instantiate(ErrorDemo.class);
+ val demo = factoryService.viewModel(ErrorDemo.class);
demo.initDefaults();
return demo;
}
diff --git a/examples/demo/src/main/java/demoapp/dom/events/EventsDemoMenu.java b/examples/demo/src/main/java/demoapp/dom/events/EventsDemoMenu.java
index 5ade4a4..9805084 100644
--- a/examples/demo/src/main/java/demoapp/dom/events/EventsDemoMenu.java
+++ b/examples/demo/src/main/java/demoapp/dom/events/EventsDemoMenu.java
@@ -38,7 +38,7 @@ public class EventsDemoMenu {
@Action
@ActionLayout(cssClassFa="fa-bolt")
public EventsDemo eventsDemo(){
- val demo = factoryService.instantiate(EventsDemo.class);
+ val demo = factoryService.viewModel(EventsDemo.class);
demo.initDefaults();
return demo;
}
diff --git a/examples/demo/src/main/java/demoapp/dom/jee/JeeMenu.java b/examples/demo/src/main/java/demoapp/dom/jee/JeeMenu.java
index e48caf0..90c15fb 100644
--- a/examples/demo/src/main/java/demoapp/dom/jee/JeeMenu.java
+++ b/examples/demo/src/main/java/demoapp/dom/jee/JeeMenu.java
@@ -36,7 +36,7 @@ public class JeeMenu {
@Action
@ActionLayout(cssClassFa="fa-bolt")
public JeeDemo jeeInjectDemo(){
- val demo = factoryService.instantiate(JeeDemo.class);
+ val demo = factoryService.viewModel(JeeDemo.class);
demo.initDefaults();
return demo;
}
diff --git a/examples/demo/src/main/java/demoapp/dom/tabs/TabMenu.java b/examples/demo/src/main/java/demoapp/dom/tabs/TabMenu.java
index d76e268..e53f35c 100644
--- a/examples/demo/src/main/java/demoapp/dom/tabs/TabMenu.java
+++ b/examples/demo/src/main/java/demoapp/dom/tabs/TabMenu.java
@@ -38,7 +38,7 @@ public class TabMenu {
cssClassFa="fa-bolt",
describedAs="Opens the Tabs-Demo page.")
public TabDemo tabDemo(){
- val demo = factoryService.instantiate(TabDemo.class);
+ val demo = factoryService.viewModel(TabDemo.class);
demo.initDefaults();
return demo;
}
diff --git a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipMenu.java b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipMenu.java
index 4d854f8..65f5d2c 100644
--- a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipMenu.java
+++ b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipMenu.java
@@ -38,7 +38,7 @@ public class TooltipMenu {
cssClassFa="fa-bolt",
describedAs="Opens the Tooltip-Demo page.")
public TooltipDemo tooltipDemo(){
- val demo = factoryService.instantiate(TooltipDemo.class);
+ val demo = factoryService.viewModel(TooltipDemo.class);
demo.initDefaults();
return demo;
}
diff --git a/examples/demo/src/main/java/demoapp/dom/tree/TreeDemoMenu.java b/examples/demo/src/main/java/demoapp/dom/tree/TreeDemoMenu.java
index 67fd98b..b6df117 100644
--- a/examples/demo/src/main/java/demoapp/dom/tree/TreeDemoMenu.java
+++ b/examples/demo/src/main/java/demoapp/dom/tree/TreeDemoMenu.java
@@ -40,7 +40,7 @@ public class TreeDemoMenu {
@Action
@ActionLayout(cssClassFa="fa-tree")
public DemoStub fileSystemTree(){
- val demo = factoryService.instantiate(TreeDemo.class);
+ val demo = factoryService.viewModel(TreeDemo.class);
demo.initDefaults();
return demo;
}
diff --git a/examples/demo/src/main/java/demoapp/dom/types/FeaturedTypesMenu.java b/examples/demo/src/main/java/demoapp/dom/types/FeaturedTypesMenu.java
index 112bdec..412885d 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/FeaturedTypesMenu.java
+++ b/examples/demo/src/main/java/demoapp/dom/types/FeaturedTypesMenu.java
@@ -43,7 +43,7 @@ public class FeaturedTypesMenu {
@Action
@ActionLayout(cssClassFa="fa-font")
public TextDemo text(){
- val demo = factoryService.instantiate(TextDemo.class);
+ val demo = factoryService.viewModel(TextDemo.class);
demo.initDefaults();
return demo;
}
@@ -51,7 +51,7 @@ public class FeaturedTypesMenu {
@Action
@ActionLayout(cssClassFa="fa-hashtag")
public PrimitivesDemo primitives(){
- val demo = factoryService.instantiate(PrimitivesDemo.class);
+ val demo = factoryService.viewModel(PrimitivesDemo.class);
demo.initDefaults();
return demo;
}
@@ -59,7 +59,7 @@ public class FeaturedTypesMenu {
@Action
@ActionLayout(cssClassFa="fa-clock-o")
public TemporalDemo temporals(){
- val demo = factoryService.instantiate(TemporalDemo.class);
+ val demo = factoryService.viewModel(TemporalDemo.class);
demo.initDefaults();
return demo;
}
@@ -67,7 +67,7 @@ public class FeaturedTypesMenu {
@Action
@ActionLayout(cssClassFa="fa-cloud")
public BlobDemo blobs(){
- val demo = factoryService.instantiate(BlobDemo.class);
+ val demo = factoryService.viewModel(BlobDemo.class);
demo.initDefaults();
return demo;
}