svn commit: r748000 - /archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository/src/main/java/org/apache/archiva/repository/GroupRepositoryManager.java

[jdumay]

Author: jdumay
Date: Thu Feb 26 04:07:55 2009
New Revision: 748000

URL: http://svn.apache.org/viewvc?rev=748000&view=rev
Log:
Tidy up method order

Modified:
    
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository/src/main/java/org/apache/archiva/repository/GroupRepositoryManager.java

Modified: 
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository/src/main/java/org/apache/archiva/repository/GroupRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository/src/main/java/org/apache/archiva/repository/GroupRepositoryManager.java?rev=748000&r1=747999&r2=748000&view=diff
==============================================================================
--- 
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository/src/main/java/org/apache/archiva/repository/GroupRepositoryManager.java
 (original)
+++ 
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository/src/main/java/org/apache/archiva/repository/GroupRepositoryManager.java
 Thu Feb 26 04:07:55 2009
@@ -21,14 +21,10 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.CharArrayWriter;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -45,7 +41,6 @@
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration;
 import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
-import org.apache.maven.archiva.model.VersionedReference;
 import org.apache.maven.archiva.repository.content.RepositoryRequest;
 import org.apache.maven.archiva.repository.metadata.MetadataTools;
 import 
org.apache.maven.archiva.repository.metadata.RepositoryMetadataException;
@@ -96,16 +91,6 @@
         return null;
     }
 
-    private MutableResourceContext 
getMetadataLogicalPathWithoutChecksum(ResourceContext resourceContext)
-    {
-        MutableResourceContext context = new 
MutableResourceContext(resourceContext);
-        if (context.getLogicalPath().endsWith(".md5") || 
context.getLogicalPath().endsWith(".sha1"))
-        {
-            context.setLogicalPath(context.getLogicalPath().substring(0, 
context.getLogicalPath().lastIndexOf('.')));
-        }
-        return context;
-    }
-
     public boolean read(ResourceContext context, OutputStream os)
     {
         final RepositoryGroupConfiguration groupConfiguration = 
getGroupConfiguration(context.getRepositoryId());
@@ -232,6 +217,16 @@
         }
     }
 
+    private MutableResourceContext 
getMetadataLogicalPathWithoutChecksum(ResourceContext resourceContext)
+    {
+        MutableResourceContext context = new 
MutableResourceContext(resourceContext);
+        if (context.getLogicalPath().endsWith(".md5") || 
context.getLogicalPath().endsWith(".sha1"))
+        {
+            context.setLogicalPath(context.getLogicalPath().substring(0, 
context.getLogicalPath().lastIndexOf('.')));
+        }
+        return context;
+    }
+
     private boolean readFromGroup(final RepositoryGroupConfiguration 
groupConfiguration, ResourceContext context, OutputStream os)
     {
         for (final String repositoryId : groupConfiguration.getRepositories())