eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-04 14:19:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4712 from rzats/bugfix-4696

Browse Source 
CM: Fix null versions in the contribution manager (#4696)
This commit is contained in:
Ben Fry
2016-10-29 09:52:37 -04:00
committed by GitHub
parent 5d5b4571bf 7813e16252
commit 63066ebb73
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/processing/app/contrib/DetailPanel.java
View File

@@ -461,7 +461,7 @@ class DetailPanel extends JPanel {
desc.append("</font> ");
String version = contrib.getPrettyVersion();
if (version != null) {
if (version != null && !version.equals("null")) {
desc.append(version);
}
desc.append(" <br/>");

18
app/src/processing/app/contrib/StatusPanel.java
View File

@@ -259,12 +259,24 @@ class StatusPanel extends JPanel {
if (panel.getContrib().isCompatible(Base.getRevision())) {
if (installButton.isEnabled()) {
updateLabel.setText(latestVersion + " available");
if (latestVersion != null) {
updateLabel.setText(latestVersion + " available");
} else {
updateLabel.setText("Available");
}
} else {
updateLabel.setText(currentVersion + " installed");
if (currentVersion != null && !currentVersion.equals("null")) {
updateLabel.setText(currentVersion + " installed");
} else {
updateLabel.setText("Installed");
}
}
} else {
updateLabel.setText(currentVersion + " not compatible");
if (currentVersion != null && !currentVersion.equals("null")) {
updateLabel.setText(currentVersion + " not compatible");
} else {
updateLabel.setText("Not compatible");
}
}
if (latestVersion != null) {