[jsword-svn] r1473 - in trunk: biblemapper/src/main/java/org/crosswire/biblemapper/swing biblemapper/src/main/resources common-swing/src/main/java/org/crosswire/common/config/swing common-swing/src/main/java/org/crosswire/common/progress/swing common-swing/src/main/java/org/crosswire/common/swing common-swing/src/main/java/org/crosswire/common/swing/desktop jsword/src/main/java/org/crosswire/jsword/book jsword/src/main/java/org/crosswire/jsword/book/filter/thml jsword/src/main/java/org/crosswire/jsword/book/sword jsword-limbo/src/historic/java/org/crosswire/bible/view/swing/beans jsword-limbo/src/historic/java/org/crosswire/jsword/view/cli jsword-limbo/src/historic/java/org/crosswire/swing jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop jsword-limbo/src/main/java/org/crosswire/bibledesktop/journal jsword-limbo/src/main/java/org/crosswire/common/swing jsword-limbo/src/main/java/org/crosswire/jsword/book
dmsmith at www.crosswire.org
dmsmith at www.crosswire.org
Wed Jul 4 08:22:51 MST 2007
Author: dmsmith
Date: 2007-07-04 08:22:50 -0700 (Wed, 04 Jul 2007)
New Revision: 1473
Modified:
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/Mapper.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/RuleSlider.java
trunk/biblemapper/src/main/resources/config.properties
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/ColorField.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/NumberField.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java
trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java
trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsViewPane.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ViewManager.java
trunk/jsword-limbo/src/historic/java/org/crosswire/bible/view/swing/beans/WebBrowserPane.java
trunk/jsword-limbo/src/historic/java/org/crosswire/jsword/view/cli/BSFGui.java
trunk/jsword-limbo/src/historic/java/org/crosswire/swing/ScriptPane.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/ComparePane.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/DebugPane.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/GeneratorPane.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/journal/BlogClientPanel.java
trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/BeanPanel.java
trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/ExceptionShelf.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/LimboMsg.properties
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/Strongs.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/StudyTool.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/FeatureType.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/OSISUtil.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/SyncTag.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java
Log:
corrected Strongs to Strong's
More rtol changes (mostly EAST => LINE_END, WEST => LINE_START)
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/Mapper.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/Mapper.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/Mapper.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -488,7 +488,7 @@
this.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
this.getContentPane().setLayout(new BorderLayout());
this.getContentPane().add(tab_main, BorderLayout.CENTER);
- this.getContentPane().add(pnl_tools, BorderLayout.EAST);
+ this.getContentPane().add(pnl_tools, BorderLayout.LINE_END);
this.setJMenuBar(menubar);
this.setEnabled(true);
// this.setIconImage(GuiUtil.loadImageIcon("org.crosswire.common.resource.task_small.gif"));
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/RuleSlider.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/RuleSlider.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/RuleSlider.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -95,7 +95,7 @@
this.setLayout(new BorderLayout());
this.setBorder(bdrRule);
this.add(sdrRule, BorderLayout.CENTER);
- this.add(txtRule, BorderLayout.EAST);
+ this.add(txtRule, BorderLayout.LINE_END);
}
/**
Modified: trunk/biblemapper/src/main/resources/config.properties
===================================================================
--- trunk/biblemapper/src/main/resources/config.properties 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/biblemapper/src/main/resources/config.properties 2007-07-04 15:22:50 UTC (rev 1473)
@@ -12,10 +12,10 @@
Bibles.DefaultCommentary.help=Which of the available Commentaries is the default.
Bibles.DefaultDailyDevotional.path=Bibles.Default Daily Devotional
Bibles.DefaultDailyDevotional.help=Which of the available Daily Devotionals is the default.
-Bibles.DefaultGreekDefinitions.path=Bibles.Default Greek Definitions (Strongs)
-Bibles.DefaultGreekDefinitions.help=Which of the available Greek Definitions (Strongs) is the default.
-Bibles.DefaultHebrewDefinitions.path=Bibles.Default Hebrew Definitions (Strongs)
-Bibles.DefaultHebrewDefinitions.help=Which of the available Hebrew Definitions (Strongs) is the default.
+Bibles.DefaultGreekDefinitions.path=Bibles.Default Greek Definitions (Strong''s)
+Bibles.DefaultGreekDefinitions.help=Which of the available Greek Definitions (Strong''s) is the default.
+Bibles.DefaultHebrewDefinitions.path=Bibles.Default Hebrew Definitions (Strong''s)
+Bibles.DefaultHebrewDefinitions.help=Which of the available Hebrew Definitions (Strong''s) is the default.
Bibles.DefaultGreekParse.path=Bibles.Default Greek Morphology/Parsing Guides
Bibles.DefaultGreekParse.help=Which of the available Greek Morphology/Parsing Guides is the default.
Bibles.DefaultHebrewParse.path=Bibles.Default Hebrew Morphology/Parsing Guides
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/ColorField.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/ColorField.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/ColorField.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -60,8 +60,8 @@
edit.setMargin(new Insets(1, 2, 1, 1));
setLayout(new BorderLayout());
- add(edit, BorderLayout.WEST);
- //add(text, BorderLayout.EAST);
+ add(edit, BorderLayout.LINE_START);
+ //add(text, BorderLayout.LINE_END);
}
/**
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/NumberField.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/NumberField.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/NumberField.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -49,7 +49,7 @@
text.setColumns(10);
setLayout(new BorderLayout(10, 0));
- add(BorderLayout.WEST, text);
+ add(BorderLayout.LINE_START, text);
}
/**
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -126,7 +126,7 @@
setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
//if (cards > 1)
- add(BorderLayout.WEST, new CWScrollPane(tree));
+ add(BorderLayout.LINE_START, new CWScrollPane(tree));
add(BorderLayout.CENTER, panel);
add(BorderLayout.SOUTH, new ButtonPane(this));
Modified: trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -384,6 +384,7 @@
gbc.gridwidth = GridBagConstraints.REMAINDER;
gbc.fill = GridBagConstraints.HORIZONTAL;
panel.add(progress, gbc);
+ GuiUtil.applyDefaultOrientation(panel);
return panel;
}
Modified: trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsViewPane.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsViewPane.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsViewPane.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -75,6 +75,7 @@
Progress job = (Progress) it.next();
addJob(job);
}
+ GuiUtil.applyDefaultOrientation(this);
}
/**
@@ -99,8 +100,8 @@
this.setLayout(new BorderLayout());
this.add(scrollPane, BorderLayout.CENTER);
this.add(new JPanel(), BorderLayout.SOUTH);
- this.add(new JPanel(), BorderLayout.EAST);
- this.add(new JPanel(), BorderLayout.WEST);
+ this.add(new JPanel(), BorderLayout.LINE_END);
+ this.add(new JPanel(), BorderLayout.LINE_START);
this.add(new JPanel(), BorderLayout.NORTH);
}
@@ -150,7 +151,7 @@
}
cancel.addActionListener(new CancelListener(job));
- jobsPanel.add(label, new GridBagConstraints(0, i, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.BOTH, new Insets(5, 5, 5, 5), 0, 0));
+ jobsPanel.add(label, new GridBagConstraints(0, i, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.BOTH, new Insets(5, 5, 5, 5), 0, 0));
jobsPanel.add(progress, new GridBagConstraints(1, i, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
jobsPanel.add(cancel, new GridBagConstraints(2, i, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
GuiUtil.refresh(this);
@@ -206,7 +207,7 @@
*/
protected void addEmptyLabel()
{
- jobsPanel.add(noJobLabel, new GridBagConstraints(0, 0, 3, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.BOTH, new Insets(5, 5, 5, 5), 0, 0));
+ jobsPanel.add(noJobLabel, new GridBagConstraints(0, 0, 3, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.BOTH, new Insets(5, 5, 5, 5), 0, 0));
GuiUtil.refresh(this);
}
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -120,7 +120,7 @@
JPanel buttons = new JPanel(new BorderLayout());
buttons.add(spacer, BorderLayout.CENTER);
- buttons.add(detail, BorderLayout.WEST);
+ buttons.add(detail, BorderLayout.LINE_START);
upper = new JPanel(new BorderLayout());
upper.add(banner, BorderLayout.NORTH);
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -39,6 +39,7 @@
import org.crosswire.common.swing.ActionFactory;
import org.crosswire.common.swing.CWAction;
+import org.crosswire.common.swing.GuiUtil;
import org.crosswire.common.util.OSType;
/**
@@ -70,6 +71,7 @@
{
setFloatable(false);
}
+ GuiUtil.applyDefaultOrientation(this);
}
/**
@@ -90,7 +92,7 @@
}
else
{
- contentPane.add(this, BorderLayout.WEST);
+ contentPane.add(this, BorderLayout.LINE_START);
}
}
else
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ViewManager.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ViewManager.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ViewManager.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -33,6 +33,7 @@
import javax.swing.JRadioButtonMenuItem;
import org.crosswire.common.swing.ActionFactory;
+import org.crosswire.common.swing.GuiUtil;
import org.crosswire.common.swing.desktop.event.TitleChangedEvent;
import org.crosswire.common.swing.desktop.event.TitleChangedListener;
import org.crosswire.common.swing.desktop.event.ViewEvent;
@@ -87,6 +88,7 @@
}
addViewEventListener(this);
addView();
+ GuiUtil.applyDefaultOrientation(panel);
}
/**
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/FeatureType.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/FeatureType.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/FeatureType.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -33,7 +33,7 @@
public final class FeatureType implements Serializable
{
/**
- * The book is one of Greek Definitions. AKA, Strongs.
+ * The book is one of Greek Definitions. AKA, Strong's.
*/
public static final FeatureType GREEK_DEFINITIONS = new FeatureType("GreekDef"); //$NON-NLS-1$
@@ -43,7 +43,7 @@
public static final FeatureType GREEK_PARSE = new FeatureType("GreekParse"); //$NON-NLS-1$
/**
- * The book is one of Hebrew Definitions. AKA, Strongs.
+ * The book is one of Hebrew Definitions. AKA, Strong's.
*/
public static final FeatureType HEBREW_DEFINITIONS = new FeatureType("HebrewDef"); //$NON-NLS-1$
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/OSISUtil.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/OSISUtil.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/OSISUtil.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -190,13 +190,13 @@
public static final String DEF_TYPE = "x-def"; //$NON-NLS-1$
/**
- * Constant for a Strongs numbering lemma
+ * Constant for a Strong's numbering lemma
*/
public static final String LEMMA_STRONGS = "strong:"; //$NON-NLS-1$
public static final String MORPH_ROBINSONS = "robinson:"; //$NON-NLS-1$
/**
- * Constant for Strongs numbering morphology
+ * Constant for Strong's numbering morphology
*/
public static final String MORPH_STRONGS = "x-StrongsMorph:T"; //$NON-NLS-1$
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/SyncTag.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/SyncTag.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/SyncTag.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -32,7 +32,7 @@
/**
* THML Tag to process the sync element. A sync tag is always empty and
- * immediately follows what it marks. With types of Strongs and morph
+ * immediately follows what it marks. With types of Strong's and morph
* these are to become w elements that surround the word that they modify.
* This requires that we find the last text element and surround it with
* a w element. If the last text element is already surrounded with a w
@@ -59,7 +59,7 @@
*/
public Element processTag(Element ele, Attributes attrs)
{
- // Strongs reference
+ // Strong's reference
String type = attrs.getValue("type"); //$NON-NLS-1$
String value = attrs.getValue("value"); //$NON-NLS-1$
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -827,7 +827,7 @@
/**
* A Feature describes a characteristic of the Book.
- * TODO(DMS): use this to present the user with a pick list of books for Strongs,
+ * TODO(DMS): use this to present the user with a pick list of books for Strong's,
* and Heb/Greek Def/Parse. We should also use DailyDevotional to map the days to a date.
*/
public static final ConfigEntryType FEATURE = new ConfigEntryType("Feature") //$NON-NLS-1$
Modified: trunk/jsword-limbo/src/historic/java/org/crosswire/bible/view/swing/beans/WebBrowserPane.java
===================================================================
--- trunk/jsword-limbo/src/historic/java/org/crosswire/bible/view/swing/beans/WebBrowserPane.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/jsword-limbo/src/historic/java/org/crosswire/bible/view/swing/beans/WebBrowserPane.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -49,7 +49,7 @@
});
pnl_url.setLayout(new BorderLayout(5, 5));
pnl_url.add(txt_url, BorderLayout.CENTER);
- pnl_url.add(btn_go, BorderLayout.EAST);
+ pnl_url.add(btn_go, BorderLayout.LINE_END);
txt_browser.setPreferredSize(new Dimension(300, 200));
txt_browser.setEditable(false);
Modified: trunk/jsword-limbo/src/historic/java/org/crosswire/jsword/view/cli/BSFGui.java
===================================================================
--- trunk/jsword-limbo/src/historic/java/org/crosswire/jsword/view/cli/BSFGui.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/jsword-limbo/src/historic/java/org/crosswire/jsword/view/cli/BSFGui.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -77,7 +77,7 @@
lblcmd.setText(" > "); //$NON-NLS-1$
pnlcmd.setLayout(new BorderLayout());
- pnlcmd.add(lblcmd, BorderLayout.WEST);
+ pnlcmd.add(lblcmd, BorderLayout.LINE_START);
pnlcmd.add(txtcmd, BorderLayout.CENTER);
txtresult.setEditable(false);
Modified: trunk/jsword-limbo/src/historic/java/org/crosswire/swing/ScriptPane.java
===================================================================
--- trunk/jsword-limbo/src/historic/java/org/crosswire/swing/ScriptPane.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/jsword-limbo/src/historic/java/org/crosswire/swing/ScriptPane.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -60,8 +60,8 @@
});
pnl_command.setLayout(new BorderLayout(5, 0));
pnl_command.add(txt_command, BorderLayout.CENTER);
- pnl_command.add(btn_go, BorderLayout.EAST);
- pnl_command.add(lbl_prompt, BorderLayout.WEST);
+ pnl_command.add(btn_go, BorderLayout.LINE_END);
+ pnl_command.add(lbl_prompt, BorderLayout.LINE_START);
txt_results.setColumns(40);
txt_results.setRows(10);
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/ComparePane.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/ComparePane.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/ComparePane.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -98,13 +98,13 @@
lblVerses.setText(LimboMsg.COMPARE_VERSES.toString());
lblVerses.setLabelFor(txtVerses);
pnlVerses.setLayout(new BorderLayout());
- pnlVerses.add(lblVerses, BorderLayout.WEST);
+ pnlVerses.add(lblVerses, BorderLayout.LINE_START);
pnlVerses.add(txtVerses, BorderLayout.CENTER);
txtWords.setToolTipText(LimboMsg.COMPARE_WORDS_TIP.toString());
lblWords.setText(LimboMsg.COMPARE_WORDS.toString());
lblWords.setLabelFor(txtWords);
pnlWords.setLayout(new BorderLayout());
- pnlWords.add(lblWords, BorderLayout.WEST);
+ pnlWords.add(lblWords, BorderLayout.LINE_START);
pnlWords.add(txtWords, BorderLayout.CENTER);
pnlUsing.setBorder(new TitledBorder(LimboMsg.COMPARE_USING.toString()));
pnlUsing.setLayout(new BoxLayout(pnlUsing, BoxLayout.Y_AXIS));
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/DebugPane.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/DebugPane.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/DebugPane.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -103,9 +103,9 @@
});
pnlMethod.setLayout(new BorderLayout(5, 5));
- pnlMethod.add(lblMethod, BorderLayout.WEST);
+ pnlMethod.add(lblMethod, BorderLayout.LINE_START);
pnlMethod.add(cboMethod, BorderLayout.CENTER);
- pnlMethod.add(btnMethod, BorderLayout.EAST);
+ pnlMethod.add(btnMethod, BorderLayout.LINE_END);
scrResults.getViewport().add(txtResults);
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/GeneratorPane.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/GeneratorPane.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/GeneratorPane.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -95,7 +95,7 @@
lblSource.setText(" Source Bible: "); //$NON-NLS-1$
pnlSource.setLayout(new BorderLayout());
pnlSource.setBorder(BorderFactory.createTitledBorder("Source")); //$NON-NLS-1$
- pnlSource.add(lblSource, BorderLayout.WEST);
+ pnlSource.add(lblSource, BorderLayout.LINE_START);
pnlSource.add(cboSource, BorderLayout.CENTER);
lblName.setText("New Name:"); //$NON-NLS-1$
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/journal/BlogClientPanel.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/journal/BlogClientPanel.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/journal/BlogClientPanel.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -425,7 +425,7 @@
setLayout(new BorderLayout());
add(propsPanel, BorderLayout.NORTH);
add(textPanel, BorderLayout.CENTER);
- add(btnPanel, BorderLayout.EAST);
+ add(btnPanel, BorderLayout.LINE_END);
}
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/BeanPanel.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/BeanPanel.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/BeanPanel.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -122,7 +122,7 @@
editors.add(text);
- this.add(label, new GridBagConstraints(0, y, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
+ this.add(label, new GridBagConstraints(0, y, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
this.add(text, new GridBagConstraints(1, y, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 10), 0, 0));
y++;
}
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/ExceptionShelf.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/ExceptionShelf.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/ExceptionShelf.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -76,7 +76,7 @@
setLayout(new BorderLayout());
add(shelf, BorderLayout.CENTER);
- add(toggle, BorderLayout.EAST);
+ add(toggle, BorderLayout.LINE_END);
addPanel(noproblems);
SHELVES.add(this);
@@ -311,7 +311,7 @@
retcode.setLayout(new BorderLayout());
retcode.add(report, BorderLayout.CENTER);
- retcode.add(remove, BorderLayout.EAST);
+ retcode.add(remove, BorderLayout.LINE_END);
return retcode;
}
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/LimboMsg.properties
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/LimboMsg.properties 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/LimboMsg.properties 2007-07-04 15:22:50 UTC (rev 1473)
@@ -15,9 +15,9 @@
Strongs.Hebrew=Hebrew:
Strongs.Parsing=Parsing:
-Strongs.ErrorParse=Strongs number must be of the form <n>, <0n> or (n) where n is a number. Given ''{0}''
+Strongs.ErrorParse=Strong''s number must be of the form <n>, <0n> or (n) where n is a number. Given ''{0}''
Strongs.ErrorNumber=Could not get a number from ''{0}''
Strongs.ErrorHebrew=Hebrew numbers must be between 0 and {0,number,integer}. Given {1,number,integer}
Strongs.ErrorGreek=Greek numbers must be between 0 and {0,number,integer}. Given {1,number,integer}
Strongs.ErrorParsing=Parsing numbers must be greater than 0. Given {0,number,integer}
-Strongs.ErrorType=Strongs numbers must have a type in the range, 0-2. Given {0,number,integer}
+Strongs.ErrorType=Strong''s numbers must have a type in the range, 0-2. Given {0,number,integer}
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/Strongs.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/Strongs.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/Strongs.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -24,10 +24,10 @@
import org.jdom.Element;
/**
- * Strongs is a convenience way of recording a Strongs number instead of
+ * Strongs is a convenience way of recording a Strong's number instead of
* using a String with a number in it.
*
- * <p>A Strongs number can not be a number because Hebrew and Greek numbers are
+ * <p>A Strong's number can not be a number because Hebrew and Greek numbers are
* distinguished only by the Hebrew having a 0 at the start.
* <p>The class is immutable.
* <p>Numbers that exist:<ul>
@@ -43,7 +43,7 @@
public class Strongs
{
/**
- * Create a Strongs number from an OLB descriptive string.
+ * Create a Strong's number from an OLB descriptive string.
* @param desc The OLB style descriptive string
*/
public Strongs(String desc) throws BookException
@@ -90,7 +90,7 @@
}
/**
- * Create a Strongs number from a type and a number
+ * Create a Strong's number from a type and a number
* @param type 0=HEBREW, 1=GREEK, 2=PARSING
* @param number The strongs number
*/
@@ -100,7 +100,7 @@
}
/**
- * Work out what the Strongs number is from the W element
+ * Work out what the Strong's number is from the W element
* @param w The element to investigate
*/
public Strongs(Element w) throws BookException
@@ -157,7 +157,7 @@
}
/**
- * A very short description of the Strongs number
+ * A very short description of the Strong's number
* @return The short description
*/
public String getDescription()
@@ -187,7 +187,7 @@
}
/**
- * @return The type of this Strongs number
+ * @return The type of this Strong's number
*/
public int getType()
{
@@ -230,7 +230,7 @@
}
/**
- * Create a Strongs number from a type and a number.
+ * Create a Strong's number from a type and a number.
* This is private since it should only be called from a constructor
* to keep this class immutable.
* @param type 0=HEBREW, 1=GREEK, 2=PARSING
@@ -300,7 +300,7 @@
public static final int HEBREW_MAX = 8674;
/**
- * The type of this Strongs number
+ * The type of this Strong's number
*/
private int type;
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/StudyTool.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/StudyTool.java 2007-07-04 15:20:10 UTC (rev 1472)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/StudyTool.java 2007-07-04 15:22:50 UTC (rev 1473)
@@ -34,7 +34,7 @@
/**
* StudyTool is-an extension to Bible that knows about the original
- * Greek/Hebrew in the form of Strongs numbers.
+ * Greek/Hebrew in the form of Strong's numbers.
*
* @see gnu.lgpl.License for license details.
* The copyright to this program is held by it's authors.
More information about the jsword-svn
mailing list