Changeset 2468

Timestamp:

03/17/08 00:15:00 (9 months ago)

Author:

kmaclean

Message:

SpeechSubmission refactor to use array for prompt list - snapshot

Files:

• Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/CapturePlayback.java (modified) (65 diffs)

Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/CapturePlayback.java

@@ -62 +62 @@
-// !!!!!!
-import speechrecorder.MultiLineLabel;
-// !!!!!!
-
-/**
@@ -87 +86 @@
-    AudioInputStream audioInputStream;
-    SamplingGraph samplingGraph;
-
+
+
+
+
+
-    JButton play1;
-    JButton capt1;
@@ -108 +111 @@
-    JButton play10;
-    JButton capt10;
+ !!!!!! */       
+    
-    JButton uploadB;
-    JButton moreInfoB;    
-    JButton aboutB; 
-
+
+
+
+
+
-    boolean play1_state;
-    boolean capt1_state;
@@ -132 +141 @@
-    boolean play10_state;
-    boolean capt10_state;
-   
+!!!!!! */
-    License licenseObject = new License();
-    String license = licenseObject.getLicense();
@@ -142 +151 @@
-    String errStr;
-
+    // !!!!!!
+    double [] durationA= new double [numberofPrompts];
-    double duration = 0;
+/*
-    double duration1 = 0;
-    double duration2 = 0;
@@ -152 +164 @@
-    double duration8 = 0;
-    double duration9 = 0;  
-   
-
+
+
-    double seconds;
+    // !!!!!!
+    long [] totalBytesWrittenA= new long [numberofPrompts];
-    long totalBytesWritten = 0L;
+    /*
-    long totalBytesWritten1 = 0L;
-    long totalBytesWritten2 = 0L;
@@ -166 +181 @@
-    long totalBytesWritten9 = 0L;
-    long totalBytesWritten10 = 0L;
+        !!!!!! */    
+    
-    File file;
-    Vector lines = new Vector();
-  
-    private File wavFile;
-
+
+
+
-    private File wavFile1;
-    private File wavFile2;
@@ -180 +199 @@
-    private File wavFile8;
-    private File wavFile9;
-
+
+
+
+
-    private File uploadWavFile1;
-    private File uploadWavFile2;
@@ -191 +213 @@
-    private File uploadWavFile9;
-    private File uploadWavFile10;  
+    !!!!!! */      
-    private File promptsFile;  
-    private File readmeFile;    
@@ -203 +226 @@
-    JTextField subjectBox;
-    String subject;
-
-
-
-
-
+
+
+
-    String prompt1;
-    String prompt2;
@@ -218 +239 @@
-    String prompt9;
-    String prompt10;  
+    !!!!!! */
+    // !!!!!!
+    String [] promptidA = new String [numberofPrompts];;
+    /*
-    String promptID1;
-    String promptID2;
@@ -228 +253 @@
-    String promptID9;
-    String promptID10;  
-
+
+
-    String fileFieldName = "userfile"; 
-// !!!!!!    
-//  ############ Localized Fields ####################################   
-    JTextField usernameTextField;  
@@ -296 +321 @@
-//  ############ Localized Fields ####################################   
-        //this.language = language;
-
-//
+//
+
-        // debug System.err.println("CapturePlayback Language:" + this.language + ":");
-
@@ -347 +372 @@
-    uploadCompletedMessageLabel = labels.getUploadCompletedMessageLabel();
-//  ############ Localized Fields ####################################  
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        this.prompt1 = promptArray[1][0];
-                this.promptID2 = promptArray[0][1];
@@ -370 +404 @@
-                this.prompt9 = promptArray[1][8];
-                this.promptID10 = promptArray[0][9];
-
-
+
+
+
-
-//        this.language = language;
@@ -381 +416 @@
-        capturePlayback = this;
-
-a single WAV file that will hold our
+WAV files to hold
-                try {
+                        // !!!!!!
+                for (int i = 0; i < numberofPrompts; i++) {
+                        wavFileA [i] = new File(tempdir + "wavFile" + i + ".wav");
+                        wavFileA[i].deleteOnExit();
+                }
+                /*
-                        wavFile1 = new File(tempdir + "wavFile1.wav");
-                        wavFile1.deleteOnExit();
@@ -403 +444 @@
-                        wavFile10 = new File(tempdir + "wavFile10.wav");
-                        wavFile10.deleteOnExit();
-
+
+
+
+
+
+
-                        uploadWavFile1 = new File(tempdir + this.promptID1 + ".wav");
-                        uploadWavFile1.deleteOnExit();
@@ -423 +469 @@
-                        uploadWavFile9.deleteOnExit();
-                        uploadWavFile10 = new File(tempdir + this.promptID10 + ".wav");
-
+
+
-                        promptsFile = new File(tempdir + "prompts.txt");                        
-                        promptsFile.deleteOnExit();             
@@ -436 +483 @@
-                        return;
-                }
+                // !!!!!!
+        for (int i = 0; i < numberofPrompts; i++) {                     
+                System.err.println("CapturePlayback's WAV file for recording uploadWavFile" + i + "is:" + uploadWavFileA[i]);
+        }
+                /*
-                System.err.println("CapturePlayback's WAV file for recording uploadWavFile1 is:" + uploadWavFile1);
-                System.err.println("CapturePlayback's WAV file for recording uploadWavFile2 is:" + uploadWavFile2);
@@ -447 +499 @@
-                System.err.println("CapturePlayback's WAV file for recording uploadWavFile10 is:" + uploadWavFile10);           
-                System.err.println("---------------------------------------------------------------------------");              
-
+
-                setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
-        EmptyBorder eb = new EmptyBorder(5,5,5,5);
@@ -519 +571 @@
-        Color voxforgeColour    = new Color(197, 216, 234);
-        prompts.setBorder(BorderFactory.createLineBorder (voxforgeColour, 3));
-//             ############ Prompts ####################################     
+
-        int maxWidth = 40;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        JPanel prompt1Panel = new JPanel(); 
-
-
+      
+ 
-        prompt1InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1));
-
-
-
-
+
-        prompt1Panel.add(prompt1InnerPanel);
-        play1 = addButton(playButton, prompt1Panel, false);
-
-
-
+
+
-//              ############ Prompt2 ####################################            
-        JPanel prompt2Panel = new JPanel(); 
@@ -540 +607 @@
-        JPanel prompt2InnerPanel = new JPanel(); 
-        prompt2InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1));
-        // !!!!!!
-        //prompt2InnerPanel.add(new JLabel(this.prompt2));
-        prompt2InnerPanel.add(new MultiLineLabel(prompt2Panel, this.prompt2, maxWidth));
-        // !!!!!!
-        prompt2Panel.add(prompt2InnerPanel);
-        play2 = addButton(playButton, prompt2Panel, false);
@@ -553 +617 @@
-        JPanel prompt3InnerPanel = new JPanel(); 
-        prompt3InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1));
-        // !!!!!!
-        //prompt3InnerPanel.add(new JLabel(this.prompt3));
-        prompt3InnerPanel.add(new MultiLineLabel(prompt3Panel, this.prompt3, maxWidth));
-        // !!!!!!
-        prompt3Panel.add(prompt3InnerPanel);
-        play3 = addButton(playButton, prompt3Panel, false);
@@ -566 +627 @@
-        JPanel prompt4InnerPanel = new JPanel(); 
-        prompt4InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1));
-        // !!!!!!
-        //prompt4InnerPanel.add(new JLabel(this.prompt4));
-        prompt4InnerPanel.add(new MultiLineLabel(prompt4Panel, this.prompt4, maxWidth));
-        // !!!!!!
-        prompt4Panel.add(prompt4InnerPanel);     
-        play4 = addButton(playButton, prompt4Panel, false);
@@ -579 +637 @@
-        JPanel prompt5InnerPanel = new JPanel(); 
-        prompt5InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1));
-        // !!!!!!
-        //prompt5InnerPanel.add(new JLabel(this.prompt5));
-        prompt5InnerPanel.add(new MultiLineLabel(prompt5Panel, this.prompt5, maxWidth));
-        // !!!!!!        
-        prompt5Panel.add(prompt5InnerPanel);
-        play5 = addButton(playButton, prompt5Panel, false);
@@ -592 +647 @@
-        JPanel prompt6InnerPanel = new JPanel();
-        prompt6InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1));
-        // !!!!!!
-        //prompt6InnerPanel.add(new JLabel(this.prompt6));
-        prompt6InnerPanel.add(new MultiLineLabel(prompt6Panel, this.prompt6, maxWidth));
-        // !!!!!!  
-        prompt6Panel.add(prompt6InnerPanel);
-        play6 = addButton(playButton, prompt6Panel, false);
@@ -606 +658 @@
-        JPanel prompt7InnerPanel = new JPanel(); 
-        prompt7InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1));
-        // !!!!!!
-        //prompt7InnerPanel.add(new JLabel(this.prompt7));
-        prompt7InnerPanel.add(new MultiLineLabel(prompt7Panel, this.prompt7, maxWidth));
-        // !!!!!!  
-        prompt7Panel.add(prompt7InnerPanel);
-        play7 = addButton(playButton, prompt7Panel, false);
@@ -619 +668 @@
-        JPanel prompt8InnerPanel = new JPanel(); 
-        prompt8InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1));
-        // !!!!!!
-        //prompt8InnerPanel.add(new JLabel(this.prompt8));
-        prompt8InnerPanel.add(new MultiLineLabel(prompt8Panel, this.prompt8, maxWidth));
-        // !!!!!!  
-        prompt8Panel.add(prompt8InnerPanel);
-        play8 = addButton(playButton, prompt8Panel, false);
@@ -632 +678 @@
-        JPanel prompt9InnerPanel = new JPanel(); 
-        prompt9InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1));
-        // !!!!!!
-        //prompt9InnerPanel.add(new JLabel(this.prompt9));
-        prompt9InnerPanel.add(new MultiLineLabel(prompt9Panel, this.prompt9, maxWidth));
-        // !!!!!!  
-        prompt9Panel.add(prompt9InnerPanel);     
-        play9 = addButton(playButton, prompt9Panel, false);
@@ -645 +688 @@
-        JPanel prompt10InnerPanel = new JPanel(); 
-        prompt10InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1));
-        // !!!!!!
-        //prompt10InnerPanel.add(new JLabel(this.prompt10));
-        prompt10InnerPanel.add(new MultiLineLabel(prompt10Panel, this.prompt10, maxWidth));
-        // !!!!!!  
-        prompt10Panel.add(prompt10InnerPanel);
-        play10 = addButton(playButton, prompt10Panel, false);
@@ -658 +698 @@
-        promptsContainer.add(prompts);
-        p2.add(promptsContainer);
+        */
-//      ############ Sampling Graph ####################################          
-        JPanel samplingPanel = new JPanel(new BorderLayout());
@@ -717 +758 @@
-    public void close() {
-        if (playback.thread != null) {
+                // !!!!!!
+            for (int i = 0; i < numberofPrompts; i++) {
+                playA[i].doClick(0);
+            }
+            /*
-            play1.doClick(0);
-            play2.doClick(0);
@@ -727 +773 @@
-            play9.doClick(0);
-            play10.doClick(0);
+            !!!!!! */
-        }
-        if (capture.thread != null) {
-
+
+
+
+
+
-            capt1.doClick(0); 
-            capt2.doClick(0);
@@ -740 +791 @@
-            capt9.doClick(0);   
-            capt10.doClick(0);
+            !!!!!! */
-        }
-    }
@@ -751 +803 @@
-    
-    private void setButtonsOff() {
+        // !!!!!!
+        for (int i = 0; i < numberofPrompts; i++) {
+                playA[i].setEnabled(false); 
+                captA[i].setEnabled(false); 
+        }
+        /*
-        play1.setEnabled(false); 
-        capt1.setEnabled(false); 
@@ -771 +829 @@
-        play10.setEnabled(false); 
-        capt10.setEnabled(false); 
+        !!!!!! */
-    }
-    
-    private void saveButtonState() {
+        // !!!!!!
+        for (int i = 0; i < numberofPrompts; i++) {
+                playA[i].setEnabled(false); 
+                if (playA[i].isEnabled()) {play_stateA [i] = true;} else {play_stateA [i] = false;}
+                if (captA[i].isEnabled()) {capt_stateA [i] = true;} else {capt_stateA [i] = false;}
+        }
+        /*
-        if (play1.isEnabled()) {play1_state = true;} else {play1_state = false;}
-        if (play2.isEnabled()) {play2_state = true;} else {play2_state = false;}  
@@ -793 +859 @@
-        if (capt8.isEnabled()) {capt8_state = true;} else {capt8_state = false;}        
-        if (capt9.isEnabled()) {capt9_state = true;} else {capt9_state = false;}
-
+
+
-    }
-    
-    private void restoreButtonState() {
+        // !!!!!!
+        for (int i = 0; i < numberofPrompts; i++) {
+                playA[i].setEnabled(false); 
+                if (play_stateA[i]) {playA[i].setEnabled(true);} else {playA[i].setEnabled(false);}
+                if (capt_stateA[i]) {captA[i].setEnabled(true);} else {captA[i].setEnabled(false);}
+        }
+        /*
-        if (play1_state) {play1.setEnabled(true);} else {play1.setEnabled(false);}
-        if (play2_state) {play2.setEnabled(true);} else {play2.setEnabled(false);}
@@ -816 +890 @@
-        if (capt8_state) {capt8.setEnabled(true);} else {capt8.setEnabled(false);}
-        if (capt9_state) {capt9.setEnabled(true);} else {capt9.setEnabled(false);}
-
+
+
-    }
-
@@ -822 +897 @@
-        Object obj = e.getSource();
-         
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-       if (obj.equals(play1)) {
-            if (play1.getText().startsWith(playButton)) {
@@ -1013 +1148 @@
-            }
-        }           
-
+
+
-      else if (obj.equals(capt1)) {
-        if (capt1.getText().startsWith(recordButton)) {
@@ -1031 +1167 @@
-            lines.removeAllElements();  
-            capture.stop();
-            // !!!!!!
-            // duration1 = duration; // !!!!!!
-            totalBytesWritten1 = totalBytesWritten; // !!!!!!
-                duration1 = totalBytesWritten / (double) (format.getSampleRate() * format.getSampleSizeInBits()/ 8);
-                System.err.println("duration1:" + duration1);
-            // !!!!!!
-                samplingGraph.stop();
-            restoreButtonState(); 
@@ -1063 +1196 @@
-              lines.removeAllElements();  
-              capture.stop();
-              // !!!!!!
-              // duration2 = duration; // !!!!!!
-              totalBytesWritten2 = totalBytesWritten; // !!!!!!
-              duration2 = totalBytesWritten / (double) (format.getSampleRate() * format.getSampleSizeInBits()/ 8);
-              System.err.println("duration2:" + duration2);
-              // !!!!!!
-              samplingGraph.stop();
-              restoreButtonState(); 
@@ -1095 +1225 @@
-              lines.removeAllElements();  
-              capture.stop();
-              // !!!!!!
-              // duration3 = duration; // !!!!!!
-              totalBytesWritten3 = totalBytesWritten; // !!!!!!
-              duration3 = totalBytesWritten / (double) (format.getSampleRate() * format.getSampleSizeInBits()/ 8);
-              System.err.println("duration3:" + duration3);
-              // !!!!!!
-              samplingGraph.stop();
-              restoreButtonState(); 
@@ -1127 +1254 @@
-              lines.removeAllElements();  
-              capture.stop();
-              // !!!!!!
-              // duration4 = duration; // !!!!!!
-              totalBytesWritten4 = totalBytesWritten; // !!!!!!
-              duration4 = totalBytesWritten / (double) (format.getSampleRate() * format.getSampleSizeInBits()/ 8);
-              samplingGraph.stop();
-                  System.err.println("duration4:" + duration4);
-              // !!!!!!
-              restoreButtonState(); 
-              play4.setEnabled(true);
@@ -1159 +1283 @@
-              lines.removeAllElements();  
-              capture.stop();
-              // !!!!!!
-              // duration5 = duration; // !!!!!!
-              totalBytesWritten5 = totalBytesWritten; // !!!!!!
-              duration5 = totalBytesWritten / (double) (format.getSampleRate() * format.getSampleSizeInBits()/ 8);
-                  System.err.println("duration5:" + duration5);
-              // !!!!!!
-              samplingGraph.stop();
-              restoreButtonState(); 
@@ -1191 +1312 @@
-              lines.removeAllElements();  
-              capture.stop();
-              // !!!!!!
-              // duration6 = duration; // !!!!!!
-              totalBytesWritten6 = totalBytesWritten; // !!!!!!       
-              duration6 = totalBytesWritten / (double) (format.getSampleRate() * format.getSampleSizeInBits()/ 8);
-              System.err.println("duration6:" + duration6);
-              // !!!!!!
-              samplingGraph.stop();
-              restoreButtonState(); 
@@ -1223 +1341 @@
-                lines.removeAllElements();  
-                capture.stop();
-                // !!!!!!
-                // duration7 = duration; // !!!!!!
-                totalBytesWritten7 = totalBytesWritten; // !!!!!!
-                duration7 = totalBytesWritten / (double) (format.getSampleRate() * format.getSampleSizeInBits()/ 8);
-                System.err.println("duration7:" + duration7);
-                // !!!!!!
-                samplingGraph.stop();
-                restoreButtonState(); 
@@ -1255 +1370 @@
-                lines.removeAllElements();  
-                capture.stop();
-                // !!!!!!
-                // duration8 = duration; // !!!!!!
-                totalBytesWritten8 = totalBytesWritten; // !!!!!!
-                duration8 = totalBytesWritten / (double) (format.getSampleRate() * format.getSampleSizeInBits()/ 8);
-                System.err.println("duration8:" + duration8);
-                // !!!!!!
-                samplingGraph.stop();
-                restoreButtonState(); 
@@ -1287 +1399 @@
-                lines.removeAllElements();  
-                capture.stop();
-                // !!!!!!
-                // duration9 = duration; // !!!!!!
-                totalBytesWritten9 = totalBytesWritten; // !!!!!!
-                duration9 = totalBytesWritten / (double) (format.getSampleRate() * format.getSampleSizeInBits()/ 8);
-                System.err.println("duration9:" + duration9);
-                // !!!!!!
-                samplingGraph.stop();
-                restoreButtonState(); 
@@ -1319 +1428 @@
-                lines.removeAllElements();  
-                capture.stop();
-                // !!!!!!
-                // duration10 = duration; // !!!!!!
-                totalBytesWritten10 = totalBytesWritten; // !!!!!!
-                duration10 = totalBytesWritten / (double) (format.getSampleRate() * format.getSampleSizeInBits()/ 8);
-                System.err.println("duration10:" + duration10);
-                // !!!!!!
-                samplingGraph.stop();
-                restoreButtonState(); 
@@ -1334 +1440 @@
-            }
-          }  
+          !!!!!! */
-//          ################### Upload #######################################               
-        else if (obj.equals(uploadB)) {
+                //!!!!!!
+                for (int i = 0; i < numberofPrompts; i++) {
+                        playA[i].setEnabled(false);
+                    captA[i].setEnabled(false);
+                }
+                /*
-               play1.setEnabled(false);
-               capt1.setEnabled(false);
@@ -1356 +1469 @@
-               play10.setEnabled(false);
-               capt10.setEnabled(false);   
-  
+!!!!!! */
-               uploadB.setEnabled(false);               
-                try {
@@ -1517 +1630 @@
-                thread = null;
-                samplingGraph.stop();
+                // !!!!!!
+                for (int i = 0; i < numberofPrompts; i++) {
+                        if (playA[i].getText().startsWith(stopButton)) { //play button gets set to "Stop" after play is pressed
+                                captA[i].setEnabled(true); 
+                        }
+                }
+                /*
-              if (play1.getText().startsWith(stopButton)) { //play button gets set to "Stop" after play is pressed
-                  capt1.setEnabled(true); 
@@ -1538 +1658 @@
-                  capt10.setEnabled(true); 
-              }
+              !!!!!!! */
+              // !!!!!!
+              for (int i = 0; i < numberofPrompts; i++) {
+                  playA[i].setText(playButton);
+              }
+              /*
-              play1.setText(playButton);
-              play2.setText(playButton);
@@ -1547 +1673 @@
-              play8.setText(playButton);
-              play9.setText(playButton);
-
+
+
-            } 
-        }
-
-        public void run() {
-            // reload the file if loaded by file
-   /* !!!!!!        if (file != null) {
-                createAudioInputStream(file, false);
-                // !!!!!!
-                        System.err.println("playback ...createAudioInputStream file:" + file);
-                // !!!!!!
-            }
-
-            // make sure we have something to play
-            if (audioInputStream == null) {
-                shutDown("No loaded audio to play back");
-                return;
-            }
-  !!!!!! */
-            // reset to the beginning of the stream
-
-/*            try {
-                audioInputStream.reset();
-            } catch (Exception e) {
-                shutDown("Unable to reset the stream\n" + e);
-                return;
-            }
-*/
-            // debug System.err.println("calling getAudioInputStream from Playback");
-                        getAudioInputStream();
-
@@ -1817 +1920 @@
-        
-                duration = totalBytesWritten / (double) (format.getSampleRate() * format.getSampleSizeInBits()/ 8);
-            // !!!!!!
-                System.err.println("capture duration:" + duration);
-            // !!!!!!
-                // debug        System.err.println("Calculated duration");
-            samplingGraph.createWaveForm(audioBytes);
@@ -1871 +1972 @@
-            thread = new Thread(this);
-            thread.setName("ConvertAndUpload");
-                // !!!!!!
-                System.err.println("=== Upload ===");
-                // !!!!!!
-            thread.start();
-        }
@@ -1885 +1984 @@
-            progBar.setStringPainted(true);
-            progBar.setMaximum(100);
-            // !!!!!!
-            //progBar.setString("Uploading...");
-            progBar.setString(uploadingMessageLabel);
-            // !!!!!!
-            progBar.setIndeterminate(false);
-            progBar.setMinimum(0);
@@ -1900 +1996 @@
-                        
-                        File[] files = new File[15];
-
+
+
+
+
+
+
-                        files[1] = uploadWavFile1;
-                        files[2] = uploadWavFile2;
@@ -1911 +2012 @@
-                        files[9] = uploadWavFile9;
-                        files[10] = uploadWavFile10;
+                        !!!!!! */
-                        //############ prompt files #################################### 
-                        try {
-                                BufferedWriter out_prompts = new BufferedWriter(new FileWriter(promptsFile));
+                                // !!!!!!
+                        for (int i = 0; i < numberofPrompts; i++) {
+                                        out_prompts.write(promptidA[i] + " " + promptA[i] + System.getProperty("line.separator"));
+                        }
+                        /*
-                                out_prompts.write(promptID1 + " " + prompt1 + System.getProperty("line.separator"));
-                                out_prompts.write(promptID2 + " " + prompt2 + System.getProperty("line.separator"));
@@ -1923 +2030 @@
-                                out_prompts.write(promptID8 + " " + prompt8 + System.getProperty("line.separator"));
-                                out_prompts.write(promptID9 + " " + prompt9 + System.getProperty("line.separator"));
-
+
+
-                            out_prompts.close();
-                        } catch (IOException e) {
@@ -1931 +2039 @@
-                        //############ ReadMe file#################################### 
-                        try {
-                                // !!!!!!
-                                BufferedWriter out_readme = new BufferedWriter(new FileWriter(readmeFile));
-
-
-
-
-
-
+
-                                out_readme.write("User Name:" + userName + System.getProperty("line.separator"));
-                                out_readme.write(System.getProperty("line.separator")); 
@@ -1975 +2077 @@
-                        try {
-                                Calendar cal = Calendar.getInstance();
-
+//
-                                BufferedWriter out_licenseNoticeFile = new BufferedWriter(new FileWriter(licenseNoticeFile));
-                                String licenseNotice = "Copyright " + cal.get(Calendar.YEAR) + " " + copyrightName + System.getProperty("line.separator") 
@@ -2232 +2334 @@
-                g2.setColor(Color.black);
-                g2.setFont(font12);
-                // !!!!!!
-                //g2.drawString("Length: " + String.valueOf(seconds), 3, h-4);
-                g2.drawString(sampleGraphLengthLabel + String.valueOf(seconds), 3, h-4);
-                // !!!!!!
-            } else {
-                g2.setColor(Color.black);
@@ -2315 +2414 @@
-