ClangFormat is no more a Tool

Being a plugin Tool is not mandatory and, in this case, it just makes
things more complicated without any evident benefit.

Author: cmaglie

app/src/cc/arduino/packages/formatter/clangformat/ClangFormat.java

@@ -43,19 +43,14 @@
 import processing.app.Base;
 import processing.app.Editor;
 import processing.app.helpers.ProcessUtils;
-import processing.app.tools.Tool;
 
-public class ClangFormat implements Tool {
+public class ClangFormat implements Runnable {
 
   private final String clangExecutable = Base.getContentFile("clang-format")
       .getAbsolutePath();
   private Editor editor;
 
-  public ClangFormat() {
-  }
-
-  @Override
-  public void init(Editor editor) {
+  public ClangFormat(Editor editor) {
     this.editor = editor;
   }
 
@@ -77,11 +72,6 @@ public void run() {
     }
   }
 
-  @Override
-  public String getMenuTitle() {
-    return tr("Auto Format");
-  }
-
   private Thread copyAndClose(InputStream input, OutputStream output) {
     Thread t = new Thread(() -> {
       try {

app/src/processing/app/Editor.java

@@ -89,6 +89,7 @@
 import cc.arduino.packages.BoardPort;
 import cc.arduino.packages.MonitorFactory;
 import cc.arduino.packages.Uploader;
+import cc.arduino.packages.formatter.clangformat.ClangFormat;
 import cc.arduino.packages.uploaders.SerialUploader;
 import cc.arduino.view.GoToLineNumber;
 import cc.arduino.view.StubMenuListener;
@@ -236,11 +237,13 @@ public boolean test(SketchController controller) {
 
   private Map<String, Tool> internalToolCache = new HashMap<String, Tool>();
 
+  final ClangFormat formatter;
+
   public Editor(Base ibase, File file, int[] storedLocation, int[] defaultLocation, Platform platform) throws Exception {
     super("Arduino");
     this.base = ibase;
     this.platform = platform;
-
+    this.formatter = new ClangFormat(this);
     Base.setIcon(this);
 
     // Install default actions for Run, Present, etc.
@@ -981,14 +984,12 @@ private Tool getOrCreateToolInstance(String className) {
   }
 
   private void addInternalTools(JMenu menu) {
-    JMenuItem formatItem = createToolMenuItem("cc.arduino.packages.formatter.clangformat.ClangFormat");
-    if (formatItem == null) {
-      throw new NullPointerException("Tool cc.arduino.packages.formatter.clangformat.ClangFormat");
-    }
-    formatItem.setName("menuToolsAutoFormat");
+    JMenuItem autoFormat = new JMenuItem(tr("Auto Format"));
+    autoFormat.setName("menuToolsAutoFormat");
+    autoFormat.addActionListener(event -> SwingUtilities.invokeLater(formatter));
     int modifiers = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
-    formatItem.setAccelerator(KeyStroke.getKeyStroke('T', modifiers));
-    menu.add(formatItem);
+    autoFormat.setAccelerator(KeyStroke.getKeyStroke('T', modifiers));
+    menu.add(autoFormat);
 
     // menu.add(createToolMenuItem("processing.app.tools.CreateFont"));
     // menu.add(createToolMenuItem("processing.app.tools.ColorSelector"));
@@ -1893,8 +1894,7 @@ private boolean handleSave2() {
     boolean saved = false;
     try {
       if (PreferencesData.getBoolean("editor.autoformat_currentfile_before_saving")) {
-        Tool formatTool = getOrCreateToolInstance("cc.arduino.packages.formatter.AStyle");
-        formatTool.run();
+        formatter.run();
       }
 
       boolean wasReadOnly = sketchController.isReadOnly();

app/src/processing/app/EditorTab.java

@@ -39,6 +39,7 @@
 import javax.swing.JMenuItem;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
 import javax.swing.ToolTipManager;
 import javax.swing.border.MatteBorder;
 import javax.swing.event.PopupMenuEvent;
@@ -197,15 +198,12 @@ private void configurePopupMenu(final SketchTextArea textarea){
 
     menu.addSeparator();
 
-    JMenuItem item = editor.createToolMenuItem("cc.arduino.packages.formatter.AStyle");
-    if (item == null) {
-      throw new NullPointerException("Tool cc.arduino.packages.formatter.AStyle unavailable");
-    }
-    item.setName("menuToolsAutoFormat");
-
-    menu.add(item);
+    JMenuItem autoFormat = new JMenuItem(tr("Auto Format"));
+    autoFormat.addActionListener(event -> SwingUtilities.invokeLater(editor.formatter));
+    autoFormat.setName("menuToolsAutoFormat");
+    menu.add(autoFormat);
 
-    item = new JMenuItem(tr("Comment/Uncomment"), '/');
+    JMenuItem item = new JMenuItem(tr("Comment/Uncomment"), '/');
     item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           handleCommentUncomment();