updated build.xml
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 10 Jun 2015 15:50:03 +0000 (16:50 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 10 Jun 2015 15:50:03 +0000 (16:50 +0100)
build.xml
src/jalview/io/JSONFile.java

index 0b2a62c..c079df9 100755 (executable)
--- a/build.xml
+++ b/build.xml
   <path id="obfuscateDeps.path">
     <pathelement location="${applet.jre.tools}" />
     <pathelement location="appletlib/${jmolJar}" />
+    <pathelement location="appletlib/${jsonSimple}" />
+    <pathelement location="appletlib/${javaJson}" />
   </path>
   <taskdef resource="proguard/ant/task.properties" classpath="utils/proguard.jar" />
 
index 8882f97..621604c 100644 (file)
@@ -262,8 +262,6 @@ public class JSONFile extends AlignFile
     }
 
     SequenceI[] hiddenSeqs = hiddenSeqsObj.hiddenSequences;
-    System.out.print("Hidden Seqs : ");
-    // if(hiddenSeqs != null){
     StringBuilder hiddenSeqsBuilder = new StringBuilder();
     for (SequenceI hiddenSeq : hiddenSeqs)
     {
@@ -273,12 +271,10 @@ public class JSONFile extends AlignFile
       }
     }
     if (hiddenSeqsBuilder.length() > 0)
-      {
+    {
       hiddenSeqsBuilder.deleteCharAt(0);
-      }
+    }
     hiddenSections[1] = hiddenSeqsBuilder.toString();
-    System.out.println(hiddenSections[1]);
-    // }
 
     return hiddenSections;
   }