You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2007/10/08 15:12:24 UTC
svn commit: r582814 - in
/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web:
action/WorkingCopyAction.java util/WorkingCopyContentGenerator.java
Author: evenisse
Date: Mon Oct 8 06:12:24 2007
New Revision: 582814
URL: http://svn.apache.org/viewvc?rev=582814&view=rev
Log:
Fix indent
Modified:
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java?rev=582814&r1=582813&r2=582814&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java Mon Oct 8 06:12:24 2007
@@ -58,8 +58,6 @@
private String currentFileContent;
- private List files;
-
private String output;
private String projectName;
@@ -84,7 +82,7 @@
return REQUIRES_AUTHORIZATION;
}
- files = getContinuum().getFiles( projectId, userDirectory );
+ List<File> files = getContinuum().getFiles( projectId, userDirectory );
project = getContinuum().getProject( projectId );
@@ -174,11 +172,6 @@
this.currentFile = currentFile;
}
- public List getFiles()
- {
- return files;
- }
-
public String getOutput()
{
return output;
@@ -193,7 +186,7 @@
public InputStream getInputStream()
throws ContinuumException
{
- FileInputStream fis = null;
+ FileInputStream fis;
try
{
fis = new FileInputStream( downloadFile );
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java?rev=582814&r1=582813&r2=582814&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java Mon Oct 8 06:12:24 2007
@@ -27,7 +27,6 @@
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
/**
@@ -51,7 +50,7 @@
private boolean odd = false;
- public String generate( Object item, String baseUrl, String imagesBaseUrl, File basedir )
+ public String generate( List<File> files, String baseUrl, String imagesBaseUrl, File basedir )
{
this.basedir = basedir;
if ( baseUrl.indexOf( "?" ) > 0 )
@@ -63,18 +62,16 @@
urlParamSeparator = "?";
}
- List directoryEntries = (List) item;
-
StringBuffer buf = new StringBuffer();
buf.append( "<div class=\"eXtremeTable\" >" );
buf.append( "<table class=\"tableRegion\" width=\"100%\">\n" );
- buf.append( "<tr class=\"odd\"><td><img src=\"" + imagesBaseUrl +
- "icon_arrowfolder1_sml.gif\"> <a href=\"" + baseUrl + urlParamSeparator +
+ buf.append( "<tr class=\"odd\"><td><img src=\"" ).append( imagesBaseUrl ).append(
+ "icon_arrowfolder1_sml.gif\"> <a href=\"" ).append( baseUrl ).append( urlParamSeparator ).append(
"userDirectory=/\">/</a><br /></td><td> </td><td> </td>" );
- print( directoryEntries, " ", baseUrl, imagesBaseUrl, buf );
+ print( basedir, files, baseUrl, imagesBaseUrl, buf );
buf.append( "</table>\n" );
buf.append( "</div>\n" );
@@ -82,83 +79,73 @@
return buf.toString();
}
- private void print( List dirs, String indent, String baseUrl, String imagesBaseUrl, StringBuffer buf )
+ private void print( File basedir, List<File> files, String baseUrl, String imagesBaseUrl, StringBuffer buf )
{
- for ( Iterator i = dirs.iterator(); i.hasNext(); )
+ for ( File f : files )
{
- Object obj = i.next();
-
- print( obj, indent, baseUrl, imagesBaseUrl, buf );
+ print( f, getIndent( basedir, f ), baseUrl, imagesBaseUrl, buf );
}
}
- private void print( Object obj, String indent, String baseUrl, String imagesBaseUrl, StringBuffer buf )
+ private void print( File f, String indent, String baseUrl, String imagesBaseUrl, StringBuffer buf )
{
- if ( obj instanceof File )
- {
- String cssClass = odd ? "odd" : "even";
+ String cssClass = odd ? "odd" : "even";
- File f = (File) obj;
+ if ( !f.isDirectory() )
+ {
+ String fileName = f.getName();
- if ( !f.isDirectory() )
+ if ( !".cvsignore".equals( fileName ) && !"vssver.scc".equals( fileName ) &&
+ !".DS_Store".equals( fileName ) )
{
- String fileName = f.getName();
+ String userDirectory;
- if ( !".cvsignore".equals( fileName ) && !"vssver.scc".equals( fileName ) &&
- !".DS_Store".equals( fileName ) )
+ if ( f.getParentFile().getAbsolutePath().equals( basedir.getAbsolutePath() ) )
{
- String userDirectory = null;
-
- if ( f.getParentFile().getAbsolutePath().equals( basedir.getAbsolutePath() ) )
- {
- userDirectory = "/";
- }
- else
- {
- userDirectory =
- f.getParentFile().getAbsolutePath().substring( basedir.getAbsolutePath().length() + 1 );
- }
-
- userDirectory = StringUtils.replace( userDirectory, "\\", "/" );
-
- buf.append( "<tr class=\"" + cssClass + "\">" );
-
- buf.append( "<td width=\"98%\">" + indent + " <img src=\"" + imagesBaseUrl +
- "file.gif\"> <a href=\"" + baseUrl + urlParamSeparator + "userDirectory=" + userDirectory +
- "&file=" + fileName + "\">" + fileName + "</a></td><td width=\"1%\">" +
- getReadableFileSize( f.length() ) + "</td><td width=\"1%\">" +
- getFormattedDate( f.lastModified() ) + "</td>\n" );
- buf.append( "</tr>\n" );
-
- odd = !odd;
+ userDirectory = "/";
}
- }
- else
- {
- String directoryName = f.getName();
-
- if ( !"CVS".equals( directoryName ) && !".svn".equals( directoryName ) &&
- !"SCCS".equals( directoryName ) )
+ else
{
- String userDirectory = f.getAbsolutePath().substring( basedir.getAbsolutePath().length() + 1 );
+ userDirectory =
+ f.getParentFile().getAbsolutePath().substring( basedir.getAbsolutePath().length() + 1 );
+ }
- userDirectory = StringUtils.replace( userDirectory, "\\", "/" );
+ userDirectory = StringUtils.replace( userDirectory, "\\", "/" );
- buf.append( "<tr class=\"" + cssClass + "\">" );
+ buf.append( "<tr class=\"" ).append( cssClass ).append( "\">" );
- buf.append( "<td width=\"98%\">" + indent + " <img src=\"" + imagesBaseUrl +
- "icon_arrowfolder1_sml.gif\"> <a href =\"" + baseUrl + urlParamSeparator +
- "userDirectory=" + userDirectory + "\">" + directoryName + "</a></td><td width=\"1%\">" +
- " " + "</td><td width=\"1%\">" + getFormattedDate( f.lastModified() ) + "</td>" );
- buf.append( "</tr>\n" );
+ buf.append( "<td width=\"98%\">" ).append( indent ).append( " <img src=\"" ).append(
+ imagesBaseUrl ).append( "file.gif\"> <a href=\"" ).append( baseUrl ).append(
+ urlParamSeparator ).append( "userDirectory=" ).append( userDirectory ).append( "&file=" ).append(
+ fileName ).append( "\">" ).append( fileName ).append( "</a></td><td width=\"1%\">" ).append(
+ getReadableFileSize( f.length() ) ).append( "</td><td width=\"1%\">" ).append(
+ getFormattedDate( f.lastModified() ) ).append( "</td>\n" );
+ buf.append( "</tr>\n" );
- odd = !odd;
- }
+ odd = !odd;
}
}
else
{
- print( (List) obj, indent + " ", baseUrl, imagesBaseUrl, buf );
+ String directoryName = f.getName();
+
+ if ( !"CVS".equals( directoryName ) && !".svn".equals( directoryName ) && !"SCCS".equals( directoryName ) )
+ {
+ String userDirectory = f.getAbsolutePath().substring( basedir.getAbsolutePath().length() + 1 );
+
+ userDirectory = StringUtils.replace( userDirectory, "\\", "/" );
+
+ buf.append( "<tr class=\"" ).append( cssClass ).append( "\">" );
+
+ buf.append( "<td width=\"98%\">" ).append( indent ).append( "<img src=\"" ).append(
+ imagesBaseUrl ).append( "icon_arrowfolder1_sml.gif\"> <a href =\"" ).append( baseUrl ).append(
+ urlParamSeparator ).append( "userDirectory=" ).append( userDirectory ).append( "\">" ).append(
+ directoryName ).append( "</a></td><td width=\"1%\">" + " " + "</td><td width=\"1%\">" ).append(
+ getFormattedDate( f.lastModified() ) ).append( "</td>" );
+ buf.append( "</tr>\n" );
+
+ odd = !odd;
+ }
}
}
@@ -191,5 +178,29 @@
}
return "0 b";
+ }
+
+ private String getIndent( File basedir, File userFile )
+ {
+ String root = basedir.getAbsolutePath();
+ String userdir;
+ if ( userFile.isDirectory() )
+ {
+ userdir = userFile.getAbsolutePath();
+ }
+ else
+ {
+ userdir = userFile.getParentFile().getAbsolutePath();
+ }
+
+ userdir = userdir.substring( root.length() );
+
+ StringBuffer indent = new StringBuffer();
+ while ( userdir.indexOf( File.separator ) >= 0 )
+ {
+ indent.append( " " );
+ userdir = userdir.substring( userdir.indexOf( File.separator ) + 1 );
+ }
+ return indent.toString();
}
}