jEdit

Email Archive: jedit-cvs (read-only)

[ jEdit-commits ] SF.net SVN: jedit:[14791] plugins/GlobalPlugin/trunk/browser/ GlobalResultsView.java

From: <shlomy@us...> - 2009-03-17 20:25

Revision: 14791
          http://jedit.svn.sourceforge.net/jedit/?rev=14791&view=rev
Author:   shlomy
Date:     2009-03-17 20:25:10 +0000 (Tue, 17 Mar 2009)

Log Message:
-----------
Fixed the drawing of search nodes. The last update to the search node strings was done after the last call to the model to update the nodes.

Modified Paths:
--------------
    plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java

Modified: plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java
===================================================================
--- plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-17 17:41:51 UTC (rev 14790)
+++ plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-17 20:25:10 UTC (rev 14791)
@@ -145,6 +145,7 @@
 			SearchNode rootNode = new SearchNode(identifier);
 			SourceLinkParentNode parent =
 				tree.addSourceLinkParent(rootNode);
+			rootNode.setTreeNode(parent);
 			final int index = parent.getRoot().getIndex(parent);
 			for (int i = 0; i < refs.size(); i++)
 			{
@@ -153,7 +154,6 @@
 				int line = rec.getLine();
 				parent.addSourceLink(new FileMarker(file, line - 1, ""));
 			}
-			rootNode.setTreeNode(parent);
 			if (refs.size() == 1 && GlobalOptionPane.isJumpImmediately())
 				new GlobalReference(refs.get(0)).jump(view);
 			long end = System.currentTimeMillis();


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

Thread View

Thread	Author	Date
[ jEdit-commits ] SF.net SVN: jedit:[14718] plugins/GlobalPlugin/trunk/browser/ GlobalResultsView.java	<shlomy@us...>

[ jEdit-commits ] SF.net SVN: jedit:[14760] plugins/GlobalPlugin/trunk/browser/ GlobalResultsView.java

From: <shlomy@us...> - 2009-03-12 11:26

Revision: 14760
          http://jedit.svn.sourceforge.net/jedit/?rev=14760&view=rev
Author:   shlomy
Date:     2009-03-12 11:26:19 +0000 (Thu, 12 Mar 2009)

Log Message:
-----------
Added a context menu item for the global results view to add markers at the result locations.

Modified Paths:
--------------
    plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java

Modified: plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java
===================================================================
--- plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-12 11:24:46 UTC (rev 14759)
+++ plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-12 11:26:19 UTC (rev 14760)
@@ -1,13 +1,16 @@
 package browser;
 
 import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.io.File;
 import java.util.Vector;
 
+import javax.swing.AbstractAction;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
@@ -15,8 +18,10 @@
 import javax.swing.tree.DefaultTreeCellRenderer;
 
 import marker.FileMarker;
+import marker.MarkerSetsPlugin;
 import marker.tree.SourceLinkTree;
 import marker.tree.SourceLinkTree.SourceLinkParentNode;
+import marker.tree.SourceLinkTree.SubtreePopupMenuProvider;
 import options.GlobalOptionPane;
 
 import org.gjt.sp.jedit.View;
@@ -75,7 +80,9 @@
 		return "<html><body><b>" + s + "</body></html>";
 	}
 
