Author: mcucchiara
Date: Sat Dec 31 01:31:38 2011
New Revision: 1226015
URL: http://svn.apache.org/viewvc?rev=1226015&view=rev
Log:
DIRECTMEMORY-52 - Constants now match the right pattern "'^[a-z][a-zA-Z0-9]*$'"
and package declarations reside on top of the files
Modified:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/Monitor.java
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/MonitorService.java
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/MonitorServiceImpl.java
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerService.java
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java
Modified:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/Monitor.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/Monitor.java?rev=1226015&r1=1226014&r2=1226015&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/Monitor.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/Monitor.java
Sat Dec 31 01:31:38 2011
@@ -19,30 +19,31 @@ package org.apache.directmemory.measures
* under the License.
*/
-import java.text.DecimalFormat;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.directmemory.misc.Format;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.text.DecimalFormat;
+import java.util.HashMap;
+import java.util.Map;
+
public class Monitor
{
- private static final Logger logger = LoggerFactory.getLogger(
Monitor.class );
+ private static final Logger LOG = LoggerFactory.getLogger( Monitor.class );
- public static final Map<String, MonitorService> monitors = new
HashMap<String, MonitorService>();
+ //TODO: MONITORS looks like a good candidate to become a private field
+ public static final Map<String, MonitorService> MONITORS = new
HashMap<String, MonitorService>();
private MonitorService monitorService;
public static MonitorService get( String key )
{
- MonitorService mon = monitors.get( key );
+ MonitorService mon = MONITORS.get( key );
if ( mon == null )
{
mon = new MonitorServiceImpl( key );
- monitors.put( key, mon );
+ MONITORS.put( key, mon );
}
return mon;
}
@@ -50,7 +51,7 @@ public class Monitor
public Monitor( String name )
{
this.monitorService = new MonitorServiceImpl( name );
- monitors.put( name, monitorService );
+ MONITORS.put( name, monitorService );
}
public long start()
@@ -101,11 +102,11 @@ public class Monitor
public static void dump( String prefix )
{
- for ( MonitorService monitor : monitors.values() )
+ for ( MonitorService monitor : MONITORS.values() )
{
if ( monitor.getName().startsWith( prefix ) )
{
- logger.info( monitor.toString() );
+ LOG.info( monitor.toString() );
}
}
}
Modified:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/MonitorService.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/MonitorService.java?rev=1226015&r1=1226014&r2=1226015&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/MonitorService.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/MonitorService.java
Sat Dec 31 01:31:38 2011
@@ -1,3 +1,5 @@
+package org.apache.directmemory.measures;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,7 +19,6 @@
* under the License.
*/
-package org.apache.directmemory.measures;
import java.util.concurrent.atomic.AtomicLong;
Modified:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/MonitorServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/MonitorServiceImpl.java?rev=1226015&r1=1226014&r2=1226015&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/MonitorServiceImpl.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/MonitorServiceImpl.java
Sat Dec 31 01:31:38 2011
@@ -1,3 +1,5 @@
+package org.apache.directmemory.measures;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,17 +19,16 @@
* under the License.
*/
-package org.apache.directmemory.measures;
+
+import org.apache.directmemory.misc.Format;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.text.DecimalFormat;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.directmemory.misc.Format;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class MonitorServiceImpl
implements MonitorService
{
@@ -42,9 +43,10 @@ public class MonitorServiceImpl
public String name;
- private static final Logger logger = LoggerFactory.getLogger(
MonitorServiceImpl.class );
+ private static final Logger LOG = LoggerFactory.getLogger(
MonitorServiceImpl.class );
- public static final Map<String, MonitorServiceImpl> monitors = new
HashMap<String, MonitorServiceImpl>();
+ //TODO: MONITORS looks like a good candidate to become a private field
+ public static final Map<String, MonitorServiceImpl> MONITORS = new
HashMap<String, MonitorServiceImpl>();
public MonitorServiceImpl( String name )
{
@@ -97,11 +99,11 @@ public class MonitorServiceImpl
public void dump( String prefix )
{
- for ( MonitorServiceImpl monitor :
MonitorServiceImpl.monitors.values() )
+ for ( MonitorServiceImpl monitor :
MonitorServiceImpl.MONITORS.values() )
{
if ( monitor.name.startsWith( prefix ) )
{
- logger.info( monitor.toString() );
+ LOG.info( monitor.toString() );
}
}
}
Modified:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerService.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerService.java?rev=1226015&r1=1226014&r2=1226015&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerService.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerService.java
Sat Dec 31 01:31:38 2011
@@ -1,3 +1,5 @@
+package org.apache.directmemory.memory;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,7 +19,6 @@
* under the License.
*/
-package org.apache.directmemory.memory;
import java.util.List;
Modified:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java?rev=1226015&r1=1226014&r2=1226015&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java
Sat Dec 31 01:31:38 2011
@@ -1,3 +1,5 @@
+package org.apache.directmemory.memory;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,16 +19,15 @@
* under the License.
*/
-package org.apache.directmemory.memory;
-
-import java.util.List;
-import java.util.Vector;
import org.apache.directmemory.measures.Ram;
import org.apache.directmemory.misc.Format;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.List;
+import java.util.Vector;
+
public class MemoryManagerServiceImpl
implements MemoryManagerService
{
