svn commit: r1211870 - in /incubator/isis/trunk/framework/core/progmodel/src: main/java/org/apache/isis/core/progmodel/facets/object/disabled/method/ test/java/org/apache/isis/core/progmodel/facets/object/disabled/

[ke...@apache.org]

Author: kevin
Date: Thu Dec  8 13:25:54 2011
New Revision: 1211870

URL: http://svn.apache.org/viewvc?rev=1211870&view=rev
Log:
ISIS-142: Changed parameter from String to Identifier.Type enum

Modified:
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/disabled/method/DisabledObjectFacetViaDisabledMethod.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/disabled/method/DisabledObjectViaDisabledMethodFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/disabled/method/DisabledObjectFacetViaDisabledMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/disabled/method/DisabledObjectFacetViaDisabledMethod.java?rev=1211870&r1=1211869&r2=1211870&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/disabled/method/DisabledObjectFacetViaDisabledMethod.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/disabled/method/DisabledObjectFacetViaDisabledMethod.java Thu Dec  8 13:25:54 2011
@@ -24,6 +24,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.Identifier.Type;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.util.AdapterInvokeUtils;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -57,7 +58,8 @@ public class DisabledObjectFacetViaDisab
 
     @Override
     public String disabledReason(final ObjectAdapter owningAdapter, Identifier identifier) {
-        String type = identifier.getType().toString();
+        // String type = identifier.getType().toString();
+        Type type = identifier.getType();
         return (String) AdapterInvokeUtils.invoke(method, owningAdapter, type);
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/disabled/method/DisabledObjectViaDisabledMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/disabled/method/DisabledObjectViaDisabledMethodFacetFactory.java?rev=1211870&r1=1211869&r2=1211870&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/disabled/method/DisabledObjectViaDisabledMethodFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/disabled/method/DisabledObjectViaDisabledMethodFacetFactory.java Thu Dec  8 13:25:54 2011
@@ -21,6 +21,7 @@ package org.apache.isis.core.progmodel.f
 
 import java.lang.reflect.Method;
 
+import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -56,7 +57,7 @@ public class DisabledObjectViaDisabledMe
         final Class<?> cls = processClassContext.getCls();
         final FacetHolder facetHolder = processClassContext.getFacetHolder();
         final Class<?>[] params = new Class<?>[1];
-        params[0] = String.class;
+        params[0] = Identifier.Type.class;// String.class;
 
         final Method method =
             MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, DISABLED_PREFIX, String.class, params);

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java?rev=1211870&r1=1211869&r2=1211870&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java Thu Dec  8 13:25:54 2011
@@ -21,6 +21,8 @@ package org.apache.isis.core.progmodel.f
 
 import java.lang.reflect.Method;
 
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.Identifier.Type;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
 import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -46,11 +48,11 @@ public class ObjectDisabledMethodFacetFa
 
     public void testDisabledMethodPickedUpAndMethodRemoved() {
         final Class<?>[] params = new Class<?>[1];
-        params[0] = String.class;
+        params[0] = Identifier.Type.class;
 
         class Customer {
             @SuppressWarnings("unused")
-            public String disabled(String type) {
+            public String disabled(Type type) {
                 return null;
             }
         }