Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/FBUtilities.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/FBUtilities.java?rev=1052357&r1=1052356&r2=1052357&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/FBUtilities.java (original) +++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/FBUtilities.java Thu Dec 23 19:09:43 2010 @@ -34,11 +34,8 @@ import java.util.zip.Deflater; import java.util.zip.Inflater; import org.apache.log4j.Logger; - import org.apache.commons.collections.iterators.CollatingIterator; -import com.sun.jna.LastErrorException; -import com.sun.jna.Native; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.AbstractType;
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/GuidGenerator.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/GuidGenerator.java?rev=1052357&r1=1052356&r2=1052357&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/GuidGenerator.java (original) +++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/GuidGenerator.java Thu Dec 23 19:09:43 2010 @@ -18,11 +18,14 @@ package org.apache.cassandra.utils; -import org.apache.log4j.Logger; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.util.Random; -import java.util.*; -import java.net.*; -import java.security.*; +import org.apache.log4j.Logger; public class GuidGenerator { private static Logger logger_ = Logger.getLogger(GuidGenerator.class); Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/LatencyTracker.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/LatencyTracker.java?rev=1052357&r1=1052356&r2=1052357&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/LatencyTracker.java (original) +++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/LatencyTracker.java Thu Dec 23 19:09:43 2010 @@ -22,7 +22,6 @@ package org.apache.cassandra.utils; import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicLongArray; public class LatencyTracker { Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/MerkleTree.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/MerkleTree.java?rev=1052357&r1=1052356&r2=1052357&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/MerkleTree.java (original) +++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/MerkleTree.java Thu Dec 23 19:09:43 2010 @@ -24,7 +24,9 @@ import java.util.*; import com.google.common.collect.AbstractIterator; import com.google.common.collect.PeekingIterator; -import org.apache.cassandra.dht.*; +import org.apache.cassandra.dht.IPartitioner; +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Token; /** * A MerkleTree implemented as a binary tree. Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/SimpleCondition.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/SimpleCondition.java?rev=1052357&r1=1052356&r2=1052357&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/SimpleCondition.java (original) +++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/SimpleCondition.java Thu Dec 23 19:09:43 2010 @@ -21,9 +21,9 @@ package org.apache.cassandra.utils; */ -import java.util.concurrent.locks.Condition; -import java.util.concurrent.TimeUnit; import java.util.Date; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Condition; // fulfils the Condition interface without spurious wakeup problems // (or lost notify problems either: that is, even if you call await() Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/XMLUtils.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/XMLUtils.java?rev=1052357&r1=1052356&r2=1052357&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/XMLUtils.java (original) +++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/XMLUtils.java Thu Dec 23 19:09:43 2010 @@ -18,18 +18,21 @@ package org.apache.cassandra.utils; -import java.util.*; -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpression; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; -import java.io.*; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; import java.net.URI; -import org.w3c.dom.*; -import org.xml.sax.*; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.xpath.*; + +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.SAXException; public class XMLUtils {
