Merge pull request #3805 from Akarshit/master

Update to a incompatible version is not possible
This commit is contained in:
Ben Fry
2015-09-16 14:45:53 -04:00
2 changed files with 12 additions and 10 deletions

View File

@@ -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;
}

View File

@@ -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);