diff --git a/app/src/processing/app/contrib/Contribution.java b/app/src/processing/app/contrib/Contribution.java index 4b01c106e..67c58789c 100644 --- a/app/src/processing/app/contrib/Contribution.java +++ b/app/src/processing/app/contrib/Contribution.java @@ -158,21 +158,24 @@ abstract public class Contribution { } - // "1.0.2" + // "1.0.2" or null if not present public String getPrettyVersion() { return prettyVersion; } + // 1402805757 public long getLastUpdated() { return lastUpdated; } + // 0 public int getMinRevision() { return minRevision; } + // 227 public int getMaxRevision() { return maxRevision; diff --git a/app/src/processing/app/contrib/DetailPanel.java b/app/src/processing/app/contrib/DetailPanel.java index 1df2f7a78..4cf327165 100644 --- a/app/src/processing/app/contrib/DetailPanel.java +++ b/app/src/processing/app/contrib/DetailPanel.java @@ -461,7 +461,7 @@ class DetailPanel extends JPanel { desc.append(" "); String version = contrib.getPrettyVersion(); - if (version != null && !version.equals("null")) { + if (version != null) { desc.append(version); } desc.append("
"); diff --git a/app/src/processing/app/contrib/StatusPanel.java b/app/src/processing/app/contrib/StatusPanel.java index 93a8a3772..a048be660 100644 --- a/app/src/processing/app/contrib/StatusPanel.java +++ b/app/src/processing/app/contrib/StatusPanel.java @@ -265,14 +265,14 @@ class StatusPanel extends JPanel { updateLabel.setText("Available"); } } else { - if (currentVersion != null && !currentVersion.equals("null")) { + if (currentVersion != null) { updateLabel.setText(currentVersion + " installed"); } else { updateLabel.setText("Installed"); } } } else { - if (currentVersion != null && !currentVersion.equals("null")) { + if (currentVersion != null) { updateLabel.setText(currentVersion + " not compatible"); } else { updateLabel.setText("Not compatible"); diff --git a/todo.txt b/todo.txt index cbb09c0d9..b31d34071 100755 --- a/todo.txt +++ b/todo.txt @@ -39,6 +39,10 @@ X Chinese translation updates X https://github.com/processing/processing/pull/4661 X Spanish translation updates X https://github.com/processing/processing/pull/4697 +X Spanish "open sketch folder" fix +X https://github.com/processing/processing/pull/4710 +X Contribution Manager showing 'null' for PeasyCam version +X https://github.com/processing/processing/pull/4712 _ clicking "Update" button in contrib manager shows non-retina version of icon