Author: jbellis Date: Tue Dec 14 17:49:41 2010 New Revision: 1049194 URL: http://svn.apache.org/viewvc?rev=1049194&view=rev Log: make inner classes static where possible patch by Dave Brosius; reviewed by jbellis for CASSANDRA-1845
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/concurrent/RetryingScheduledThreadPoolExecutor.java cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/net/MessagingService.java cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java?rev=1049194&r1=1049193&r2=1049194&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java Tue Dec 14 17:49:41 2010 @@ -1916,7 +1916,7 @@ public class CliClient extends CliUserHe return getBytesAccordingToType(key, keyComparator); } - private class KsDefNamesComparator implements Comparator<KsDef> + private static class KsDefNamesComparator implements Comparator<KsDef> { public int compare(KsDef a, KsDef b) { @@ -1924,7 +1924,7 @@ public class CliClient extends CliUserHe } } - private class CfDefNamesComparator implements Comparator<CfDef> + private static class CfDefNamesComparator implements Comparator<CfDef> { public int compare(CfDef a, CfDef b) { Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/concurrent/RetryingScheduledThreadPoolExecutor.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/concurrent/RetryingScheduledThreadPoolExecutor.java?rev=1049194&r1=1049193&r2=1049194&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/concurrent/RetryingScheduledThreadPoolExecutor.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/concurrent/RetryingScheduledThreadPoolExecutor.java Tue Dec 14 17:49:41 2010 @@ -50,7 +50,7 @@ public class RetryingScheduledThreadPool return new LoggingScheduledFuture<V>(task); } - private class LoggingScheduledFuture<V> implements RunnableScheduledFuture<V> + private static class LoggingScheduledFuture<V> implements RunnableScheduledFuture<V> { private final RunnableScheduledFuture<V> task; Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java?rev=1049194&r1=1049193&r2=1049194&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java Tue Dec 14 17:49:41 2010 @@ -758,7 +758,7 @@ public class CompactionManager implement return executor.getCompletedTaskCount(); } - private class SimpleFuture implements Future + private static class SimpleFuture implements Future { private Runnable runnable; Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java?rev=1049194&r1=1049193&r2=1049194&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java Tue Dec 14 17:49:41 2010 @@ -174,7 +174,7 @@ public class ColumnFamilyOutputFormat ex /** * An {...@link OutputCommitter} that does nothing. */ - public class NullOutputCommitter extends OutputCommitter + public static class NullOutputCommitter extends OutputCommitter { public void abortTask(TaskAttemptContext taskContext) { } Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/net/MessagingService.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/net/MessagingService.java?rev=1049194&r1=1049193&r2=1049194&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/net/MessagingService.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/net/MessagingService.java Tue Dec 14 17:49:41 2010 @@ -532,7 +532,7 @@ public class MessagingService implements GCInspector.instance.logStats(); } - private class SocketThread extends Thread + private static class SocketThread extends Thread { private final ServerSocket server; Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java?rev=1049194&r1=1049193&r2=1049194&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java Tue Dec 14 17:49:41 2010 @@ -191,7 +191,7 @@ public class GCInspector // wrapper for sun class. this enables other jdks to compile this class. - private final class SunGcWrapper + private static final class SunGcWrapper { private Map<String, MemoryUsage> usageBeforeGc = null;