minor: do not confuse users with locator type

SVN: 19823

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationDetails.java

@@ -35,15 +35,12 @@ public class DataSetRegistrationDetails<T extends DataSetInformation> implements
 
     private String processorType;
 
-    private LocatorType locatorType;
-
     private T dataSetInformation;
 
     public DataSetRegistrationDetails()
     {
         fileFormatType = new FileFormatType(FileFormatType.DEFAULT_FILE_FORMAT_TYPE_CODE);
         measuredData = true;
-        locatorType = new LocatorType(LocatorType.DEFAULT_LOCATOR_TYPE_CODE);
     }
 
     public FileFormatType getFileFormatType(File incomingDataSetPath)
@@ -68,7 +65,7 @@ public class DataSetRegistrationDetails<T extends DataSetInformation> implements
 
     public LocatorType getLocatorType(File incomingDataSetPath)
     {
-        return locatorType;
+        return new LocatorType(LocatorType.DEFAULT_LOCATOR_TYPE_CODE);
     }
 
     public FileFormatType getFileFormatType()
@@ -117,16 +114,6 @@ public class DataSetRegistrationDetails<T extends DataSetInformation> implements
         dataSetInformation.setDataSetType(dataSetType);
     }
 
-    public LocatorType getLocatorType()
-    {
-        return locatorType;
-    }
-
-    public void setLocatorType(LocatorType locatorType)
-    {
-        this.locatorType = locatorType;
-    }
-
     public T getDataSetInformation()
     {
         return dataSetInformation;

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageAlgorithm.java

@@ -215,7 +215,6 @@ public class DataSetStorageAlgorithm<T extends DataSetInformation>
         data.setUserId(dataSetInformation.getUploadingUserIdOrNull());
         data.setUserEMail(dataSetInformation.tryGetUploadingUserEmail());
         data.setExtractableData(dataSetInformation.getExtractableData());
-        data.setLocatorType(registrationDetails.getLocatorType());
         data.setDataSetType(registrationDetails.getDataSetType());
         data.setFileFormatType(registrationDetails.getFileFormatType());
         data.setMeasured(registrationDetails.isMeasuredData());

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSet.java

@@ -17,7 +17,6 @@
 package ch.systemsx.cisd.etlserver.registrator.api.v1;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.FileFormatType;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.LocatorType;
 
 /**
  * @author Chandrasekhar Ramakrishnan
@@ -100,14 +99,4 @@ public interface IDataSet
      * Set the data set type.
      */
     public void setDataSetType(String dataSetTypeCode);
-
-    /**
-     * Get the locator type. Defaults to the default specified in {@link LocatorType}.
-     */
-    public String getLocatorType();
-
-    /**
-     * Set the locator type.
-     */
-    public void setLocatorType(String locatorTypeCode);
 }

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java

@@ -26,7 +26,6 @@ import ch.systemsx.cisd.etlserver.registrator.api.v1.ISampleImmutable;
 import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.FileFormatType;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.LocatorType;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifier;
 
 /**
@@ -146,16 +145,6 @@ public class DataSet<T extends DataSetInformation> implements IDataSet
         registrationDetails.setDataSetType(new DataSetType(dataSetTypeCode));
     }
 
-    public String getLocatorType()
-    {
-        return registrationDetails.getLocatorType().getCode();
-    }
-
-    public void setLocatorType(String locatorTypeCode)
-    {
-        registrationDetails.setLocatorType(new LocatorType(locatorTypeCode));
-    }
-
     protected void setExperiment(ch.systemsx.cisd.openbis.generic.shared.basic.dto.Experiment exp)
     {
         registrationDetails.getDataSetInformation().setExperiment(exp);