summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
diff options
context:
space:
mode:
authorNino Breuer2014-10-28 20:02:36 +0100
committerNino Breuer2014-10-28 20:02:36 +0100
commitf1a4b248da7e636a8fb9f2d3001fdd4ba628471c (patch)
tree9d74e7ec861c7c81c0c39a2d07e1b6a41fa94720 /dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
parentMerge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
downloadtutor-module-f1a4b248da7e636a8fb9f2d3001fdd4ba628471c.tar.gz
tutor-module-f1a4b248da7e636a8fb9f2d3001fdd4ba628471c.tar.xz
tutor-module-f1a4b248da7e636a8fb9f2d3001fdd4ba628471c.zip
changed implementation of full text search in some classes
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java')
-rw-r--r--dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java572
1 files changed, 215 insertions, 357 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 5942c49d..403520a0 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -20,6 +20,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -36,7 +37,6 @@ import javax.swing.JPanel;
import javax.swing.JRadioButton;
import javax.swing.JScrollPane;
import javax.swing.JSeparator;
-import javax.swing.JTabbedPane;
import javax.swing.JTable;
import javax.swing.JTextArea;
import javax.swing.JTextField;
@@ -46,8 +46,6 @@ import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.DefaultTableModel;
@@ -63,9 +61,8 @@ import org.apache.thrift.TException;
import server.generated.Server.Client;
import thrift.ThriftConnection;
-import util.GuiOrganizer;
-//import models.person;
import util.OpenLinks;
+//import models.person;
@SuppressWarnings("serial")
public class SearchEditImage_GUI extends JFrame {
@@ -73,8 +70,9 @@ public class SearchEditImage_GUI extends JFrame {
/**
* Logger instance for this class.
*/
- private final static Logger LOGGER = Logger.getLogger(SearchEditImage_GUI.class);
-
+ private final static Logger LOGGER = Logger
+ .getLogger(SearchEditImage_GUI.class);
+
private final JPanel contentPanel = new JPanel();
JLabel labelName;
JLabel labelUpdate;
@@ -100,52 +98,56 @@ public class SearchEditImage_GUI extends JFrame {
Component c = null;
int requiredPermission = 1; // 0=Read, 1= Write, 2=LinkAllowed, 3=Admin
String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung",
- "Verantwortlicher", "Letztes Update", "ID", "Version", "Template" };// Angezeigt
+ "Verantwortlicher", "Letztes Update", "ID", "Version", "Template", "Beschreibung" };// Angezeigt
// werden
// aber
// nur
- // Name (0),
- // OS (2),
- // Verantwortlicher (4),
+ // Name
+ // (0),
+ // OS
+ // (2),
+ // Verantwortlicher
+ // (4),
// Letztes
- // Update (5)
-
- private static final String HELP_MESSAGE = "<html><div align=\"center\">" +
- "Suchen Sie Images und laden Sie sie direkt herunter.<br />" +
- "Sie können die Volltextsuche nutzen und nach Betriebssystemen filtern.<br />" +
- "Die Volltextsuche sucht in den Feldern Name und Beschreibung.<br />" +
- "Klicken Sie auf \"Weiter\" um das Image für weitere Schritte auszuwählen." +
- "</div></html>";
+ // Update
+ // (5)
+
+ private static final String HELP_MESSAGE = "<html><div align=\"center\">"
+ + "Suchen Sie Images und laden Sie sie direkt herunter.<br />"
+ + "Sie können die Volltextsuche nutzen und nach Betriebssystemen filtern.<br />"
+ + "Die Volltextsuche sucht in den Feldern Name und Beschreibung.<br />"
+ + "Klicken Sie auf \"Weiter\" um das Image für weitere Schritte auszuwählen."
+ + "</div></html>";
ThriftConnection con = new ThriftConnection();
Client client = models.Client.clientcon.getClient();
- final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {
- public boolean isCellEditable(int rowIndex, int mColIndex) {
- return false;
- }
- };
+
+
+
final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) {
public boolean isCellEditable(int rowIndex, int mColIndex) {
return false;
}
};
- final DefaultTableModel modelPublicVorlagen = new DefaultTableModel(titles,
- 0) {
- public boolean isCellEditable(int rowIndex, int mColIndex) {
- return false;
- }
- };
- final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
- modelAll);
+
+
final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(
- modelMyImages);
- final TableRowSorter<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(
- modelPublicVorlagen);
+ modelMyImages);
+
+ RowFilter rf = null;
+ List<RowFilter<Object,Object>> filters = new ArrayList<RowFilter<Object,Object>>(2);
+
/**
- * Create the dialog.
+ * Create the dialog.
*/
public SearchEditImage_GUI(Component formerGUI) {
+
+
+ filters.add(RowFilter.regexFilter(".", 0));
+ rf = RowFilter.orFilter(filters);
+
+
addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent arg0) {
@@ -157,15 +159,14 @@ public class SearchEditImage_GUI extends JFrame {
@Override
public void windowOpened(WindowEvent arg0) {
initTableModel(modelMyImages);
- initTableModel(modelAll);
- initTableModel(modelPublicVorlagen);
-
- //auszublendende Angaben
- //1=Lizenzpflichtig
- //3=Veranstaltung
- //6=ID
- //7=Version
- //8=Template
+
+ // auszublendende Angaben
+ // 1=Lizenzpflichtig
+ // 3=Veranstaltung
+ // 6=ID
+ // 7=Version
+ // 8=Template
+ // 9=Beschreibung (needed for full text search)
tablemyImages.getColumnModel().getColumn(1).setWidth(0);
tablemyImages.getColumnModel().getColumn(1).setMinWidth(0);
tablemyImages.getColumnModel().getColumn(1).setMaxWidth(0);
@@ -181,49 +182,10 @@ public class SearchEditImage_GUI extends JFrame {
tablemyImages.getColumnModel().getColumn(7).setWidth(0);
tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);
tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);
- /*
- tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0);
- tablePublicVorlagen.getColumnModel().getColumn(1)
- .setMinWidth(0);
- tablePublicVorlagen.getColumnModel().getColumn(1)
- .setMaxWidth(0);
- tablePublicVorlagen.getColumnModel().getColumn(3).setWidth(0);
- tablePublicVorlagen.getColumnModel().getColumn(3)
- .setMinWidth(0);
- tablePublicVorlagen.getColumnModel().getColumn(3)
- .setMaxWidth(0);
- tablePublicVorlagen.getColumnModel().getColumn(8).setWidth(0);
- tablePublicVorlagen.getColumnModel().getColumn(8)
- .setMinWidth(0);
- tablePublicVorlagen.getColumnModel().getColumn(8)
- .setMaxWidth(0);
- tablePublicVorlagen.getColumnModel().getColumn(6).setWidth(0);
- tablePublicVorlagen.getColumnModel().getColumn(6)
- .setMinWidth(0);
- tablePublicVorlagen.getColumnModel().getColumn(6)
- .setMaxWidth(0);
- tablePublicVorlagen.getColumnModel().getColumn(7).setWidth(0);
- tablePublicVorlagen.getColumnModel().getColumn(7)
- .setMinWidth(0);
- tablePublicVorlagen.getColumnModel().getColumn(7)
- .setMaxWidth(0);
-
- tableAllImages.getColumnModel().getColumn(1).setWidth(0);
- tableAllImages.getColumnModel().getColumn(1).setMinWidth(0);
- tableAllImages.getColumnModel().getColumn(1).setMaxWidth(0);
- tableAllImages.getColumnModel().getColumn(3).setWidth(0);
- tableAllImages.getColumnModel().getColumn(3).setMinWidth(0);
- tableAllImages.getColumnModel().getColumn(3).setMaxWidth(0);
- tableAllImages.getColumnModel().getColumn(8).setWidth(0);
- tableAllImages.getColumnModel().getColumn(8).setMinWidth(0);
- tableAllImages.getColumnModel().getColumn(8).setMaxWidth(0);
- tableAllImages.getColumnModel().getColumn(6).setWidth(0);
- tableAllImages.getColumnModel().getColumn(6).setMinWidth(0);
- tableAllImages.getColumnModel().getColumn(6).setMaxWidth(0);
- tableAllImages.getColumnModel().getColumn(7).setWidth(0);
- tableAllImages.getColumnModel().getColumn(7).setMinWidth(0);
- tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0);
- */
+ tablemyImages.getColumnModel().getColumn(9).setWidth(0);
+ tablemyImages.getColumnModel().getColumn(9).setMinWidth(0);
+ tablemyImages.getColumnModel().getColumn(9).setMaxWidth(0);
+
textFieldName.requestFocusInWindow();
}
});
@@ -235,7 +197,6 @@ public class SearchEditImage_GUI extends JFrame {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (ClassNotFoundException | InstantiationException
| IllegalAccessException | UnsupportedLookAndFeelException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
// Setzt den Fenstertitel
@@ -244,7 +205,7 @@ public class SearchEditImage_GUI extends JFrame {
setBounds(0, 0, 918, 722);
setLocationRelativeTo(formerGUI);
- final DefaultTableModel model = new DefaultTableModel(titles, 0);
+ //final DefaultTableModel model = new DefaultTableModel(titles, 0);
getContentPane().setLayout(null);
{
@@ -254,7 +215,7 @@ public class SearchEditImage_GUI extends JFrame {
getContentPane().add(panel);
panel.setLayout(null);
{
-
+
lblNewLabel.setBounds(10, 11, 509, 22);
panel.add(lblNewLabel);
lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
@@ -291,34 +252,42 @@ public class SearchEditImage_GUI extends JFrame {
panel_1.add(lblInternetIstInnerhalb);
textFieldName = new JTextField();
+
// Key Listener der Tastatureingabe registriert
textFieldName.addKeyListener(new KeyAdapter() {
@Override
public void keyReleased(KeyEvent e) {
// Textfield eingabe auslesen
+
String stext = textFieldName.getText();
+
+ //System.out.println("Help, I don't want to be filtered yet....");
// Wenn Textfield nicht leer
- if (stext.isEmpty() == false) {
+ if (stext.trim().length() > 0) {
activeSearch = true;
// Filtere nach der Eingabe
- rowSorterAll.setRowFilter(RowFilter.regexFilter(
- textFieldName.getText(), 0));
- rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
- textFieldName.getText(), 0));
- rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
- textFieldName.getText(), 0));
+ filters.clear();
+ filters.add(RowFilter.regexFilter("(?i)"+stext, 0)); //case insensitive
+ filters.add(RowFilter.regexFilter("(?i)"+stext, 9)); //case insensitive
+ rf = RowFilter.orFilter(filters);
+ rowSorterMyImages.setRowFilter(rf);
+
+
+
} else {
activeSearch = false;
- String username = person.verantwortlicher.getName() + " "
- + person.verantwortlicher.getVorname();
- rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
- username, 4));
- rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
- "true", 8));
- rowSorterAll.setRowFilter(null);
+
+ filters.clear();
+ filters.add(RowFilter.regexFilter(".", 0)); //case insensitive, filter for anything
+ rf = RowFilter.orFilter(filters);
+ rowSorterMyImages.setRowFilter(rf);
}
+ tablemyImages.clearSelection();
+
+ resetImageInfo();
}
+
});
textFieldName.setBounds(133, 30, 400, 20);
@@ -337,11 +306,12 @@ public class SearchEditImage_GUI extends JFrame {
comboBox.addItem(list.get(i));
}
} catch (TException e2) {
- // TODO Auto-generated catch block
e2.printStackTrace();
- JOptionPane.showMessageDialog(c,
- "Konnte die Liste der Betriebssysteme vom Server nicht abfragen!", "Fehlermeldung",
- JOptionPane.ERROR_MESSAGE);
+ JOptionPane
+ .showMessageDialog(
+ c,
+ "Konnte die Liste der Betriebssysteme vom Server nicht abfragen!",
+ "Fehlermeldung", JOptionPane.ERROR_MESSAGE);
}
// Registriert Auswahlaenderungen der Box
comboBox.addActionListener(new ActionListener() {
@@ -350,21 +320,19 @@ public class SearchEditImage_GUI extends JFrame {
if (comboBox.getSelectedItem().toString().isEmpty() == false) {
// Filtert nach dem ausgewaehlten Betriebssystem
activeSearch = true;
- rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox
- .getSelectedItem().toString(), 2));
- rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
- comboBox.getSelectedItem().toString(), 2));
- rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
- comboBox.getSelectedItem().toString(), 2));
+
+ rowSorterMyImages.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2));
+
+
+
} else {
+
+
activeSearch = false;
String username = person.verantwortlicher.getName() + " "
+ person.verantwortlicher.getVorname();
- rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
- username, 4));
- rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
- "true", 8));
- rowSorterAll.setRowFilter(null);
+ rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4));
+
}
}
@@ -412,154 +380,74 @@ public class SearchEditImage_GUI extends JFrame {
String username = person.verantwortlicher.getName() + " "
+ person.verantwortlicher.getVorname();
// check if user is in correct tab
- /*if (tabbedPane.getSelectedIndex() == 0) { */
- // check if a row is selected
- if (tablemyImages.getSelectedRow() != -1) {
- String imageid = modelMyImages.getValueAt(
- tablemyImages
- .convertRowIndexToModel(tablemyImages
- .getSelectedRow()), 6)
- .toString();
-
- Image.image.setImageId(imageid);
- String imageversion = modelMyImages.getValueAt(
- tablemyImages
- .convertRowIndexToModel(tablemyImages
- .getSelectedRow()), 7)
- .toString();
-
- Image.image.setVersion(imageversion);
-
- FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI(c);
- ea.setVisible(true);
- dispose();
- /* }
- } else if (tabbedPane.getSelectedIndex() == 1) {
- if (tablePublicVorlagen.getSelectedRow() != -1) {
- if (modelPublicVorlagen
- .getValueAt(
- tablePublicVorlagen
- .convertRowIndexToModel(tablePublicVorlagen
- .getSelectedRow()), 4)
- .equals(username) == true
- || modelPublicVorlagen
- .getValueAt(
- tablePublicVorlagen
- .convertRowIndexToModel(tablePublicVorlagen
- .getSelectedRow()),
- 8).equals("true") == true) {
- String imageid = modelPublicVorlagen
- .getValueAt(
- tablePublicVorlagen
- .convertRowIndexToModel(tablePublicVorlagen
- .getSelectedRow()),
- 6).toString();
+ /* if (tabbedPane.getSelectedIndex() == 0) { */
+ // check if a row is selected
+ if (tablemyImages.getSelectedRow() != -1) {
+ String imageid = modelMyImages.getValueAt(
+ tablemyImages.convertRowIndexToModel(tablemyImages
+ .getSelectedRow()), 6).toString();
- Image.image.setImageId(imageid);
- String imageversion = modelPublicVorlagen
- .getValueAt(
- tablePublicVorlagen
- .convertRowIndexToModel(tablePublicVorlagen
- .getSelectedRow()),
- 7).toString();
+ Image.image.setImageId(imageid);
+ String imageversion = modelMyImages.getValueAt(
+ tablemyImages.convertRowIndexToModel(tablemyImages
+ .getSelectedRow()), 7).toString();
- Image.image.setVersion(imageversion);
+ Image.image.setVersion(imageversion);
- FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI();
- ea.setVisible(true);
- dispose();
- } else {
- JOptionPane
- .showMessageDialog(
- null,
- "Sie haben keine Berechtigung fremde Images herunterzuladen.",
- "Message",
- JOptionPane.INFORMATION_MESSAGE);
- }
- }
- } else if (tabbedPane.getSelectedIndex() == 2) {
- if (tableAllImages.getSelectedRow() != -1) {
- if (modelAll.getValueAt(
- tableAllImages
- .convertRowIndexToModel(tableAllImages
- .getSelectedRow()), 4).equals(
- username) == true
- || modelAll
- .getValueAt(
- tableAllImages
- .convertRowIndexToModel(tableAllImages
- .getSelectedRow()),
- 8).equals("true") == true) {
- String imageid = modelAll
- .getValueAt(
- tableAllImages
- .convertRowIndexToModel(tableAllImages
- .getSelectedRow()),
- 6).toString();
-
- Image.image.setImageId(imageid);
- String imageversion = modelAll
- .getValueAt(
- tableAllImages
- .convertRowIndexToModel(tableAllImages
- .getSelectedRow()),
- 7).toString();
-
- Image.image.setVersion(imageversion);
+ FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI(c);
+ ea.setVisible(true);
+ dispose();
- FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI();
- ea.setVisible(true);
- dispose();
- } else {
- JOptionPane
- .showMessageDialog(
- null,
- "Sie haben keine Berechtigung fremde Images herunterzuladen.",
- "Message",
- JOptionPane.INFORMATION_MESSAGE);
- }//end actionPerformed
- } */
} else {
- JOptionPane
- .showMessageDialog(
- c,
- "Bitte wählen Sie ein Image für den Download aus",
- "Message", JOptionPane.INFORMATION_MESSAGE);
+ JOptionPane.showMessageDialog(c,
+ "Bitte wählen Sie ein Image für den Download aus",
+ "Message", JOptionPane.INFORMATION_MESSAGE);
}
}
});
btnDownload.setBounds(449, 508, 118, 23);
contentPanel.add(btnDownload);
+
+ JScrollPane scrollPaneMyImage = new JScrollPane();
+ scrollPaneMyImage.setBounds(10, 158, 557, 339);
+ contentPanel.add(scrollPaneMyImage);
+ tablemyImages = new JTable();
+
+ tablemyImages.getSelectionModel().addListSelectionListener(
+ new ListSelectionListener() {
+ public void valueChanged(ListSelectionEvent e) {
+
+ if (tablemyImages.getSelectedRow() != -1) {
+
+ //zeige die ganzen Details an
+ String imageid = modelMyImages
+ .getValueAt(
+ tablemyImages
+ .convertRowIndexToModel(tablemyImages
+ .getSelectedRow()),
+ 6).toString();
+ String version = modelMyImages
+ .getValueAt(
+ tablemyImages
+ .convertRowIndexToModel(tablemyImages
+ .getSelectedRow()),
+ 7).toString();
+ writeImageData(imageid, version);
+ }
+ }
+ });
+ tablemyImages.setModel(modelMyImages);
+ tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
+ tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
+ tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();
+ tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();
+ tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
- JScrollPane scrollPaneMyImage = new JScrollPane();
- scrollPaneMyImage.setBounds(10, 158, 557, 339);
- contentPanel.add(scrollPaneMyImage);
- tablemyImages = new JTable();
- tablemyImages.getSelectionModel().addListSelectionListener(
- new ListSelectionListener() {
- public void valueChanged(ListSelectionEvent e) {
- String imageid = modelMyImages.getValueAt(
- tablemyImages
- .convertRowIndexToModel(tablemyImages
- .getSelectedRow()), 6)
- .toString();
- String version = modelMyImages.getValueAt(
- tablemyImages
- .convertRowIndexToModel(tablemyImages
- .getSelectedRow()), 7)
- .toString();
- writeImageData(imageid, version);
- }
- });
- tablemyImages.setModel(modelMyImages);
- tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
- tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
- tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();
- tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();
- tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
- tablemyImages.setRowSorter(rowSorterMyImages);
-
- scrollPaneMyImage.setViewportView(tablemyImages);
+ rowSorterMyImages.setRowFilter(rf);
+ tablemyImages.setRowSorter(rowSorterMyImages);
+
+
+ scrollPaneMyImage.setViewportView(tablemyImages);
{
JPanel buttonPane = new JPanel();
buttonPane.setBounds(0, 640, 902, 33);
@@ -589,97 +477,33 @@ public class SearchEditImage_GUI extends JFrame {
String username = person.verantwortlicher.getName()
+ " " + person.verantwortlicher.getVorname();
// check if user is in correct tab
- //if (tabbedPane.getSelectedIndex() == 0) {
- // check if a row is selected
- if (tablemyImages.getSelectedRow() != -1) {
- String imageid = modelMyImages
- .getValueAt(
- tablemyImages
- .convertRowIndexToModel(tablemyImages
- .getSelectedRow()),
- 6).toString();
-
- Image.image.setImageId(imageid);
- String imageversion = modelMyImages
- .getValueAt(
- tablemyImages
- .convertRowIndexToModel(tablemyImages
- .getSelectedRow()),
- 7).toString();
-
- Image.image.setVersion(imageversion);
-
- EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI(c);
- ea.setVisible(true);
- dispose();
- }
- /* } else if (tabbedPane.getSelectedIndex() == 1) {
- if (tablePublicVorlagen.getSelectedRow() != -1
- && modelPublicVorlagen //deprecated(?)
- .getValueAt(
- tablePublicVorlagen
- .convertRowIndexToModel(tablePublicVorlagen
- .getSelectedRow()),
- 4).equals(username) == true) {
- String imageid = modelPublicVorlagen
- .getValueAt(
- tablePublicVorlagen
- .convertRowIndexToModel(tablePublicVorlagen
- .getSelectedRow()),
- 6).toString();
-
- Image.image.setImageId(imageid);
- String imageversion = modelPublicVorlagen
- .getValueAt(
- tablePublicVorlagen
- .convertRowIndexToModel(tablePublicVorlagen
- .getSelectedRow()),
- 7).toString();
-
- Image.image.setVersion(imageversion);
-
- EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI();
- ea.setVisible(true);
- dispose();
- }
- } else if (tabbedPane.getSelectedIndex() == 2) {
- if (tableAllImages.getSelectedRow() != -1
- && modelAll
- .getValueAt(
- tableAllImages
- .convertRowIndexToModel(tableAllImages
- .getSelectedRow()),
- 4).equals(username) == true) {
- String imageid = modelAll
- .getValueAt(
- tableAllImages
- .convertRowIndexToModel(tableAllImages
- .getSelectedRow()),
- 6).toString();
-
- Image.image.setImageId(imageid);
- String imageversion = modelAll
- .getValueAt(
- tableAllImages
- .convertRowIndexToModel(tableAllImages
- .getSelectedRow()),
- 7).toString();
-
- Image.image.setVersion(imageversion);
-
- EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI();
- ea.setVisible(true);
- dispose();
- } else {
- JOptionPane
- .showMessageDialog(
- null,
- "Bitte wählen Sie ein eigenes Image aus.",
- "Image Auswahl",
- JOptionPane.INFORMATION_MESSAGE);
- }
- }// end check if correct tab is selected
- */}//end actionPerformed
+ // if (tabbedPane.getSelectedIndex() == 0) {
+ // check if a row is selected
+ if (tablemyImages.getSelectedRow() != -1) {
+ String imageid = modelMyImages
+ .getValueAt(
+ tablemyImages
+ .convertRowIndexToModel(tablemyImages
+ .getSelectedRow()),
+ 6).toString();
+
+ Image.image.setImageId(imageid);
+ String imageversion = modelMyImages
+ .getValueAt(
+ tablemyImages
+ .convertRowIndexToModel(tablemyImages
+ .getSelectedRow()),
+ 7).toString();
+
+ Image.image.setVersion(imageversion);
+
+ EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI(
+ c);
+ ea.setVisible(true);
+ dispose();
+ }
+
+ }// end actionPerformed
});
cancelButton.setActionCommand("Cancel");
buttonPane.add(cancelButton);
@@ -875,37 +699,49 @@ public class SearchEditImage_GUI extends JFrame {
}
});
mnNewMenu_1.add(mntmAbout);
-
+
JMenu mnNewMenu_Info = new JMenu("Info");
mnNewMenu_Info.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent arg0) {
- JOptionPane.showMessageDialog(c, HELP_MESSAGE, "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE);
+ JOptionPane.showMessageDialog(c, HELP_MESSAGE,
+ "Hilfe zu dieser Oberfläche",
+ JOptionPane.INFORMATION_MESSAGE);
}
});
menuBar.add(mnNewMenu_Info);
c = this;
+
}
// Initiale Beffuelung eines Table models
public DefaultTableModel initTableModel(DefaultTableModel model) {
+
+ LOGGER.debug("trying to init table first time... in: searcheditimage_gui");
+
List<server.generated.Image> images;
try {
// Hole eine Liste der passenden Images
- images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID());
- System.out.println("User is: "+person.verantwortlicher.getUserID());
- //images = client.getImageList(person.verantwortlicher.getUserID(), requiredPermission);
+ images = client.getImageListPermissionWrite(person.verantwortlicher
+ .getUserID());
+ System.out.println("User is: "
+ + person.verantwortlicher.getUserID());
+ // images = client.getImageList(person.verantwortlicher.getUserID(),
+ // requiredPermission);
Iterator<server.generated.Image> i = images.iterator();
SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
int x = 0;
+ //System.out.println("Imagesize is: "+images.size());
while (i.hasNext()) {
// erzeuge Objekte fuer die Tabelle
- LOGGER.debug("Image last updated on: " + images.get(x).updateTime);
+ LOGGER.debug("Image last updated on: "
+ + images.get(x).updateTime);
LOGGER.debug("Image name: " + images.get(x).getImageName());
+
Object[] obj = { images.get(x).getImageName(),
images.get(x).getLicenseRestriction(),
images.get(x).getOsName(),
@@ -913,14 +749,16 @@ public class SearchEditImage_GUI extends JFrame {
images.get(x).getUserData(),
out.format(in.parse(images.get(x).updateTime)),
images.get(x).id, images.get(x).getVersion(),
- images.get(x).getIsTemplate() };
+ images.get(x).getIsTemplate(),
+ images.get(x).getDescription()};
// Fuege diese Objekte der Tabelle hinzu
model.addRow(obj);
+ LOGGER.info("Counting model.getRowCount(): "+model.getRowCount());
x++;
i.next();
-
}
+ LOGGER.info("Finished counting crap, mo"+model.getRowCount());
return model;
} catch (TException | ParseException e1) {
@@ -932,6 +770,25 @@ public class SearchEditImage_GUI extends JFrame {
}
return model;
}
+
+
+ private void resetImageInfo() {
+ //reset the detailed information on the right hand side when changing search string
+ labelID.setText("");
+ labelVersion.setText("");
+ labelName.setText("");
+ textAreadesc.setText("");
+ labelOS.setText("");
+ labelUpdate.setText("");
+ labelVerantwortlicher.setText("");
+ labelWeitereVerantwortliche.setText("");
+ labelVorlage.setText("");
+ labelLizenzSoftware.setText("");
+ labelInternet.setText("");
+ labelRam.setText("");
+ labelCPU.setText("");
+
+ }
public void writeImageData(String id, String version) {
try {
@@ -941,7 +798,8 @@ public class SearchEditImage_GUI extends JFrame {
labelName.setText(res.get("name"));
labelOS.setText(res.get("os"));
labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
- labelVerantwortlicher.setText(res.get("owner") + " (" + res.get("mail") + ")");
+ labelVerantwortlicher.setText(res.get("owner") + " ("
+ + res.get("mail") + ")");
labelWeitereVerantwortliche.setText("Noch nicht Verfügbar");
if (res.get("template").equals("true")) {
labelVorlage.setText("Ja");
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-02-28 22:26:49 +0100