[jsword-svn] bibledesktop/java/main/org/crosswire/bibledesktop/book s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book
In directory www.crosswire.org:/tmp/cvs-serv15185/java/main/org/crosswire/bibledesktop/book

Modified Files:
	SitesPane.java SitePane.java 
Log Message:
Installer improvements
BD-15

Index: SitePane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/SitePane.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SitePane.java	28 Sep 2004 22:25:06 -0000	1.10
--- SitePane.java	2 Oct 2004 14:01:38 -0000	1.11
***************
*** 239,243 ****
                  {
                      // Is the book already installed? Then nothing to do.
!                     if (Books.installed().getBookMetaData(name.getName()) != null)
                      {
                          Reporter.informUser(this, Msg.INSTALLED, name.getName());
--- 239,244 ----
                  {
                      // Is the book already installed? Then nothing to do.
!                     BookMetaData bmd = Books.installed().getBookMetaData(name.getName());
!                     if (bmd != null && ! installer.isNewer(bmd))
                      {
                          Reporter.informUser(this, Msg.INSTALLED, name.getName());
***************
*** 245,249 ****
                      }
  
!                     float size = NetUtil.getSize(installer.toURL(name)) / 1024;
                      if (JOptionPane.showConfirmDialog(this, Msg.SIZE.toString(new Object[] {name.getName(), new Float(size)}),
                                      Msg.CONFIRMATION_TITLE.toString(),
--- 246,250 ----
                      }
  
!                     float size = NetUtil.getSize(installer.toRemoteURL(name)) / 1024;
                      if (JOptionPane.showConfirmDialog(this, Msg.SIZE.toString(new Object[] {name.getName(), new Float(size)}),
                                      Msg.CONFIRMATION_TITLE.toString(),

Index: SitesPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/SitesPane.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SitesPane.java	21 Sep 2004 17:46:47 -0000	1.7
--- SitesPane.java	2 Oct 2004 14:01:38 -0000	1.8
***************
*** 17,20 ****
--- 17,21 ----
  import javax.swing.JTabbedPane;
  
+ import org.crosswire.common.progress.swing.JobsProgressBar;
  import org.crosswire.common.swing.ActionFactory;
  import org.crosswire.jsword.book.install.InstallManager;
***************
*** 105,121 ****
          actions = new ActionFactory(SitesPane.class, this);
  
-         JButton btnOK = new JButton(actions.getAction(CLOSE));
- 
-         JButton btnAdd = new JButton(actions.getAction(EDIT_SITE));
- 
-         pnlButtons = new JPanel();
-         pnlButtons.setLayout(new FlowLayout(FlowLayout.RIGHT));
-         pnlButtons.add(btnAdd, null);
-         pnlButtons.add(btnOK);
- 
          tabMain = new JTabbedPane();
          this.setLayout(new BorderLayout());
          this.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
          this.add(tabMain, BorderLayout.CENTER);
      }
  
--- 106,114 ----
          actions = new ActionFactory(SitesPane.class, this);
  
          tabMain = new JTabbedPane();
          this.setLayout(new BorderLayout());
          this.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
          this.add(tabMain, BorderLayout.CENTER);
+         this.add(new JobsProgressBar(true), BorderLayout.SOUTH);
      }