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 09:53:46 UTC
svn commit: r1100910 - 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 07:53:46 2011
New Revision: 1100910
URL: http://svn.apache.org/viewvc?rev=1100910&view=rev
Log:
Improve naming before factoring inheritance to 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=1100910&r1=1100909&r2=1100910&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 07:53:46 2011
@@ -125,7 +125,7 @@ public class BayesianAnalysis extends Ge
* The JDBCUtil helper class
*/
private final JDBCUtil theJDBCUtil = new JDBCUtil() {
- protected void delegatedLog(String logString) {
+ protected void log(String logString) {
log("BayesianAnalysis: " + logString);
}
};
@@ -134,12 +134,12 @@ public class BayesianAnalysis extends Ge
* The JDBCBayesianAnalyzer class that does all the work.
*/
private JDBCBayesianAnalyzer analyzer = new JDBCBayesianAnalyzer() {
- protected void delegatedLog(String logString) {
+ protected void log(String logString) {
log("BayesianAnalysis: " + logString);
}
@Override
- protected void delegatedLog(String logString, Throwable t) {
+ protected void log(String logString, Throwable t) {
log("BayesianAnalysis: " + logString, t);
}
};
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=1100910&r1=1100909&r2=1100910&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 07:53:46 2011
@@ -129,7 +129,7 @@ public class BayesianAnalysisFeeder exte
* The JDBCUtil helper class
*/
private final JDBCUtil theJDBCUtil = new JDBCUtil() {
- protected void delegatedLog(String logString) {
+ protected void log(String logString) {
log("BayesianAnalysisFeeder: " + logString);
}
};
@@ -138,12 +138,12 @@ public class BayesianAnalysisFeeder exte
* The JDBCBayesianAnalyzer class that does all the work.
*/
private JDBCBayesianAnalyzer analyzer = new JDBCBayesianAnalyzer() {
- protected void delegatedLog(String logString) {
+ protected void log(String logString) {
log("BayesianAnalysisFeeder: " + logString);
}
@Override
- protected void delegatedLog(String logString, Throwable t) {
+ protected void log(String logString, Throwable t) {
log("BayesianAnalysis: " + logString, t);
}
};
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=1100910&r1=1100909&r2=1100910&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 07:53:46 2011
@@ -54,7 +54,7 @@ abstract public class JDBCBayesianAnalyz
* @param errorString
* the error message generated
*/
- abstract protected void delegatedLog(String errorString);
+ abstract protected void log(String errorString);
/**
* An abstract method which child classes override to handle logging of
@@ -65,14 +65,14 @@ abstract public class JDBCBayesianAnalyz
* @param t
* exception
*/
- abstract protected void delegatedLog(String errorString, Throwable t);
+ abstract protected void log(String errorString, Throwable t);
/**
* The JDBCUtil helper class
*/
private final JDBCUtil theJDBCUtil = new JDBCUtil() {
- protected void delegatedLog(String logString) {
- this.delegatedLog(logString);
+ protected void log(String logString) {
+ this.log(logString);
}
};
@@ -180,7 +180,7 @@ abstract public class JDBCBayesianAnalyz
}
}
// Verbose.
- delegatedLog("Ham tokens count: " + ham.size());
+ log("Ham tokens count: " + ham.size());
rs.close();
pstmt.close();
@@ -200,7 +200,7 @@ abstract public class JDBCBayesianAnalyz
}
// Verbose.
- delegatedLog("Spam tokens count: " + spam.size());
+ log("Spam tokens count: " + spam.size());
rs.close();
pstmt.close();
@@ -221,7 +221,7 @@ abstract public class JDBCBayesianAnalyz
try {
rs.close();
} catch (java.sql.SQLException se) {
- delegatedLog("Failed to close statement after selecting spam tokens.", se);
+ log("Failed to close statement after selecting spam tokens.", se);
}
rs = null;
@@ -231,7 +231,7 @@ abstract public class JDBCBayesianAnalyz
try {
pstmt.close();
} catch (java.sql.SQLException se) {
- delegatedLog("Failed to close statement selecting message counts.", se);
+ log("Failed to close statement selecting message counts.", se);
}
pstmt = null;
@@ -302,14 +302,14 @@ abstract public class JDBCBayesianAnalyz
try {
init.close();
} catch (java.sql.SQLException ignore) {
- delegatedLog("Failed to close statement after initializing message count.", ignore);
+ log("Failed to close statement after initializing message count.", ignore);
}
}
if (update != null) {
try {
update.close();
} catch (java.sql.SQLException ignore) {
- delegatedLog("Failed to close statement after setting message count.", ignore);
+ log("Failed to close statement after setting message count.", ignore);
}
}
}
@@ -345,7 +345,7 @@ abstract public class JDBCBayesianAnalyz
try {
insert.close();
} catch (java.sql.SQLException ignore) {
- delegatedLog("Failed to close statement after updating tokens.", ignore);
+ log("Failed to close statement after updating tokens.", ignore);
}
insert = null;
@@ -355,7 +355,7 @@ abstract public class JDBCBayesianAnalyz
try {
update.close();
} catch (java.sql.SQLException ignore) {
- delegatedLog("Failed to close statement after updating tokens.", ignore);
+ log("Failed to close statement after updating tokens.", ignore);
}
update = null;
@@ -428,7 +428,7 @@ abstract public class JDBCBayesianAnalyz
StringBuffer logBuffer = null;
logBuffer = new StringBuffer(64).append("Created table '").append(tableName).append("' using sqlResources string '").append(createSqlStringName).append("'.");
- delegatedLog(logBuffer.toString());
+ log(logBuffer.toString());
} finally {
theJDBCUtil.closeJDBCStatement(createStatement);
@@ -449,7 +449,7 @@ abstract public class JDBCBayesianAnalyz
try {
delete.close();
} catch (java.sql.SQLException ignore) {
- delegatedLog("Failed to close statement after deleting ham statement. ", ignore);
+ log("Failed to close statement after deleting ham statement. ", ignore);
}
delete = null;
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=1100910&r1=1100909&r2=1100910&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 07:53:46 2011
@@ -44,7 +44,7 @@ abstract class JDBCUtil {
* @param errorString
* the error message generated
*/
- abstract protected void delegatedLog(String errorString);
+ abstract protected void log(String errorString);
/**
* Checks database metadata to see if a table exists. Try UPPER, lower, and
@@ -193,7 +193,7 @@ abstract class JDBCUtil {
*/
private void subclassLogWrapper(String logString) {
try {
- delegatedLog(logString);
+ log(logString);
} catch (Throwable t) { //NOPMD
// Throwables generated by the logging system are ignored
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org