diff --git a/pom.xml b/pom.xml index 7e0180a..b4040c6 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ weasis-dicom-tools jar Weasis DICOM API (based on dcm4che3) - 5.29.0.2 + 5.29.2 11 [${java-version},) [3.0.5,) - 5.29.0 + 5.29.2 UTF-8 UTF-8 weasis-dicom-tools @@ -40,13 +40,6 @@ https://github.com/nroduit/weasis-dicom-tools - - - github - GitHub Weasis Maven Packages - https://maven.pkg.github.com/nroduit/weasis-dicom-tools - - central @@ -423,7 +416,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.23.0 + 2.35.0 diff --git a/src/main/java/org/dcm4che3/tool/storescp/StoreSCP.java b/src/main/java/org/dcm4che3/tool/storescp/StoreSCP.java index 0ca297b..c253dbb 100644 --- a/src/main/java/org/dcm4che3/tool/storescp/StoreSCP.java +++ b/src/main/java/org/dcm4che3/tool/storescp/StoreSCP.java @@ -266,4 +266,12 @@ public Connection getConnection() { public Device getDevice() { return device; } + + public File getStorageDir() { + return storageDir; + } + + public DicomProgress getProgress() { + return progress; + } } diff --git a/src/test/java/org/dcm4che3/img/util/DicomObjectUtilTest.java b/src/test/java/org/dcm4che3/img/util/DicomObjectUtilTest.java index b1ee4b5..40bbd01 100644 --- a/src/test/java/org/dcm4che3/img/util/DicomObjectUtilTest.java +++ b/src/test/java/org/dcm4che3/img/util/DicomObjectUtilTest.java @@ -81,10 +81,10 @@ public void testIsImageFrameApplicableToReferencedImageSequence() { assertFalse( DicomObjectUtil.isImageFrameApplicableToReferencedImageSequence( - new ArrayList(), Tag.ReferencedFrameNumber, "1.2.3.4.5.1.1", 1, true)); + new ArrayList<>(), Tag.ReferencedFrameNumber, "1.2.3.4.5.1.1", 1, true)); assertFalse( DicomObjectUtil.isImageFrameApplicableToReferencedImageSequence( - new ArrayList(), Tag.ReferencedFrameNumber, "", 3, true)); + new ArrayList<>(), Tag.ReferencedFrameNumber, "", 3, true)); // Accept all when no reference assertTrue(