--- a/MetricsReporter.st	Wed Nov 07 19:51:40 2012 +0100
+++ b/MetricsReporter.st	Wed Nov 07 20:16:17 2012 +0100
@@ -238,16 +238,16 @@
     stream nextPutLine: '    <class>'.
     stream nextPutLine: ('      <name>%1</name>' bindWith:aClass name).
 
-    self classMetricNames notEmptyOrNil ifTrue:[
-        self reportXml_metricValues:(self generateClassMetricsFor:aClass).
-    ].
-
     self methodMetricNames notEmptyOrNil ifTrue:[
         aClass instAndClassMethodsDo:[:eachMethod |
             self reportXml_metricsForMethod:eachMethod
         ].
     ].
 
+    self classMetricNames notEmptyOrNil ifTrue:[
+        self reportXml_metricValues:(self generateClassMetricsFor:aClass).
+    ].
+
     stream nextPutLine: '    </class>'.
 !
 
@@ -264,8 +264,6 @@
     stream nextPutLine: '  <project>'.
     stream nextPutLine: ('    <name>%1</name>' bindWith:aPackageID).
 
-    self reportXml_metricValues:(self generatePackageMetricsFor:aPackageID).
-
     (self classMetricNames notEmptyOrNil 
     or:[self methodMetricNames notEmptyOrNil]) ifTrue:[
         Smalltalk allClassesInPackage:aPackageID do:[:eachClass |
@@ -277,6 +275,8 @@
         ].
     ].
 
+    self reportXml_metricValues:(self generatePackageMetricsFor:aPackageID).
+
     stream nextPutLine: '  </project>'.
 ! !
 
@@ -303,9 +303,9 @@
 !MetricsReporter class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/sunit/MetricsReporter.st,v 1.1 2012-11-07 18:40:22 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/sunit/MetricsReporter.st,v 1.2 2012-11-07 19:16:17 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/goodies/sunit/MetricsReporter.st,v 1.1 2012-11-07 18:40:22 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/sunit/MetricsReporter.st,v 1.2 2012-11-07 19:16:17 cg Exp $'
 ! !