From b64366cb97b9e6b56c3d8c6281ccf56af9bfc491 Mon Sep 17 00:00:00 2001 From: Akarshit Wal Date: Wed, 16 Sep 2015 22:55:42 +0530 Subject: [PATCH] Revert "Update to a incompatible version is not possible" This reverts commit 4ecacefbded0bec10489a03b78ea84a31211d2a4. --- .../app/contrib/ContributionListing.java | 3 +-- .../processing/app/contrib/StatusPanel.java | 19 +++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/src/processing/app/contrib/ContributionListing.java b/app/src/processing/app/contrib/ContributionListing.java index 828272d06..ba2c3da1f 100644 --- a/app/src/processing/app/contrib/ContributionListing.java +++ b/app/src/processing/app/contrib/ContributionListing.java @@ -515,8 +515,7 @@ public class ContributionListing { if (advertised == null) { return false; } - return advertised.getVersion() > contribution.getVersion() - && advertised.isCompatible(Base.getRevision()); + return advertised.getVersion() > contribution.getVersion(); } return false; } diff --git a/app/src/processing/app/contrib/StatusPanel.java b/app/src/processing/app/contrib/StatusPanel.java index a53777ac6..1f011007d 100644 --- a/app/src/processing/app/contrib/StatusPanel.java +++ b/app/src/processing/app/contrib/StatusPanel.java @@ -238,16 +238,6 @@ 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 { @@ -264,6 +254,15 @@ 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);