Thread: [ jEdit-commits ] SF.net SVN: jedit: [7125] plugins/XInsert/trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7125
          http://svn.sourceforge.net/jedit/?rev=7125&view=rev
Author:   hertzhaft
Date:     2006-09-25 07:50:26 -0700 (Mon, 25 Sep 2006)

Log Message:
-----------
bug fix for [1032850]; code refactoring, reformatting and beautifying; rewrote the text insert routine in InsertTextCommand.java and got rid of the one in XTree.java

Modified Paths:
--------------
    plugins/XInsert/trunk/RELEASE.txt
    plugins/XInsert/trunk/XInsert.props
    plugins/XInsert/trunk/build.xml
    plugins/XInsert/trunk/src/Command.java
    plugins/XInsert/trunk/src/CommandQueue.java
    plugins/XInsert/trunk/src/InputDialog.java
    plugins/XInsert/trunk/src/InsertTextCommand.java
    plugins/XInsert/trunk/src/RunJavaCommand.java
    plugins/XInsert/trunk/src/ScriptContext.java
    plugins/XInsert/trunk/src/ShowDialogCommand.java
    plugins/XInsert/trunk/src/SubVariableCommand.java
    plugins/XInsert/trunk/src/Utilities.java
    plugins/XInsert/trunk/src/XInsertOptionPane.java
    plugins/XInsert/trunk/src/XInsertReader.java
    plugins/XInsert/trunk/src/XScripter.java
    plugins/XInsert/trunk/src/XTree.java
    plugins/XInsert/trunk/src/XTreeItem.java
    plugins/XInsert/trunk/src/XTreeNode.java
    plugins/XInsert/trunk/src/XTreeObject.java

Modified: plugins/XInsert/trunk/RELEASE.txt
===================================================================

--- plugins/XInsert/trunk/RELEASE.txt	2006-09-25 13:34:25 UTC (rev 7124)
+++ plugins/XInsert/trunk/RELEASE.txt	2006-09-25 14:50:26 UTC (rev 7125)
@@ -1,15 +1,15 @@
-XInsert 2.1
+XInsert 2.2
 
 Requirements:
 	* jdk 1.2
 	* jEdit 4.1
 
 Announcement:
-	Release 2.1 - added reference entries
+	Release 2.2 - bug fixes and code reformatting
 
 Source:
 	https://svn.sourceforge.net/svnroot/jedit/plugins/XInsert/
-	tag: tags/release-2_1
+	tag: tags/release-2_2
 
 Short Description:
 	Insert text clips and execute macros and scripts from a dockable tree. 

Modified: plugins/XInsert/trunk/XInsert.props
===================================================================
--- plugins/XInsert/trunk/XInsert.props	2006-09-25 13:34:25 UTC (rev 7124)
+++ plugins/XInsert/trunk/XInsert.props	2006-09-25 14:50:26 UTC (rev 7125)
@@ -1,6 +1,6 @@
 plugin.XInsertPlugin.name=XInsert
 plugin.XInsertPlugin.author=Romain Guy and Dominic Stolerman
-plugin.XInsertPlugin.version=2.1
+plugin.XInsertPlugin.version=2.2
 plugin.XInsertPlugin.docs=xinsert.html
 plugin.XInsertPlugin.depend.0=jedit 04.00.01.00
 plugin.XInsertPlugin.depend.1=jdk 1.2

Modified: plugins/XInsert/trunk/build.xml
===================================================================
--- plugins/XInsert/trunk/build.xml	2006-09-25 13:34:25 UTC (rev 7124)
+++ plugins/XInsert/trunk/build.xml	2006-09-25 14:50:26 UTC (rev 7125)
@@ -24,5 +24,8 @@
 		<filename name="xml/*.insert.xml"/>
 	  </or>
 	</selector>
+	
+	<!-- we have no doc/users-guide.xml -->
+	<target name="docs-xsltproc" />
 
 </project>

