From 72a7a0380b90584c469be52ff8c744ccb31e56b3 Mon Sep 17 00:00:00 2001
From: John Hughes <steve.hughes@jpl.nasa.gov>
Date: Fri, 6 Sep 2019 20:52:03 -0700
Subject: [PATCH] Issue #32 DOMConv Deprecation_FinalCleanup
 WriteDOMSpecification

1) WriteDOMSpecification
   Convert to DOM attribute definitions - AttrDefn to DOMDefn

2) ProtPinsGlossary
   Convert to DOM attribute definitions - AttrDefn to DOMDefn
---
 .../pds/model/plugin/ProtPinsGlossary.java    | 23 ++++++++++---------
 .../model/plugin/WriteDOMSpecification.java   | 12 +++++-----
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/ProtPinsGlossary.java b/model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/ProtPinsGlossary.java
index 7da5683c..8383ebd8 100644
--- a/model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/ProtPinsGlossary.java
+++ b/model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/ProtPinsGlossary.java
@@ -32,13 +32,13 @@
 import java.util.*;
 
 class ProtPinsGlossary extends Object{
-	TreeMap <String, AttrDefn> glossMap;
+	TreeMap <String, DOMAttr> glossMap;
 	TreeMap <String, String> glossTitleIdMap;
 	
 	ProtPins protPinsInst;   
 	
 	public ProtPinsGlossary () {
-		glossMap = new TreeMap <String, AttrDefn> ();
+		glossMap = new TreeMap <String, DOMAttr> ();
 		glossTitleIdMap = new TreeMap <String, String> ();
 		return;
 	}
@@ -54,18 +54,19 @@ public void getProtPinsGlossary (String subModelId, String fname) throws Throwab
 		while(iter1.hasNext()) {
 			String instRDFId = (String) iter1.next();		
 			InstDefn localInst = (InstDefn) tDict.get(instRDFId);
-			AttrDefn attrClass = new AttrDefn(localInst.rdfIdentifier);
-			attrClass.regAuthId = DMDocument.registrationAuthorityIdentifierValue;
-			attrClass.subModelId = subModelId;
-			attrClass.title = InfoModel.unEscapeProtegeString(localInst.title);
-			attrClass.genAttrMap = localInst.genSlotMap;
-			ArrayList attrdescarr = (ArrayList) attrClass.genAttrMap.get("column_desc");
+			DOMAttr lDOMAttr = new DOMAttr();
+			lDOMAttr.setRDFIdentifier(localInst.rdfIdentifier);
+			lDOMAttr.regAuthId = DMDocument.registrationAuthorityIdentifierValue;
+			lDOMAttr.subModelId = subModelId;
+			lDOMAttr.title = InfoModel.unEscapeProtegeString(localInst.title);
+			lDOMAttr.genAttrMap = localInst.genSlotMap;
+			ArrayList <String> attrdescarr = (ArrayList<String>) lDOMAttr.genAttrMap.get("column_desc");
 			String lDescription = (String) attrdescarr.get(0);
 			lDescription =  InfoModel.unEscapeProtegeString(lDescription);
-			attrClass.description = lDescription;
+			lDOMAttr.definition = lDescription;
 			
-			glossMap.put(attrClass.rdfIdentifier, attrClass);
-			glossTitleIdMap.put(attrClass.title, attrClass.rdfIdentifier);
+			glossMap.put(lDOMAttr.rdfIdentifier, lDOMAttr);
+			glossTitleIdMap.put(lDOMAttr.title, lDOMAttr.rdfIdentifier);
 		}
 		return;
 	}
diff --git a/model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/WriteDOMSpecification.java b/model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/WriteDOMSpecification.java
index 0d97d34a..6ef30d01 100644
--- a/model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/WriteDOMSpecification.java
+++ b/model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/WriteDOMSpecification.java
@@ -1106,8 +1106,8 @@ public void printGlossary (SectionDefn secInfo) {
 		while(iter1.hasNext()) {
 			String lTitle = (String) iter1.next();
 			String lId = (String) lmodel.glossTitleIdMap.get(lTitle);
-			AttrDefn attr =  (AttrDefn) lmodel.glossMap.get(lId);
-			printTerm (attr);
+			DOMAttr lDOMAttr =  (DOMAttr) lmodel.glossMap.get(lId);
+			printTerm (lDOMAttr);
 			pflag = true;
 		}
 		
@@ -1120,14 +1120,14 @@ public void printGlossary (SectionDefn secInfo) {
 	/**
 		*  Print a data element
 		*/
-	private void printTerm (AttrDefn attr) {
+	private void printTerm (DOMAttr lDOMAttr) {
 		
 		String phtitle, desc;
 		
-		String lTermAnchorString = ("term_" + attr.title).toLowerCase();
-		String titleWithBlanks = DMDocument.replaceString (attr.title, "_", " ");
+		String lTermAnchorString = ("term_" + lDOMAttr.title).toLowerCase();
+		String titleWithBlanks = DMDocument.replaceString (lDOMAttr.title, "_", " ");
 		phtitle = "<a name=\"" + lTermAnchorString + "\">" + titleWithBlanks + "</a>";
-		desc = attr.description;
+		desc = lDOMAttr.definition;
 		prhtml.println("<dt><b>" + phtitle +  "</b><dd><i>" + "</i>" + desc);
 	}