Changeset 4550 for ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/StatisticsPage.java

Timestamp:

02/25/14 09:35:47 (10 years ago)

Author:

twagoo

Message:

Fixed errors due to schema change allowing only one root element in a profile or component (see r4525)

File:

• ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/StatisticsPage.java (modified) (4 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/StatisticsPage.java

@@ -21 +21 @@
 import clarin.cmdi.componentregistry.model.ComponentDescription;
 import clarin.cmdi.componentregistry.model.ProfileDescription;
+import java.util.Collection;
+import java.util.Collections;
 
 /**
@@ -69 +71 @@
         CMDComponentSpec profile = CMDComponentSpecExpanderDbImpl.expandProfile(pd.getId(), (ComponentRegistryDbImpl) registry);
         Statistics stats = new Statistics();
-        componentCounter(profile.getCMDComponent(), stats);
+        componentCounter(profile, stats);
         item.add(new Label("nrcomp", "" + stats.componentnumber));
         item.add(new Label("nrprofelem", "" + stats.elementcounter));
@@ -82 +84 @@
         CMDComponentSpec compspec = CMDComponentSpecExpanderDbImpl.expandComponent(cd.getId(), (ComponentRegistryDbImpl) registry);
         Statistics stats = new Statistics();
-        componentCounter(compspec.getCMDComponent(), stats);
+        componentCounter(compspec, stats);
         item.add(new Label("nrcomp", "" + stats.componentnumber));
         item.add(new Label("nrelem", "" + stats.elementcounter));
@@ -88 +90 @@
     }
 
-    private void componentCounter(List<CMDComponentType> components, Statistics stats) {
+    private void componentCounter(CMDComponentSpec components, Statistics stats) {
+        componentCounter(Collections.singleton(components.getCMDComponent()), stats);
+    }
+    
+    private void componentCounter(Collection<CMDComponentType> components, Statistics stats) {
         if (components != null) {
             for (CMDComponentType component : components) {