[Babeldoc-devel] babeldoc/modules/gui/src/com/babeldoc/gui/journal/browser JournalBrowserFrame.java,1.5,1.6 JournalTree.java,1.4,1.5 JournalBrowserModel.java,1.3,1.4

[David G. <dgl...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/journal/browser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12980/babeldoc/modules/gui/src/com/babeldoc/gui/journal/browser

Modified Files:
	JournalBrowserFrame.java JournalTree.java 
	JournalBrowserModel.java 
Log Message:
Show most current journal tickets first; prepare for user-selectable
ticket-count option

Index: JournalBrowserFrame.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/journal/browser/JournalBrowserFrame.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JournalBrowserFrame.java	6 Sep 2003 00:58:45 -0000	1.5
--- JournalBrowserFrame.java	20 Dec 2004 18:02:50 -0000	1.6
***************
*** 73,77 ****
  import java.util.Set;
  
- import javax.swing.JEditorPane;
  import javax.swing.JFrame;
  import javax.swing.JMenu;
--- 73,76 ----
***************
*** 93,97 ****
  
  import com.babeldoc.core.config.ConfigService;
- import com.babeldoc.core.journal.IJournal;
  import com.babeldoc.core.journal.JournalException;
  import com.babeldoc.core.journal.JournalOperation;
--- 92,95 ----
***************
*** 114,118 ****
    private String TITLE_MESSAGE =  "JournalBrowser v" + version;
    private String ABOUT_MESSAGE =  TITLE_MESSAGE + "\n\n" +
! 								    "(C)opyright 2000-2003 The Apache Software Foundation\n" +
  								    "All rights reserved";
    private String COMING_SOON_MESSAGE = "This feature will soon be implemented.\nPlease be patient!";
--- 112,116 ----
    private String TITLE_MESSAGE =  "JournalBrowser v" + version;
    private String ABOUT_MESSAGE =  TITLE_MESSAGE + "\n\n" +
! 								    "(C)opyright 2000-2005 The Apache Software Foundation\n" +
  								    "All rights reserved";
    private String COMING_SOON_MESSAGE = "This feature will soon be implemented.\nPlease be patient!";
***************
*** 272,276 ****
  
      // Link the controller to this frame.
!     JournalTree tree = new JournalTree(model);
  
      tree.getModel().addTreeModelListener(new MyTreeModelListener());
--- 270,274 ----
  
      // Link the controller to this frame.
!     JournalTree tree = new JournalTree(model, journalStart, journalCount);
  
      tree.getModel().addTreeModelListener(new MyTreeModelListener());

Index: JournalBrowserModel.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/journal/browser/JournalBrowserModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JournalBrowserModel.java	6 Sep 2003 00:58:45 -0000	1.3
--- JournalBrowserModel.java	20 Dec 2004 18:02:51 -0000	1.4
***************
*** 69,72 ****
--- 69,73 ----
  import com.babeldoc.core.journal.*;
  import com.babeldoc.core.journal.query.JournalQuery;
+ import com.babeldoc.core.journal.query.QueryOption;
  import com.babeldoc.core.journal.query.QueryTicket;
  
***************
*** 120,126 ****
    public QueryTicket[] getTickets(int start, int number) {
      try {
        JournalOperation[] jo = new JournalOperation[] { JournalOperation.newTicket };
        JournalQuery jQuery = new JournalQuery(start, number, null, new Date(),
!           null, jo);
  
        return JournalFactory.getJournal().getTickets(jQuery);
--- 121,128 ----
    public QueryTicket[] getTickets(int start, int number) {
      try {
+       QueryOption[] qo = new QueryOption[] { QueryOption.newestFirst };
        JournalOperation[] jo = new JournalOperation[] { JournalOperation.newTicket };
        JournalQuery jQuery = new JournalQuery(start, number, null, new Date(),
!           qo, jo);
  
        return JournalFactory.getJournal().getTickets(jQuery);

Index: JournalTree.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/journal/browser/JournalTree.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JournalTree.java	6 Sep 2003 00:58:45 -0000	1.4
--- JournalTree.java	20 Dec 2004 18:02:51 -0000	1.5
***************
*** 88,91 ****
--- 88,94 ----
    private DefaultTreeModel journalTreeModel;
    private JournalBrowserModel browserModel;
+   private int journalStart = 0;
+   private int journalCount = 100;
+   
  
    /**
***************
*** 94,98 ****
     * @param browserModel DOCUMENT ME!
     */
!   public JournalTree(JournalBrowserModel browserModel) {
      super();
      this.browserModel = browserModel;
--- 97,101 ----
     * @param browserModel DOCUMENT ME!
     */
!   public JournalTree(JournalBrowserModel browserModel, int journalStart, int journalCount) {
      super();
      this.browserModel = browserModel;
***************
*** 101,105 ****
      this.journalTreeModel = new DefaultTreeModel(this.rootNode);
  
!     this.populateTree();
      super.setModel(this.journalTreeModel);
  
--- 104,108 ----
      this.journalTreeModel = new DefaultTreeModel(this.rootNode);
  
!     this.populateTree(journalStart, journalCount);
      super.setModel(this.journalTreeModel);
  
***************
*** 112,116 ****
     */
    private void populateTree() {
!   	populateTree(0, 100);
    }
  
--- 115,119 ----
     */
    private void populateTree() {
!   	populateTree(journalStart, journalCount);
    }