← Back to branch summary

~andre-dau/jhelioviewer/deadlock-fix

« back to all changes in this revision

Viewing changes to jhv/src/org/helioviewer/jhv/gui/dialogs/PreferencesDialog.java

  • Committer: Andre Dau
  • Date: 2010-06-10 01:53:09 UTC
  • Revision ID: andre@sporran.nascom.nasa.gov-20100610015309-4rqe1s53op1uda7h
Put JHVDirectory and JHVGlobals back to jhv project and changed the way LogSettings is initialized. Fixed a bug where a NullPointerException would occur when closing JHV while playing a movie.

Show diffs side-by-side

added added

removed removed

Lines of Context:
jhv/src/org/helioviewer/jhv/gui/dialogs/PreferencesDialog.java
36
36
import javax.swing.table.TableModel;
37
37
 
38
38
import org.apache.log4j.Level;
39
 
import org.helioviewer.base.jhv.JHVDirectory;
40
 
import org.helioviewer.base.jhv.JHVGlobals;
41
39
import org.helioviewer.base.logging.LogSettings;
 
40
import org.helioviewer.jhv.JHVDirectory;
 
41
import org.helioviewer.jhv.JHVGlobals;
42
42
import org.helioviewer.jhv.Settings;
43
43
import org.helioviewer.jhv.gui.IconBank;
44
44
import org.helioviewer.jhv.gui.ImageViewerGui;
361
361
        if (debugFileCombo != null) {
362
362
            Level level = (Level) debugFileCombo.getSelectedItem();
363
363
            logSettings.setLoggingLevel("file", level);
364
 
            logSettings.setMaxiumLogFileAge(LogSettings.FILE_LOGGER, Integer.parseInt(debugFileTextField.getText()));
 
364
            logSettings.setMaxiumLogFileAge(LogSettings.getSingletonInstance().FILE_LOGGER, Integer.parseInt(debugFileTextField.getText()));
365
365
        }
366
366
 
367
367
        if (debugConsoleCombo != null) {
530
530
        paramsPanel.add(row3);
531
531
 
532
532
        LogSettings logSettings = LogSettings.getSingletonInstance();
533
 
        Level fileLoggingLevel = logSettings.getLoggingLevel(LogSettings.FILE_LOGGER);
534
 
        Level consoleLoggingLevel = logSettings.getLoggingLevel(LogSettings.CONSOLE_LOGGER);
 
533
        Level fileLoggingLevel = logSettings.getLoggingLevel(LogSettings.getSingletonInstance().FILE_LOGGER);
 
534
        Level consoleLoggingLevel = logSettings.getLoggingLevel(LogSettings.getSingletonInstance().CONSOLE_LOGGER);
535
535
 
536
536
        JPanel row4 = new JPanel(new FlowLayout(FlowLayout.LEADING));
537
537
        if (fileLoggingLevel != null) {
538
538
            row4.add(new JLabel("File log level:"));
539
 
            debugFileCombo = new JComboBox(LogSettings.LEVELS);
 
539
            debugFileCombo = new JComboBox(LogSettings.getSingletonInstance().LEVELS);
540
540
            row4.add(debugFileCombo);
541
541
            debugFileCombo.setSelectedItem(fileLoggingLevel);
542
542
        }
543
543
 
544
544
        if (consoleLoggingLevel != null) {
545
545
            row4.add(new JLabel("Console log level:"));
546
 
            debugConsoleCombo = new JComboBox(LogSettings.LEVELS);
 
546
            debugConsoleCombo = new JComboBox(LogSettings.getSingletonInstance().LEVELS);
547
547
            row4.add(debugConsoleCombo);
548
548
            debugConsoleCombo.setSelectedItem(consoleLoggingLevel);
549
549
        }
556
556
        if (fileLoggingLevel != null) {
557
557
            row5.add(new JLabel("Delete log files after "));
558
558
            debugFileTextField = new JTextField(3);
559
 
            debugFileTextField.setText(Integer.toString(logSettings.getMaxiumLogFileAge(LogSettings.FILE_LOGGER)));
 
559
            debugFileTextField.setText(Integer.toString(logSettings.getMaxiumLogFileAge(LogSettings.getSingletonInstance().FILE_LOGGER)));
560
560
            row5.add(debugFileTextField);
561
561
            row5.add(new JLabel("days (enter 0 to keep all files)"));
562
562
            paramsPanel.add(row5);