svn commit: r15094 - trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr

Author: tfmorris
Date: 2008-06-27 15:39:17-0700
New Revision: 15094

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

Log:
Issue 5017: Include system ID in value returned by getUUID().  Store resolved (not raw) system ID in hash table.

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java?view=diff&rev=15094&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java&r1=15093&r2=15094
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java	2008-06-27 15:39:17-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 2005-2007 The Regents of the University of California. All
+// Copyright (c) 2005-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -4216,7 +4216,12 @@
                 if (ref == null) {
                     return mofId;
                 } else {
-                    return ref.getXmiId();
+                    String systemId = ref.getSystemId();
+                    if (systemId == null || systemId.equals("")) {
+                        return ref.getXmiId();
+                    } else {
+                        return systemId + "#" + ref.getXmiId();
+                    }
                 }
             }
         } catch (InvalidObjectException e) {

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiReferenceResolverImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiReferenceResolverImpl.java?view=diff&rev=15094&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiReferenceResolverImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiReferenceResolverImpl.java&r1=15093&r2=15094
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiReferenceResolverImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiReferenceResolverImpl.java	2008-06-27 15:39:17-0700
@@ -208,7 +208,7 @@
             // No # here because PGML parser needs bare UUID/xmi.id
             key = xmiId;            
         } else {
-            key = systemId + "#" + xmiId;                
+            key = resolvedSystemId + "#" + xmiId;                
         }
 
         if (!idToObjects.containsKey(key)