You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/11/04 16:24:33 UTC
[1/3] isis git commit: ISIS-830: further improvements to error
message.
Repository: isis
Updated Branches:
refs/heads/master f1c65d0e1 -> 24388d7fe
ISIS-830: further improvements to error message.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/acf1860d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/acf1860d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/acf1860d
Branch: refs/heads/master
Commit: acf1860d678c8c04783ac76888c2f684d1278621
Parents: f1c65d0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Nov 4 15:12:29 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Nov 4 15:12:29 2015 +0000
----------------------------------------------------------------------
.../core/runtime/services/eventbus/EventBusServiceDefault.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/acf1860d/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
index 93aafc4..cf6a630 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
@@ -17,9 +17,12 @@
package org.apache.isis.core.runtime.services.eventbus;
import java.util.Map;
+
import javax.annotation.PostConstruct;
import javax.enterprise.context.RequestScoped;
+
import com.google.common.base.Strings;
+
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.eventbus.EventBusImplementation;
@@ -63,7 +66,7 @@ public abstract class EventBusServiceDefault extends EventBusService {
// a singleton
if (!allowLateRegistration && hasPosted()) {
// ... coming too late to the party.
- throw new IllegalStateException("Events have already been posted; too late to register any further (singleton) subscribers. Either use @DomainServiceLayout(menuOrder=...) to ensure that subscribers are initialized before any services that might post events, or alternatively use '" + KEY_ALLOW_LATE_REGISTRATION + "' configuration property to relax this check (meaning that some subscribers will miss some posted events)");
+ throw new IllegalStateException("Attempting to register '" + domainService.getClass().getSimpleName() + "' as a subscriber. However events have already been posted and it is too late to register any further (singleton) subscribers. Either use @DomainServiceLayout(menuOrder=...) on subscribing services to ensure that subscribers are initialized before any services that might post events, or alternatively use '" + KEY_ALLOW_LATE_REGISTRATION + "' configuration property to relax this check (meaning that some subscribers will miss some posted events)");
}
}
super.register(domainService);
[2/3] isis git commit: ISIS-1213: shouldn't be able to contribute or
mixin to another mixin.
Posted by da...@apache.org.
ISIS-1213: shouldn't be able to contribute or mixin to another mixin.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f37ea89e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f37ea89e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f37ea89e
Branch: refs/heads/master
Commit: f37ea89eb40e09cc2afce1745c963989c6234777
Parents: acf1860
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Nov 4 15:13:26 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Nov 4 15:13:26 2015 +0000
----------------------------------------------------------------------
.../specloader/specimpl/ObjectSpecificationAbstract.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f37ea89e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index fd6bf5c..d2fa3c6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -741,8 +741,12 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
if(contributed.isIncluded() && !contributeeAndMixedInActionsAdded) {
synchronized (this.objectActions) {
final List<ObjectAction> actions = Lists.newArrayList(this.objectActions);
- actions.addAll(createContributeeActions());
- actions.addAll(createMixedInActions());
+ if (containsDoOpFacet(MixinFacet.class)) {
+ // don't contribute to mixins themselves!
+ } else {
+ actions.addAll(createContributeeActions());
+ actions.addAll(createMixedInActions());
+ }
sortCacheAndUpdateActions(actions);
contributeeAndMixedInActionsAdded = true;
}
[3/3] isis git commit: ISIS-1195: refined the handling of the
activeTheme as per cookies vs held in persistent store somehow.
Posted by da...@apache.org.
ISIS-1195: refined the handling of the activeTheme as per cookies vs held in persistent store somehow.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/24388d7f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/24388d7f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/24388d7f
Branch: refs/heads/master
Commit: 24388d7fe945ec8f4deaa3484377fffc8d4762e1
Parents: f37ea89
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Nov 4 15:21:56 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Nov 4 15:21:56 2015 +0000
----------------------------------------------------------------------
.../widgets/themepicker/ThemeChooser.java | 36 +++++++++++++-------
1 file changed, 23 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/24388d7f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
index 2df759e..1a556f4 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
@@ -18,26 +18,16 @@
*/
package org.apache.isis.viewer.wicket.ui.components.widgets.themepicker;
-import de.agilecoders.wicket.core.Bootstrap;
-import de.agilecoders.wicket.core.settings.ActiveThemeProvider;
-import de.agilecoders.wicket.core.settings.IBootstrapSettings;
-import de.agilecoders.wicket.core.settings.ITheme;
-import de.agilecoders.wicket.core.settings.SingleThemeProvider;
-import de.agilecoders.wicket.core.util.Attributes;
-import de.agilecoders.wicket.themes.markup.html.bootstrap.BootstrapThemeTheme;
-import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchTheme;
-import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvider;
-import de.agilecoders.wicket.themes.markup.html.vegibit.VegibitTheme;
-import de.agilecoders.wicket.themes.markup.html.vegibit.VegibitThemeProvider;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
+
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -50,9 +40,23 @@ import org.apache.wicket.util.cookies.CookieUtils;
import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import de.agilecoders.wicket.core.Bootstrap;
+import de.agilecoders.wicket.core.settings.ActiveThemeProvider;
+import de.agilecoders.wicket.core.settings.IBootstrapSettings;
+import de.agilecoders.wicket.core.settings.ITheme;
+import de.agilecoders.wicket.core.settings.SessionThemeProvider;
+import de.agilecoders.wicket.core.settings.SingleThemeProvider;
+import de.agilecoders.wicket.core.util.Attributes;
+import de.agilecoders.wicket.themes.markup.html.bootstrap.BootstrapThemeTheme;
+import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchTheme;
+import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvider;
+import de.agilecoders.wicket.themes.markup.html.vegibit.VegibitTheme;
+import de.agilecoders.wicket.themes.markup.html.vegibit.VegibitThemeProvider;
+
/**
* A panel used as a Navbar item to change the application theme/skin
*/
@@ -84,7 +88,13 @@ public class ThemeChooser extends Panel {
public ThemeChooser(String id) {
super(id);
- initializeActiveThemeFromCookie();
+ final ActiveThemeProvider activeThemeProvider = getActiveThemeProvider();
+ if(activeThemeProvider.getClass() == SessionThemeProvider.class) {
+ initializeActiveThemeFromCookie();
+ } else {
+ // if anything other than the default, then we do NOT initialize
+ // (on the assumption that it is a persistent store and we don't want to overwrite).
+ }
ListView<String> themesView = new ListView<String>("themes", getThemeNames()) {