You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by km...@apache.org on 2008/01/30 01:04:39 UTC
svn commit: r616569 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne:
reflect/ util/
Author: kmenard
Date: Tue Jan 29 16:04:37 2008
New Revision: 616569
URL: http://svn.apache.org/viewvc?rev=616569&view=rev
Log:
Generics.
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandler.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/PersistentObjectList.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/WebApplicationResourceLocator.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandler.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandler.java?rev=616569&r1=616568&r2=616569&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandler.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandler.java Tue Jan 29 16:04:37 2008
@@ -37,13 +37,13 @@
class LifecycleCallbackEventHandler {
private EntityResolver resolver;
- private Map listeners;
- private Collection defaultListeners;
+ private Map<String, Collection<AbstractCallback>> listeners;
+ private Collection<AbstractCallback> defaultListeners;
LifecycleCallbackEventHandler(EntityResolver resolver) {
this.resolver = resolver;
- this.listeners = new HashMap();
- this.defaultListeners = new ArrayList();
+ this.listeners = new HashMap<String, Collection<AbstractCallback>>();
+ this.defaultListeners = new ArrayList<AbstractCallback>();
}
private boolean excludingDefaultListeners(String entityName) {
@@ -108,10 +108,10 @@
* Registers a callback object to be invoked when a lifecycle event occurs.
*/
private void addCallback(Class entityClass, AbstractCallback callback) {
- Collection entityListeners = (Collection) listeners.get(entityClass.getName());
+ Collection<AbstractCallback> entityListeners = listeners.get(entityClass.getName());
if (entityListeners == null) {
- entityListeners = new ArrayList(3);
+ entityListeners = new ArrayList<AbstractCallback>(3);
listeners.put(entityClass.getName(), entityListeners);
}
@@ -126,9 +126,9 @@
// default listeners are invoked first
if (!defaultListeners.isEmpty()
&& !excludingDefaultListeners(object.getObjectId().getEntityName())) {
- Iterator it = defaultListeners.iterator();
+ Iterator<AbstractCallback> it = defaultListeners.iterator();
while (it.hasNext()) {
- ((AbstractCallback) it.next()).performCallback(object);
+ (it.next()).performCallback(object);
}
}
@@ -175,12 +175,12 @@
// perform callbacks on provided class
String key = callbackEntityClass.getName();
- Collection entityListeners = (Collection) listeners.get(key);
+ Collection<AbstractCallback> entityListeners = listeners.get(key);
if (entityListeners != null) {
- Iterator it = entityListeners.iterator();
+ Iterator<AbstractCallback> it = entityListeners.iterator();
while (it.hasNext()) {
- ((AbstractCallback) it.next()).performCallback(object);
+ (it.next()).performCallback(object);
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java?rev=616569&r1=616568&r2=616569&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java Tue Jan 29 16:04:37 2008
@@ -45,11 +45,11 @@
public class DeepMergeOperation {
protected ObjectContext context;
- protected Map seen;
+ protected Map<ObjectId, Persistent> seen;
public DeepMergeOperation(ObjectContext context) {
this.context = context;
- this.seen = new HashMap();
+ this.seen = new HashMap<ObjectId, Persistent>();
}
public void reset() {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java?rev=616569&r1=616568&r2=616569&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java Tue Jan 29 16:04:37 2008
@@ -48,11 +48,11 @@
public class ObjectDetachOperation {
protected EntityResolver targetResolver;
- protected Map seen;
+ protected Map<ObjectId, Persistent> seen;
public ObjectDetachOperation(EntityResolver targetResolver) {
this.targetResolver = targetResolver;
- this.seen = new HashMap();
+ this.seen = new HashMap<ObjectId, Persistent>();
}
public void reset() {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/PersistentObjectList.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/PersistentObjectList.java?rev=616569&r1=616568&r2=616569&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/PersistentObjectList.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/PersistentObjectList.java Tue Jan 29 16:04:37 2008
@@ -43,7 +43,7 @@
// track additions/removals in unresolved...
protected LinkedList addedToUnresolved;
- protected LinkedList removedFromUnresolved;
+ protected LinkedList<Object> removedFromUnresolved;
// exists for the benefit of manual serialization schemes such as the one in Hessian.
@SuppressWarnings("unused")
@@ -373,7 +373,7 @@
}
if (removedFromUnresolved == null) {
- removedFromUnresolved = new LinkedList();
+ removedFromUnresolved = new LinkedList<Object>();
}
removedFromUnresolved.addLast(object);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/WebApplicationResourceLocator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/WebApplicationResourceLocator.java?rev=616569&r1=616568&r2=616569&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/WebApplicationResourceLocator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/WebApplicationResourceLocator.java Tue Jan 29 16:04:37 2008
@@ -40,13 +40,13 @@
private static Log logObj = LogFactory.getLog(WebApplicationResourceLocator.class);
protected ServletContext context;
- protected List additionalContextPaths;
+ protected List<String> additionalContextPaths;
/**
* @since 1.2
*/
public WebApplicationResourceLocator() {
- this.additionalContextPaths = new ArrayList();
+ this.additionalContextPaths = new ArrayList<String>();
this.addFilesystemPath("/WEB-INF/");
}
@@ -86,9 +86,9 @@
suffix = suffix.substring(1);
}
- Iterator cpi = this.additionalContextPaths.iterator();
+ Iterator<String> cpi = this.additionalContextPaths.iterator();
while (cpi.hasNext()) {
- String prefix = (String) cpi.next();
+ String prefix = cpi.next();
if (!prefix.endsWith("/")) {
prefix += "/";