From: <dal...@us...> - 2008-02-05 02:38:58
|
Revision: 11684 http://jedit.svn.sourceforge.net/jedit/?rev=11684&view=rev Author: daleanson Date: 2008-02-04 18:38:55 -0800 (Mon, 04 Feb 2008) Log Message: ----------- fix for 1886691 Modified Paths: -------------- plugins/SVNPlugin/trunk/src/ise/plugin/svn/SVNPlugin.java Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/SVNPlugin.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/SVNPlugin.java 2008-02-04 01:44:13 UTC (rev 11683) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/SVNPlugin.java 2008-02-05 02:38:55 UTC (rev 11684) @@ -33,7 +33,9 @@ import org.gjt.sp.jedit.View; import org.gjt.sp.jedit.jEdit; import org.gjt.sp.jedit.EBMessage; +import org.gjt.sp.jedit.GUIUtilities; import org.gjt.sp.jedit.msg.ViewUpdate; +import org.gjt.sp.jedit.options.GlobalOptions; import ise.plugin.svn.gui.OutputPanel; import ise.plugin.svn.gui.TextAreaContextMenu; import ise.plugin.svn.pv.NodeActor; @@ -70,8 +72,10 @@ } public void stop() { - panelMap.clear(); - panelMap = null; + if ( panelMap != null ) { + panelMap.clear(); + panelMap = null; + } for ( View view : jEdit.getViews() ) { removeContextMenu( view ); @@ -82,7 +86,7 @@ /* for ( View view : jEdit.getViews() ) { addContextMenu( view ); - } + } */ } @@ -108,13 +112,18 @@ } } - private static void removeContextMenu( View view ) { - JPopupMenu menu = view.getTextArea().getRightClickPopup(); - Component[] mes = menu.getComponents(); - if (mes[0].toString().equals("Subversion")) { - menu.remove(0); - menu.remove(0); - } + private static void removeContextMenu( final View view ) { + JPopupMenu popup = GUIUtilities.loadPopupMenu( "view.context" ); + JMenuItem customize = new JMenuItem( jEdit.getProperty( "view.context.customize" ) ); + customize.addActionListener( new ActionListener() { + public void actionPerformed( ActionEvent evt ) { + new GlobalOptions( view, "context" ); + } + } + ); + popup.addSeparator(); + popup.add( customize ); + view.getTextArea().setRightClickPopup( popup ); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |