[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jedit-cvs
Subject:    [ jEdit-commits ] [ CtagsInterface plugin ] CtagsInterface jEdit plugin branch master updated.
From:       "Tim Blackler" <grepppo () users ! sourceforge ! net>
Date:       2015-09-27 18:29:32
Message-ID: E1ZgGhb-0007u7-F0 () sfs-ml-3 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CtagsInterface jEdit plugin".

The branch, master has been updated
       via  5daed4983e67f49d5a1243911ba1b6729d318e77 (commit)
      from  26fa2a58d7130db8e62f8b40448b0af661df6f38 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit: http://sourceforge.net/p/jedit/CtagsInterface/ci/5daed4983e67f49d5a1243911ba1b6729d318e77/
                
tree: http://sourceforge.net/p/jedit/CtagsInterface/ci/5daed4983e67f49d5a1243911ba1b6729d318e77/tree/


commit 5daed4983e67f49d5a1243911ba1b6729d318e77
Author: Tim Blackler <grepppo@users.sourceforge.net>
Date:   Sun Sep 27 19:29:05 2015 +0100

    #1824 CtagsInterface doesn't work with latest Lucene

diff --git a/CtagsInterface.props b/CtagsInterface.props
index 1022214..19c0057 100644
--- a/CtagsInterface.props
+++ b/CtagsInterface.props
@@ -3,7 +3,7 @@ plugin.ctagsinterface.main.CtagsInterfacePlugin.activate=startup
 # general plugin information
 plugin.ctagsinterface.main.CtagsInterfacePlugin.name=CtagsInterface
 plugin.ctagsinterface.main.CtagsInterfacePlugin.author=Shlomy Reinstein
-plugin.ctagsinterface.main.CtagsInterfacePlugin.version=2.7.0
+plugin.ctagsinterface.main.CtagsInterfacePlugin.version=2.8.0
 plugin.ctagsinterface.main.CtagsInterfacePlugin.description=\
 	CtagsInterface provides common Ctags services to interested plugins.\
 	Among this plugin's capabilities are:\
@@ -17,7 +17,7 @@ plugin.ctagsinterface.main.CtagsInterfacePlugin.depend.1=jedit \
05.00.99.00  plugin.ctagsinterface.main.CtagsInterfacePlugin.depend.2=optional plugin \
projectviewer.ProjectPlugin 3.5.2  \
plugin.ctagsinterface.main.CtagsInterfacePlugin.depend.3=plugin SuperAbbrevsPlugin \
1.0  plugin.ctagsinterface.main.CtagsInterfacePlugin.depend.4=optional plugin \
                ise.plugin.nav.NavigatorPlugin 2.4
-plugin.ctagsinterface.main.CtagsInterfacePlugin.depend.5=plugin \
gatchan.jedit.lucene.LucenePlugin 4.0 \
+plugin.ctagsinterface.main.CtagsInterfacePlugin.depend.5=plugin \
gatchan.jedit.lucene.LucenePlugin 4.2  \
plugin.ctagsinterface.main.CtagsInterfacePlugin.depend.6=plugin \
completion.CompletionPlugin 0.3  \
plugin.ctagsinterface.main.CtagsInterfacePlugin.depend.7=optional plugin \
sidekick.SideKickPlugin 1.4  \
plugin.ctagsinterface.main.CtagsInterfacePlugin.depend.8=optional plugin \
                ctags.sidekick.Plugin 1.5
diff --git a/src/ctagsinterface/index/TagIndex.java \
b/src/ctagsinterface/index/TagIndex.java index 9a271b7..3321e44 100644
--- a/src/ctagsinterface/index/TagIndex.java
+++ b/src/ctagsinterface/index/TagIndex.java
@@ -12,7 +12,6 @@ import java.util.Vector;
 
 import javax.swing.JOptionPane;
 
-import ctagsinterface.main.CtagsInterfacePlugin;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.core.KeywordAnalyzer;
 import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper;
@@ -38,13 +37,13 @@ import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.util.Version;
 import org.gjt.sp.jedit.EditPlugin;
 import org.gjt.sp.jedit.GUIUtilities;
 import org.gjt.sp.jedit.jEdit;
 import org.gjt.sp.util.IOUtilities;
 import org.gjt.sp.util.Log;
 
+import ctagsinterface.main.CtagsInterfacePlugin;
 import ctagsinterface.main.Logger;
 import ctagsinterface.main.Tag;
 
@@ -116,7 +115,7 @@ public class TagIndex
 	{
 		File path = getIndexPath();
 		// todo Matthieu: stowords ?
-		standardAnalyzer = new StandardAnalyzer(Version.LUCENE_41);
+		standardAnalyzer = new StandardAnalyzer();
 		keywordAnalyzer = new KeywordAnalyzer();
 		Map<String, Analyzer> fieldAnalysers = new HashMap<String, Analyzer>();
 
@@ -135,17 +134,18 @@ public class TagIndex
 		writeCount = 0;
 		try
 		{
-			directory = FSDirectory.open(path);
+			directory = FSDirectory.open(path.toPath());
 			if (IndexWriter.isLocked(directory))
 			{
 				Log.log(Log.WARNING, this, "The lucene index at " + path.getAbsolutePath() + " \
is locked");  int ret = GUIUtilities.confirm(jEdit.getActiveView(),
 					"lucene.index.locked", new Object[]{path},
 					JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE);
-				if (ret == JOptionPane.YES_OPTION)
-					IndexWriter.unlock(directory);
+				if (ret == JOptionPane.YES_OPTION) {
+					//IndexWriter.unlock(directory);
+				}
 			}
-			IndexWriterConfig indexWriterConfig = new IndexWriterConfig(Version.LUCENE_41, \
analyzer); +			IndexWriterConfig indexWriterConfig = new IndexWriterConfig(analyzer);
 			writer = new IndexWriter(directory, indexWriterConfig);
 
 		}
@@ -730,7 +730,7 @@ public class TagIndex
 	private Query getQuery(String query)
 	{
 		Log.log(Log.MESSAGE, TagIndex.class, "Parsing query: " + query);
-		QueryParser qp = new QueryParser(Version.LUCENE_41, _NAME_FLD, analyzer);
+		QueryParser qp = new QueryParser(_NAME_FLD, analyzer);
 		qp.setAllowLeadingWildcard(true);
 		qp.setLowercaseExpandedTerms(false);
 		try

-----------------------------------------------------------------------

Summary of changes:
 CtagsInterface.props                   |    4 ++--
 src/ctagsinterface/index/TagIndex.java |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CtagsInterface jEdit plugin

------------------------------------------------------------------------------
_______________________________________________
jEdit-CVS mailing list
jEdit-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jedit-cvs


[prev in list] [next in list] [prev in thread] [next in thread]