svn commit: r14084 - trunk/src_new/org/argouml/kernel/AbstractProjectMember.java

Author: mvw
Date: 2008-02-07 00:39:14-0800
New Revision: 14084

Modified:
   trunk/src_new/org/argouml/kernel/AbstractProjectMember.java

Log:
Replace deprecated method.

Added comment.

Modified: trunk/src_new/org/argouml/kernel/AbstractProjectMember.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/AbstractProjectMember.java?view=diff&rev=14084&p1=trunk/src_new/org/argouml/kernel/AbstractProjectMember.java&p2=trunk/src_new/org/argouml/kernel/AbstractProjectMember.java&r1=14083&r2=14084
==============================================================================
--- trunk/src_new/org/argouml/kernel/AbstractProjectMember.java	(original)
+++ trunk/src_new/org/argouml/kernel/AbstractProjectMember.java	2008-02-07 00:39:14-0800
@@ -24,6 +24,8 @@
 
 package org.argouml.kernel;
 
+import org.argouml.persistence.PersistenceManager;
+
 /**
  * A member of the project.
  *
@@ -87,7 +89,7 @@
 	    return null;
 	}
 
-        String s = project.getBaseName();
+        String s = PersistenceManager.getInstance().getProjectBaseName(project);
 
         if (uniqueName.length() > 0) {
             s += "_" + uniqueName;
@@ -114,8 +116,11 @@
             return;
         }
 
-        if (uniqueName.startsWith (project.getBaseName())) {
-            uniqueName = uniqueName.substring (project.getBaseName().length());
+        String pbn = 
+            PersistenceManager.getInstance().getProjectBaseName(project); 
+        if (uniqueName.startsWith (pbn)) {
+            uniqueName = uniqueName.substring (pbn.length());
+            /* Skip leading underscores: */
             int i = 0;
             for (; i < uniqueName.length(); i++) {
             	if (uniqueName.charAt(i) != '_') {