[Bojangles-cvs] cvs: bojangles / MainWindow.java /xml XmlHandler.java

[nehresma <boj...@li...>]

nehresma		Wed Aug 14 18:40:53 2002 EDT

  Modified files:              
    /bojangles	MainWindow.java 
    /bojangles/xml	XmlHandler.java 
  Log:
  * updated the save dialog box to be lightweight and moved some GUI code into
    MainWindow.
  
  
Index: bojangles/MainWindow.java
diff -u bojangles/MainWindow.java:1.10 bojangles/MainWindow.java:1.11
--- bojangles/MainWindow.java:1.10	Wed Aug 14 07:52:36 2002
+++ bojangles/MainWindow.java	Wed Aug 14 18:40:52 2002
@@ -309,16 +309,20 @@
         System.out.println(propertiesTable.getColumnModel().getColumn(0).getCellRenderer());
     }
 
-     private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {
-         try { 
-          FileDialog fb = new FileDialog(this, "Save as", FileDialog.SAVE);
-          fb.setVisible(true);
-          String file = new String(fb.getDirectory() + fb.getFile());
-          xmlHandler.saveXML(file);
-         }
-         catch (Exception e) {
-         e.printStackTrace();
-         }
+    private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {
+        JFileChooser fc = new JFileChooser();
+        int returnVal = fc.showSaveDialog(this);
+        if (returnVal == JFileChooser.APPROVE_OPTION) {
+            File file = fc.getSelectedFile();
+            if (file.exists()) {
+                String suremsg = "Are you sure you want to overwrite " + file + " ?";
+                int choice = JOptionPane.showConfirmDialog(this,"File will be overwritten.",suremsg,JOptionPane.YES_NO_OPTION);
+                if(choice == JOptionPane.NO_OPTION) return;
+            }
+            xmlHandler.saveXML(file);
+        } else {
+            System.out.println("Save canceled");
+        }
     }
     
     private void exitMenuItemActionPerformed(java.awt.event.ActionEvent evt) {
Index: bojangles/xml/XmlHandler.java
diff -u bojangles/xml/XmlHandler.java:1.7 bojangles/xml/XmlHandler.java:1.8
--- bojangles/xml/XmlHandler.java:1.7	Wed Aug 14 14:09:02 2002
+++ bojangles/xml/XmlHandler.java	Wed Aug 14 18:40:53 2002
@@ -175,31 +175,20 @@
     return l.size();
   }
   
-  public void saveXML(String of) {
+  public void saveXML(File of) {
       try {
-          // Lets do some error checking, keep the user from hurting themselves.
-          File ckfile = new File(of);
-          if(ckfile.exists()) {
-            String suremsg = "Are you sure you want to overwrite " + of + " ?";
-            int choice = JOptionPane.showConfirmDialog(null,"File will be overwritten.",suremsg,JOptionPane.YES_NO_OPTION);
-            if(choice == JOptionPane.NO_OPTION) {
-             JOptionPane.showMessageDialog(null,"Save aborted","Save status",JOptionPane.PLAIN_MESSAGE);
-             return;
-            }
-          }
           FileOutputStream outfile = new FileOutputStream(of);
           XMLWriter saver = new XMLWriter(outfile);
           saver.write(this.doc);
-          //String savemsg = "Saved " + of,"Save status";
-          //JOptionPane.showMessageDialog(this, savemsg, JOptionPane.PLAIN_MESSAGE);
-      } catch (Exception e) { e.printStackTrace(); }
+      } catch (Exception e) {
+          e.printStackTrace();
+      }
   }
   
   public void printXML() {
       try {
           XMLWriter writer = new XMLWriter(System.out);
           writer.write(doc);
-          System.out.println("\n");
       } catch (Exception e) { e.printStackTrace(); }
   }