Records implementation (WIP)

.gitignore

@@ -27,4 +27,5 @@ bin/
 
 ### Mac OS ###
 .DS_Store
-*.csv
+*.csv
+target

src/com/edass/GUI/EdassGUI.java

@@ -2,13 +2,15 @@
 
 import com.edass.Analysis.AnalysisEngine;
 import com.edass.Analysis.AnalysisUtilities;
+import com.edass.Record.AnalysisRecord;
 import com.edass.Record.EdassRecord;
 import org.apache.spark.sql.Dataset;
 import org.apache.spark.sql.Row;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.ArrayList;
 
 /**
  * Handles all GUI operations on EDASS
@@ -18,11 +20,11 @@ public class EdassGUI implements ActionListener {
 
     JMenuBar menubar;
     JMenu file_menu, analysis_menu,transformation_menu;
-    JMenuItem file_import, analysis_summary,transform_remove_duplicate_rows;
+    JMenuItem FILE_IMPORT, ANALYSIS_SUMMARY,transform_remove_duplicate_rows;
 
     AnalysisEngine engine;
 
-    EdassRecord[] records;
+    private ArrayList<EdassRecord> records = new ArrayList<>();
 
     public EdassGUI(AnalysisEngine analysis_engine){
         JFrame frame = new JFrame("EDASS 1.0");
@@ -39,15 +41,15 @@ public JFrame getFrame() {
     public void createMenu(){
         menubar =new JMenuBar();
         file_menu=new JMenu("File");
-        file_import = new JMenuItem("Import");
-        file_import.addActionListener(this);
-        file_menu.add(file_import);
+        FILE_IMPORT = new JMenuItem("Import");
+        FILE_IMPORT.addActionListener(this);
+        file_menu.add(FILE_IMPORT);
         menubar.add(file_menu);
 
         analysis_menu=new JMenu("Analysis");
-        analysis_summary = new JMenuItem("Descriptive Stats");
-        analysis_summary.addActionListener(this);
-        analysis_menu.add(analysis_summary);
+        ANALYSIS_SUMMARY = new JMenuItem("Descriptive Stats");
+        ANALYSIS_SUMMARY.addActionListener(this);
+        analysis_menu.add(ANALYSIS_SUMMARY);
         menubar.add(analysis_menu);
 
         transformation_menu=new JMenu("Transformation");
@@ -76,17 +78,20 @@ private void analysisSummary(){
     }
 
     public void actionPerformed(ActionEvent e) {
-        if(e.getSource() == file_import){
+        if(e.getSource() == FILE_IMPORT){
             fileImport();
         }
-        else if(e.getSource() == analysis_summary){
+        else if(e.getSource() == ANALYSIS_SUMMARY){
             analysisSummary();
         }
     }
 
     public void showDataTable(Dataset<Row> df){
         String[][] rows = AnalysisUtilities.dataframeToRows(df,50);
         String[] columns = engine.getDataFrame().columns();
+
+        records.add(new AnalysisRecord("Data View " + (records.size() + 1),df,""));
+
         JTable data_table = new JTable(rows,columns);
         JFrame new_window = new JFrame("Data View");
         new_window.setSize(400, 400);
@@ -95,4 +100,8 @@ public void showDataTable(Dataset<Row> df){
         new_window.getContentPane().add(sp);
         new_window.setVisible(true);
     }
+
+    public void addRecord(){
+
+    }
 }

src/com/edass/Record/AnalysisRecord.java

@@ -0,0 +1,22 @@
+package com.edass.Record;
+
+import org.apache.spark.sql.Dataset;
+import org.apache.spark.sql.Row;
+
+public class AnalysisRecord extends EdassRecord{
+    private final Dataset<Row> dataFrame;
+    private final String analysisOutput;
+    public AnalysisRecord(String recordName, Dataset<Row> dataFrame, String analysisOutput) {
+        super(recordName);
+        this.dataFrame = dataFrame;
+        this.analysisOutput = analysisOutput;
+    }
+
+    public Dataset<Row> getDataFrame() {
+        return dataFrame;
+    }
+
+    public String getAnalysisOutput() {
+        return analysisOutput;
+    }
+}

src/com/edass/Record/EdassRecord.java

@@ -1,18 +1,18 @@
 package com.edass.Record;
 
+
+
 /**
  * Represents an operation (Analysis, Transformation etc.) on EDASS which can be stored and executed at a later time
  */
 public class EdassRecord {
+    private String recordName;
 
-}
-
-
-class AnalysisRecord extends EdassRecord{
-
-}
-
-
-class TransformationRecord extends  EdassRecord{
+    public EdassRecord(String recordName) {
+        this.recordName = recordName;
+    }
 
+    public String getRecordName() {
+        return recordName;
+    }
 }

src/com/edass/Record/TransformationRecord.java

@@ -0,0 +1,7 @@
+package com.edass.Record;
+
+public class TransformationRecord extends EdassRecord {
+    public TransformationRecord(String recordName) {
+        super(recordName);
+    }
+}