Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix non standard variables names 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1427060 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-12-31 09:29:49 +00:00
parent bf6b8b7c62
commit 0daef64c18
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
View File

@ -265,8 +265,8 @@ public class LegacyToDefaultConverter
v3Model.getVersion(), v3Model.getPackage() ); v3Model.getVersion(), v3Model.getPackage() );
writer = new StringWriter(); writer = new StringWriter();
MavenXpp3Writer Xpp3Writer = new MavenXpp3Writer(); MavenXpp3Writer xpp3Writer = new MavenXpp3Writer();
Xpp3Writer.write( writer, v4Model ); xpp3Writer.write( writer, v4Model );
transaction.createFile( writer.toString(), targetFile, digesters ); transaction.createFile( writer.toString(), targetFile, digesters );

34
archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntityResolutionReader.java
View File

@ -58,9 +58,9 @@ public class LatinEntityResolutionReader
public int read( char[] destbuf, int offset, int length ) public int read( char[] destbuf, int offset, int length )
throws IOException throws IOException
{ {
int tmp_length; int tmpLength;
int current_requested_offset = offset; int currentRequestedOffset = offset;
int current_requested_length = length; int currentRequestedLength = length;
// Drain leftover from last read request. // Drain leftover from last read request.
if ( leftover != null ) if ( leftover != null )
@ -68,7 +68,7 @@ public class LatinEntityResolutionReader
if ( leftover.length > length ) if ( leftover.length > length )
{ {
// Copy partial leftover. // Copy partial leftover.
System.arraycopy( leftover, 0, destbuf, current_requested_offset, length ); System.arraycopy( leftover, 0, destbuf, currentRequestedOffset, length );
int copyLeftOverLength = leftover.length - length; int copyLeftOverLength = leftover.length - length;
// Create new leftover of remaining. // Create new leftover of remaining.
@ -82,30 +82,30 @@ public class LatinEntityResolutionReader
} }
else else
{ {
tmp_length = leftover.length; tmpLength = leftover.length;
// Copy full leftover // Copy full leftover
System.arraycopy( leftover, 0, destbuf, current_requested_offset, tmp_length ); System.arraycopy( leftover, 0, destbuf, currentRequestedOffset, tmpLength );
// Empty out leftover (as there is now none left) // Empty out leftover (as there is now none left)
leftover = null; leftover = null;
// Adjust offset and lengths. // Adjust offset and lengths.
current_requested_offset += tmp_length; currentRequestedOffset += tmpLength;
current_requested_length -= tmp_length; currentRequestedLength -= tmpLength;
} }
} }
StringBuilder sbuf = getExpandedBuffer( current_requested_length ); StringBuilder sbuf = getExpandedBuffer( currentRequestedLength );
// Have we reached the end of the buffer? // Have we reached the end of the buffer?
if ( sbuf == null ) if ( sbuf == null )
{ {
// Do we have content? // Do we have content?
if ( current_requested_offset > offset ) if ( currentRequestedOffset > offset )
{ {
// Signal that we do, by calculating length. // Signal that we do, by calculating length.
return ( current_requested_offset - offset ); return ( currentRequestedOffset - offset );
} }
// No content. signal end of buffer. // No content. signal end of buffer.
@ -113,18 +113,18 @@ public class LatinEntityResolutionReader
} }
// Copy from expanded buf whatever length we can accomodate. // Copy from expanded buf whatever length we can accomodate.
tmp_length = Math.min( sbuf.length(), current_requested_length ); tmpLength = Math.min( sbuf.length(), currentRequestedLength );
sbuf.getChars( 0, tmp_length, destbuf, current_requested_offset ); sbuf.getChars( 0, tmpLength, destbuf, currentRequestedOffset );
// Create the leftover (if any) // Create the leftover (if any)
if ( tmp_length < sbuf.length() ) if ( tmpLength < sbuf.length() )
{ {
leftover = new char[sbuf.length() - tmp_length]; leftover = new char[sbuf.length() - tmpLength];
sbuf.getChars( tmp_length, tmp_length + leftover.length, leftover, 0 ); sbuf.getChars( tmpLength, tmpLength + leftover.length, leftover, 0 );
} }
// Calculate Actual Length and return. // Calculate Actual Length and return.
return ( current_requested_offset - offset ) + tmp_length; return ( currentRequestedOffset - offset ) + tmpLength;
} }
private StringBuilder getExpandedBuffer( int minimum_length ) private StringBuilder getExpandedBuffer( int minimum_length )