From a7e22e1958bd675a427f9802725b39732feeb0ac Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Tue, 29 Dec 2015 15:58:49 +0100 Subject: [PATCH] Some minor cosmetics --- .../ui/LibrariesIndexTableModel.java | 25 +++--- .../ui/ContributedPlatformTableCell.java | 2 +- .../ContributedPlatformTableCellEditor.java | 82 +++++++++---------- .../ui/ContributionIndexTableModel.java | 21 ++--- 4 files changed, 66 insertions(+), 64 deletions(-) diff --git a/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java b/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java index 63d515711..40bd655ad 100644 --- a/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java +++ b/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java @@ -41,19 +41,20 @@ import java.util.function.Predicate; import java.util.stream.Stream; @SuppressWarnings("serial") -public class LibrariesIndexTableModel extends FilteredAbstractTableModel { - +public class LibrariesIndexTableModel + extends FilteredAbstractTableModel { private final List contributions = new ArrayList<>(); - private final String[] columnNames = {"Description"}; + private final String[] columnNames = { "Description" }; - private final Class[] columnTypes = {ContributedPlatform.class}; + private final Class[] columnTypes = { ContributedPlatform.class }; Predicate selectedCategoryFilter = null; String selectedFilters[] = null; - public void updateIndexFilter(String filters[], Stream> additionalFilters) { + public void updateIndexFilter(String filters[], + Stream> additionalFilters) { selectedCategoryFilter = additionalFilters.reduce(Predicate::and).get(); selectedFilters = filters; update(); @@ -66,7 +67,7 @@ public class LibrariesIndexTableModel extends FilteredAbstractTableModeltrue if all the strings in set are contained in - * string. + * string. */ private boolean stringContainsAll(String string, String filters[]) { if (string == null) { @@ -154,7 +155,8 @@ public class LibrariesIndexTableModel extends FilteredAbstractTableModel onInstall(editorValue.getSelected(), - editorValue.getInstalled())); - editorCell.removeButton - .addActionListener(e -> onRemove(editorValue.getInstalled())); - editorCell.downgradeButton.addActionListener(e -> { - ContributedPlatform selected = (ContributedPlatform) editorCell.downgradeChooser + value = (ContributedPlatformReleases) _value; + + cell = new ContributedPlatformTableCell(); + cell.installButton.addActionListener(e -> onInstall(value.getSelected(), + value.getInstalled())); + cell.removeButton.addActionListener(e -> onRemove(value.getInstalled())); + cell.downgradeButton.addActionListener(e -> { + ContributedPlatform selected = (ContributedPlatform) cell.downgradeChooser .getSelectedItem(); - onInstall(selected, editorValue.getInstalled()); + onInstall(selected, value.getInstalled()); }); - editorCell.versionToInstallChooser.addItemListener(e -> editorValue - .select((ContributedPlatform) editorCell.versionToInstallChooser + cell.versionToInstallChooser.addItemListener(e -> value + .select((ContributedPlatform) cell.versionToInstallChooser .getSelectedItem())); - editorValue = (ContributedPlatformReleases) value; setEnabled(true); - final ContributedPlatform installed = editorValue.getInstalled(); + final ContributedPlatform installed = value.getInstalled(); - java.util.List releases = new LinkedList<>( - editorValue.releases); - java.util.List uninstalledReleases = releases.stream() + List releases = new LinkedList<>(value.releases); + List uninstalledReleases = releases.stream() .filter(new InstalledPredicate().negate()).collect(Collectors.toList()); - java.util.List installedBuiltIn = releases.stream() + List installedBuiltIn = releases.stream() .filter(new InstalledPredicate()).filter(new BuiltInPredicate()) .collect(Collectors.toList()); @@ -98,11 +97,11 @@ public class ContributedPlatformTableCellEditor extends InstallerTableCell { Collections.sort(uninstalledReleases, new ReverseComparator<>( new DownloadableContributionVersionComparator())); - editorCell.downgradeChooser.removeAllItems(); - editorCell.downgradeChooser.addItem(tr("Select version")); + cell.downgradeChooser.removeAllItems(); + cell.downgradeChooser.addItem(tr("Select version")); - final java.util.List uninstalledPreviousReleases = new LinkedList<>(); - final java.util.List uninstalledNewerReleases = new LinkedList<>(); + final List uninstalledPreviousReleases = new LinkedList<>(); + final List uninstalledNewerReleases = new LinkedList<>(); final VersionComparator versionComparator = new VersionComparator(); uninstalledReleases.stream().forEach(input -> { @@ -114,35 +113,32 @@ public class ContributedPlatformTableCellEditor extends InstallerTableCell { uninstalledNewerReleases.add(input); } }); - uninstalledNewerReleases.forEach(editorCell.downgradeChooser::addItem); - uninstalledPreviousReleases.forEach(editorCell.downgradeChooser::addItem); + uninstalledNewerReleases.forEach(cell.downgradeChooser::addItem); + uninstalledPreviousReleases.forEach(cell.downgradeChooser::addItem); - editorCell.downgradeChooser - .setVisible(installed != null - && (!uninstalledPreviousReleases.isEmpty() - || uninstalledNewerReleases.size() > 1)); - editorCell.downgradeButton - .setVisible(installed != null - && (!uninstalledPreviousReleases.isEmpty() - || uninstalledNewerReleases.size() > 1)); + boolean downgradeVisible = installed != null + && (!uninstalledPreviousReleases.isEmpty() + || uninstalledNewerReleases.size() > 1); + cell.downgradeChooser.setVisible(downgradeVisible); + cell.downgradeButton.setVisible(downgradeVisible); - editorCell.versionToInstallChooser.removeAllItems(); - uninstalledReleases.forEach(editorCell.versionToInstallChooser::addItem); - editorCell.versionToInstallChooser + cell.versionToInstallChooser.removeAllItems(); + uninstalledReleases.forEach(cell.versionToInstallChooser::addItem); + cell.versionToInstallChooser .setVisible(installed == null && uninstalledReleases.size() > 1); - editorCell.update(table, value, true, !installedBuiltIn.isEmpty()); - editorCell.setBackground(new Color(218, 227, 227)); // #dae3e3 - return editorCell; + cell.update(table, _value, true, !installedBuiltIn.isEmpty()); + cell.setBackground(new Color(218, 227, 227)); // #dae3e3 + return cell; } @Override public void setEnabled(boolean enabled) { - editorCell.setButtonsVisible(enabled); + cell.setButtonsVisible(enabled); } public void setStatus(String status) { - editorCell.statusLabel.setText(status); + cell.statusLabel.setText(status); } protected void onRemove(ContributedPlatform contributedPlatform) { diff --git a/app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java b/app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java index e186fc95a..283df1067 100644 --- a/app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java +++ b/app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java @@ -29,8 +29,6 @@ package cc.arduino.contributions.packages.ui; -import cc.arduino.contributions.DownloadableContributionBuiltInAtTheBottomComparator; -import cc.arduino.contributions.filters.InstalledPredicate; import cc.arduino.contributions.packages.ContributedBoard; import cc.arduino.contributions.packages.ContributedPackage; import cc.arduino.contributions.packages.ContributedPlatform; @@ -48,17 +46,20 @@ public class ContributionIndexTableModel extends FilteredAbstractTableModel { private final List contributions = new ArrayList<>(); + private final String[] columnNames = { "Description" }; + private final Class[] columnTypes = { ContributedPlatform.class }; - private final String[] columnNames = {"Description"}; - - private final Class[] columnTypes = {ContributedPlatform.class}; - - public void updateIndexFilter(String[] filters, Stream> additionalFilters) { + public void updateIndexFilter(String[] filters, + Stream> additionalFilters) { contributions.clear(); - Predicate filter = additionalFilters.reduce(Predicate::and).get(); + Predicate filter = additionalFilters + .reduce(Predicate::and).get(); for (ContributedPackage pack : BaseNoGui.indexer.getPackages()) { for (ContributedPlatform platform : pack.getPlatforms()) { - String compoundTargetSearchText = platform.getName() + "\n" + platform.getBoards().stream().map(ContributedBoard::getName).collect(Collectors.joining(" ")); + String compoundTargetSearchText = platform.getName() + "\n" + + platform.getBoards().stream() + .map(ContributedBoard::getName) + .collect(Collectors.joining(" ")); if (!filter.test(platform)) { continue; } @@ -77,7 +78,7 @@ public class ContributionIndexTableModel * @param string * @param set * @return true if all the strings in set are contained in - * string. + * string. */ private boolean stringContainsAll(String string, String set[]) { if (set == null)