From 3931683352e87b1b4039fd888bf4a82a05ccab82 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 18 Oct 2014 22:19:31 +0200 Subject: [PATCH] remove edit field for person date --- src/de/mpg/molgen/buczek/portifix/Gui.form | 32 +++--------- src/de/mpg/molgen/buczek/portifix/Gui.java | 61 +++------------------- 2 files changed, 14 insertions(+), 79 deletions(-) diff --git a/src/de/mpg/molgen/buczek/portifix/Gui.form b/src/de/mpg/molgen/buczek/portifix/Gui.form index 69d0d7f..61ab4f8 100644 --- a/src/de/mpg/molgen/buczek/portifix/Gui.form +++ b/src/de/mpg/molgen/buczek/portifix/Gui.form @@ -24,7 +24,7 @@ - + @@ -55,9 +55,9 @@ - + - + @@ -78,7 +78,7 @@ - + @@ -102,15 +102,13 @@ - - + - - + - + @@ -126,11 +124,6 @@ - - - - - @@ -147,11 +140,6 @@ - - - - - @@ -163,12 +151,6 @@ - - - - - - diff --git a/src/de/mpg/molgen/buczek/portifix/Gui.java b/src/de/mpg/molgen/buczek/portifix/Gui.java index 23ca9ee..dcadc37 100644 --- a/src/de/mpg/molgen/buczek/portifix/Gui.java +++ b/src/de/mpg/molgen/buczek/portifix/Gui.java @@ -127,7 +127,6 @@ private String join(String delim, String s1, String s2) { private void setEditEnabled(boolean enabled) { textField_datum.setEnabled(enabled); - textField_endedatum.setEnabled(enabled); } private void updateForm() { @@ -151,7 +150,6 @@ private void updateForm() { label_abteilung.setText(singleColumnValueOfSelection(TableModel.COLUMN_ABTEILUNG)); label_schluessel.setText(singleColumnValueOfArray(exemplar)); textField_datum.setText(singleColumnValueOfSelection(TableModel.COLUMN_RUECKGABEDATUM)); - textField_endedatum.setText(singleColumnValueOfSelection(TableModel.COLUMN_ENDEDATUM)); setEditEnabled(isUnique(columnValuesOfSelection(TableModel.COLUMN_PERSONAL_ID))); } @@ -196,18 +194,6 @@ private void saveThis() { } catch (ParseException exception) { // invalid date string. keep old values } - } else if (edit_mode == EDIT_MODE_PERSON) { - try { - String s = textField_endedatum.getText(); - Date d = MyDateFormat.parse(s); - System.out.printf(" %s --> %s\n", s, d); - for (int i = 0; i < selected.length; i++) { - tableModel.setNewDatePerson(jTable1.convertRowIndexToModel(selected[i]), d); - } - } catch (ParseException exception) { - // invalid date string. keep old values - } - } else { throw new Error("internal error"); } @@ -229,9 +215,7 @@ public void run() { label_abteilung.setText(""); label_schluessel.setText(""); textField_datum.setText(""); - textField_endedatum.setText(""); textField_datum.setEnabled(false); - textField_endedatum.setEnabled(false); jTable1.addMouseListener(popupListener); @@ -264,21 +248,6 @@ public void focusLost(FocusEvent e) { } }); - textField_endedatum.addFocusListener(new FocusListener() { - - @Override - public void focusGained(FocusEvent e) { - if (textField_endedatum.getText().equals("...")) { - textField_endedatum.setText(""); - } - startEdit(EDIT_MODE_PERSON); - } - - @Override - public void focusLost(FocusEvent e) { - } - }); - button_cancel.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -327,10 +296,8 @@ private void initComponents() { jPanel2 = new javax.swing.JPanel(); jLabel1 = new javax.swing.JLabel(); jLabel3 = new javax.swing.JLabel(); - jLabel2 = new javax.swing.JLabel(); label_name = new javax.swing.JLabel(); label_abteilung = new javax.swing.JLabel(); - textField_endedatum = new javax.swing.JTextField(); button_cancel = new javax.swing.JButton(); button_refresh = new javax.swing.JButton(); button_ok = new javax.swing.JButton(); @@ -351,16 +318,11 @@ private void initComponents() { jLabel3.setText("Abteilung:"); - jLabel2.setText("Ende Datum:"); - label_name.setText("Donald Buczek"); label_name.setToolTipText(""); label_abteilung.setText("Allgemein"); - textField_endedatum.setColumns(10); - textField_endedatum.setText("01.01.1988"); - javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); jPanel2.setLayout(jPanel2Layout); jPanel2Layout.setHorizontalGroup( @@ -369,14 +331,12 @@ private void initComponents() { .addContainerGap() .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel1) - .addComponent(jLabel3) - .addComponent(jLabel2)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jLabel3)) + .addGap(19, 19, 19) .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(textField_endedatum, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(label_name, javax.swing.GroupLayout.DEFAULT_SIZE, 162, Short.MAX_VALUE) + .addComponent(label_name, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(label_abteilung, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addContainerGap(56, Short.MAX_VALUE)) + .addContainerGap(66, Short.MAX_VALUE)) ); jPanel2Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel1, jLabel3}); @@ -391,10 +351,6 @@ private void initComponents() { .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(jLabel3) .addComponent(label_abteilung)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jLabel2) - .addComponent(textField_endedatum, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); @@ -404,7 +360,6 @@ private void initComponents() { button_refresh.setText("Refresh"); button_ok.setText("OK"); - button_ok.setActionCommand("OK"); button_ok.setEnabled(false); label_schluessel.setText("Schlüssel"); @@ -452,7 +407,7 @@ private void initComponents() { .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 38, Short.MAX_VALUE)) + .addGap(0, 0, Short.MAX_VALUE)) .addGroup(jPanel1Layout.createSequentialGroup() .addContainerGap() .addComponent(button_ok) @@ -468,7 +423,7 @@ private void initComponents() { .addContainerGap() .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(button_ok) @@ -489,7 +444,7 @@ private void initComponents() { getContentPane().setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jSplitPane1, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(jSplitPane1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 461, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -525,7 +480,6 @@ public void run() { private javax.swing.JButton button_ok; private javax.swing.JButton button_refresh; private javax.swing.JLabel jLabel1; - private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel5; private javax.swing.JLabel jLabel7; @@ -539,7 +493,6 @@ public void run() { private javax.swing.JLabel label_name; private javax.swing.JLabel label_schluessel; private javax.swing.JTextField textField_datum; - private javax.swing.JTextField textField_endedatum; // End of variables declaration//GEN-END:variables private final JPopupMenu popupMenu = new JPopupMenu();