Restored a correction to ElementAssembler so that, when assembling a

collection reference feature, it checks the in-memory repository for the
target of a reference, if no assembler is found for it in the assembler
map (as is done for a singular reference).

Author: seidewitz

org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/assembly/ElementAssembler.java

@@ -2,7 +2,7 @@
  * Initial version copyright 2008 Lockheed Martin Corporation, except
  * as stated in the file entitled Licensing-Information.
  *
- * All modifications copyright 2009-2011 Data Access Technologies, Inc. 
+ * All modifications copyright 2009-2015 Data Access Technologies, Inc. 
  * (Model Driven Solutions). Licensed under the Academic Free License version 3.0
  * (http://www.opensource.org/licenses/afl-3.0.php), except as stated
  * in the file entitled Licensing-Information.
@@ -706,7 +706,7 @@ private void assembleReferenceFeature(XmiReference reference) throws ClassNotFou
             InstantiationException, NoSuchFieldException {
         StreamNode eventNode = (StreamNode) this.getSource();
 
-        NamespaceDomain domain = null; // only lookup as needed
+        // NamespaceDomain domain = null; // only lookup as needed
         Property property = this.prototype.getProperty(reference.getLocalName());
         Classifier type = property.getType();
 
@@ -778,12 +778,19 @@ private void assembleReferenceFeature(XmiReference reference) throws ClassNotFou
                         	this.assembleCollectionReferenceFeature(referent, property, type);
                     }
                 } else {
+                	FumlObject target = null;
+                	
                     ElementAssembler referencedAssembler = this.assemblerMap.get(id);
-                    if (referencedAssembler == null)
+                    if (referencedAssembler != null)
+                        target = referencedAssembler.getTargetObject();
+                    else
+                        target = Environment.getInstance().findElementById(id);
+
+                    if (target != null)
+                        this.assembleCollectionReferenceFeature(target, property, type);
+                    else
                         throw new ValidationException(new ValidationError(reference, id,
                                 ErrorCode.INVALID_REFERENCE, ErrorSeverity.FATAL));
-                    this.assembleCollectionReferenceFeature(referencedAssembler.getTargetObject(),
-                            property, type);
                 }
             }
         }