Merge pull request #2 from arduino/master

pull master

Author: me-no-dev

app/src/cc/arduino/ConsoleOutputStream.java

@@ -40,7 +40,6 @@
 
 import javax.swing.*;
 import javax.swing.text.BadLocationException;
-import javax.swing.text.Document;
 import javax.swing.text.SimpleAttributeSet;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -57,28 +56,23 @@ public class ConsoleOutputStream extends ByteArrayOutputStream {
   private final PrintStream printStream;
   private final StringBuilder buffer;
   private final Timer timer;
-  private JScrollPane scrollPane;
-  private Document document;
+  private volatile EditorConsole editorConsole;
 
   public ConsoleOutputStream(SimpleAttributeSet attributes, PrintStream printStream) {
     this.attributes = attributes;
     this.printStream = printStream;
     this.buffer = new StringBuilder();
 
     this.timer = new Timer(100, (e) -> {
-      if (scrollPane != null) {
-        synchronized (scrollPane) {
-          scrollPane.getHorizontalScrollBar().setValue(0);
-          scrollPane.getVerticalScrollBar().setValue(scrollPane.getVerticalScrollBar().getMaximum());
-        }
+      if (editorConsole != null) {
+        editorConsole.scrollDown();
       }
     });
     timer.setRepeats(false);
   }
 
-  public synchronized void setCurrentEditorConsole(EditorConsole console) {
-    this.scrollPane = console;
-    this.document = console.getDocument();
+  public void setCurrentEditorConsole(EditorConsole console) {
+    this.editorConsole = console;
   }
 
   public synchronized void flush() {
@@ -102,7 +96,7 @@ private void handleAppend(String message) {
   }
 
   private void resetBufferIfDocumentEmpty() {
-    if (document != null && document.getLength() == 0) {
+    if (editorConsole != null && editorConsole.isEmpty()) {
       buffer.setLength(0);
     }
   }
@@ -113,12 +107,10 @@ private void clearBuffer() {
 
     printStream.print(line);
 
-    if (document != null) {
+    if (editorConsole != null) {
       SwingUtilities.invokeLater(() -> {
         try {
-          String lineWithoutCR = line.replace("\r\n", "\n").replace("\r", "\n");
-          int offset = document.getLength();
-          document.insertString(offset, lineWithoutCR, attributes);
+          editorConsole.insertString(line, attributes);
         } catch (BadLocationException ble) {
           //ignore
         }

app/src/cc/arduino/contributions/BuiltInCoreIsNewerCheck.java

@@ -33,14 +33,12 @@
 import cc.arduino.contributions.filters.InstalledPredicate;
 import cc.arduino.contributions.packages.ContributedPackage;
 import cc.arduino.contributions.packages.ContributedPlatform;
-import cc.arduino.view.Event;
 import processing.app.Base;
 import processing.app.BaseNoGui;
 import processing.app.I18n;
 import processing.app.PreferencesData;
 
 import javax.swing.*;
-import java.awt.event.ActionEvent;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;

app/src/cc/arduino/contributions/libraries/LibraryTypeComparator.java

@@ -38,7 +38,7 @@ public class LibraryTypeComparator implements Comparator<String> {
   private final List<String> types;
 
   public LibraryTypeComparator() {
-    this("Arduino", "Recommended", "Contributed");
+    this("Arduino", "Partner", "Recommended", "Contributed");
   }
 
   public LibraryTypeComparator(String... types) {

app/src/cc/arduino/packages/formatter/AStyle.java

@@ -91,10 +91,11 @@ public void run() {
     int line = getLineOfOffset(textArea);
     int lineOffset = getLineOffset(textArea, line);
 
-    editor.getTextArea().getUndoManager().beginInternalAtomicEdit();
+    textArea.getUndoManager().beginInternalAtomicEdit();
+    editor.removeAllLineHighlights();
     editor.setText(formattedText);
     editor.getSketch().setModified(true);
-    editor.getTextArea().getUndoManager().endInternalAtomicEdit();
+    textArea.getUndoManager().endInternalAtomicEdit();
 
     if (line != -1 && lineOffset != -1) {
       try {

app/src/cc/arduino/view/NotificationPopup.java

@@ -53,6 +53,11 @@ public NotificationPopup(Frame parent, HyperlinkListener hyperlinkListener, Stri
       public void componentMoved(ComponentEvent e) {
         updateLocation(parent);
       }
+
+      @Override
+      public void componentResized(ComponentEvent e) {
+        updateLocation(parent);
+      }
     };
     parent.addComponentListener(parentMovedListener);
 

app/src/cc/arduino/view/SplashScreenHelper.java

@@ -37,6 +37,11 @@
 
 public class SplashScreenHelper {
 
+  private static final int X_OFFSET = 0;
+  private static final int Y_OFFSET = 300;
+  private static final int TEXTAREA_HEIGHT = 30;
+  private static final int TEXTAREA_WIDTH = 475;
+
   private final Map desktopHints;
   private final SplashScreen splash;
   private Rectangle2D.Double splashTextArea;
@@ -48,44 +53,56 @@ public SplashScreenHelper(SplashScreen splash) {
     desktopHints = (Map) tk.getDesktopProperty("awt.font.desktophints");
   }
 
-  public void splashText(String str) {
+  public void splashText(String text) {
     if (splash == null) {
-      printText(str);
+      printText(text);
       return;
     }
+
     if (!splash.isVisible()) {
       return;
     }
 
     if (splashTextArea == null) {
-      // stake out some area for our status information
-      splashTextArea = new Rectangle2D.Double(0, 300, 520, 30);
-
-      // create the Graphics environment for drawing status info
-      splashGraphics = splash.createGraphics();
-
-      if (desktopHints != null) {
-        splashGraphics.addRenderingHints(desktopHints);
-      }
+      prepareTextAreaAndGraphics();
     }
 
-    // erase the last status text
-    splashGraphics.setPaint(new Color(245, 245, 245));
-    splashGraphics.fill(splashTextArea);
+    eraseLastStatusText();
 
-    // draw the text
-    splashGraphics.setPaint(Color.BLACK);
-    FontMetrics metrics = splashGraphics.getFontMetrics();
-    splashGraphics.drawString(str, (int) splashTextArea.getX() + 10, (int) splashTextArea.getY() + (30 - metrics.getHeight()) + 4);
+    drawText(text);
 
-    // make sure it's displayed
+    ensureTextIsDiplayed();
+  }
+
+  private void ensureTextIsDiplayed() {
     synchronized (SplashScreen.class) {
       if (splash.isVisible()) {
         splash.update();
       }
     }
   }
 
+  private void drawText(String str) {
+    splashGraphics.setPaint(Color.BLACK);
+    FontMetrics metrics = splashGraphics.getFontMetrics();
+    splashGraphics.drawString(str, (int) splashTextArea.getX() + 10, (int) splashTextArea.getY() + (TEXTAREA_HEIGHT - metrics.getHeight()) + 5);
+  }
+
+  private void eraseLastStatusText() {
+    splashGraphics.setPaint(new Color(229, 229, 229));
+    splashGraphics.fill(splashTextArea);
+  }
+
+  private void prepareTextAreaAndGraphics() {
+    splashTextArea = new Rectangle2D.Double(X_OFFSET, Y_OFFSET, TEXTAREA_WIDTH, TEXTAREA_HEIGHT);
+
+    splashGraphics = splash.createGraphics();
+
+    if (desktopHints != null) {
+      splashGraphics.addRenderingHints(desktopHints);
+    }
+  }
+
   public void close() {
     if (splash == null) {
       return;

app/src/cc/arduino/view/findreplace/FindReplace.form

@@ -4,8 +4,9 @@
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="2"/>
     <Property name="title" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-      <Connection code="_(&quot;Find&quot;)" type="code"/>
+      <Connection code="tr(&quot;Find&quot;)" type="code"/>
     </Property>
+    <Property name="resizable" type="boolean" value="false"/>
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
@@ -84,7 +85,7 @@
     <Component class="javax.swing.JLabel" name="findLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-          <Connection code="_(&quot;Find:&quot;)" type="code"/>
+          <Connection code="tr(&quot;Find:&quot;)" type="code"/>
         </Property>
       </Properties>
       <AuxValues>
@@ -100,7 +101,7 @@
     <Component class="javax.swing.JLabel" name="replaceLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-          <Connection code="_(&quot;Replace with:&quot;)" type="code"/>
+          <Connection code="tr(&quot;Replace with:&quot;)" type="code"/>
         </Property>
       </Properties>
       <AuxValues>
@@ -117,22 +118,22 @@
       <Properties>
         <Property name="selected" type="boolean" value="true"/>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-          <Connection code="_(&quot;Ignore Case&quot;)" type="code"/>
+          <Connection code="tr(&quot;Ignore Case&quot;)" type="code"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="wrapAroundBox">
       <Properties>
         <Property name="selected" type="boolean" value="true"/>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-          <Connection code="_(&quot;Wrap Around&quot;)" type="code"/>
+          <Connection code="tr(&quot;Wrap Around&quot;)" type="code"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="searchAllFilesBox">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-          <Connection code="_(&quot;Search all Sketch Tabs&quot;)" type="code"/>
+          <Connection code="tr(&quot;Search all Sketch Tabs&quot;)" type="code"/>
         </Property>
       </Properties>
     </Component>
@@ -143,7 +144,7 @@
         <Component class="javax.swing.JButton" name="findButton">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="_(&quot;Find&quot;)" type="code"/>
+              <Connection code="tr(&quot;Find&quot;)" type="code"/>
             </Property>
           </Properties>
           <Events>
@@ -153,7 +154,7 @@
         <Component class="javax.swing.JButton" name="previousButton">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="_(&quot;Previous&quot;)" type="code"/>
+              <Connection code="tr(&quot;Previous&quot;)" type="code"/>
             </Property>
           </Properties>
           <Events>
@@ -163,7 +164,7 @@
         <Component class="javax.swing.JButton" name="replaceFindButton">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="_(&quot;Replace &amp; Find&quot;)" type="code"/>
+              <Connection code="tr(&quot;Replace &amp; Find&quot;)" type="code"/>
             </Property>
           </Properties>
           <Events>
@@ -173,7 +174,7 @@
         <Component class="javax.swing.JButton" name="replaceButton">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="_(&quot;Replace&quot;)" type="code"/>
+              <Connection code="tr(&quot;Replace&quot;)" type="code"/>
             </Property>
           </Properties>
           <Events>
@@ -183,7 +184,7 @@
         <Component class="javax.swing.JButton" name="replaceAllButton">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="_(&quot;Replace All&quot;)" type="code"/>
+              <Connection code="tr(&quot;Replace All&quot;)" type="code"/>
             </Property>
           </Properties>
           <Events>

app/src/cc/arduino/view/findreplace/FindReplace.java

@@ -66,8 +66,6 @@ public FindReplace(Editor editor, Map<String, Object> state) {
       buttonsContainer.add(findButton);
     }
 
-    getRootPane().setDefaultButton(findButton);
-
     Base.registerWindowCloseKeys(getRootPane(), e -> {
       setVisible(false);
       Base.FIND_DIALOG_STATE = findDialogState();
@@ -85,6 +83,13 @@ public void windowActivated(WindowEvent e) {
     restoreFindDialogState(state);
   }
 
+  @Override
+  public void setVisible(boolean b) {
+    getRootPane().setDefaultButton(findButton);
+
+    super.setVisible(b);
+  }
+
   private Map<String, Object> findDialogState() {
     Map<String, Object> state = new HashMap<>();
     state.put(FIND_TEXT, findField.getText());
@@ -138,6 +143,7 @@ private void initComponents() {
 
     setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
     setTitle(tr("Find"));
+    setResizable(false);
 
     findLabel.setText(tr("Find:"));
 

app/src/cc/arduino/view/preferences/Preferences.java

@@ -48,7 +48,13 @@
 public class Preferences extends javax.swing.JDialog {
 
   private final Language[] languages;
+
+  // Languages that are not translated at least to 65% are
+  // kept in the "missingLanguages" array until they have enough
+  // translated strings.
+  @SuppressWarnings("unused")
   private final Language[] missingLanguages;
+
   private final WarningItem[] warningItems;
   private final Base base;
 

app/src/processing/app/AbstractMonitor.java

@@ -13,7 +13,6 @@
 @SuppressWarnings("serial")
 public abstract class AbstractMonitor extends JFrame implements ActionListener {
 
-  private boolean monitorEnabled;
   private boolean closed;
 
   private StringBuffer updateBuffer;
@@ -78,15 +77,13 @@ public void actionPerformed(ActionEvent event) {
     updateTimer = new Timer(33, this);  // redraw serial monitor at 30 Hz
     updateTimer.start();
 
-    monitorEnabled = true;
     closed = false;
   }
 
   protected abstract void onCreateWindow(Container mainPane);
 
   public void enableWindow(boolean enable) {
     onEnableWindow(enable);
-    monitorEnabled = enable;
   }
 
   protected abstract void onEnableWindow(boolean enable);