Changeset 203 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures/events


Ignore:
Timestamp:
02/01/2020 04:18:21 PM (6 years ago)
Author:
jdalbey
Message:

XMLWriter.java name changed to XMLBuilder. Add pretty printing methods (ticket #237).

Location:
trunk/src/scriptbuilder/structures/events
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/scriptbuilder/structures/events/ATMSEvaluationEvent.java

    r76 r203  
    1010import scriptbuilder.structures.I_XML_Writable; 
    1111import scriptbuilder.structures.ScriptEvent; 
    12 import scriptbuilder.structures.XMLWriter; 
     12import scriptbuilder.structures.XMLBuilder; 
    1313 
    1414/** 
    … …  
    6060    public String toXML() 
    6161    { 
    62         String output = XMLWriter.openTag(ELEMENT.ATMS_EVALUATION.tag); 
     62        String output = XMLBuilder.openTag(ELEMENT.ATMS_EVALUATION.tag); 
    6363        if (expectedAction != null) 
    6464        { 
    … …  
    6969                    str = ""; 
    7070                } 
    71                 output += XMLWriter.simpleTag(str, ELEMENT.EXPECTED_ACTION); 
     71                output += XMLBuilder.simpleTag(str, ELEMENT.EXPECTED_ACTION); 
    7272            } 
    7373        } 
    74         output += XMLWriter.closeTag(ELEMENT.ATMS_EVALUATION.tag); 
     74        output += XMLBuilder.closeTag(ELEMENT.ATMS_EVALUATION.tag); 
    7575 
    7676        return output; 

  • trunk/src/scriptbuilder/structures/events/ActivityLogEvaluationEvent.java

    r76 r203  
    1010import scriptbuilder.structures.I_XML_Writable; 
    1111import scriptbuilder.structures.ScriptEvent; 
    12 import scriptbuilder.structures.XMLWriter; 
     12import scriptbuilder.structures.XMLBuilder; 
    1313 
    1414/** 
    … …  
    6060    public String toXML() 
    6161    { 
    62         String output = XMLWriter.openTag(ELEMENT.ACTIVITY_LOG_EVALUATION.tag); 
     62        String output = XMLBuilder.openTag(ELEMENT.ACTIVITY_LOG_EVALUATION.tag); 
    6363        if (expectedAction != null) 
    6464        { 
    … …  
    6969                    str = ""; 
    7070                } 
    71                 output += XMLWriter.simpleTag(str, ELEMENT.EXPECTED_ACTION); 
     71                output += XMLBuilder.simpleTag(str, ELEMENT.EXPECTED_ACTION); 
    7272            } 
    7373        } 
    74         output += XMLWriter.closeTag(ELEMENT.ACTIVITY_LOG_EVALUATION.tag); 
     74        output += XMLBuilder.closeTag(ELEMENT.ACTIVITY_LOG_EVALUATION.tag); 
    7575 
    7676        return output; 

  • trunk/src/scriptbuilder/structures/events/AudioEvent.java

    r167 r203  
    99import scriptbuilder.structures.I_XML_Writable; 
    1010import scriptbuilder.structures.ScriptEvent; 
    11 import scriptbuilder.structures.XMLWriter; 
     11import scriptbuilder.structures.XMLBuilder; 
    1212 
    1313/** 
    … …  
    7575    public String toXML() 
    7676    { 
    77         return XMLWriter.emptyTag(ELEMENT.AUDIO.tag + " Length=\"" + audioLength + "\" Path=\"" + audioPath + "\""); 
     77        return XMLBuilder.emptyTag(ELEMENT.AUDIO.tag + " Length=\"" + audioLength + "\" Path=\"" + audioPath + "\""); 
    7878    } 
    7979} 

  • trunk/src/scriptbuilder/structures/events/CADEvaluationEvent.java

    r76 r203  
    1010import scriptbuilder.structures.I_XML_Writable; 
    1111import scriptbuilder.structures.ScriptEvent; 
    12 import scriptbuilder.structures.XMLWriter; 
     12import scriptbuilder.structures.XMLBuilder; 
    1313 
    1414/** 
    … …  
    6060    public String toXML() 
    6161    { 
    62         String output = XMLWriter.openTag(ELEMENT.CAD_EVALUATION.tag); 
     62        String output = XMLBuilder.openTag(ELEMENT.CAD_EVALUATION.tag); 
    6363        if (expectedAction != null) 
    6464        { 
    … …  
    6969                    str = ""; 
    7070                } 
    71                 output += XMLWriter.simpleTag(str, ELEMENT.EXPECTED_ACTION); 
     71                output += XMLBuilder.simpleTag(str, ELEMENT.EXPECTED_ACTION); 
    7272            } 
    7373        } 
    74         output += XMLWriter.closeTag(ELEMENT.CAD_EVALUATION.tag); 
     74        output += XMLBuilder.closeTag(ELEMENT.CAD_EVALUATION.tag); 
    7575 
    7676        return output; 

  • trunk/src/scriptbuilder/structures/events/CADEvent.java

    r185 r203  
    1010import scriptbuilder.structures.I_XML_Writable; 
    1111import scriptbuilder.structures.ScriptEvent; 
    12 import scriptbuilder.structures.XMLWriter; 
     12import scriptbuilder.structures.XMLBuilder; 
    1313 
    1414/** 
    … …  
    4646        while (tok.hasMoreTokens()) 
    4747        { 
    48             output += XMLWriter.simpleTag(tok.nextToken(), ELEMENT.DETAIL); 
     48            output += XMLBuilder.simpleTag(tok.nextToken(), ELEMENT.DETAIL); 
    4949        } 
    5050        return output; 

  • trunk/src/scriptbuilder/structures/events/CCTVEvent.java

    r153 r203  
    99import scriptbuilder.structures.I_XML_Writable; 
    1010import scriptbuilder.structures.ScriptEvent; 
    11 import scriptbuilder.structures.XMLWriter; 
     11import scriptbuilder.structures.XMLBuilder; 
    1212 
    1313/** 

  • trunk/src/scriptbuilder/structures/events/CHPRadioEvent.java

    r175 r203  
    1010import scriptbuilder.structures.I_XML_Writable; 
    1111import scriptbuilder.structures.ScriptEvent; 
    12 import scriptbuilder.structures.XMLWriter; 
     12import scriptbuilder.structures.XMLBuilder; 
    1313 
    1414/** 
    … …  
    101101    public String toXML() 
    102102    { 
    103         String output = XMLWriter.openTag(ELEMENT.CHP_RADIO.tag + " RadioFile=\"" + radioFile + "\""); 
    104         output += XMLWriter.openTag(ELEMENT.DIALOG.tag); 
     103        String output = XMLBuilder.openTag(ELEMENT.CHP_RADIO.tag + " RadioFile=\"" + radioFile + "\""); 
     104        output += XMLBuilder.openTag(ELEMENT.DIALOG.tag); 
    105105 
    106106        for (int i = 0; i < lines.size(); i++) 
    107107        { 
    108             output += XMLWriter.openTag(ELEMENT.LINE.tag + " Role=\"" + roles.get(i) + "\""); 
     108            output += XMLBuilder.openTag(ELEMENT.LINE.tag + " Role=\"" + roles.get(i) + "\""); 
    109109            output += lines.get(i); 
    110             output += XMLWriter.closeTag(ELEMENT.LINE.tag); 
     110            output += XMLBuilder.closeTag(ELEMENT.LINE.tag); 
    111111        } 
    112112 
    113         output += XMLWriter.closeTag(ELEMENT.DIALOG.tag); 
    114         output += XMLWriter.closeTag(ELEMENT.CHP_RADIO.tag); 
     113        output += XMLBuilder.closeTag(ELEMENT.DIALOG.tag); 
     114        output += XMLBuilder.closeTag(ELEMENT.CHP_RADIO.tag); 
    115115 
    116116        return output; 

  • trunk/src/scriptbuilder/structures/events/CMSEvaluationEvent.java

    r76 r203  
    1010import scriptbuilder.structures.I_XML_Writable; 
    1111import scriptbuilder.structures.ScriptEvent; 
    12 import scriptbuilder.structures.XMLWriter; 
     12import scriptbuilder.structures.XMLBuilder; 
    1313 
    1414/** 
    … …  
    6666    public String toXML() 
    6767    { 
    68         String output = XMLWriter.openTag(ELEMENT.CMS_EVALUATION.tag + " cmsID=\"" + cmsID + "\" type=\"" + cmsType + "\""); 
    69         output += XMLWriter.simpleTag(location, ELEMENT.LOCATION); 
     68        String output = XMLBuilder.openTag(ELEMENT.CMS_EVALUATION.tag + " cmsID=\"" + cmsID + "\" type=\"" + cmsType + "\""); 
     69        output += XMLBuilder.simpleTag(location, ELEMENT.LOCATION); 
    7070 
    7171        if (message.size() > 0) 
    7272        { 
    73             output += XMLWriter.openTag(ELEMENT.SAMPLE_MESSAGE.tag); 
     73            output += XMLBuilder.openTag(ELEMENT.SAMPLE_MESSAGE.tag); 
    7474            for (String str : message) 
    7575            { 
    … …  
    7878                    str = ""; 
    7979                } 
    80                 output += XMLWriter.simpleTag(str, ELEMENT.CMS_LINE); 
     80                output += XMLBuilder.simpleTag(str, ELEMENT.CMS_LINE); 
    8181            } 
    82             output += XMLWriter.closeTag(ELEMENT.SAMPLE_MESSAGE.tag); 
     82            output += XMLBuilder.closeTag(ELEMENT.SAMPLE_MESSAGE.tag); 
    8383        } 
    8484 
    85         output += XMLWriter.closeTag(ELEMENT.CMS_EVALUATION.tag); 
     85        output += XMLBuilder.closeTag(ELEMENT.CMS_EVALUATION.tag); 
    8686 
    8787        return output; 

  • trunk/src/scriptbuilder/structures/events/FacilitatorEvaluationEvent.java

    r76 r203  
    1010import scriptbuilder.structures.I_XML_Writable; 
    1111import scriptbuilder.structures.ScriptEvent; 
    12 import scriptbuilder.structures.XMLWriter; 
     12import scriptbuilder.structures.XMLBuilder; 
    1313 
    1414/** 
    … …  
    6060    public String toXML() 
    6161    { 
    62         String output = XMLWriter.openTag(ELEMENT.FACILITATOR_EVALUATION.tag); 
     62        String output = XMLBuilder.openTag(ELEMENT.FACILITATOR_EVALUATION.tag); 
    6363        if (expectedAction != null) 
    6464        { 
    … …  
    6969                    str = ""; 
    7070                } 
    71                 output += XMLWriter.simpleTag(str, ELEMENT.EXPECTED_ACTION); 
     71                output += XMLBuilder.simpleTag(str, ELEMENT.EXPECTED_ACTION); 
    7272            } 
    7373        } 
    74         output += XMLWriter.closeTag(ELEMENT.FACILITATOR_EVALUATION.tag); 
     74        output += XMLBuilder.closeTag(ELEMENT.FACILITATOR_EVALUATION.tag); 
    7575 
    7676        return output; 

  • trunk/src/scriptbuilder/structures/events/MaintenanceRadioEvent.java

    r76 r203  
    99import scriptbuilder.structures.I_XML_Writable; 
    1010import scriptbuilder.structures.ScriptEvent; 
    11 import scriptbuilder.structures.XMLWriter; 
     11import scriptbuilder.structures.XMLBuilder; 
    1212 
    1313/** 
    … …  
    3333    public String toXML() 
    3434    { 
    35         String output = XMLWriter.simpleTag(message, ELEMENT.MAINTENANCE_RADIO); 
     35        String output = XMLBuilder.simpleTag(message, ELEMENT.MAINTENANCE_RADIO); 
    3636        return output; 
    3737    } 

  • trunk/src/scriptbuilder/structures/events/ParamicsEvent.java

    r76 r203  
    1010import scriptbuilder.structures.I_XML_Writable; 
    1111import scriptbuilder.structures.ScriptEvent; 
    12 import scriptbuilder.structures.XMLWriter; 
     12import scriptbuilder.structures.XMLBuilder; 
    1313 
    1414/** 
    … …  
    4040    public String toXML() 
    4141    { 
    42         String output = XMLWriter.openTag(ELEMENT.PARAMICS.tag + " LocationID=\"" + locationID + "\""); 
     42        String output = XMLBuilder.openTag(ELEMENT.PARAMICS.tag + " LocationID=\"" + locationID + "\""); 
    4343 
    44         output += XMLWriter.simpleTag(status, ELEMENT.Status); 
     44        output += XMLBuilder.simpleTag(status, ELEMENT.Status); 
    4545 
    4646        if (!type.equals("")) 
    4747        { 
    48             output += XMLWriter.simpleTag(type, ELEMENT.Incident_type); 
     48            output += XMLBuilder.simpleTag(type, ELEMENT.Incident_type); 
    4949        } 
    5050 
    5151        for (Integer lane : laneNums) 
    5252        { 
    53             output += XMLWriter.simpleTag("" + lane, ELEMENT.Lane_number); 
     53            output += XMLBuilder.simpleTag("" + lane, ELEMENT.Lane_number); 
    5454        } 
    55         output += XMLWriter.closeTag(ELEMENT.PARAMICS.tag); 
     55        output += XMLBuilder.closeTag(ELEMENT.PARAMICS.tag); 
    5656 
    5757        return output; 

  • trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java

    r76 r203  
    1010import scriptbuilder.structures.I_XML_Writable; 
    1111import scriptbuilder.structures.ScriptEvent; 
    12 import scriptbuilder.structures.XMLWriter; 
     12import scriptbuilder.structures.XMLBuilder; 
    1313 
    1414/** 
    … …  
    6060    public String toXML() 
    6161    { 
    62         String output = XMLWriter.openTag(ELEMENT.RADIO_EVALUATION.tag); 
     62        String output = XMLBuilder.openTag(ELEMENT.RADIO_EVALUATION.tag); 
    6363        if (expectedAction != null) 
    6464        { 
    … …  
    6969                    str = ""; 
    7070                } 
    71                 output += XMLWriter.simpleTag(str, ELEMENT.EXPECTED_ACTION); 
     71                output += XMLBuilder.simpleTag(str, ELEMENT.EXPECTED_ACTION); 
    7272            } 
    7373        } 
    74         output += XMLWriter.closeTag(ELEMENT.RADIO_EVALUATION.tag); 
     74        output += XMLBuilder.closeTag(ELEMENT.RADIO_EVALUATION.tag); 
    7575 
    7676        return output; 

  • trunk/src/scriptbuilder/structures/events/TMTRadioEvent.java

    r76 r203  
    99import scriptbuilder.structures.I_XML_Writable; 
    1010import scriptbuilder.structures.ScriptEvent; 
    11 import scriptbuilder.structures.XMLWriter; 
     11import scriptbuilder.structures.XMLBuilder; 
    1212 
    1313/** 
    … …  
    3333    public String toXML() 
    3434    { 
    35         String output = XMLWriter.simpleTag(message, ELEMENT.TMT_RADIO); 
     35        String output = XMLBuilder.simpleTag(message, ELEMENT.TMT_RADIO); 
    3636        return output; 
    3737    } 

  • trunk/src/scriptbuilder/structures/events/TelephoneEvent.java

    r76 r203  
    1010import scriptbuilder.structures.I_XML_Writable; 
    1111import scriptbuilder.structures.ScriptEvent; 
    12 import scriptbuilder.structures.XMLWriter; 
     12import scriptbuilder.structures.XMLBuilder; 
    1313 
    1414/** 
    … …  
    3737    public String toXML() 
    3838    { 
    39         String output = XMLWriter.openTag(ELEMENT.TELEPHONE.tag); 
     39        String output = XMLBuilder.openTag(ELEMENT.TELEPHONE.tag); 
    4040        for (int i = 0; i < lines.size(); i++) 
    4141        { 
    4242            if (roles.get(i).equalsIgnoreCase(ELEMENT.STUDENT.tag)) 
    4343            { 
    44                 output += XMLWriter.simpleTag(lines.get(i), ELEMENT.STUDENT); 
     44                output += XMLBuilder.simpleTag(lines.get(i), ELEMENT.STUDENT); 
    4545            } 
    4646            else 
    4747            { 
    48                 output += XMLWriter.openTag(ELEMENT.INSTRUCTOR.tag + " Role=\"" + roles.get(i) + "\""); 
     48                output += XMLBuilder.openTag(ELEMENT.INSTRUCTOR.tag + " Role=\"" + roles.get(i) + "\""); 
    4949                output += lines.get(i); 
    50                 output += XMLWriter.closeTag(ELEMENT.INSTRUCTOR.tag); 
     50                output += XMLBuilder.closeTag(ELEMENT.INSTRUCTOR.tag); 
    5151            } 
    5252        } 
    53         output += XMLWriter.closeTag(ELEMENT.TELEPHONE.tag); 
     53        output += XMLBuilder.closeTag(ELEMENT.TELEPHONE.tag); 
    5454        return output; 
    5555    } 

  • trunk/src/scriptbuilder/structures/events/TowEvent.java

    r76 r203  
    99import scriptbuilder.structures.I_XML_Writable; 
    1010import scriptbuilder.structures.ScriptEvent; 
    11 import scriptbuilder.structures.XMLWriter; 
     11import scriptbuilder.structures.XMLBuilder; 
    1212 
    1313/** 
    … …  
    3939    public String toXML() 
    4040    { 
    41         return XMLWriter.emptyTag(ELEMENT.TOW.tag + " Company=\"" + towCompany + "\" ConfNum=\"" 
     41        return XMLBuilder.emptyTag(ELEMENT.TOW.tag + " Company=\"" + towCompany + "\" ConfNum=\"" 
    4242                + towConfNum + "\" PubNum=\"" + towPubNum + "\" Beat=\"" + towBeat + "\""); 
    4343    } 

  • trunk/src/scriptbuilder/structures/events/UnitEvent.java

    r145 r203  
    99import scriptbuilder.structures.I_XML_Writable; 
    1010import scriptbuilder.structures.ScriptEvent; 
    11 import scriptbuilder.structures.XMLWriter; 
     11import scriptbuilder.structures.XMLBuilder; 
    1212 
    1313/** 
    … …  
    4141    public String toXML() 
    4242    { 
    43         return XMLWriter.emptyTag(ELEMENT.UNIT.tag+" UnitNum=\""+unitNum+"\" Status=\"" 
     43        return XMLBuilder.emptyTag(ELEMENT.UNIT.tag+" UnitNum=\""+unitNum+"\" Status=\"" 
    4444                +unitStatus+"\" Primary=\""+unitPrimary+"\" Active=\""+unitActive+"\""); 
    4545    } 

  • trunk/src/scriptbuilder/structures/events/WitnessEvent.java

    r46 r203  
    99import scriptbuilder.structures.I_XML_Writable; 
    1010import scriptbuilder.structures.ScriptEvent; 
    11 import scriptbuilder.structures.XMLWriter; 
     11import scriptbuilder.structures.XMLBuilder; 
    1212 
    1313/** 
    … …  
    3737    public String toXML() 
    3838    { 
    39         return XMLWriter.emptyTag(ELEMENT.WITNESS.tag + " Name=\"" + witnessName + "\" Address=\"" 
     39        return XMLBuilder.emptyTag(ELEMENT.WITNESS.tag + " Name=\"" + witnessName + "\" Address=\"" 
    4040                + witnessAddress + "\" PhoneNum=\"" + witnessNum + "\""); 
    4141    } 
Note: See TracChangeset for help on using the changeset viewer.