[jsword-svn] r1261 - in trunk/bibledesktop: etc/bin src/main/java/org/crosswire/bibledesktop/book src/main/java/org/crosswire/bibledesktop/passage

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2007-03-22 14:01:01 -0700 (Thu, 22 Mar 2007)
New Revision: 1261

Modified:
   trunk/bibledesktop/etc/bin/BibleDesktop.sh
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeySidebar.java
Log:
Fix buttons for Mac where they had an empty border.
Fix BibleDesktop.sh syntax errors.

Modified: trunk/bibledesktop/etc/bin/BibleDesktop.sh
===================================================================
--- trunk/bibledesktop/etc/bin/BibleDesktop.sh	2007-03-22 19:57:47 UTC (rev 1260)
+++ trunk/bibledesktop/etc/bin/BibleDesktop.sh	2007-03-22 21:01:01 UTC (rev 1261)
@@ -89,12 +89,12 @@
 
 # define the location of the jar files
 JSWORD_LIB="$JSWORD_HOME"
-if [-e "${JSWORD_LIB}/lib"] ; then
+if [ -e "${JSWORD_LIB}/lib" ] ; then
   JSWORD_LIB=$JSWORD_HOME
 fi
 
 # This is redundant if we are using the endorsed.dirs method
-for i in "${JSWORD_LIB}"*.jar
+for i in "${JSWORD_LIB}"/*.jar
 do
   # if the directory is empty, then it will return the input string
   # this is stupid, so case for it
@@ -121,7 +121,7 @@
 # Note: We always pass the "apple" arguments, even when not on a mac.
 JSWORD_PROPERTIES=-Dapple.laf.useScreenMenuBar=true
 JSWORD_PROPERTIES="$JSWORD_PROPERTIES -Dcom.apple.mrj.application.apple.menu.about.name=BibleDesktop"
-[-e "$JSWORD_HOME/JSword"] && JSWORD_PROPERTIES="$JSWORD_PROPERTIES -Djsword.home=$JSWORD_HOME/JSword"
-[-e "$ROOT/mods.d"]        && JSWORD_PROPERTIES="$JSWORD_PROPERTIES -Dsword.home=$ROOT"
+[ -e "$JSWORD_HOME/JSword" ] && JSWORD_PROPERTIES="$JSWORD_PROPERTIES -Djsword.home=$JSWORD_HOME/JSword"
+[ -e "$ROOT/mods.d" ]        && JSWORD_PROPERTIES="$JSWORD_PROPERTIES -Dsword.home=$ROOT"
 
 "$JAVACMD" -classpath "${LOCALCLASSPATH}" $JSWORD_PROPERTIES org.crosswire.bibledesktop.desktop.Desktop

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java	2007-03-22 19:57:47 UTC (rev 1260)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java	2007-03-22 21:01:01 UTC (rev 1261)
@@ -35,7 +35,6 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 
-import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
@@ -161,26 +160,26 @@
         });
         btnKey = new JButton(actions.getAction(MORE));
         btnKey.setIcon(ICON_SELECT);
-        btnKey.setBorder(BorderFactory.createEmptyBorder(3, 5, 3, 5));
+        //btnKey.setBorder(BorderFactory.createEmptyBorder(3, 5, 3, 5));
         btnKeyGo = new JButton(actions.getAction(GO_PASSAGE));
-        btnKeyGo.setBorder(BorderFactory.createEmptyBorder(4, 5, 4, 5));
+        //btnKeyGo.setBorder(BorderFactory.createEmptyBorder(4, 5, 4, 5));
 
         txtSearch = new JTextField();
         txtSearch.setAction(actions.getAction(SEARCH_FIELD));
         JLabel lblSearch = actions.createJLabel(SEARCH_LABEL);
         lblSearch.setLabelFor(txtSearch);
         btnSearch = new JButton(actions.getAction(GO_SEARCH));
-        btnSearch.setBorder(BorderFactory.createEmptyBorder(4, 5, 4, 5));
+        //btnSearch.setBorder(BorderFactory.createEmptyBorder(4, 5, 4, 5));
 
         JButton btnHelp = new JButton(actions.getAction(HELP));
-        btnHelp.setBorder(BorderFactory.createEmptyBorder(2, 5, 2, 5));
+        //btnHelp.setBorder(BorderFactory.createEmptyBorder(2, 5, 2, 5));
         btnHelp.setText(null);
         dlgHelp = new QuickHelpDialog(GuiUtil.getFrame(this), Msg.HELP_TITLE.toString(), Msg.HELP_TEXT.toString());
 
         btnAdvanced = new JButton(actions.getAction(ADVANCED));
-        btnAdvanced.setBorder(BorderFactory.createEmptyBorder(3, 5, 3, 5));
+        //btnAdvanced.setBorder(BorderFactory.createEmptyBorder(3, 5, 3, 5));
         btnIndex = new JButton(actions.getAction(INDEX));
-        btnIndex.setBorder(BorderFactory.createEmptyBorder(3, 15, 3, 15));
+        //btnIndex.setBorder(BorderFactory.createEmptyBorder(3, 15, 3, 15));
 
         this.setLayout(new GridBagLayout());
         this.add(lblBible,    new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 5), 0, 0));

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeySidebar.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeySidebar.java	2007-03-22 19:57:47 UTC (rev 1260)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeySidebar.java	2007-03-22 21:01:01 UTC (rev 1261)
@@ -29,7 +29,6 @@
 import java.util.List;
 
 import javax.swing.Action;
-import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JList;
 import javax.swing.JPanel;
@@ -99,14 +98,14 @@
         actBlur5 = actions.getAction(BLUR5);
 
         JButton delete = new JButton(actDelete);
-        delete.setBorder(BorderFactory.createEmptyBorder(2, 5, 2, 5));
+        //delete.setBorder(BorderFactory.createEmptyBorder(2, 5, 2, 5));
         delete.setText(null);
         JButton blur1 = new JButton(actBlur1);
         blur1.setText(null);
-        blur1.setBorder(BorderFactory.createEmptyBorder(2, 5, 2, 5));
+        //blur1.setBorder(BorderFactory.createEmptyBorder(2, 5, 2, 5));
         JButton blur5 = new JButton(actBlur5);
         blur5.setText(null);
-        blur5.setBorder(BorderFactory.createEmptyBorder(2, 5, 2, 5));
+        //blur5.setBorder(BorderFactory.createEmptyBorder(2, 5, 2, 5));
 
         JPanel mutate = new JPanel(new FlowLayout());
         mutate.add(delete);