Changeset 1102 for trunk/src/org/apollo/meldex/RogTrack.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/apollo/meldex/RogTrack.java (modified) (7 diffs)

trunk/src/org/apollo/meldex/RogTrack.java

@@ -1 +1 @@
 package org.apollo.meldex;
-
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.ArrayList;
-import javax.swing.JOptionPane;
-
-@SuppressWarnings("unchecked") // code in java 1.4
+
+import org.expeditee.gio.EcosystemManager;
+
 public class RogTrack
 {
@@ -20 +20 @@
 
     // Data representing the track events
-    ArrayList trackData = new ArrayList();
+    ArrayList<RogTrackEvent> trackData = new ArrayList<RogTrackEvent>();
 
 
@@ -217 +217 @@
         int track_len = trackData.size();
 
-        ArrayList filtered_td = new ArrayList();
+        ArrayList<RogTrackEvent> filtered_td = new ArrayList<RogTrackEvent>();
 
         for (int i = 0; i < track_len; i++) {
@@ -235 +235 @@
         }
 
-        ArrayList me_list = new ArrayList();
+        ArrayList<MelodyEvent> me_list = new ArrayList<MelodyEvent>();
 
         for (int i = 0; i < filtered_track_len-1; i++) {
@@ -283 +283 @@
     public boolean loadFromFile(File rogFile)
     {
-        try {
-            // Open the file with a FileInputStream, ready for parsing
-            FileInputStream fileIn = new FileInputStream(rogFile);
-
-            // Get the number of bytes in the file
-            int rogLength = fileIn.available();
-
-            // Create a buffer to store the file, and read the file into it
-            byte[] rogData = new byte[rogLength];
-            fileIn.read(rogData, 0, rogLength);
-
-            // Parse the .rog file
-            parseFile(rogData, rogLength);
-        }
-        catch (Exception ex) {
-            JOptionPane.showMessageDialog(null, "Exception occurred reading file.\n\n" + ex);
-            return false;
-        }
-
-        // File loaded successfully
-        return true;
+        boolean success = true;
+        FileInputStream fileIn = null;
+                try {
+                    // Open the file with a FileInputStream, ready for parsing
+                    fileIn = new FileInputStream(rogFile);
+        
+                    // Get the number of bytes in the file
+                    int rogLength = fileIn.available();
+        
+                    // Create a buffer to store the file, and read the file into it
+                    byte[] rogData = new byte[rogLength];
+                    fileIn.read(rogData, 0, rogLength);
+        
+                    // Parse the .rog file
+                    parseFile(rogData, rogLength);
+                } catch (Exception ex) {
+                        EcosystemManager.getGraphicsManager().showDialog("Exception", "Exception occurred reading file.\n\n" + ex);
+                        success = false;
+                } finally {
+                        if (fileIn != null) {
+                                try {
+                                        fileIn.close();
+                                } catch (IOException e) {
+                                        // If an IO exception occurs when closing the file, just sweep it under the rug
+                                }
+                        }
+                }
+        
+                // File loaded successfully
+                return success;
     }
 
@@ -406 +415 @@
             // Check that the noteName is valid
             if (noteName < 'A' || noteName > 'G') {
-                JOptionPane.showMessageDialog(null, "Parsing error - check that the Rog file is valid.");
+                EcosystemManager.getGraphicsManager().showDialog("Exception", "Parsing error - check that the Rog file is valid.");
                 return;
             }
@@ -497 +506 @@
         }
         catch (Exception ex) {
-            JOptionPane.showMessageDialog(null, "Exception occurred writing to file.\n\n" + ex);
+            EcosystemManager.getGraphicsManager().showDialog("Exception", "Exception occurred writing to file.\n\n" + ex);
             return false;
         }