arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

Fixed NPE when currently selected platform is no more installed.

Browse Source 
BaseNoGui.getTargetBoard() now handles null TargetBoard.
Removed unused method Base.getTargetBoard()
This commit is contained in:
Cristian Maglie
2014-05-01 16:17:43 +02:00
parent ec67b0d4be
commit 56b9f1cd6f
3 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/processing/app/Base.java
View File

@ -1077,6 +1077,10 @@ public class Base {
}
public void rebuildBoardsMenu(JMenu toolsMenu, Editor editor) throws Exception {
// If there are no platforms installed skip menu creation
if (BaseNoGui.packages.size() == 0)
return;
JMenu boardsMenu = getBoardCustomMenu();
boolean first = true;
@ -1698,11 +1702,6 @@ public class Base {
return BaseNoGui.getBoardPreferences();
}
public static TargetBoard getTargetBoard() {
String boardId = Preferences.get("board");
return getTargetPlatform().getBoard(boardId);
}
static public File getPortableFolder() {
return BaseNoGui.getPortableFolder();
}

33
app/src/processing/app/EditorLineStatus.java
View File

@ -1,5 +1,3 @@
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
/*
Part of the Processing project - http://processing.org
@ -23,18 +21,23 @@
package processing.app;
import processing.app.helpers.OSUtils;
import processing.app.syntax.*;
import java.awt.*;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.Image;
import java.awt.geom.Rectangle2D;
import java.util.Map;
import javax.swing.*;
import javax.swing.JComponent;
import processing.app.helpers.PreferencesMap;
import processing.app.syntax.JEditTextArea;
/**
* Li'l status bar fella that shows the line number.
*/
@SuppressWarnings("serial")
public class EditorLineStatus extends JComponent {
JEditTextArea textarea;
int start = -1, stop;
@ -52,7 +55,6 @@ public class EditorLineStatus extends JComponent {
String name = "";
String serialport = "";
public EditorLineStatus(JEditTextArea textarea) {
this.textarea = textarea;
textarea.editorLineStatus = this;
@ -70,7 +72,6 @@ public class EditorLineStatus extends JComponent {
//linestatus.color = #FFFFFF
}
public void set(int newStart, int newStop) {
if ((newStart == start) && (newStop == stop)) return;
@ -93,11 +94,10 @@ public class EditorLineStatus extends JComponent {
repaint();
}
public void paintComponent(Graphics g) {
if (name=="" && serialport=="") {
Map<String, String> boardPreferences = Base.getBoardPreferences();
if (boardPreferences!=null)
if (name == "" && serialport == "") {
PreferencesMap boardPreferences = Base.getBoardPreferences();
if (boardPreferences != null)
setBoardName(boardPreferences.get("name"));
else
setBoardName("-");
@ -124,8 +124,13 @@ public class EditorLineStatus extends JComponent {
}
}
public void setBoardName(String name) { this.name = name; }
public void setSerialPort(String serialport) { this.serialport = serialport; }
public void setBoardName(String name) {
this.name = name;
}
public void setSerialPort(String serialport) {
this.serialport = serialport;
}
public Dimension getPreferredSize() {
return new Dimension(300, high);