Remove Legacy Range Index

extensions/fluent/src/org/exist/fluent/Database.java

@@ -518,13 +518,13 @@ public void dropIndex(Collection collection) {
 		public void dropIndex(DocumentImpl doc) throws ReadOnlyException {
 			stale(normalizePath(doc.getURI().getCollectionPath()));
 		}
-                @Override
-		public void removeNode(NodeHandle node, NodePath currentPath, String content) {
+		@Override
+		public void removeNode(NodeHandle node, NodePath currentPath) {
 			stale(normalizePath((node.getOwnerDocument()).getURI().getCollectionPath()) + "#" + node.getNodeId());
 		}
 		public void flush() {}
 		public void setDocument(DocumentImpl document) {}
-		public void storeAttribute(AttrImpl node, NodePath currentPath, RangeIndexSpec spec, boolean remove) {}
+		public void storeAttribute(AttrImpl node, NodePath currentPath, boolean remove) {}
 		public void storeText(TextImpl node, NodePath currentPath) {}
 		public void sync() {}
 		public void printStatistics() {}

extensions/indexes/range/src/org/exist/indexing/range/ComplexTextCollector.java

@@ -3,19 +3,21 @@
 import org.exist.dom.persistent.AttrImpl;
 import org.exist.dom.persistent.AbstractCharacterData;
 import org.exist.dom.QName;
+import org.exist.indexing.range.config.ComplexGeneralRangeIndexConfigElement;
+import org.exist.indexing.range.config.RangeIndexConfigField;
 import org.exist.storage.NodePath;
 
 import java.util.*;
 
 public class ComplexTextCollector implements TextCollector {
 
     private NodePath parentPath;
-    private ComplexRangeIndexConfigElement config;
+    private ComplexGeneralRangeIndexConfigElement config;
     private List<Field> fields = new LinkedList<Field>();
     private RangeIndexConfigField currentField = null;
     private int length = 0;
 
-    public ComplexTextCollector(ComplexRangeIndexConfigElement configuration, NodePath parentPath) {
+    public ComplexTextCollector(ComplexGeneralRangeIndexConfigElement configuration, NodePath parentPath) {
         this.config = configuration;
         this.parentPath = new NodePath(parentPath, false);
     }
@@ -73,7 +75,7 @@ public List<Field> getFields() {
         return fields;
     }
 
-    public ComplexRangeIndexConfigElement getConfig() {
+    public ComplexGeneralRangeIndexConfigElement getConfig() {
         return config;
     }
 }

extensions/indexes/range/src/org/exist/indexing/range/RangeIndex.java

@@ -1,6 +1,6 @@
 /*
  *  eXist Open Source Native XML Database
- *  Copyright (C) 2013 The eXist Project
+ *  Copyright (C) 2001-2015 The eXist Project
  *  http://exist-db.org
  *
  *  This program is free software; you can redistribute it and/or
@@ -40,33 +40,6 @@ public class RangeIndex extends LuceneIndex {
 
     public final static String ID = RangeIndex.class.getName();
 
-    /**
-     * Enumeration of supported operators and optimized functions.
-     */
-    public enum Operator {
-        GT ("gt"),
-        LT ("lt"),
-        EQ ("eq"),
-        GE ("ge"),
-        LE ("le"),
-        NE ("ne"),
-        ENDS_WITH ("ends-with"),
-        STARTS_WITH ("starts-with"),
-        CONTAINS ("contains"),
-        MATCH ("matches");
-
-        private final String name;
-
-        Operator(String name) {
-            this.name = name;
-        }
-
-        @Override
-        public String toString() {
-            return name;
-        }
-    };
-
     private static final String DIR_NAME = "range";
 
     private Analyzer defaultAnalyzer = new KeywordAnalyzer();