LMS-1811 Extracted shared constants.

SVN: 18289

rtd_cina/source/java/ch/systemsx/cisd/cina/dss/bundle/registrators/ReplicaRegistrator.java

@@ -19,6 +19,7 @@ package ch.systemsx.cisd.cina.dss.bundle.registrators;
 import java.io.File;
 import java.util.List;
 
+import ch.systemsx.cisd.cina.shared.constants.BundleStructureConstants;
 import ch.systemsx.cisd.cina.shared.metadata.ImageMetadataExtractor;
 import ch.systemsx.cisd.cina.shared.metadata.ReplicaMetadataExtractor;
 import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
@@ -33,7 +34,8 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
  */
 public class ReplicaRegistrator extends BundleDataSetHelper
 {
-    private static final String RAW_IMAGES_FOLDER_NAME = "RawData";
+    private static final String RAW_IMAGES_FOLDER_NAME =
+            BundleStructureConstants.RAW_IMAGES_FOLDER_NAME;
 
     private final ReplicaMetadataExtractor replicaMetadataExtractor;
 

rtd_cina/source/java/ch/systemsx/cisd/cina/shared/metadata/BundleMetadataExtractor.java

@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import ch.systemsx.cisd.cina.shared.constants.BundleStructureConstants;
 import ch.systemsx.cisd.cina.shared.labview.LVData;
 import ch.systemsx.cisd.cina.shared.labview.LVDataParser;
 
@@ -29,11 +30,14 @@ import ch.systemsx.cisd.cina.shared.labview.LVDataParser;
  */
 public class BundleMetadataExtractor
 {
-    private static final String METADATA_FOLDER_NAME = "Annotations";
+    private static final String METADATA_FOLDER_NAME =
+            BundleStructureConstants.METADATA_FOLDER_NAME;
 
-    private static final String BUNDLE_METADATA_FILE_NAME = "BundleMetadata.xml";
+    private static final String BUNDLE_METADATA_FILE_NAME =
+            BundleStructureConstants.BUNDLE_METADATA_FILE_NAME;
 
-    private static final String GRID_PREP_SAMPLE_CODE_KEY = "database link information";
+    private static final String GRID_PREP_SAMPLE_CODE_KEY =
+            BundleStructureConstants.GRID_PREP_SAMPLE_CODE_KEY;
 
     private final ArrayList<ReplicaMetadataExtractor> replicaMetadataExtractors;
 

rtd_cina/source/java/ch/systemsx/cisd/cina/shared/metadata/ImageMetadataExtractor.java

@@ -20,6 +20,7 @@ import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
+import ch.systemsx.cisd.cina.shared.constants.BundleStructureConstants;
 import ch.systemsx.cisd.cina.shared.constants.CinaConstants;
 import ch.systemsx.cisd.cina.shared.labview.LVData;
 import ch.systemsx.cisd.cina.shared.labview.LVDataParser;
@@ -37,7 +38,8 @@ public class ImageMetadataExtractor implements IMetadataExtractor
 
     private LVData lvdata;
 
-    private final static String METADATA_FILE_NAME = "metadata.xml";
+    private final static String IMAGE_METADATA_FILE_NAME =
+            BundleStructureConstants.IMAGE_METADATA_FILE_NAME;
 
     private final static HashMap<String, String> prefixMap;
     static
@@ -49,7 +51,7 @@ public class ImageMetadataExtractor implements IMetadataExtractor
 
     public static boolean doesFolderContainImageMetadata(File folder)
     {
-        File metadataFile = new File(folder, METADATA_FILE_NAME);
+        File metadataFile = new File(folder, IMAGE_METADATA_FILE_NAME);
         return metadataFile.exists();
     }
 
@@ -88,7 +90,7 @@ public class ImageMetadataExtractor implements IMetadataExtractor
                     + " is not an image metadata file");
         }
 
-        File metadataFile = new File(folder, METADATA_FILE_NAME);
+        File metadataFile = new File(folder, IMAGE_METADATA_FILE_NAME);
         lvdata = LVDataParser.parse(metadataFile);
         if (null == lvdata)
         {

rtd_cina/source/java/ch/systemsx/cisd/cina/shared/metadata/ReplicaMetadataExtractor.java

@@ -22,6 +22,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import ch.systemsx.cisd.cina.shared.constants.BundleStructureConstants;
 import ch.systemsx.cisd.cina.shared.labview.LVData;
 import ch.systemsx.cisd.cina.shared.labview.LVDataParser;
 
@@ -30,9 +31,11 @@ import ch.systemsx.cisd.cina.shared.labview.LVDataParser;
  */
 public class ReplicaMetadataExtractor implements IMetadataExtractor
 {
-    private static final String REPLICA_METADATA_FILE_NAME = "ReplicaMetadata.xml";
+    private static final String REPLICA_METADATA_FILE_NAME =
+            BundleStructureConstants.REPLICA_METADATA_FILE_NAME;
 
-    private static final String REPLICA_SAMPLE_CODE_KEY = "database id (replica)";
+    private static final String REPLICA_SAMPLE_CODE_KEY =
+            BundleStructureConstants.REPLICA_SAMPLE_CODE_KEY;
 
     private final ArrayList<ImageMetadataExtractor> metadataExtractors;