Updated x3

updated SUD reader to handle and unexpectedchunkID.
This commit is contained in:
Douglas Gillespie 2023-04-24 12:49:19 +01:00
parent 96d18b85a7
commit 317f87265a
7 changed files with 22 additions and 1 deletions

View File

@ -784,7 +784,7 @@
<dependency> <dependency>
<groupId>pamguard.org</groupId> <groupId>pamguard.org</groupId>
<artifactId>x3</artifactId> <artifactId>x3</artifactId>
<version>2.2.0</version> <version>2.2.1</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/it.sauronsoftware/jave --> <!-- https://mvnrepository.com/artifact/it.sauronsoftware/jave -->

View File

@ -0,0 +1,4 @@
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
#Mon Apr 24 10:32:52 BST 2023
x3-2.2.1.jar>=
x3-2.2.1.pom>=

Binary file not shown.

View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>pamguard.org</groupId>
<artifactId>x3</artifactId>
<version>2.2.1</version>
<description>POM was created from install:install-file</description>
</project>

View File

@ -180,6 +180,7 @@ public abstract class FileListWorker<T extends File> implements PamWorkWrapper<F
T newFile = createFile(moreFiles[i]); T newFile = createFile(moreFiles[i]);
eachFileTask(newFile); eachFileTask(newFile);
newFileList.addFile(newFile); newFileList.addFile(newFile);
Debug.out.println("Adding file " + newFile.getAbsolutePath());
if (i%100 == 0) { if (i%100 == 0) {
sayProgress(pamWorker, newFileList, folder); sayProgress(pamWorker, newFileList, folder);
} }

View File

@ -1086,6 +1086,9 @@ public class ClickControl extends PamControlledUnit implements PamSettings {
} }
public ClickDisplayManager getDisplayManager(){ public ClickDisplayManager getDisplayManager(){
if (tabPanelControl == null) {
return null;
}
return tabPanelControl.clickDisplayManager; return tabPanelControl.clickDisplayManager;
} }

View File

@ -146,6 +146,10 @@ public class STClickControl extends ClickControl {
*/ */
public void updateDisplayScrollers(long timeMillis) { public void updateDisplayScrollers(long timeMillis) {
ClickDisplayManager dispManager = getDisplayManager(); ClickDisplayManager dispManager = getDisplayManager();
if (dispManager == null) {
// happens in -nogui operation.
return;
}
ArrayList<ClickDisplay> dispList = dispManager.getWindowList(); ArrayList<ClickDisplay> dispList = dispManager.getWindowList();
for (ClickDisplay display : dispList) { for (ClickDisplay display : dispList) {
if (display instanceof ClickBTDisplay) { if (display instanceof ClickBTDisplay) {