Skip to content

Commit d2e4d76

Browse files
cmagliecmaglie
committed
Cumulative patch for MSFT Store hot-fix release
The following commits have been added here: - 4286522: Library manager: update filters combo box only if there are changes - 3263967: Removed unused include and clueless whitespaces - b66ed5e: LibraryManager: correctly apply "type" and "category" filters together - 1361bce: Board manager: Update filters UI only if categories changes - a81772a: Boards Manager: update UI after an install/remove - 851b5b1: Lib manager GUI is updated after installing/upgrading library - 10bee20: Lib manager: added getContribModel() as in Boards manager
1 parent 5adf408 commit d2e4d76

File tree

4 files changed

+69
-50
lines changed

4 files changed

+69
-50
lines changed

‎app/src/cc/arduino/contributions/libraries/ui/LibraryManagerUI.java‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
import java.awt.Frame;
3636
import java.awt.event.ActionEvent;
3737
import java.awt.event.ActionListener;
38+
import java.util.ArrayList;
3839
import java.util.Collection;
3940
import java.util.Collections;
4041
import java.util.LinkedList;
4142
import java.util.List;
4243
import java.util.Optional;
43-
import java.util.function.Predicate;
4444

4545
import javax.swing.Box;
4646
import javax.swing.JComboBox;
@@ -66,13 +66,16 @@ public class LibraryManagerUI extends InstallerJDialog<ContributedLibraryRelease
6666

6767
private final JComboBox typeChooser;
6868
private final LibraryInstaller installer;
69-
private Predicate<ContributedLibraryReleases> typeFilter;
7069

7170
@Override
7271
protected FilteredAbstractTableModel createContribModel() {
7372
return new LibrariesIndexTableModel();
7473
}
7574

