Commits

Anonymous committed 92586c4

use DicomEdit 3.0.0

  • Participants
  • Parent commits 9640825

Comments (0)

Files changed (2)

     </parent>
 
     <artifactId>UploadAssistant</artifactId>
+    <version>1.6.2-SNAPSHOT</version>
 
     <name>XNAT Upload Assistant</name>
     <description>The XNAT Upload Assistant applet.</description>
         <dependency>
             <groupId>org.nrg</groupId>
             <artifactId>DicomEdit</artifactId>
-            <version>2.2.1</version>
             <exclusions>
                 <exclusion>
                     <artifactId>dcm4che-net</artifactId>

File src/main/java/org/nrg/io/dcm/ZipSeriesUploader.java

 /**
- * Copyright (c) 2010,2011 Washington University
+ * Copyright (c) 2010-2012 Washington University
  */
 package org.nrg.io.dcm;
 
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Set;
-import java.util.SortedSet;
 import java.util.concurrent.Callable;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.ZipEntry;
         return path.replaceAll("\\.[gG][zZ]$", "");
     }
 
-    @SuppressWarnings("unchecked")
     private int getTopTag() {
-        final SortedSet<Integer> tags = Sets.newTreeSet();
-        tags.addAll(applicator.getTags());
-        tags.add(Tag.SOPInstanceUID);   // largest locally required tag: > tags for FMI, SOP Class UID
-        return tags.last();
+        return Math.max(applicator.getTopTag(), Tag.SOPInstanceUID);
     }
 
     private void addFileToZip(final File f, final ZipOutputStream zos, final DicomInputHandler handler)