Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit:[13959] plugins/SourceNavigator/trunk
|
From: <sh...@us...> - 2008-10-29 07:06:45
|
Revision: 13959
http://jedit.svn.sourceforge.net/jedit/?rev=13959&view=rev
Author: shlomy
Date: 2008-10-29 07:06:40 +0000 (Wed, 29 Oct 2008)
Log Message:
-----------
No need to specify the file and line columns in the props file, they can be determined from the column names - File and Line.
Modified Paths:
--------------
plugins/SourceNavigator/trunk/SourceNavigator.props
plugins/SourceNavigator/trunk/src/sn/AllDbDockable.java
plugins/SourceNavigator/trunk/src/sn/DbDockable.java
plugins/SourceNavigator/trunk/src/sn/SourceNavigatorPlugin.java
Modified: plugins/SourceNavigator/trunk/SourceNavigator.props
===================================================================
--- plugins/SourceNavigator/trunk/SourceNavigator.props 2008-10-28 21:58:30 UTC (rev 13958)
+++ plugins/SourceNavigator/trunk/SourceNavigator.props 2008-10-29 07:06:40 UTC (rev 13959)
@@ -53,138 +53,92 @@
source-navigator-table.1.label=Classes
source-navigator-table.1.db=cl
source-navigator-table.1.columns=Name?Line?File
-source-navigator-table.1.file-col=2
-source-navigator-table.1.line-col=1
source-navigator-table.2.name=constant
source-navigator-table.2.label=Constants
source-navigator-table.2.db=con
source-navigator-table.2.columns=Name?Line?File
-source-navigator-table.2.file-col=2
-source-navigator-table.2.line-col=1
source-navigator-table.3.name=enumeration
source-navigator-table.3.label=Enumerations
source-navigator-table.3.db=e
source-navigator-table.3.columns=Name?Line?File
-source-navigator-table.3.file-col=2
-source-navigator-table.3.line-col=1
source-navigator-table.4.name=enumerator
source-navigator-table.4.label=Enumerators
source-navigator-table.4.db=ec
source-navigator-table.4.columns=Name?Line?File
-source-navigator-table.4.file-col=2
-source-navigator-table.4.line-col=1
source-navigator-table.5.name=file
source-navigator-table.5.label=Files
source-navigator-table.5.db=f
source-navigator-table.5.columns=Name
-source-navigator-table.5.file-col=0
-source-navigator-table.5.line-col=-1
source-navigator-table.6.name=function-definition
source-navigator-table.6.label=Function Definitions
source-navigator-table.6.db=fd
source-navigator-table.6.columns=Name?Line?File
-source-navigator-table.6.file-col=2
-source-navigator-table.6.line-col=1
source-navigator-table.7.name=symbol
source-navigator-table.7.label=Symbols
source-navigator-table.7.db=fil
source-navigator-table.7.columns=File?Line?Class?Name?Type
-source-navigator-table.7.file-col=0
-source-navigator-table.7.line-col=1
source-navigator-table.8.name=friend
source-navigator-table.8.label=Friends
source-navigator-table.8.db=fr
source-navigator-table.8.columns=Class?Friend?Line?File
-source-navigator-table.8.file-col=3
-source-navigator-table.8.line-col=2
source-navigator-table.9.name=function
source-navigator-table.9.label=Functions
source-navigator-table.9.db=fu
source-navigator-table.9.columns=Name?Line?File
-source-navigator-table.9.file-col=2
-source-navigator-table.9.line-col=1
source-navigator-table.10.name=variable
source-navigator-table.10.label=Variables
source-navigator-table.10.db=gv
source-navigator-table.10.columns=Name?Line?File
-source-navigator-table.10.file-col=2
-source-navigator-table.10.line-col=1
source-navigator-table.11.name=inheritance
source-navigator-table.11.label=Inheritances
source-navigator-table.11.db=in
source-navigator-table.11.columns=Class?Base Class?Line?File
-source-navigator-table.11.file-col=3
-source-navigator-table.11.line-col=2
source-navigator-table.12.name=include
source-navigator-table.12.label=Includes
source-navigator-table.12.db=iu
source-navigator-table.12.columns=File?Line?Included From
-source-navigator-table.12.file-col=2
-source-navigator-table.12.line-col=1
source-navigator-table.13.name=instance-variable
source-navigator-table.13.label=Instance Variables
source-navigator-table.13.db=iv
source-navigator-table.13.columns=Class?Name?Line?File
-source-navigator-table.13.file-col=3
-source-navigator-table.13.line-col=2
source-navigator-table.14.name=local-variable
source-navigator-table.14.label=Local Variables
source-navigator-table.14.db=lv
source-navigator-table.14.columns=Function?Name?Line?File
-source-navigator-table.14.file-col=3
-source-navigator-table.14.line-col=2
source-navigator-table.15.name=macro
source-navigator-table.15.label=Macros
source-navigator-table.15.db=ma
source-navigator-table.15.columns=Name?Line?File
-source-navigator-table.15.file-col=2
-source-navigator-table.15.line-col=1
source-navigator-table.16.name=method-definition
source-navigator-table.16.label=Method Definitions
source-navigator-table.16.db=md
source-navigator-table.16.columns=Class?Name?Line?File
-source-navigator-table.16.file-col=3
-source-navigator-table.16.line-col=2
source-navigator-table.17.name=method-implementation
source-navigator-table.17.label=Method Implementations
source-navigator-table.17.db=mi
source-navigator-table.17.columns=Class?Name?Line?File
-source-navigator-table.17.file-col=3
-source-navigator-table.17.line-col=2
source-navigator-table.18.name=remark
source-navigator-table.18.label=Remarks
source-navigator-table.18.db=rem
source-navigator-table.18.columns=File?Line?Class?Function
-source-navigator-table.18.file-col=0
-source-navigator-table.18.line-col=1
source-navigator-table.19.name=subroutine
source-navigator-table.19.label=Subroutines
source-navigator-table.19.db=su
source-navigator-table.19.columns=Name?Line?File
-source-navigator-table.19.file-col=2
-source-navigator-table.19.line-col=1
source-navigator-table.20.name=typedef
source-navigator-table.20.label=Typedefs
source-navigator-table.20.db=t
source-navigator-table.20.columns=Name?Line?File
-source-navigator-table.20.file-col=2
-source-navigator-table.20.line-col=1
source-navigator-table.21.name=refers-to
source-navigator-table.21.label=Refers To
source-navigator-table.21.db=to
source-navigator-table.21.columns=Class?Name?Type?Ref Class?Ref Name?Ref Type?Access?Line?File
-source-navigator-table.21.file-col=8
-source-navigator-table.21.line-col=7
source-navigator-table.22.name=union
source-navigator-table.22.label=Unions
source-navigator-table.22.db=un
source-navigator-table.22.columns=Name?Line?File
-source-navigator-table.22.file-col=2
-source-navigator-table.22.line-col=1
source-navigator-table.23.name=referred-by
source-navigator-table.23.label=Referred By
source-navigator-table.23.db=by
source-navigator-table.23.columns=Ref Class?Ref Name?Ref Type?Class?Name?Type?Access?Line?File
-source-navigator-table.23.file-col=8
-source-navigator-table.23.line-col=7
Modified: plugins/SourceNavigator/trunk/src/sn/AllDbDockable.java
===================================================================
--- plugins/SourceNavigator/trunk/src/sn/AllDbDockable.java 2008-10-28 21:58:30 UTC (rev 13958)
+++ plugins/SourceNavigator/trunk/src/sn/AllDbDockable.java 2008-10-29 07:06:40 UTC (rev 13959)
@@ -49,8 +49,7 @@
DbDescriptor desc = (DbDescriptor) item;
current = dockables.get(item);
if (current == null) {
- DbDockable dockable = new DbDockable(
- view, desc.db, desc.columns, desc.fileCol, desc.lineCol);
+ DbDockable dockable = new DbDockable(view, desc.db, desc.columns);
dockables.put(desc, dockable);
current = dockable;
}
Modified: plugins/SourceNavigator/trunk/src/sn/DbDockable.java
===================================================================
--- plugins/SourceNavigator/trunk/src/sn/DbDockable.java 2008-10-28 21:58:30 UTC (rev 13958)
+++ plugins/SourceNavigator/trunk/src/sn/DbDockable.java 2008-10-29 07:06:40 UTC (rev 13959)
@@ -50,10 +50,15 @@
String baseDir;
Vector<String []> elements;
- public DbTableModel(String columns, int fileColumn, int lineColumn) {
- this.columns = columns.split(SN_SEP);
- this.fileColumn = fileColumn;
- this.lineColumn = lineColumn;
+ public DbTableModel(String columnsString) {
+ columns = columnsString.split(SN_SEP);
+ fileColumn = lineColumn = -1; // None by default
+ for (int i = 0; i < columns.length; i++) {
+ if (columns[i].equals("File"))
+ fileColumn = i;
+ else if (columns[i].equals("Line"))
+ lineColumn = i;
+ }
elements = new Vector<String []>();
}
public void setBaseDir(String baseDir) {
@@ -78,6 +83,8 @@
return elements.get(rowIndex)[columnIndex];
}
public SourceLink getSourceLink(int selectedRow) {
+ if (fileColumn < 0)
+ return null;
String file = (String) getValueAt(selectedRow, fileColumn);
if (file == null)
return null;
@@ -124,13 +131,12 @@
private JTextField text;
private String db;
- public DbDockable(View view,
- String db, String columns, int fileColumn, int lineColumn)
+ public DbDockable(View view, String db, String columns)
{
super(new BorderLayout());
this.view = view;
this.db = db;
- model = new DbTableModel(columns, fileColumn, lineColumn);
+ model = new DbTableModel(columns);
table = new JTable();
table.setModel(model);
table.setAutoCreateRowSorter(true);
Modified: plugins/SourceNavigator/trunk/src/sn/SourceNavigatorPlugin.java
===================================================================
--- plugins/SourceNavigator/trunk/src/sn/SourceNavigatorPlugin.java 2008-10-28 21:58:30 UTC (rev 13958)
+++ plugins/SourceNavigator/trunk/src/sn/SourceNavigatorPlugin.java 2008-10-29 07:06:40 UTC (rev 13959)
@@ -47,22 +47,12 @@
public static class DbDescriptor {
public String name, label, db, columns;
- public int fileCol, lineCol;
public DbDescriptor(String base) {
- super();
name = jEdit.getProperty(base + "name");
label = jEdit.getProperty(base + "label");
db = jEdit.getProperty(base + "db");
- columns = jEdit.getProperty(base + "columns");
- try {
- fileCol = Integer.valueOf(jEdit.getProperty(base + "file-col"));
- lineCol = Integer.valueOf(jEdit.getProperty(base + "line-col"));
- } catch (Exception e) {
- }
+ columns = jEdit.getProperty(base + "columns");
}
- public DbDescriptor() {
- fileCol = lineCol = -1;
- }
public String toString() {
return label;
}
@@ -75,7 +65,7 @@
DockableWindowFactory.getInstance().registerDockableWindow(
getPluginJAR(), dockableName,
"new sn.DbDockable(view, \"" + desc.db + "\", \"" +
- desc.columns + "\", " + desc.fileCol + ", " + desc.lineCol + ");",
+ desc.columns + ");",
true, true);
String menu = jEdit.getProperty(SOURCE_NAVIGATOR_TABLES_MENU);
if (menu == null)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|