From bbc2e2ec2bf07b386dfe2bf3ee978236d43d7f8a Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Mon, 17 Jan 2022 18:22:16 -0500 Subject: [PATCH] minor moving around --- .../app/contrib/ContributionTab.java | 3 +- .../processing/app/contrib/DetailPanel.java | 28 +++++++++++-------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/src/processing/app/contrib/ContributionTab.java b/app/src/processing/app/contrib/ContributionTab.java index 457f23045..4020ea633 100644 --- a/app/src/processing/app/contrib/ContributionTab.java +++ b/app/src/processing/app/contrib/ContributionTab.java @@ -383,8 +383,7 @@ public class ContributionTab extends JPanel { } public void applyFilter() { - String filter = getText(); - filter = filter.toLowerCase(); + String filter = getText().toLowerCase(); // Replace anything but 0-9, a-z, or : with a space filter = filter.replaceAll("[^\\x30-\\x39^\\x61-\\x7a\\x3a]", " "); diff --git a/app/src/processing/app/contrib/DetailPanel.java b/app/src/processing/app/contrib/DetailPanel.java index adb06ca66..0dfae12d6 100644 --- a/app/src/processing/app/contrib/DetailPanel.java +++ b/app/src/processing/app/contrib/DetailPanel.java @@ -186,6 +186,22 @@ class DetailPanel extends JPanel { } + public void remove() { + clearStatusMessage(); + if (contrib.isInstalled() && contrib instanceof LocalContribution) { + removeInProgress = true; + installProgressBar.setVisible(true); + installProgressBar.setIndeterminate(true); + + ContribProgressBar monitor = new RemoveProgressBar(installProgressBar); + getLocalContrib().removeContribution(getBase(), monitor, getStatusPanel()); + } + } + + + // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + class UpdateProgressBar extends ContribProgressBar { public UpdateProgressBar(JProgressBar progressBar) { super(progressBar); @@ -213,17 +229,7 @@ class DetailPanel extends JPanel { } - public void remove() { - clearStatusMessage(); - if (contrib.isInstalled() && contrib instanceof LocalContribution) { - removeInProgress = true; - installProgressBar.setVisible(true); - installProgressBar.setIndeterminate(true); - - ContribProgressBar monitor = new RemoveProgressBar(installProgressBar); - getLocalContrib().removeContribution(getBase(), monitor, getStatusPanel()); - } - } + // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . class RemoveProgressBar extends ContribProgressBar {