[jsword-devel] Patch for clean install

[DM Smith]

This is a multi-part message in MIME format.

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

Joe,
I worked on it and have a potential solution. I guess I am in a different 
timezone (Eastern, USA).

I found a bug in setChapter and setVerse in BibleComboBoxModel. The first 
argument to the Verse ctor was the chapter when it should have been the 
book.

I changed the methods setBook to honor chapter and verse and setChapter to 
honor verse, if they could. Otherwise, I set them to 1.

I found that if this was not done, then it would be possible for book to 
change from what the user selected. For example, the user is in Psalm 119:6 
and then changes the Book combo to Genesis.
Internally, the verse is set to a later book than Genesis since it only has 
50 chapters. This triggers a call to cbo_book.setSelectedItem(book). 
However, the code in JComboBox causes it to be ignored since the JComboBox 
protects item changes during their processing.

Thus, it is not possible to change the selection while handling a selection 
change. I spent a lot of time in JComboBox and ComboBoxModel figuring this 
out. Bit of a bummer.

Anyway these changes were fairly simple.

The other change was to BibleComboBoxModelSet and it was a little bit more 
significant. First, I changed from ActionListener to ItemListener. 
ItemListener is the stated way of listening for selection changes. I moved 
the call to fireContentsChanged out of the listener and into the setVerse 
routine.

I made progress in the setVerse routine dependent upon whether the verse was 
different. This was needed to prevent infinite recursion. I then called 
setSelectedItem on the book, chapter and/or verse only if it differed from 
what it was.

Anyway, feel free to use this as a starting point or to throw it away for 
what you had in mind.

DM



Joe Walker wrote:
>
>About to go to bed.
>Had a quick look, applied - Thanks!
>I've got thoughts on the verse thing but more tomorrow.
>
>Joe.
>
>DM Smith wrote:
>
... stuff deleted........
>
>>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.

_________________________________________________________________
Free up your inbox with MSN Hotmail Extra Storage. Multiple plans available. 
http://join.msn.com/?pgmarket=en-us&page=hotmail/es2&ST=1/go/onm00200362ave/direct/01/

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

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


------=_NextPart_000_24eb_68d8_5ee4--