From 4ecacefbded0bec10489a03b78ea84a31211d2a4 Mon Sep 17 00:00:00 2001 From: Akarshit Wal Date: Wed, 16 Sep 2015 22:51:34 +0530 Subject: [PATCH] Update to a incompatible version is not possible --- .../app/contrib/ContributionListing.java | 3 ++- .../processing/app/contrib/StatusPanel.java | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/src/processing/app/contrib/ContributionListing.java b/app/src/processing/app/contrib/ContributionListing.java index ba2c3da1f..828272d06 100644 --- a/app/src/processing/app/contrib/ContributionListing.java +++ b/app/src/processing/app/contrib/ContributionListing.java @@ -515,7 +515,8 @@ public class ContributionListing { if (advertised == null) { return false; } - return advertised.getVersion() > contribution.getVersion(); + return advertised.getVersion() > contribution.getVersion() + && advertised.isCompatible(Base.getRevision()); } return false; } diff --git a/app/src/processing/app/contrib/StatusPanel.java b/app/src/processing/app/contrib/StatusPanel.java index 1f011007d..a53777ac6 100644 --- a/app/src/processing/app/contrib/StatusPanel.java +++ b/app/src/processing/app/contrib/StatusPanel.java @@ -238,6 +238,16 @@ class StatusPanel extends JPanel { contributionListing.getLatestVersion(panel.getContrib()); String currentVersion = panel.getContrib().getPrettyVersion(); + installButton.setEnabled(!panel.getContrib().isInstalled() + && contributionListing.hasDownloadedLatestList() + && panel.getContrib().isCompatible(Base.getRevision())); + + if (installButton.isEnabled()) { + updateLabel.setText(latestVersion + " available"); + } else { + updateLabel.setText(currentVersion + " installed"); + } + if (latestVersion != null) { latestVersion = "Update to " + latestVersion; } else { @@ -254,15 +264,6 @@ class StatusPanel extends JPanel { updateButton.setText("Update"); } - installButton.setEnabled(!panel.getContrib().isInstalled() - && contributionListing.hasDownloadedLatestList() - && panel.getContrib().isCompatible(Base.getRevision())); - - if (installButton.isEnabled()) { - updateLabel.setText(currentVersion + " available"); - } else { - updateLabel.setText(currentVersion + " installed"); - } removeButton.setEnabled(panel.getContrib().isInstalled()); progressBarPanel.add(panel.installProgressBar);