Project

General

Profile

« Previous | Next » 

Revision 6366

Added by ben leinfelder over 12 years ago

use new "v1" types from DataONE

View differences:

ObjectFormatService.java
28 28 
import java.util.HashMap;
29 29 

  		




  30
  30
  
    
import org.apache.log4j.Logger;


  		




  31
  
  
    
import org.dataone.cn.batch.utils.TypeMarshaller;


  		




  
  31
  
    
import org.dataone.service.util.TypeMarshaller;


  		




  32
  32
  
    
import org.dataone.service.exceptions.InsufficientResources;


  		




  33
  33
  
    
import org.dataone.service.exceptions.InvalidRequest;


  		




  34
  34
  
    
import org.dataone.service.exceptions.NotFound;


  		




  35
  35
  
    
import org.dataone.service.exceptions.NotImplemented;


  		




  36
  36
  
    
import org.dataone.service.exceptions.ServiceFailure;


  		




  37
  
  
    
import org.dataone.service.types.ObjectFormat;


  		




  38
  
  
    
import org.dataone.service.types.ObjectFormatIdentifier;


  		




  39
  
  
    
import org.dataone.service.types.ObjectFormatList;


  		




  
  37
  
    
import org.dataone.service.types.v1.ObjectFormat;


  		




  
  38
  
    
import org.dataone.service.types.v1.ObjectFormatIdentifier;


  		




  
  39
  
    
import org.dataone.service.types.v1.ObjectFormatList;


  		




  40
  40
  
    
import org.jibx.runtime.JiBXException;


  		




  41
  41
  
    

  		




  42
  42
  
    
import edu.ucsb.nceas.metacat.DBUtil;


  		




  ......




  235
  235
  
    
		}


  		




  236
  236
  
    

  		




  237
  237
  
    
		// index the object format list based on the format identifier string


  		




  238
  
  
    
		int listSize = objectFormatList.sizeObjectFormats();


  		




  
  238
  
    
		int listSize = objectFormatList.sizeObjectFormatList();


  		




  239
  239
  
    

  		




  240
  240
  
    
		for (int i = 0; i < listSize; i++) {


  		




  241
  241
  
    

  		












Also available in:  Unified diff