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 2016/03/13 19:59:45 UTC

[3/7] isis git commit: ISIS-1228: breaking out new domain services from DomainObjectContainer.

http://git-wip-us.apache.org/repos/asf/isis/blob/387fe368/core/runtime/src/main/java/org/apache/isis/core/runtime/services/config/ConfigurationServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/config/ConfigurationServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/config/ConfigurationServiceDefault.java
new file mode 100644
index 0000000..9e7a063
--- /dev/null
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/config/ConfigurationServiceDefault.java
@@ -0,0 +1,69 @@
+/*
+ *  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.core.runtime.services.config;
+
+import java.util.List;
+
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.Programmatic;
+
+@DomainService(
+        nature = NatureOfService.DOMAIN
+)
+public class ConfigurationServiceDefault
+        implements org.apache.isis.applib.services.config.ConfigurationService,
+                   org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceAware {
+
+
+    @Programmatic
+    @Override
+    public String getProperty(final String name) {
+        return getConfigurationService().getProperty(name);
+    }
+
+    @Programmatic
+    @Override
+    public String getProperty(final String name, final String defaultValue) {
+        final String value = getProperty(name);
+        return value == null ? defaultValue : value;
+    }
+
+    @Programmatic
+    @Override
+    public List<String> getPropertyNames() {
+        return getConfigurationService().getPropertyNames();
+    }
+
+
+
+    private org.apache.isis.core.metamodel.runtimecontext.ConfigurationService configurationService;
+
+    protected org.apache.isis.core.metamodel.runtimecontext.ConfigurationService getConfigurationService() {
+        return configurationService;
+    }
+
+    @Programmatic
+    @Override
+    public void setConfigurationService(final org.apache.isis.core.metamodel.runtimecontext.ConfigurationService configurationService) {
+        this.configurationService = configurationService;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/387fe368/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java
index 7862e5a..bc05331 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java
@@ -17,31 +17,33 @@
  *  under the License.
  */
 
-    package org.apache.isis.core.runtime.services.sudo;
+package org.apache.isis.core.runtime.services.sudo;
 
 import java.util.List;
 import java.util.concurrent.Callable;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
-import org.apache.isis.applib.DomainObjectContainer;
+
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.sudo.SudoService;
-import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;
+import org.apache.isis.applib.services.user.UserService;
+import org.apache.isis.core.metamodel.services.user.UserServiceDefault;
 
 @DomainService(
         nature = NatureOfService.DOMAIN
 )
 public class SudoServiceDefault implements SudoService {
 
-    private DomainObjectContainerDefault containerDefault;
+    private UserServiceDefault userServiceDefault;
 
     @Programmatic
     @PostConstruct
     public void init() {
-        if(container instanceof DomainObjectContainerDefault) {
-            containerDefault = (DomainObjectContainerDefault) container;
+        if(userService instanceof UserServiceDefault) {
+            userServiceDefault = (UserServiceDefault) userService;
         }
     }
 
@@ -50,10 +52,10 @@ public class SudoServiceDefault implements SudoService {
     public void sudo(final String user, final Runnable runnable) {
         ensureContainerOk();
         try {
-            containerDefault.overrideUser(user);
+            userServiceDefault.overrideUser(user);
             runnable.run();
         } finally {
-            containerDefault.resetOverrides();
+            userServiceDefault.resetOverrides();
         }
     }
 
@@ -62,12 +64,12 @@ public class SudoServiceDefault implements SudoService {
     public <T> T sudo(final String user, final Callable<T> callable) {
         ensureContainerOk();
         try {
-            containerDefault.overrideUser(user);
+            userServiceDefault.overrideUser(user);
             return callable.call();
         } catch (Exception e) {
             throw new RuntimeException(e);
         } finally {
-            containerDefault.resetOverrides();
+            userServiceDefault.resetOverrides();
         }
     }
 
@@ -76,10 +78,10 @@ public class SudoServiceDefault implements SudoService {
     public void sudo(final String username, final List<String> roles, final Runnable runnable) {
         ensureContainerOk();
         try {
-            containerDefault.overrideUserAndRoles(username, roles);
+            userServiceDefault.overrideUserAndRoles(username, roles);
             runnable.run();
         } finally {
-            containerDefault.resetOverrides();
+            userServiceDefault.resetOverrides();
         }
     }
 
@@ -88,23 +90,23 @@ public class SudoServiceDefault implements SudoService {
     public <T> T sudo(final String username, final List<String> roles, final Callable<T> callable) {
         ensureContainerOk();
         try {
-            containerDefault.overrideUserAndRoles(username, roles);
+            userServiceDefault.overrideUserAndRoles(username, roles);
             return callable.call();
         } catch (Exception e) {
             throw new RuntimeException(e);
         } finally {
-            containerDefault.resetOverrides();
+            userServiceDefault.resetOverrides();
         }
     }
 
     private void ensureContainerOk() {
-        if(containerDefault == null) {
+        if(userServiceDefault == null) {
             throw new IllegalStateException("DomainObjectContainer does not support the user being overridden");
         }
     }
 
 
     @Inject
-    private DomainObjectContainer container;
+    private UserService userService;
 
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/387fe368/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index 97a6ca3..a63571f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -2335,6 +2335,11 @@ public class PersistenceSession implements
     }
 
     @Override
+    public void beginTran() {
+        getTransactionManager().startTransaction();
+    }
+
+    @Override
     public boolean flush() {
         return getTransactionManager().flushTransaction();
     }

http://git-wip-us.apache.org/repos/asf/isis/blob/387fe368/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
index eb07ad6..61ec066 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
@@ -69,6 +69,11 @@ public final class ObjectAdapterPropertyColumn extends ColumnAbstract<ObjectAdap
         return label;
     }
 
+    @Override
+    public String getCssClass() {
+        final String cssClass = super.getCssClass();
+        return (cssClass != null ? (cssClass + " ") : "") + propertyExpression;
+    }
 
     @Override
     public void populateItem(final Item<ICellPopulator<ObjectAdapter>> cellItem, final String componentId, final IModel<ObjectAdapter> rowModel) {

http://git-wip-us.apache.org/repos/asf/isis/blob/387fe368/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
index 01824bd..53ca4c6 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
@@ -94,6 +94,8 @@ public class EntityCollectionPanel extends PanelAbstract<EntityModel> implements
         final WebMarkupContainer div = new WebMarkupContainer(ID_COLLECTION_GROUP);
 
         final EntityCollectionModel entityCollectionModel = EntityCollectionModel.createParented(getModel());
+        CssClassAppender.appendCssClassTo(div, entityCollectionModel.getCollectionMemento().getId());
+
         final OneToManyAssociation association = entityCollectionModel.getCollectionMemento().getCollection();
         final ObjectAdapter objectAdapter = getModel().getObject();
         final Consent visibility = association.isVisible(objectAdapter, InteractionInitiatedBy.USER, Where.OBJECT_FORMS);