Fixed monitor module to avoid having to export monitor implementation classes. Removed dependencies on monitor-logging.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@700000 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 54 insertions, 28 deletions

diff --git a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java
index 274b4faefd..b38968caeb 100644
--- a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java
+++ b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java
@@ -17,10 +17,9 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.monitor.impl;
+package org.apache.tuscany.sca.monitor;
 
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
+import org.apache.tuscany.sca.monitor.impl.MonitorImpl;
 
 
 /**
@@ -28,14 +27,15 @@ import org.apache.tuscany.sca.monitor.MonitorFactory;
  *
  * @version $Rev$ $Date$
  */
-public class DefaultMonitorFactoryImpl implements MonitorFactory {
+public class DefaultMonitorFactory implements MonitorFactory {
     
     private Monitor monitor = null;
 
     public Monitor createMonitor() {
-        if (monitor == null){
-            monitor = new DefaultMonitorImpl();
+        if (monitor == null) {
+            monitor = new MonitorImpl();
         }
         return monitor ;
     }
+
 }
diff --git a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
index c16140213d..ef49ddd323 100644
--- a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
+++ b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
@@ -21,6 +21,8 @@ package org.apache.tuscany.sca.monitor;
 
 import java.util.List;
 
+import org.apache.tuscany.sca.monitor.Problem.Severity;
+
 /**
  * A monitor for the watching for validation problems
  *
@@ -41,4 +43,37 @@ public interface Monitor {
      */
     List<Problem> getProblems();
     
+    /**
+     * Returns the last logged problem.
+     * 
+     * @return
+     */
+    public Problem getLastLoggedProblem();
+    
+    /**
+     * Create a new problem.
+     * 
+     * @param sourceClassName   the class name reporting the problem
+     * @param bundleName        the name of the message bundle to use
+     * @param severity          the severity of the problem
+     * @param problemObject     the model object for which the problem is being reported
+     * @param messageId         the id of the problem message
+     * @param cause             the exception which caused the problem
+     * @return
+     */
+    Problem createProblem(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Exception cause);
+
+    /**
+     * Create a new problem.
+     *  
+     * @param sourceClassName   the class name reporting the problem
+     * @param bundleName        the name of the message bundle to use
+     * @param severity          the severity of the problem
+     * @param problemObject     the model object for which the problem is being reported
+     * @param messageId         the id of the problem message
+     * @param messageParams     the parameters of the problem message
+     * @return
+     */
+    Problem createProblem(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Object... messageParams );
+    
 }
diff --git a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
index 38c3bbd991..3384626958 100644
--- a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
+++ b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
@@ -18,6 +18,7 @@
  */
 package org.apache.tuscany.sca.monitor;
 
+
 /**
  * A factory for validation monitors
  * 
@@ -26,7 +27,7 @@ package org.apache.tuscany.sca.monitor;
 public interface MonitorFactory {
 
     /**
-     * Create a new monitor
+     * Create a new monitor.
      * 
      * @return a new monitor
      */
diff --git a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java
index b98f29d4dd..585e616632 100644
--- a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java
+++ b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java
@@ -20,11 +20,10 @@
 package org.apache.tuscany.sca.monitor.impl;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
 import org.apache.tuscany.sca.monitor.Problem.Severity;
@@ -34,8 +33,8 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  *
  * @version $Rev$ $Date$
  */
-public class DefaultMonitorImpl implements Monitor {
-    private static final Logger logger = Logger.getLogger(DefaultMonitorImpl.class.getName());
+public class MonitorImpl implements Monitor {
+    private static final Logger logger = Logger.getLogger(MonitorImpl.class.getName());
     
     // Cache all the problem reported to monitor for further analysis
     private List<Problem> problemCache = new ArrayList<Problem>();
@@ -77,26 +76,17 @@ public class DefaultMonitorImpl implements Monitor {
     }
     
     public Problem getLastLoggedProblem(){
+        if (problemCache.isEmpty()) {
+            return null;
+        }
         return problemCache.get(problemCache.size() - 1);
     }
     
-    public boolean isMessageLogged(String messageId) {
-        for (Problem problem : problemCache){
-            if (problem.getMessageId().equals(messageId)){
-                return true;
-            }
-        }
-        
-        return false;
+    public Problem createProblem(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Exception cause) {
+        return new ProblemImpl(sourceClassName, bundleName, severity, problemObject, messageId, cause);
     }
     
-    public Problem getProblem(String messageId) {
-        for (Problem problem : problemCache){
-            if (problem.getMessageId().equals(messageId)){
-                return problem;
-            }
-        }
-        
-        return null;
+    public Problem createProblem(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Object... messageParams) {
+        return new ProblemImpl(sourceClassName, bundleName, severity, problemObject, messageId, messageParams);
     }
 }
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java
index 03f24dfae8..5a0aaeddd0 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
+++ b/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.assembly.builder.impl;
+package org.apache.tuscany.sca.monitor.impl;
 
 import java.util.logging.Formatter;
 import java.util.logging.Level;