Revision: 10376
http://jedit.svn.sourceforge.net/jedit/?rev=10376&view=rev
Author: kpouer
Date: 2007-08-16 12:41:22 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
fixed a bug introduced when fixing folding on wrong line in sidekick mode
Modified Paths:
--------------
plugins/SideKick/trunk/sidekick/SideKickFoldHandler.java
plugins/SideKick/trunk/sidekick/SideKickParsedData.java
Modified: plugins/SideKick/trunk/sidekick/SideKickFoldHandler.java
===================================================================
--- plugins/SideKick/trunk/sidekick/SideKickFoldHandler.java 2007-08-15 20:28:51 UTC (rev 10375)
+++ plugins/SideKick/trunk/sidekick/SideKickFoldHandler.java 2007-08-16 19:41:22 UTC (rev 10376)
@@ -23,10 +23,13 @@
package sidekick;
//{{{ Imports
+
+import org.gjt.sp.jedit.buffer.FoldHandler;
+import org.gjt.sp.jedit.buffer.JEditBuffer;
+
import javax.swing.text.Segment;
+import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
-import org.gjt.sp.jedit.buffer.FoldHandler;
-import org.gjt.sp.jedit.buffer.JEditBuffer;
//}}}
/**
@@ -50,11 +53,18 @@
SideKickPlugin.PARSED_DATA_PROPERTY);
if(data == null)
return 0;
- int offset = buffer.getLineStartOffset(lineIndex);
- TreePath path = data.getTreePathForPosition(offset);
+ int lineStartOffset = buffer.getLineStartOffset(lineIndex);
+ TreePath path = data.getTreePathForPosition(lineStartOffset);
if(path == null)
return 0;
else
+ {
+ TreeNode treeNode = (TreeNode) path.getLastPathComponent();
+ IAsset asset = SideKickParsedData.getAsset(treeNode);
+ if (asset.getStart().getOffset() == lineStartOffset)
+ return path.getPathCount() - 2;
+
return path.getPathCount() - 1;
+ }
} //}}}
}
Modified: plugins/SideKick/trunk/sidekick/SideKickParsedData.java
===================================================================
--- plugins/SideKick/trunk/sidekick/SideKickParsedData.java 2007-08-15 20:28:51 UTC (rev 10375)
+++ plugins/SideKick/trunk/sidekick/SideKickParsedData.java 2007-08-16 19:41:22 UTC (rev 10376)
@@ -164,7 +164,7 @@
private static boolean assetContains(IAsset asset, int offset)
{
- return offset > asset.getStart().getOffset()
+ return offset >= asset.getStart().getOffset()
&& offset < asset.getEnd().getOffset();
}
@@ -211,7 +211,7 @@
* to return null.
* @return the IAsset contained in the user object in the node.
*/
- public IAsset getAsset( TreeNode node ) {
+ public static IAsset getAsset( TreeNode node ) {
if ( !( node instanceof DefaultMutableTreeNode ) )
{
return null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
