Upgraded Griffon to 0.2.1.

.classpath

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+    <classpathentry kind="src" path="src/main"/>
+    <classpathentry kind="src" path="griffon-app/conf"/>
+    <classpathentry kind="src" path="griffon-app/models"/>
+    <classpathentry kind="src" path="griffon-app/views"/>
+    <classpathentry kind="src" path="griffon-app/controllers"/>
+    <classpathentry kind="src" path="griffon-app/resources"/>
+    <classpathentry kind="src" path="test/integration"/>
+    <classpathentry kind="src" path="test/unit"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+    <classpathentry kind="var" path="GRIFFON_HOME/ant/lib/ant.jar"/>
+<classpathentry kind="var" path="GRIFFON_HOME/lib/swingx-0.9.3.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/swing-worker.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/commons-lang-2.4.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/ant-launcher-1.7.1.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/gant_groovy1.6-1.6.0.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/asm-2.2.3.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/commons-cli-1.0.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/groovy-all-1.6.4.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/swingxbuilder-0.1.6-SNAPSHOT.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/jline-0.9.94.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/svnkit-1.2.0.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/log4j-1.2.15.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/ant-nodeps-1.7.1.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/ant-1.7.1.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/ant-trax-1.7.1.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/commons-logging-1.1.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/ant-junit-1.7.1.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/MultipleGradientPaint.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/spring-2.5.6.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/lib/junit-3.8.2.jar" />
+
+
+<classpathentry kind="var" path="GRIFFON_HOME/dist/griffon-rt-0.2.1.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/dist/griffon-resources-0.2.1.jar" />
+
+<classpathentry kind="var" path="GRIFFON_HOME/dist/griffon-cli-0.2.1.jar" />
+
+
+    <classpathentry kind="output" path="staging/classes"/>
+</classpath>

.project

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+    <name>TimeStamper</name>
+    <comment/>
+    <projects>
+    </projects>
+    <buildSpec>
+        <buildCommand>
+            <name>org.eclipse.jdt.core.javabuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+    </buildSpec>
+    <natures>
+        <nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
+        <nature>org.eclipse.jdt.core.javanature</nature>
+    </natures>
+</projectDescription>

TimeStamper.iml

@@ -28,7 +28,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Griffon 0.2" level="project" />
+    <orderEntry type="library" name="Griffon 0.2.1" level="project" />
     <orderEntry type="module-library">
       <library name="Griffon User Library">
         <CLASSES>

TimeStamper.ipr

@@ -10,51 +10,53 @@
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="libraryTable">
-    <library name="Griffon 0.2">
+    <library name="Griffon 0.2.1">
       <CLASSES>
-        <root url="jar://c:\Program Files\griffon-0.2/lib/ant-junit.jar!/" />
+        <root url="jar:///usr/share/griffon/lib/swingx-0.9.3.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/ant-launcher.jar!/" />
+<root url="jar:///usr/share/griffon/lib/swing-worker.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/ant-nodeps.jar!/" />
+<root url="jar:///usr/share/griffon/lib/commons-lang-2.4.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/ant-trax.jar!/" />
+<root url="jar:///usr/share/griffon/lib/ant-launcher-1.7.1.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/ant.jar!/" />
+<root url="jar:///usr/share/griffon/lib/gant_groovy1.6-1.6.0.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/asm-2.2.3.jar!/" />
+<root url="jar:///usr/share/griffon/lib/asm-2.2.3.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/commons-cli-1.0.jar!/" />
+<root url="jar:///usr/share/griffon/lib/commons-cli-1.0.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/commons-lang-2.1.jar!/" />
+<root url="jar:///usr/share/griffon/lib/groovy-all-1.6.4.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/commons-logging-1.1.jar!/" />
+<root url="jar:///usr/share/griffon/lib/swingxbuilder-0.1.6-SNAPSHOT.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/groovy-all-1.6.4.jar!/" />
+<root url="jar:///usr/share/griffon/lib/jline-0.9.94.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/jline-0.9.94.jar!/" />
+<root url="jar:///usr/share/griffon/lib/svnkit-1.2.0.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/junit-3.8.2.jar!/" />
+<root url="jar:///usr/share/griffon/lib/log4j-1.2.15.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/log4j-1.2.15.jar!/" />
+<root url="jar:///usr/share/griffon/lib/ant-nodeps-1.7.1.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/MultipleGradientPaint.jar!/" />
+<root url="jar:///usr/share/griffon/lib/ant-1.7.1.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/spring-2.5.6.jar!/" />
+<root url="jar:///usr/share/griffon/lib/ant-trax-1.7.1.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/svnkit-1.2.0.jar!/" />
+<root url="jar:///usr/share/griffon/lib/commons-logging-1.1.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/swing-worker.jar!/" />
+<root url="jar:///usr/share/griffon/lib/ant-junit-1.7.1.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/swingx-0.9.3.jar!/" />
+<root url="jar:///usr/share/griffon/lib/MultipleGradientPaint.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/lib/swingxbuilder-0.1.6-SNAPSHOT.jar!/" />
+<root url="jar:///usr/share/griffon/lib/spring-2.5.6.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/dist/griffon-cli-0.2.jar!/" />
+<root url="jar:///usr/share/griffon/lib/junit-3.8.2.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/dist/griffon-resources-0.2.jar!/" />
+<root url="jar:///usr/share/griffon/dist/griffon-rt-0.2.1.jar!/" />
 