Modified: plugins/XInsert/trunk/src/Command.java
===================================================================
--- plugins/XInsert/trunk/src/Command.java	2006-09-25 13:34:25 UTC (rev 7124)
+++ plugins/XInsert/trunk/src/Command.java	2006-09-25 14:50:26 UTC (rev 7125)
@@ -23,8 +23,7 @@
 *@author Dominic Stolerman
 */
 
-public interface Command
-{
+public interface Command {
 	public void run(ScriptContext sc);
 }
 

Modified: plugins/XInsert/trunk/src/CommandQueue.java
===================================================================
--- plugins/XInsert/trunk/src/CommandQueue.java	2006-09-25 13:34:25 UTC (rev 7124)
+++ plugins/XInsert/trunk/src/CommandQueue.java	2006-09-25 14:50:26 UTC (rev 7125)
@@ -21,60 +21,52 @@
 
 import java.util.Vector;
 import java.util.Enumeration;
+import org.gjt.sp.util.Log;
 
 
-public class CommandQueue
-{
-  public CommandQueue()
-  {
-    qu = new Vector();
+public class CommandQueue {
+  public CommandQueue() {
+    queue = new Vector();
   }
   
   /**
    * Adds a command to th beginning of the queue;
    */
-  public synchronized void addFirst(Command c)
-  {
-    qu.insertElementAt(c, 0);
+  public synchronized void addFirst(Command cmd) {
+    queue.insertElementAt(cmd, 0);
     insertPos++;
   }
   
   /**
    * Adds commands to the end of the queue;
    */
-  public synchronized void add(Command c)
-  {
-    qu.insertElementAt(c, insertPos);
+  public synchronized void add(Command cmd) {
+    queue.insertElementAt(cmd, insertPos);
     insertPos++;
   }
   
   /**
    * Adds commands to the queue to be run after those added using {@link #add(Command)} and {@link #addFirst(Command)}.
    */
-  public synchronized void addLast(Command c)
-  {
-    qu.addElement(c);
+  public synchronized void addLast(Command cmd) {
+    queue.addElement(cmd);
   }
   
-  public int size()
-  {
-    return qu.size();
+  public int size() {
+    return queue.size();
   }
   
-  public synchronized void executeNext(ScriptContext sc)
-  {
-    ((Command)qu.remove(0)).run(sc);
+  public synchronized void executeNext(ScriptContext context) {
+    ((Command) queue.remove(0)).run(context);
   }
   
-  public void executeAll(ScriptContext sc)
-  {
-    while(qu.size() != 0)
-    {
-      executeNext(sc);
+  public void executeAll(ScriptContext context) {
+    while(queue.size() != 0) {
+      executeNext(context);
     }
   }
   
   private int insertPos = 0;
-  private Vector qu;
+  private Vector queue;
 }
 

Modified: plugins/XInsert/trunk/src/InputDialog.java
===================================================================
--- plugins/XInsert/trunk/src/InputDialog.java	2006-09-25 13:34:25 UTC (rev 7124)
+++ plugins/XInsert/trunk/src/InputDialog.java	2006-09-25 14:50:26 UTC (rev 7125)
@@ -1,238 +1,205 @@
-/*
- *
- * InputDialog.java
- * Copyright (C) 2001 Dominic Stolerman
- * dst...@je...
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
- 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
-
-public class InputDialog extends JDialog 
-{
-	public static final double MIN_WIDTH  = 290.0;
-	public static final double MIN_HEIGHT =  110.0;
-	
-	public InputDialog(Frame owner, String key, String message, String defValue)
-	{
-		super(owner, "Please input a value for " + key, true);
-		parent = owner;
-		init( key,  message,  defValue);
-	}
-	
-	public InputDialog(Frame owner, String key, String message, String defValue, String[] opts, boolean allowUser)
-	{
-		super(owner, "Please input a value for " + key, true);
-		parent = owner;
-		init( key,  message,  defValue,  opts,  allowUser);
-	}
-	
-	public InputDialog(Dialog owner, String key, String message, String defValue)
-	{
-		super(owner, "Please input a value for " + key, true);
-		parent = owner;
-		init( key,  message,  defValue);
-	}
-	
-	public InputDialog(Dialog owner, String key, String message, String defValue, String[] opts, boolean allowUser)
-	{
-		super(owner, "Please input a value for " + key, true);
-		parent = owner;
-		init( key, message, defValue, opts, allowUser);
-	}
-	
-	public String getValue()
-	{
-		return selected;
-	}
-	
-	public String showDialog()
-	{
-    pack();
-    setLocationRelativeTo(parent);
-    show();
-		return getValue();
-	}
-	
-	public Dimension getMinimumSize()
-	{
-		Dimension supMin = super.getMinimumSize();
-		return new Dimension((int)Math.max(supMin.getWidth(), MIN_WIDTH), 
-												 (int)Math.max(supMin.getHeight(), MIN_HEIGHT));
-	}
-	
-	public Dimension getPreferredSize()
-	{
-		Dimension supMin = super.getPreferredSize();
-		return new Dimension((int)Math.max(supMin.getWidth(), MIN_WIDTH), 
-												 (int)Math.max(supMin.getHeight(), MIN_HEIGHT));
-	}
-	
-	private void init(String key, String message, String defValue, String[] opts, boolean allowUser)
-	{
-    centPanel = new CentrePanel();
-		centPanel.addComboBox(opts, defValue, allowUser);
-		init(message);
-	}
-	
-	private void init(String key, String message, String defValue)
-	{
-		centPanel = new CentrePanel();
-		centPanel.addTextBox(defValue);
-		init(message);
-	}
-	
-	private void init(String message)
-	{
-		setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-		addWindowListener(new WindowAdapter() {
-			public void windowClosing(WindowEvent e)
-			{
-				okJB.doClick();
-			}
-		});
-		setResizable(false);
-		
-		panel = new JPanel();
-		GridBagLayout gb = new GridBagLayout();
-		GridBagConstraints c = new GridBagConstraints();
-		panel.setLayout(gb);
-		
-		c.gridx = 0;
-		c.fill = GridBagConstraints.HORIZONTAL;
-		c.weightx =  0.5;
-		c.weighty = 0.5;
-		
-		c.gridy = 0;
-		label = new JLabel(message);
-		label.setHorizontalAlignment(SwingConstants.LEFT);
-		gb.setConstraints(label, c);
-		panel.add(label);
-		
-		c.gridy = 1;
-		gb.setConstraints(centPanel, c);
-		panel.add(centPanel);
-		
-		
-		c.gridy = 2;
-		c.fill = GridBagConstraints.NONE;
-		c.anchor = GridBagConstraints.SOUTHEAST;
-		okJB = new JButton("OK");
-		getRootPane().setDefaultButton(okJB);
-		okJB.addActionListener(al);
-		gb.setConstraints(okJB, c);
-		panel.add(okJB);
-		
-		setContentPane(panel);
-		
-		//getRootPane().registerKeyboardAction(al, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), JComponent.WHEN_IN_FOCUSED_WINDOW);
-	}
-	
-	ActionListener al = new ActionListener() {
-	public void actionPerformed(ActionEvent evt)
-	{
-		selected = centPanel.getValue();
-		setVisible(false);
-		dispose();
-	}
-	};
-		
-	
-	private JLabel label;
-	private JButton okJB;
-	private JPanel panel;
-	private CentrePanel centPanel;
-	String selected;
-	private Window parent;
-	
-	private class CentrePanel extends JPanel
-	{
-		public CentrePanel()
-		{
-			super();
-			setLayout(new BorderLayout());
-		}
-		
-		public void addTextBox(String defValue)
-		{
-			box = null;
-			add(text = new JTextField(defValue, 20), BorderLayout.CENTER);
-      if(defValue !=null)
-      {
-        text.setSelectionStart(0);
-        text.setSelectionEnd(defValue.length());
-      }
-			text.addActionListener(al);
-		}
-		
-		public void addComboBox(String[] opts, String defValue, boolean editable)
-		{
-      text = null;
-			add(box = new JComboBox(opts));
-			if(defValue != null)
-      {
-        boolean defValInc = false;
-        for(int i=0; i < opts.length; i++)
-        {
-          if(opts[i].equals(defValue))
-          {
-            box.setSelectedIndex(i);
-            defValInc = true;
-          }
-        }
-        if(!defValInc)
-        {
-          box.addItem(defValue);
-          box.setSelectedItem(defValue);
-        }
-      }
-			box.setEditable(editable);
-			// Needs to close dialog when enter pressed and popup is not visible:
-			/* This doesn't work - the action is never performed?
-			box.registerKeyboardAction(new ActionListener() {
-				public void actionPerformed(ActionEvent e)
-				{
-					al.actionPerformed(e);
-				} 
-			}, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, Event.SHIFT_MASK), WHEN_FOCUSED); */
-			
-			// to get round above problem - but only work when editable
-			box.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent e)
-				{
-						if(!box.isPopupVisible())
-							okJB.doClick();
-				}
-			});
-		}
-		
-		public String getValue()
-		{
-			if(box == null)
-				return text.getText();
-			else
-				return (String)box.getSelectedItem();
-		}
-		
-		private JTextField text;
-		private JComboBox box;
-	}
-	
-	
-	
-}
+/*
+ *
+ * InputDialog.java
+ * Copyright (C) 2001 Dominic Stolerman
+ * dst...@je...
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
+
+public class InputDialog extends JDialog 
+{
+	public static final double MIN_WIDTH  = 290.0;
+	public static final double MIN_HEIGHT =  110.0;
+	
+	public InputDialog(Frame owner, String key, String message, String defValue) {
+		super(owner, "Please input a value for " + key, true);
+		parent = owner;
+		init( key,  message,  defValue);
+		}
+	
+	public InputDialog(Frame owner, String key, String message, String defValue, String[] opts, boolean allowUser) {
+		super(owner, "Please input a value for " + key, true);
+		parent = owner;
+		init( key,  message,  defValue,  opts,  allowUser);
+		}
+	
+	public InputDialog(Dialog owner, String key, String message, String defValue) {
+		super(owner, "Please input a value for " + key, true);
+		parent = owner;
+		init( key,  message,  defValue);
+		}
+	
+	public InputDialog(Dialog owner, String key, String message, String defValue, String[] opts, boolean allowUser) {
+		super(owner, "Please choose a value for " + key, true);
+		parent = owner;
+		init( key, message, defValue, opts, allowUser);
+		}
+	
+	public String getValue() {
+		return selected;
+		}
+	
+	public String showDialog() {
+		pack();
+		setLocationRelativeTo(parent);
+		show();
+		return getValue();
+		}
+	
+	public Dimension getMinimumSize() {
+		Dimension supMin = super.getMinimumSize();
+		return new Dimension(
+			(int)Math.max(supMin.getWidth(), MIN_WIDTH),
+			(int)Math.max(supMin.getHeight(), MIN_HEIGHT)
+			);
+		}
+	
+	public Dimension getPreferredSize() {
+		Dimension supMin = super.getPreferredSize();
+		return new Dimension(
+			(int)Math.max(supMin.getWidth(), MIN_WIDTH),
+			(int)Math.max(supMin.getHeight(), MIN_HEIGHT)
+			);
+		}
+	
+	private void init(String key, String message, String defValue, String[] opts, boolean allowUser) {
+		centPanel = new CentrePanel();
+		centPanel.addComboBox(opts, defValue, allowUser);
+		init(message);
+		}
+	
+	private void init(String key, String message, String defValue) {
+		centPanel = new CentrePanel();
+		centPanel.addTextBox(defValue);
+		init(message);
+		}
+	
+	private void init(String message) {
+		setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+		addWindowListener(
+			new WindowAdapter() {
+				public void windowClosing(WindowEvent e) {
+					okJB.doClick();
+					}
+				}
+			);
+		setResizable(false);
+		panel = new JPanel();
+		GridBagLayout gb = new GridBagLayout();
+		GridBagConstraints c = new GridBagConstraints();
+		panel.setLayout(gb);
+		c.gridx = 0;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.weightx =  0.5;
+		c.weighty = 0.5;
+
+		c.gridy = 0;
+		label = new JLabel(message);
+		label.setHorizontalAlignment(SwingConstants.LEFT);
+		gb.setConstraints(label, c);
+		panel.add(label);
+
+		c.gridy = 1;
+		gb.setConstraints(centPanel, c);
+		panel.add(centPanel);
+
+		c.gridy = 2;
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.SOUTHEAST;
+		okJB = new JButton("OK");
+		getRootPane().setDefaultButton(okJB);
+		okJB.addActionListener(al);
+		gb.setConstraints(okJB, c);
+		panel.add(okJB);
+
+		setContentPane(panel);
+		//getRootPane().registerKeyboardAction(al, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), JComponent.WHEN_IN_FOCUSED_WINDOW);
+		}
+
+	ActionListener al = new ActionListener() {
+		public void actionPerformed(ActionEvent evt) {
+			selected = centPanel.getValue();
+			setVisible(false);
+			dispose();
+			}
+		};
+
+	private JLabel label;
+	private JButton okJB;
+	private JPanel panel;
+	private CentrePanel centPanel;
+	private Window parent;
+
+	String selected;
+	
+	private class CentrePanel extends JPanel {
+		public CentrePanel() {
+			super();
+			setLayout(new BorderLayout());
+			}
+
+		public void addTextBox(String defValue)	{
+			box = null;
+			add(text = new JTextField(defValue, 20), BorderLayout.CENTER);
+			if(defValue !=null) {
+				text.setSelectionStart(0);
+				text.setSelectionEnd(defValue.length());
+				}
+			text.addActionListener(al);
+			}
+
+		public void addComboBox(String[] opts, String defValue, boolean editable) {
+			text = null;
+			add(box = new JComboBox(opts));
+			if(defValue != null) {
+				boolean defValInc = false;
+				for(int i=0; i < opts.length; i++) {
+					if(opts[i].equals(defValue)) {
+						box.setSelectedIndex(i);
+						defValInc = true;
+						}
+					}
+				if(!defValInc) {
+					box.addItem(defValue);
+					box.setSelectedItem(defValue);
+					}
+				}
+			box.setEditable(editable);
+ 			box.addActionListener(
+				new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						selected = centPanel.getValue();
+						}
+					}
+				);
+		}
+		
+		public String getValue() {
+			if(box == null)
+				return text.getText();
+			else
+				return (String)box.getSelectedItem();
+			}
+		
+		private JTextField text;
+		private JComboBox box;
+	}
+}
+

Modified: plugins/XInsert/trunk/src/InsertTextCommand.java
===================================================================
--- plugins/XInsert/trunk/src/InsertTextCommand.java	2006-09-25 13:34:25 UTC (rev 7124)
+++ plugins/XInsert/trunk/src/InsertTextCommand.java	2006-09-25 14:50:26 UTC (rev 7125)
@@ -1,5 +1,4 @@
 /*
- *
  * InsertTextCommand.java
  * Copyright (C) 2001 Dominic Stolerman
  * dst...@je...
@@ -24,64 +23,130 @@
 *@author Dominic Stolerman
 */
 
-
 import org.gjt.sp.jedit.*;
 import org.gjt.sp.jedit.textarea.JEditTextArea;
-import javax.swing.text.BadLocationException;
+import org.gjt.sp.util.Log;
 
-public class InsertTextCommand extends java.lang.Object implements Command
-{
-  public static void insertText(String text, ScriptContext sc)
-  {
-    InsertTextCommand co = new InsertTextCommand(text);
-    co.run(sc);
-  }
+public class InsertTextCommand extends java.lang.Object implements Command {
 
+  public static void insertText(String text, ScriptContext context) {
+    InsertTextCommand cmd = new InsertTextCommand(text);
+    cmd.run(context);
+    }
+
   /* constructor */
-  public InsertTextCommand(String text)
-  {
+  public InsertTextCommand(String text) {
     this.text = text;
-  }
+    // this.src = MiscUtilities.escapesToChars(text);
+    this.src = text;
+    this.result = new StringBuffer(src.length());
+    this.i = 0;
+    }
 
-  public void run(ScriptContext sc)
-  {
-    View v = sc.getView();
-    Buffer b = v.getBuffer();
-    JEditTextArea textArea = v.getTextArea();
-    String t = MiscUtilities.escapesToChars(text);
-    StringBuffer buf = new StringBuffer(t.length());
-    String selected;
-    if(textArea.getSelectedText() != null)
-      selected = textArea.getSelectedText();
-      else selected = "";
-      char c;
-      for(int i=0; i<t.length(); i++)
-      {
-        c = t.charAt(i);
-        if(c == '|')
-        {
-          if(i < t.length() -1 && t.charAt(i + 1) == '|')
-          {
+  public void run(ScriptContext context) {
+    XTreeNode node = context.getNode();
+    View view = context.getView();
+    JEditTextArea textarea = view.getTextArea();
+    Buffer buffer = view.getBuffer();
+    int tabSize = buffer.getTabSize();
+
+    char c;
+    boolean braced;
+    int caretpos = -1;
+
+    for (i = 0; i < src.length(); i++) {
+      c = src.charAt(i);
+      switch(c) {
+      case '|':
+        // double '|'
+        if(nextCharIs('|')) {
             i++;
-            buf.append(c);
-          }
-          else
-          {
-            buf.append(selected);
-            charPos = i;
-          }
-        }
-        else
-          buf.append(c);
+            result.append(c);
+            }
+        // insert selection
+        else {
+            result.append(context.getSelection());
+            caretpos = result.length();
+            }
+        // pos = j;
+        break;
+      case '\\':
+        // new line
+        if(nextCharIs('n')) {
+           i++;
+           result.append('\n');
+           }
+        // tab
+        else if(nextCharIs('t')) {
+           i++;
+           if(jEdit.getBooleanProperty("buffer.noTabs", false))
+             for(int k = 0; k < tabSize; k++)
+               result.append(" ");
+           else
+             result.append("\t");
+             }
+        // escaped dollar sign
+        else if(nextCharIs('$')) {
+           i++;
+           result.append('$');
+           }
+        // escaped pipe
+        else if(nextCharIs('|')) {
+           i++;
+           result.append('|');
+           }
+        // escaped backslash
+        else if(nextCharIs('\\')) {
+           i++;
+           result.append(c);
+           }
+	    else
+           result.append(c);
+        break;
+        // insert variable
+      case '$':
+	        braced = nextCharIs('{');
+            // insertText ${varname}
+	        if(braced) i++;
+            i++;
+            int temp = i;
+            while(i < src.length() && Character.isLetterOrDigit(src.charAt(i)))
+              i++;
+            // Log.log(Log.DEBUG, this, "$ = " + src.substring(temp, i));
+            String val = XScripter.getSubstituteFor(view, src.substring(temp, i), node);
+            if(val == null)
+              result.append(src.substring(temp, i));
+            else
+              result.append(val);
+            if(!braced) i--;
+        break;
+      default:
+        result.append(c);
+        break;
       }
-      int pos = textArea.getCaretPosition();
-      b.insert(pos, buf.toString());
-      if(charPos != -1)
-        sc.getCommandQueue().addLast(new SetCursorPositionCommand(pos + charPos));
-      textArea.setCaretPosition(pos + buf.length());
-  }
+    }
+    if(jEdit.getBooleanProperty("xtree.carriage", false))
+      result.append('\n');
+    int caret = textarea.getCaretPosition();
+    int len = result.length();
+    if(len > 0) {
+      textarea.setSelectedText(result.toString());
+      // set caret to end of insert or last "|" position
+      textarea.setCaretPosition(caretpos > -1
+	      ? caret + caretpos
+	      : caret + len
+	      );
+      }
+    }
 
+  // enhances source readability
+  private boolean nextCharIs(char ch) {
+      return (i < src.length() - 1) && (src.charAt(i + 1) == ch);
+      }
+
+  private int i;
   private String text;
-  private int charPos = -1;
+  private String src;
+  private StringBuffer result;
 }
 

Modified: plugins/XInsert/trunk/src/RunJavaCommand.java
===================================================================
--- plugins/XInsert/trunk/src/RunJavaCommand.java	2006-09-25 13:34:25 UTC (rev 7124)
+++ plugins/XInsert/trunk/src/RunJavaCommand.java	2006-09-25 14:50:26 UTC (rev 7125)
@@ -27,27 +27,23 @@
  *
  * @author     Dominic Stolerman
  */
-public class RunJavaCommand extends Object implements Command
-{
+public class RunJavaCommand extends Object implements Command {
 
 	private final String command;
 
 
-	public RunJavaCommand(String command)
-	{
+	public RunJavaCommand(String command) {
 		this.command = command;
 	}
 
-	public void run(ScriptContext sc)
-	{
+	public void run(ScriptContext sc) {
 		View parent = sc.getView();
 		XTreeNode node = sc.getNode();
 		boolean stringArg = false;
 		String arg = "";
 		String cleanedCmd = command.substring(1, command.length() - 1).trim();
 		int bracket = cleanedCmd.indexOf("(");
-		if(bracket == -1)
-		{
+		if(bracket == -1) {
 			XScripter.doError(command, "\"(\" expected");
 			return;
 		}
@@ -56,46 +52,38 @@
 		int classEnds = cleanedCmd.lastIndexOf(".", bracket);
 		String clazzName = cleanedCmd.substring(0, classEnds);
 		String methodName = cleanedCmd.substring(classEnds + 1, bracket);
-		if(cleanedCmd.charAt(bracket + 1) != ')')
-		{
+		if(cleanedCmd.charAt(bracket + 1) != ')') {
 			stringArg = true;
 			String _arg = cleanedCmd.substring(bracket + 1, cleanedCmd.length());
-			if(_arg.startsWith("$"))
-			{
+			if(_arg.startsWith("$")) {
 				arg = XScripter.getSubstituteFor(parent, _arg.substring(1), node);
 			}
-			else
-			{
+			else {
 				arg = _arg;
 			}
 		}
-		try
-		{
+		try {
 			Class clazz = Class.forName(clazzName);
 			Method method = null;
 			System.out.println("ClassName=" + clazzName + "/" + clazz.getName() + " methodName=" + methodName);
 			
 			Object[] args = null; //Arguments for method
-			if(stringArg)
-			{
+			if(stringArg) {
 				method = clazz.getMethod(methodName, new Class[] {String.class});
 				//method = clazz.getMethod(methodName, new Class[] {Object.class, String.class});
 				args = new Object[1];
 				args[0] = arg;
 			}
-			else
-			{
+			else {
 				//method = clazz.getMethod(methodName, new Class[] {Object.class});
 				method = clazz.getMethod(methodName, null);
 			}
 			
 			Object obj = method.invoke(null, args);
-			if(obj == null)
-			{
+			if(obj == null) {
 				return;
 			}
-			else
-			{
+			else {
 				InsertTextCommand.insertText(obj.toString(), sc);
 			}
 			/*
@@ -116,26 +104,19 @@
 			 * System.out.println();
 			 * }
 			 
-			for(int i = 0; i < methods.length; i++)
-
-			{
-				if(methods[i].getName().equals(methodName))
-				{
+			for(int i = 0; i < methods.length; i++) {
+				if(methods[i].getName().equals(methodName)) {
 					Class[] parameterTypes = methods[i].getParameterTypes();
-					if(stringArg && parameterTypes.length == 2)
-					{
+					if(stringArg && parameterTypes.length == 2) {
 						if(parameterTypes[0].getName().equals(ScriptContext.class.getName()) && 
-								parameterTypes[1].getName().equals(String.class.getName()))
-						{
+								parameterTypes[1].getName().equals(String.class.getName())) {
 							method = methods[i];
 							args = new Object[]{sc, arg};
 							break;
 						}
 					}
-					else if(!stringArg && parameterTypes.length == 1)
-					{
-						if(parameterTypes[0].getName().equals(ScriptContext.class.getName()))
-						{
+					else if(!stringArg && parameterTypes.length == 1) {
+						if(parameterTypes[0].getName().equals(ScriptContext.class.getName())) {
 							method = methods[i];
 							args = new Object[]{sc};
 							break;
@@ -143,32 +124,26 @@
 					}
 				}
 			}
-			if(method != null)
-			{
-				for(int i = 0; i < args.length; i++)
-				{
+			if(method != null) {
+				for(int i = 0; i < args.length; i++) {
 					Log.log(Log.DEBUG, this, args[i].getClass().getName());
 				}
 				Object obj = method.invoke(null, args);
-				if(obj == null)
-				{
+				if(obj == null) {
 					return;
 				}
-				else
-				{
+				else {
 					InsertTextCommand.insertText(obj.toString(), sc);
 				}
 			}
-			else
-			{
+			else {
 				XScripter.doError(command, "Method not found");
 				return;
 			}
 			
 */
 		}
-		catch(Exception e)
-		{
+		catch(Exception e) {
 			XScripter.doError(command, e);
 		}
 	}

Modified: plugins/XInsert/trunk/src/ScriptContext.java
===================================================================
--- plugins/XInsert/trunk/src/ScriptContext.java	2006-09-25 13:34:25 UTC (rev 7124)
+++ plugins/XInsert/trunk/src/ScriptContext.java	2006-09-25 14:50:26 UTC (rev 7125)
@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */ 
 import org.gjt.sp.jedit.View;
+import org.gjt.sp.jedit.textarea.JEditTextArea;
+import org.gjt.sp.util.Log;
 
 /**
  *
@@ -26,12 +28,16 @@
 public class ScriptContext extends Object {
 
   /** Creates new ScriptContext */
-  public ScriptContext(final View view, final XTreeNode node, final CommandQueue queue) 
-  {
+  public ScriptContext(final View view, final XTreeNode node, final CommandQueue queue) {
     this.view = view;
     this.node = node;
     this.queue = queue;
-  }
+    this.textarea = view.getTextArea();
+    String sel = textarea.getSelectedText();
+    this.selection = (sel == null)
+    	? ""
+	: sel;
+    }
 
   public View getView() {
     return view;
@@ -41,11 +47,17 @@
     return node;
   }
 
+  public String getSelection() {
+    return selection;
+  }
+
   public CommandQueue getCommandQueue() {
     return queue;
   }
   
+  private final String selection;
   private final View view;
+  private final JEditTextArea textarea;
   private final XTreeNode node;
   private final CommandQueue queue;
 

Modified: plugins/XInsert/trunk/src/ShowDialogCommand.java
===================================================================
--- plugins/XInsert/trunk/src/ShowDialogCommand.java	2006-09-25 13:34:25 UTC (rev 7124)
+++ plugins/XInsert/trunk/src/ShowDialogCommand.java	2006-09-25 14:50:26 UTC (rev 7125)
@@ -1,91 +1,94 @@
-/*
- *
- * ShowDialogCommand.java
- * Copyright (C) 2001 Dominic Stolerman
- * dst...@je...
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-
-import org.gjt.sp.jedit.View;
-
-/**
- *
- * @author  Dominic Stolerman
- */
-public class ShowDialogCommand extends Object implements Command
-{
-
-  /** Creates new ShowDialogCommand */
-  public ShowDialogCommand(String command)
-  {
-    this.command = command;
-  }
-
-  public void run(...
 
[truncated message content]

Thread: [ jEdit-commits ] SF.net SVN: jedit: [7125] plugins/XInsert/trunk

jEdit is a programmer's text editor written in Java.

jedit-cvs