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 4f17375e84 ISIS-3116: purge WicketViewerSettingsAccessor
4f17375e84 is described below
commit 4f17375e84e3caf8c529ec9972874cb97cbe6296
Author: Andi Huber <[email protected]>
AuthorDate: Wed Aug 10 09:07:52 2022 +0200
ISIS-3116: purge WicketViewerSettingsAccessor
---
.../apache/isis/core/config/IsisConfiguration.java | 4 +++-
.../testdomain/conf/Configuration_usingWicket.java | 8 -------
.../model/isis/WicketViewerSettingsAccessor.java | 25 ----------------------
.../widgets/linkandlabel/ActionLink.java | 11 ++++++----
.../viewer/wicketapp/IsisWicketApplication.java | 8 -------
5 files changed, 10 insertions(+), 46 deletions(-)
diff --git
a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index fc796dd468..3052f42b97 100644
---
a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++
b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -68,6 +68,8 @@ import org.apache.isis.applib.services.userui.UserMenu;
import
org.apache.isis.applib.value.semantics.TemporalValueSemantics.TemporalEditingPattern;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.core.config.IsisConfiguration.Core;
+import org.apache.isis.core.config.IsisConfiguration.Viewer;
import org.apache.isis.core.config.metamodel.facets.DefaultViewConfiguration;
import
org.apache.isis.core.config.metamodel.facets.EditingObjectsConfiguration;
import
org.apache.isis.core.config.metamodel.facets.PublishingPolicies.ActionPublishingPolicy;
@@ -1942,7 +1944,7 @@ public class IsisConfiguration {
private int maxTitleLengthInTables = 12;
private static boolean isValidTitleLenght(final int len) {
- return len>0;
+ return len>=0;
}
private int asTitleLenght(final int len) {
return isValidTitleLenght(len)
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingWicket.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingWicket.java
index 7a2414cc5d..5864777bd2 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingWicket.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingWicket.java
@@ -50,7 +50,6 @@ import static org.junit.Assert.assertEquals;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.config.IsisConfiguration.Viewer.Wicket;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
@@ -58,7 +57,6 @@ import
org.apache.isis.core.runtime.context.IsisAppCommonContext;
import
org.apache.isis.core.runtime.context.IsisAppCommonContext.HasCommonContext;
import org.apache.isis.testdomain.util.dto.BookDto;
import org.apache.isis.testdomain.util.dto.IBook;
-import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettingsAccessor;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.model.util.PageParameterUtils;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
@@ -300,7 +298,6 @@ public class Configuration_usingWicket {
extends WebApplication
implements
ComponentFactoryRegistryAccessor,
- WicketViewerSettingsAccessor,
HasCommonContext {
private static final long serialVersionUID = 1L;
@@ -328,11 +325,6 @@ public class Configuration_usingWicket {
private final PageClassRegistry pageClassRegistry =
getCommonContext().lookupServiceElseFail(PageClassRegistry.class);
- @Override
- public Wicket getSettings() {
- return
getCommonContext().getConfiguration().getViewer().getWicket();
- }
-
@Override
public Class<? extends Page> getHomePage() {
return getPageClassRegistry().getPageClass(PageType.HOME);
diff --git
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettingsAccessor.java
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettingsAccessor.java
deleted file mode 100644
index 8a2f0539ee..0000000000
---
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettingsAccessor.java
+++ /dev/null
@@ -1,25 +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 org.apache.isis.viewer.wicket.model.isis;
-
-public interface WicketViewerSettingsAccessor {
-
- org.apache.isis.core.config.IsisConfiguration.Viewer.Wicket getSettings();
-
-}
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
index 605c89c380..0d6872e4d1 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
@@ -33,7 +33,6 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
import org.apache.isis.viewer.commons.model.components.ComponentType;
-import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettingsAccessor;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
import org.apache.isis.viewer.wicket.model.models.ActionPromptWithExtraContent;
@@ -157,9 +156,9 @@ extends IndicatingAjaxLink<ManagedObject> {
: null;
}
- protected Wicket getSettings() {
- return ((WicketViewerSettingsAccessor)
Application.get()).getSettings();
- }
+// protected Wicket getSettings() {
+// return ((WicketViewerSettingsAccessor)
Application.get()).getSettings();
+// }
@Override
public void onClick(final AjaxRequestTarget target) {
@@ -261,4 +260,8 @@ extends IndicatingAjaxLink<ManagedObject> {
return ((ComponentFactoryRegistryAccessor)
Application.get()).getComponentFactoryRegistry();
}
+ public Wicket getSettings() {
+ return getCommonContext().getConfiguration().getViewer().getWicket();
+ }
+
}
diff --git
a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
index 1e59486637..f83aeb7c7e 100644
---
a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
+++
b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
@@ -53,7 +53,6 @@ import
org.apache.wicket.spring.injection.annot.SpringComponentInjector;
import org.apache.isis.commons.internal.concurrent._ConcurrentContext;
import org.apache.isis.commons.internal.concurrent._ConcurrentTaskList;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.core.config.IsisConfiguration.Viewer.Wicket;
import org.apache.isis.core.config.environment.IsisSystemEnvironment;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.memento.ObjectMemento;
@@ -61,7 +60,6 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
import
org.apache.isis.core.runtime.context.IsisAppCommonContext.HasCommonContext;
import org.apache.isis.viewer.wicket.model.isis.WicketApplicationInitializer;
-import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettingsAccessor;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
@@ -103,7 +101,6 @@ extends AuthenticatedWebApplication
implements
ComponentFactoryRegistryAccessor,
PageClassRegistryAccessor,
- WicketViewerSettingsAccessor,
HasCommonContext {
private static final long serialVersionUID = 1L;
@@ -425,9 +422,4 @@ implements
return (Class<? extends WebPage>)
getPageClassRegistry().getPageClass(PageType.PASSWORD_RESET);
}
- @Override
- public Wicket getSettings() {
- return configuration.getViewer().getWicket();
- }
-
}
