From: Olivier Lamy <olamy@apache.org>
Date: Mon, 31 Dec 2012 09:29:49 +0000 (+0000)
Subject: fix non standard variables names
X-Git-Tag: archiva-1.4-M4~342
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0daef64c18b2a5f4cf9da278f430aae020982213;p=archiva.git

fix non standard variables names

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1427060 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
index 83a1f4cff..1faac13aa 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
@@ -265,8 +265,8 @@ public class LegacyToDefaultConverter
                                                  v3Model.getVersion(), v3Model.getPackage() );
 
                     writer = new StringWriter();
-                    MavenXpp3Writer Xpp3Writer = new MavenXpp3Writer();
-                    Xpp3Writer.write( writer, v4Model );
+                    MavenXpp3Writer xpp3Writer = new MavenXpp3Writer();
+                    xpp3Writer.write( writer, v4Model );
 
                     transaction.createFile( writer.toString(), targetFile, digesters );
 
diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntityResolutionReader.java b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntityResolutionReader.java
index 17313d642..9b62ee412 100644
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntityResolutionReader.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntityResolutionReader.java
@@ -58,9 +58,9 @@ public class LatinEntityResolutionReader
     public int read( char[] destbuf, int offset, int length )
         throws IOException
     {
-        int tmp_length;
-        int current_requested_offset = offset;
-        int current_requested_length = length;
+        int tmpLength;
+        int currentRequestedOffset = offset;
+        int currentRequestedLength = length;
 
         // Drain leftover from last read request.
         if ( leftover != null )
@@ -68,7 +68,7 @@ public class LatinEntityResolutionReader
             if ( leftover.length > length )
             {
                 // Copy partial leftover.
-                System.arraycopy( leftover, 0, destbuf, current_requested_offset, length );
+                System.arraycopy( leftover, 0, destbuf, currentRequestedOffset, length );
                 int copyLeftOverLength = leftover.length - length;
 
                 // Create new leftover of remaining.
@@ -82,30 +82,30 @@ public class LatinEntityResolutionReader
             }
             else
             {
-                tmp_length = leftover.length;
+                tmpLength = leftover.length;
 
                 // 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)
                 leftover = null;
 
                 // Adjust offset and lengths.
-                current_requested_offset += tmp_length;
-                current_requested_length -= tmp_length;
+                currentRequestedOffset += tmpLength;
+                currentRequestedLength -= tmpLength;
             }
         }
 
-        StringBuilder sbuf = getExpandedBuffer( current_requested_length );
+        StringBuilder sbuf = getExpandedBuffer( currentRequestedLength );
 
         // Have we reached the end of the buffer?
         if ( sbuf == null )
         {
             // Do we have content?
-            if ( current_requested_offset > offset )
+            if ( currentRequestedOffset > offset )
             {
                 // Signal that we do, by calculating length.
-                return ( current_requested_offset - offset );
+                return ( currentRequestedOffset - offset );
             }
 
             // No content. signal end of buffer.
@@ -113,18 +113,18 @@ public class LatinEntityResolutionReader
         }
 
         // Copy from expanded buf whatever length we can accomodate.
-        tmp_length = Math.min( sbuf.length(), current_requested_length );
-        sbuf.getChars( 0, tmp_length, destbuf, current_requested_offset );
+        tmpLength = Math.min( sbuf.length(), currentRequestedLength );
+        sbuf.getChars( 0, tmpLength, destbuf, currentRequestedOffset );
 
         // Create the leftover (if any)
-        if ( tmp_length < sbuf.length() )
+        if ( tmpLength < sbuf.length() )
         {
-            leftover = new char[sbuf.length() - tmp_length];
-            sbuf.getChars( tmp_length, tmp_length + leftover.length, leftover, 0 );
+            leftover = new char[sbuf.length() - tmpLength];
+            sbuf.getChars( tmpLength, tmpLength + leftover.length, leftover, 0 );
         }
 
         // Calculate Actual Length and return.
-        return ( current_requested_offset - offset ) + tmp_length;
+        return ( currentRequestedOffset - offset ) + tmpLength;
     }
 
     private StringBuilder getExpandedBuffer( int minimum_length )