From 78fee12dd6e687a34d5a19ad30ffd22de5b72a37 Mon Sep 17 00:00:00 2001
From: Manindra Moharana <mkmoharana29@gmail.com>
Date: Sun, 14 Jul 2013 23:57:41 +0530
Subject: [PATCH] minor fixes

---
 .../mode/experimental/ASTGenerator.java        | 18 ++++--------------
 .../mode/experimental/TextAreaPainter.java     |  6 ++++--
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/pdex/src/processing/mode/experimental/ASTGenerator.java b/pdex/src/processing/mode/experimental/ASTGenerator.java
index 5123c6d49..9a7bfc28f 100644
--- a/pdex/src/processing/mode/experimental/ASTGenerator.java
+++ b/pdex/src/processing/mode/experimental/ASTGenerator.java
@@ -2798,20 +2798,7 @@ public class ASTGenerator {
       resources[i] = resources[i].replace('/', '.')
           .substring(0, resources[i].length() - 6);
     }
-//    if(resources.length == 1){
-//      System.out.println("Found import: " + resources[0]);
-//      String impS = resources[0].substring(0, resources[0]
-//                              .length() - 6);            
-//      String impString = "import " + impS.replace('/','.') + ";\n";      
-//      try {
-//        editor.textArea().getDocument().insertString(0, impString, null);
-//        errorCheckerService.runManualErrorCheck();
-//      } catch (BadLocationException e) {
-//        System.out.println("Failed to insert import for " + className);
-//        e.printStackTrace();
-//      }
-//    } else 
-      if (resources.length >= 1) {
+    if (resources.length >= 1) {
       final JList classList = new JList(resources);
       classList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
       frmImportSuggest = new JFrame();
@@ -2831,7 +2818,10 @@ public class ASTGenerator {
             try {
               String impString = "import " + classList.getSelectedValue()
                   + ";\n";
+              int ct = editor.getSketch().getCurrentCodeIndex(), coff = editor.textArea().getCaretPosition();
+              editor.getSketch().setCurrentCode(0);
               editor.textArea().getDocument().insertString(0, impString, null);
+              editor.getSketch().setCurrentCode(ct);
               errorCheckerService.runManualErrorCheck();
               frmImportSuggest.setVisible(false);
               frmImportSuggest = null;
diff --git a/pdex/src/processing/mode/experimental/TextAreaPainter.java b/pdex/src/processing/mode/experimental/TextAreaPainter.java
index 2a1599c56..6a06e4d9b 100644
--- a/pdex/src/processing/mode/experimental/TextAreaPainter.java
+++ b/pdex/src/processing/mode/experimental/TextAreaPainter.java
@@ -75,8 +75,10 @@ public class TextAreaPainter extends processing.app.syntax.TextAreaPainter {
     addMouseListener(new MouseAdapter() {
       public void mouseClicked(MouseEvent evt) {
 //        		System.out.println( " Meta,Ctrl "+ (evt.getModifiers() & ctrlMask));
-        if (evt.isControlDown() || evt.isMetaDown())
-          handleCtrlClick(evt);
+        if (evt.getButton() == MouseEvent.BUTTON1) {
+          if (evt.isControlDown() || evt.isMetaDown())
+            handleCtrlClick(evt);
+        }
       }
     });