Skip to content

Commit

Permalink
Merge pull request #53 from NASA-PDS-Incubator/Issue-#52-DOMConv-Depr…
Browse files Browse the repository at this point in the history 
…ecation_FinalCleanup---Deprecate-InfoModel

Issue #52 DOMConv Deprecation_FinalCleanup - Deprecate InfoModel - Pa…
  • Loading branch information
@jshughes416
jshughes416 authored Sep 8, 2019
2 parents 814d4a2 + fb637e7 commit 59c5eba
Show file tree
Hide file tree
Showing 12 changed files with 168 additions and 1,432 deletions.
2 changes: 1 addition & 1 deletion model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/DOMProtAttr.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public DOMProtAttr () {

public void setRDFIdentifier (String lClassTitle, String lAttrTitle) {
this.title = lAttrTitle;
this.sequenceId = InfoModel.getNextUId();
this.sequenceId = DOMInfoModel.getNextUId();
this.rdfIdentifier = DMDocument.rdfPrefix + lClassTitle + "." + lAttrTitle + "." + this.sequenceId;
}

Expand Down
588 changes: 0 additions & 588 deletions model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/GenSchematronRules.java
View file

This file was deleted.

3 changes: 1 addition & 2 deletions model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/ISOClass.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public ISOClass () {
rdfIdentifier = "TBD_rdfIdentifier";
identifier = "TBD_identifier";
versionId = "0.1";
// sequenceId = InfoModel.getNextUId();
sequenceId = "TBD_sequenceId";

title = "TBD_title";
Expand All @@ -80,7 +79,7 @@ public String getRDFIdentifier() {

public void setRDFIdentifier (String lTitle) {
this.title = lTitle;
this.sequenceId = InfoModel.getNextUId();
this.sequenceId = DOMInfoModel.getNextUId();
this.rdfIdentifier = DMDocument.rdfPrefix + lTitle + "." + this.sequenceId;
}

Expand Down
6 changes: 3 additions & 3 deletions model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/ProtPins.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ private void getInstances(Iterator <String> tokenIter) {
case 1: // Instance Name
// System.out.println("debug ProtPins - instance name - token:" + token);
// 444 String title = token;
String lToken = InfoModel.unEscapeProtegeString(token);
String lToken = DOMInfoModel.unEscapeProtegeString(token);
String title = lToken;
String rdfIdentifier = gNameSpaceIdNC + "." + title;
String identifier = gNameSpaceIdNC + "." + title;
Expand Down Expand Up @@ -121,7 +121,7 @@ private void getInstances(Iterator <String> tokenIter) {
// 444
// lInst.genSlotMap.put(token, genSlotValArray);
// lAttrName = token;
String lToken2 = InfoModel.unEscapeProtegeString(token);
String lToken2 = DOMInfoModel.unEscapeProtegeString(token);
lInst.genSlotMap.put(lToken2, genSlotValArray);
lAttrName = lToken2;
// System.out.println("\ndebug ProtPins.getInstances gSteward:" + gSteward + " lInst.title:" + lInst.title + " lAttrName:" + lAttrName);
Expand All @@ -133,7 +133,7 @@ private void getInstances(Iterator <String> tokenIter) {
} else if ((token.compareTo("[") == 0) || (token.compareTo("]") == 0)) {
type = 4;
} else {
String lToken3 = InfoModel.unEscapeProtegeString(token);
String lToken3 = DOMInfoModel.unEscapeProtegeString(token);
genSlotValArray.add(lToken3);
lAttrVal = lToken3;
}
Expand Down
4 changes: 2 additions & 2 deletions model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/ProtPinsGlossary.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ public void getProtPinsGlossary (String subModelId, String fname) throws Throwab
lDOMAttr.setRDFIdentifier(localInst.rdfIdentifier);
lDOMAttr.regAuthId = DMDocument.registrationAuthorityIdentifierValue;
lDOMAttr.subModelId = subModelId;
lDOMAttr.title = InfoModel.unEscapeProtegeString(localInst.title);
lDOMAttr.title = DOMInfoModel.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);
lDescription = DOMInfoModel.unEscapeProtegeString(lDescription);
lDOMAttr.definition = lDescription;

glossMap.put(lDOMAttr.rdfIdentifier, lDOMAttr);
Expand Down
120 changes: 61 additions & 59 deletions model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/RegConfig.java
View file

Large diffs are not rendered by default.

132 changes: 0 additions & 132 deletions model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/WriteCSVFiles.java
View file

This file was deleted.

17 changes: 8 additions & 9 deletions model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/WriteDOM11179DDPinsFile.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ public void printPDDPVD (PrintWriter prDDPins) {
prDDPins.println(" (minimumCharacterQuantity \"" + lDOMAttr.minimum_characters + "\")");
prDDPins.println(" (maximumValue \"" + lDOMAttr.maximum_value + "\")");
prDDPins.println(" (minimumValue \"" + lDOMAttr.minimum_value + "\")");
prDDPins.println(" (pattern \"" + InfoModel.escapeProtegePatterns(lDOMAttr.pattern) + "\")");
prDDPins.println(" (valueDomainFormat \"" + InfoModel.escapeProtegePatterns(lDOMAttr.format) + "\")");
prDDPins.println(" (pattern \"" + DOMInfoModel.escapeProtegePatterns(lDOMAttr.pattern) + "\")");
prDDPins.println(" (valueDomainFormat \"" + DOMInfoModel.escapeProtegePatterns(lDOMAttr.format) + "\")");
prDDPins.println(" (registeredBy " + lDOMAttr.registeredByValue+ ")");
prDDPins.println(" (registrationAuthorityIdentifier [" + lDOMAttr.registrationAuthorityIdentifierValue + "])");
prDDPins.println(" (representedBy" + " [" + lDOMAttr.deDataIdentifier + "])");
Expand Down Expand Up @@ -211,15 +211,15 @@ public void printPDDPVD (PrintWriter prDDPins) {
prDDPins.println(" (containing1 [" + lDOMAttr.evdDataIdentifier + "])");
prDDPins.println(" (endDate \"" + DMDocument.endDateValue + "\")");
prDDPins.println(" (usedIn [" + vmIdentifier + "])");
prDDPins.println(" (value \"" + InfoModel.escapeProtegeString(lDOMPermValDefn.value) + "\"))");
// v1.3 prDDPins.println(" (value \"" + InfoModel.escapeProtegeString(tPermValue) + "\"))");
prDDPins.println(" (value \"" + DOMInfoModel.escapeProtegeString(lDOMPermValDefn.value) + "\"))");
// v1.3 prDDPins.println(" (value \"" + DOMInfoModel.escapeProtegeString(tPermValue) + "\"))");
prDDPins.println(" ");
prDDPins.println("([" + vmIdentifier + "] of ValueMeaning");
prDDPins.println(" (beginDate \"" + DMDocument.beginDatePDS4Value + "\")");
prDDPins.println(" (containing1 [" + lDOMAttr.evdDataIdentifier + "])");
prDDPins.println(" (endDate \"" + DMDocument.endDateValue + "\")");
prDDPins.println(" (description \"" + InfoModel.escapeProtegeString(lDOMPermValDefn.value_meaning) + "\"))");
// v1.3 prDDPins.println(" (description \"" + InfoModel.escapeProtegeString(tPermValueMeaning) + "\"))");
prDDPins.println(" (description \"" + DOMInfoModel.escapeProtegeString(lDOMPermValDefn.value_meaning) + "\"))");
// v1.3 prDDPins.println(" (description \"" + DOMInfoModel.escapeProtegeString(tPermValueMeaning) + "\"))");
prDDPins.println(" ");
}
}
Expand Down Expand Up @@ -529,12 +529,11 @@ public void printPDDPMISC (PrintWriter prDDPins) {
prDDPins.println(" (languageIdentifier \"English\"))");

// write the unitOfMeasure
// for (Iterator<UnitDefn> i = InfoModel.masterUnitOfMeasureArr.iterator(); i.hasNext();) {
for (Iterator<DOMUnit> i = DOMInfoModel.masterDOMUnitArr.iterator(); i.hasNext();) {
DOMUnit lDOMUnit = (DOMUnit) i.next();
prDDPins.println("([" + lDOMUnit.title + "] of UnitOfMeasure");
prDDPins.println(" (measureName \"" + lDOMUnit.title + "\")");
prDDPins.println(" (defaultUnitId \"" + InfoModel.escapeProtegeString(lDOMUnit.default_unit_id) + "\")");
prDDPins.println(" (defaultUnitId \"" + DOMInfoModel.escapeProtegeString(lDOMUnit.default_unit_id) + "\")");
prDDPins.println(" (precision \"" + "TBD_precision" + "\")");
if (! lDOMUnit.unit_id.isEmpty() )
{
Expand All @@ -543,7 +542,7 @@ public void printPDDPMISC (PrintWriter prDDPins) {
// set the units
for (Iterator<String> j = lDOMUnit.unit_id.iterator(); j.hasNext();) {
String lVal = (String) j.next();
prDDPins.print(lSpace + "\"" + InfoModel.escapeProtegeString(lVal) + "\"");
prDDPins.print(lSpace + "\"" + DOMInfoModel.escapeProtegeString(lVal) + "\"");
lSpace = " ";
}
prDDPins.println("))");
Expand Down
4 changes: 1 addition & 3 deletions model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/WriteDOM11179DDRDFFile.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ public void printISO11179DDRDF (String todaysDate) throws java.io.IOException {
*/
private void printAttrISODERDF (PrintWriter pr11179) {
// print the data elements
/// ArrayList <AttrDefn> lSortedAttrArr = new ArrayList <AttrDefn> (InfoModel.masterMOFAttrIdMap.values());
/// for (Iterator<AttrDefn> i = lSortedAttrArr.iterator(); i.hasNext();) {
for (Iterator<DOMAttr> i = DOMInfoModel.masterDOMAttrArr.iterator(); i.hasNext();) {

DOMAttr lAttr = (DOMAttr) i.next();
Expand Down Expand Up @@ -201,7 +199,7 @@ private void printAttrISOTermEntry (DOMAttr lAttr, PrintWriter pr11179) {
// pr11179.println(" " + kbId + "isPreferred=\"" + lTE.defIsPreferred + "\"");
pr11179.println(" " + kbId + "isPreferred=\"" + "TRUE" + "\"");
pr11179.println(" rdfs:label=\"" + lAttr.defDataIdentifier + "\">");
pr11179.println(" <" + kbId + "definitionText>" + InfoModel.escapeXMLChar(lAttr.definition) + "</" + kbId + "definitionText>");
pr11179.println(" <" + kbId + "definitionText>" + DOMInfoModel.escapeXMLChar(lAttr.definition) + "</" + kbId + "definitionText>");
pr11179.println("</" + kbId + "Definition>");
pr11179.println(" ");

Expand Down
6 changes: 2 additions & 4 deletions model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/WriteDOMCSVFile.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,11 @@
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.

package gov.nasa.pds.model.plugin;
//package gov.nasa.pds.model.plugin;

import java.io.*;
import java.util.*;



class WriteDOMCSVFiles extends Object {
static final String DELM_BEGIN = "\"", DELM_MID = "\",\"", DELM_END = "\"";
TreeMap <String, TermEntryDefn> termEntryMap;
Expand All @@ -54,7 +52,7 @@ public void writeDOMCSVFile (ArrayList <DOMClass> lClassArr, SchemaFileDefn lSch
// String lFileName;
String lFileName = lSchemaFileDefn.relativeFileSpecDDCSV;
if (lOtherLanguage != null) lFileName = lSchemaFileDefn.relativeFileSpecDDCSV + "_" + lOtherLanguage;
lFileName += ".csv";
lFileName += "_DOM.csv";

FileOutputStream lFileOutputStream = new FileOutputStream(lFileName);
BufferedWriter prCSVAttr = new BufferedWriter(new OutputStreamWriter(lFileOutputStream,"UTF8"));
Expand Down
Loading

0 comments on commit 59c5eba

Please sign in to comment.