svn commit: r1363006 - in /incubator/isis/trunk/framework: core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/jdo/ runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo...

[da...@apache.org]

Author: danhaywood
Date: Wed Jul 18 16:23:46 2012
New Revision: 1363006

URL: http://svn.apache.org/viewvc?rev=1363006&view=rev
Log:
ISIS-14: added another facet factory to ignore DataNucleus-enhanced methods

Added:
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/jdo/RemoveJdoPrefixedMethodsFacetFactory.java
Modified:
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/metamodel/specloader/progmodelfacets/DataNucleusProgrammingModelFacets.java

Added: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/jdo/RemoveJdoPrefixedMethodsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/jdo/RemoveJdoPrefixedMethodsFacetFactory.java?rev=1363006&view=auto
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/jdo/RemoveJdoPrefixedMethodsFacetFactory.java (added)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/jdo/RemoveJdoPrefixedMethodsFacetFactory.java Wed Jul 18 16:23:46 2012
@@ -0,0 +1,48 @@
+/*
+ *  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.progmodel.facets.object.ignore.jdo;
+
+
+import java.lang.reflect.Method;
+
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+
+/**
+ * Removes all methods inherited from <tt>javax.jdo.spi.PersistenceCapable</tt> (if JDO is on the classpath).
+ */
+public class RemoveJdoPrefixedMethodsFacetFactory extends FacetFactoryAbstract {
+
+    public RemoveJdoPrefixedMethodsFacetFactory() {
+        super(FeatureType.OBJECTS_ONLY);
+    }
+    
+    @Override
+    public void process(ProcessClassContext context) {
+        Class<?> cls = context.getCls();
+        Method[] methods = cls.getMethods();
+        for(Method method: methods) {
+            if(method.getName().startsWith("jdo")) {
+                context.removeMethod(method);
+            }
+        }
+    }
+
+}

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/metamodel/specloader/progmodelfacets/DataNucleusProgrammingModelFacets.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/metamodel/specloader/progmodelfacets/DataNucleusProgrammingModelFacets.java?rev=1363006&r1=1363005&r2=1363006&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/metamodel/specloader/progmodelfacets/DataNucleusProgrammingModelFacets.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/metamodel/specloader/progmodelfacets/DataNucleusProgrammingModelFacets.java Wed Jul 18 16:23:46 2012
@@ -20,6 +20,7 @@ package org.apache.isis.runtimes.dflt.ob
 
 
 import org.apache.isis.core.progmodel.facets.object.ignore.jdo.RemoveJdoEnhancementTypesFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.ignore.jdo.RemoveJdoPrefixedMethodsFacetFactory;
 import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5;
 import org.apache.isis.runtimes.dflt.objectstores.jdo.metamodel.specloader.progmodelfacets.JdoProgrammingModelFacets;
 
@@ -35,6 +36,7 @@ public class DataNucleusProgrammingModel
 
     public DataNucleusProgrammingModelFacets() {
         addFactory(RemoveJdoEnhancementTypesFacetFactory.class);
+        addFactory(RemoveJdoPrefixedMethodsFacetFactory.class);
     }
 
 }