DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Wed Apr 27 15:49:21 2005
New Revision: 2430

Added:
   
development/main/metro/parts/src/main/net/dpml/parts/model/DuplicateKeyException.java
      - copied, changed from r2429, 
development/main/metro/parts/src/main/net/dpml/parts/state/DuplicateKeyException.java
   
development/main/metro/parts/src/main/net/dpml/parts/model/ResourceUnavailableException.java
Removed:
   
development/main/metro/composition/control/src/main/net/dpml/composition/model/DuplicateKeyException.java
   
development/main/metro/parts/src/main/net/dpml/parts/state/DuplicateKeyException.java
Modified:
   
development/main/metro/composition/control/src/main/net/dpml/composition/control/ComponentController.java
   
development/main/metro/composition/control/src/main/net/dpml/composition/model/ComponentModel.java
   
development/main/metro/composition/control/src/main/net/dpml/composition/model/ContextTable.java
   
development/main/metro/composition/control/src/main/net/dpml/composition/model/PartsTable.java
Log:
fixing up a bunch of errors exposed after upgrading svn  client

Modified: 
development/main/metro/composition/control/src/main/net/dpml/composition/control/ComponentController.java
==============================================================================
--- 
development/main/metro/composition/control/src/main/net/dpml/composition/control/ComponentController.java
   (original)
+++ 
development/main/metro/composition/control/src/main/net/dpml/composition/control/ComponentController.java
   Wed Apr 27 15:49:21 2005
@@ -48,11 +48,11 @@
 import net.dpml.composition.model.ComponentModel;
 
 import net.dpml.parts.control.Monitor;
+import net.dpml.parts.model.DuplicateKeyException;
 import net.dpml.parts.state.State;
 import net.dpml.parts.state.Transition;
 import net.dpml.parts.state.Manager;
 import net.dpml.parts.state.ResourceUnavailableException;
-import net.dpml.parts.state.DuplicateKeyException;
 import net.dpml.parts.state.NoSuchTransitionException;
 import net.dpml.parts.state.NoSuchOperationException;
 import net.dpml.parts.state.ValidationException;

Modified: 
development/main/metro/composition/control/src/main/net/dpml/composition/model/ComponentModel.java
==============================================================================
--- 
development/main/metro/composition/control/src/main/net/dpml/composition/model/ComponentModel.java
  (original)
+++ 
development/main/metro/composition/control/src/main/net/dpml/composition/model/ComponentModel.java
  Wed Apr 27 15:49:21 2005
@@ -37,12 +37,11 @@
 import net.dpml.activity.Executable;
 import net.dpml.activity.Startable;
 
+
 import net.dpml.composition.control.CompositionController;
 import net.dpml.composition.state.DefaultState;
 import net.dpml.composition.event.AvailabilityEvent;
 
-import net.dpml.lang.ResourceUnavailableException;
-
 import net.dpml.parts.control.Identifiable;
 import net.dpml.parts.control.LifecycleException;
 import net.dpml.parts.control.Monitor;
@@ -50,6 +49,7 @@
 import net.dpml.parts.state.StateEvent;
 import net.dpml.parts.state.StateListener;
 import net.dpml.parts.state.State;
+import net.dpml.parts.state.ResourceUnavailableException;
 
 /**
  * A lifestyle handler provides support for the aquisition and release

Modified: 
development/main/metro/composition/control/src/main/net/dpml/composition/model/ContextTable.java
==============================================================================
--- 
development/main/metro/composition/control/src/main/net/dpml/composition/model/ContextTable.java
    (original)
+++ 
development/main/metro/composition/control/src/main/net/dpml/composition/model/ContextTable.java
    Wed Apr 27 15:49:21 2005
@@ -27,6 +27,7 @@
 import net.dpml.parts.model.Model;
 import net.dpml.parts.model.ModelException;
 import net.dpml.parts.model.ModelRuntimeException;
+import net.dpml.parts.model.DuplicateKeyException;
 import net.dpml.parts.part.Part;
 
 import net.dpml.composition.control.CompositionController;

Modified: 
development/main/metro/composition/control/src/main/net/dpml/composition/model/PartsTable.java
==============================================================================
--- 
development/main/metro/composition/control/src/main/net/dpml/composition/model/PartsTable.java
      (original)
+++ 
development/main/metro/composition/control/src/main/net/dpml/composition/model/PartsTable.java
      Wed Apr 27 15:49:21 2005
@@ -23,6 +23,7 @@
 
 import net.dpml.parts.model.ModelException;
 import net.dpml.parts.model.Model;
+import net.dpml.parts.model.DuplicateKeyException;
 import net.dpml.parts.part.Part;
 
 import net.dpml.composition.data.ReferenceDirective;

Copied: 
development/main/metro/parts/src/main/net/dpml/parts/model/DuplicateKeyException.java
 (from r2429, 
development/main/metro/parts/src/main/net/dpml/parts/state/DuplicateKeyException.java)
==============================================================================
--- 
development/main/metro/parts/src/main/net/dpml/parts/state/DuplicateKeyException.java
       (original)
+++ 
development/main/metro/parts/src/main/net/dpml/parts/model/DuplicateKeyException.java
       Wed Apr 27 15:49:21 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.parts.state;
+package net.dpml.parts.model;
 
 
 /**

Added: 
development/main/metro/parts/src/main/net/dpml/parts/model/ResourceUnavailableException.java
==============================================================================
--- (empty file)
+++ 
development/main/metro/parts/src/main/net/dpml/parts/model/ResourceUnavailableException.java
        Wed Apr 27 15:49:21 2005
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2005 Stephen J. McConnell
+ *
+ * Licensed  under the  Apache License,  Version 2.0  (the "License");
+ * you may not use  this file  except in  compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed  under the  License is distributed on an "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.parts.model;
+
+/**
+ * Exception thrown in response to an attempt to register a part model 
+ * under a key that is already assigned.
+ *
+ * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product 
Meta Library</a>
+ * @version $Revision: 1.2 $ $Date: 2004/03/17 10:30:09 $
+ */
+public class  ResourceUnavailableException extends ModelException 
+{
+    private String m_key;
+
+    public ResourceUnavailableException( String key )
+    {
+        super( key );
+        m_key = key;
+    }
+
+    public String getKey()
+    {
+        return m_key;
+    }
+}
+