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 2018/11/18 09:24:00 UTC

[isis] branch v2 updated: ISIS-1991: never show devutils in PRODUCTION

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

ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/v2 by this push:
     new 76fb7fe  ISIS-1991: never show devutils in PRODUCTION
76fb7fe is described below

commit 76fb7febe598f03cbf4945f9ba69f3757207465e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Nov 18 10:23:55 2018 +0100

    ISIS-1991: never show devutils in PRODUCTION
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-1991
---
 .../wicket/viewer/IsisWicketApplication.java       | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 8356a41..bcace7c 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -353,23 +353,23 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
                 DebugDiskDataStore.register(this);
                 LOG.info("DebugDiskDataStore registered; access via ~/wicket/internal/debug/diskDataStore");
                 LOG.info("DebugDiskDataStore: eg, http://localhost:8080/wicket/wicket/internal/debug/diskDataStore");
-            }
 
-            if(!getDebugSettings().isDevelopmentUtilitiesEnabled()) {
-                boolean enableDevUtils = configuration
-                        .getBoolean(ENABLE_DEVELOPMENT_UTILITIES_KEY, ENABLE_DEVELOPMENT_UTILITIES_DEFAULT);
-                if(enableDevUtils) {
-                    getDebugSettings().setDevelopmentUtilitiesEnabled(true);
-
-                    // copied from DebugBarInitializer
-                    // this is hacky, but need to do this because IInitializer#init() called before
-                    // the Application's #init() is called.
-                    // an alternative, better, design might be to move Isis' own initialization into an
-                    // implementation of IInitializer?
-                    DebugBar.registerContributor(VersionDebugContributor.DEBUG_BAR_CONTRIB, this);
-                    DebugBar.registerContributor(InspectorDebugPanel.DEBUG_BAR_CONTRIB, this);
-                    DebugBar.registerContributor(SessionSizeDebugPanel.DEBUG_BAR_CONTRIB, this);
-                    DebugBar.registerContributor(PageSizeDebugPanel.DEBUG_BAR_CONTRIB, this);
+                if(!getDebugSettings().isDevelopmentUtilitiesEnabled()) {
+                    boolean enableDevUtils = configuration
+                            .getBoolean(ENABLE_DEVELOPMENT_UTILITIES_KEY, ENABLE_DEVELOPMENT_UTILITIES_DEFAULT);
+                    if(enableDevUtils) {
+                        getDebugSettings().setDevelopmentUtilitiesEnabled(true);
+    
+                        // copied from DebugBarInitializer
+                        // this is hacky, but need to do this because IInitializer#init() called before
+                        // the Application's #init() is called.
+                        // an alternative, better, design might be to move Isis' own initialization into an
+                        // implementation of IInitializer?
+                        DebugBar.registerContributor(VersionDebugContributor.DEBUG_BAR_CONTRIB, this);
+                        DebugBar.registerContributor(InspectorDebugPanel.DEBUG_BAR_CONTRIB, this);
+                        DebugBar.registerContributor(SessionSizeDebugPanel.DEBUG_BAR_CONTRIB, this);
+                        DebugBar.registerContributor(PageSizeDebugPanel.DEBUG_BAR_CONTRIB, this);
+                    }
                 }
             }