diff options
Diffstat (limited to 'dozentenmodul')
8 files changed, 25 insertions, 119 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java index 82b3e26e..1d9b8571 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java @@ -3,9 +3,6 @@ package org.openslx.dozmod.gui.control; import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; @@ -15,22 +12,20 @@ import javax.swing.BoxLayout; import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.JScrollPane; import javax.swing.JTextField; import javax.swing.RowFilter; import javax.swing.UIManager; import javax.swing.border.TitledBorder; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; import org.apache.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageSummaryRead; import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.control.table.ImageTable; -import org.openslx.dozmod.gui.control.table.QScrollPane; import org.openslx.dozmod.gui.control.table.ListTable.ListModel; +import org.openslx.dozmod.gui.control.table.QScrollPane; import org.openslx.dozmod.gui.helper.GridManager; +import org.openslx.dozmod.gui.helper.TextChangeListener; import org.openslx.dozmod.permissions.ImagePerms; import org.openslx.dozmod.thrift.Session; import org.openslx.dozmod.thrift.ThriftActions; @@ -155,19 +150,9 @@ public class ImageListViewer extends QLabel { * ActionListeners */ // filter the objects in the table depending on the search field - searchTextField.getDocument().addDocumentListener(new DocumentListener() { - @Override - public void removeUpdate(DocumentEvent e) { - changedUpdate(e); - } - - @Override - public void insertUpdate(DocumentEvent e) { - changedUpdate(e); - } - + searchTextField.getDocument().addDocumentListener(new TextChangeListener() { @Override - public void changedUpdate(DocumentEvent e) { + public void changed() { String str = searchTextField.getText(); if (str == null || str.isEmpty()) { searchFieldPattern = null; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/QDatePickerImpl.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/QDatePickerImpl.java index 3bd0745a..08f90145 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/QDatePickerImpl.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/QDatePickerImpl.java @@ -8,13 +8,12 @@ import java.util.Set; import javax.swing.JButton; import javax.swing.JFormattedTextField.AbstractFormatter; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; import javax.swing.JTextField; import org.apache.log4j.Logger; import org.jdatepicker.impl.JDatePanelImpl; import org.jdatepicker.impl.JDatePickerImpl; +import org.openslx.dozmod.gui.helper.TextChangeListener; @SuppressWarnings("serial") public class QDatePickerImpl extends JDatePickerImpl { @@ -62,19 +61,9 @@ public class QDatePickerImpl extends JDatePickerImpl { pickButton = button; displayTextField = textField; if (displayTextField != null) { - displayTextField.getDocument().addDocumentListener(new DocumentListener() { + displayTextField.getDocument().addDocumentListener(new TextChangeListener() { @Override - public void removeUpdate(DocumentEvent e) { - fireChangeEvent(); - } - - @Override - public void insertUpdate(DocumentEvent e) { - fireChangeEvent(); - } - - @Override - public void changedUpdate(DocumentEvent e) { + public void changed() { fireChangeEvent(); } }); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java index 52fe9279..05120831 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java @@ -25,8 +25,6 @@ import javax.swing.JOptionPane; import javax.swing.KeyStroke; import javax.swing.ListSelectionModel; import javax.swing.SwingUtilities; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; import org.apache.log4j.Logger; import org.apache.thrift.TException; @@ -44,6 +42,7 @@ import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.MainWindow; import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.gui.helper.PopupMenu; +import org.openslx.dozmod.gui.helper.TextChangeListener; import org.openslx.dozmod.gui.helper.UiFeedback; import org.openslx.dozmod.gui.window.UserListWindow.UserAddedCallback; import org.openslx.dozmod.gui.window.layout.ImageDetailsWindowLayout; @@ -290,19 +289,9 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe versionTable.addMouseListener(ma); // listen to changes - final DocumentListener docListener = new DocumentListener() { + final TextChangeListener docListener = new TextChangeListener() { @Override - public void removeUpdate(DocumentEvent e) { - changedUpdate(e); - } - - @Override - public void insertUpdate(DocumentEvent e) { - changedUpdate(e); - } - - @Override - public void changedUpdate(DocumentEvent e) { + public void changed() { reactToChange(); } }; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java index a4043e75..46ff6c0f 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java @@ -24,8 +24,6 @@ import javax.swing.JFrame; import javax.swing.JOptionPane; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; import org.apache.log4j.Logger; import org.apache.thrift.TException; @@ -40,6 +38,7 @@ import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.MainWindow; import org.openslx.dozmod.gui.helper.DateTimeHelper; import org.openslx.dozmod.gui.helper.MessageType; +import org.openslx.dozmod.gui.helper.TextChangeListener; import org.openslx.dozmod.gui.helper.UiFeedback; import org.openslx.dozmod.gui.window.UserListWindow.UserAddedCallback; import org.openslx.dozmod.gui.window.layout.LectureDetailsWindowLayout; @@ -205,19 +204,9 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements }); // final step, add listeners to react to change - final DocumentListener docListener = new DocumentListener() { + final TextChangeListener docListener = new TextChangeListener() { @Override - public void removeUpdate(DocumentEvent e) { - changedUpdate(e); - } - - @Override - public void insertUpdate(DocumentEvent e) { - changedUpdate(e); - } - - @Override - public void changedUpdate(DocumentEvent e) { + public void changed() { reactToChange(); } }; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java index a1591370..d81ed319 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java @@ -24,8 +24,6 @@ import javax.swing.ListSelectionModel; import javax.swing.RowFilter; import javax.swing.SwingUtilities; import javax.swing.UIManager; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; @@ -39,6 +37,7 @@ import org.openslx.dozmod.gui.MainWindow; import org.openslx.dozmod.gui.control.table.ListTable.ListModel; import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.gui.helper.PopupMenu; +import org.openslx.dozmod.gui.helper.TextChangeListener; import org.openslx.dozmod.gui.window.LectureDetailsWindow.LectureUpdatedCallback; import org.openslx.dozmod.gui.window.layout.LectureListWindowLayout; import org.openslx.dozmod.gui.wizard.LectureWizard; @@ -147,20 +146,9 @@ public class LectureListWindow extends LectureListWindowLayout { lectureTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); // filter the objects in the table depending on the search field - searchTextField.getDocument().addDocumentListener(new DocumentListener() { + searchTextField.getDocument().addDocumentListener(new TextChangeListener() { @Override - public void removeUpdate(DocumentEvent e) { - changedUpdate(e); - } - - @Override - public void insertUpdate(DocumentEvent e) { - changedUpdate(e); - } - - @Override - public void changedUpdate(DocumentEvent e) { - // stuff + public void changed() { String str = searchTextField.getText(); if (str == null || str.isEmpty()) { searchFieldPattern = null; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java index ba714cf3..c24af053 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java @@ -14,12 +14,11 @@ import java.util.List; import javax.swing.JTable; import javax.swing.RowFilter; import javax.swing.UIManager; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; import org.apache.log4j.Logger; import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.dozmod.gui.Gui; +import org.openslx.dozmod.gui.helper.TextChangeListener; import org.openslx.dozmod.gui.helper.UiFeedback; import org.openslx.dozmod.gui.window.layout.UserListWindowLayout; import org.openslx.dozmod.thrift.cache.UserCache; @@ -78,19 +77,9 @@ public class UserListWindow extends UserListWindowLayout implements UiFeedback { }); // filter the objects in the table depending on the search field - searchUserField.getDocument().addDocumentListener(new DocumentListener() { + searchUserField.getDocument().addDocumentListener(new TextChangeListener() { @Override - public void removeUpdate(DocumentEvent e) { - changedUpdate(e); - } - - @Override - public void insertUpdate(DocumentEvent e) { - changedUpdate(e); - } - - @Override - public void changedUpdate(DocumentEvent e) { + public void changed() { try { userTable.getRowSorter().setRowFilter( RowFilter.regexFilter("(?i)" + searchUserField.getText())); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java index 6645e388..4e87038e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java @@ -4,13 +4,11 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.util.List; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; - import org.apache.log4j.Logger; import org.openslx.bwlp.thrift.iface.OperatingSystem; import org.openslx.bwlp.thrift.iface.ShareMode; import org.openslx.dozmod.gui.Gui; +import org.openslx.dozmod.gui.helper.TextChangeListener; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.layout.ImageMetaDataPageLayout; import org.openslx.dozmod.state.UploadWizardState; @@ -63,19 +61,9 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout { } }); - descriptionText.getDocument().addDocumentListener(new DocumentListener() { - @Override - public void removeUpdate(DocumentEvent e) { - changedUpdate(e); - } - - @Override - public void insertUpdate(DocumentEvent e) { - changedUpdate(e); - } - + descriptionText.getDocument().addDocumentListener(new TextChangeListener() { @Override - public void changedUpdate(DocumentEvent e) { + public void changed() { reactToUserInput(); } }); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java index 3e603935..c3039fcd 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java @@ -6,11 +6,10 @@ import java.util.Date; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; import org.apache.log4j.Logger; import org.openslx.dozmod.gui.helper.DateTimeHelper; +import org.openslx.dozmod.gui.helper.TextChangeListener; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.layout.LectureCreationPageLayout; import org.openslx.dozmod.state.LectureWizardState; @@ -36,19 +35,9 @@ public class LectureCreationPage extends LectureCreationPageLayout { this.state = state; // listener for the text fields - final DocumentListener docListener = new DocumentListener() { + final TextChangeListener docListener = new TextChangeListener() { @Override - public void removeUpdate(DocumentEvent e) { - changedUpdate(e); - } - - @Override - public void insertUpdate(DocumentEvent e) { - changedUpdate(e); - } - - @Override - public void changedUpdate(DocumentEvent e) { + public void changed() { reactToUserInput(); } }; |