← Back to branch summary

~andre-dau/jhelioviewer/deadlock-fix

« back to all changes in this revision

Viewing changes to jhv/src/org/helioviewer/jhv/JavaHelioViewer.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/JavaHelioViewer.java
4
4
 
5
5
import javax.swing.UIManager;
6
6
 
7
 
import org.helioviewer.base.jhv.JHVDirectory;
8
 
import org.helioviewer.base.jhv.JHVGlobals;
9
7
import org.helioviewer.jhv.ffmpeg.FFmpegLoader;
10
8
import org.helioviewer.jhv.gui.ImageViewerGui;
11
9
import org.helioviewer.jhv.internal_plugins.InternalFilterPlugin;
12
10
import org.helioviewer.jhv.internal_plugins.InternalOverlayPlugin;
13
11
import org.helioviewer.jhv.io.CommandLineProcessor;
14
12
import org.helioviewer.base.logging.Log;
 
13
import org.helioviewer.base.logging.LogSettings;
15
14
import org.helioviewer.jhv.opengl.GLLoadLibraries;
16
15
import org.helioviewer.viewmodel.view.jp2view.JP2Image;
17
16
import org.helioviewer.viewmodel.view.jp2view.kakadu.JHV_KduException;
36
35
     */
37
36
    public static void main(String[] args) {
38
37
 
 
38
        LogSettings.init("/log_settings/log4j.properties", JHVDirectory.LOGS_SETTINGS.getPath() + "log4j.properties", JHVDirectory.LOGS.getPath());
 
39
        
39
40
        String argString = "";
40
41
        for (int i = 0; i < args.length; ++i) {
41
42
            argString += " " + args[i];