You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2009/09/18 17:30:31 UTC
svn commit: r816670 - in
/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation:
EventImpl.java ObservationManagerImpl.java
Author: reschke
Date: Fri Sep 18 15:30:29 2009
New Revision: 816670
URL: http://svn.apache.org/viewvc?rev=816670&view=rev
Log:
JCR-2087: parametrize generic types
Modified:
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventImpl.java?rev=816670&r1=816669&r2=816670&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventImpl.java Fri Sep 18 15:30:29 2009
@@ -18,7 +18,6 @@
import java.util.Map;
import java.util.HashMap;
-import java.util.Iterator;
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
import org.apache.jackrabbit.spi.commons.value.ValueFormat;
@@ -118,12 +117,11 @@
/**
* @see javax.jcr.observation.Event#getInfo()
*/
- public Map getInfo() throws RepositoryException {
- Map<String, String> jcrInfo = new HashMap();
- Map<Name, QValue> infos = event.getInfo();
- for (Iterator<Name> it = event.getInfo().keySet().iterator(); it.hasNext(); ) {
- Name key = it.next();
- QValue value = infos.get(key);
+ public Map<String, String> getInfo() throws RepositoryException {
+ Map<String, String> jcrInfo = new HashMap<String, String>();
+ for (Map.Entry<Name, QValue> entry : event.getInfo().entrySet()) {
+ Name key = entry.getKey();
+ QValue value = entry.getValue();
String strValue = null;
if (value != null) {
strValue = ValueFormat.getJCRString(value, resolver);
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java?rev=816670&r1=816669&r2=816670&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java Fri Sep 18 15:30:29 2009
@@ -136,7 +136,7 @@
* @inheritDoc
*/
public EventListenerIterator getRegisteredEventListeners() throws RepositoryException {
- Map activeListeners;
+ Map<EventListener, EventFilter> activeListeners;
synchronized (subscriptions) {
ensureReadOnlyMap();
activeListeners = readOnlySubscriptions;