svn commit: r1190208 - /lucene/dev/branches/branch_3x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java

[dw...@apache.org]

Author: dweiss
Date: Fri Oct 28 08:49:49 2011
New Revision: 1190208

URL: http://svn.apache.org/viewvc?rev=1190208&view=rev
Log:
Die, java5, die...

Modified:
    lucene/dev/branches/branch_3x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java

Modified: lucene/dev/branches/branch_3x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java?rev=1190208&r1=1190207&r2=1190208&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java Fri Oct 28 08:49:49 2011
@@ -112,7 +112,6 @@ public class CarrotClusteringEngine exte
           CarrotParams.LEXICAL_RESOURCES_DIR, CARROT_RESOURCES_PREFIX);
     }
 
-    @Override
     public IResource[] getAll(final String resource) {
       final String resourceName = carrot2ResourcesDir + "/" + resource;
       log.debug("Looking for Solr resource: " + resourceName);
@@ -136,26 +135,22 @@ public class CarrotClusteringEngine exte
       log.info("Loaded Solr resource: " + resourceName);
 
       final IResource foundResource = new IResource() {
-        @Override
         public InputStream open() throws IOException {
           return new ByteArrayInputStream(asBytes);
         }
         
-        @Override
         public int hashCode() {
           // In case multiple resources are found they will be deduped, but we don't use it in Solr,
           // so simply rely on instance equivalence.
           return super.hashCode();
         }
         
-        @Override
         public boolean equals(Object obj) {
           // In case multiple resources are found they will be deduped, but we don't use it in Solr,
           // so simply rely on instance equivalence.
           return super.equals(obj);
         }
 
-        @Override
         public String toString() {
           return "Solr config resource: " + resourceName;
         }
@@ -164,21 +159,18 @@ public class CarrotClusteringEngine exte
       return new IResource[] { foundResource };
     }
 
-    @Override
     public int hashCode() {
       // In case multiple locations are used locators will be deduped, but we don't use it in Solr,
       // so simply rely on instance equivalence.
       return super.hashCode();
     }
 
-    @Override
     public boolean equals(Object obj) {
       // In case multiple locations are used locators will be deduped, but we don't use it in Solr,
       // so simply rely on instance equivalence.
       return super.equals(obj);
     }
 
-    @Override
     public String toString() {
       return "SolrResourceLocator, " 
           + "configDir=" + new File(resourceLoader.getConfigDir()).getAbsolutePath()