-	private class SearchNode extends DefaultMutableTreeNode {
+	private class SearchNode extends DefaultMutableTreeNode
+		implements SubtreePopupMenuProvider
+	{
 		String search;
 		public SearchNode(String search) {
 			this.search = search;
@@ -86,6 +93,19 @@
 			return makeBold(search + " (" + occurs + " occurrences in " + files +
 				" files)");
 		}
+		public void addPopupMenuItemsFor(JPopupMenu popup, final SourceLinkParentNode parent,
+			final DefaultMutableTreeNode node)
+		{
+			if (popup == null)
+				return;
+			popup.add(new AbstractAction("Toggle marker(s)") {
+				public void actionPerformed(ActionEvent e) {
+					Vector<FileMarker> markers = parent.getFileMarkers(node);
+					for (FileMarker marker: markers)
+						MarkerSetsPlugin.toggleMarker(marker);
+				}
+			});
+		}
 	}
 	
 	private class RecordQuery implements Runnable {
@@ -112,9 +132,9 @@
 			for (int i = 0; i < refs.size(); i++)
 			{
 				GlobalRecord rec = refs.get(i);
-				String file = rec.getFile();
+				String file = rec.getFile().replace("/", File.separator);
 				int line = rec.getLine();
-				parent.addSourceLink(new FileMarker(file, line, ""));
+				parent.addSourceLink(new FileMarker(file, line - 1, ""));
 			}
 			if (refs.size() == 1 && GlobalOptionPane.isJumpImmediately())
 				new GlobalReference(refs.get(0)).jump(view);


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

[ jEdit-commits ] SF.net SVN: jedit:[14763] plugins/GlobalPlugin/trunk/browser/ GlobalResultsView.java

From: <shlomy@us...> - 2009-03-12 15:11

Revision: 14763
          http://jedit.svn.sourceforge.net/jedit/?rev=14763&view=rev
Author:   shlomy
Date:     2009-03-12 15:11:02 +0000 (Thu, 12 Mar 2009)

Log Message:
-----------
Fixed the counting of the leaf nodes under the search root.

Modified Paths:
--------------
    plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java

Modified: plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java
===================================================================
--- plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-12 12:27:30 UTC (rev 14762)
+++ plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-12 15:11:02 UTC (rev 14763)
@@ -80,16 +80,19 @@
 		return "<html><body><b>" + s + "</body></html>";
 	}
 
-	private class SearchNode extends DefaultMutableTreeNode
-		implements SubtreePopupMenuProvider
+	private class SearchNode implements SubtreePopupMenuProvider
 	{
 		String search;
+		SourceLinkParentNode parent;
+		
 		public SearchNode(String search) {
 			this.search = search;
 		}
 		public String toString() {
-			int occurs = getLeafCount();
-			int files = getChildCount();
+			if (parent == null)
+				return makeBold(search);
+			int occurs = parent.getLeafCount();
+			int files = parent.getChildCount();
 			return makeBold(search + " (" + occurs + " occurrences in " + files +
 				" files)");
 		}
@@ -106,6 +109,10 @@
 				}
 			});
 		}
+		public void setTreeNode(SourceLinkParentNode parent)
+		{
+			this.parent = parent;
+		}
 	}
 	
 	private class RecordQuery implements Runnable {
@@ -126,9 +133,10 @@
 			final Vector<GlobalRecord> refs =
 				GlobalLauncher.instance().runRecordQuery(getParam() +
 					" " + identifier, workingDirectory);
-			DefaultMutableTreeNode rootNode = new SearchNode(identifier);
+			SearchNode rootNode = new SearchNode(identifier);
 			SourceLinkParentNode parent =
 				tree.addSourceLinkParent(rootNode);
+			rootNode.setTreeNode(parent);
 			for (int i = 0; i < refs.size(); i++)
 			{
 				GlobalRecord rec = refs.get(i);


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

[ jEdit-commits ] SF.net SVN: jedit:[14765] plugins/GlobalPlugin/trunk/browser/ GlobalResultsView.java

From: <shlomy@us...> - 2009-03-12 23:32

Revision: 14765
          http://jedit.svn.sourceforge.net/jedit/?rev=14765&view=rev
Author:   shlomy
Date:     2009-03-12 23:31:55 +0000 (Thu, 12 Mar 2009)

Log Message:
-----------
Fixed the display of the number of occurrences and files of the global results.

Modified Paths:
--------------
    plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java

Modified: plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java
===================================================================
--- plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-12 19:06:35 UTC (rev 14764)
+++ plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-12 23:31:55 UTC (rev 14765)
@@ -87,14 +87,17 @@
 		
 		public SearchNode(String search) {
 			this.search = search;
+			parent = null;
 		}
+		public void setTreeNode(SourceLinkParentNode parent) {
+			this.parent = parent;
+		}
 		public String toString() {
 			if (parent == null)
 				return makeBold(search);
-			int occurs = parent.getLeafCount();
-			int files = parent.getChildCount();
-			return makeBold(search + " (" + occurs + " occurrences in " + files +
-				" files)");
+			int [] counts = parent.getFileAndMarkerCounts(); 
+			return makeBold(search + " (" + counts[1] +
+				" occurrences in " + counts[0] + " files)");
 		}
 		public void addPopupMenuItemsFor(JPopupMenu popup, final SourceLinkParentNode parent,
 			final DefaultMutableTreeNode node)
@@ -109,10 +112,6 @@
 				}
 			});
 		}
