Align with Export

Align the files that depend on the N5 export service to work with its new configuration.

vcell-client/src/main/java/cbit/vcell/export/gui/N5SettingsPanel.java

@@ -511,7 +511,7 @@ public N5Specs getN5Specs(){
         int[] paramScanIndexes = simulationSelector == null ? null : simulationSelector.getselectedParamScanIndexes();
         String dataSetName = getJTextFieldDataSetName().getText();
 
-        return new N5Specs(simDataID, DataType.PDE_VARIABLE_DATA, ExportFormat.N5, compressionLevel, dataSetName);
+        return new N5Specs(DataType.PDE_VARIABLE_DATA, ExportFormat.N5, compressionLevel, dataSetName);
     }
 
     private JLabel lblSeeVcellHelp;

vcell-core/src/main/java/cbit/vcell/export/server/ExportServiceImpl.java

@@ -226,7 +226,7 @@ public ExportEvent makeRemoteFile(OutputContext outputContext,User user, DataSer
 			fileFormat = "NRRD";
 			break;
 		case N5:
-			fileFormat = "N5";
+			fileFormat = "n5";
 			break;
 //		case IMAGEJ:
 //			fileFormat = "IMAGEJ";
@@ -314,7 +314,7 @@ public ExportEvent makeRemoteFile(OutputContext outputContext,User user, DataSer
 				case N5:
 					n5Exporter.initalizeDataControllers(exportSpecs.getVCDataIdentifier().getDataKey().toString() ,user.getName(), user.getID().toString(), newExportJob.getJobID());
 					ExportOutput exportOutput = n5Exporter.makeN5Data(outputContext, newExportJob, exportSpecs, fileDataContainerManager);
-					return makeRemoteN5File(fileFormat, n5Exporter.n5FileNameHash(), exportN5Dir, "s3://", exportOutput, exportSpecs, newExportJob, fileDataContainerManager);
+					return makeRemoteN5File(fileFormat, n5Exporter.getN5FileNameHash(), exportN5Dir, "s3://", exportOutput, exportSpecs, newExportJob, fileDataContainerManager);
 				default:
 					throw new DataAccessException("Unknown export format requested");
 			}

vcell-core/src/main/java/cbit/vcell/export/server/N5Specs.java

@@ -12,10 +12,7 @@
 
 import cbit.vcell.math.MathException;
 import cbit.vcell.simdata.VCData;
-import org.janelia.saalfeldlab.n5.Bzip2Compression;
-import org.janelia.saalfeldlab.n5.Compression;
-import org.janelia.saalfeldlab.n5.GzipCompression;
-import org.janelia.saalfeldlab.n5.N5FSWriter;
+import org.janelia.saalfeldlab.n5.*;
 import org.vcell.util.Compare;
 import org.vcell.util.DataAccessException;
 
@@ -30,7 +27,6 @@
 public class N5Specs extends FormatSpecificSpecs implements Serializable {
 	private final ExportFormat format;
 	private final ExportConstants.DataType dataType;
-	private final ExportSpecs.SimNameSimDataID[] simNameSimDataIDs;
 	private final CompressionLevel compression;
 
 	public final String dataSetName;
@@ -44,16 +40,12 @@ public static enum CompressionLevel{
 /**
  * TextSpecs constructor comment.
  */
-	public N5Specs(ExportSpecs.SimNameSimDataID[] simNameSimDataIDs, ExportConstants.DataType dataType, ExportFormat format, CompressionLevel compressionLevel, String dataSetName) {
+	public N5Specs(ExportConstants.DataType dataType, ExportFormat format, CompressionLevel compressionLevel, String dataSetName) {
 		this.format = format;
 		this.dataType = dataType;
-		this.simNameSimDataIDs = simNameSimDataIDs;
 		this.compression = compressionLevel;
 		this.dataSetName = dataSetName;
 	}
-	public ExportSpecs.SimNameSimDataID[] getSimNameSimDataIDs(){
-		return simNameSimDataIDs;
-	}
 	/**
 	 * This method was created in VisualAge.
 	 * @return int
@@ -72,13 +64,13 @@ public ExportFormat getFormat() {
 	public Compression getCompression(){
 		switch (compression){
 			case RAW:
-				return null;
+				return new RawCompression();
 			case BZIP:
 				return new Bzip2Compression();
 			case GZIP:
 				return new GzipCompression();
 			default:
-				return null;
+				return new RawCompression();
 		}
 	}