TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-30 08:23:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor refactoring of InsertHistory.java.

Browse Source
This commit is contained in:
helmut.neemann 2017-03-28 11:41:51 +02:00
parent 0227c0f318
commit 0ab7b3b9e7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/de/neemann/digital/gui/InsertHistory.java
View File

@ -16,7 +16,6 @@ import java.util.Iterator;
* @author hneemann * @author hneemann
*/ */
public class InsertHistory implements LibraryListener { public class InsertHistory implements LibraryListener {
private static final int MAX_ICONS = 6; private static final int MAX_ICONS = 6;
private final JToolBar bar; private final JToolBar bar;
private final ElementLibrary library; private final ElementLibrary library;
@ -48,13 +47,13 @@ public class InsertHistory implements LibraryListener {
bar.add(wrapper); bar.add(wrapper);
if (wrappers.size() > MAX_ICONS) { if (wrappers.size() > MAX_ICONS) {
int oldest = findOldestIndex(); int oldest = findOldestIndex();
removeWrapperFromBar(wrappers.get(oldest)); removeWrapperFromToolBar(wrappers.get(oldest));
wrappers.remove(oldest); wrappers.remove(oldest);
} }
} }
} }
private void removeWrapperFromBar(WrapperAction wrapper) { private void removeWrapperFromToolBar(WrapperAction wrapper) {
final int position = wrapper.componentPosition; final int position = wrapper.componentPosition;
bar.remove(position); bar.remove(position);
for (WrapperAction w : wrappers) for (WrapperAction w : wrappers)
@ -85,20 +84,21 @@ public class InsertHistory implements LibraryListener {
@Override @Override
public void libraryChanged(LibraryNode node) { public void libraryChanged(LibraryNode node) {
removeAllCustomComponents(); updateCustomComponents();
} }
/** /**
* remove all custom components * Updates all custom components.
* If the component no longer exists, it is deleted from the history toolbar.
*/ */
private void removeAllCustomComponents() { private void updateCustomComponents() {
Iterator<WrapperAction> it = wrappers.iterator(); Iterator<WrapperAction> it = wrappers.iterator();
while (it.hasNext()) { while (it.hasNext()) {
WrapperAction w = it.next(); WrapperAction w = it.next();
if (w.action.isCustom()) { if (w.action.isCustom()) {
LibraryNode n = library.getElementNodeOrNull(w.action.getName()); LibraryNode n = library.getElementNodeOrNull(w.action.getName());
if (n == null) { // is'nt there, so delete if (n == null) { // is'nt there, so delete
removeWrapperFromBar(w); removeWrapperFromToolBar(w);
it.remove(); it.remove();
} else } else
w.update(n); w.update(n);