[ jEdit-commits ] SF.net SVN: jedit: [12975] plugins/ContextMenu/branches/0.3

[<osw...@us...>]

Revision: 12975
          http://jedit.svn.sourceforge.net/jedit/?rev=12975&view=rev
Author:   oswaldcz
Date:     2008-06-29 12:34:11 -0700 (Sun, 29 Jun 2008)

Log Message:
-----------
minor changes

Modified Paths:
--------------
    plugins/ContextMenu/branches/0.3/ContextMenu.props
    plugins/ContextMenu/branches/0.3/actions.xml
    plugins/ContextMenu/branches/0.3/contextmenu/ContextMenuPlugin.java
    plugins/ContextMenu/branches/0.3/contextmenu/ContextMenuService.java

Modified: plugins/ContextMenu/branches/0.3/ContextMenu.props
===================================================================
--- plugins/ContextMenu/branches/0.3/ContextMenu.props	2008-06-29 19:08:11 UTC (rev 12974)
+++ plugins/ContextMenu/branches/0.3/ContextMenu.props	2008-06-29 19:34:11 UTC (rev 12975)
@@ -40,5 +40,5 @@
                                           contextmenu.customize
 
 
-contextmenu.customize-mode=Customize this menu (mode-specific)...
+contextmenu.customize-mode=Customize This Menu (mode-specific)...
 

Modified: plugins/ContextMenu/branches/0.3/actions.xml
===================================================================
--- plugins/ContextMenu/branches/0.3/actions.xml	2008-06-29 19:08:11 UTC (rev 12974)
+++ plugins/ContextMenu/branches/0.3/actions.xml	2008-06-29 19:34:11 UTC (rev 12975)
@@ -2,9 +2,6 @@
 <!DOCTYPE ACTIONS SYSTEM "actions.dtd">
 <!-- $Id$ -->
 <ACTIONS>
-	<!-- <ACTION NAME="contextmenu.open-popup-menu">
-		<CODE>contextmenu.ContextMenuPlugin.openPopupMenu();</CODE>
-	</ACTION> -->
 	<ACTION NAME="contextmenu.customize">
 		<CODE>contextmenu.ContextMenuPlugin.openPluginOptionsDialog();</CODE>
 	</ACTION>

Modified: plugins/ContextMenu/branches/0.3/contextmenu/ContextMenuPlugin.java
===================================================================
--- plugins/ContextMenu/branches/0.3/contextmenu/ContextMenuPlugin.java	2008-06-29 19:08:11 UTC (rev 12974)
+++ plugins/ContextMenu/branches/0.3/contextmenu/ContextMenuPlugin.java	2008-06-29 19:34:11 UTC (rev 12975)
@@ -243,26 +243,6 @@
 		new PluginOptions(jEdit.getActiveView(), "contextmenu-modes");
 	} //}}}
 
-	//{{{ openPopupMenu()
-	// Based on: Open_Context_Menu.bsh Copyright (C) 2003 Nitsan Vardi
-	/* public static void openPopupMenu() {
-		View view = jEdit.getActiveView();
-		JEditTextArea textArea = view.getTextArea();
-		if (textArea.hasFocus()) {
-			int caretOffset = textArea.getCaretPosition();
-			Point caretPos = textArea.offsetToXY(caretOffset);
-			if (caretPos != null) {
-				TextAreaPainter painter = textArea.getPainter();
-				int charHeight = painter.getFontMetrics().getHeight();
-				String mode = getMode(view);
-				GUIUtilities.showPopupMenu(getPopupForMode(mode),
-					painter,
-					caretPos.x,
-					caretPos.y + charHeight);
-			}
-		}
-	} */ //}}}
-
 	//{{{ getCustomizeModeItem()
 	public static JMenuItem getCustomizeModeItem(String text) {
 		JMenuItem customize = new JMenuItem(text);

Modified: plugins/ContextMenu/branches/0.3/contextmenu/ContextMenuService.java
===================================================================
--- plugins/ContextMenu/branches/0.3/contextmenu/ContextMenuService.java	2008-06-29 19:08:11 UTC (rev 12974)
+++ plugins/ContextMenu/branches/0.3/contextmenu/ContextMenuService.java	2008-06-29 19:34:11 UTC (rev 12975)
@@ -11,6 +11,9 @@
 
 public class ContextMenuService extends DynamicContextMenuService{
 	public JMenuItem createMenu(JEditTextArea ta) {
+		if (ta == null || ta.getBuffer() == null) {
+			return null;
+		}
 		String mode = ta.getBuffer().getMode().getName();
 		JMenuItem item = ContextMenuPlugin.getMenuForMode(mode, ContextMenuPlugin.CACHE_POPUP);
 		if (item == null) {


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