-<root url="jar://c:\Program Files\griffon-0.2/dist/griffon-rt-0.2.jar!/" />
+<root url="jar:///usr/share/griffon/dist/griffon-resources-0.2.1.jar!/" />
+
+<root url="jar:///usr/share/griffon/dist/griffon-cli-0.2.1.jar!/" />
 
 
       </CLASSES>

application.properties

@@ -1,4 +1,5 @@
-#Thu Dec 17 08:19:45 CST 2009
+#Do not edit app.griffon.* properties, they may change automatically. DO NOT put application configuration in here, it is not the right place!
-app.version=2.0
+#Thu Apr 01 22:28:40 CDT 2010
-app.griffon.version=0.2
+app.version=2.0
-app.name=TimeStamper
+app.griffon.version=0.2.1
+app.name=TimeStamper

griffon-app/conf/Application.groovy

@@ -1,33 +1,22 @@
 application {
-    title='TimeStamper'
+	title="TimeStamper"
-    startupGroups = ['TimeStamperMain']
+	startupGroups=["TimeStamperMain"]
-
+	autoShutdown=true
-    // Should Griffon exit when no Griffon created frames are showing?
-    autoShutdown = true
-
-    // If you want some non-standard application class, apply it here
-    //frameClass = 'javax.swing.JFrame'
 }
 mvcGroups {
-    // MVC Group for "com.jdbernard.timestamper.TimeStamperMain"
+	TimeStamperMain {
-    'TimeStamperMain' {
+		model="com.jdbernard.timestamper.TimeStamperMainModel"
-        model = 'com.jdbernard.timestamper.TimeStamperMainModel'
+		view="com.jdbernard.timestamper.TimeStamperMainView"
-        view = 'com.jdbernard.timestamper.TimeStamperMainView'
+		controller="com.jdbernard.timestamper.TimeStamperMainController"
-        controller = 'com.jdbernard.timestamper.TimeStamperMainController'
+	}
-    }
+	PunchcardDialog {
-
+		model="com.jdbernard.timestamper.PunchcardDialogModel"
-    // MVC Group for "com.jdbernard.timestamper.PunchcardDialog"
+		view="com.jdbernard.timestamper.PunchcardDialogView"
-    'PunchcardDialog' {
+		controller="com.jdbernard.timestamper.PunchcardDialogController"
-        model = 'com.jdbernard.timestamper.PunchcardDialogModel'
+	}
-        view = 'com.jdbernard.timestamper.PunchcardDialogView'
+	NotesDialog {
-        controller = 'com.jdbernard.timestamper.PunchcardDialogController'
+		model="com.jdbernard.timestamper.NotesDialogModel"
-    }
+		view="com.jdbernard.timestamper.NotesDialogView"
-
+		controller="com.jdbernard.timestamper.NotesDialogController"
-    // MVC Group for "com.jdbernard.timestamper.NotesDialog"
+	}
-    'NotesDialog' {
-        model = 'com.jdbernard.timestamper.NotesDialogModel'
-        view = 'com.jdbernard.timestamper.NotesDialogView'
-        controller = 'com.jdbernard.timestamper.NotesDialogController'
-    }
-
 }

