Changeset 2153

Timestamp:

08/27/12 10:04:08 (12 years ago)

Author:

olhsha

Message:

refactoring of #50

Location:

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry

Files:

• CMDComponentTypeWrapper.java (modified) (2 diffs)
• rest/ComponentRegistryRestService.java (modified) (1 diff)

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/CMDComponentTypeWrapper.java

@@ -5 +5 @@
 package clarin.cmdi.componentregistry;
 
+import clarin.cmdi.componentregistry.components.CMDComponentSpec;
 import clarin.cmdi.componentregistry.components.CMDComponentType;
 import java.util.List;
@@ -12 +13 @@
  * @author olhsha
  */
-public class CMDComponentTypeWrapper { // extending CMDComponentType does not work :( does not want to cast
+public class CMDComponentTypeWrapper { // extending CMDComponentType does not work :( does not want to downcast
     
-     /**
-     * Olha: null fileName of *this*, also in children
-     *
-     */
+    CMDComponentType component;
+    List<CMDComponentType> listofcomponents;
     
-    // may be do this method static? 
-    public void setFileNamesToNull(CMDComponentType component){ 
-    //public void setFileNamesToNull(){    
+    public CMDComponentTypeWrapper(CMDComponentType newcomponent){
+        component = newcomponent;
+        listofcomponents = newcomponent.getCMDComponent();
+    }
+    
+    
+    public CMDComponentTypeWrapper(CMDComponentSpec newspec){
+        component = null;
+        listofcomponents = newspec.getCMDComponent();
+    }
+    
+    
+    public void setFileNamesToNull(){ 
+   
+        if (component != null) {component.setFilename(null);}
         
-        // null the filename of component
-        component.setFilename(null);
-        //filename=null;
-                
-        // and now null filenames in all children's components
-        List<CMDComponentType> cildrencomponents = component.getCMDComponent();
-        CMDComponentTypeWrapper childwrapper = new CMDComponentTypeWrapper();
-        for (CMDComponentType currentcomponent : cildrencomponents) {
-        //for (CMDComponentType currentcomponent : cmdComponent) {
-                childwrapper.setFileNamesToNull(currentcomponent);
-                //((CMDComponentTypeWrapper) currentcomponent).setFileNamesToNull();
+        for (CMDComponentType currentcomponent : listofcomponents) { 
+                CMDComponentTypeWrapper currentwrapper = new CMDComponentTypeWrapper(currentcomponent);
+                currentwrapper.setFileNamesToNull();
                 } 
     

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

@@ -799 +799 @@
                 
                 // Olha: removing filename from spec before it gets extended!!! recursion over all the components
-                List<CMDComponentType> listofcomponents=spec.getCMDComponent();
-                CMDComponentTypeWrapper setnulls= new CMDComponentTypeWrapper();
-                
-                for (CMDComponentType currentcomponent : listofcomponents) {
-                  setnulls.setFileNamesToNull(currentcomponent);
-                  } 
+                CMDComponentTypeWrapper setnull = new CMDComponentTypeWrapper(spec);
                
-                //for (CMDComponentType currentcomponent : listofcomponents) {
-                  //((CMDComponentTypeWrapper) currentcomponent). setFileNamesToNull();
-                    
-                //} 
+               
                 
                 try {