[jboss-svn-commits] JBL Code SVN: r5270 - in labs/shotoku/trunk: shotoku-base/src/java/org/jboss/shotoku shotoku-base/src/java/org/jboss/shotoku/tools shotoku-feeds/src/java/org/jboss/shotoku/feeds

[jboss-svn-commits at lists.jboss.org]

Author: adamw
Date: 2006-07-24 17:54:56 -0400 (Mon, 24 Jul 2006)
New Revision: 5270

Added:
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Tuples.java
Modified:
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Tools.java
   labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsDescriptor.java
Log:
Tuples

Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java	2006-07-24 21:42:41 UTC (rev 5269)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java	2006-07-24 21:54:56 UTC (rev 5270)
@@ -39,6 +39,8 @@
 import org.jboss.shotoku.tools.Pair;
 import org.jboss.shotoku.tools.Tools;
 
+import static org.jboss.shotoku.tools.Tuples.*;
+
 /**
  * A base class which provides access to nodes and directories. <br />
  * <b>Warning:</b> all shotoku classes are not thread-safe.
@@ -563,8 +565,7 @@
                 String implementation = conf
                         .getString(Constants.PROPERTIES_IMPL_SUFFIX);
 
-                contentManagersImplementations.put(id, Tools.createPair(
-                        implementation, conf));
+                contentManagersImplementations.put(id, tuple(implementation, conf));
 
                 Set<String> implIds = implementationsIds.get(implementation);
                 if (implIds == null) {

Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Tools.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Tools.java	2006-07-24 21:42:41 UTC (rev 5269)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Tools.java	2006-07-24 21:54:56 UTC (rev 5270)
@@ -380,16 +380,4 @@
     public static String getNameBasedMimeType(File file) {
         return mimeTypes.getContentType(file);
     }
-
-    /*
-     * TUPLES
-     */
-
-    public static<A, B> Pair<A, B> createPair(A a, B b) {
-        return new Pair<A, B>(a, b);
-    }
-
-    public static<A, B, C> Triple<A, B, C> createTriple(A a, B b, C c) {
-        return new Triple<A, B, C>(a, b, c);
-    }
 }

Added: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Tuples.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Tuples.java	2006-07-24 21:42:41 UTC (rev 5269)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Tuples.java	2006-07-24 21:54:56 UTC (rev 5270)
@@ -0,0 +1,14 @@
+package org.jboss.shotoku.tools;
+
+/**
+ * @author Adam Warski (adamw at aster.pl)
+ */
+public class Tuples {
+    public static<A, B> Pair<A, B> tuple(A a, B b) {
+        return new Pair<A, B>(a, b);
+    }
+
+    public static<A, B, C> Triple<A, B, C> tuple(A a, B b, C c) {
+        return new Triple<A, B, C>(a, b, c);
+    }
+}

Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsDescriptor.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsDescriptor.java	2006-07-24 21:42:41 UTC (rev 5269)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsDescriptor.java	2006-07-24 21:54:56 UTC (rev 5270)
@@ -45,6 +45,8 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
+import static org.jboss.shotoku.tools.Tuples.*;
+
 /**
  * Class which handles parsing feed descriptions, generates the feeds and
  * provides access to them.
@@ -67,6 +69,8 @@
      */
     private Map<String, Map<String, SpecialFeed>> specialFeeds;
 
+    private Map<String, Map<String, Object>> properties;
+
     private VariableResolverManager vrm;
 
     /**
@@ -86,7 +90,7 @@
     public FeedsDescriptor(String id, FeedsConfigurationWatcher fcw) {
         this.fcw = fcw;
 
-        confKey = Tools.createPair(
+        confKey = tuple(
                 ContentManager.getProperty(FeedsConstants.CONFIGID, ""),
                 ContentManager.getProperty(FeedsConstants.CONFIGDIR, ""));