Windows: got rid on JNA, thus no more UnsatisfiedLinkError (at least when accessing native OS functions). Fixes #3190

Author: Federico Fissore

.classpath

@@ -6,7 +6,6 @@
 	<classpathentry kind="lib" path="app/lib/antlr.jar"/>
 	<classpathentry kind="lib" path="app/lib/apple.jar"/>
 	<classpathentry kind="lib" path="app/lib/ecj.jar"/>
-	<classpathentry kind="lib" path="app/lib/jna.jar"/>
 	<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
 	<classpathentry kind="lib" path="app/test-lib/fest-assert-1.2.jar"/>
 	<classpathentry kind="lib" path="app/test-lib/fest-reflect-1.2.jar"/>

app/.classpath

@@ -4,7 +4,6 @@
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/antlr.jar"/>
-	<classpathentry kind="lib" path="lib/jna.jar"/>
 	<classpathentry kind="lib" path="lib/ecj.jar"/>
 	<classpathentry kind="lib" path="lib/apple.jar"/>
 	<classpathentry kind="lib" path="lib/bcpg-jdk15on-152.jar"/>

app/.classpath_macosx

@@ -14,7 +14,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/serial"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/video"/>
 	<classpathentry kind="lib" path="lib/antlr.jar"/>
-	<classpathentry kind="lib" path="lib/jna.jar"/>
 	<classpathentry kind="lib" path="lib/ecj.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

app/.classpath_vista

@@ -617,13 +617,6 @@
             </Property>
           </Properties>
         </Component>
-        <Component class="javax.swing.JCheckBox" name="autoAssociateBox">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="_(&quot;Automatically associate .ino files with Arduino&quot;)" type="code"/>
-            </Property>
-          </Properties>
-        </Component>
         <Component class="javax.swing.JCheckBox" name="saveVerifyUploadBox">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">

app/lib/jna.LICENSE.LGPL-2.1.txt

@@ -34,7 +34,6 @@
 import processing.app.I18n;
 import processing.app.PreferencesData;
 import processing.app.helpers.FileUtils;
-import processing.app.helpers.OSUtils;
 import processing.app.legacy.PApplet;
 
 import javax.swing.*;
@@ -198,11 +197,6 @@ public void actionPerformed(ActionEvent e) {
       }
     });
 
-    if (!OSUtils.isWindows() || base.getPortableFolder() != null) {
-      autoAssociateBox.setEnabled(false);
-      autoAssociateBox.getParent().remove(autoAssociateBox);
-    }
-
     showPrerefencesData();
   }
 
@@ -256,7 +250,6 @@ private void initComponents() {
     externalEditorBox = new javax.swing.JCheckBox();
     checkUpdatesBox = new javax.swing.JCheckBox();
     updateExtensionBox = new javax.swing.JCheckBox();
-    autoAssociateBox = new javax.swing.JCheckBox();
     saveVerifyUploadBox = new javax.swing.JCheckBox();
 
     setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
@@ -445,9 +438,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
     updateExtensionBox.setText(_("Update sketch files to new extension on save (.pde -> .ino)"));
     checkboxesContainer.add(updateExtensionBox);
 
-    autoAssociateBox.setText(_("Automatically associate .ino files with Arduino"));
-    checkboxesContainer.add(autoAssociateBox);
-
     saveVerifyUploadBox.setText(_("Save when verifying or uploading"));
     checkboxesContainer.add(saveVerifyUploadBox);
 
@@ -610,7 +600,6 @@ private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
 
   // Variables declaration - do not modify//GEN-BEGIN:variables
   private javax.swing.JTextField additionalBoardsManagerField;
-  private javax.swing.JCheckBox autoAssociateBox;
   private javax.swing.JCheckBox checkUpdatesBox;
   private javax.swing.JComboBox comboLanguage;
   private javax.swing.JComboBox comboWarnings;
@@ -683,10 +672,6 @@ private void savePreferencesData() {
 
     PreferencesData.setBoolean("editor.update_extension", updateExtensionBox.isSelected());
 
-    if (autoAssociateBox != null) {
-      PreferencesData.setBoolean("platform.auto_file_type_associations", autoAssociateBox.isSelected());
-    }
-
     PreferencesData.setBoolean("editor.save_on_verify", saveVerifyUploadBox.isSelected());
 
     PreferencesData.set("proxy.http.server", proxyHTTPServer.getText());
@@ -744,10 +729,6 @@ private void showPrerefencesData() {
 
     updateExtensionBox.setSelected(PreferencesData.get("editor.update_extension") == null || PreferencesData.getBoolean("editor.update_extension"));
 
-    if (autoAssociateBox != null) {
-      autoAssociateBox.setSelected(PreferencesData.getBoolean("platform.auto_file_type_associations"));
-    }
-
     saveVerifyUploadBox.setSelected(PreferencesData.getBoolean("editor.save_on_verify"));
 
     proxyHTTPServer.setText(PreferencesData.get("proxy.http.server"));

app/lib/jna.jar

@@ -146,6 +146,8 @@ static public void guardedMain(String args[]) throws Exception {
 
     initPlatform();
 
+    getPlatform().init();
+
     BaseNoGui.initPortableFolder();
 
     BaseNoGui.initParameters(args);
@@ -284,8 +286,6 @@ static public File absoluteFile(String path) {
   }
 
   public Base(String[] args) throws Exception {
-    getPlatform().init();
-
     String sketchbookPath = BaseNoGui.getSketchbookPath();
 
     // If no path is set, get the default sketchbook folder for this platform

app/run-linux.launch

@@ -0,0 +1,29 @@
+package processing.app.windows;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class RegQueryParserTest {
+
+  @Test
+  public void testRegQueryParser() throws Exception {
+    String output = "! REG.EXE VERSION 3.0\n" +
+      "\n" +
+      "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\n" +
+      "\n" +
+      "    Local AppData    REG_SZ    C:\\Documents and Settings\\username\\My Documents";
+
+    String folderPath = new RegQueryParser(output).getValueOfKey();
+    assertEquals("C:\\Documents and Settings\\username\\My Documents", folderPath);
+  }
+
+  @Test
+  public void testRegQueryParser2() throws Exception {
+    String output = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\n" +
+      "    Local AppData    REG_SZ    C:\\Users\\username\\AppData\\Local";
+
+    String folderPath = new RegQueryParser(output).getValueOfKey();
+    assertEquals("C:\\Users\\username\\AppData\\Local", folderPath);
+  }
+}

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

@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/jna.jar"/>
 	<classpathentry kind="lib" path="lib/apple.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="lib" path="lib/jmdns-3.4.1.jar"/>

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

@@ -425,8 +425,6 @@ static public String[] headerListFromIncludePath(File path) throws IOException {
   }
 
   static public void init(String[] args) throws Exception {
-    getPlatform().init();
-  
     String sketchbookPath = getSketchbookPath();
 
     // If no path is set, get the default sketchbook folder for this platform
@@ -740,7 +738,9 @@ static public void main(String args[]) throws Exception {
     Runtime.getRuntime().addShutdownHook(new Thread(DeleteFilesOnShutdown.INSTANCE));
 
     initPlatform();
-    
+
+    getPlatform().init();
+
     initPortableFolder();
 
     initParameters(args);

app/src/processing/app/Base.java

@@ -57,6 +57,8 @@ public Platform() {
   }
 
   public void init() throws IOException {
+    super.init();
+
     System.setProperty("apple.laf.useScreenMenuBar", "true");
 
     discoverRealOsArch();