import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
import javax.swing.*;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import tim.prune.I18nManager;
import tim.prune.data.Altitude;
import tim.prune.data.Field;
+import tim.prune.data.SourceInfo;
/**
{
_dialog = new JDialog(_parentFrame, I18nManager.getText("dialog.openoptions.title"), true);
_dialog.setLocationRelativeTo(_parentFrame);
- _dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+ _dialog.setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
+ // add closing listener
+ _dialog.addWindowListener(new WindowAdapter() {
+ public void windowClosing(WindowEvent e) {
+ _dialog.dispose();
+ _app.informNoDataLoaded();
+ }
+ });
_dialog.getContentPane().add(makeDialogComponents());
// select best separator according to row counts (more is better)
else {
// Didn't pass pre-check
_app.showErrorMessage("error.load.dialogtitle", "error.load.noread");
+ _app.informNoDataLoaded();
}
}
public void actionPerformed(ActionEvent e)
{
_dialog.dispose();
+ _app.informNoDataLoaded();
}
});
buttonPanel.add(cancelButton);
}
}
});
- JPanel tablePanel = new JPanel();
- tablePanel.setLayout(new BorderLayout());
- tablePanel.add(_fieldTable.getTableHeader(), BorderLayout.NORTH);
- tablePanel.add(_fieldTable, BorderLayout.CENTER);
- innerPanel2.add(tablePanel, BorderLayout.CENTER);
+ JScrollPane lowerTablePane = new JScrollPane(_fieldTable);
+ lowerTablePane.setPreferredSize(new Dimension(300, 100));
+ innerPanel2.add(lowerTablePane, BorderLayout.CENTER);
JPanel innerPanel3 = new JPanel();
innerPanel3.setLayout(new BoxLayout(innerPanel3, BoxLayout.Y_AXIS));
}
_lastAltitudeFormat = altitudeFormat;
// give data to App
+ SourceInfo sourceInfo = new SourceInfo(_file, SourceInfo.FILE_TYPE.TEXT);
_app.informDataLoaded(_fieldTableModel.getFieldArray(),
- _fileExtractTableModel.getData(), altitudeFormat,
- _file.getName());
+ _fileExtractTableModel.getData(), altitudeFormat, sourceInfo, null);
// clear up file cacher
_fileCacher.clear();
// dispose of dialog