Changes to comply with Project Wonder coding conventions:

   * Class and interface names start with ERX or IERX respectively.
   * Individual imports instead of '*'.

Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java

@@ -1,18 +1,35 @@
 package er.extensions.statistics;
 
-import com.webobjects.appserver.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
+
+import org.apache.log4j.Logger;
+
+import com.webobjects.appserver.WOComponent;
+import com.webobjects.appserver.WOContext;
+import com.webobjects.appserver.WORequest;
+import com.webobjects.appserver.WOSession;
+import com.webobjects.appserver.WOStatisticsStore;
 import com.webobjects.foundation.NSArray;
 import com.webobjects.foundation.NSDictionary;
 import com.webobjects.foundation.NSMutableArray;
 import com.webobjects.foundation.NSMutableDictionary;
+
 import er.extensions.appserver.ERXApplication;
 import er.extensions.eof.ERXEC;
 import er.extensions.eof.ERXObjectStoreCoordinator;
 import er.extensions.foundation.ERXProperties;
-import er.extensions.statistics.store.*;
-import org.apache.log4j.Logger;
-
-import java.util.*;
+import er.extensions.statistics.store.ERXDumbStatisticsStoreListener;
+import er.extensions.statistics.store.IERXStatisticsStoreListener;
+import er.extensions.statistics.store.ERXEmptyRequestDescription;
+import er.extensions.statistics.store.ERXNormalRequestDescription;
+import er.extensions.statistics.store.IERXRequestDescription;
 
 /**
  * Enhances the normal stats store with a bunch of useful things which get
@@ -45,10 +62,10 @@ private StopWatchTimer timer() {
 		return _timer;
 	}
 
-    private final ERXStatisticsStoreListener listener;
+    private final IERXStatisticsStoreListener listener;
 
     public ERXStatisticsStore() {
-        listener = new DumbERXStatisticsStoreListener();
+        listener = new ERXDumbStatisticsStoreListener();
     }
 
     /**
@@ -57,7 +74,7 @@ public ERXStatisticsStore() {
      * 
      * @param listener a customer listener to do something 'special' when requests are slow
      */
-    public ERXStatisticsStore(ERXStatisticsStoreListener listener) {
+    public ERXStatisticsStore(IERXStatisticsStoreListener listener) {
         this.listener = listener;
     }
 
@@ -117,7 +134,7 @@ protected void endTimer(WOContext aContext, String aString) {
 					_lastLog = currentTime;
 				}
 
-                RequestDescription requestDescription = descriptionObjectForContext(aContext, aString);
+                IERXRequestDescription requestDescription = descriptionObjectForContext(aContext, aString);
                 listener.log(requestTime, requestDescription);
 				if (requestTime > _maximumRequestFatalTime) {
 					log.fatal("Request did take too long : " + requestTime + "ms request was: " + requestDescription + trace);
@@ -221,7 +238,7 @@ public String descriptionForContext(WOContext aContext, String string) {
 			return descriptionObjectForContext(aContext, string).toString();
 		}
 
-        public RequestDescription descriptionObjectForContext(WOContext aContext, String string) {
+        public IERXRequestDescription descriptionObjectForContext(WOContext aContext, String string) {
             if (aContext != null) {
                 try {
                     WOComponent component = aContext.page();
@@ -232,13 +249,13 @@ public RequestDescription descriptionObjectForContext(WOContext aContext, String
                     if (!requestHandler.equals("wo")) {
                         additionalInfo = additionalInfo + aContext.request().uri();
                     }
-                    return new NormalRequestDescription(componentName, requestHandler, additionalInfo);
+                    return new ERXNormalRequestDescription(componentName, requestHandler, additionalInfo);
                 }
                 catch (RuntimeException e) {
                     log.error("Cannot get context description since received exception " + e, e);
                 }
             }
-            return new EmptyRequestDescription(string);
+            return new ERXEmptyRequestDescription(string);
         }
 
 

Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXDumbStatisticsStoreListener.java

@@ -0,0 +1,8 @@
+package er.extensions.statistics.store;
+
+public class ERXDumbStatisticsStoreListener implements IERXStatisticsStoreListener {
+
+    public void log(long requestTime, IERXRequestDescription description) {}
+
+    public void deadlock(int deadlocksCount) {}
+}

Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/EmptyRequestDescription.java → Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXEmptyRequestDescription.java

@@ -1,11 +1,11 @@
 package er.extensions.statistics.store;
 
-public class EmptyRequestDescription implements RequestDescription {
+public class ERXEmptyRequestDescription implements IERXRequestDescription {
 
     public static final String ERROR_STRING = "Error-during-context-description";
     private String descriptionString = ERROR_STRING;
 
-    public EmptyRequestDescription(String descriptionString) {
+    public ERXEmptyRequestDescription(String descriptionString) {
         if (descriptionString != null) {
             this.descriptionString = descriptionString;
         }

Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/NormalRequestDescription.java → Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXNormalRequestDescription.java

@@ -1,12 +1,12 @@
 package er.extensions.statistics.store;
 
-public class NormalRequestDescription implements RequestDescription {
+public class ERXNormalRequestDescription implements IERXRequestDescription {
 
     private final String componentName;
     private final String requestHandler;
     private final String additionalInfo;
 
-    public NormalRequestDescription(String componentName, String requestHandler, String additionalInfo) {
+    public ERXNormalRequestDescription(String componentName, String requestHandler, String additionalInfo) {
         this.componentName = componentName;
         this.requestHandler = requestHandler;
         this.additionalInfo = additionalInfo;

Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/RequestDescription.java → Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/IERXRequestDescription.java

@@ -1,6 +1,6 @@
 package er.extensions.statistics.store;
 
-public interface RequestDescription {
+public interface IERXRequestDescription {
 
     public String getComponentName();
 

Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/IERXStatisticsStoreListener.java

@@ -0,0 +1,9 @@
+package er.extensions.statistics.store;
+
+public interface IERXStatisticsStoreListener {
+
+    public void log(long requestTime, IERXRequestDescription description);
+
+    public void deadlock(int deadlocksCount);
+
+}