~tapaal-contributor/tapaal/autodetect-lens-check2

« back to all changes in this revision

Viewing changes to src/pipe/gui/widgets/QueryPane.java

merged in lp:~yrke/tapaal/evenMore-gui-cleanup doing GUI cleanup and fixing memory access check, about menu in Mac, exception in verification and reenabled quick draw

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
import javax.swing.BorderFactory;
16
16
import javax.swing.DefaultListCellRenderer;
17
17
import javax.swing.DefaultListModel;
18
 
import javax.swing.ImageIcon;
19
18
import javax.swing.JButton;
20
19
import javax.swing.JList;
21
20
import javax.swing.JOptionPane;
25
24
import javax.swing.event.ListDataEvent;
26
25
import javax.swing.event.ListDataListener;
27
26
 
28
 
import dk.aau.cs.gui.TemplateExplorer;
29
27
import dk.aau.cs.gui.undo.MoveElementDownCommand;
30
28
import dk.aau.cs.gui.undo.MoveElementUpCommand;
31
29
import net.tapaal.resourcemanager.ResourceManager;
50
48
 
51
49
        private final JPanel queryCollectionPanel;
52
50
        private final JPanel buttonsPanel;
53
 
        private final DefaultListModel listModel;
 
51
 
 
52
        private final DefaultListModel<TAPNQuery> listModel;
54
53
        private final JList<TAPNQuery> queryList;
55
54
        private List<TAPNQuery> selectedQueries;
56
55
        private JScrollPane queryScroller;
101
100
                        }
102
101
                });
103
102
 
104
 
                queryList = new NonsearchableJList(listModel);
 
103
                queryList = new NonsearchableJList<>(listModel);
105
104
                queryList.setCellRenderer(new QueryCellRenderer());
106
105
                queryList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
107
106
                queryList.addListSelectionListener(e -> {
328
327
                                        q = QueryDialog.showQueryDialogue(QueryDialogueOption.Save, null, tabContent.network(), tabContent.getGuiModels(), tabContent.getLens());
329
328
                                }
330
329
                if(q == null) return;
 
330
 
331
331
                undoManager.addNewEdit(new AddQueryCommand(q, tabContent));
332
332
                addQuery(q);
333
333
 
343
343
        }
344
344
 
345
345
        private void swapQueries(int currentIndex, int newIndex) {
346
 
                TAPNQuery temp = (TAPNQuery)listModel.get(currentIndex);
 
346
                TAPNQuery temp = listModel.get(currentIndex);
347
347
                listModel.set(currentIndex, listModel.get(newIndex));
348
348
                listModel.set(newIndex, temp);
349
349
        }
396
396
                ArrayList<TAPNQuery> queries = new ArrayList<TAPNQuery>();
397
397
 
398
398
                for (int i = 0; i < listModel.size(); ++i) {
399
 
                        queries.add((TAPNQuery) listModel.get(i));
 
399
                        queries.add(listModel.get(i));
400
400
                }
401
401
 
402
402
                return queries;