svn commit: r679391 - in /incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social: core/util/EnumUtil.java opensocial/model/EnumUtil.java opensocial/model/Person.java

[ieb]

Author: ieb
Date: Thu Jul 24 05:33:27 2008
New Revision: 679391

URL: http://svn.apache.org/viewvc?rev=679391&view=rev
Log:
Moved EnumUtil into opensocial model package as it generated an invalid 
dependency path.

Added:
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java
      - copied, changed from r679376, 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/EnumUtil.java
Removed:
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/EnumUtil.java
Modified:
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java

Copied: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java
 (from r679376, 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/EnumUtil.java)
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/EnumUtil.java&r1=679376&r2=679391&rev=679391&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/EnumUtil.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java
 Thu Jul 24 05:33:27 2008
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.apache.shindig.social.core.util;
+package org.apache.shindig.social.opensocial.model;
+
 
 import com.google.common.collect.Sets;
 
@@ -35,12 +36,14 @@
 
   }
   /**
+   *
    * @param vals array of enums
    * @return a set of the names for a list of Enum values defined by toString
    */
-  public static Set<String> getEnumStrings(Enum... vals) {
+  // TODO: Because we have a Enum interface in this package we have to 
explicitly state the java.lang.Enum (bad ?)
+  public static Set<String> getEnumStrings(java.lang.Enum<?>... vals) {
     Set<String> result = Sets.newHashSet();
-    for (Enum v : vals) {
+    for (java.lang.Enum<?> v : vals) {
       result.add(v.toString());
     }
     if (result.size() != vals.length) {

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java?rev=679391&r1=679390&r2=679391&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
 Thu Jul 24 05:33:27 2008
@@ -18,7 +18,6 @@
 package org.apache.shindig.social.opensocial.model;
 
 import org.apache.shindig.social.core.model.PersonImpl;
-import org.apache.shindig.social.core.util.EnumUtil;
 
 import com.google.inject.ImplementedBy;