Commit 52a2d550 by Robbie Hott

Save dialog now works, updated for different stages in reconciliation engine

parent 6c1f3154
...@@ -159,6 +159,7 @@ public class CBWReconcileUI extends javax.swing.JFrame { ...@@ -159,6 +159,7 @@ public class CBWReconcileUI extends javax.swing.JFrame {
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
// Pop up a file chooser for the user to pick a CSV file // Pop up a file chooser for the user to pick a CSV file
JFileChooser chooser2 = new JFileChooser(); JFileChooser chooser2 = new JFileChooser();
chooser2.setDialogType(JFileChooser.OPEN_DIALOG);
chooser2.setDialogTitle("Choose a CSV File."); chooser2.setDialogTitle("Choose a CSV File.");
chooser2.setFileFilter(new FileNameExtensionFilter("CSV Files", "csv")); chooser2.setFileFilter(new FileNameExtensionFilter("CSV Files", "csv"));
int returnVal = chooser2.showOpenDialog(null); int returnVal = chooser2.showOpenDialog(null);
...@@ -195,8 +196,9 @@ public class CBWReconcileUI extends javax.swing.JFrame { ...@@ -195,8 +196,9 @@ public class CBWReconcileUI extends javax.swing.JFrame {
// enter a filename for the destination CSV. // enter a filename for the destination CSV.
JFileChooser chooser2 = new JFileChooser(); JFileChooser chooser2 = new JFileChooser();
chooser2.setDialogTitle("Choose a Destination CSV File."); chooser2.setDialogTitle("Choose a Destination CSV File.");
chooser2.setDialogType(JFileChooser.SAVE_DIALOG);
chooser2.setFileFilter(new FileNameExtensionFilter("CSV Files","csv")); chooser2.setFileFilter(new FileNameExtensionFilter("CSV Files","csv"));
int returnVal = chooser2.showOpenDialog(null); int returnVal = chooser2.showSaveDialog(null);
if(returnVal == JFileChooser.APPROVE_OPTION) { if(returnVal == JFileChooser.APPROVE_OPTION) {
toCSVFile = chooser2.getSelectedFile().getAbsolutePath(); toCSVFile = chooser2.getSelectedFile().getAbsolutePath();
toCSVFileLocationLabel.setText(toCSVFile); toCSVFileLocationLabel.setText(toCSVFile);
......
...@@ -243,8 +243,8 @@ public class CBWReconcileWorker extends SwingWorker<Void, Void> { ...@@ -243,8 +243,8 @@ public class CBWReconcileWorker extends SwingWorker<Void, Void> {
vector.has("ElasticNameOnly") ? JSONObject.doubleToString(vector.getDouble("ElasticNameOnly")) : "0", vector.has("ElasticNameOnly") ? JSONObject.doubleToString(vector.getDouble("ElasticNameOnly")) : "0",
vector.has("ElasticSeventyFive") ? JSONObject.doubleToString(vector.getDouble("ElasticSeventyFive")) : "0", vector.has("ElasticSeventyFive") ? JSONObject.doubleToString(vector.getDouble("ElasticSeventyFive")) : "0",
vector.has("OriginalLength") ? JSONObject.doubleToString(vector.getDouble("OriginalLength")) : "0", vector.has("OriginalLength") ? JSONObject.doubleToString(vector.getDouble("OriginalLength")) : "0",
vector.has("MultiStage:ElasticNameOnly:OriginalLengthDifference") ? JSONObject.doubleToString(vector.getDouble("MultiStage:ElasticNameOnly:OriginalLengthDifference")) : "0", vector.has("OriginalLengthDifference") ? JSONObject.doubleToString(vector.getDouble("OriginalLengthDifference")) : "0",
vector.has("MultiStage:ElasticNameOnly:EntityTypeFilter") ? JSONObject.doubleToString(vector.getDouble("MultiStage:ElasticNameOnly:EntityTypeFilter")) : "0", vector.has("EntityTypeFilter") ? JSONObject.doubleToString(vector.getDouble("EntityTypeFilter")) : "0",
vector.has("MultiStage:ElasticNameOnly:SNACDegree") ? JSONObject.doubleToString(vector.getDouble("MultiStage:ElasticNameOnly:SNACDegree")) : "0" vector.has("MultiStage:ElasticNameOnly:SNACDegree") ? JSONObject.doubleToString(vector.getDouble("MultiStage:ElasticNameOnly:SNACDegree")) : "0"
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment