From 0f6b011e1af2e67fadca76dc5d7f3ad9dc196f2a Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Mon, 12 Oct 2009 21:12:42 +0000
Subject: [PATCH] fix for new index location and better way to use own classes
 by reflection

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6406 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 source/net/yacy/kelondro/order/MergeIterator.java         | 5 +----
 source/net/yacy/kelondro/rwi/ReferenceContainer.java      | 5 +----
 source/net/yacy/kelondro/rwi/ReferenceContainerArray.java | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/source/net/yacy/kelondro/order/MergeIterator.java b/source/net/yacy/kelondro/order/MergeIterator.java
index 26aea8856..bfb980c0c 100644
--- a/source/net/yacy/kelondro/order/MergeIterator.java
+++ b/source/net/yacy/kelondro/order/MergeIterator.java
@@ -149,14 +149,11 @@ public class MergeIterator<E> implements CloneableIterator<E> {
     static {
         Method meth = null;
         try {
-            final Class<?> c = Class.forName("net.yacy.kelondro.order.MergeIterator");
+            final Class<?> c = net.yacy.kelondro.order.MergeIterator.class;
             meth = c.getMethod("mergeEqualByReplace", new Class[]{Object.class, Object.class});
         } catch (final SecurityException e) {
             System.out.println("Error while initializing simpleMerge (1): " + e.getMessage());
             meth = null;
-        } catch (final ClassNotFoundException e) {
-            System.out.println("Error while initializing simpleMerge (2): " + e.getMessage());
-            meth = null;
         } catch (final NoSuchMethodException e) {
             System.out.println("Error while initializing simpleMerge (3): " + e.getMessage());
             meth = null;
diff --git a/source/net/yacy/kelondro/rwi/ReferenceContainer.java b/source/net/yacy/kelondro/rwi/ReferenceContainer.java
index f6a960aca..41c15147e 100644
--- a/source/net/yacy/kelondro/rwi/ReferenceContainer.java
+++ b/source/net/yacy/kelondro/rwi/ReferenceContainer.java
@@ -215,14 +215,11 @@ public class ReferenceContainer<ReferenceType extends Reference> extends RowSet
     static {
         Method meth = null;
         try {
-            final Class<?> c = Class.forName("net.yacy.kelondro.rwi.ReferenceContainer");
+            final Class<?> c = net.yacy.kelondro.rwi.ReferenceContainer.class;
             meth = c.getMethod("mergeUnique", new Class[]{Object.class, Object.class});
         } catch (final SecurityException e) {
             System.out.println("Error while initializing containerMerge.SecurityException: " + e.getMessage());
             meth = null;
-        } catch (final ClassNotFoundException e) {
-            System.out.println("Error while initializing containerMerge.ClassNotFoundException: " + e.getMessage());
-            meth = null;
         } catch (final NoSuchMethodException e) {
             System.out.println("Error while initializing containerMerge.NoSuchMethodException: " + e.getMessage());
             meth = null;
diff --git a/source/net/yacy/kelondro/rwi/ReferenceContainerArray.java b/source/net/yacy/kelondro/rwi/ReferenceContainerArray.java
index 662be89c4..94c0c580a 100644
--- a/source/net/yacy/kelondro/rwi/ReferenceContainerArray.java
+++ b/source/net/yacy/kelondro/rwi/ReferenceContainerArray.java
@@ -318,7 +318,7 @@ public final class ReferenceContainerArray<ReferenceType extends Reference> {
         HandleMap references = new HandleMap(payloadrow.primaryKeyLength, termOrder, 4, 0, 1000000);
         String[] files = heapLocation.list();
         for (String f: files) {
-            if (f.length() < 22 || !f.startsWith("index") || !f.endsWith(".blob")) continue;
+            if (f.length() < 22 || !f.startsWith("text.index") || !f.endsWith(".blob")) continue;
             File fl = new File(heapLocation, f);
             System.out.println("CELL REFERENCE COLLECTION opening blob " + fl);
             CloneableIterator<ReferenceContainer<ReferenceType>>  ei = new ReferenceIterator<ReferenceType>(fl, factory, payloadrow);