diff options
3 files changed, 12 insertions, 7 deletions
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/AttentionRecord.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/AttentionRecord.java index d08faa2a09c..e086a0d1e8a 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/AttentionRecord.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/AttentionRecord.java @@ -12,6 +12,7 @@ package org.eclipse.osee.ote.core.log.record; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; + import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp; import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor; import org.eclipse.osee.ote.core.log.TestLevel; @@ -67,7 +68,7 @@ public class AttentionRecord extends TestRecord { @Override public void toXml(XMLStreamWriter writer) throws XMLStreamException { writer.writeStartElement(getLevel().getName()); - writeLocation(writer); + writeLocationCheckLocationLoggingOn(writer); writeMessage(writer); writer.writeEndElement(); } diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TestRecord.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TestRecord.java index 804ef9c9438..43ffefe9a7d 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TestRecord.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TestRecord.java @@ -14,8 +14,10 @@ import java.util.ArrayList; import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.regex.Pattern; + import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; + import org.eclipse.osee.framework.jdk.core.persistence.Xmlizable; import org.eclipse.osee.framework.jdk.core.persistence.XmlizableStream; import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp; @@ -175,7 +177,7 @@ public abstract class TestRecord extends LogRecord implements Xmlizable, Xmlizab @Override public void toXml(XMLStreamWriter writer) throws XMLStreamException { writer.writeStartElement(getLevel().getName()); - writeLocation(writer); + writeLocationCheckLocationLoggingOn(writer); writeMessage(writer); writer.writeEndElement(); } @@ -195,18 +197,18 @@ public abstract class TestRecord extends LogRecord implements Xmlizable, Xmlizab return locationElement; } - private void getLocation(XMLStreamWriter writer) throws XMLStreamException { + protected void writeLocation(XMLStreamWriter writer) throws XMLStreamException { calc(writer); writeTime(writer); writer.writeEndElement(); } - protected void writeLocation(XMLStreamWriter writer) throws XMLStreamException { + protected void writeLocationCheckLocationLoggingOn(XMLStreamWriter writer) throws XMLStreamException { if (TestRecord.getLocationLoggingOn()) { - getLocation(writer); + writeLocation(writer); } } - + protected void writeTime(XMLStreamWriter writer) throws XMLStreamException { if (this.printTimeStamp) { writer.writeStartElement("Time"); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TraceRecord.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TraceRecord.java index 62101786b91..4c3ae208b5c 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TraceRecord.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/log/record/TraceRecord.java @@ -11,8 +11,10 @@ package org.eclipse.osee.ote.core.log.record; import java.util.ArrayList; + import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; + import org.eclipse.osee.framework.jdk.core.persistence.Xmlizable; import org.eclipse.osee.framework.jdk.core.persistence.XmlizableStream; import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp; @@ -108,6 +110,6 @@ public class TraceRecord extends TestRecord implements Xmlizable { } writer.writeEndElement(); } - writeLocation(writer); + writeLocationCheckLocationLoggingOn(writer); } }
\ No newline at end of file |