[jsword-devel] Patch for clean install

[DM Smith]

This is a multi-part message in MIME format.

------=_NextPart_000_442a_6201_56c9
Content-Type: text/plain; format=flowed

On a clean install, with no books installed there are null pointer errors in 
the CommentaryPane and in DisplaySelectPane. This is because the calls to 
get the selected item from the combo boxes returns a null BookMetaData. In 
CommentaryPane, I had the routines check for null and if null, returned. 
With DisplaySelectPane, I checked for null and if null, popped up a warning 
and returned.

I fixed a small display bug with the commentary verse picker. When you chose 
a book that had more than 99 chapters or a chapter that had more than 99 
verses, the combo box would display "..." for numbers higher than 99. The 
solution was to use a prototype display value.

I also fixed the BooksComboBoxModel to update the selection correctly.

I made a few small changes to build.xml. The jdepend was recommending a 
change so I did that. I also based findbugs on "jnlp" rather than "jar".

I have found another bug in the workings of the commentary verse picker. If 
you change the book to Psalms and then the chapter to 119 and then change 
the book to 1 John, it still shows the chapter as 119, but the drop down 
does not list it. I began poking around in the code and I found another 
problem. 1 John 119.1 computes a verse based upon addition. According to the 
comment in the documentation for the Verse constructor, this allows for 
addition, Gen 1.50 would yeild something in Gen 2 because there are less 
than 50 verses in Gen 1. In the context of a verse picker, I think that this 
violates my "least suprise" principle.

I think the user would be suprised that the selected verse was not valid and 
was re-adjusted to something else.

I tried to simulate a different algorithm to establish the "viewed verse" 
for BibleComboBoxModelSet. I was able to get that to work by setting in 
BibleComboBoxModel the chapter and verse to 1 when a new book was selected 
and setting the verse to 1 when a new chapter is selected. However, the 
display did not update. When I tried to adjust the display, I got into an 
infinite loop. Anyway, I'll figure it out.

_________________________________________________________________
Is your PC infected? Get a FREE online computer virus scan from McAfeeŽ 
Security. http://clinic.mcafee.com/clinic/ibuy/campaign.asp?cid=3963

------=_NextPart_000_442a_6201_56c9
Content-Type: application/x-zip-compressed; name="patchempty.zip"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="patchempty.zip"

