Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit:[21585] plugins/Console/trunk/console
|
From: <ko...@us...> - 2012-04-16 21:45:58
|
Revision: 21585
http://jedit.svn.sourceforge.net/jedit/?rev=21585&view=rev
Author: kog13
Date: 2012-04-16 21:45:51 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Added new commando widget for entering paths.
Modified Paths:
--------------
plugins/Console/trunk/console/bsh/getBufferClassPath.bsh
plugins/Console/trunk/console/commands/ant.xml
plugins/Console/trunk/console/commands/commando.dtd
plugins/Console/trunk/console/commands/gcc.xml
plugins/Console/trunk/console/commands/ghc.xml
plugins/Console/trunk/console/commands/groovy.xml
plugins/Console/trunk/console/commands/java.xml
plugins/Console/trunk/console/commands/javac.xml
Added Paths:
-----------
plugins/Console/trunk/console/bsh/commandoPATH_ENTRY.bsh
Added: plugins/Console/trunk/console/bsh/commandoPATH_ENTRY.bsh
===================================================================
--- plugins/Console/trunk/console/bsh/commandoPATH_ENTRY.bsh (rev 0)
+++ plugins/Console/trunk/console/bsh/commandoPATH_ENTRY.bsh 2012-04-16 21:45:51 UTC (rev 21585)
@@ -0,0 +1,49 @@
+commandoPATH_ENTRY(view,pane,ns,label,var,options)
+{
+ entry = new JTextField(20);
+ value = ns.getVariable(var);
+ if (value != null)
+ entry.setText(value.toString());
+
+ valueChanged()
+ {
+ ns.setVariable(var, entry.getText());
+ }
+
+ dim = entry.getPreferredSize();
+ dim.width = Integer.MAX_VALUE;
+ entry.setMaximumSize(dim);
+
+ box = new Box(BoxLayout.X_AXIS);
+ box.add(entry);
+ box.add(Box.createHorizontalStrut(12));
+
+ btn = new RolloverButton(GUIUtilities.loadIcon("Plus.png"));
+ btn.setToolTipText("Add file to path");
+ listener = new ActionListener()
+ {
+ actionPerformed(evt)
+ {
+ files = GUIUtilities.showVFSFileDialog(view,
+ null, VFSBrowser.CHOOSE_DIRECTORY_DIALOG, true);
+
+ if (files != null && files.length > 0) {
+ path = files[0];
+ for (int i = 1; i<files.length; i++)
+ path += File.pathSeparator+files[i];
+
+ value = entry.getText();
+ if (value != null && value.length() > 0)
+ value += File.pathSeparator;
+
+ entry.setText(value + path);
+ }
+ }
+ };
+ btn.addActionListener(listener);
+ box.add(btn);
+
+ pane.addComponent(label, box);
+
+ return this;
+}
Modified: plugins/Console/trunk/console/bsh/getBufferClassPath.bsh
===================================================================
--- plugins/Console/trunk/console/bsh/getBufferClassPath.bsh 2012-04-16 12:46:32 UTC (rev 21584)
+++ plugins/Console/trunk/console/bsh/getBufferClassPath.bsh 2012-04-16 21:45:51 UTC (rev 21585)
@@ -4,10 +4,17 @@
{
import console.ConsolePlugin;
- String cp = buffer.getProperty("java.classpath");
+ cp = buffer.getProperty("java.classpath");
if (cp == null || cp.equals(""))
- return getenv("CLASSPATH") + File.pathSeparator
- + ConsolePlugin.getPackageRoot(buffer);
+ cp = getenv("CLASSPATH");
+
+ if (cp == null)
+ cp = "";
+
+ if (cp != "")
+ cp += File.pathSeparator;
+
+ cp += ConsolePlugin.getPackageRoot(buffer);
return cp;
}
Modified: plugins/Console/trunk/console/commands/ant.xml
===================================================================
--- plugins/Console/trunk/console/commands/ant.xml 2012-04-16 12:46:32 UTC (rev 21584)
+++ plugins/Console/trunk/console/commands/ant.xml 2012-04-16 21:45:51 UTC (rev 21585)
@@ -13,7 +13,7 @@
<ENTRY LABEL="Rule name(s)" VARNAME="rules" DEFAULT=""/>
</CAPTION>
<CAPTION LABEL="Advanced">
- <HIST_ENTRY LABEL="Classpath" VARNAME="classpath" EVAL="getBufferClassPath(buffer);" />
+ <PATH_ENTRY LABEL="Classpath" VARNAME="classpath" EVAL="getBufferClassPath(buffer);" />
<TOGGLE LABEL="Strip adornments (Emacs style)" VARNAME="emacs" DEFAULT="FALSE"/>
<ENTRY LABEL="Additional parameters" VARNAME="args" DEFAULT=""/>
</CAPTION>
Modified: plugins/Console/trunk/console/commands/commando.dtd
===================================================================
--- plugins/Console/trunk/console/commands/commando.dtd 2012-04-16 12:46:32 UTC (rev 21584)
+++ plugins/Console/trunk/console/commands/commando.dtd 2012-04-16 21:45:51 UTC (rev 21585)
@@ -34,7 +34,7 @@
VARNAME CDATA #REQUIRED
DEFAULT CDATA #IMPLIED
EVAL CDATA #IMPLIED >
-
+
<!ELEMENT FILE_ENTRY EMPTY >
<!ATTLIST FILE_ENTRY
LABEL CDATA #REQUIRED
@@ -42,6 +42,13 @@
DEFAULT CDATA #IMPLIED
EVAL CDATA #IMPLIED >
+<!ELEMENT PATH_ENTRY EMPTY >
+<!ATTLIST PATH_ENTRY
+ LABEL CDATA #REQUIRED
+ VARNAME CDATA #REQUIRED
+ DEFAULT CDATA #IMPLIED
+ EVAL CDATA #IMPLIED >
+
<!ELEMENT TOGGLE EMPTY >
<!ATTLIST TOGGLE
LABEL CDATA #REQUIRED
Modified: plugins/Console/trunk/console/commands/gcc.xml
===================================================================
--- plugins/Console/trunk/console/commands/gcc.xml 2012-04-16 12:46:32 UTC (rev 21584)
+++ plugins/Console/trunk/console/commands/gcc.xml 2012-04-16 21:45:51 UTC (rev 21585)
@@ -8,7 +8,7 @@
<FILE_ENTRY LABEL="Source file(s)" VARNAME="source" EVAL="buffer.getPath()" />
<DIR_ENTRY LABEL="Output directory" VARNAME="outputdir" EVAL="buffer.getDirectory()" />
<ENTRY LABEL="Output file name" VARNAME="executable" EVAL="getBufferOutputName(buffer);" />
- <ENTRY LABEL="Include" VARNAME="include" />
+ <PATH_ENTRY LABEL="Include" VARNAME="include" />
</CAPTION>
<CAPTION LABEL="Options">
Modified: plugins/Console/trunk/console/commands/ghc.xml
===================================================================
--- plugins/Console/trunk/console/commands/ghc.xml 2012-04-16 12:46:32 UTC (rev 21584)
+++ plugins/Console/trunk/console/commands/ghc.xml 2012-04-16 21:45:51 UTC (rev 21585)
@@ -6,7 +6,7 @@
<CAPTION LABEL="Files">
<ENTRY LABEL="Source file(s)" VARNAME="source" EVAL="buffer.getPath();"/>
<ENTRY LABEL="Output file name" VARNAME="output" EVAL="getBufferOutputName(buffer);"/>
- <ENTRY LABEL="Module search path" VARNAME="include"/>
+ <PATH_ENTRY LABEL="Module search path" VARNAME="include"/>
</CAPTION>
<CAPTION LABEL="Options">
<TOGGLE LABEL="Compile and link imported modules" VARNAME="make" DEFAULT="true"/>
Modified: plugins/Console/trunk/console/commands/groovy.xml
===================================================================
--- plugins/Console/trunk/console/commands/groovy.xml 2012-04-16 12:46:32 UTC (rev 21584)
+++ plugins/Console/trunk/console/commands/groovy.xml 2012-04-16 21:45:51 UTC (rev 21585)
@@ -8,8 +8,7 @@
<UI>
<CAPTION LABEL="Source file(s)">
<FILE_ENTRY LABEL="Source file(s)" VARNAME="scriptname" EVAL="buffer.getPath();" />
- <FILE_ENTRY LABEL="Classpath" VARNAME="classpath"
- EVAL="getBufferClassPath(buffer);" />
+ <PATH_ENTRY LABEL="Classpath" VARNAME="classpath" EVAL="getBufferClassPath(buffer);" />
</CAPTION>
<CAPTION LABEL="Advanced">
<ENTRY LABEL="Additional parameters" VARNAME="args"/>
Modified: plugins/Console/trunk/console/commands/java.xml
===================================================================
--- plugins/Console/trunk/console/commands/java.xml 2012-04-16 12:46:32 UTC (rev 21584)
+++ plugins/Console/trunk/console/commands/java.xml 2012-04-16 21:45:51 UTC (rev 21585)
@@ -25,8 +25,7 @@
<OPTION LABEL="Classic" VALUE="classic" />
</CHOICE> -->
- <ENTRY LABEL="Classpath" VARNAME="classpath"
- EVAL="getBufferClassPath(buffer);" />
+ <PATH_ENTRY LABEL="Classpath" VARNAME="classpath" EVAL="getBufferClassPath(buffer);" />
<!-- <TOGGLE LABEL="Verbose class loading" VARNAME="verbose_class" />
<TOGGLE LABEL="Verbose garbage collection" VARNAME="verbose_gc" />
Modified: plugins/Console/trunk/console/commands/javac.xml
===================================================================
--- plugins/Console/trunk/console/commands/javac.xml 2012-04-16 12:46:32 UTC (rev 21584)
+++ plugins/Console/trunk/console/commands/javac.xml 2012-04-16 21:45:51 UTC (rev 21585)
@@ -11,7 +11,7 @@
</CAPTION>
<CAPTION LABEL="Paths">
- <HIST_ENTRY LABEL="Classpath" VARNAME="classpath" EVAL="getBufferClassPath(buffer);" />
+ <PATH_ENTRY LABEL="Classpath" VARNAME="classpath" EVAL="getBufferClassPath(buffer);" />
<!-- <HIST_ENTRY LABEL="Source path" VARNAME="sourcepath" EVAL="getProjectRoot(view, buffer);" /> -->
<!-- <DIR_ENTRY LABEL="Extension directory" VARNAME="extdirs" /> -->
<DIR_ENTRY LABEL="Output directory" VARNAME="outputpath" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|