Commit 1079e457 authored by Christian Reuschling's avatar Christian Reuschling
Browse files

now lucene stuff is managed by DynaQ and not by leechcrawler. We are

independent from leechcrawler regarding the lucene version now. | some
new migrations to several dependency versions
parent 5ca3df8e
target target
dynaq.keys dynaq.keys
.idea
dynaq.iml
This diff is collapsed.
...@@ -19,9 +19,9 @@ import org.apache.lucene.store.NativeFSLockFactory; ...@@ -19,9 +19,9 @@ import org.apache.lucene.store.NativeFSLockFactory;
import org.kafkaRCP.core.KafkaRCPConstants; import org.kafkaRCP.core.KafkaRCPConstants;
import org.kafkaRCP.ui.KafkaRCP; import org.kafkaRCP.ui.KafkaRCP;
import de.dfki.inquisition.exceptions.ExceptionUtils; import de.dfki.inquisitor.exceptions.ExceptionUtils;
import de.dfki.inquisition.file.FileUtils; import de.dfki.inquisitor.file.FileUtilz;
import de.dfki.inquisition.resources.ResourceUtilz; import de.dfki.inquisitor.resources.ResourceUtilz;
...@@ -121,7 +121,7 @@ public class DynaQ ...@@ -121,7 +121,7 @@ public class DynaQ
if(bLogConfig) if(bLogConfig)
{ {
File fLogProps = new File(KafkaRCPConstants.addKafkaBaseDir2RelativePath("config/logging.properties")); File fLogProps = new File(KafkaRCPConstants.addKafkaBaseDir2RelativePath("config/logging.properties"));
if(!fLogProps.exists()) FileUtils.copyFile(new File(fLogProps.getAbsolutePath() + ".reference"), fLogProps); if(!fLogProps.exists()) FileUtilz.copyFile(new File(fLogProps.getAbsolutePath() + ".reference"), fLogProps);
LogManager.getLogManager().readConfiguration(new FileInputStream(fLogProps)); LogManager.getLogManager().readConfiguration(new FileInputStream(fLogProps));
System.setProperty("java.util.logging.config.file", fLogProps.getAbsolutePath()); System.setProperty("java.util.logging.config.file", fLogProps.getAbsolutePath());
} }
......
...@@ -39,22 +39,26 @@ import org.dynaq.core.DynaQDocument; ...@@ -39,22 +39,26 @@ import org.dynaq.core.DynaQDocument;
import org.dynaq.core.DynaQException; import org.dynaq.core.DynaQException;
import org.dynaq.index.LuceneIndexSet; import org.dynaq.index.LuceneIndexSet;
import org.dynaq.util.DateUtils; import org.dynaq.util.DateUtils;
import org.dynaq.util.lucene.basic.Buzzwords;
// import org.dynaq.util.lucene.basic.DynamicFieldType;
import org.dynaq.util.lucene.basic.DynaQDefaultFieldConfig;
import org.dynaq.util.lucene.basic.DynamicFieldType;
import org.dynaq.util.lucene.basic.FieldConfig;
import org.kafkaRCP.core.KafkaRCPConstants; import org.kafkaRCP.core.KafkaRCPConstants;
import de.dfki.inquisition.collections.ConfigurationException; import de.dfki.inquisitor.collections.ConfigurationException;
import de.dfki.inquisition.collections.ConfigurationValue; import de.dfki.inquisitor.collections.ConfigurationValue;
import de.dfki.inquisition.collections.MultiValueConfiguration; import de.dfki.inquisitor.collections.MultiValueConfiguration;
import de.dfki.inquisition.collections.MultiValueLinkedHashMap; import de.dfki.inquisitor.collections.MultiValueLinkedHashMap;
import de.dfki.inquisition.file.FileUtils; import de.dfki.inquisitor.file.FileUtilz;
import de.dfki.inquisition.lucene.Buzzwords; import de.dfki.inquisitor.text.DateParser;
import de.dfki.inquisition.lucene.DynamicFieldType;
import de.dfki.inquisition.lucene.FieldConfig;
import de.dfki.inquisition.text.DateParser;
import de.dfki.km.leech.lucene.LeechDefaultFieldConfig; import de.dfki.km.leech.lucene.LeechDefaultFieldConfig;
import de.dfki.km.leech.metadata.LeechMetadata; import de.dfki.km.leech.metadata.LeechMetadata;
@SuppressWarnings({"JavaDoc", "ConstantConditions"})
public class AttributeConfig public class AttributeConfig
{ {
...@@ -573,27 +577,27 @@ public class AttributeConfig ...@@ -573,27 +577,27 @@ public class AttributeConfig
for (String targetAttributeName : targetAttributeNames) for (String targetAttributeName : targetAttributeNames)
{ {
if("integer".equals(strFieldType.toLowerCase())) if("integer".equalsIgnoreCase(strFieldType))
{ {
numberAttributeQuery.add(NumericRangeQuery.newIntRange(targetAttributeName, (Integer) lowerBound, (Integer) upperBound, true, true), Occur.SHOULD); numberAttributeQuery.add(NumericRangeQuery.newIntRange(targetAttributeName, (Integer) lowerBound, (Integer) upperBound, true, true), Occur.SHOULD);
} }
else if("long".equals(strFieldType.toLowerCase())) else if("long".equalsIgnoreCase(strFieldType))
{ {
numberAttributeQuery.add(NumericRangeQuery.newLongRange(targetAttributeName, (Long) lowerBound, (Long) upperBound, true, true), Occur.SHOULD); numberAttributeQuery.add(NumericRangeQuery.newLongRange(targetAttributeName, (Long) lowerBound, (Long) upperBound, true, true), Occur.SHOULD);
} }
else if("float".equals(strFieldType.toLowerCase())) else if("float".equalsIgnoreCase(strFieldType))
{ {
numberAttributeQuery.add(NumericRangeQuery.newFloatRange(targetAttributeName, (Float) lowerBound, (Float) upperBound, true, true), Occur.SHOULD); numberAttributeQuery.add(NumericRangeQuery.newFloatRange(targetAttributeName, (Float) lowerBound, (Float) upperBound, true, true), Occur.SHOULD);
} }
else if("double".equals(strFieldType.toLowerCase())) else if("double".equalsIgnoreCase(strFieldType))
{ {
numberAttributeQuery.add(NumericRangeQuery.newDoubleRange(targetAttributeName, (Double) lowerBound, (Double) upperBound, true, true), Occur.SHOULD); numberAttributeQuery.add(NumericRangeQuery.newDoubleRange(targetAttributeName, (Double) lowerBound, (Double) upperBound, true, true), Occur.SHOULD);
} }
else if("date".equals(strFieldType.toLowerCase())) else if("date".equalsIgnoreCase(strFieldType))
{ {
numberAttributeQuery.add(NumericRangeQuery.newLongRange(targetAttributeName, (Long) lowerBound, (Long) upperBound, true, true), Occur.SHOULD); numberAttributeQuery.add(NumericRangeQuery.newLongRange(targetAttributeName, (Long) lowerBound, (Long) upperBound, true, true), Occur.SHOULD);
} }
else if("time".equals(strFieldType.toLowerCase())) else if("time".equalsIgnoreCase(strFieldType))
{ {
numberAttributeQuery.add(NumericRangeQuery.newIntRange(targetAttributeName, (Integer) lowerBound, (Integer) upperBound, true, true), Occur.SHOULD); numberAttributeQuery.add(NumericRangeQuery.newIntRange(targetAttributeName, (Integer) lowerBound, (Integer) upperBound, true, true), Occur.SHOULD);
} }
...@@ -1129,10 +1133,10 @@ public class AttributeConfig ...@@ -1129,10 +1133,10 @@ public class AttributeConfig
// die fieldConfig muß noch aus der Konfiguration erzeugt werden. Wir nehmen schon mal eine StandardConfig, und überschreiben/erweitern dann mit der aus der // die fieldConfig muß noch aus der Konfiguration erzeugt werden. Wir nehmen schon mal eine StandardConfig, und überschreiben/erweitern dann mit der aus der
// Datei // Datei
m_fieldConfig = new LeechDefaultFieldConfig(); m_fieldConfig = new DynaQDefaultFieldConfig();
FieldConfig fieldConfigFromJson = new FieldConfig(); FieldConfig fieldConfigFromJson = new FieldConfig();
fieldConfigFromJson.fromJson(FileUtils.file2String(KafkaRCPConstants.addKafkaBaseDir2RelativePath(DynaQConstants.fieldsConf))); fieldConfigFromJson.fromJson(FileUtilz.file2String(KafkaRCPConstants.addKafkaBaseDir2RelativePath(DynaQConstants.fieldsConf)));
if(fieldConfigFromJson.defaultFieldType != null) m_fieldConfig.defaultFieldType = fieldConfigFromJson.defaultFieldType; if(fieldConfigFromJson.defaultFieldType != null) m_fieldConfig.defaultFieldType = fieldConfigFromJson.defaultFieldType;
m_fieldConfig.fieldName2FieldType.putAll(fieldConfigFromJson.fieldName2FieldType); m_fieldConfig.fieldName2FieldType.putAll(fieldConfigFromJson.fieldName2FieldType);
......
...@@ -12,6 +12,7 @@ import javax.mail.Folder; ...@@ -12,6 +12,7 @@ import javax.mail.Folder;
import javax.mail.MessagingException; import javax.mail.MessagingException;
import javax.mail.Store; import javax.mail.Store;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreeNode;
...@@ -45,10 +46,10 @@ class CheckTreeTools ...@@ -45,10 +46,10 @@ class CheckTreeTools
// If there are children and they are no dummies, check them // If there are children and they are no dummies, check them
if((top.getChildCount() != 0) && (!(((DefaultMutableTreeNode) top.getFirstChild()).getUserObject().equals(DUMMY.getUserObject())))) if((top.getChildCount() != 0) && (!(((DefaultMutableTreeNode) top.getFirstChild()).getUserObject().equals(DUMMY.getUserObject()))))
{ {
Enumeration<DefaultMutableTreeNode> e = top.children(); Enumeration<TreeNode> e = top.children();
for (int i = 0; i < top.getChildCount(); i++) for (int i = 0; i < top.getChildCount(); i++)
{ {
DefaultMutableTreeNode child = e.nextElement(); DefaultMutableTreeNode child = (DefaultMutableTreeNode) e.nextElement();
// Object childInfo = child.getUserObject(); // Object childInfo = child.getUserObject();
changeChildrenSelectionState(child, set, false); changeChildrenSelectionState(child, set, false);
} }
...@@ -76,10 +77,10 @@ class CheckTreeTools ...@@ -76,10 +77,10 @@ class CheckTreeTools
// if a node got "unchecked" // if a node got "unchecked"
{ {
// look, whether a other node on the same level is checked, or partly checked // look, whether a other node on the same level is checked, or partly checked
Enumeration<DefaultMutableTreeNode> e = parent.children(); Enumeration<TreeNode> e = parent.children();
while (e.hasMoreElements()) while (e.hasMoreElements())
{ {
DefaultMutableTreeNode child = e.nextElement(); DefaultMutableTreeNode child = (DefaultMutableTreeNode) e.nextElement();
// if one of the node's siblings is checked or partly checked, the selection of the parental nodes doesn't change // if one of the node's siblings is checked or partly checked, the selection of the parental nodes doesn't change
if(((Checkable) child.getUserObject()).getSelectionState() != Checkable.UNCHECKED) if(((Checkable) child.getUserObject()).getSelectionState() != Checkable.UNCHECKED)
{ {
......
...@@ -4,8 +4,8 @@ package org.dynaq.config; ...@@ -4,8 +4,8 @@ package org.dynaq.config;
import java.util.logging.Logger; import java.util.logging.Logger;
import de.dfki.inquisition.collections.ConfigurationException; import de.dfki.inquisitor.collections.ConfigurationException;
import de.dfki.inquisition.collections.MultiValueConfiguration; import de.dfki.inquisitor.collections.MultiValueConfiguration;
......
...@@ -26,7 +26,7 @@ import javax.swing.ListSelectionModel; ...@@ -26,7 +26,7 @@ import javax.swing.ListSelectionModel;
import org.kafkaRCP.core.KafkaRCPConstants; import org.kafkaRCP.core.KafkaRCPConstants;
import de.dfki.inquisition.collections.MultiValueConfiguration; import de.dfki.inquisitor.collections.MultiValueConfiguration;
......
...@@ -26,6 +26,7 @@ import javax.swing.JScrollPane; ...@@ -26,6 +26,7 @@ import javax.swing.JScrollPane;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.UIManager; import javax.swing.UIManager;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath; import javax.swing.tree.TreePath;
import org.kafkaRCP.core.KafkaRCPConstants; import org.kafkaRCP.core.KafkaRCPConstants;
...@@ -168,7 +169,7 @@ public class DirectoryTreePanel extends JPanel implements ActionListener,ItemLis ...@@ -168,7 +169,7 @@ public class DirectoryTreePanel extends JPanel implements ActionListener,ItemLis
while (!fileStack.empty()) while (!fileStack.empty())
{ {
DefaultMutableTreeNode node = (DefaultMutableTreeNode)homePath.getLastPathComponent(); DefaultMutableTreeNode node = (DefaultMutableTreeNode)homePath.getLastPathComponent();
Enumeration<DefaultMutableTreeNode> children = node.children(); Enumeration<TreeNode> children = node.children();
// Search the children for the next match // Search the children for the next match
File childFile; File childFile;
...@@ -177,7 +178,7 @@ public class DirectoryTreePanel extends JPanel implements ActionListener,ItemLis ...@@ -177,7 +178,7 @@ public class DirectoryTreePanel extends JPanel implements ActionListener,ItemLis
while (children.hasMoreElements()) while (children.hasMoreElements())
{ {
childNode = children.nextElement(); childNode = (DefaultMutableTreeNode) children.nextElement();
childFile = (File)childNode.getUserObject(); childFile = (File)childNode.getUserObject();
if (pathFile.equals(childFile)) if (pathFile.equals(childFile))
{ {
......
...@@ -34,8 +34,8 @@ import org.dynaq.config.AttributeConfig.ConfigAttributes.IMAP_DIRECTORY_ATTS; ...@@ -34,8 +34,8 @@ import org.dynaq.config.AttributeConfig.ConfigAttributes.IMAP_DIRECTORY_ATTS;
import org.jasypt.util.text.BasicTextEncryptor; import org.jasypt.util.text.BasicTextEncryptor;
import org.kafkaRCP.core.KafkaRCPConstants; import org.kafkaRCP.core.KafkaRCPConstants;
import de.dfki.inquisition.collections.ConfigurationValue; import de.dfki.inquisitor.collections.ConfigurationValue;
import de.dfki.inquisition.collections.MultiValueConfiguration; import de.dfki.inquisitor.collections.MultiValueConfiguration;
......
...@@ -25,7 +25,7 @@ import org.dynaq.config.AttributeConfig.ConfigAttributes; ...@@ -25,7 +25,7 @@ import org.dynaq.config.AttributeConfig.ConfigAttributes;
import org.dynaq.config.AttributeConfig.ConfigAttributes.IMAP_DIRECTORY_ATTS; import org.dynaq.config.AttributeConfig.ConfigAttributes.IMAP_DIRECTORY_ATTS;
import org.kafkaRCP.core.KafkaRCPConstants; import org.kafkaRCP.core.KafkaRCPConstants;
import de.dfki.inquisition.collections.MultiValueConfiguration; import de.dfki.inquisitor.collections.MultiValueConfiguration;
......
...@@ -39,7 +39,7 @@ import org.kafkaRCP.core.RCPPersistentPlugin; ...@@ -39,7 +39,7 @@ import org.kafkaRCP.core.RCPPersistentPlugin;
import org.kafkaRCP.core.data.KafkaMessages; import org.kafkaRCP.core.data.KafkaMessages;
import org.kafkaRCP.ui.KafkaRCP; import org.kafkaRCP.ui.KafkaRCP;
import de.dfki.inquisition.exceptions.ExceptionUtils; import de.dfki.inquisitor.exceptions.ExceptionUtils;
......
...@@ -12,12 +12,7 @@ import javax.mail.Folder; ...@@ -12,12 +12,7 @@ import javax.mail.Folder;
import javax.mail.MessagingException; import javax.mail.MessagingException;
import javax.mail.Store; import javax.mail.Store;
import javax.swing.JTree; import javax.swing.JTree;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.*;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.ExpandVetoException;
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel;
...@@ -181,8 +176,8 @@ public class JCheckTree extends JTree ...@@ -181,8 +176,8 @@ public class JCheckTree extends JTree
if(((Checkable) node.getUserObject()).getSelectionState() == Checkable.CHILD_IS_CHECKED) if(((Checkable) node.getUserObject()).getSelectionState() == Checkable.CHILD_IS_CHECKED)
{ {
Enumeration<DefaultMutableTreeNode> children = node.children(); Enumeration<TreeNode> children = node.children();
DefaultMutableTreeNode child = children.nextElement(); DefaultMutableTreeNode child = (DefaultMutableTreeNode) children.nextElement();
if(child.getUserObject() instanceof String) if(child.getUserObject() instanceof String)
{ {
...@@ -203,7 +198,7 @@ public class JCheckTree extends JTree ...@@ -203,7 +198,7 @@ public class JCheckTree extends JTree
while (children.hasMoreElements()) while (children.hasMoreElements())
{ {
list = getCheckedNodesHelper(list, children.nextElement()); list = getCheckedNodesHelper(list, (DefaultMutableTreeNode) children.nextElement());
} }
} }
} }
...@@ -223,11 +218,11 @@ public class JCheckTree extends JTree ...@@ -223,11 +218,11 @@ public class JCheckTree extends JTree
// List the children of the root // List the children of the root
DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot();
Enumeration<DefaultMutableTreeNode> children = root.children(); Enumeration<TreeNode> children = root.children();
while (children.hasMoreElements()) while (children.hasMoreElements())
{ {
checkList = getCheckedNodesHelper(checkList, children.nextElement()); checkList = getCheckedNodesHelper(checkList, (DefaultMutableTreeNode) children.nextElement());
} }
return checkList.toArray(); return checkList.toArray();
...@@ -249,12 +244,12 @@ public class JCheckTree extends JTree ...@@ -249,12 +244,12 @@ public class JCheckTree extends JTree
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public Object[] getRootNodesObjects() public Object[] getRootNodesObjects()
{ {
Enumeration<DefaultMutableTreeNode> e = top.children(); Enumeration<TreeNode> e = top.children();
Object[] result = new Object[top.getChildCount()]; Object[] result = new Object[top.getChildCount()];
for (int i = 0; i < result.length; i++) for (int i = 0; i < result.length; i++)
{ {
result[i] = e.nextElement().getUserObject(); result[i] = ((DefaultMutableTreeNode)e.nextElement()).getUserObject();
} }
return result; return result;
...@@ -263,12 +258,12 @@ public class JCheckTree extends JTree ...@@ -263,12 +258,12 @@ public class JCheckTree extends JTree
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public DefaultMutableTreeNode[] getRootNodes() public DefaultMutableTreeNode[] getRootNodes()
{ {
Enumeration<DefaultMutableTreeNode> e = top.children(); Enumeration<TreeNode> e = top.children();
DefaultMutableTreeNode[] result = new DefaultMutableTreeNode[top.getChildCount()]; DefaultMutableTreeNode[] result = new DefaultMutableTreeNode[top.getChildCount()];
for (int i = 0; i < result.length; i++) for (int i = 0; i < result.length; i++)
{ {
result[i] = e.nextElement(); result[i] = (DefaultMutableTreeNode)e.nextElement();
} }
return result; return result;
...@@ -291,10 +286,10 @@ public class JCheckTree extends JTree ...@@ -291,10 +286,10 @@ public class JCheckTree extends JTree
DefaultTreeModel model = (DefaultTreeModel) this.getModel(); DefaultTreeModel model = (DefaultTreeModel) this.getModel();
DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot();
Enumeration<DefaultMutableTreeNode> nodes = root.preorderEnumeration(); Enumeration<TreeNode> nodes = root.preorderEnumeration();
while (nodes.hasMoreElements()) while (nodes.hasMoreElements())
{ {
DefaultMutableTreeNode node = nodes.nextElement(); DefaultMutableTreeNode node = (DefaultMutableTreeNode) nodes.nextElement();
if (node.getUserObject() instanceof Checkable) if (node.getUserObject() instanceof Checkable)
{ {
boolean removed = ((CheckTreeMutableTreeNode)node).removeHiddenChildrenFromRealChildren(); boolean removed = ((CheckTreeMutableTreeNode)node).removeHiddenChildrenFromRealChildren();
...@@ -319,10 +314,10 @@ public class JCheckTree extends JTree ...@@ -319,10 +314,10 @@ public class JCheckTree extends JTree
DefaultTreeModel model = (DefaultTreeModel) this.getModel(); DefaultTreeModel model = (DefaultTreeModel) this.getModel();
DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot();
Enumeration<DefaultMutableTreeNode> nodes = root.preorderEnumeration(); Enumeration<TreeNode> nodes = root.preorderEnumeration();
while (nodes.hasMoreElements()) while (nodes.hasMoreElements())
{ {
DefaultMutableTreeNode node = nodes.nextElement(); DefaultMutableTreeNode node = (DefaultMutableTreeNode) nodes.nextElement();
if (node.getUserObject() instanceof Checkable) if (node.getUserObject() instanceof Checkable)
{ {
boolean added = ((CheckTreeMutableTreeNode)node).addHiddenChildrenToRealChildren(); boolean added = ((CheckTreeMutableTreeNode)node).addHiddenChildrenToRealChildren();
......
...@@ -30,9 +30,9 @@ import javax.swing.table.TableColumn; ...@@ -30,9 +30,9 @@ import javax.swing.table.TableColumn;
import org.kafkaRCP.core.KafkaRCPConstants; import org.kafkaRCP.core.KafkaRCPConstants;
import de.dfki.inquisition.ui.table.ComparableColumnComparator; import de.dfki.inquisitor.ui.table.ComparableColumnComparator;
import de.dfki.inquisition.ui.table.TableUtils; import de.dfki.inquisitor.ui.table.TableUtils;
import de.dfki.inquisition.ui.table.rowheader.Util; import de.dfki.inquisitor.ui.table.rowheader.Util;
......
...@@ -17,11 +17,13 @@ import java.awt.event.MouseAdapter; ...@@ -17,11 +17,13 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.rmi.server.UID; import java.rmi.server.UID;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
...@@ -41,12 +43,15 @@ import javax.swing.SwingUtilities; ...@@ -41,12 +43,15 @@ import javax.swing.SwingUtilities;
import javax.swing.ToolTipManager; import javax.swing.ToolTipManager;
import javax.swing.UIManager; import javax.swing.UIManager;
import com.cedarsoftware.util.io.JsonReader;
import com.jgoodies.binding.beans.PropertyAccessor;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.dynaq.core.Context; import org.dynaq.core.Context;
import org.dynaq.core.DynaQQuery; import org.dynaq.core.DynaQQuery;
import org.dynaq.search.pull.ConfigurableSearchingView; import org.dynaq.search.pull.ConfigurableSearchingView;
import org.dynaq.search.pull.sections.QueryContextContextualizationPanel; import org.dynaq.search.pull.sections.QueryContextContextualizationPanel;
import org.dynaq.util.lucene.BooleanQueryWithMetaData; import org.dynaq.util.lucene.BooleanQueryWithMetaData;
import org.dynaq.util.lucene.basic.LuceneUtilz;
import org.kafkaRCP.core.KafkaRCPConstants; import org.kafkaRCP.core.KafkaRCPConstants;
import org.kafkaRCP.core.RCPPersistentPlugin; import org.kafkaRCP.core.RCPPersistentPlugin;
import org.kafkaRCP.ui.KafkaRCP; import org.kafkaRCP.ui.KafkaRCP;
...@@ -55,11 +60,10 @@ import com.jgoodies.binding.adapter.BasicComponentFactory; ...@@ -55,11 +60,10 @@ import com.jgoodies.binding.adapter.BasicComponentFactory;
import com.jgoodies.binding.beans.BeanAdapter; import com.jgoodies.binding.beans.BeanAdapter;
import com.jgoodies.common.collect.LinkedListModel; import com.jgoodies.common.collect.LinkedListModel;
import de.dfki.inquisition.file.FileUtils; import de.dfki.inquisitor.file.FileUtilz;
import de.dfki.inquisition.lucene.LuceneUtilz; import de.dfki.inquisitor.ui.SwingUtils;
import de.dfki.inquisition.ui.SwingUtils; import de.dfki.inquisitor.ui.componentList.ComponentList;
import de.dfki.inquisition.ui.componentList.ComponentList; import de.dfki.inquisitor.ui.tablelayout.TableLayoutUtil;
import de.dfki.inquisition.ui.tablelayout.TableLayoutUtil;
...@@ -71,15 +75,15 @@ public class QueryContextConfigView extends JPanel implements RCPPersistentPlugi ...@@ -71,15 +75,15 @@ public class QueryContextConfigView extends JPanel implements RCPPersistentPlugi
{ {
private static final long serialVersionUID = 2051413894930182977L; private static final long serialVersionUID = 2051413894930182977L;
protected final Context context; protected Context context;
final protected JButton m_add2ActiveQueryContextualizationsButton; protected JButton m_add2ActiveQueryContextualizationsButton;
final protected JButton m_add2ActiveQueryContextualizationsOrthogonalButton; protected JButton m_add2ActiveQueryContextualizationsOrthogonalButton;
final protected JTextField m_contextNameJTextField; protected JTextField m_contextNameJTextField;
final protected JButton m_editButton; protected JButton m_editButton;
final protected Component m_firstQueryContextLabel = new JLabel("<html><font COLOR=GREEN> &lt;&lt; first query context</font></html>"); final protected Component m_firstQueryContextLabel = new JLabel("<html><font COLOR=GREEN> &lt;&lt; first query context</font></html>");
...@@ -159,15 +163,20 @@ public class QueryContextConfigView extends JPanel implements RCPPersistentPlugi ...@@ -159,15 +163,20 @@ public class QueryContextConfigView extends JPanel implements RCPPersistentPlugi
}; };