diff --git a/.classpath b/.classpath new file mode 100644 index 00000000..43cd7cd5 --- /dev/null +++ b/.classpath @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..a1c2a238 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..78063ef3 --- /dev/null +++ b/pom.xml @@ -0,0 +1,823 @@ + + 4.0.0 + org.pamguard + PamguardBeta + 2.02.02 + Pamguard Java12+ + Pamguard for Java 12+, using Maven to control dependcies + www.pamguard.org + + Sea Mammal Research Unit, University of St. Andrews + http://www.smru.st-andrews.ac.uk + + + + + 16 + 11 + 11 + + + + src + + + src + + **/*.java + jars/*.* + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + + + 11 + jdt + + .settings/org.eclipse.jdt.core.prefs + + + + + + + org.eclipse.tycho + tycho-compiler-jdt + 1.5.1 + + + + + + + org.openjfx + javafx-maven-plugin + 0.0.6 + + 16 + 16 + 16 + + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.1 + + + + + + + + package + + shade + + + + + + pamguard.Pamguard + . + Resources/pgBlankSplash.png + + + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + + + com.github.marschall + jdeps-maven-plugin + 0.5.1 + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.1.1 + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/tempDependencies + false + false + true + + + + + + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-dependency-plugin + + + [3.1.1,) + + + + purge-local-repository + + + + + + + + + + + + + + + + + + + com.github.marschall + jdeps-maven-plugin + 0.5.1 + + + + + + + + + + + repo + + true + ignore + + + false + + file://${project.basedir}/repo + + + + + + + false + + central + a0u0ltozdsehx-artifactory-primary-0-releases + https://jmachund.jfrog.io/artifactory/jpam2 + + + + + + false + + unidata-all + Unidata netCDF + https://artifacts.unidata.ucar.edu/repository/unidata-all/ + + + + + + false + + geomajas + geomajas + http://maven.geomajas.org/ + + + + + + false + + bedatadriven + bedatadriven_renjin + https://nexus.bedatadriven.com/content/groups/public/ + + + + + + false + + talan + talan + https://nexus.talanlabs.com/content/repositories/releases/ + + + + + + + + + + + org.jamdev + jpamutils + 0.0.55 + + + + + org.jamdev + jdl4pam + 0.0.91 + + + + + gov.nist.math + jama + 1.0.3 + + + + + + org.openjfx + javafx-controls + ${javafx.version} + + + + + + org.openjfx + javafx-swing + ${javafx.version} + + + + + + org.openjfx + javafx-media + ${javafx.version} + + + + + + org.openjfx + javafx-web + ${javafx.version} + + + + + org.apache.commons + commons-compress + 1.19 + + + + + org.apache.commons + commons-csv + 1.7 + + + + + commons-io + commons-io + 2.6 + + + + + org.apache.commons + commons-lang3 + 3.9 + + + + + org.apache.commons + commons-math3 + 3.6.1 + + + + + org.apache.commons + commons-math + 2.2 + + + + + commons-net + commons-net + 3.6 + + + + + org.controlsfx + controlsfx + 11.0.0 + + + org.openjfx + javafx-base + + + org.openjfx + javafx-controls + + + org.openjfx + javafx-graphics + + + org.openjfx + javafx-media + + + org.openjfx + javafx-web + + + + + + + + org.kordamp.ikonli + ikonli-javafx + 12.2.0 + + + + + + + + org.kordamp.ikonli + ikonli-materialdesign2-pack + 12.2.0 + + + + + net.sf.geographiclib + GeographicLib-Java + 1.50 + + + + + org.jogamp.gluegen + gluegen-rt-main + 2.3.2 + + + + + + + + + com.healthmarketscience.jackcess + jackcess + 3.0.1 + + + + + com.fasterxml.jackson.core + jackson-databind + 2.10.1 + + + + + org.jogamp.jogl + jogl-all-main + 2.3.2 + + + + + + + org.jflac + jflac-codec + 1.5.2 + + + + + javax.help + javahelp + 2.0.05 + + + + + net.java.dev.jna + jna + 5.5.0 + + + + + net.java.dev.jna + jna-platform + 5.5.0 + + + + + com.jcraft + jsch + 0.1.55 + + + + + com.fazecast + jSerialComm + 2.5.3 + + + + + edu.emory.mathcs + JTransforms + 2.4 + + + + + com.sun.mail + javax.mail + 1.6.2 + + + + + com.diffplug.matsim + matfilerw + 3.1.1 + + + + + com.drewnoakes + metadata-extractor + 2.12.0 + + + + + mysql + mysql-connector-java + 8.0.18 + + + + + + + com.google.protobuf + protobuf-java + 3.17.0 + + + + + + edu.ucar + netcdfAll + 4.6.14 + + + com.google.protobuf + protobuf-java + + + com.google.protobuf + protobuf-java-util + + + compile + + + + + com.opencsv + opencsv + 5.0 + + + + + + + org.postgresql + postgresql + 42.2.24 + + + + + org.renjin + renjin-script-engine + 0.9.2725 + + + + + org.slf4j + slf4j-api + 1.8.0-beta4 + + + + + + + org.slf4j + slf4j-nop + 1.8.0-beta4 + + + + + + + + + org.docx4j + docx4j-JAXB-ReferenceImpl + 11.1.3 + + + + + + org.xerial + sqlite-jdbc + 3.28.0 + + + + + net.sf.ucanaccess + ucanaccess + 4.0.4 + + + + + nz.ac.waikato.cms.weka + weka-dev + 3.7.7 + + + + + javax.vecmath + vecmath + 1.5.2 + + + + + + + + + pamguard.org + x3 + 2.0.0 + + + + + it.sauronsoftware + jave + 1.0.2 + + + + + com.synthbot + jasiohost + 1.0.0 + + + + + + + + org.springframework + spring-core + 5.2.3.RELEASE + + + + + + com.1stleg + jnativehook + 2.1.0 + + + + + + org.swinglabs.swingx + swingx-all + 1.6.5-1 + + + + + \ No newline at end of file diff --git a/src/Acquisition/AcquisitionControl.java b/src/Acquisition/AcquisitionControl.java index 8cbce2fe..afe5defe 100644 --- a/src/Acquisition/AcquisitionControl.java +++ b/src/Acquisition/AcquisitionControl.java @@ -88,7 +88,7 @@ import PamguardMVC.dataOffline.OfflineDataLoadInfo; * NI cards (via UDP), files, directories of files, etc. *

* Uses a plug in architecture to allow new types to be added. This - * is done through RegisterDaqType(). + * is done through RegisterDaqType() * * @author Doug Gillespie *