You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2011/05/09 13:49:19 UTC
svn commit: r1100968 - in
/james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic:
BayesianAnalysis.java BayesianAnalysisFeeder.java JDBCBayesianAnalyzer.java
JDBCUtil.java
Author: rdonkin
Date: Mon May 9 11:49:18 2011
New Revision: 1100968
URL: http://svn.apache.org/viewvc?rev=1100968&view=rev
Log:
Replaced subclassing with delegation.
Modified:
james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java
james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java
james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java
james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCUtil.java
Modified: james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java
URL: http://svn.apache.org/viewvc/james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java?rev=1100968&r1=1100967&r2=1100968&view=diff
==============================================================================
--- james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java (original)
+++ james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java Mon May 9 11:49:18 2011
@@ -124,11 +124,7 @@ public class BayesianAnalysis extends Ge
/**
* The JDBCUtil helper class
*/
- private final JDBCUtil theJDBCUtil = new JDBCUtil() {
- protected void log(String logString) {
- log("BayesianAnalysis: " + logString);
- }
- };
+ private final JDBCUtil theJDBCUtil = new JDBCUtil(this);
/**
* The JDBCBayesianAnalyzer class that does all the work.
Modified: james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java
URL: http://svn.apache.org/viewvc/james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java?rev=1100968&r1=1100967&r2=1100968&view=diff
==============================================================================
--- james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java (original)
+++ james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java Mon May 9 11:49:18 2011
@@ -128,11 +128,7 @@ public class BayesianAnalysisFeeder exte
/**
* The JDBCUtil helper class
*/
- private final JDBCUtil theJDBCUtil = new JDBCUtil() {
- protected void log(String logString) {
- log("BayesianAnalysisFeeder: " + logString);
- }
- };
+ private final JDBCUtil theJDBCUtil = new JDBCUtil(this);
/**
* The JDBCBayesianAnalyzer class that does all the work.
Modified: james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java
URL: http://svn.apache.org/viewvc/james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java?rev=1100968&r1=1100967&r2=1100968&view=diff
==============================================================================
--- james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java (original)
+++ james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java Mon May 9 11:49:18 2011
@@ -42,7 +42,7 @@ import org.w3c.dom.Document;
* @since 2.3.0
*/
-public class JDBCBayesianAnalyzer extends BayesianAnalyzer {
+public class JDBCBayesianAnalyzer extends BayesianAnalyzer implements Log {
/** Public object representing a lock on database activity. */
public final static String DATABASE_LOCK = "database lock";
@@ -52,11 +52,7 @@ public class JDBCBayesianAnalyzer extend
/**
* The JDBCUtil helper class
*/
- private final JDBCUtil theJDBCUtil = new JDBCUtil() {
- protected void log(String logString) {
- this.log(logString);
- }
- };
+ private final JDBCUtil theJDBCUtil = new JDBCUtil(this);
/** Logs messages. */
private Log log;
@@ -470,7 +466,7 @@ public class JDBCBayesianAnalyzer extend
* @param errorString
* the error message generated
*/
- private void log(String errorString) {
+ public void log(String errorString) {
log.log(errorString);
}
@@ -482,7 +478,7 @@ public class JDBCBayesianAnalyzer extend
* @param t
* exception
*/
- private void log(String errorString, Throwable t) {
+ public void log(String errorString, Throwable t) {
log.log(errorString, t);
}
}
Modified: james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCUtil.java
URL: http://svn.apache.org/viewvc/james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCUtil.java?rev=1100968&r1=1100967&r2=1100968&view=diff
==============================================================================
--- james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCUtil.java (original)
+++ james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCUtil.java Mon May 9 11:49:18 2011
@@ -36,7 +36,28 @@ import java.util.Locale;
* different logging capabilities/interfaces in different parts of the code.
* </p>
*/
-abstract class JDBCUtil {
+final class JDBCUtil {
+
+ private Log log;
+
+ public JDBCUtil(Log log) {
+ super();
+ this.log = log;
+ }
+
+ public JDBCUtil() {
+ super();
+ this.log = new SystemLog();
+ }
+
+ public Log getLog() {
+ return log;
+ }
+
+ public void setLog(Log log) {
+ this.log = log;
+ }
+
/**
* An abstract method which child classes override to handle logging of
* errors in their particular environments.
@@ -44,7 +65,9 @@ abstract class JDBCUtil {
* @param errorString
* the error message generated
*/
- abstract protected void log(String errorString);
+ private void log(String errorString) {
+ log.log(errorString);
+ }
/**
* Checks database metadata to see if a table exists. Try UPPER, lower, and
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org