changeset 22:719a11e4bd98

CODETOOLS-7902011, CODETOOLS-7902002
author afedorch
date Thu, 24 Aug 2017 15:10:51 -0700
parents e608a1c1471b
children 0a03b7759381
files build/build.xml src/classes/com/sun/tdk/jcov/report/MethodCoverage.java
diffstat 2 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/build/build.xml	Tue Aug 08 17:53:36 2017 -0700
+++ b/build/build.xml	Thu Aug 24 15:10:51 2017 -0700
@@ -159,13 +159,13 @@
     <target name="compile"  depends="prepare, build-date"
             description="compile main tools">
 
-        <javac includeantruntime="false" encoding="iso-8859-1" debug="true" target="1.5" source="1.5"
+        <javac includeantruntime="false" encoding="iso-8859-1" debug="true" target="1.7" source="1.7"
                srcdir="${jcov.src.update}"
                destdir="${jcov.classes}"
                classpath="${jcov.classpath}">
         </javac>
 
-        <javac includeantruntime="true" encoding="iso-8859-1" debug="true" target="1.5" source="1.5"
+        <javac includeantruntime="true" encoding="iso-8859-1" debug="true" target="1.7" source="1.7"
                srcdir="${src.dir}"
                destdir="${jcov.classes}"
                classpath="${jcov.classpath}">
@@ -236,7 +236,7 @@
                 </filterreader>
             </filterchain>
         </copy>
-        <javac includeantruntime="true" encoding="iso-8859-1" debug="true" target="1.5" source="1.5"
+        <javac includeantruntime="true" encoding="iso-8859-1" debug="true" target="1.7" source="1.7"
                srcdir="${jcov.filesaver.src}"
                sourcepath=""
                classpath="${jcov.filesaver.classes}"
@@ -270,7 +270,7 @@
                 </filterreader>
             </filterchain>
         </copy>
-        <javac includeantruntime="true" encoding="iso-8859-1" debug="true" target="1.5" source="1.5"
+        <javac includeantruntime="true" encoding="iso-8859-1" debug="true" target="1.7" source="1.7"
                srcdir="${jcov.networksaver.src}"
                sourcepath=""
                classpath="${jcov.networksaver.classes}"
@@ -287,7 +287,7 @@
 
     <target name="build-jt.observer" depends="prepare" if ="javatest.present" description="build jtobserver jar">
         <mkdir dir="${jcov.jtobserver.classes}"/>
-        <javac includeantruntime="false" encoding="iso-8859-1" debug="true" target="1.5" source="1.5"
+        <javac includeantruntime="false" encoding="iso-8859-1" debug="true" target="1.7" source="1.7"
                srcdir="${src.dir}"
                sourcepath=""
                destdir="${jcov.jtobserver.classes}" classpath="${javatestjar}">
--- a/src/classes/com/sun/tdk/jcov/report/MethodCoverage.java	Tue Aug 08 17:53:36 2017 -0700
+++ b/src/classes/com/sun/tdk/jcov/report/MethodCoverage.java	Thu Aug 24 15:10:51 2017 -0700
@@ -120,6 +120,9 @@
                         }
                     }
                 }
+                if (item.getSourceLine() < 0 && lineTable.size() > 0){
+                    item.setSrcLine(lineTable.get(lineTable.size() - 1).line);
+                }
             }
         }
     }