Changeset 2152

Timestamp:

08/24/12 15:16:03 (12 years ago)

Author:

olhsha

Message:

key stuff for fixing tickets 50 and 180 is discussed and coded

Location:

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/CMDComponentTypeWrapper.java (added)
• main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (3 diffs)
• test/java/clarin/cmdi/componentregistry/CMDComponentTypeWrapperTest.java (added)
• test/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestServiceTest.java (modified) (1 diff)

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

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.rest;
 
+import clarin.cmdi.componentregistry.CMDComponentTypeWrapper;
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.ComponentRegistryException;
@@ -797 +798 @@
                 CMDComponentSpec spec = validator.getCMDComponentSpec();
                 
-                // Olha was here: remove filename from spec before it gets extended!!! recursion over all the components
+                // 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) {
-                    currentcomponent.setFilename(null);
-                }
+                  setnulls.setFileNamesToNull(currentcomponent);
+                  } 
+               
+                //for (CMDComponentType currentcomponent : listofcomponents) {
+                  //((CMDComponentTypeWrapper) currentcomponent). setFileNamesToNull();
+                    
+                //} 
                 
                 try {
@@ -936 +944 @@
         this.componentRegistryFactory = componentRegistryFactory;
     }
+    
+    
 }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestServiceTest.java

@@ -1141 +1141 @@
         assertEquals(MDValidator.MISMATCH_ERROR, response.getErrors().get(0));
     }
+    
+    
 }