DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2006-01-26 06:12:05 +0100 (Thu, 26 Jan 2006)
New Revision: 977

Modified:
   trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java
   trunk/main/metro/model/src/main/net/dpml/metro/ComponentHandler.java
   trunk/main/metro/model/src/main/net/dpml/metro/ComponentManager.java
   trunk/main/metro/model/src/main/net/dpml/metro/ComponentModel.java
   
trunk/main/metro/model/src/main/net/dpml/metro/ComponentModelOperations.java
   trunk/main/metro/model/src/main/net/dpml/metro/ContextManager.java
   trunk/main/metro/model/src/main/net/dpml/metro/ContextModel.java
   trunk/main/metro/model/src/main/net/dpml/metro/ContextModelOperations.java
   trunk/main/metro/model/src/main/net/dpml/metro/PartsManager.java
   trunk/main/metro/part/api/src/main/net/dpml/part/ComponentOperations.java
   trunk/main/metro/part/api/src/main/net/dpml/part/ProviderOperations.java
   trunk/main/metro/part/api/src/main/net/dpml/part/remote/Component.java
   trunk/main/metro/part/api/src/main/net/dpml/part/remote/Provider.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
   trunk/main/metro/test/src/main/net/dpml/test/composite/PartsComponent.java
   
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java
   
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java
   
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java
   
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ProviderTestCase.java
   trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java
Log:
checkstyle cleanup

Modified: 
trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java
===================================================================
--- trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java  
  2006-01-26 04:10:09 UTC (rev 976)
+++ trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java  
  2006-01-26 05:12:05 UTC (rev 977)
@@ -42,8 +42,6 @@
 import net.dpml.part.remote.Model;
 import net.dpml.part.remote.Service;
 
-import net.dpml.metro.ComponentModel;
-import net.dpml.metro.ContextModel;
 import net.dpml.metro.ComponentManager;
 import net.dpml.metro.ContextManager;
 

Modified: trunk/main/metro/model/src/main/net/dpml/metro/ComponentHandler.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/ComponentHandler.java      
  2006-01-26 04:10:09 UTC (rev 976)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ComponentHandler.java      
  2006-01-26 05:12:05 UTC (rev 977)
@@ -22,11 +22,9 @@
 
 import net.dpml.part.ComponentOperations;
 
-import net.dpml.metro.ComponentModel;
-
 /**
  * Local interface through which a component implementation may 
- * interact with subsidary parts.
+ * interact with the assigned model, subsidary parts, and context.
  *
  * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
  * @version @PROJECT-VERSION@
@@ -34,14 +32,16 @@
 public interface ComponentHandler extends ComponentOperations
 {
    /**
-    * Return a mutible context map.
+    * Return a mutible context map.  The map may be used by component
+    * implementations to override context entries in the associated 
+    * component instance.
     *
     * @return the context map
     */
     Map getContextMap();
     
    /**
-    * Return the component model manager associated with the component 
handler.
+    * Return the component model manager.
     * @return the component model manager
     */
     ComponentManager getComponentManager();

Modified: trunk/main/metro/model/src/main/net/dpml/metro/ComponentManager.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/ComponentManager.java      
  2006-01-26 04:10:09 UTC (rev 976)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ComponentManager.java      
  2006-01-26 05:12:05 UTC (rev 977)
@@ -18,19 +18,15 @@
 
 package net.dpml.metro;
 
-import java.rmi.RemoteException;
-
 import net.dpml.metro.info.CollectionPolicy;
 
 import net.dpml.part.ActivationPolicy;
 
-import net.dpml.metro.ComponentModelOperations;
-
 import net.dpml.lang.UnknownKeyException;
 
 /**
- * The MutableComponentModel interface extends ComponentModel with a set of 
- * operations supporting model changes.
+ * The ComponentManager interface provides support for manipulatation of 
+ * a local component model.
  *
  * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
  * @version @PROJECT-VERSION@
@@ -38,34 +34,35 @@
 public interface ComponentManager extends ComponentModelOperations
 {
    /**
-    * Return the set of component model keys.
-    * @return the component part keys
+    * Return the context model manager.
+    * @return the context model manager
     */
