nordic-dev.net/PAMGuard
nordic-dev.net/PAMGuard
2
0
Fork 0
mirror of https://github.com/PAMGuard/PAMGuard.git synced 2024-11-25 08:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore single param call into PamParameterSet.autoGenerate

Browse Source
This commit is contained in:
Douglas Gillespie 2024-02-27 19:09:58 +00:00
parent c36ad2a33a
commit 45b99273fa
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/PamModel/parametermanager/PamParameterSet.java
View File

@ -10,7 +10,6 @@ import java.util.Collection;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.List; import java.util.List;
import binaryFileStorage.BinaryStoreSettings;
/** /**
* Description of the parameters within a class. Primarily holds a list * Description of the parameters within a class. Primarily holds a list
@ -51,6 +50,17 @@ public class PamParameterSet {
hiddenFields = new ArrayList<>(); 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 * 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 * any private or protected fields for which a getter can be found that has a similar enough name

4
src/binaryFileStorage/BinaryOutputStream.java
View File

@ -505,7 +505,9 @@ public class BinaryOutputStream {
*/ */
public synchronized boolean storeData(DataOutputStream outputStream, int objectId, DataUnitBaseData baseData, BinaryObjectData binaryObjectData) { public synchronized boolean storeData(DataOutputStream outputStream, int objectId, DataUnitBaseData baseData, BinaryObjectData binaryObjectData) {
if (lastObjectType == BinaryTypes.MODULE_FOOTER) { 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(); byte[] data = binaryObjectData.getData();
int objectLength = binaryObjectData.getDataLength(); int objectLength = binaryObjectData.getDataLength();