75+
private LibrariesIndexTableModel getContribModel() {
76+
return (LibrariesIndexTableModel) contribModel;
77+
}
78+
7679
@Override
7780
protected TableCellRenderer createCellRenderer() {
7881
return new ContributedLibraryTableCellRenderer();
@@ -115,63 +118,60 @@ public LibraryManagerUI(Frame parent, LibraryInstaller installer) {
115118
}
116119

117120
protected final ActionListener typeChooserActionListener = new ActionListener() {
118-
119121
@Override
120122
public void actionPerformed(ActionEvent event) {
121123
DropdownItem<ContributedLibraryReleases> selected = (DropdownItem<ContributedLibraryReleases>) typeChooser.getSelectedItem();
122124
previousRowAtPoint = -1;
123-
if (selected != null && typeFilter != selected.getFilterPredicate()) {
124-
typeFilter = selected.getFilterPredicate();
125+
if (selected != null && extraFilter != selected.getFilterPredicate()) {
126+
extraFilter = selected.getFilterPredicate();
125127
if (contribTable.getCellEditor() != null) {
126128
contribTable.getCellEditor().stopCellEditing();
127129
}
128-
updateIndexFilter(filters, categoryFilter.and(typeFilter));
130+
updateIndexFilter(filters, categoryFilter.and(extraFilter));
129131
}
130132
}
131133
};
132134

135+
private Collection<String> oldCategories = new ArrayList<>();
136+
private Collection<String> oldTypes = new ArrayList<>();
137+
133138
public void updateUI() {
134-
DropdownItem<ContributedLibraryReleases> previouslySelectedCategory = (DropdownItem<ContributedLibraryReleases>) categoryChooser.getSelectedItem();
135-
DropdownItem<ContributedLibraryReleases> previouslySelectedType = (DropdownItem<ContributedLibraryReleases>) typeChooser.getSelectedItem();
139+
// Check if categories or types have changed
140+
Collection<String> categories = BaseNoGui.librariesIndexer.getIndex().getCategories();
141+
List<String> types = new LinkedList<>(BaseNoGui.librariesIndexer.getIndex().getTypes());
142+
Collections.sort(types, new LibraryTypeComparator());
136143

137-
categoryChooser.removeActionListener(categoryChooserActionListener);
138-
typeChooser.removeActionListener(typeChooserActionListener);
144+
if (categories.equals(oldCategories) && types.equals(oldTypes)) {
145+
return;
146+
}
147+
oldCategories = categories;
148+
oldTypes = types;
139149

140150
// Load categories
141151
categoryFilter = x -> true;
152+
categoryChooser.removeActionListener(categoryChooserActionListener);
142153
categoryChooser.removeAllItems();
143154
categoryChooser.addItem(new DropdownAllLibraries());
144-
Collection<String> categories = BaseNoGui.librariesIndexer.getIndex().getCategories();
145155
for (String category : categories) {
146156
categoryChooser.addItem(new DropdownLibraryOfCategoryItem(category));
147157
}
148-
149158
categoryChooser.setEnabled(categoryChooser.getItemCount() > 1);
150-
151159
categoryChooser.addActionListener(categoryChooserActionListener);
152-
if (previouslySelectedCategory != null) {
153-
categoryChooser.setSelectedItem(previouslySelectedCategory);
154-
} else {
155-
categoryChooser.setSelectedIndex(0);
156-
}
160+
categoryChooser.setSelectedIndex(0);
157161

158-
typeFilter = x -> true;
162+
// Load types
163+
extraFilter = x -> true;
164+
typeChooser.removeActionListener(typeChooserActionListener);
159165
typeChooser.removeAllItems();
160166
typeChooser.addItem(new DropdownAllLibraries());
161167
typeChooser.addItem(new DropdownUpdatableLibrariesItem());
162168
typeChooser.addItem(new DropdownInstalledLibraryItem());
163-
List<String> types = new LinkedList<>(BaseNoGui.librariesIndexer.getIndex().getTypes());
164-
Collections.sort(types, new LibraryTypeComparator());
165169
for (String type : types) {
166170
typeChooser.addItem(new DropdownLibraryOfTypeItem(type));
167171
}
168172
typeChooser.setEnabled(typeChooser.getItemCount() > 1);
169173
typeChooser.addActionListener(typeChooserActionListener);
170-
if (previouslySelectedType != null) {
171-
typeChooser.setSelectedItem(previouslySelectedType);
172-
} else {
173-
typeChooser.setSelectedIndex(0);
174-
}
174+
typeChooser.setSelectedIndex(0);
175175

176176
filterField.setEnabled(contribModel.getRowCount() > 0);
177177
}
@@ -201,8 +201,11 @@ protected void onUpdatePressed() {
201201
try {
202202
setProgressVisible(true, "");
203203
installer.updateIndex(this::setProgress);
204-
((LibrariesIndexTableModel) contribModel).update();
205204
onIndexesUpdated();
205+
if (contribTable.getCellEditor() != null) {
206+
contribTable.getCellEditor().stopCellEditing();
207+
}
208+
getContribModel().update();
206209
} catch (Exception e) {
207210
throw new RuntimeException(e);
208211
} finally {
@@ -238,12 +241,11 @@ public void onInstallPressed(final ContributedLibrary lib) {
238241
} else {
239242
installer.install(lib, this::setProgress);
240243
}
241-
// TODO: Do a better job in refreshing only the needed element
244+
onIndexesUpdated();
242245
if (contribTable.getCellEditor() != null) {
243246
contribTable.getCellEditor().stopCellEditing();
244247
}
245-
((LibrariesIndexTableModel) contribModel).update();
246-
onIndexesUpdated();
248+
getContribModel().update();
247249
} catch (Exception e) {
248250
throw new RuntimeException(e);
249251
} finally {
@@ -270,12 +272,11 @@ public void onRemovePressed(final ContributedLibrary lib) {
270272
try {
271273
setProgressVisible(true, tr("Removing..."));
272274
installer.remove(lib, this::setProgress);
273-
// TODO: Do a better job in refreshing only the needed element
275+
onIndexesUpdated();
274276
if (contribTable.getCellEditor() != null) {
275277
contribTable.getCellEditor().stopCellEditing();
276278
}
277-
((LibrariesIndexTableModel) contribModel).update();
278-
onIndexesUpdated();
279+
getContribModel().update();
279280
} catch (Exception e) {
280281
throw new RuntimeException(e);
281282
} finally {

‎app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,17 @@ public class ContributionIndexTableModel
4747
private final List<ContributedPlatformReleases> contributions = new ArrayList<>();
4848
private final String[] columnNames = { "Description" };
4949
private final Class<?>[] columnTypes = { ContributedPlatform.class };
50+
private Predicate<ContributedPlatform> filter;
51+
private String[] filters;
5052

5153
public void updateIndexFilter(String[] filters,
5254
Predicate<ContributedPlatform> filter) {
55+
this.filter = filter;
56+
this.filters = filters;
57+
updateContributions();
58+
}
59+
60+
private void updateContributions() {
5361
contributions.clear();
5462
for (ContributedPackage pack : BaseNoGui.indexer.getPackages()) {
5563
for (ContributedPlatform platform : pack.getPlatforms()) {
@@ -146,6 +154,7 @@ public ContributedPlatform getSelectedRelease(int row) {
146154
}
147155

148156
public void update() {
157+
updateContributions();
149158
fireTableDataChanged();
150159
}
151160

‎app/src/cc/arduino/contributions/packages/ui/ContributionManagerUI.java‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
package cc.arduino.contributions.packages.ui;
3131

32-
import cc.arduino.contributions.DownloadableContribution;
3332
import cc.arduino.contributions.packages.ContributedPlatform;
3433
import cc.arduino.contributions.packages.ContributionInstaller;
3534
import cc.arduino.contributions.ui.*;
@@ -41,6 +40,7 @@
4140
import javax.swing.table.TableCellRenderer;
4241

4342
import java.awt.*;
43+
import java.util.ArrayList;
4444
import java.util.Collection;
4545
import java.util.LinkedList;
4646
import java.util.List;
@@ -92,30 +92,28 @@ public ContributionManagerUI(Frame parent, ContributionInstaller installer) {
9292
this.installer = installer;
9393
}
9494

95+
private Collection<String> oldCategories = new ArrayList<>();
96+
9597
public void updateUI() {
96-
DropdownItem<DownloadableContribution> previouslySelectedCategory = (DropdownItem<DownloadableContribution>) categoryChooser
97-
.getSelectedItem();
98+
// Check if categories have changed
99+
Collection<String> categories = BaseNoGui.indexer.getCategories();
100+
if (categories.equals(oldCategories)) {
101+
return;
102+
}
103+
oldCategories = categories;
98104

99105
categoryChooser.removeActionListener(categoryChooserActionListener);
100-
101-
filterField.setEnabled(getContribModel().getRowCount() > 0);
102-
103-
categoryChooser.addActionListener(categoryChooserActionListener);
104-
105106
// Enable categories combo only if there are two or more choices
107+
filterField.setEnabled(getContribModel().getRowCount() > 0);
106108
categoryFilter = x -> true;
107109
categoryChooser.removeAllItems();
108110
categoryChooser.addItem(new DropdownAllCoresItem());
109111
categoryChooser.addItem(new DropdownUpdatableCoresItem());
110-
Collection<String> categories = BaseNoGui.indexer.getCategories();
111112
for (String s : categories) {
112113
categoryChooser.addItem(new DropdownCoreOfCategoryItem(s));
113114
}
114-
if (previouslySelectedCategory != null) {
115-
categoryChooser.setSelectedItem(previouslySelectedCategory);
116-
} else {
117-
categoryChooser.setSelectedIndex(0);
118-
}
115+
categoryChooser.addActionListener(categoryChooserActionListener);
116+
categoryChooser.setSelectedIndex(0);
119117
}
120118

121119
public void setProgress(Progress progress) {
@@ -146,6 +144,10 @@ public void onUpdatePressed() {
146144
.updateIndex(this::setProgress);
147145
installer.deleteUnknownFiles(downloadedPackageIndexFiles);
148146
onIndexesUpdated();
147+
if (contribTable.getCellEditor() != null) {
148+
contribTable.getCellEditor().stopCellEditing();
149+
}
150+
getContribModel().update();
149151
} catch (Exception e) {
150152
throw new RuntimeException(e);
151153
} finally {
@@ -171,6 +173,10 @@ public void onInstallPressed(final ContributedPlatform platformToInstall,
171173
}
172174
errors.addAll(installer.install(platformToInstall, this::setProgress));
173175
onIndexesUpdated();
176+
if (contribTable.getCellEditor() != null) {
177+
contribTable.getCellEditor().stopCellEditing();
178+
}
179+
getContribModel().update();
174180
} catch (Exception e) {
175181
throw new RuntimeException(e);
176182
} finally {
@@ -209,6 +215,10 @@ public void onRemovePressed(final ContributedPlatform platform,
209215
setProgressVisible(true, tr("Removing..."));
210216
installer.remove(platform);
211217
onIndexesUpdated();
218+
if (contribTable.getCellEditor() != null) {
219+
contribTable.getCellEditor().stopCellEditing();
220+
}
221+
getContribModel().update();
212222
} catch (Exception e) {
213223
throw new RuntimeException(e);
214224
} finally {

‎app/src/cc/arduino/contributions/ui/InstallerJDialog.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171

7272
import cc.arduino.contributions.ui.listeners.AbstractKeyListener;
7373
import processing.app.Base;
74-
import processing.app.Theme;
7574

7675
public abstract class InstallerJDialog<T> extends JDialog {
7776

@@ -82,6 +81,7 @@ public abstract class InstallerJDialog<T> extends JDialog {
8281
protected final FilterJTextField filterField;
8382
protected final JPanel filtersContainer;
8483
// Currently selected category and filters
84+
protected Predicate<T> extraFilter = x -> true;
8585
protected Predicate<T> categoryFilter;
8686
protected String[] filters;
8787
protected final String noConnectionErrorMessage;
@@ -329,7 +329,6 @@ private void setErrorMessageVisible(boolean visible) {
329329
}
330330

331331
protected final ActionListener categoryChooserActionListener = new ActionListener() {
332-
333332
@Override
334333
public void actionPerformed(ActionEvent event) {
335334
DropdownItem<T> selected = (DropdownItem<T>) categoryChooser.getSelectedItem();
@@ -339,7 +338,7 @@ public void actionPerformed(ActionEvent event) {
339338
if (contribTable.getCellEditor() != null) {
340339
contribTable.getCellEditor().stopCellEditing();
341340
}
342-
updateIndexFilter(filters, categoryFilter);
341+
updateIndexFilter(filters, categoryFilter.and(extraFilter));
343342
}
344343
}
345344
};

0 commit comments

Comments
 (0)