Commits

Rick Herrick committed 8aa7962 Merge

Updated to 1.6.2-SNAPSHOT. Updated DicomEdit dependency to 3.0.0.

Comments (0)

Files changed (3)

UploadAssistant.iml

       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/test-annotations" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/target/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/target/dependency" />
-      <excludeFolder url="file://$MODULE_DIR$/target/javadoc-bundle-options" />
-      <excludeFolder url="file://$MODULE_DIR$/target/jnlp" />
-      <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.nrg:DicomEdit:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.nrg:framework:1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:3.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.nrg:DicomUtils:1.2.0" level="project" />
+    <orderEntry type="module" module-name="framework" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:3.0.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.0.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:3.0.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:3.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.0.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:3.0.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.0.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:3.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.2.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.8.5" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.8.11" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.8.11" level="project" />
     <orderEntry type="library" name="Maven: org.restlet:org.restlet:1.1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.nrg:DicomEdit:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.nrg:DicomEdit:2.2.2" level="project" />
     <orderEntry type="library" name="Maven: dcm4che:dcm4che-core:2.0.25" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.6" level="project" />
     <orderEntry type="library" name="Maven: org.json:json:20080701" level="project" />
     <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:12.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.nrg:DicomUtils:1.2.0" level="project" />
+    <orderEntry type="module" module-name="DicomUtils" />
     <orderEntry type="library" name="Maven: com.fasterxml.uuid:java-uuid-generator:3.1.3" level="project" />
     <orderEntry type="library" name="Maven: org.nrg:ecat-io:0.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.nrg:ecat-edit:0.1.2" level="project" />
     <orderEntry type="library" name="Maven: com.jgoodies:common:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.jgoodies:looks:2.4.1" level="project" />
     <orderEntry type="library" name="Maven: org.swinglabs:wizard:1.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.5" level="project" />
     <orderEntry type="library" name="Maven: netscape:javascript:1.5.0" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-log4j12:1.6.6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.1" level="project" />
     <parent>
         <groupId>org.nrg</groupId>
         <artifactId>nrg</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2-SNAPSHOT</version>
         <relativePath>../nrg/pom.xml</relativePath>
     </parent>
 
     <artifactId>UploadAssistant</artifactId>
-
-    <name>XNAT Upload Assistant</name>
+        <name>XNAT Upload Assistant</name>
     <description>The XNAT Upload Assistant applet.</description>
 
     <url>http://www.xnat.org</url>
         <dependency>
             <groupId>org.nrg</groupId>
             <artifactId>DicomEdit</artifactId>
-            <version>2.2.1</version>
             <exclusions>
                 <exclusion>
                     <artifactId>dcm4che-net</artifactId>
         <dependency>
             <groupId>org.nrg</groupId>
             <artifactId>DicomUtils</artifactId>
-            <version>1.2.0</version>
             <exclusions>
                 <exclusion>
                     <artifactId>dcm4che-net</artifactId>

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)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.