Merge pull request #670 from Sloeber/fix_upload_problems

Fix upload problems

Author: jantje

io.sloeber.core/src/cc/arduino/packages/BoardPort.java

@@ -0,0 +1,112 @@
+/*
+ * This file is part of Arduino.
+ *
+ * Arduino 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
+ * (at your option) 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2013 Arduino LLC (http://www.arduino.cc/)
+ */
+
+package cc.arduino.packages;
+
+@SuppressWarnings({ "unqualified-field-access", "nls" })
+public class BoardPort {
+
+	private String address;
+	private String protocol;
+	private String boardName;
+	private String vid;
+	private String pid;
+	private String iserial;
+	private String label;
+	private boolean online;
+
+	public BoardPort() {
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getProtocol() {
+		return protocol;
+	}
+
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+
+	public String getBoardName() {
+		return boardName;
+	}
+
+	public void setBoardName(String boardName) {
+		this.boardName = boardName;
+	}
+
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setOnlineStatus(boolean online) {
+		this.online = online;
+	}
+
+	public boolean isOnline() {
+		return online;
+	}
+
+	public void setVIDPID(String vid, String pid) {
+		this.vid = vid;
+		this.pid = pid;
+	}
+
+	public String getVID() {
+		return vid;
+	}
+
+	public String getPID() {
+		return pid;
+	}
+
+	public void setISerial(String iserial) {
+		this.iserial = iserial;
+	}
+
+	public String getISerial() {
+		return iserial;
+	}
+
+	@Override
+	public String toString() {
+		return this.address + "_" + this.vid + "_" + this.pid;
+	}
+}

io.sloeber.core/src/cc/arduino/packages/ssh/NoInteractionUserInfo.java

@@ -1,43 +1,73 @@
+/*
+ * This file is part of Arduino.
+ *
+ * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
+ *
+ * Arduino 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
+ * (at your option) 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ */
+
 package cc.arduino.packages.ssh;
 
 import com.jcraft.jsch.UserInfo;
 
+@SuppressWarnings({ "unqualified-field-access" })
 public class NoInteractionUserInfo implements UserInfo {
 
-    private final String password;
-
-    public NoInteractionUserInfo(String password) {
-	this.password = password;
-    }
-
-    @Override
-    public String getPassword() {
-	return this.password;
-    }
-
-    @Override
-    public boolean promptYesNo(String str) {
-	return true;
-    }
-
-    @Override
-    public String getPassphrase() {
-	return this.password;
-    }
-
-    @Override
-    public boolean promptPassphrase(String message) {
-	return true;
-    }
-
-    @Override
-    public boolean promptPassword(String message) {
-	return true;
-    }
-
-    @Override
-    public void showMessage(String message) {
-	// no code needed here
-    }
+	private final String password;
+
+	public NoInteractionUserInfo(String password) {
+		this.password = password;
+	}
+
+	@Override
+	public String getPassword() {
+		return password;
+	}
+
+	@Override
+	public boolean promptYesNo(String str) {
+		return true;
+	}
+
+	@Override
+	public String getPassphrase() {
+		return password;
+	}
+
+	@Override
+	public boolean promptPassphrase(String message) {
+		return true;
+	}
+
+	@Override
+	public boolean promptPassword(String message) {
+		return true;
+	}
+
+	@Override
+	public void showMessage(String message) {
+		//
+	}
 
 }