You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/06/06 09:08:28 UTC
svn commit: r412023 - in
/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing:
AbstractRepositoryIndex.java ArtifactRepositoryIndex.java
EclipseRepositoryIndex.java
Author: brett
Date: Tue Jun 6 00:08:27 2006
New Revision: 412023
URL: http://svn.apache.org/viewvc?rev=412023&view=rev
Log:
refactor indexer to remove large section of duplicated code
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/EclipseRepositoryIndex.java
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java?rev=412023&r1=412022&r2=412023&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java Tue Jun 6 00:08:27 2006
@@ -17,9 +17,9 @@
*/
import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.CharTokenizer;
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.CharTokenizer;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
@@ -29,6 +29,7 @@
import java.io.IOException;
import java.io.Reader;
import java.util.Collection;
+import java.util.zip.ZipEntry;
/**
* Abstract class for RepositoryIndexers
@@ -254,7 +255,7 @@
}
else if ( indexDir.isDirectory() )
{
- if( indexDir.listFiles().length > 1 )
+ if ( indexDir.listFiles().length > 1 )
{
throw new RepositoryIndexException( indexPath + " is not a valid index directory." );
}
@@ -298,6 +299,37 @@
public boolean isKeywordField( String field )
{
return KEYWORD_FIELDS.contains( field );
+ }
+
+ /**
+ * Method to test a zip entry if it is a java class, and adds it to the classes buffer
+ *
+ * @param entry the zip entry to test for java class
+ * @param classes the String buffer to add the java class if the test result as true
+ * @return true if the zip entry is a java class and was successfully added to the buffer
+ */
+ protected boolean addIfClassEntry( ZipEntry entry, StringBuffer classes )
+ {
+ boolean isAdded = false;
+
+ String name = entry.getName();
+ if ( name.endsWith( ".class" ) )
+ {
+ // TODO verify if class is public or protected
+ if ( name.lastIndexOf( "$" ) == -1 )
+ {
+ int idx = name.lastIndexOf( '/' );
+ if ( idx < 0 )
+ {
+ idx = 0;
+ }
+ String classname = name.substring( idx + 1, name.length() - 6 );
+ classes.append( classname ).append( "\n" );
+ isAdded = true;
+ }
+ }
+
+ return isAdded;
}
private class ArtifactRepositoryIndexAnalyzer
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java?rev=412023&r1=412022&r2=412023&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java Tue Jun 6 00:08:27 2006
@@ -175,37 +175,6 @@
}
/**
- * Method to test a zip entry if it is a java class, and adds it to the classes buffer
- *
- * @param entry the zip entry to test for java class
- * @param classes the String buffer to add the java class if the test result as true
- * @return true if the zip entry is a java class and was successfully added to the buffer
- */
- private boolean addIfClassEntry( ZipEntry entry, StringBuffer classes )
- {
- boolean isAdded = false;
-
- String name = entry.getName();
- if ( name.endsWith( ".class" ) )
- {
- // TODO verify if class is public or protected
- if ( name.lastIndexOf( "$" ) == -1 )
- {
- int idx = name.lastIndexOf( '/' );
- if ( idx < 0 )
- {
- idx = 0;
- }
- String classname = name.substring( idx + 1, name.length() - 6 );
- classes.append( classname ).append( "\n" );
- isAdded = true;
- }
- }
-
- return isAdded;
- }
-
- /**
* Method to add a class package to the buffer of packages
*
* @param name the complete path name of the class
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/EclipseRepositoryIndex.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/EclipseRepositoryIndex.java?rev=412023&r1=412022&r2=412023&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/EclipseRepositoryIndex.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/EclipseRepositoryIndex.java Tue Jun 6 00:08:27 2006
@@ -29,11 +29,11 @@
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.Reader;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.security.NoSuchAlgorithmException;
import java.util.Enumeration;
import java.util.zip.ZipEntry;
@@ -212,37 +212,6 @@
}
return outputFile;
- }
-
- /**
- * Method to test a zip entry if it is a java class, and adds it to the classes buffer
- *
- * @param entry the zip entry to test for java class
- * @param classes the String buffer to add the java class if the test result as true
- * @return true if the zip entry is a java class and was successfully added to the buffer
- */
- protected boolean addIfClassEntry( ZipEntry entry, StringBuffer classes )
- {
- boolean isAdded = false;
-
- String name = entry.getName();
- if ( name.endsWith( ".class" ) )
- {
- // TODO verify if class is public or protected
- if ( name.lastIndexOf( "$" ) == -1 )
- {
- int idx = name.lastIndexOf( '/' );
- if ( idx < 0 )
- {
- idx = 0;
- }
- String classname = name.substring( idx + 1, name.length() - 6 );
- classes.append( classname ).append( "\n" );
- isAdded = true;
- }
- }
-
- return isAdded;
}
/**