svn commit: r16214 - trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelEventPumpMDRImpl.java

Author: tfmorris
Date: 2008-12-01 01:14:47-0800
New Revision: 16214

Modified:
   trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelEventPumpMDRImpl.java

Log:
Make type casts as general as possible

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelEventPumpMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelEventPumpMDRImpl.java?view=diff&rev=16214&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelEventPumpMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelEventPumpMDRImpl.java&r1=16213&r2=16214
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelEventPumpMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelEventPumpMDRImpl.java	2008-12-01 01:14:47-0800
@@ -59,7 +59,6 @@
 import org.argouml.model.RemoveAssociationEvent;
 import org.argouml.model.UmlChangeEvent;
 import org.netbeans.api.mdr.MDRManager;
-import org.netbeans.api.mdr.MDRObject;
 import org.netbeans.api.mdr.MDRepository;
 import org.netbeans.api.mdr.events.AssociationEvent;
 import org.netbeans.api.mdr.events.AttributeEvent;
@@ -352,7 +351,7 @@
             fire(event);
             // Unregister deleted instances after all events have been delivered
             if (event instanceof DeleteInstanceEvent) {
-                elements.unregister(null, ((MDRObject) event.getSource())
+                elements.unregister(null, ((RefBaseObject) event.getSource())
                         .refMofId(), null);
             }
         }
@@ -444,7 +443,7 @@
      * Fire an event to any registered listeners.
      */
     private void fire(UmlChangeEvent event) {
-        String mofId = ((MDRObject) event.getSource()).refMofId();
+        String mofId = ((RefBaseObject) event.getSource()).refMofId();
         String className  = getClassName(event.getSource());
 
         // Any given listener is only called once even if it is
@@ -466,7 +465,7 @@
                     + " source "
                     + modelImpl.getMetaTypes().getName(
                             event.getSource())
-                    + " [" + ((MDRObject) event.getSource()).refMofId()
+                    + " [" + ((RefBaseObject) event.getSource()).refMofId()
                     + "]."  + event.getPropertyName()
                     + "," + formatElement(event.getOldValue())
                     + "->" + formatElement(event.getNewValue()));
@@ -490,7 +489,7 @@
                         + modelImpl.getMetaTypes().getName(
                                 event.getSource())
                         + " ["
-                        + ((MDRObject) event.getSource()).refMofId() + "]."
+                        + ((RefBaseObject) event.getSource()).refMofId() + "]."
                         + event.getPropertyName() + "," + event.getOldValue()
                         + "->" + event.getNewValue());
             }
@@ -511,9 +510,9 @@
         }
 
         // Fetch the key before going in synchronized mode
-        String mofId = ((MDRObject) modelElement).refMofId();
+        String mofId = ((RefBaseObject) modelElement).refMofId();
         try {
-            verifyAttributeNames(((MDRObject) modelElement).refMetaObject(),
+            verifyAttributeNames(((RefBaseObject) modelElement).refMetaObject(),
                     propertyNames);
         } catch (InvalidObjectException e) {
             throw new InvalidElementException(e);
@@ -541,12 +540,12 @@
                     + ")! [Property names: " + propertyNames + "]");
             return;
         }
-        if (!(modelElement instanceof MDRObject)) {
-            LOG.error("Ignoring non-MDRObject received by "
+        if (!(modelElement instanceof RefBaseObject)) {
+            LOG.error("Ignoring non-RefBaseObject received by "
                     + "unregisterModelEvent - " + modelElement);
             return;
         }
-        String mofId = ((MDRObject) modelElement).refMofId();
+        String mofId = ((RefBaseObject) modelElement).refMofId();
         if (LOG.isDebugEnabled()) {
             LOG.debug("Unregister ["
                     + " element:" + formatElement(modelElement)
@@ -719,9 +718,9 @@
 
     private String formatElement(Object element) {
         try {
-            if (element instanceof MDRObject) {
+            if (element instanceof RefBaseObject) {
                 return modelImpl.getMetaTypes().getName(element)
-                        + "<" + ((MDRObject) element).refMofId() + ">";
+                        + "<" + ((RefBaseObject) element).refMofId() + ">";
             } else if (element != null) {
                 return element.toString();
             }
@@ -1086,4 +1085,4 @@
         return results;
     }
 
-}
\ No newline at end of file
+}