From: <sh...@us...> - 2011-12-02 01:49:23
|
Revision: 20481 http://jedit.svn.sourceforge.net/jedit/?rev=20481&view=rev Author: shlomy Date: 2011-12-02 01:49:17 +0000 (Fri, 02 Dec 2011) Log Message: ----------- Fixed SF bug #3445893: Sidekick unable to clear checkbox tree/combo follows The plugin option pane set the value of the checkbox from the mode-specific property, but set the global property. Modified Paths: -------------- plugins/SideKick/trunk/sidekick/SideKick.java plugins/SideKick/trunk/sidekick/SideKickOptionPane.java plugins/SideKick/trunk/sidekick/SideKickTree.java Modified: plugins/SideKick/trunk/sidekick/SideKick.java =================================================================== --- plugins/SideKick/trunk/sidekick/SideKick.java 2011-12-01 10:51:02 UTC (rev 20480) +++ plugins/SideKick/trunk/sidekick/SideKick.java 2011-12-02 01:49:17 UTC (rev 20481) @@ -117,7 +117,10 @@ return jEdit.getBooleanProperty(SideKick.FOLLOW_CARET) ; } } - public static void setFollowCaret(boolean fc) { + public static boolean isGlobalFollowCaret() { + return jEdit.getBooleanProperty(SideKick.FOLLOW_CARET); + } + public static void setGlobalFollowCaret(boolean fc) { jEdit.setBooleanProperty( SideKick.FOLLOW_CARET, fc); } Modified: plugins/SideKick/trunk/sidekick/SideKickOptionPane.java =================================================================== --- plugins/SideKick/trunk/sidekick/SideKickOptionPane.java 2011-12-01 10:51:02 UTC (rev 20480) +++ plugins/SideKick/trunk/sidekick/SideKickOptionPane.java 2011-12-02 01:49:17 UTC (rev 20481) @@ -72,7 +72,7 @@ showStatusWindow.setSelected(jEdit.getBooleanProperty("sidekick.showStatusWindow")); addComponent(treeFollowsCaret = new JCheckBox(jEdit.getProperty( "options.sidekick.tree-follows-caret"))); - treeFollowsCaret.setSelected(SideKick.isFollowCaret()); + treeFollowsCaret.setSelected(SideKick.isGlobalFollowCaret()); treeFollowsCaret.addActionListener(new ActionHandler()); @@ -229,7 +229,7 @@ keystrokeParse.isSelected()); jEdit.setProperty("sidekick.auto-parse-delay",String.valueOf( autoParseDelay.getValue())); - SideKick.setFollowCaret(treeFollowsCaret.isSelected()); + SideKick.setGlobalFollowCaret(treeFollowsCaret.isSelected()); jEdit.setBooleanProperty(SHOW_TOOL_BAR, showToolBar.isSelected()); jEdit.setBooleanProperty(SPLIT_COMBO, splitCombo.isSelected()); jEdit.setBooleanProperty(SINGLE_ICON_IN_COMBO, singleIconInCombo.isSelected()); Modified: plugins/SideKick/trunk/sidekick/SideKickTree.java =================================================================== --- plugins/SideKick/trunk/sidekick/SideKickTree.java 2011-12-01 10:51:02 UTC (rev 20480) +++ plugins/SideKick/trunk/sidekick/SideKickTree.java 2011-12-02 01:49:17 UTC (rev 20481) @@ -901,7 +901,7 @@ if (evt.getSource() == followCaret) { boolean v = followCaret.isSelected(); - SideKick.setFollowCaret(followCaret.isSelected()); + SideKick.setGlobalFollowCaret(followCaret.isSelected()); if (v) { onChange.setSelected(true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |