mirror of
https://github.com/vanitasvitae/Smack.git
synced 2025-09-10 17:49:38 +02:00
SMACK-534 Refactored all System.out/err and printStackTrace calls with appropriate Java util logging calls.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13887 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
rcollier
parent
9bb940da4b
commit
1b651d4939
30 changed files with 189 additions and 183 deletions
|
|
@ -5,6 +5,9 @@
|
|||
*
|
||||
*/
|
||||
package org.jivesoftware.smack.util;
|
||||
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
/**
|
||||
* <p>Encodes and decodes to and from Base64 notation.</p>
|
||||
|
|
@ -17,9 +20,9 @@ package org.jivesoftware.smack.util;
|
|||
*/
|
||||
public class Base64
|
||||
{
|
||||
|
||||
/* ******** P U B L I C F I E L D S ******** */
|
||||
|
||||
private static Logger log = Logger.getLogger(Base64.class.getName());
|
||||
|
||||
/* ******** P U B L I C F I E L D S ******** */
|
||||
|
||||
/** No options specified. Value is zero. */
|
||||
public final static int NO_OPTIONS = 0;
|
||||
|
|
@ -311,18 +314,6 @@ public class Base64
|
|||
/** Defeats instantiation. */
|
||||
private Base64(){}
|
||||
|
||||
/**
|
||||
* Prints command line usage.
|
||||
*
|
||||
* @param msg A message to include with usage info.
|
||||
*/
|
||||
private final static void usage( String msg )
|
||||
{
|
||||
System.err.println( msg );
|
||||
System.err.println( "Usage: java Base64 -e|-d inputfile outputfile" );
|
||||
} // end usage
|
||||
|
||||
|
||||
/* ******** E N C O D I N G M E T H O D S ******** */
|
||||
|
||||
|
||||
|
|
@ -494,7 +485,7 @@ public class Base64
|
|||
} // end try
|
||||
catch( java.io.IOException e )
|
||||
{
|
||||
e.printStackTrace();
|
||||
log.log(Level.SEVERE, "Error encoding object", e);
|
||||
return null;
|
||||
} // end catch
|
||||
finally
|
||||
|
|
@ -623,7 +614,7 @@ public class Base64
|
|||
} // end try
|
||||
catch( java.io.IOException e )
|
||||
{
|
||||
e.printStackTrace();
|
||||
log.log(Level.SEVERE, "Error encoding bytes", e);
|
||||
return null;
|
||||
} // end catch
|
||||
finally
|
||||
|
|
@ -777,11 +768,12 @@ public class Base64
|
|||
destination[ destOffset + 2 ] = (byte)( outBuff );
|
||||
|
||||
return 3;
|
||||
}catch( Exception e){
|
||||
System.out.println(""+source[srcOffset]+ ": " + ( DECODABET[ source[ srcOffset ] ] ) );
|
||||
System.out.println(""+source[srcOffset+1]+ ": " + ( DECODABET[ source[ srcOffset + 1 ] ] ) );
|
||||
System.out.println(""+source[srcOffset+2]+ ": " + ( DECODABET[ source[ srcOffset + 2 ] ] ) );
|
||||
System.out.println(""+source[srcOffset+3]+ ": " + ( DECODABET[ source[ srcOffset + 3 ] ] ) );
|
||||
}catch( Exception e){
|
||||
log.log(Level.SEVERE, e.getMessage(), e);
|
||||
log.severe(""+source[srcOffset]+ ": " + ( DECODABET[ source[ srcOffset ] ] ) );
|
||||
log.severe(""+source[srcOffset+1]+ ": " + ( DECODABET[ source[ srcOffset + 1 ] ] ) );
|
||||
log.severe(""+source[srcOffset+2]+ ": " + ( DECODABET[ source[ srcOffset + 2 ] ] ) );
|
||||
log.severe(""+source[srcOffset+3]+ ": " + ( DECODABET[ source[ srcOffset + 3 ] ] ) );
|
||||
return -1;
|
||||
} // end catch
|
||||
}
|
||||
|
|
@ -839,7 +831,7 @@ public class Base64
|
|||
} // end if: white space, equals sign or better
|
||||
else
|
||||
{
|
||||
System.err.println( "Bad Base64 input character at " + i + ": " + source[i] + "(decimal)" );
|
||||
log.warning("Bad Base64 input character at " + i + ": " + source[i] + "(decimal)");
|
||||
return null;
|
||||
} // end else:
|
||||
} // each input character
|
||||
|
|
@ -967,12 +959,12 @@ public class Base64
|
|||
} // end try
|
||||
catch( java.io.IOException e )
|
||||
{
|
||||
e.printStackTrace();
|
||||
log.log(Level.SEVERE, "Error reading object", e);
|
||||
obj = null;
|
||||
} // end catch
|
||||
catch( java.lang.ClassNotFoundException e )
|
||||
{
|
||||
e.printStackTrace();
|
||||
log.log(Level.SEVERE, "Class not found for encoded object", e);
|
||||
obj = null;
|
||||
} // end catch
|
||||
finally
|
||||
|
|
@ -1079,7 +1071,7 @@ public class Base64
|
|||
// Check for size of file
|
||||
if( file.length() > Integer.MAX_VALUE )
|
||||
{
|
||||
System.err.println( "File is too big for this convenience method (" + file.length() + " bytes)." );
|
||||
log.warning("File is too big for this convenience method (" + file.length() + " bytes).");
|
||||
return null;
|
||||
} // end if: file too big for int index
|
||||
buffer = new byte[ (int)file.length() ];
|
||||
|
|
@ -1100,7 +1092,7 @@ public class Base64
|
|||
} // end try
|
||||
catch( java.io.IOException e )
|
||||
{
|
||||
System.err.println( "Error decoding from file " + filename );
|
||||
log.log(Level.SEVERE, "Error decoding from file " + filename, e);
|
||||
} // end catch: IOException
|
||||
finally
|
||||
{
|
||||
|
|
@ -1148,7 +1140,7 @@ public class Base64
|
|||
} // end try
|
||||
catch( java.io.IOException e )
|
||||
{
|
||||
System.err.println( "Error encoding from file " + filename );
|
||||
log.log(Level.SEVERE, "Error encoding from file " + filename, e);
|
||||
} // end catch: IOException
|
||||
finally
|
||||
{
|
||||
|
|
@ -1175,7 +1167,7 @@ public class Base64
|
|||
out.write( encoded.getBytes("US-ASCII") ); // Strict, 7-bit output.
|
||||
} // end try
|
||||
catch( java.io.IOException ex ) {
|
||||
ex.printStackTrace();
|
||||
log.log(Level.SEVERE, "Error encoding file " + infile, ex);
|
||||
} // end catch
|
||||
finally {
|
||||
try { out.close(); }
|
||||
|
|
@ -1201,7 +1193,7 @@ public class Base64
|
|||
out.write( decoded );
|
||||
} // end try
|
||||
catch( java.io.IOException ex ) {
|
||||
ex.printStackTrace();
|
||||
log.log(Level.SEVERE, "Error decoding file " + infile, ex);
|
||||
} // end catch
|
||||
finally {
|
||||
try { out.close(); }
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ package org.jivesoftware.smack.util;
|
|||
import org.jivesoftware.smack.util.collections.AbstractMapEntry;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
/**
|
||||
* A specialized Map that is size-limited (using an LRU algorithm) and
|
||||
|
|
@ -49,7 +50,7 @@ import java.util.*;
|
|||
* @author Matt Tucker
|
||||
*/
|
||||
public class Cache<K, V> implements Map<K, V> {
|
||||
|
||||
private static Logger log = Logger.getLogger(Cache.class.getName());
|
||||
/**
|
||||
* The map the keys and values are stored in.
|
||||
*/
|
||||
|
|
@ -382,8 +383,7 @@ public class Cache<K, V> implements Map<K, V> {
|
|||
|
||||
while (expireTime > node.timestamp) {
|
||||
if (remove(node.object, true) == null) {
|
||||
System.err.println("Error attempting to remove(" + node.object.toString() +
|
||||
") - cacheObject not found in cache!");
|
||||
log.warning("Error attempting to remove(" + node.object.toString() + ") - cacheObject not found in cache!");
|
||||
// remove from the ageList
|
||||
node.remove();
|
||||
}
|
||||
|
|
@ -417,9 +417,7 @@ public class Cache<K, V> implements Map<K, V> {
|
|||
for (int i=map.size(); i>desiredSize; i--) {
|
||||
// Get the key and invoke the remove method on it.
|
||||
if (remove(lastAccessedList.getLast().object, true) == null) {
|
||||
System.err.println("Error attempting to cullCache with remove(" +
|
||||
lastAccessedList.getLast().object.toString() + ") - " +
|
||||
"cacheObject not found in cache!");
|
||||
log.warning("Error attempting to cullCache with remove(" + lastAccessedList.getLast().object.toString() + ") - cacheObject not found in cache!");
|
||||
lastAccessedList.getLast().remove();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@ import java.util.Collection;
|
|||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.jivesoftware.smack.Connection;
|
||||
import org.jivesoftware.smack.packet.Authentication;
|
||||
|
|
@ -57,7 +59,8 @@ import org.xmlpull.v1.XmlPullParserException;
|
|||
* @author Gaston Dombiak
|
||||
*/
|
||||
public class PacketParserUtils {
|
||||
|
||||
private static Logger logger = Logger.getLogger(PacketParserUtils.class.getName());
|
||||
|
||||
/**
|
||||
* Namespace used to store packet properties.
|
||||
*/
|
||||
|
|
@ -198,7 +201,7 @@ public class PacketParserUtils {
|
|||
type = Presence.Type.valueOf(typeString);
|
||||
}
|
||||
catch (IllegalArgumentException iae) {
|
||||
System.err.println("Found invalid presence type " + typeString);
|
||||
logger.warning("Found invalid presence type " + typeString);
|
||||
}
|
||||
}
|
||||
Presence presence = new Presence(type);
|
||||
|
|
@ -242,7 +245,7 @@ public class PacketParserUtils {
|
|||
presence.setMode(Presence.Mode.valueOf(modeText));
|
||||
}
|
||||
catch (IllegalArgumentException iae) {
|
||||
System.err.println("Found invalid presence mode " + modeText);
|
||||
logger.warning("Found invalid presence mode " + modeText);
|
||||
}
|
||||
}
|
||||
else if (elementName.equals("error")) {
|
||||
|
|
@ -263,7 +266,7 @@ public class PacketParserUtils {
|
|||
presence.addExtension(PacketParserUtils.parsePacketExtension(elementName, namespace, parser));
|
||||
}
|
||||
catch (Exception e) {
|
||||
System.err.println("Failed to parse extension packet in Presence packet.");
|
||||
logger.warning("Failed to parse extension packet in Presence packet.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -639,7 +642,7 @@ public class PacketParserUtils {
|
|||
value = in.readObject();
|
||||
}
|
||||
catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
logger.log(Level.SEVERE, "Error parsing java object", e);
|
||||
}
|
||||
}
|
||||
if (name != null && value != null) {
|
||||
|
|
@ -782,8 +785,7 @@ public class PacketParserUtils {
|
|||
}
|
||||
}
|
||||
catch (IllegalArgumentException iae) {
|
||||
// Print stack trace. We shouldn't be getting an illegal error type.
|
||||
iae.printStackTrace();
|
||||
logger.log(Level.SEVERE, "Could not find error type for " + type.toUpperCase(), iae);
|
||||
}
|
||||
return new XMPPError(Integer.parseInt(errorCode), errorType, condition, message, extensions);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,6 +34,8 @@ import java.util.Date;
|
|||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import java.util.TimeZone;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
|
|
@ -41,7 +43,8 @@ import java.util.regex.Pattern;
|
|||
* A collection of utility methods for String objects.
|
||||
*/
|
||||
public class StringUtils {
|
||||
|
||||
private static Logger log = Logger.getLogger(StringUtils.class.getName());
|
||||
|
||||
/**
|
||||
* Date format as defined in XEP-0082 - XMPP Date and Time Profiles. The time zone is set to
|
||||
* UTC.
|
||||
|
|
@ -619,8 +622,7 @@ public class StringUtils {
|
|||
digest = MessageDigest.getInstance("SHA-1");
|
||||
}
|
||||
catch (NoSuchAlgorithmException nsae) {
|
||||
System.err.println("Failed to load the SHA-1 MessageDigest. " +
|
||||
"Jive will be unable to function normally.");
|
||||
log.log(Level.SEVERE, "Failed to load the SHA-1 MessageDigest. Smack will be unable to function normally.", nsae);
|
||||
}
|
||||
}
|
||||
// Now, compute hash.
|
||||
|
|
@ -628,7 +630,7 @@ public class StringUtils {
|
|||
digest.update(data.getBytes("UTF-8"));
|
||||
}
|
||||
catch (UnsupportedEncodingException e) {
|
||||
System.err.println(e);
|
||||
log.log(Level.SEVERE, "Error computing hash", e);
|
||||
}
|
||||
return encodeHex(digest.digest());
|
||||
}
|
||||
|
|
@ -664,7 +666,7 @@ public class StringUtils {
|
|||
bytes = data.getBytes("ISO-8859-1");
|
||||
}
|
||||
catch (UnsupportedEncodingException uee) {
|
||||
uee.printStackTrace();
|
||||
throw new IllegalStateException(uee);
|
||||
}
|
||||
return encodeBase64(bytes);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue