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 2021/05/21 14:23:20 UTC

[isis] branch master updated: ISIS-2601: cleaning up (more dead code)

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 2e8a583  ISIS-2601: cleaning up (more dead code)
2e8a583 is described below

commit 2e8a58308f26f5b99bc5b566df0705f293952116
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri May 21 16:23:11 2021 +0200

    ISIS-2601: cleaning up (more dead code)
---
 .../src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java | 4 ----
 .../viewer/registries/components/ComponentFactoryRegistryDefault.java | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
index 373a83c..b9596cb 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
@@ -115,10 +115,6 @@ public enum ComponentType {
      */
     STANDALONE_COLLECTION,
     /**
-     * Bookmarked link to invoke an action
-     */
-    ACTION_LINK,
-    /**
      * A collection of entities (the value of)
      */
     COLLECTION_CONTENTS,
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
index 21a83ac..a05fdca 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
@@ -111,7 +111,7 @@ public class ComponentFactoryRegistryDefault implements ComponentFactoryRegistry
 
     private void ensureAllComponentTypesRegistered() {
         for (val componentType : ComponentType.values()) {
-            final Collection<ComponentFactory> componentFactories = componentFactoriesByType.get(componentType);
+            final Collection<ComponentFactory> componentFactories = componentFactoriesByType.getOrElseEmpty(componentType);
             if (componentFactories.isEmpty()) {
                 throw new IllegalStateException("No component factories registered for " + componentType);
             }