Index: JCVSReport
===================================================================
RCS file: /tmp/c408h11/408project/JCVSReport,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JCVSReport 13 Mar 2005 05:11:06 -0000 1.2
+++ JCVSReport 23 Mar 2005 21:29:04 -0000 1.3
@@ -1 +1 @@
-java -cp "dest:lib/JCVSReport.jar" ca.utoronto.JCVSReport.Presentation $*
+java -cp "dest:src:lib/JCVSReport.jar" ca.utoronto.JCVSReport.Presentation $*
Index: JCVSReport.bat
===================================================================
RCS file: /tmp/c408h11/408project/JCVSReport.bat,v
retrieving revision 1.2
diff -u -r1.2 JCVSReport.bat
--- JCVSReport.bat 13 Mar 2005 05:11:06 -0000 1.2
+++ JCVSReport.bat 29 Mar 2005 01:53:01 -0000
@@ -1,2 +1,2 @@
@echo off
-java -cp "dest;lib/JCVSReport.jar" ca.utoronto.JCVSReport.Presentation %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -cp "dest;src;lib/JCVSReport.jar" ca.utoronto.JCVSReport.Presentation %1 %2 %3 %4 %5 %6 %7 %8 %9
Index: build.xml
===================================================================
RCS file: /tmp/c408h11/408project/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 15 Mar 2005 02:57:22 -0000 1.3
+++ build.xml 15 Mar 2005 17:24:40 -0000 1.4
@@ -12,7 +12,7 @@
-
+
@@ -33,7 +33,7 @@
Index: sample_config.txt
===================================================================
RCS file: /tmp/c408h11/408project/sample_config.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sample_config.txt 15 Mar 2005 03:28:51 -0000 1.19
+++ sample_config.txt 15 Mar 2005 17:34:52 -0000 1.20
@@ -6,12 +6,4 @@
cvsmodule=408project
# The graphs you'd like to show
-graphs=CodeSize,CodeComplexity,TestSize,DocumentationSize,Conflicts,\
-Operations,NumberOfImports,Coupling,\
-CodeSize-PerDeveloper,DocumentationSize-PerDeveloper,\
-TestSize-PerDeveloper,CodeComplexity-PerDeveloper,\
-Coupling-PerDeveloper,\
-Operations-PerDeveloper,\
-NumberOfClasses-PerDeveloper,NumberOfMethods-PerDeveloper,\
-LinesOfCode-PerDeveloper,NCSS-PerDeveloper,\
-CyclomaticComplexity-PerDeveloper
+graphs=CodeSize,CodeComplexity,TestSize,DocumentationSize,Conflicts,Operations,NumberOfImports,Coupling,CodeSize-PerDeveloper,DocumentationSize-PerDeveloper,TestSize-PerDeveloper,CodeComplexity-PerDeveloper,Coupling-PerDeveloper,Operations-PerDeveloper,NumberOfClasses-PerDeveloper,NumberOfMethods-PerDeveloper,LinesOfCode-PerDeveloper,NCSS-PerDeveloper,CyclomaticComplexity-PerDeveloper,CyclomaticComplexity-PerDeveloperTimeSeriesGraph,LinesOfCode-PerDeveloperTimeSeriesGraph,LinesOfComments-PerDeveloperTimeSeriesGraph,LinesOfJavaDoc-PerDeveloperTimeSeriesGraph,NCSS-PerDeveloperTimeSeriesGraph,NumberOfClasses-PerDeveloperTimeSeriesGraph,NumberOfImports-PerDeveloperTimeSeriesGraph,NumberOfMethods-PerDeveloperTimeSeriesGraph,NumberOfTestClasses-PerDeveloperTimeSeriesGraph,NumberOfTestMethods-PerDeveloperTimeSeriesGraph
Index: lib/JCVSReport.jar
===================================================================
RCS file: /tmp/c408h11/408project/lib/JCVSReport.jar,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
Binary files /tmp/cvsURWNBD and /tmp/cvsges2Sr differ
Index: src/ca/utoronto/JCVSReport/metric/SyntaxTreeRegexMatchCounter.java
===================================================================
RCS file: /tmp/c408h11/408project/src/ca/utoronto/JCVSReport/metric/SyntaxTreeRegexMatchCounter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- src/ca/utoronto/JCVSReport/metric/SyntaxTreeRegexMatchCounter.java 14 Mar 2005 00:17:03 -0000 1.3
+++ src/ca/utoronto/JCVSReport/metric/SyntaxTreeRegexMatchCounter.java 15 Mar 2005 18:33:31 -0000 1.4
@@ -56,10 +56,10 @@
// Output the syntax tree to our special buffer within MyPrintStream.
try {
parser.CompilationUnit().dump("");
- } catch (ParseException ex) {
+ } catch (Throwable ex) {
// Print empty parse tree
System.out.println("");
- }
+ }
// Set standard out back to where it was before method invocation.
System.setOut(originalStream);
Index: src/ca/utoronto/JCVSReport/report/TimeSeriesGraph.java
===================================================================
RCS file: /tmp/c408h11/408project/src/ca/utoronto/JCVSReport/report/TimeSeriesGraph.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- src/ca/utoronto/JCVSReport/report/TimeSeriesGraph.java 14 Mar 2005 06:17:32 -0000 1.23
+++ src/ca/utoronto/JCVSReport/report/TimeSeriesGraph.java 15 Mar 2005 17:21:06 -0000 1.24
@@ -65,12 +65,17 @@
double value = getStoredMetricValue(revision);
String key = getKey(revision);
+
if (lastResultMap.containsKey(key)) {
// Get the last day
RegularTimePeriod lastDay = getLastRevision(key).getDay();
// Fill interim days from lastDay to currentDay with old value
fillInterimDays(series, lastDay, revision.getDay(), value);
+ } else {
+ // Fill previous day with zero
+ fillInterimDays(series, revision.getDay().previous().previous(),
+ revision.getDay(), 0);
}
}
@@ -225,6 +230,33 @@
return super.getTitle() + " over time";
}
+ /** Get the key attribute of a MetricRevision object.
+ * If our metric is PerDeveloper, we use the developer
+ * as the key. Otherwise, we use the metric name.
+ * @param revision The MetricRevision object
+ * @return the key attribute
+ */
+ protected String getKey(MetricRevision revision) {
+ if (perDeveloper) {
+ return revision.getDeveloper();
+ } else {
+ return revision.getMetricName();
+ }
+ }
-
- }
+ /** Get the label of a series on a graph from a MetricRevision object.
+ * By default, we use the same series label as the BasicGraph.
+ * If the metric is PerDeveloper, then we use the developer name
+ * as the series label.
+ *
+ * @param revision the MetricRevision object
+ * @return the series label
+ */
+ protected String getSeriesLabel(MetricRevision revision) {
+ if (perDeveloper) {
+ return revision.getDeveloper();
+ } else {
+ return super.getSeriesLabel(revision);
+ }
+ }
+}
Index: src/net/sf/bloof/db/database.ddl
===================================================================
RCS file: /tmp/c408h11/408project/src/net/sf/bloof/db/database.ddl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- src/net/sf/bloof/db/database.ddl 9 Mar 2005 19:01:15 -0000 1.5
+++ src/net/sf/bloof/db/database.ddl 23 Mar 2005 21:31:29 -0000 1.6
@@ -38,7 +38,7 @@
lines_add INTEGER,
lines_del INTEGER,
description TEXT,
- UNIQUE(file, version),
+ UNIQUE(file, tstamp, version),
CONSTRAINT rev_devel_fk FOREIGN KEY (developer) REFERENCES Developer,
CONSTRAINT rev_file_fk FOREIGN KEY (file) REFERENCES File,
CONSTRAINT rev_pk PRIMARY KEY (revision_id)
@@ -86,4 +86,4 @@
SELECT Revision.revision_id, file, version,
operation, CVSOperation.tstamp, CVSOperation.developer
FROM CVSOperation, Revision
- WHERE CVSOperation.revision_id = Revision.revision_id;
\ No newline at end of file
+ WHERE CVSOperation.revision_id = Revision.revision_id;