You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2006/10/08 03:02:56 UTC
svn commit: r454056 - in
/incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer:
DataObjectAccessorInjector.java DataObjectPropertyInjector.java
InterfaceMethodInjector.java PropertyInjector.java
Author: aadamchik
Date: Sat Oct 7 18:02:55 2006
New Revision: 454056
URL: http://svn.apache.org/viewvc?view=rev&rev=454056
Log:
making enahncer helpers non-public. There is no benefit in exposing them
Modified:
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectAccessorInjector.java
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectPropertyInjector.java
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/InterfaceMethodInjector.java
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/PropertyInjector.java
Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectAccessorInjector.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectAccessorInjector.java?view=diff&rev=454056&r1=454055&r2=454056
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectAccessorInjector.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectAccessorInjector.java Sat Oct 7 18:02:55 2006
@@ -17,7 +17,6 @@
* under the License.
****************************************************************/
-
package org.apache.cayenne.jpa.enhancer;
import java.util.Map;
@@ -39,7 +38,7 @@
*
* @author Andrus Adamchik
*/
-public class DataObjectAccessorInjector extends ClassEmitterTransformer {
+class DataObjectAccessorInjector extends ClassEmitterTransformer {
protected Map<String, JpaClassDescriptor> managedClasses;
protected Type staticDelegate;
@@ -47,7 +46,7 @@
protected Signature setterBeforeSignature;
protected Signature setterAfterSignature;
- public DataObjectAccessorInjector(Map<String, JpaClassDescriptor> managedClasses) {
+ DataObjectAccessorInjector(Map<String, JpaClassDescriptor> managedClasses) {
this.managedClasses = managedClasses;
Class delegateClass = DataObjectDelegate.class;
@@ -109,7 +108,7 @@
return super.begin_method(access, sig, exceptions, attrs);
}
- protected JpaPropertyDescriptor getProperty(String propertyName) {
+ JpaPropertyDescriptor getProperty(String propertyName) {
String className = getClassType().getClassName();
JpaClassDescriptor descriptor = managedClasses.get(className);
@@ -120,7 +119,7 @@
return descriptor.getProperty(propertyName);
}
- protected CodeEmitter enhanceGetter(
+ CodeEmitter enhanceGetter(
JpaPropertyDescriptor property,
int access,
Signature sig,
@@ -131,7 +130,7 @@
return super.begin_method(access, sig, exceptions, attrs);
}
- protected CodeEmitter enhanceSetter(
+ CodeEmitter enhanceSetter(
JpaPropertyDescriptor property,
int access,
Signature sig,
Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectPropertyInjector.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectPropertyInjector.java?view=diff&rev=454056&r1=454055&r2=454056
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectPropertyInjector.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectPropertyInjector.java Sat Oct 7 18:02:55 2006
@@ -16,14 +16,12 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-
-
package org.apache.cayenne.jpa.enhancer;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.ObjectId;
-public class DataObjectPropertyInjector extends PropertyInjector {
+class DataObjectPropertyInjector extends PropertyInjector {
static final String OBJECT_ID_PROPERTY = "objectId";
static final String PERSISTENCE_STATE_PROPERTY = "persistenceState";
Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/InterfaceMethodInjector.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/InterfaceMethodInjector.java?view=diff&rev=454056&r1=454055&r2=454056
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/InterfaceMethodInjector.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/InterfaceMethodInjector.java Sat Oct 7 18:02:55 2006
@@ -17,7 +17,6 @@
* under the License.
****************************************************************/
-
package org.apache.cayenne.jpa.enhancer;
import java.lang.reflect.Method;
@@ -43,16 +42,14 @@
*
* @author Andrus Adamchik
*/
-public class InterfaceMethodInjector extends ClassEmitterTransformer {
-
- protected Class delegatedInterface;
- protected Type staticDelegate;
- protected List<Signature> interfaceMethods;
- protected List<Signature> delegateMethods;
+class InterfaceMethodInjector extends ClassEmitterTransformer {
-
+ private Class delegatedInterface;
+ private Type staticDelegate;
+ private List<Signature> interfaceMethods;
+ private List<Signature> delegateMethods;
- public InterfaceMethodInjector(Class delegatedInterface, Class staticDelegate,
+ InterfaceMethodInjector(Class delegatedInterface, Class staticDelegate,
Collection<String> excludedMethods) {
this.staticDelegate = Type.getType(staticDelegate);
this.delegatedInterface = delegatedInterface;
@@ -88,7 +85,7 @@
super.end_class();
}
- protected Signature mapDelegateMethod(Class staticDelegate, Method method) {
+ Signature mapDelegateMethod(Class staticDelegate, Method method) {
Class[] params = method.getParameterTypes();
Class[] delegateParams;
@@ -132,7 +129,7 @@
/**
* Adds a delegated interface unless it is already declared for the class.
*/
- protected Type[] addInterface(Type[] interfaces, Class iface) {
+ Type[] addInterface(Type[] interfaces, Class iface) {
String name = iface.getName();
for (Type type : interfaces) {
@@ -147,7 +144,7 @@
return newInterfaces;
}
- protected void addDelegateMethods() {
+ void addDelegateMethods() {
// TODO: andrus, 5/1/2006 - check if the interface is partially implemented...
for (int i = 0; i < interfaceMethods.size(); i++) {
Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/PropertyInjector.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/PropertyInjector.java?view=diff&rev=454056&r1=454055&r2=454056
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/PropertyInjector.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/PropertyInjector.java Sat Oct 7 18:02:55 2006
@@ -16,8 +16,6 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-
-
package org.apache.cayenne.jpa.enhancer;
import net.sf.cglib.asm.Type;
@@ -29,12 +27,12 @@
*
* @author Andrus Adamchik
*/
-public class PropertyInjector extends ClassEmitterTransformer {
+class PropertyInjector extends ClassEmitterTransformer {
- protected String[] names;
- protected Type[] types;
+ private String[] names;
+ private Type[] types;
- public PropertyInjector(String[] names, Class[] types) {
+ PropertyInjector(String[] names, Class[] types) {
this.names = names;
this.types = new Type[types.length];
for (int i = 0; i < types.length; i++) {