+    ContextManager getContextManager();
+    
+   /**
+    * Return the set of subsidiary component model keys.
+    * @return the part keys
+    */
     String[] getPartKeys();
 
    /**
-    * Return the set of component model keys.
-    * @return the component part keys
+    * Return a subsidiary component manager.
+    * @param key the component part key
+    * @return the component manager
+    * @exception UnknownKeyException if the key is not recognized
+    * @see #getPartKeys()
     */
     ComponentManager getComponentManager( String key ) throws 
UnknownKeyException;
 
    /**
-    * Return the context model manager.
-    * @return the context model manager
-    */
-    ContextManager getContextManager();
-    
-   /**
     * Set the component activation policy to the supplied value.
     * @param policy the new activation policy
-    * @exception RemoteException if a remote exception occurs
     */
     void setActivationPolicy( ActivationPolicy policy );
 
    /**
     * Override the assigned collection policy.
     * @param policy the collection policy value
-    * @exception RemoteException if a remote exception occurs
     */
     void setCollectionPolicy( CollectionPolicy policy );
 }

Modified: trunk/main/metro/model/src/main/net/dpml/metro/ComponentModel.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/ComponentModel.java  
2006-01-26 04:10:09 UTC (rev 976)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ComponentModel.java  
2006-01-26 05:12:05 UTC (rev 977)
@@ -18,23 +18,10 @@
 
 package net.dpml.metro;
 
-import java.rmi.Remote;
 import java.rmi.RemoteException;
 
-import net.dpml.metro.info.LifestylePolicy;
-import net.dpml.metro.info.CollectionPolicy;
-import net.dpml.metro.data.ClassLoaderDirective;
-import net.dpml.metro.data.CategoryDirective;
-import net.dpml.metro.ComponentModelOperations;
-
 import net.dpml.part.remote.Model;
 
