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 2013/03/15 18:53:52 UTC
git commit: ISIS-344: now working with subtypes for
Hidden.REFERENCES_PARENT
Updated Branches:
refs/heads/master fef459a9b -> aab76d54c
ISIS-344: now working with subtypes for Hidden.REFERENCES_PARENT
* the subtype check was the wrong way around.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/aab76d54
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/aab76d54
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/aab76d54
Branch: refs/heads/master
Commit: aab76d54c36a6a7a59e9e77bc405de369dd4ba78
Parents: fef459a
Author: Dan Haywood <da...@apache.org>
Authored: Fri Mar 15 17:47:18 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Mar 15 17:47:18 2013 +0000
----------------------------------------------------------------------
.../CollectionContentsAsAjaxTablePanel.java | 2 +-
.../annotation/TitleAnnotationFacetFactory.java | 10 ++--------
.../annotation/TitleFacetViaTitleAnnotation.java | 9 ++-------
.../TitleAnnotationFacetFactoryTest.java | 6 +++---
.../TitleFacetViaTitleAnnotationTest.java | 4 ++--
5 files changed, 10 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/aab76d54/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index f969949..1156a09 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -197,7 +197,7 @@ public class CollectionContentsAsAjaxTablePanel extends PanelAbstract<EntityColl
return true;
}
final ObjectSpecification assocSpec = association.getSpecification();
- final boolean associationSpecIsOfParentSpec = assocSpec.isOfType(parentSpec);
+ final boolean associationSpecIsOfParentSpec = parentSpec.isOfType(assocSpec);
final boolean isVisible = !associationSpecIsOfParentSpec;
return isVisible;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/aab76d54/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
index 8362098..4bed5ef 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
@@ -41,10 +41,9 @@ import org.apache.isis.core.progmodel.facets.MethodFinderUtils;
import org.apache.isis.core.progmodel.facets.fallback.FallbackFacetFactory;
import org.apache.isis.core.progmodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation.TitleComponent;
-public class TitleAnnotationFacetFactory extends FacetFactoryAbstract implements AdapterManagerAware, LocalizationProviderAware {
+public class TitleAnnotationFacetFactory extends FacetFactoryAbstract implements AdapterManagerAware {
private AdapterManager adapterManager;
- private LocalizationProvider localizationProvider;
public TitleAnnotationFacetFactory() {
super(FeatureType.OBJECTS_ONLY);
@@ -75,7 +74,7 @@ public class TitleAnnotationFacetFactory extends FacetFactoryAbstract implements
return;
}
final List<TitleComponent> titleComponents = Lists.transform(methods, TitleComponent.FROM_METHOD);
- FacetUtil.addFacet(new TitleFacetViaTitleAnnotation(titleComponents, facetHolder, adapterManager, localizationProvider));
+ FacetUtil.addFacet(new TitleFacetViaTitleAnnotation(titleComponents, facetHolder, adapterManager));
}
@@ -133,13 +132,8 @@ public class TitleAnnotationFacetFactory extends FacetFactoryAbstract implements
private static List<String> componentsFor(final String sequence) {
return Lists.newArrayList(Splitter.on('.').split(sequence));
}
-
}
- @Override
- public void setLocalizationProvider(final LocalizationProvider localizationProvider) {
- this.localizationProvider = localizationProvider;
- }
@Override
public void setAdapterManager(final AdapterManager adapterMap) {
http://git-wip-us.apache.org/repos/asf/isis/blob/aab76d54/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
index 44df5e9..b8ca514 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
@@ -31,7 +31,6 @@ import org.apache.log4j.Logger;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.lang.StringUtils;
-import org.apache.isis.core.metamodel.adapter.LocalizationProvider;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.util.AdapterInvokeUtils;
@@ -45,7 +44,6 @@ public class TitleFacetViaTitleAnnotation extends TitleFacetAbstract {
private static final Logger LOG = Logger.getLogger(TitleFacetViaTitleAnnotation.class);
private final List<TitleComponent> components;
private final AdapterManager adapterManager;
- private final LocalizationProvider localizationProvider;
public static class TitleComponent {
public static final Function<? super Method, ? extends TitleComponent> FROM_METHOD = new Function<Method, TitleComponent>() {
@@ -90,11 +88,10 @@ public class TitleFacetViaTitleAnnotation extends TitleFacetAbstract {
}
}
- public TitleFacetViaTitleAnnotation(final List<TitleComponent> components, final FacetHolder holder, final AdapterManager adapterManager, final LocalizationProvider localizationProvider) {
+ public TitleFacetViaTitleAnnotation(final List<TitleComponent> components, final FacetHolder holder, final AdapterManager adapterManager) {
super(holder);
this.components = components;
this.adapterManager = adapterManager;
- this.localizationProvider = localizationProvider;
}
@Override
@@ -141,9 +138,7 @@ public class TitleFacetViaTitleAnnotation extends TitleFacetAbstract {
if(StringUtils.isNullOrEmpty(title)) {
continue;
}
- if(stringBuilder.length() > 0) {
- stringBuilder.append(component.getPrepend());
- }
+ stringBuilder.append(component.getPrepend());
stringBuilder.append(abbreviated(title, component.abbreviateTo));
stringBuilder.append(component.getAppend());
}
http://git-wip-us.apache.org/repos/asf/isis/blob/aab76d54/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
index c519e50..ff37d39 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
@@ -45,6 +45,7 @@ import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.progmodel.facets.object.title.annotation.TitleAnnotationFacetFactory;
import org.apache.isis.core.progmodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation;
import org.apache.isis.core.progmodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation.TitleComponent;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Allowing;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
@@ -54,8 +55,10 @@ public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
@Mock
private ObjectAdapter mockObjectAdapter;
+ @Allowing
@Mock
private SpecificationLoader mockSpecificationLookup;
+ @Allowing
@Mock
private AdapterManager mockAdapterMap;
@Mock
@@ -67,12 +70,9 @@ public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
facetFactory = context.getClassUnderTest();
facetFactory.setAdapterManager(mockAdapterMap);
facetFactory.setSpecificationLookup(mockSpecificationLookup);
- facetFactory.setLocalizationProvider(mockLocalizationProvider);
context.checking(new Expectations() {
{
- allowing(mockAdapterMap);
- allowing(mockSpecificationLookup);
allowing(mockLocalizationProvider).getLocalization();
will(returnValue(new LocalizationDefault()));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/aab76d54/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
index a950de4..5da3899 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
@@ -96,7 +96,7 @@ public class TitleFacetViaTitleAnnotationTest {
final List<Method> methods = Arrays.asList(NormalDomainObject.class.getMethod("titleElement1"), NormalDomainObject.class.getMethod("titleElement2"), NormalDomainObject.class.getMethod("titleElement3"));
final List<TitleComponent> components = Lists.transform(methods, TitleComponent.FROM_METHOD);
- final TitleFacetViaTitleAnnotation facet = new TitleFacetViaTitleAnnotation(components, mockFacetHolder, mockAdapterManager, mockLocalizationProvider);
+ final TitleFacetViaTitleAnnotation facet = new TitleFacetViaTitleAnnotation(components, mockFacetHolder, mockAdapterManager);
final NormalDomainObject normalPojo = new NormalDomainObject();
final Sequence sequence = context.sequence("in-title-element-order");
context.checking(new Expectations() {
@@ -124,7 +124,7 @@ public class TitleFacetViaTitleAnnotationTest {
final List<Method> methods = MethodFinderUtils.findMethodsWithAnnotation(DomainObjectWithProblemInItsAnnotatedTitleMethod.class, MethodScope.OBJECT, Title.class);
final List<TitleComponent> components = Lists.transform(methods, TitleComponent.FROM_METHOD);
- final TitleFacetViaTitleAnnotation facet = new TitleFacetViaTitleAnnotation(components, mockFacetHolder, mockAdapterManager, mockLocalizationProvider);
+ final TitleFacetViaTitleAnnotation facet = new TitleFacetViaTitleAnnotation(components, mockFacetHolder, mockAdapterManager);
final DomainObjectWithProblemInItsAnnotatedTitleMethod screwedPojo = new DomainObjectWithProblemInItsAnnotatedTitleMethod();
context.checking(new Expectations() {
{