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/09/15 08:03:54 UTC
[49/50] [abbrv] isis git commit: ISIS-1194: simplifying the provision
of DeploymentCategory...
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
index ffb55b0..62ab8c7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
@@ -124,7 +124,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertyAccessorFacetViaAccessorFactory facetFactory = new PropertyAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -149,7 +149,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -179,7 +179,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -209,7 +209,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -235,7 +235,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
facetFactoryForModify.setSpecificationLoader(programmableReflector);
facetFactoryForModify.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactoryForModify.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactoryForModify.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final PropertySetAndClearFacetFactory facetFactoryForSetter = new PropertySetAndClearFacetFactory();
facetFactoryForSetter.setSpecificationLoader(programmableReflector);
@@ -271,12 +271,12 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final PropertyModifyFacetFactory facetFactoryForModify = new PropertyModifyFacetFactory();
facetFactoryForModify.setSpecificationLoader(programmableReflector);
facetFactoryForModify.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactoryForModify.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactoryForModify.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final DisabledFacetOnPropertyInferredFactory disabledFacetOnPropertyInferredFactory = new DisabledFacetOnPropertyInferredFactory();
@@ -312,12 +312,12 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final PropertyModifyFacetFactory facetFactoryForModify = new PropertyModifyFacetFactory();
facetFactoryForModify.setSpecificationLoader(programmableReflector);
facetFactoryForModify.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactoryForModify.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactoryForModify.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -355,7 +355,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -385,7 +385,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -413,7 +413,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertyChoicesFacetViaMethodFactory facetFactory = new PropertyChoicesFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -444,7 +444,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertyAutoCompleteFacetMethodFactory facetFactory = new PropertyAutoCompleteFacetMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -475,7 +475,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertyDefaultFacetViaMethodFactory facetFactory = new PropertyDefaultFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -507,7 +507,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setServicesInjector(mockServicesInjector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -539,7 +539,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setServicesInjector(mockServicesInjector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -571,7 +571,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setServicesInjector(mockServicesInjector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -602,7 +602,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final HideForContextFacetViaMethodFactory facetFactory = new HideForContextFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -633,7 +633,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final HideForContextFacetViaMethodFactory facetFactory = new HideForContextFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -664,7 +664,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertyAccessorFacetViaAccessorFactory facetFactory = new PropertyAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -692,19 +692,19 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final HideForContextFacetViaMethodFactory facetFactoryForHide = new HideForContextFacetViaMethodFactory();
facetFactoryForHide.setSpecificationLoader(programmableReflector);
facetFactoryForHide.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactoryForHide.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactoryForHide.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final DisableForContextFacetViaMethodFactory facetFactoryForDisable = new DisableForContextFacetViaMethodFactory();
facetFactoryForDisable.setSpecificationLoader(programmableReflector);
facetFactoryForDisable.setServicesInjector(mockServicesInjector);
facetFactoryForDisable.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactoryForDisable.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactoryForDisable.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -802,7 +802,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final NamedFacetStaticMethodFactory facetFactory = new NamedFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method nameMethod = findMethod(CustomerStatic.class, "nameFirstName");
@@ -822,7 +822,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final DescribedAsFacetStaticMethodFactory facetFactory = new DescribedAsFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method descriptionMethod = findMethod(CustomerStatic.class, "descriptionFirstName");
@@ -842,7 +842,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method propertyAlwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideFirstName");
@@ -859,7 +859,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getLastName");
final Method propertyAlwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideLastName");
@@ -875,7 +875,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method propertyProtectMethod = findMethod(CustomerStatic.class, "protectFirstName");
@@ -893,7 +893,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getLastName");
final Method propertyProtectMethod = findMethod(CustomerStatic.class, "protectLastName");
@@ -910,7 +910,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final HideForSessionFacetViaMethodFactory facetFactory = new HideForSessionFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method hideMethod = findMethod(CustomerStatic.class, "hideFirstName", new Class[] { UserMemento.class });
@@ -931,7 +931,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final DisableForSessionFacetViaMethodFactory facetFactory = new DisableForSessionFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method disableMethod = findMethod(CustomerStatic.class, "disableFirstName", new Class[] { UserMemento.class });
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index 56a1a03..30be3dc 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -40,6 +40,7 @@ import org.apache.isis.applib.services.eventbus.PropertyInteractionEvent;
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -114,7 +115,7 @@ public class PropertyAnnotationFacetFactoryTest extends AbstractFacetFactoryJUni
facetFactory = new PropertyAnnotationFacetFactory();
facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
}
@After
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefaultTest_allMatches.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefaultTest_allMatches.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefaultTest_allMatches.java
index 12250e2..98039f2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefaultTest_allMatches.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefaultTest_allMatches.java
@@ -30,6 +30,7 @@ import org.junit.Test;
import org.apache.isis.applib.query.Query;
import org.apache.isis.core.metamodel.runtimecontext.ConfigurationService;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
@@ -45,6 +46,8 @@ public class DomainObjectContainerDefaultTest_allMatches {
@Mock
private ConfigurationService mockConfigurationService;
+ @Mock
+ private ServicesInjector mockServicesInjector;
private boolean flushCalled;
@@ -59,9 +62,14 @@ public class DomainObjectContainerDefaultTest_allMatches {
@Override <T> List<T> submitQuery(final Query<T> query) {
return null;
}
+
+ {
+ setServicesInjector(mockServicesInjector);
+ }
};
container.setConfigurationService(mockConfigurationService);
context.allowing(mockConfigurationService);
+ context.allowing(mockServicesInjector);
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
index fa749df..28531e6 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
@@ -34,7 +34,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProviderAware;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategoryAware;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
@@ -172,9 +172,9 @@ public abstract class FormComponentPanelAbstract<T> extends FormComponentPanel<T
final AuthenticationSessionProviderAware cast = AuthenticationSessionProviderAware.class.cast(candidate);
cast.setAuthenticationSessionProvider(this);
}
- if (DeploymentCategoryProviderAware.class.isAssignableFrom(candidate.getClass())) {
- final DeploymentCategoryProviderAware cast = DeploymentCategoryProviderAware.class.cast(candidate);
- cast.setDeploymentCategoryProvider(this);
+ if (DeploymentCategoryAware.class.isAssignableFrom(candidate.getClass())) {
+ final DeploymentCategoryAware cast = DeploymentCategoryAware.class.cast(candidate);
+ cast.setDeploymentCategory(this.getDeploymentCategory());
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index 45f49f9..4815d10 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProviderAware;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategoryAware;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.isis.PersistenceSessionProvider;
@@ -145,9 +145,9 @@ public abstract class FormAbstract<T> extends Form<T>
final AuthenticationSessionProviderAware cast = AuthenticationSessionProviderAware.class.cast(candidate);
cast.setAuthenticationSessionProvider(this);
}
- if (DeploymentCategoryProviderAware.class.isAssignableFrom(candidate.getClass())) {
- final DeploymentCategoryProviderAware cast = DeploymentCategoryProviderAware.class.cast(candidate);
- cast.setDeploymentCategoryProvider(this);
+ if (DeploymentCategoryAware.class.isAssignableFrom(candidate.getClass())) {
+ final DeploymentCategoryAware cast = DeploymentCategoryAware.class.cast(candidate);
+ cast.setDeploymentCategory(this.getDeploymentCategory());
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index 81b5a18..9f968c1 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider
import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProviderAware;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategoryAware;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
@@ -168,9 +168,9 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel implement
final AuthenticationSessionProviderAware cast = AuthenticationSessionProviderAware.class.cast(candidate);
cast.setAuthenticationSessionProvider(this);
}
- if (DeploymentCategoryProviderAware.class.isAssignableFrom(candidate.getClass())) {
- final DeploymentCategoryProviderAware cast = DeploymentCategoryProviderAware.class.cast(candidate);
- cast.setDeploymentCategoryProvider(this);
+ if (DeploymentCategoryAware.class.isAssignableFrom(candidate.getClass())) {
+ final DeploymentCategoryAware cast = DeploymentCategoryAware.class.cast(candidate);
+ cast.setDeploymentCategory(this.getDeploymentCategory());
}
}