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

[jswordcvs at crosswire.org]

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

Modified Files:
	ViewSourcePane.java DesktopActions.java Msg.properties 
	AboutPane.java 
Removed Files:
	DebugPane.java 
Log Message:
build changes. Bug fix to view source pane.

--- DebugPane.java DELETED ---

Index: Msg.properties
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/Msg.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Msg.properties	8 Mar 2005 02:31:36 -0000	1.10
--- Msg.properties	14 May 2005 00:08:20 -0000	1.11
***************
*** 9,13 ****
  Desktop.Title=Bible Desktop
  Desktop.Splash=Bible Desktop
! Desktop.Version=0.9.9
  Desktop.VersionTitle=Version {0}
  Desktop.VersionAppTitle={0} v{1}
--- 9,13 ----
  Desktop.Title=Bible Desktop
  Desktop.Splash=Bible Desktop
! Desktop.Version=1.0
  Desktop.VersionTitle=Version {0}
  Desktop.VersionAppTitle={0} v{1}

Index: AboutPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/AboutPane.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** AboutPane.java	10 May 2005 02:40:11 -0000	1.11
--- AboutPane.java	14 May 2005 00:08:20 -0000	1.12
***************
*** 41,47 ****
  import javax.swing.SwingConstants;
  
- import org.crosswire.common.progress.swing.JobsViewPane;
  import org.crosswire.common.swing.ActionFactory;
- import org.crosswire.common.swing.ExceptionShelf;
  import org.crosswire.common.swing.GuiUtil;
  import org.crosswire.common.swing.MapTableModel;
--- 41,45 ----
***************
*** 60,66 ****
       * Basic constructor
       */
!     public AboutPane(Desktop desktop)
      {
!         init(desktop);
      }
  
--- 58,64 ----
       * Basic constructor
       */
!     public AboutPane()
      {
!         init();
      }
  
***************
*** 68,72 ****
       * Build the GUI components
       */
!     private void init(Desktop desktop)
      {
          Icon icon = GuiUtil.getIcon(Msg.SPLASH_IMAGE.toString());
--- 66,70 ----
       * Build the GUI components
       */
!     private void init()
      {
          Icon icon = GuiUtil.getIcon(Msg.SPLASH_IMAGE.toString());
***************
*** 115,126 ****
              tabMain.add(pnlSplash, Msg.getApplicationTitle());
  
-             // create and add the Exception shelf
-             ExceptionShelf pnlShelf = new ExceptionShelf();
-             JPanel pnlHshelf = new JPanel();
-             pnlHshelf.setLayout(new BorderLayout());
-             pnlHshelf.add(pnlShelf, BorderLayout.NORTH);
-             pnlHshelf.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-             tabMain.add(pnlHshelf, Msg.ERROR_TAB_TITLE.toString());
- 
              // create and add the System Properties tab
              JTable tblProps = new JTable();
--- 113,116 ----
***************
*** 138,149 ****
              tabMain.add(pnlProps, Msg.SYSTEM_PROPS_TAB_TITLE.toString());
  
-             // create and add the Tasks tab
-             JobsViewPane pnlJobs = new JobsViewPane();
-             tabMain.add(pnlJobs, Msg.TASK_TAB_TITLE.toString());
- 
-             // create and add the Debug tab
-             //tabMain.add(pnlLogs, "Logs");
-             DebugPane pnlDebug = new DebugPane(desktop);
-             tabMain.add(pnlDebug, Msg.DEBUG_TAB_TITLE.toString());
          }
      }
--- 128,131 ----

Index: DesktopActions.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/DesktopActions.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** DesktopActions.java	10 May 2005 02:40:11 -0000	1.27
--- DesktopActions.java	14 May 2005 00:08:20 -0000	1.28
***************
*** 373,377 ****
          if (atp == null)
          {
!             atp = new AboutPane(getDesktop());
          }
  
--- 373,377 ----
          if (atp == null)
          {
!             atp = new AboutPane();
          }
  

Index: ViewSourcePane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/ViewSourcePane.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ViewSourcePane.java	10 May 2005 02:40:11 -0000	1.16
--- ViewSourcePane.java	14 May 2005 00:08:20 -0000	1.17
***************
*** 138,142 ****
  //        txtOsis.setText(osis);
  //        txtOsis.setCaretPosition(0);
!         JTextArea txtOsis = new JTextArea(html, 24, 80);
          txtOsis.setFont(userRequestedFont);
          txtOsis.setLineWrap(true);
--- 138,142 ----
  //        txtOsis.setText(osis);
  //        txtOsis.setCaretPosition(0);
!         JTextArea txtOsis = new JTextArea(osis, 24, 80);
          txtOsis.setFont(userRequestedFont);
          txtOsis.setLineWrap(true);
***************
*** 155,159 ****
  //        txtHtml.setText(html);
  //        txtHtml.setCaretPosition(0);
!         JTextArea txtHtml = new JTextArea(osis, 24, 80);
          txtHtml.setFont(userRequestedFont);
          txtHtml.setLineWrap(true);
--- 155,159 ----
  //        txtHtml.setText(html);
  //        txtHtml.setCaretPosition(0);
!         JTextArea txtHtml = new JTextArea(html, 24, 80);
          txtHtml.setFont(userRequestedFont);
          txtHtml.setLineWrap(true);