Changeset 8821

Timestamp:

2004-12-15T17:12:49+13:00 (19 years ago)

Author:

mdewsnip

Message:

Fix to deprecated function call and wrong option dialog type, by Matthew Whyte.

File:

• trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -43 +43 @@
 import java.io.PrintStream;
 import java.io.FileInputStream;
+import java.io.BufferedReader;
 import java.io.FileOutputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
 import java.util.*;
 import javax.swing.*;
@@ -603 +606 @@
         if(atLeastOneSetChanged == true) {
             
-            int result = JOptionPane.showOptionDialog(self, Dictionary.get("GEMS.Menu.Confirm_Exit_Save", Dictionary.get("GEMS.Element")), Dictionary.get("GEMS.Menu.Confirm_Exit_Save_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
+            int result = JOptionPane.showConfirmDialog(self, Dictionary.get("GEMS.Menu.Confirm_Exit_Save", Dictionary.get("GEMS.Element")), Dictionary.get("GEMS.Menu.Confirm_Exit_Save_Title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); //, null, dialog_options, dialog_options[0]);
 
          //   System.out.println("Exit: "+result);
@@ -2031 +2034 @@
                         try {
 
-                        FileInputStream fstream = new FileInputStream(items[1].trim());
-                        DataInputStream in = new DataInputStream(fstream);
+            FileInputStream fstream = new FileInputStream(items[1].trim());
+            BufferedReader in = new BufferedReader(new InputStreamReader(fstream, "UTF-8"));
+                        //DataInputStream in = new DataInputStream(fstream);
                         ///////////////
 
@@ -2043 +2047 @@
 
                         //cycle through all lines in IN and print to OUT
-                        while(in.available() != 0){
+                        //while(in.available() != 0){
+            while(in.ready()){
 
                             //System.out.println(in.readLine()+ "\n"
-                            String nextline = in.readLine();
+                            //String nextline = in.readLine();
+                String nextline = in.readLine();
 
                             if(nextline.matches(".+namespace=\".+\".*") == true){