← Back to branch summary

~meier-philipp/humigraf/development

« back to all changes in this revision

Viewing changes to Humigraf/src/ch/praeber/humigraf/AnalyticsGUI.java

  • Committer: Philipp Meier
  • Date: 2012-07-31 13:49:09 UTC
  • Revision ID: meier.phi@gmail.com-20120731134909-c2jtviet0hqnem51
file save is working correct

Show diffs side-by-side

added added

removed removed

Lines of Context:
Humigraf/src/ch/praeber/humigraf/AnalyticsGUI.java
81
81
    private DataManager datamanager;
82
82
    private Controller controller;
83
83
    private JFileChooser fileChooser;
84
 
    //TODO Remember window size
85
84
    //TODO Remeber last save & load place
86
85
    //TODO import data twice does nothing.
87
86
    private Configuration configuration;
383
382
     * Initialised when clicking File->new
384
383
     */
385
384
    public void newFile() {
386
 
        if (!datamanager.isDataSaved()) {
 
385
        if (!controller.isSaved()) {
387
386
            int response = JOptionPane.showConfirmDialog(this,
388
387
                    languages.getString("WOULD YOU LIKE TO SAVE THE IMPORTED DATA?"),
389
388
                    languages.getString("CONFIRM EXIT WITHOUT SAVING"), JOptionPane.YES_NO_OPTION,
411
410
     *
412
411
     */
413
412
    private void exitProcedure() {
414
 
        if (!datamanager.isDataSaved()) {
 
413
        if (!controller.isSaved()) {
415
414
            int response = JOptionPane.showConfirmDialog(this,
416
415
                    languages.getString("WOULD YOU LIKE TO SAVE THE IMPORTED DATA?"),
417
416
                    languages.getString("CONFIRM EXIT WITHOUT SAVING"),
522
521
                result = false;
523
522
            } else {
524
523
                result = true;
 
524
                controller.setSaved(result);
525
525
            }
526
526
            //JOptionPane.showMessageDialog(rootPane, "File successfully saved to " + file.toString());
527
527
        }
528
 
 
529
528
        return result;
530
529
    }
531
530
 
641
640
     */
642
641
    private void openConfigureDialog() {
643
642
        if (controller.getIntervall() < 0) {
644
 
             JOptionPane.showConfirmDialog(this, languages.getString("NO CONNECTION TO DEVICE.")
 
643
            JOptionPane.showConfirmDialog(this, languages.getString("NO CONNECTION TO DEVICE.")
645
644
                    + "\n" + languages.getString("PLEASE PLUG-IN YOUR HUMIGRAF AND TRY AGAIN."),
646
645
                    languages.getString("NO CONNECTION TO HUMIGRAF"), JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE);
647
646
        } else {
691
690
    public void EreaseDeviceMemory() {
692
691
        //TODO Ask if user wants to import data
693
692
        int response = 0;
694
 
        if (!datamanager.isDataSaved()) {
 
693
        if (!controller.isSaved()) {
695
694
            response = JOptionPane.showConfirmDialog(this,
696
695
                    languages.getString("WOULD YOU LIKE TO SAVE YOUR DATA BEFORE")
697
696
                    + languages.getString(" YOU ERASE THE RECORDS ON YOUR DEVICE?"),