← Back to branch summary

~ubuntu-branches/ubuntu/raring/scilab/raring-proposed

« back to all changes in this revision

Viewing changes to modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotesOptions.java

  • Committer: Package Import Robot
  • Author(s): Sylvestre Ledru
  • Date: 2012-08-30 14:42:38 UTC
  • mfrom: (1.4.7)
  • Revision ID: package-import@ubuntu.com-20120830144238-c1y2og7dbm7m9nig
Tags: 5.4.0-beta-3-1~exp1
* New upstream release
* Update the scirenderer dep
* Get ride of libjhdf5-java dependency

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotesOptions.java
65
65
        private void set(boolean restartOpen, boolean addLineTermination, int numberOfRecentlyOpen, String encoding, String eol, boolean useScinotes, boolean externalCmd, String cmd) {
66
66
            this.restartOpen = restartOpen;
67
67
            this.addLineTermination = addLineTermination;
68
 
            this.numberOfRecentlyOpen = numberOfRecentlyOpen;
 
68
            this.numberOfRecentlyOpen = numberOfRecentlyOpen > 0 ? numberOfRecentlyOpen : 1;
69
69
            this.encoding = encoding.toLowerCase();
70
70
 
71
 
            if (eol.equals("")) {
72
 
                switch (OS.get()) {
73
 
                case WINDOWS:
74
 
                    this.eol = ScilabDocument.EOLWIN;
75
 
                    break;
76
 
                case MAC:
77
 
                    this.eol = ScilabDocument.EOLMAC;
78
 
                    break;
79
 
                default:
80
 
                    this.eol = ScilabDocument.EOLUNIX;
81
 
                    break;
82
 
                }
 
71
            if (eol.equals("")) {
 
72
                switch (OS.get()) {
 
73
                case WINDOWS:
 
74
                    this.eol = ScilabDocument.EOLWIN;
 
75
                    break;
 
76
                case MAC:
 
77
                    this.eol = ScilabDocument.EOLMAC;
 
78
                    break;
 
79
                default:
 
80
                    this.eol = ScilabDocument.EOLUNIX;
 
81
                    break;
 
82
                }
83
83
            } else if (eol.startsWith("Windows")) {
84
84
                this.eol = ScilabDocument.EOLWIN;
85
85
            } else if (eol.startsWith("Mac")) {