-		public void setTreeNode(SourceLinkParentNode parent)
-		{
-			this.parent = parent;
-		}
 	}
 	
 	private class RecordQuery implements Runnable {
@@ -136,7 +135,6 @@
 			SearchNode rootNode = new SearchNode(identifier);
 			SourceLinkParentNode parent =
 				tree.addSourceLinkParent(rootNode);
-			rootNode.setTreeNode(parent);
 			for (int i = 0; i < refs.size(); i++)
 			{
 				GlobalRecord rec = refs.get(i);
@@ -144,6 +142,7 @@
 				int line = rec.getLine();
 				parent.addSourceLink(new FileMarker(file, line - 1, ""));
 			}
+			rootNode.setTreeNode(parent);
 			if (refs.size() == 1 && GlobalOptionPane.isJumpImmediately())
 				new GlobalReference(refs.get(0)).jump(view);
 			long end = System.currentTimeMillis();


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

[ jEdit-commits ] SF.net SVN: jedit:[14787] plugins/GlobalPlugin/trunk/browser/ GlobalResultsView.java

From: <shlomy@us...> - 2009-03-17 10:10

Revision: 14787
          http://jedit.svn.sourceforge.net/jedit/?rev=14787&view=rev
Author:   shlomy
Date:     2009-03-17 10:10:57 +0000 (Tue, 17 Mar 2009)

Log Message:
-----------
Allow setting of single / multiple root nodes.

Modified Paths:
--------------
    plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java

Modified: plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java
===================================================================
--- plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-17 10:10:22 UTC (rev 14786)
+++ plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-17 10:10:57 UTC (rev 14787)
@@ -2,12 +2,14 @@
 
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.io.File;
 import java.util.Vector;
 
 import javax.swing.AbstractAction;
+import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
@@ -36,6 +38,7 @@
 	private String param;
 	private JTextField symbolTF;
 	private JLabel statusLbl;
+	private JCheckBox multiCB;
 	private SourceLinkTree tree;
 	
 	public GlobalResultsView(final View view, String param)
@@ -44,6 +47,7 @@
 		this.view = view;
 		this.param = param;
 		JPanel symbolPanel = new JPanel(new BorderLayout());
+		add(symbolPanel, BorderLayout.NORTH);
 		symbolPanel.add(new JLabel("Search for:"), BorderLayout.WEST);
 		symbolTF = new JTextField(40);
 		symbolTF.addKeyListener(new KeyAdapter() {
@@ -54,10 +58,9 @@
 		});
 		symbolPanel.add(symbolTF, BorderLayout.CENTER);
 		JPanel toolbar = new JPanel(new BorderLayout(5, 0));
+		symbolPanel.add(toolbar, BorderLayout.EAST);
 		statusLbl = new JLabel("");
 		toolbar.add(statusLbl, BorderLayout.EAST);
-		symbolPanel.add(toolbar, BorderLayout.EAST);
-		add(symbolPanel, BorderLayout.NORTH);
 		DefaultTreeCellRenderer renderer = new DefaultTreeCellRenderer();
 		renderer.setClosedIcon(null);
 		renderer.setOpenIcon(null);
@@ -65,6 +68,13 @@
 		tree = new SourceLinkTree(view);
 		tree.setCellRenderer(renderer);
 		add(new JScrollPane(tree), BorderLayout.CENTER);
+		multiCB = new JCheckBox("Multiple", true);
+		toolbar.add(multiCB, BorderLayout.CENTER);
+		multiCB.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				tree.allowMultipleResults(multiCB.isSelected());
+			}
+		});
 	}
 	
 	protected String getParam()	{


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

[ jEdit-commits ] SF.net SVN: jedit:[14788] plugins/GlobalPlugin/trunk/browser/ GlobalResultsView.java

From: <shlomy@us...> - 2009-03-17 12:00

Revision: 14788
          http://jedit.svn.sourceforge.net/jedit/?rev=14788&view=rev
Author:   shlomy
Date:     2009-03-17 11:59:55 +0000 (Tue, 17 Mar 2009)

Log Message:
-----------
In the results view, only expand the results of the newest search, not all.

Modified Paths:
--------------
    plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java

Modified: plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java
===================================================================
--- plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-17 10:10:57 UTC (rev 14787)
+++ plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-17 11:59:55 UTC (rev 14788)
@@ -145,6 +145,7 @@
 			SearchNode rootNode = new SearchNode(identifier);
 			SourceLinkParentNode parent =
 				tree.addSourceLinkParent(rootNode);
+			final int index = parent.getRoot().getIndex(parent);
 			for (int i = 0; i < refs.size(); i++)
 			{
 				GlobalRecord rec = refs.get(i);
@@ -161,7 +162,7 @@
 			SwingUtilities.invokeLater(new Runnable() {
 				public void run() {
 					statusLbl.setText(refs.size() + " results");
-					for (int i = 0; i < tree.getRowCount(); i++)
+					for (int i = index; i < tree.getRowCount(); i++)
 						tree.expandRow(i);
 				}
 			});


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

[ jEdit-commits ] SF.net SVN: jedit:[14791] plugins/GlobalPlugin/trunk/browser/ GlobalResultsView.java

From: <shlomy@us...> - 2009-03-17 20:25

Revision: 14791
          http://jedit.svn.sourceforge.net/jedit/?rev=14791&view=rev
Author:   shlomy
Date:     2009-03-17 20:25:10 +0000 (Tue, 17 Mar 2009)

Log Message:
-----------
Fixed the drawing of search nodes. The last update to the search node strings was done after the last call to the model to update the nodes.

Modified Paths:
--------------
    plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java

Modified: plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java
===================================================================
--- plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-17 17:41:51 UTC (rev 14790)
+++ plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-17 20:25:10 UTC (rev 14791)
@@ -145,6 +145,7 @@
 			SearchNode rootNode = new SearchNode(identifier);
 			SourceLinkParentNode parent =
 				tree.addSourceLinkParent(rootNode);
+			rootNode.setTreeNode(parent);
 			final int index = parent.getRoot().getIndex(parent);
 			for (int i = 0; i < refs.size(); i++)
 			{
@@ -153,7 +154,6 @@
 				int line = rec.getLine();
 				parent.addSourceLink(new FileMarker(file, line - 1, ""));
 			}
-			rootNode.setTreeNode(parent);
 			if (refs.size() == 1 && GlobalOptionPane.isJumpImmediately())
 				new GlobalReference(refs.get(0)).jump(view);
 			long end = System.currentTimeMillis();


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

[ jEdit-commits ] SF.net SVN: jedit:[14819] plugins/GlobalPlugin/trunk/browser/ GlobalResultsView.java

From: <shlomy@us...> - 2009-03-21 19:35

Revision: 14819
          http://jedit.svn.sourceforge.net/jedit/?rev=14819&view=rev
Author:   shlomy
Date:     2009-03-21 19:35:21 +0000 (Sat, 21 Mar 2009)

Log Message:
-----------
Got rid of the shortcut parameter to the FileMarker constructor.

Modified Paths:
--------------
    plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java

Modified: plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java
===================================================================
--- plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-21 15:25:37 UTC (rev 14818)
+++ plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-21 19:35:21 UTC (rev 14819)
@@ -152,7 +152,7 @@
 				GlobalRecord rec = refs.get(i);
 				String file = rec.getFile().replace("/", File.separator);
 				int line = rec.getLine();
-				parent.addSourceLink(new FileMarker(file, line - 1, ""));
+				parent.addSourceLink(new FileMarker(file, line - 1));
 			}
 			if (refs.size() == 1 && GlobalOptionPane.isJumpImmediately())
 				new GlobalReference(refs.get(0)).jump(view);


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

[ jEdit-commits ] SF.net SVN: jedit:[14840] plugins/GlobalPlugin/trunk/browser/ GlobalResultsView.java

From: <shlomy@us...> - 2009-03-23 07:08

Revision: 14840
          http://jedit.svn.sourceforge.net/jedit/?rev=14840&view=rev
Author:   shlomy
Date:     2009-03-23 07:07:58 +0000 (Mon, 23 Mar 2009)

Log Message:
-----------
Get rid of the redundant cell renderer.

Modified Paths:
--------------
    plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java

Modified: plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java
===================================================================
--- plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-23 06:36:23 UTC (rev 14839)
+++ plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-23 07:07:58 UTC (rev 14840)
@@ -17,7 +17,6 @@
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
 import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeCellRenderer;
 
 import marker.FileMarker;
 import marker.MarkerSetsPlugin;
@@ -61,12 +60,7 @@
 		symbolPanel.add(toolbar, BorderLayout.EAST);
 		statusLbl = new JLabel("");
 		toolbar.add(statusLbl, BorderLayout.EAST);
-		DefaultTreeCellRenderer renderer = new DefaultTreeCellRenderer();
-		renderer.setClosedIcon(null);
-		renderer.setOpenIcon(null);
-		renderer.setLeafIcon(null);
 		tree = new SourceLinkTree(view);
-		tree.setCellRenderer(renderer);
 		add(new JScrollPane(tree), BorderLayout.CENTER);
 		multiCB = new JCheckBox("Multiple", true);
 		toolbar.add(multiCB, BorderLayout.CENTER);


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

[ jEdit-commits ] SF.net SVN: jedit:[14848] plugins/GlobalPlugin/trunk/browser/ GlobalResultsView.java

From: <shlomy@us...> - 2009-03-24 07:58

Revision: 14848
          http://jedit.svn.sourceforge.net/jedit/?rev=14848&view=rev
Author:   shlomy
Date:     2009-03-24 07:58:02 +0000 (Tue, 24 Mar 2009)

Log Message:
-----------
Use file markers with fixed line text, from the output of GNU Global.

Modified Paths:
--------------
    plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java

Modified: plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java
===================================================================
--- plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-24 07:57:39 UTC (rev 14847)
+++ plugins/GlobalPlugin/trunk/browser/GlobalResultsView.java	2009-03-24 07:58:02 UTC (rev 14848)
@@ -146,7 +146,7 @@
 				GlobalRecord rec = refs.get(i);
 				String file = rec.getFile().replace("/", File.separator);
 				int line = rec.getLine();
-				parent.addSourceLink(new FileMarker(file, line - 1));
+				parent.addSourceLink(new FileMarker(file, line - 1, rec.getText()));
 			}
 			if (refs.size() == 1 && GlobalOptionPane.isJumpImmediately())
 				new GlobalReference(refs.get(0)).jump(view);


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