From 45b99273fa4392bd75a6f323aab25fc61910e0f5 Mon Sep 17 00:00:00 2001 From: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com> Date: Tue, 27 Feb 2024 19:09:58 +0000 Subject: [PATCH] Restore single param call into PamParameterSet.autoGenerate --- src/PamModel/parametermanager/PamParameterSet.java | 12 +++++++++++- src/binaryFileStorage/BinaryOutputStream.java | 4 +++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/PamModel/parametermanager/PamParameterSet.java b/src/PamModel/parametermanager/PamParameterSet.java index c7108e0a..2425b2e7 100644 --- a/src/PamModel/parametermanager/PamParameterSet.java +++ b/src/PamModel/parametermanager/PamParameterSet.java @@ -10,7 +10,6 @@ import java.util.Collection; import java.util.Hashtable; import java.util.List; -import binaryFileStorage.BinaryStoreSettings; /** * Description of the parameters within a class. Primarily holds a list @@ -51,6 +50,17 @@ public class PamParameterSet { hiddenFields = new ArrayList<>(); } + /** + * Automatically generate a parameter set for a class. Will include all public fields and + * any private or protected fields for which a getter can be found that has a similar enough name + * @param parentObject class to generate description for. Exception is anything that's listed + * in the STANDARD_MODIFIER_EXCLUSIONS list (FINAL or STATIC). + * @return Created parameter set. + */ + @Deprecated + public static PamParameterSet autoGenerate(Object parentObject) { + return autoGenerate(parentObject, ParameterSetType.DETECTOR); + } /** * Automatically generate a parameter set for a class. Will include all public fields and * any private or protected fields for which a getter can be found that has a similar enough name diff --git a/src/binaryFileStorage/BinaryOutputStream.java b/src/binaryFileStorage/BinaryOutputStream.java index 1e474686..7797134a 100644 --- a/src/binaryFileStorage/BinaryOutputStream.java +++ b/src/binaryFileStorage/BinaryOutputStream.java @@ -505,7 +505,9 @@ public class BinaryOutputStream { */ public synchronized boolean storeData(DataOutputStream outputStream, int objectId, DataUnitBaseData baseData, BinaryObjectData binaryObjectData) { if (lastObjectType == BinaryTypes.MODULE_FOOTER) { - System.out.printf("Storing binary object type %d in file %s with no module header\n", objectId, outputStream == null ? null : outputStream.toString()); + System.out.printf("Storing binary object at %s from %s in file %s with no module header\n", + PamCalendar.formatDBDateTime(baseData.getTimeMilliseconds()), + parentDataBlock.getDataName(), outputStream == null ? null : outputStream.toString()); } byte[] data = binaryObjectData.getData(); int objectLength = binaryObjectData.getDataLength();