You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by cz...@apache.org on 2003/07/14 21:06:09 UTC
cvs commit: avalon-excalibur/store/src/java/org/apache/excalibur/store/impl JispFilesystemStore.java AbstractJispFilesystemStore.java
cziegeler 2003/07/14 12:06:09
Modified: store/src/java/org/apache/excalibur/store/impl
JispFilesystemStore.java
AbstractJispFilesystemStore.java
Log:
Removing unused code
Revision Changes Path
1.2 +15 -28 avalon-excalibur/store/src/java/org/apache/excalibur/store/impl/JispFilesystemStore.java
Index: JispFilesystemStore.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/store/src/java/org/apache/excalibur/store/impl/JispFilesystemStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JispFilesystemStore.java 14 Jul 2003 18:17:23 -0000 1.1
+++ JispFilesystemStore.java 14 Jul 2003 19:06:08 -0000 1.2
@@ -56,7 +56,6 @@
import com.coyotegulch.jisp.IndexedObjectDatabase;
import com.coyotegulch.jisp.KeyNotFound;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
@@ -74,21 +73,14 @@
public class JispFilesystemStore extends AbstractJispFilesystemStore
implements org.apache.excalibur.store.Store,
ThreadSafe,
- Initializable,
Parameterizable {
- /** The database file */
- protected File m_databaseFile;
- /** The index file */
- protected File m_indexFile;
- /** The page size of the B-Tree */
- protected int m_Order;
-
/**
* Configure the Component.<br>
* A few options can be used
* <UL>
- * <LI> The directory to store the two files belowe</LI>
+ * <LI> directory - The directory to store the two files belowe
+ * </LI>
* <LI> data-file = the name of the data file (Default: store.dat)
* </LI>
* <LI> index-file = the name of the index file (Default: store.idx)
@@ -101,7 +93,7 @@
*/
public void parameterize(Parameters params) throws ParameterException
{
-
+ // get the directory to use
try
{
final String dir = params.getParameter("directory");
@@ -114,38 +106,32 @@
final String databaseName = params.getParameter("data-file", "store.dat");
final String indexName = params.getParameter("index-file", "store.idx");
- m_Order = params.getParameterAsInteger("order", 301);
+ final int order = params.getParameterAsInteger("order", 301);
if (getLogger().isDebugEnabled())
{
getLogger().debug("Database file name = " + databaseName);
getLogger().debug("Index file name = " + indexName);
- getLogger().debug("Order=" + m_Order);
+ getLogger().debug("Order=" + order);
}
- this.m_databaseFile = new File(m_directoryFile, databaseName);
- m_indexFile = new File(m_directoryFile, indexName);
- }
+ final File databaseFile = new File(m_directoryFile, databaseName);
+ final File indexFile = new File(m_directoryFile, indexName);
- /**
- * Initialize the Component
- */
- public void initialize()
- {
if (getLogger().isDebugEnabled())
{
- getLogger().debug("initialize() JispFilesystemStore");
+ getLogger().debug("Initializing JispFilesystemStore");
}
try {
- JispKey nullKey = (JispKey)new JispKey("").makeNullKey();
- m_Index = new BTreeIndex(m_indexFile.toString(),
- m_Order, nullKey, false);
- final boolean isOld = m_databaseFile.exists();
+ final boolean isOld = databaseFile.exists();
if (getLogger().isDebugEnabled())
{
getLogger().debug("initialize(): Datafile exists: " + isOld);
}
- m_Database = new IndexedObjectDatabase(m_databaseFile.toString(), !isOld);
+
+ m_Index = new BTreeIndex(indexFile.toString(),
+ order, super.getNullKey(), false);
+ m_Database = new IndexedObjectDatabase(databaseFile.toString(), !isOld);
m_Database.attachIndex(m_Index);
}
@@ -157,4 +143,5 @@
getLogger().error("initialize(..) Exception", e);
}
}
+
}
1.12 +9 -2 avalon-excalibur/store/src/java/org/apache/excalibur/store/impl/AbstractJispFilesystemStore.java
Index: AbstractJispFilesystemStore.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/store/src/java/org/apache/excalibur/store/impl/AbstractJispFilesystemStore.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractJispFilesystemStore.java 14 Jul 2003 19:00:20 -0000 1.11
+++ AbstractJispFilesystemStore.java 14 Jul 2003 19:06:08 -0000 1.12
@@ -338,11 +338,18 @@
* @param key the key object
* @return the wrapped key object
*/
- private KeyObject wrapKeyObject(Object key)
+ protected KeyObject wrapKeyObject(Object key)
{
return new JispKey( key );
}
+ /**
+ * Return the Null JispKey
+ */
+ protected KeyObject getNullKey() {
+ return new JispKey().makeNullKey();
+ }
+
class BTreeObjectEnumeration implements Enumeration
{
private BTreeIterator m_Iterator;
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org