mirror of
https://github.com/PAMGuard/PAMGuard.git
synced 2024-11-22 07:02:29 +00:00
V 2.02.10ad for testing
Fixed issue of finding correct raw data block
This commit is contained in:
parent
6110ddb9d1
commit
f115e1248e
2
pom.xml
2
pom.xml
@ -5,7 +5,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.pamguard</groupId>
|
<groupId>org.pamguard</groupId>
|
||||||
<artifactId>Pamguard</artifactId>
|
<artifactId>Pamguard</artifactId>
|
||||||
<version>2.02.10ac</version>
|
<version>2.02.10ad</version>
|
||||||
<name>Pamguard Java12+</name>
|
<name>Pamguard Java12+</name>
|
||||||
<description>Pamguard for Java 12+, using Maven to control dependcies</description>
|
<description>Pamguard for Java 12+, using Maven to control dependcies</description>
|
||||||
<url>www.pamguard.org</url>
|
<url>www.pamguard.org</url>
|
||||||
|
@ -184,6 +184,23 @@ public class PamConfiguration {
|
|||||||
return dataBlock;
|
return dataBlock;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return tryShortName(blockType, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* For backwards compatibility, some blocks may still use the short name.
|
||||||
|
* @param blockType
|
||||||
|
* @param name
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private PamDataBlock tryShortName(Class blockType, String name) {
|
||||||
|
if (name == null) return null;
|
||||||
|
ArrayList<PamDataBlock> blocks = getDataBlocks(blockType, true);
|
||||||
|
for (PamDataBlock dataBlock:blocks) {
|
||||||
|
if (name.equals(dataBlock.getDataName())) { // check for a long name match first
|
||||||
|
return dataBlock;
|
||||||
|
}
|
||||||
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -31,12 +31,12 @@ public class PamguardVersionInfo {
|
|||||||
* Version number, major version.minorversion.sub-release.
|
* Version number, major version.minorversion.sub-release.
|
||||||
* Note: can't go higher than sub-release 'f'
|
* Note: can't go higher than sub-release 'f'
|
||||||
*/
|
*/
|
||||||
static public final String version = "2.02.10ac";
|
static public final String version = "2.02.10ad";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Release date
|
* Release date
|
||||||
*/
|
*/
|
||||||
static public final String date = "7 March 2024";
|
static public final String date = "13 March 2024";
|
||||||
|
|
||||||
// /**
|
// /**
|
||||||
// * Release type - Beta or Core
|
// * Release type - Beta or Core
|
||||||
|
Loading…
Reference in New Issue
Block a user