UEsDBBQAAAAIAFaMeTCo8tzycAoAAPMtAAAOAAAAcGF0Y2hlbXB0eS50eHTl
GmuT2jjy86Qq/0HL7QcYBvMehsmQyntr9naSVMjl7tuWsAV4xrYoS2Zgs/Pf
t1uSjQxmeCS5qr1TFdjI3a3uVj9lriOPLS7JKPEDz1mEwdMng28fT5/ETMY+
m/vRhMRwET6PSNPp9Z4+8fzxmNQSUovxt71wrVZb/TxpdcgNjUmr0eiQVvuy
2bvsNEmtAeNEE6pWqzZ41wJvXbb7l20D/vTJixek1mmfnzU7pKqubfLixdMn
BMdVeOf5MYHPoPTzV0njCZPOPRs91G89NmORV6o/T0GZO+UkZELQCRuUrsdE
Tn1BxtQPBFnyhIT+ZCpJxJhHJCdxEgEAIzSSgT8SRFJxh/Muny3JLY0F/oCH
dXh6aa1i1iVjHodUDkogXYnwRM4SOfYDZrEpWTjL+EyvtZjNeCwdhQY07gal
JRMlIF8jegHBk9hlYkbldDUL8zjBAhaySBK8x5U0rHNL5/Sh7vIw5JFi9QCs
W3HPY+9QLMHiecDkwWj3YHI20lU9L27VTLsBFWJ9dssKRt0GJaeHwxAtVRyG
uBLrQDxLi6nk9bzoKTk1u2ET4BeCyTX3SMmvjFbBonVawNm+xA8l4kdukHhM
DEqnp/VTnNyBnMyUFUvOA5HZeKuzi5KRzsiBjt9t9896pNptX8DFuP1VXUuC
eHrip1ptV1Dbc9RqWoFXegkS0RB8FiKKM/Yjb5RMRIloaUAE5F5vzX7gUTAr
ZYFia+TKMFdBBYOPx8aG/Iq00paeZF7iJKHnuCJb2oHwhJjOO5h4BROf4UfJ
0vaGsrvNM4jE1W63cda2oiwOHcLe5UNYjt+6CV1yIUsWop79jc1ZMCgF/N5+
JuDJoCSZwsh843YeAnlQWO0/4aLbbIU2ihUbFPsk4C6VkKAsttBojbcqCyN2
RNGG/RGk3jfgXdFk8TpV1SYSruXxsNFXl8yk90YO+KRz22z19E2t6bSc3hFU
aDSB9Gmim6jh71rLaRxO6ZYuRs0GmCyH4OHVj5JpjYagi2+msaAg0rdTYZhN
rsNZcCwpdanRmf9tBLCo+DYK8fEc5DLKVjfSdRQELeMTNZXHVh51MIGM3xSz
kN9tq3PhiyMpbHWK48hETIKbNo+ms2FBR6Dn7OcI/Pjo1e2AcBhqUYA7kELi
sogBiXYN0g4NjiQDdhzQca3hdI4kABMZJjGYUITsn2U2i/GdKAU19W6c9YJa
1TdZpj09JZ+hxxnzABIzdnvQEGEDBC0Qj4IlNiCqCUqiROBcPHHcmAugGsMK
2qfnPruHmtLPk72WxKURGTHI/yGfA/L9lEVQsPi4hplzLBybsd1xbCTGrTYE
ho3tg00gllLUWjQAUZQ8RrbRUkmVFi5kkvj59VcUbG3t7l/2bi22VRwHYO3b
VGy1oayjyElr5lLdPC+ouK/1oQNS1FzUwTDqmWEYeepoGOb5iPO7+it/FLDX
PBzxV3xxwz0WDFWtNqc/9NTiIn9ocUEe4wMPMb6fXCfNFvngSjzWaJPGOZ6C
dDvZKQgwhocg33G5zVOUbt8+Ren2zs6huu+dXeRrezwIcdwR/92d0plkMRkQ
69eztM3Sw3riQMunOCiHXpBOVp5ZFlmvY4CJGaHwAZePSbPRIAZSQDcIzhoy
goIJC21tjY8xl1wuZ+yNL2YBXX6hQcLKEbsn15FkExaX+/1+BRcu5JJ63ksX
S5PffCEhfcRllwYZ9IMSD9VzfoHq6TW2qgf4F8woR90XqEbN5xWjpvZQi4Jb
KSXV0nfXi2ZxH60c6+m4nTkT/fFu3s27eZdsZeIoHy8mdnJB3rFRdsrZaF+2
Wpl/d4/07y1L7XLuTu+sT6rqO7Per3avncxgj8d+YHyUWAdF/piUR6EnHOH/
wcoV8pw0KpbZ4WOI/kP7YUb3q0UHh5vEMeafASmjKDdM0jdU0gpRCwCZciPn
C4/iAPhbnc9eGrwM52HDf3sqvMF323LgWTIKfJfYZJHqENKkK5lnz5crBWoD
a0viKOUwZRwWrZrb+ikpRzyq/Qqb5HE309speSEYe6Rm0t0U7rmj9hz9UO33
P1zqTlnKkaFWN3cz8HnFOZlz3yOboF8t3ao9dywYW/H5eIRnRKoqmqFT8URA
uSSMkogvWWiBA88Bg+puzBNAGpAxDVQsXBkM7CWaEjzL7MZ+jnVlGYF8gGg8
g8uVgoe7atW2PFsYRVhb4som/AoZDNLdqaxBr2PjSHmWcZJjGceD9du+z2vq
egz6IPcUSmUuDT2JxS3z4RITPAeVHKrLWEiSVmMgcJQEwZpT/aSwKxuMFks9
LHROHEWCHuBTW5WAg8HeHrQcyrlDs9nV3NZPT49ONhAqURYaLz/SiP34RNNq
5TMNRPxCFo5JMwWETlqNVdxvnl92oIa8yHIMMnNMkilcaEeCaTb7+O6tqq5W
klGxSd2sxaZk5lGZ1iZ2cM3FCR+3XRdVruZKZYk0QCur0NFjzXkM4gA4eyxk
6AD+LG+AVbu8i5f5dGZjky+q5ksrP/BtZE5NlnPpCEfMxgDzkapXjO+oK3m8
hODPQAtmshAHS7FyViSStXx6kI5ypHM5D7LvZihw05SsFjCrb9DQ+B5+D5AO
YuB8uYJ3KrGAFIitzKTbUK9qm93zs2a30Ex0Sh6Cd4FrAYkPw+vhUDWhtpXk
qhOlWh1bKt/LgCya5M8/Sd6eUsANgzAFQalkq/shr7kNk/rb7uiRQdk4vRbn
vxOXm518XAYb3MbFMaG5mNajDQBydExw3rLUrvjcbmP5C9/mRakf4ou3tQJU
n1A5ifQD55N6M6cb/EJgU61mJeregO9UlyHQ5/aCT+13rwWGjMbudBfoTAdc
559suS/oez5M3KmK7W8XLpthc2yCWqvfROW2+q2zZmuP1OdxzaXusAtzX4Ev
h16Aq0d2JMg3KM/WQpjC2wyL9jonEUca15GQNAiYlydyUpge09sdudFE8BmN
aYgl9UJqqZH/z2why2lOaDea+Ba/3bDe4ueH0IiQXz8xAWS13mJzvxEIHzbz
JAqpDpL2UuQq4tmir9PJhcZ1HsCyyB18BgpavXUvazGKwi4oB2uACYqodAOo
SPs9DSHrZYpqKTtrty72tbMbKv//zEwJvWllbW1lnc4PtjKs1TDp7KPKHYa2
IrWnrRmEXeYGfeo9w9oqLUc/41sQoTrvEchLQlShUQgTRoHnF3iG1L5obqvc
Yn8Oxey+5f3f0/YKogoeue/FfPFun+SoPLrRZrdMKwFgucZhDXgMSQw7ORp5
N9TTJ7+54uHtHArLMp5fnyHFM81DFm06PUhnDVLt9LdveP60aUqjCfuiTfB/
dcvV4bwviEvBTeAq6JiBz7g0gRYQnIqKO6b+36nfJKkDezw4w3bvB+Skk70T
0sG2YzbytdpVbx/zgXVX1nPRUa+TIKlDrZ2Lt+sRPK00HT/C/8X+S7DYkDU9
SjrSc6Lc+eppqo3TlD1CiefTgE+wj/LxfyeQH+SUShJxvSu4cX5qHNl7ZusU
1QpkG6ZkgGx7+/WDKgdVNS6m/P5G/4/4jeLCyFJ6X7R46ZEHNtV/v/z0/vr9
L7/fvB0OX/7yNlPL+jHZX1BLAQIUCxQAAAAIAFaMeTCo8tzycAoAAPMtAAAO
AAAAAAAAAAEAIAAAAAAAAABwYXRjaGVtcHR5LnR4dFBLBQYAAAAAAQABADwA
AACcCgAAAAA=


------=_NextPart_000_442a_6201_56c9--