jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1174244 - in /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype: EffectiveNodeTypeCacheImpl.java xml/AdditionalNamespaceResolver.java xml/NodeTypeWriter.java
Date Thu, 22 Sep 2011 16:26:01 GMT
Author: reschke
Date: Thu Sep 22 16:26:00 2011
New Revision: 1174244

URL: http://svn.apache.org/viewvc?rev=1174244&view=rev
Log:
generics

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCacheImpl.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/AdditionalNamespaceResolver.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCacheImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCacheImpl.java?rev=1174244&r1=1174243&r2=1174244&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCacheImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCacheImpl.java
Thu Sep 22 16:26:00 2011
@@ -254,7 +254,7 @@ public class EffectiveNodeTypeCacheImpl 
          * @param ntNames
          * @param weight
          */
-        WeightedKey(Collection ntNames, int weight) {
+        WeightedKey(Collection<Name> ntNames, int weight) {
             this((Name[]) ntNames.toArray(new Name[ntNames.size()]), weight);
         }
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/AdditionalNamespaceResolver.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/AdditionalNamespaceResolver.java?rev=1174244&r1=1174243&r2=1174244&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/AdditionalNamespaceResolver.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/AdditionalNamespaceResolver.java
Thu Sep 22 16:26:00 2011
@@ -43,7 +43,7 @@ public class AdditionalNamespaceResolver
      * @param namespaces namespace properties
      */
     public AdditionalNamespaceResolver(Properties namespaces) {
-        Enumeration prefixes = namespaces.propertyNames();
+        Enumeration<?> prefixes = namespaces.propertyNames();
         while (prefixes.hasMoreElements()) {
             String prefix = (String) prefixes.nextElement();
             addNamespace(prefix, namespaces.getProperty(prefix));

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java?rev=1174244&r1=1174243&r2=1174244&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java
Thu Sep 22 16:26:00 2011
@@ -214,8 +214,8 @@ public final class NodeTypeWriter {
         // TODO do properly...
         String[] qops = def.getAvailableQueryOperators();
         if (qops != null && qops.length > 0) {
-            List ops = Arrays.asList(qops);
-            List defaultOps = Arrays.asList(Operator.getAllQueryOperators());
+            List<String> ops = Arrays.asList(qops);
+            List<String> defaultOps = Arrays.asList(Operator.getAllQueryOperators());
             if (!ops.containsAll(defaultOps)) {
                 StringBuilder sb = new StringBuilder();
                 for (int i = 0; i < qops.length; i++) {



Mime
View raw message