[jsword-svn] r1682 - in trunk/incubator/org.crosswire.jsword.test: . META-INF src src/main/java src/main/java/org/crosswire/jsword/test/internal/osgi
Apache
apache at www.crosswire.org
Wed Aug 15 13:17:54 MST 2007
Author:
Date: 2007-08-15 13:17:54 -0700 (Wed, 15 Aug 2007)
New Revision: 1682
Added:
trunk/incubator/org.crosswire.jsword.test/src/main/java/org/
Removed:
trunk/incubator/org.crosswire.jsword.test/src/org/
Modified:
trunk/incubator/org.crosswire.jsword.test/.classpath
trunk/incubator/org.crosswire.jsword.test/META-INF/MANIFEST.MF
trunk/incubator/org.crosswire.jsword.test/build.properties
trunk/incubator/org.crosswire.jsword.test/src/main/java/org/crosswire/jsword/test/internal/osgi/Activator.java
Log:
Updated for Eclipse 3.3 and latest JSword.
Modified: trunk/incubator/org.crosswire.jsword.test/.classpath
===================================================================
--- trunk/incubator/org.crosswire.jsword.test/.classpath 2007-08-15 20:13:14 UTC (rev 1681)
+++ trunk/incubator/org.crosswire.jsword.test/.classpath 2007-08-15 20:17:54 UTC (rev 1682)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: trunk/incubator/org.crosswire.jsword.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/incubator/org.crosswire.jsword.test/META-INF/MANIFEST.MF 2007-08-15 20:13:14 UTC (rev 1681)
+++ trunk/incubator/org.crosswire.jsword.test/META-INF/MANIFEST.MF 2007-08-15 20:17:54 UTC (rev 1682)
@@ -5,10 +5,9 @@
Bundle-Version: 1.0.0
Bundle-Activator: org.crosswire.jsword.test.internal.osgi.Activator
Bundle-Vendor: crosswire.org
-Bundle-Localization: plugin
Require-Bundle: org.crosswire.common,
org.crosswire.jsword,
org.jdom
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
Import-Package: org.osgi.framework;version="1.3.0"
Export-Package: org.crosswire.jsword.test
Modified: trunk/incubator/org.crosswire.jsword.test/build.properties
===================================================================
--- trunk/incubator/org.crosswire.jsword.test/build.properties 2007-08-15 20:13:14 UTC (rev 1681)
+++ trunk/incubator/org.crosswire.jsword.test/build.properties 2007-08-15 20:17:54 UTC (rev 1682)
@@ -1,4 +1,6 @@
-source.. = src/
+source.. = src/main/java/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ src/main/java/
+src.includes = src/main/java/
Copied: trunk/incubator/org.crosswire.jsword.test/src/main/java/org (from rev 1675, trunk/incubator/org.crosswire.jsword.test/src/org)
Modified: trunk/incubator/org.crosswire.jsword.test/src/main/java/org/crosswire/jsword/test/internal/osgi/Activator.java
===================================================================
--- trunk/incubator/org.crosswire.jsword.test/src/org/crosswire/jsword/test/internal/osgi/Activator.java 2007-08-13 14:25:01 UTC (rev 1675)
+++ trunk/incubator/org.crosswire.jsword.test/src/main/java/org/crosswire/jsword/test/internal/osgi/Activator.java 2007-08-15 20:17:54 UTC (rev 1682)
@@ -20,14 +20,16 @@
*/
package org.crosswire.jsword.test.internal.osgi;
-import java.net.URL;
+import java.net.URI;
import java.util.Hashtable;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import org.crosswire.common.activate.Lock;
import org.crosswire.common.util.CommonLogger;
+import org.crosswire.common.util.Language;
import org.crosswire.common.util.Logger;
import org.crosswire.jsword.book.Book;
import org.crosswire.jsword.book.BookCategory;
@@ -239,6 +241,16 @@
public List toOSIS(Book book, Key key, String plain) throws FilterException {
return null;
}
+ public Object clone() {
+ try
+ {
+ return super.clone();
+ }
+ catch (CloneNotSupportedException e)
+ {
+ return null;
+ }
+ }
};
Hashtable properties = new Hashtable();
@@ -296,8 +308,8 @@
return new CustomBookDriver();
}
- public String getLanguage() {
- return "en";
+ public Language getLanguage() {
+ return new Language("en");
}
public String getInitials() {
@@ -348,29 +360,29 @@
return false;
}
- public URL getLibrary() {
+ public URI getLibrary() {
return null;
}
- public void setLibrary(URL library) {
+ public void setLibrary(URI library) {
}
- public URL getLocation() {
+ public URI getLocation() {
return null;
}
- public void setLocation(URL library) {
+ public void setLocation(URI library) {
}
public Map getProperties() {
return null;
}
- public String getProperty(String key) {
+ public Object getProperty(String key) {
return null;
}
- public void putProperty(String key, String value) {
+ public void putProperty(String key, Object value) {
}
public IndexStatus getIndexStatus() {
@@ -421,8 +433,8 @@
public BookDriver getDriver() {
return new CustomBookDriver();
}
- public String getLanguage() {
- return "en";
+ public Language getLanguage() {
+ return new Language("en");
}
public String getInitials() {
return "mybook";
@@ -463,11 +475,9 @@
public Map getProperties() {
return null;
}
- public String getProperty(String key) {
+ public Object getProperty(String key) {
return null;
}
- public void putProperty(String key, String value) {
- }
public IndexStatus getIndexStatus() {
return null;
}
@@ -505,10 +515,53 @@
public Document toOSIS() {
return null;
}
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.Book#getOsisIterator(org.crosswire.jsword.passage.Key, boolean)
+ */
+ public Iterator getOsisIterator(Key key, boolean allowEmpty)
+ throws BookException {
+ return null;
+ }
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.Book#getRawText(org.crosswire.jsword.passage.Key)
+ */
+ public String getRawText(Key key) throws BookException {
+ return null;
+ }
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.Book#isWritable()
+ */
+ public boolean isWritable() {
+ return false;
+ }
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.Book#match(java.lang.String)
+ */
+ public boolean match(String name) {
+ return false;
+ }
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.Book#putProperty(java.lang.String, java.lang.Object)
+ */
+ public void putProperty(String key, Object value) {
+ }
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.Book#setAliasKey(org.crosswire.jsword.passage.Key, org.crosswire.jsword.passage.Key)
+ */
+ public void setAliasKey(Key alias, Key source) throws BookException {
+ }
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.Book#setRawText(org.crosswire.jsword.passage.Key, java.lang.String)
+ */
+ public void setRawText(Key key, String rawData) throws BookException {
+ }
}
private static final class CustomBookDriver implements BookDriver {
private static final Book MY_BOOK = new CustomBook();
+ public Book getFirstBook() {
+ return MY_BOOK;
+ }
public Book[] getBooks() {
return new Book[] {MY_BOOK};
}
More information about the jsword-svn
mailing list