Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit:[17895] plugins/CtagsInterface/trunk/src/ctagsinterface
|
From: <sh...@us...> - 2010-05-27 21:30:47
|
Revision: 17895
http://jedit.svn.sourceforge.net/jedit/?rev=17895&view=rev
Author: shlomy
Date: 2010-05-27 21:30:41 +0000 (Thu, 27 May 2010)
Log Message:
-----------
Use more localized loggers.
Modified Paths:
--------------
plugins/CtagsInterface/trunk/src/ctagsinterface/dockables/Progress.java
plugins/CtagsInterface/trunk/src/ctagsinterface/index/TagIndex.java
plugins/CtagsInterface/trunk/src/ctagsinterface/main/CtagsInterfacePlugin.java
Modified: plugins/CtagsInterface/trunk/src/ctagsinterface/dockables/Progress.java
===================================================================
--- plugins/CtagsInterface/trunk/src/ctagsinterface/dockables/Progress.java 2010-05-27 21:15:04 UTC (rev 17894)
+++ plugins/CtagsInterface/trunk/src/ctagsinterface/dockables/Progress.java 2010-05-27 21:30:41 UTC (rev 17895)
@@ -1,6 +1,8 @@
package ctagsinterface.dockables;
import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
@@ -40,12 +42,7 @@
int i = tabs.getSelectedIndex();
if (i < 0)
return;
- ProgressTab tab = (ProgressTab) tabs.getComponentAt(i);
- synchronized(progressTabs)
- {
- progressTabs.remove(tab.logger);
- tabs.removeTabAt(i);
- }
+ closeTab((ProgressTab) tabs.getComponentAt(i));
}
}
});
@@ -77,8 +74,16 @@
{
getTab(logger).endTask();
}
- private static class ProgressTab extends JPanel
+ public void closeTab(ProgressTab tab)
{
+ synchronized(progressTabs)
+ {
+ progressTabs.remove(tab.logger);
+ }
+ tabs.remove(tab);
+ }
+ private class ProgressTab extends JPanel
+ {
private static final String IDLE = "Idle";
private Logger logger;
private JTextArea textArea;
@@ -95,6 +100,13 @@
top.setLayout(new BorderLayout());
close = new JButton("Close");
top.add(close, BorderLayout.EAST);
+ close.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ closeTab(ProgressTab.this);
+ }
+ });
status = new JLabel(IDLE);
top.add(status, BorderLayout.CENTER);
textArea = new JTextArea();
Modified: plugins/CtagsInterface/trunk/src/ctagsinterface/index/TagIndex.java
===================================================================
--- plugins/CtagsInterface/trunk/src/ctagsinterface/index/TagIndex.java 2010-05-27 21:15:04 UTC (rev 17894)
+++ plugins/CtagsInterface/trunk/src/ctagsinterface/index/TagIndex.java 2010-05-27 21:30:41 UTC (rev 17895)
@@ -156,7 +156,7 @@
public void getOrigins(OriginType type, final List<String> origins)
{
String query = DOCTYPE_FLD + ":" + ORIGIN_DOC_TYPE + " AND " +
- TYPE_FLD + ":" + type;
+ TYPE_FLD + ":" + type.name.toLowerCase();
runQuery(query, 1, new DocHandler()
{
public void handle(Document doc)
@@ -321,8 +321,8 @@
startActivity();
deleteTagsOfOrigin(logger, origin);
String s = DOCTYPE_FLD + ":" + ORIGIN_DOC_TYPE + " AND " +
- TYPE_FLD + origin.type + " AND " + ORIGIN_FLD + ":" +
- escape(origin.id);
+ TYPE_FLD + origin.type.name.toLowerCase() + " AND " + ORIGIN_FLD + ":" +
+ escape(origin.id.toLowerCase());
Query q = getQuery(s);
if (q != null)
{
@@ -342,7 +342,8 @@
final boolean b[] = new boolean[1];
b[0] = false;
String query = DOCTYPE_FLD + ":" + ORIGIN_DOC_TYPE + " AND " +
- TYPE_FLD + ":" + type + " AND " + ORIGIN_FLD + ":" + escape(id);
+ TYPE_FLD + ":" + type.name.toLowerCase() + " AND " + ORIGIN_FLD + ":" +
+ escape(id.toLowerCase());
runQuery(query, 1, new DocHandler() {
public void handle(Document doc)
{
Modified: plugins/CtagsInterface/trunk/src/ctagsinterface/main/CtagsInterfacePlugin.java
===================================================================
--- plugins/CtagsInterface/trunk/src/ctagsinterface/main/CtagsInterfacePlugin.java 2010-05-27 21:15:04 UTC (rev 17894)
+++ plugins/CtagsInterface/trunk/src/ctagsinterface/main/CtagsInterfacePlugin.java 2010-05-27 21:30:41 UTC (rev 17895)
@@ -222,10 +222,10 @@
}
Vector<String> allProjects = pvi.getProjects();
Vector<String> dbProjects = ProjectsOptionPane.getProjects();
- Logger logger = getLogger(view, "All projects");
for (int i = 0; i < allProjects.size(); i++)
{
String project = allProjects.get(i);
+ Logger logger = getLogger(view, "Project " + project);
if (! dbProjects.contains(project))
insertOrigin(logger, OriginType.PROJECT, project);
}
@@ -546,18 +546,6 @@
});
}
- static private String join(Vector<String> strings)
- {
- StringBuilder sb = new StringBuilder();
- for (String s: strings)
- {
- if (sb.length() > 0)
- sb.append(",");
- sb.append(s);
- }
- return sb.toString();
- }
-
// Updates the given origins in the DB
static public void updateOrigins(OriginType type, Vector<String> names)
{
@@ -565,19 +553,24 @@
Vector<String> current = new Vector<String>();
index.getOrigins(type, current);
View view = jEdit.getActiveView();
- Logger logger = getLogger(view, "Origins " + join(names) + " of type "+ type);
for (int i = 0; i < current.size(); i++)
{
String name = current.get(i);
if (! names.contains(name))
+ {
+ Logger logger = getLogger(view, "Delete " + type.name + " " + name);
deleteOrigin(logger, type, name);
+ }
}
// Add new origins
for (int i = 0; i < names.size(); i++)
{
String name = names.get(i);
if (! current.contains(name))
+ {
+ Logger logger = getLogger(view, type.name + " " + name);
insertOrigin(logger, type, name);
+ }
}
}
@@ -800,7 +793,7 @@
setStatusMessage("Updating project: " + project);
Origin origin = index.getOrigin(OriginType.PROJECT, project, true);
View view = jEdit.getActiveView();
- Logger logger = getLogger(view, "update project " + project);
+ Logger logger = getLogger(view, "Project " + project);
if (origin != null && removed != null && (! removed.isEmpty()))
index.deleteTagsOfOrigin(logger, origin);
if ((added != null) && (! added.isEmpty()))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|