From 255c663af12b2339eda05fe3b04522e1c6577fd6 Mon Sep 17 00:00:00 2001 From: Jamie Mac Date: Mon, 10 Jan 2022 09:58:26 +0000 Subject: [PATCH 1/8] Added fullstop --- .classpath | 2 +- .gitignore | 1 + pom.xml | 6 +++--- src/Acquisition/AcquisitionControl.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.classpath b/.classpath index 43cd7cd5..fe69133f 100644 --- a/.classpath +++ b/.classpath @@ -6,7 +6,7 @@ - + diff --git a/.gitignore b/.gitignore index a1c2a238..c836fce5 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +/target/ diff --git a/pom.xml b/pom.xml index 78063ef3..98f428a9 100644 --- a/pom.xml +++ b/pom.xml @@ -660,11 +660,11 @@ - + diff --git a/src/Acquisition/AcquisitionControl.java b/src/Acquisition/AcquisitionControl.java index afe5defe..8cbce2fe 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 * From 582ea3cbe2c7461a37863476893acfd0765c3799 Mon Sep 17 00:00:00 2001 From: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com> Date: Mon, 10 Jan 2022 10:11:30 +0000 Subject: [PATCH 2/8] Delete .classpath --- .classpath | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 .classpath diff --git a/.classpath b/.classpath deleted file mode 100644 index fe69133f..00000000 --- a/.classpath +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - From bb667b7c3b33252ec86675a04bacd17a4bbfb00a Mon Sep 17 00:00:00 2001 From: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com> Date: Mon, 10 Jan 2022 10:11:54 +0000 Subject: [PATCH 3/8] Delete pom.xml --- pom.xml | 823 -------------------------------------------------------- 1 file changed, 823 deletions(-) delete mode 100644 pom.xml diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 98f428a9..00000000 --- a/pom.xml +++ /dev/null @@ -1,823 +0,0 @@ - - 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.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 From c537dacbd9db4d69fec07ae391bfdd9b34c94e6f Mon Sep 17 00:00:00 2001 From: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com> Date: Mon, 10 Jan 2022 10:12:23 +0000 Subject: [PATCH 4/8] Delete .gitignore --- .gitignore | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c836fce5..00000000 --- a/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -# 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* -/target/ From e70ae9616cb7b51ed6ecff4abc8fbe18633c33f3 Mon Sep 17 00:00:00 2001 From: douggillespie Date: Mon, 10 Jan 2022 10:20:58 +0000 Subject: [PATCH 5/8] Revert "Delete .gitignore" This reverts commit c537dacbd9db4d69fec07ae391bfdd9b34c94e6f. --- .gitignore | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c836fce5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,24 @@ +# 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* +/target/ From aa7e9e452b29011205859952560095a99f44e870 Mon Sep 17 00:00:00 2001 From: douggillespie Date: Mon, 10 Jan 2022 10:21:12 +0000 Subject: [PATCH 6/8] Revert "Delete .classpath" This reverts commit 582ea3cbe2c7461a37863476893acfd0765c3799. --- .classpath | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .classpath diff --git a/.classpath b/.classpath new file mode 100644 index 00000000..fe69133f --- /dev/null +++ b/.classpath @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + From 32dd401dd9c163e630f8940ec54dcb082390f55f Mon Sep 17 00:00:00 2001 From: douggillespie Date: Mon, 10 Jan 2022 10:21:26 +0000 Subject: [PATCH 7/8] Revert "Delete pom.xml" This reverts commit bb667b7c3b33252ec86675a04bacd17a4bbfb00a. --- pom.xml | 823 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 823 insertions(+) create mode 100644 pom.xml diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..98f428a9 --- /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.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 From f03f66782a25079ebc539ca00071aa8b591f16f9 Mon Sep 17 00:00:00 2001 From: douggillespie Date: Mon, 10 Jan 2022 10:24:21 +0000 Subject: [PATCH 8/8] Revert "Added fullstop" This reverts commit 255c663af12b2339eda05fe3b04522e1c6577fd6. --- .classpath | 2 +- .gitignore | 1 - pom.xml | 6 +++--- src/Acquisition/AcquisitionControl.java | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.classpath b/.classpath index fe69133f..43cd7cd5 100644 --- a/.classpath +++ b/.classpath @@ -6,7 +6,7 @@ - + diff --git a/.gitignore b/.gitignore index c836fce5..a1c2a238 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,3 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* -/target/ diff --git a/pom.xml b/pom.xml index 98f428a9..78063ef3 100644 --- a/pom.xml +++ b/pom.xml @@ -660,11 +660,11 @@ - + 42.2.24 + 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 *