From 8fb95c09ae6f08fce9e1b9e2307d39448c82ceec Mon Sep 17 00:00:00 2001
From: Todd Viegut <todd.viegut@gmail.com>
Date: Wed, 23 Oct 2024 23:40:46 -0500
Subject: [PATCH] #170

---
 .../src/au/com/langdale/xmi/EAPParser.java    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/CIMUtil/src/au/com/langdale/xmi/EAPParser.java b/CIMUtil/src/au/com/langdale/xmi/EAPParser.java
index ec2697d..696042a 100644
--- a/CIMUtil/src/au/com/langdale/xmi/EAPParser.java
+++ b/CIMUtil/src/au/com/langdale/xmi/EAPParser.java
@@ -156,7 +156,7 @@ protected void gatherPackageIDs() throws EAProjectParserException {
 			if (row.getName().equals("Model"))
 				subject = top;
 			else
-				subject = createIndividual(row.getPackageEAGUID(), row.getName(), UML.Package);
+				subject = createIndividual(row.getXUID(), row.getName(), UML.Package);
 			packageIDs.putID(row.getPackageID(), subject);
 		}
 	}
@@ -190,7 +190,7 @@ protected void parseClasses() throws EAProjectParserException {
 		while (it.hasNext()) {
 			Row row = new Row(it.next());
 			if (row.getObjectType().equals("Class")) {
-				OntResource subject = createClass(row.getEAGUID(), row.getName());
+				OntResource subject = createClass(row.getXUID(), row.getName());
 				objectIDs.putID(row.getObjectID(), subject);
 				annotate(subject, row.getNote());
 				OntResource parent = packageIDs.getID(row.getPackageID());
@@ -209,7 +209,7 @@ protected void parseAttributes() throws EAProjectParserException {
 			Row row = new Row(it.next());
 			OntResource id = objectIDs.getID(row.getObjectID());
 			if (id != null) {
-				OntResource subject = createAttributeProperty(row.getEAGUID(), row.getName());
+				OntResource subject = createAttributeProperty(row.getXUID(), row.getName());
 				subject.addDomain(id);
 				annotate(subject, row.getNotes());
 				subject.addIsDefinedBy(id.getIsDefinedBy());
@@ -246,7 +246,7 @@ protected void parseAssociations() throws EAProjectParserException {
 						source.addSuperClass(destin);
 					} else {
 						Role roleA = extractProperty( //
-								row.getEAGUID(), //
+								row.getXUID(), //
 								source, //
 								destin, //
 								row.getDestRole(), //
@@ -256,7 +256,7 @@ protected void parseAssociations() throws EAProjectParserException {
 								true, //
 								row.getConnectorID());
 						Role roleB = extractProperty( //
-								row.getEAGUID(), //
+								row.getXUID(), //
 								destin, //
 								source, //
 								row.getSourceRole(), //
@@ -409,14 +409,14 @@ int getID() {
 			return getInt(COL_ID);
 		}
 
-		String getPackageEAGUID() {
-			String xuid = fields.get(COL_ea_guid).toString();
-			return "EAPK_" + xuid.substring(1, xuid.length() - 1).replace("-", "_");
-		}
-		
 		String getEAGUID() {
+			String eaGUID = fields.get(COL_ea_guid).toString();
+			return eaGUID;
+		}
+
+		String getXUID() {
 			String xuid = fields.get(COL_ea_guid).toString();
-			return "EAID_" + xuid.substring(1, xuid.length() - 1).replace("-", "_");
+			return "_" + xuid.substring(1, xuid.length() - 1);
 		}
 
 		public String getClient() {