[jsword-svn] r1017 - in trunk: bibledesktop bibledesktop/etc/jnlp
bibledesktop/src/main/java/org/crosswire/bibledesktop
bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install
bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop
bibledesktop/src/main/resources
bibledesktop-web/src/web/stable jsword
jsword/src/main/java/org/crosswire/jsword/book/filter/thml
jsword-support/tools/findbugs jsword-web
dmsmith at crosswire.org
dmsmith at crosswire.org
Wed Mar 1 09:19:10 MST 2006
Author: dmsmith
Date: 2006-03-01 09:18:45 -0700 (Wed, 01 Mar 2006)
New Revision: 1017
Removed:
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/journal/
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/signal/
Modified:
trunk/bibledesktop-web/src/web/stable/bibledesktop.jnlp
trunk/bibledesktop/.classpath
trunk/bibledesktop/build.xml
trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java
trunk/bibledesktop/src/main/resources/config.xml
trunk/jsword-support/tools/findbugs/build.xml
trunk/jsword-web/jsword-web.iml
trunk/jsword/jsword.iml
trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/CustomHandler.java
Log:
temporarily moved blogging out of bibledesktop
Modified: trunk/bibledesktop/.classpath
===================================================================
--- trunk/bibledesktop/.classpath 2006-03-01 15:55:18 UTC (rev 1016)
+++ trunk/bibledesktop/.classpath 2006-03-01 16:18:45 UTC (rev 1017)
@@ -2,14 +2,6 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="jar/jlfgr-1.0/jlfgr-1_0.jar"/>
- <classpathentry exported="true" kind="lib" path="jar/blogapps-1.0/blogapps-1.0.jar"/>
- <classpathentry exported="true" sourcepath="jar/gnu-regex-1.1.4/gnu.regexp-1.1.4.zip" kind="lib" path="jar/gnu-regex-1.1.4/gnu-regexp-1.1.4.jar"/>
- <classpathentry exported="true" sourcepath="jar/rome-0.7/rome-0.7-src.zip" kind="lib" path="jar/rome-0.7/rome-0.7.jar"/>
- <classpathentry exported="true" sourcepath="jar/werx-051405/werx-051405.zip" kind="lib" path="jar/werx-051405/werx-051405.jar"/>
- <classpathentry exported="true" sourcepath="jar/xmlrpc-2.0.1/xmlrpc-2.0.1-sources.zip" kind="lib" path="jar/xmlrpc-2.0.1/xmlrpc-2.0.1.jar"/>
- <classpathentry exported="true" sourcepath="jar/kafenio-0.8.5/kafenio-src_0_8_5.zip" kind="lib" path="jar/kafenio-0.8.5/kafenio-0.8.5.jar"/>
- <classpathentry exported="true" sourcepath="jar/kafenio-0.8.5/kafenio-src_0_8_5.zip" kind="lib" path="jar/kafenio-0.8.5/kafenio-config-0.8.5.jar"/>
- <classpathentry exported="true" sourcepath="jar/kafenio-0.8.5/kafenio-src_0_8_5.zip" kind="lib" path="jar/kafenio-0.8.5/kafenio-icons-0.8.5.jar"/>
<classpathentry exported="true" kind="src" path="/jsword"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/common-swing"/>
<classpathentry kind="src" path="src/main/resources"/>
Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml 2006-03-01 15:55:18 UTC (rev 1016)
+++ trunk/bibledesktop/build.xml 2006-03-01 16:18:45 UTC (rev 1017)
@@ -44,7 +44,8 @@
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="jdom-1.0.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="javatar-2.5.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="jlfgr-1_0.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="lucene-1.9-final.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="lucene-core-1.9-final.jar"/>
+ <!--
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="blogapps-1.0.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="gnu-regexp-1.1.4.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="kafenio-0.8.5.jar"/>
@@ -53,6 +54,7 @@
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="rome-0.7.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="werx-051405.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="xmlrpc-2.0.1.jar"/>
+ -->
<!-- Create a flag file used to determine whether the set of jars needs to be signed -->
<touch file="${target.root}/.flagfile"/>
Modified: trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
===================================================================
--- trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2006-03-01 15:55:18 UTC (rev 1016)
+++ trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2006-03-01 16:18:45 UTC (rev 1017)
@@ -36,8 +36,9 @@
<jar href="commons-httpclient-3.0.jar"/>
<jar href="commons-logging.jar"/>
<jar href="commons-net-1.4.1.jar"/>
- <jar href="lucene-1.9-final.jar"/>
+ <jar href="lucene-core-1.9-final.jar"/>
<jar href="jlfgr-1_0.jar"/>
+ <!--
<jar href="xmlrpc-2.0.1.jar"/>
<jar href="rome-0.7.jar"/>
<jar href="werx-051405.jar"/>
@@ -46,6 +47,7 @@
<jar href="kafenio-config-0.8.5.jar"/>
<jar href="kafenio-icons-0.8.5.jar"/>
<jar href="kafenio-0.8.5.jar"/>
+ -->
<property name="apple.laf.useScreenMenuBar" value="true"/>
<property name="com.apple.mrj.application.apple.menu.about.name" value="BibleDesktop"/>
</resources>
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java 2006-03-01 15:55:18 UTC (rev 1016)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java 2006-03-01 16:18:45 UTC (rev 1017)
@@ -514,7 +514,7 @@
if (installer != null)
{
siteEditor = SiteEditorFactory.createSiteEditor(installer);
- siteEditorPane.add((Component) siteEditor,new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
+ siteEditorPane.add((Component) siteEditor, new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
}
GuiUtil.refresh(this);
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2006-03-01 15:55:18 UTC (rev 1016)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2006-03-01 16:18:45 UTC (rev 1017)
@@ -61,8 +61,6 @@
import org.crosswire.bibledesktop.display.BookDataDisplay;
import org.crosswire.bibledesktop.display.URLEvent;
import org.crosswire.bibledesktop.display.URLEventListener;
-import org.crosswire.bibledesktop.journal.BlogClientFrame;
-import org.crosswire.bibledesktop.signal.ResizeJournalSignal;
import org.crosswire.bibledesktop.util.ConfigurableSwingConverter;
import org.crosswire.common.config.ChoiceFactory;
import org.crosswire.common.config.Config;
@@ -98,8 +96,6 @@
import org.crosswire.jsword.util.ConverterFactory;
import org.crosswire.jsword.util.Project;
import org.jdom.Document;
-import org.werx.framework.bus.BusStart;
-import org.werx.framework.bus.ReflectionBus;
/**
* The Desktop is the user's view of BibleDesktop.
@@ -125,7 +121,7 @@
{
public void run()
{
- new BusStart();
+// new BusStart();
ExceptionPane.setHelpDeskListener(true);
LookAndFeelUtil.initialize();
@@ -202,7 +198,7 @@
debug();
init();
- ReflectionBus.plug(this);
+// ReflectionBus.plug(this);
// Listen for book changes so that the Options can be kept current
BooksListener cbl = new BooksListener()
@@ -239,14 +235,14 @@
private void createComponents()
{
barStatus = new StatusBar();
- ReflectionBus.plug(barStatus);
+// ReflectionBus.plug(barStatus);
//barSide = new SidebarPane();
//barBook = new ReferencedPane();
reference = new DictionaryPane();
sptBooks = new FixedSplitPane(false);
sptBlog = new FixedSplitPane(false);
- blogPanel = BlogClientFrame.getInstance();
+// blogPanel = BlogClientFrame.getInstance();
views = new ViewManager(this);
views.addViewEventListener(this);
@@ -282,12 +278,12 @@
sptBooks.setOpaque(true);
sptBooks.setBorder(null);
- sptBlog.setOrientation(JSplitPane.VERTICAL_SPLIT);
- sptBlog.setTopComponent(sptBooks);
- sptBlog.setBottomComponent(blogPanel);
- sptBlog.setResizeWeight(0.8D);
- sptBlog.setOpaque(true);
- sptBlog.setBorder(null);
+// sptBlog.setOrientation(JSplitPane.VERTICAL_SPLIT);
+// sptBlog.setTopComponent(sptBooks);
+// sptBlog.setBottomComponent(blogPanel);
+// sptBlog.setResizeWeight(0.8D);
+// sptBlog.setOpaque(true);
+// sptBlog.setBorder(null);
// The toolbar needs to be in the outermost container, on the border
// And the only other item in that container can be CENTER
@@ -298,14 +294,14 @@
mainPanel = new JPanel(new BorderLayout());
mainPanel.setBorder(BorderFactory.createEmptyBorder(1, 5, 1, 5));
- if (webJournalShowing)
- {
- mainPanel.add(sptBlog, BorderLayout.CENTER);
- }
- else
- {
+// if (webJournalShowing)
+// {
+// mainPanel.add(sptBlog, BorderLayout.CENTER);
+// }
+// else
+// {
mainPanel.add(sptBooks, BorderLayout.CENTER);
- }
+// }
// Put everything else in its own panel
corePanel = new JPanel(new BorderLayout());
@@ -318,14 +314,14 @@
setEnabled(true);
setTitle(Msg.getApplicationTitle());
}
-
+
/**
* Cause the Journal to reset itself to preferred size
*/
- public void channel(ResizeJournalSignal signal)
- {
- sptBlog.resetToPreferredSizes();
- }
+// public void channel(ResizeJournalSignal signal)
+// {
+// sptBlog.resetToPreferredSizes();
+// }
private JMenuBar createMenuBar(ToolBar toolbar)
{
@@ -1066,7 +1062,7 @@
private transient ViewManager views;
private JPanel corePanel;
- private BlogClientFrame blogPanel;
+// private BlogClientFrame blogPanel;
private JSplitPane sptBlog;
private JCheckBoxMenuItem sidebarToggle;
private StatusBar barStatus;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java 2006-03-01 15:55:18 UTC (rev 1016)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java 2006-03-01 16:18:45 UTC (rev 1017)
@@ -35,11 +35,9 @@
import javax.swing.JLabel;
import javax.swing.JSeparator;
import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
import org.crosswire.bibledesktop.display.URLEvent;
import org.crosswire.bibledesktop.display.URLEventListener;
-import org.crosswire.bibledesktop.signal.StatusSignal;
import org.crosswire.common.progress.swing.JobsProgressBar;
/**
@@ -147,16 +145,16 @@
* Catches status signals and displays new text
* @param signal The signal with the status text
*/
- public void channel(final StatusSignal signal)
- {
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- lbl_message.setText(signal.getMessage());
- }
- });
- }
+// public void channel(final StatusSignal signal)
+// {
+// SwingUtilities.invokeLater(new Runnable()
+// {
+// public void run()
+// {
+// lbl_message.setText(signal.getMessage());
+// }
+// });
+// }
/**
* When the mouse points at something that has registered with us
Modified: trunk/bibledesktop/src/main/resources/config.xml
===================================================================
--- trunk/bibledesktop/src/main/resources/config.xml 2006-03-01 15:55:18 UTC (rev 1016)
+++ trunk/bibledesktop/src/main/resources/config.xml 2006-03-01 16:18:45 UTC (rev 1017)
@@ -248,6 +248,7 @@
</option>
-->
+<!-- Temporarily remove Blog code
<option key="WebJournal.Url" type="string" priority="1">
<introspect class="org.crosswire.bibledesktop.journal.BlogClientFrame" property="Url"/>
</option>
@@ -265,5 +266,5 @@
<alternative number="0" />
<alternative number="1" />
</option>
-
+ -->
</config>
Modified: trunk/bibledesktop-web/src/web/stable/bibledesktop.jnlp
===================================================================
--- trunk/bibledesktop-web/src/web/stable/bibledesktop.jnlp 2006-03-01 15:55:18 UTC (rev 1016)
+++ trunk/bibledesktop-web/src/web/stable/bibledesktop.jnlp 2006-03-01 16:18:45 UTC (rev 1017)
@@ -34,7 +34,7 @@
<jar href="commons-httpclient-3.0.jar"/>
<jar href="commons-logging.jar"/>
<jar href="commons-net-1.4.1.jar"/>
- <jar href="lucene-1.9-final.jar"/>
+ <jar href="lucene-core-1.9-final.jar"/>
<jar href="jlfgr-1_0.jar"/>
<property name="apple.laf.useScreenMenuBar" value="true"/>
<property name="com.apple.mrj.application.apple.menu.about.name" value="BibleDesktop"/>
Modified: trunk/jsword/jsword.iml
===================================================================
--- trunk/jsword/jsword.iml 2006-03-01 15:55:18 UTC (rev 1016)
+++ trunk/jsword/jsword.iml 2006-03-01 16:18:45 UTC (rev 1017)
@@ -17,7 +17,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/jar/lucene-1.9-final/lucene-1.9-final.jar!/" />
+ <root url="jar://$MODULE_DIR$/jar/lucene-1.9-final/lucene-core-1.9-final.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/CustomHandler.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/CustomHandler.java 2006-03-01 15:55:18 UTC (rev 1016)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/CustomHandler.java 2006-03-01 16:18:45 UTC (rev 1017)
@@ -98,8 +98,7 @@
int size = current.getContentSize();
// what we are adding
- String text =
- new String(data, offset, length);
+ String text = new String(data, offset, length);
// If the last element in the list is a string then we should add
// this string on to the end of it rather than add a new list item
// because (probably as an atrifact of the HTML/XSL transform we get
@@ -145,20 +144,20 @@
private Tag getTag(String localname, String qname)
{
Tag t = (Tag) TAG_MAP.get(qname);
-
+
// Some of the THML books are broken in that they use uppercase
// element names, which the spec disallows, but we might as well
// look out for them
if (t == null)
{
t = (Tag) TAG_MAP.get(qname.toLowerCase());
-
+
if (t == null)
{
log.warn("unknown thml element: " + localname + " qname=" + qname); //$NON-NLS-1$ //$NON-NLS-2$
return t;
}
-
+
DataPolice.report("Wrong case used in thml element: " + qname); //$NON-NLS-1$
}
return t;
Modified: trunk/jsword-support/tools/findbugs/build.xml
===================================================================
--- trunk/jsword-support/tools/findbugs/build.xml 2006-03-01 15:55:18 UTC (rev 1016)
+++ trunk/jsword-support/tools/findbugs/build.xml 2006-03-01 16:18:45 UTC (rev 1017)
@@ -31,7 +31,7 @@
<auxClasspath path="${target.jar}/commons-httpclient-3.0.jar"/>
<auxClasspath path="${target.jar}/javatar-2.5.jar"/>
<auxClasspath path="${target.jar}/jdom-1.0.jar"/>
- <auxClasspath path="${target.jar}/lucene-1.9-final.jar"/>
+ <auxClasspath path="${target.jar}/lucene-core-1.9-final.jar"/>
<auxClasspath path="../common/jar/jaf-1.0.2/activation.jar"/>
<auxClasspath path="${target.jar}/jlfgr-1_0.jar"/>
<auxClasspath path="${target.jar}/blogapps-1.0.jar"/>
Modified: trunk/jsword-web/jsword-web.iml
===================================================================
--- trunk/jsword-web/jsword-web.iml 2006-03-01 15:55:18 UTC (rev 1016)
+++ trunk/jsword-web/jsword-web.iml 2006-03-01 16:18:45 UTC (rev 1017)
@@ -69,9 +69,9 @@
<attribute name="URI" value="/WEB-INF/lib/tar.jar" />
</containerElement>
<containerElement type="library" level="module">
- <url>jar://$MODULE_DIR$/../jsword/jar/lucene-1.9-final/lucene-1.9-final.jar!/</url>
+ <url>jar://$MODULE_DIR$/../jsword/jar/lucene-1.9-final/lucene-core-1.9-final.jar!/</url>
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/lucene-1.9-final.jar" />
+ <attribute name="URI" value="/WEB-INF/lib/lucene-core-1.9-final.jar" />
</containerElement>
<containerElement type="library" level="module">
<url>jar://$MODULE_DIR$/../jsword/jar/net-1.3.0/commons-net-1.3.0.jar!/</url>
More information about the jsword-svn
mailing list