-import net.dpml.configuration.Configuration;
-
-import net.dpml.parameters.Parameters;
-
-import net.dpml.lang.UnknownKeyException;
-
 /**
  * The ComponentModel interface defines the remotely accessible aspects of a 
component
  * configuration.

Modified: 
trunk/main/metro/model/src/main/net/dpml/metro/ComponentModelOperations.java
===================================================================
--- 
trunk/main/metro/model/src/main/net/dpml/metro/ComponentModelOperations.java  
      2006-01-26 04:10:09 UTC (rev 976)
+++ 
trunk/main/metro/model/src/main/net/dpml/metro/ComponentModelOperations.java  
      2006-01-26 05:12:05 UTC (rev 977)
@@ -18,7 +18,6 @@
 
 package net.dpml.metro;
 
-import java.rmi.Remote;
 import java.rmi.RemoteException;
 
 import net.dpml.metro.info.LifestylePolicy;
@@ -26,17 +25,13 @@
 import net.dpml.metro.data.ClassLoaderDirective;
 import net.dpml.metro.data.CategoryDirective;
 
-import net.dpml.part.remote.Model;
-
 import net.dpml.configuration.Configuration;
 
 import net.dpml.parameters.Parameters;
 
-import net.dpml.lang.UnknownKeyException;
-
 /**
- * The ComponentModel interface defines the remotely accessible aspects of a 
component
- * configuration.
+ * The ComponentModelOperations interface defines the set of operations 
shared
+ * across local and remote clients.
  *
  * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
  * @version @PROJECT-VERSION@
@@ -84,22 +79,6 @@
     CollectionPolicy getCollectionPolicy() throws RemoteException;
 
    /**
-    * Return the set of component model keys.
-    * @return the component part keys
-    * @exception RemoteException if a remote exception occurs
-    */
-    //String[] getPartKeys() throws RemoteException;
-
-   /**
-    * Return the component model of an internal part referenced by the 
supplied key.
-    * @param key the part key
-    * @return the internal part component model 
-    * @exception UnknownKeyException if the key is unknown
-    * @exception RemoteException if a remote exception occurs
-    */
-    //ComponentModel getComponentModel( String key ) throws 
UnknownKeyException, RemoteException;
-
-   /**
     * Return the component configuration.
     * @return the configuration
     * @exception RemoteException if a remote exception occurs

Modified: trunk/main/metro/model/src/main/net/dpml/metro/ContextManager.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/ContextManager.java  
2006-01-26 04:10:09 UTC (rev 976)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ContextManager.java  
2006-01-26 05:12:05 UTC (rev 977)
@@ -18,18 +18,14 @@
 
 package net.dpml.metro;
 
-import java.rmi.RemoteException;
-
 import net.dpml.metro.info.PartReference;
+
 import net.dpml.part.Directive;
 
 import net.dpml.lang.UnknownKeyException;
 
-import net.dpml.metro.ContextModelOperations;
-
 /**
- * The MutableContextModel interface extends ContextModel with operations 
supporting
- * context entry value mutation. 
+ * The ContextManager interface exposes a management view of a local context 
model 
  *
  * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
  * @version @PROJECT-VERSION@
@@ -37,21 +33,6 @@
 public interface ContextManager extends ContextModelOperations
 {
    /**
-    * Set a context entry value.
-    * @param key the context entry key
-    * @param value the context entry value
-    * @exception UnknownKeyException if the key is unknown
-    */
-    //void setEntry( String key, Object value ) throws UnknownKeyException;
-    
-   /**
-    * Return a context entry value.
-    * @return the context entry value
-    * @exception UnknownKeyException if the key is unknown
-    */
-    //Object getEntry( String key ) throws UnknownKeyException;
-
-   /**
     * Set a context entry directive value.
     * @param key the context entry key
     * @param directive the context entry directive

Modified: trunk/main/metro/model/src/main/net/dpml/metro/ContextModel.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/ContextModel.java    
2006-01-26 04:10:09 UTC (rev 976)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ContextModel.java    
2006-01-26 05:12:05 UTC (rev 977)
@@ -20,8 +20,6 @@
 
 import java.rmi.Remote;
 
-import net.dpml.metro.ContextModelOperations;
-
 /**
  * The ContextModel interface defines the remotely accessible component 
context. 
  *

Modified: 
trunk/main/metro/model/src/main/net/dpml/metro/ContextModelOperations.java
===================================================================
--- 
trunk/main/metro/model/src/main/net/dpml/metro/ContextModelOperations.java  
2006-01-26 04:10:09 UTC (rev 976)
+++ 
trunk/main/metro/model/src/main/net/dpml/metro/ContextModelOperations.java  
2006-01-26 05:12:05 UTC (rev 977)
@@ -18,7 +18,6 @@
 
 package net.dpml.metro;
 
-import java.rmi.Remote;
 import java.rmi.RemoteException;
 
 import net.dpml.metro.info.EntryDescriptor;
@@ -27,7 +26,8 @@
 import net.dpml.lang.UnknownKeyException;
 
 /**
- * The ContextModelOperations interface defines the common local and 
remotely accessible component context. 
+ * The ContextModelOperations interface defines the operations common to 
+ * local and remote consumers of a component context. 
  *
  * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
  * @version @PROJECT-VERSION@

Modified: trunk/main/metro/model/src/main/net/dpml/metro/PartsManager.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/PartsManager.java    
2006-01-26 04:10:09 UTC (rev 976)
+++ trunk/main/metro/model/src/main/net/dpml/metro/PartsManager.java    
2006-01-26 05:12:05 UTC (rev 977)
@@ -19,8 +19,6 @@
 package net.dpml.metro;
 
 import net.dpml.part.ControlException;
-import net.dpml.part.remote.Component;
-import net.dpml.part.remote.Model;
 
 import net.dpml.lang.UnknownKeyException;
 

Modified: 
trunk/main/metro/part/api/src/main/net/dpml/part/ComponentOperations.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/ComponentOperations.java 
  2006-01-26 04:10:09 UTC (rev 976)
+++ trunk/main/metro/part/api/src/main/net/dpml/part/ComponentOperations.java 
  2006-01-26 05:12:05 UTC (rev 977)
@@ -18,7 +18,6 @@
 
 package net.dpml.part;
 
-import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.lang.reflect.InvocationTargetException;
 

Modified: 
trunk/main/metro/part/api/src/main/net/dpml/part/ProviderOperations.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/ProviderOperations.java  
  2006-01-26 04:10:09 UTC (rev 976)
+++ trunk/main/metro/part/api/src/main/net/dpml/part/ProviderOperations.java  
  2006-01-26 05:12:05 UTC (rev 977)
@@ -18,7 +18,6 @@
 
 package net.dpml.part;
 
-import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.lang.reflect.InvocationTargetException;
 

Modified: 
trunk/main/metro/part/api/src/main/net/dpml/part/remote/Component.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/remote/Component.java    
  2006-01-26 04:10:09 UTC (rev 976)
+++ trunk/main/metro/part/api/src/main/net/dpml/part/remote/Component.java    
  2006-01-26 05:12:05 UTC (rev 977)
@@ -19,10 +19,7 @@
 package net.dpml.part.remote;
 
 import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.lang.reflect.InvocationTargetException;
 
-import net.dpml.part.ControlException;
 import net.dpml.part.ComponentOperations;
 
 /**

Modified: 
trunk/main/metro/part/api/src/main/net/dpml/part/remote/Provider.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/remote/Provider.java     
  2006-01-26 04:10:09 UTC (rev 976)
+++ trunk/main/metro/part/api/src/main/net/dpml/part/remote/Provider.java     
  2006-01-26 05:12:05 UTC (rev 977)
@@ -19,14 +19,7 @@
 package net.dpml.part.remote;
 
 import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.lang.reflect.InvocationTargetException;
 
-import net.dpml.state.State;
-import net.dpml.state.StateListener;
-import net.dpml.state.UnknownOperationException;
-import net.dpml.state.UnknownTransitionException;
-
 import net.dpml.part.ProviderOperations;
 
 /**

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
   2006-01-26 04:10:09 UTC (rev 976)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
   2006-01-26 05:12:05 UTC (rev 977)
@@ -38,7 +38,6 @@
 import net.dpml.metro.data.ComponentDirective;
 import net.dpml.metro.ComponentModel;
 import net.dpml.metro.ContextModel;
-import net.dpml.metro.ContextManager;
 
 import net.dpml.configuration.Configuration;
 

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
       2006-01-26 04:10:09 UTC (rev 976)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
       2006-01-26 05:12:05 UTC (rev 977)
@@ -27,8 +27,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
 import java.rmi.RemoteException;
-import java.rmi.NoSuchObjectException;
-import java.rmi.server.UnicastRemoteObject;
 import java.util.EventObject;
 import java.util.Map;
 import java.util.Hashtable;
@@ -578,6 +576,10 @@
     // DefaultComponentHandler
     
//--------------------------------------------------------------------------
     
+   /**
+    * Return the internal parts manager.
+    * @return the part manager
+    */
     public PartsManager getPartsManager()
     {
         return m_parts;

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
   2006-01-26 04:10:09 UTC (rev 976)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
   2006-01-26 05:12:05 UTC (rev 977)
@@ -25,7 +25,6 @@
 import java.util.EventObject;
 import java.util.EventListener;
 import java.util.Map;
-import java.util.Hashtable;
 
 import net.dpml.metro.data.ContextDirective;
 import net.dpml.metro.info.EntryDescriptor;

Modified: 
trunk/main/metro/test/src/main/net/dpml/test/composite/PartsComponent.java
===================================================================
--- 
trunk/main/metro/test/src/main/net/dpml/test/composite/PartsComponent.java  
2006-01-26 04:10:09 UTC (rev 976)
+++ 
trunk/main/metro/test/src/main/net/dpml/test/composite/PartsComponent.java  
2006-01-26 05:12:05 UTC (rev 977)
@@ -19,7 +19,6 @@
 package net.dpml.test.composite;
 
 import java.awt.Color;
-import java.util.Map;
 
 import net.dpml.logging.Logger;
 
@@ -27,8 +26,6 @@
 
 import net.dpml.metro.PartsManager;
 import net.dpml.metro.ComponentHandler;
-import net.dpml.metro.ComponentManager;
-import net.dpml.metro.ContextManager;
 
 import net.dpml.lang.UnknownKeyException;
 

Modified: 
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java
===================================================================
--- 
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java
      2006-01-26 04:10:09 UTC (rev 976)
+++ 
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java
      2006-01-26 05:12:05 UTC (rev 977)
@@ -29,8 +29,6 @@
 import net.dpml.metro.info.CollectionPolicy;
 import net.dpml.metro.ComponentModel;
 
-import net.dpml.lang.UnknownKeyException;
-
 import net.dpml.test.ExampleComponent;
 
 /**

Modified: 
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java
===================================================================
--- 
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java
        2006-01-26 04:10:09 UTC (rev 976)
+++ 
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java
        2006-01-26 05:12:05 UTC (rev 977)
@@ -30,7 +30,6 @@
 import net.dpml.metro.ContextManager;
 import net.dpml.metro.ValidationException;
 import net.dpml.metro.ValidationException.Issue;
-import net.dpml.metro.ContextModel;
 import net.dpml.metro.data.ValueDirective;
 import net.dpml.metro.info.EntryDescriptor;
 

Modified: 
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java
===================================================================
--- 
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java
    2006-01-26 04:10:09 UTC (rev 976)
+++ 
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java
    2006-01-26 05:12:05 UTC (rev 977)
@@ -30,7 +30,6 @@
 
 import net.dpml.metro.data.ValueDirective;
 import net.dpml.metro.ComponentModel;
-import net.dpml.metro.ContextModel;
 import net.dpml.metro.ComponentManager;
 import net.dpml.metro.ContextManager;
 

Modified: 
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ProviderTestCase.java
===================================================================
--- 
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ProviderTestCase.java
    2006-01-26 04:10:09 UTC (rev 976)
+++ 
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ProviderTestCase.java
    2006-01-26 05:12:05 UTC (rev 977)
@@ -20,7 +20,6 @@
 
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.awt.Color;
 import java.io.File;
 import java.net.URI;
 import java.lang.reflect.Proxy;
@@ -33,9 +32,6 @@
 import net.dpml.state.State;
 import net.dpml.state.StateListener;
 import net.dpml.state.impl.DefaultStateListener;
-import net.dpml.metro.data.ValueDirective;
-import net.dpml.metro.ComponentModel;
-import net.dpml.metro.ContextModel;
 
 import net.dpml.test.ColorManager;
 import net.dpml.test.ExampleComponent;

Modified: 
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java
===================================================================
--- 
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java  
2006-01-26 04:10:09 UTC (rev 976)
+++ 
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java  
2006-01-26 05:12:05 UTC (rev 977)
@@ -203,7 +203,6 @@
    /**
     * Add a disposal listener to the model.
     * @param listener the listener to add
-    * @exception RemoteException if a remote exception occurs
     */
     public void addDisposalListener( DisposalListener listener )
     {
@@ -213,7 +212,6 @@
    /**
     * Remove a disposal listener from the model.
     * @param listener the listener to remove
-    * @exception RemoteException if a remote exception occurs
     */
     public void removeDisposalListener( DisposalListener listener )
     {