griffon-app/resources/log4j.properties

@@ -1,4 +1,4 @@
-log4j.rootLogger=trace, stdout
+log4j.rootLogger=info, stdout, fileout
 
 # set up stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

griffon-app/session.vim

@@ -1,32 +1,43 @@
 let SessionLoad = 1
 if &cp | set nocp | endif
+let s:cpo_save=&cpo
+set cpo&vim
+inoremap <Nul> 
 nmap v :call Screen_Vars()
 nmap  vip
 vmap  {j"ry} :call Send_to_Screen(@r)
-let s:cpo_save=&cpo
-set cpo&vim
-map \dk <Plug>DirDiffPrev
-map \dj <Plug>DirDiffNext
-map \dp <Plug>DirDiffPut
 map \dg <Plug>DirDiffGet
+map \dp <Plug>DirDiffPut
+map \dj <Plug>DirDiffNext
+map \dk <Plug>DirDiffPrev
 nmap gx <Plug>NetrwBrowseX
 nnoremap <silent> <Plug>NetrwBrowseX :call netrw#NetrwBrowseX(expand("<cWORD>"),0)
 let &cpo=s:cpo_save
 unlet s:cpo_save
 set autoindent
 set backspace=indent,eol,start
+set errorformat=%A\ %#[javac]\ %f:%l:\ %m,%-Z\ %#[javac]\ %p^,%-C%.%#
 set expandtab
+set fileencodings=ucs-bom,utf-8,default,latin1
+set helplang=en
 set history=50
 set hlsearch
+set iminsert=0
+set imsearch=0
 set incsearch
+set makeprg=ant
+set nomodeline
+set printoptions=paper:letter
 set ruler
+set runtimepath=~/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim72,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,~/.vim/after
 set shiftwidth=4
 set showcmd
+set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc
 set tabstop=4
 let s:so_save = &so | let s:siso_save = &siso | set so=0 siso=0
 let v:this_session=expand("<sfile>:p")
 silent only
-cd ~/My\ Documents/Projects/Non-Gemalto/TimeStamper-griffon/griffon-app
+cd ~/projects/TimeStamper/griffon-app
 if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == ''
   let s:wipebuf = bufnr('%')
 endif
@@ -34,13 +45,13 @@ set shortmess=aoO
 badd +88 views/com/jdbernard/timestamper/TimeStamperMainView.groovy
 badd +24 models/com/jdbernard/timestamper/TimeStamperMainModel.groovy
 badd +64 controllers/com/jdbernard/timestamper/TimeStamperMainController.groovy
-badd +27 views/com/jdbernard/timestamper/NotesDialogView.groovy
+badd +1 views/com/jdbernard/timestamper/NotesDialogView.groovy
 badd +8 models/com/jdbernard/timestamper/NotesDialogModel.groovy
 badd +1 controllers/com/jdbernard/timestamper/NotesDialogController.groovy
 badd +1 views/com/jdbernard/timestamper/PunchcardDialogView.groovy
 badd +7 models/com/jdbernard/timestamper/PunchcardDialogModel.groovy
 badd +1 controllers/com/jdbernard/timestamper/PunchcardDialogController.groovy
-badd +215 ../src/main/com/jdbernard/timestamper/gui/TimelineDayDisplay.java
+badd +1 ../src/main/com/jdbernard/timestamper/gui/TimelineDayDisplay.java
 badd +8 ../src/main/com/jdbernard/timestamper/gui/WindowInformation.groovy
 badd +28 conf/Application.groovy
 badd +1 conf/Builder.groovy
@@ -66,15 +77,16 @@ set nosplitbelow
 set nosplitright
 wincmd t
 set winheight=1 winwidth=1
-exe 'vert 1resize ' . ((&columns * 89 + 118) / 237)
+exe 'vert 1resize ' . ((&columns * 90 + 91) / 182)
-exe '2resize ' . ((&lines * 26 + 46) / 92)
+exe '2resize ' . ((&lines * 23 + 40) / 81)
-exe 'vert 2resize ' . ((&columns * 147 + 118) / 237)
+exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
-exe '3resize ' . ((&lines * 62 + 46) / 92)
+exe '3resize ' . ((&lines * 54 + 40) / 81)
-exe 'vert 3resize ' . ((&columns * 147 + 118) / 237)
+exe 'vert 3resize ' . ((&columns * 91 + 91) / 182)
 argglobal
 setlocal keymap=
 setlocal noarabic
 setlocal autoindent
+setlocal balloonexpr=
 setlocal nobinary
 setlocal bufhidden=
 setlocal buflisted
@@ -166,7 +178,7 @@ setlocal nowinfixwidth
 setlocal wrap
 setlocal wrapmargin=0
 silent! normal! zE
-let s:l = 92 - ((88 * winheight(0) + 44) / 89)
+let s:l = 92 - ((28 * winheight(0) + 39) / 78)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
@@ -178,6 +190,7 @@ edit models/com/jdbernard/timestamper/TimeStamperMainModel.groovy
 setlocal keymap=
 setlocal noarabic
 setlocal autoindent
+setlocal balloonexpr=
 setlocal nobinary
 setlocal bufhidden=
 setlocal buflisted
@@ -269,7 +282,7 @@ setlocal nowinfixwidth
 setlocal wrap
 setlocal wrapmargin=0
 silent! normal! zE
-let s:l = 23 - ((21 * winheight(0) + 13) / 26)
+let s:l = 23 - ((19 * winheight(0) + 11) / 23)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
@@ -281,6 +294,7 @@ edit controllers/com/jdbernard/timestamper/TimeStamperMainController.groovy
 setlocal keymap=
 setlocal noarabic
 setlocal autoindent
+setlocal balloonexpr=
 setlocal nobinary
 setlocal bufhidden=
 setlocal buflisted
@@ -372,18 +386,18 @@ setlocal nowinfixwidth
 setlocal wrap
 setlocal wrapmargin=0
 silent! normal! zE
-let s:l = 38 - ((34 * winheight(0) + 31) / 62)
+let s:l = 38 - ((0 * winheight(0) + 27) / 54)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
 38
 normal! 033l
 wincmd w
-exe 'vert 1resize ' . ((&columns * 89 + 118) / 237)
+exe 'vert 1resize ' . ((&columns * 90 + 91) / 182)
-exe '2resize ' . ((&lines * 26 + 46) / 92)
+exe '2resize ' . ((&lines * 23 + 40) / 81)
-exe 'vert 2resize ' . ((&columns * 147 + 118) / 237)
+exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
-exe '3resize ' . ((&lines * 62 + 46) / 92)
+exe '3resize ' . ((&lines * 54 + 40) / 81)
-exe 'vert 3resize ' . ((&columns * 147 + 118) / 237)
+exe 'vert 3resize ' . ((&columns * 91 + 91) / 182)
 tabedit views/com/jdbernard/timestamper/NotesDialogView.groovy
 set splitbelow splitright
 wincmd _ | wincmd |
@@ -398,15 +412,16 @@ set nosplitbelow
 set nosplitright
 wincmd t
 set winheight=1 winwidth=1
-exe 'vert 1resize ' . ((&columns * 85 + 118) / 237)
+exe 'vert 1resize ' . ((&columns * 90 + 91) / 182)
-exe '2resize ' . ((&lines * 14 + 46) / 92)
+exe '2resize ' . ((&lines * 12 + 40) / 81)
-exe 'vert 2resize ' . ((&columns * 151 + 118) / 237)
+exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
-exe '3resize ' . ((&lines * 74 + 46) / 92)
+exe '3resize ' . ((&lines * 65 + 40) / 81)
-exe 'vert 3resize ' . ((&columns * 151 + 118) / 237)
+exe 'vert 3resize ' . ((&columns * 91 + 91) / 182)
 argglobal
 setlocal keymap=
 setlocal noarabic
 setlocal autoindent
+setlocal balloonexpr=
 setlocal nobinary
 setlocal bufhidden=
 setlocal buflisted
@@ -498,18 +513,19 @@ setlocal nowinfixwidth
 setlocal wrap
 setlocal wrapmargin=0
 silent! normal! zE
-let s:l = 16 - ((15 * winheight(0) + 44) / 89)
+let s:l = 1 - ((0 * winheight(0) + 39) / 78)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-16
+1
-normal! 022l
+normal! 0
 wincmd w
 argglobal
 edit models/com/jdbernard/timestamper/NotesDialogModel.groovy
 setlocal keymap=
 setlocal noarabic
 setlocal autoindent
+setlocal balloonexpr=
 setlocal nobinary
 setlocal bufhidden=
 setlocal buflisted
@@ -601,18 +617,19 @@ setlocal nowinfixwidth
 setlocal wrap
 setlocal wrapmargin=0
 silent! normal! zE
-let s:l = 7 - ((6 * winheight(0) + 7) / 14)
+let s:l = 1 - ((0 * winheight(0) + 6) / 12)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-7
+1
-normal! 07l
+normal! 0
 wincmd w
 argglobal
 edit controllers/com/jdbernard/timestamper/NotesDialogController.groovy
 setlocal keymap=
 setlocal noarabic
 setlocal autoindent
+setlocal balloonexpr=
 setlocal nobinary
 setlocal bufhidden=
 setlocal buflisted
@@ -704,18 +721,18 @@ setlocal nowinfixwidth
 setlocal wrap
 setlocal wrapmargin=0
 silent! normal! zE
-let s:l = 16 - ((15 * winheight(0) + 37) / 74)
+let s:l = 1 - ((0 * winheight(0) + 32) / 65)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-16
+1
-normal! 04l
+normal! 0
 wincmd w
-exe 'vert 1resize ' . ((&columns * 85 + 118) / 237)
+exe 'vert 1resize ' . ((&columns * 90 + 91) / 182)
-exe '2resize ' . ((&lines * 14 + 46) / 92)
+exe '2resize ' . ((&lines * 12 + 40) / 81)
-exe 'vert 2resize ' . ((&columns * 151 + 118) / 237)
+exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
-exe '3resize ' . ((&lines * 74 + 46) / 92)
+exe '3resize ' . ((&lines * 65 + 40) / 81)
-exe 'vert 3resize ' . ((&columns * 151 + 118) / 237)
+exe 'vert 3resize ' . ((&columns * 91 + 91) / 182)
 tabedit views/com/jdbernard/timestamper/PunchcardDialogView.groovy
 set splitbelow splitright
 wincmd _ | wincmd |
@@ -730,15 +747,16 @@ set nosplitbelow
 set nosplitright
 wincmd t
 set winheight=1 winwidth=1
-exe 'vert 1resize ' . ((&columns * 83 + 118) / 237)
+exe 'vert 1resize ' . ((&columns * 90 + 91) / 182)
-exe '2resize ' . ((&lines * 14 + 46) / 92)
+exe '2resize ' . ((&lines * 12 + 40) / 81)
-exe 'vert 2resize ' . ((&columns * 153 + 118) / 237)
+exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
-exe '3resize ' . ((&lines * 74 + 46) / 92)
+exe '3resize ' . ((&lines * 65 + 40) / 81)
-exe 'vert 3resize ' . ((&columns * 153 + 118) / 237)
+exe 'vert 3resize ' . ((&columns * 91 + 91) / 182)
 argglobal
 setlocal keymap=
 setlocal noarabic
 setlocal autoindent
+setlocal balloonexpr=
 setlocal nobinary
 setlocal bufhidden=
 setlocal buflisted
@@ -830,7 +848,7 @@ setlocal nowinfixwidth
 setlocal wrap
 setlocal wrapmargin=0
 silent! normal! zE
-let s:l = 7 - ((5 * winheight(0) + 44) / 89)
+let s:l = 7 - ((4 * winheight(0) + 39) / 78)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
@@ -842,6 +860,7 @@ edit models/com/jdbernard/timestamper/PunchcardDialogModel.groovy
 setlocal keymap=
 setlocal noarabic
 setlocal autoindent
+setlocal balloonexpr=
 setlocal nobinary
 setlocal bufhidden=
 setlocal buflisted
@@ -933,7 +952,7 @@ setlocal nowinfixwidth
 setlocal wrap
 setlocal wrapmargin=0
 silent! normal! zE
-let s:l = 8 - ((7 * winheight(0) + 7) / 14)
+let s:l = 8 - ((6 * winheight(0) + 6) / 12)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
@@ -945,6 +964,7 @@ edit controllers/com/jdbernard/timestamper/PunchcardDialogController.groovy
 setlocal keymap=
 setlocal noarabic
 setlocal autoindent
+setlocal balloonexpr=
 setlocal nobinary
 setlocal bufhidden=
 setlocal buflisted
@@ -1036,18 +1056,18 @@ setlocal nowinfixwidth
 setlocal wrap
 setlocal wrapmargin=0
 silent! normal! zE
-let s:l = 1 - ((0 * winheight(0) + 37) / 74)
+let s:l = 1 - ((0 * winheight(0) + 32) / 65)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
 1
 normal! 0
 wincmd w
-exe 'vert 1resize ' . ((&columns * 83 + 118) / 237)
+exe 'vert 1resize ' . ((&columns * 90 + 91) / 182)
-exe '2resize ' . ((&lines * 14 + 46) / 92)
+exe '2resize ' . ((&lines * 12 + 40) / 81)
-exe 'vert 2resize ' . ((&columns * 153 + 118) / 237)
+exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
-exe '3resize ' . ((&lines * 74 + 46) / 92)
+exe '3resize ' . ((&lines * 65 + 40) / 81)
-exe 'vert 3resize ' . ((&columns * 153 + 118) / 237)
+exe 'vert 3resize ' . ((&columns * 91 + 91) / 182)
 tabedit conf/Application.groovy
 set splitbelow splitright
 set nosplitbelow
@@ -1058,6 +1078,7 @@ argglobal
 setlocal keymap=
 setlocal noarabic
 setlocal autoindent
+setlocal balloonexpr=
 setlocal nobinary
 setlocal bufhidden=
 setlocal buflisted
@@ -1149,7 +1170,7 @@ setlocal nowinfixwidth
 setlocal wrap
 setlocal wrapmargin=0
 silent! normal! zE
-let s:l = 28 - ((27 * winheight(0) + 45) / 90)
+let s:l = 28 - ((24 * winheight(0) + 39) / 79)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
@@ -1165,12 +1186,13 @@ set nosplitbelow
 set nosplitright
 wincmd t
 set winheight=1 winwidth=1
-exe 'vert 1resize ' . ((&columns * 118 + 118) / 237)
+exe 'vert 1resize ' . ((&columns * 90 + 91) / 182)
-exe 'vert 2resize ' . ((&columns * 118 + 118) / 237)
+exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
 argglobal
 setlocal keymap=
 setlocal noarabic
 setlocal autoindent
+setlocal balloonexpr=
 setlocal nobinary
 setlocal bufhidden=
 setlocal buflisted
@@ -1271,7 +1293,7 @@ normal zc
 normal zc
 76
 normal zc
-let s:l = 215 - ((214 * winheight(0) + 44) / 89)
+let s:l = 215 - ((188 * winheight(0) + 39) / 78)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
@@ -1283,6 +1305,7 @@ edit ../src/main/com/jdbernard/timestamper/GUIUtil.groovy
 setlocal keymap=
 setlocal noarabic
 setlocal autoindent
+setlocal balloonexpr=
 setlocal nobinary
 setlocal bufhidden=
 setlocal buflisted
@@ -1374,16 +1397,16 @@ setlocal nowinfixwidth
 setlocal wrap
 setlocal wrapmargin=0
 silent! normal! zE
-let s:l = 127 - ((39 * winheight(0) + 44) / 89)
+let s:l = 1 - ((0 * winheight(0) + 39) / 78)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-127
+1
-normal! 024l
+normal! 0
 wincmd w
-exe 'vert 1resize ' . ((&columns * 118 + 118) / 237)
+exe 'vert 1resize ' . ((&columns * 90 + 91) / 182)
-exe 'vert 2resize ' . ((&columns * 118 + 118) / 237)
+exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
-tabnext 2
+tabnext 4
 if exists('s:wipebuf')
   silent exe 'bwipe ' . s:wipebuf
 endif
@@ -1391,7 +1414,7 @@ unlet! s:wipebuf
 set winheight=1 winwidth=20 shortmess=filnxtToO
 let s:sx = expand("<sfile>:p:r")."x.vim"
 if file_readable(s:sx)
-  exe "source " . s:sx
+  exe "source " . fnameescape(s:sx)
 endif
 let &so = s:so_save | let &siso = s:siso_save
 doautoall SessionLoadPost