[ jEdit-commits ] SF.net SVN: jedit:[23423] plugins/SmartOpen/trunk

[<kp...@us...>]

Revision: 23423
          http://sourceforge.net/p/jedit/svn/23423
Author:   kpouer
Date:     2014-02-28 09:38:38 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
SmartOpen was not working when the file was already opened (#3615259)

Modified Paths:
--------------
    plugins/SmartOpen/trunk/SmartOpen.props
    plugins/SmartOpen/trunk/docs/SmartOpen.html
    plugins/SmartOpen/trunk/src/com/kpouer/jedit/smartopen/FileItemFinder.java

Modified: plugins/SmartOpen/trunk/SmartOpen.props
===================================================================
--- plugins/SmartOpen/trunk/SmartOpen.props	2014-02-21 08:46:33 UTC (rev 23422)
+++ plugins/SmartOpen/trunk/SmartOpen.props	2014-02-28 09:38:38 UTC (rev 23423)
@@ -4,7 +4,7 @@
 plugin.com.kpouer.jedit.smartopen.SmartOpenPlugin.activate=startup
 plugin.com.kpouer.jedit.smartopen.SmartOpenPlugin.name=SmartOpen
 plugin.com.kpouer.jedit.smartopen.SmartOpenPlugin.author=Matthieu Casanova
-plugin.com.kpouer.jedit.smartopen.SmartOpenPlugin.version=2.0
+plugin.com.kpouer.jedit.smartopen.SmartOpenPlugin.version=2.1
 plugin.com.kpouer.jedit.smartopen.SmartOpenPlugin.depend.0=jdk 1.7
 plugin.com.kpouer.jedit.smartopen.SmartOpenPlugin.depend.1=jedit 05.01.99.00
 plugin.com.kpouer.jedit.smartopen.SmartOpenPlugin.depend.2=plugin CommonControlsPlugin 1.7.2

Modified: plugins/SmartOpen/trunk/docs/SmartOpen.html
===================================================================
--- plugins/SmartOpen/trunk/docs/SmartOpen.html	2014-02-21 08:46:33 UTC (rev 23422)
+++ plugins/SmartOpen/trunk/docs/SmartOpen.html	2014-02-28 09:38:38 UTC (rev 23423)
@@ -12,7 +12,7 @@
 	<tr>
 		<td valign="top" style="font-weight:bold;font-size:x-large">SmartOpen</td>
 		<td align="right" valign="top" style="font-size:small">
-			<span style="font-weight:bold">Version 2.0 ($Date$) </span><br>
+			<span style="font-weight:bold">Version 2.1 ($Date$) </span><br>
 			Matthieu Casanova &lt;cho...@gm...&gt;&nbsp;
 		</td>
 	</tr>
@@ -45,6 +45,10 @@
 <p>and any other combination</p>
 <h2>History</h2>
 <ul>
+	<li>2.1</li>
+    <ul>
+        <li>SmartOpen 2.0 doesn't jump to already open buffers (#3615259 - Matthieu Casanova)</li>
+    </ul>
     <li>2.0</li>
     <ul>
         <li>Use of frequency to sort search results (patch #3602213 - Ivan Baidakou)</li>

Modified: plugins/SmartOpen/trunk/src/com/kpouer/jedit/smartopen/FileItemFinder.java
===================================================================
--- plugins/SmartOpen/trunk/src/com/kpouer/jedit/smartopen/FileItemFinder.java	2014-02-21 08:46:33 UTC (rev 23422)
+++ plugins/SmartOpen/trunk/src/com/kpouer/jedit/smartopen/FileItemFinder.java	2014-02-28 09:38:38 UTC (rev 23423)
@@ -1,9 +1,9 @@
 /*
  * jEdit - Programmer's Text Editor
- * :tabSize=8:indentSize=8:noTabs=false:
+ * :tabSize=4:indentSize=4:noTabs=false:
  * :folding=explicit:collapseFolds=1:
  *
- * Copyright © 2011-2012 Matthieu Casanova
+ * Copyright © 2011-2014 Matthieu Casanova
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -62,11 +62,12 @@
 		this.extensionTextField = extensionTextField;
 	} //}}}
 
+	//{{{ setFileIndex() method
 	public void setFileIndex(FileIndex itemFinder)
 	{
 		this.itemFinder.close();
 		this.itemFinder = itemFinder;
-	}
+	} //}}}
 
 	//{{{ getLabel() method
 	@Override
@@ -145,8 +146,11 @@
 		}
 		if (buffer == null)
 			jEdit.openFile(jEdit.getActiveView().getEditPane(), path);
+		else
+			jEdit.getActiveView().getEditPane().setBuffer(buffer);
 	} //}}}
 
+	//{{{ moveCaret() method
 	private static void moveCaret(int _seletedLine, String[] split)
 	{
 		JEditTextArea textArea = jEdit.getActiveView().getEditPane().getTextArea();
@@ -172,7 +176,7 @@
 			}
 		}
 		textArea.setCaretPosition(caret);
-	}
+	} //}}}
 
 	//{{{ getListCellRenderer() method
 	@Override

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.