Index: trunk/src/scriptbuilder/gui/IncidentPaletteFrame.java =================================================================== --- trunk/src/scriptbuilder/gui/IncidentPaletteFrame.java (revision 189) +++ trunk/src/scriptbuilder/gui/IncidentPaletteFrame.java (revision 190) @@ -71,32 +71,32 @@ initComponents(); - - txtSearchFilter.addKeyListener(new KeyListener() - { - - @Override - public void keyTyped(KeyEvent e) - { - } - - @Override - public void keyPressed(KeyEvent e) - { - if (e.getKeyCode() == KeyEvent.VK_ENTER) - { - /*This feature has not yet been implemented. Show a message and just return.*/ - if (true) - { - JOptionPane.showMessageDialog(txtSearchFilter.getTopLevelAncestor(), "This feature has not yet been implemented.\n", - "Feature not implemented", JOptionPane.INFORMATION_MESSAGE); - } - } - } - - @Override - public void keyReleased(KeyEvent e) - { - } - }); +//This is a deprecated feature that originally was used to search for text. +// txtSearchFilter.addKeyListener(new KeyListener() +// { +// +// @Override +// public void keyTyped(KeyEvent e) +// { +// } +// +// @Override +// public void keyPressed(KeyEvent e) +// { +// if (e.getKeyCode() == KeyEvent.VK_ENTER) +// { +// /*This feature has not yet been implemented. Show a message and just return.*/ +//// if (true) +//// { +//// JOptionPane.showMessageDialog(txtSearchFilter.getTopLevelAncestor(), "This feature has not yet been implemented.\n", +//// "Feature not implemented", JOptionPane.INFORMATION_MESSAGE); +//// } +// } +// } +// +// @Override +// public void keyReleased(KeyEvent e) +// { +// } +// }); String fs = System.getProperty("file.separator"); @@ -281,10 +281,8 @@ @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents - private void initComponents() - { + private void initComponents() { jPanel1 = new javax.swing.JPanel(); btnCreateIncident = new javax.swing.JButton(); - txtSearchFilter = new javax.swing.JTextField(); jPanel2 = new javax.swing.JPanel(); jScrollPane2 = new javax.swing.JScrollPane(); @@ -296,18 +294,10 @@ labelFileCount = new javax.swing.JLabel(); - btnCreateIncident.setText("Create New..."); - btnCreateIncident.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { + setTitle("Incident Palette"); + + btnCreateIncident.setText("Create New Incident..."); + btnCreateIncident.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { btnCreateIncidentActionPerformed(evt); - } - }); - - txtSearchFilter.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - txtSearchFilterActionPerformed(evt); } }); @@ -317,10 +307,8 @@ jPanel1Layout.setHorizontalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup() + .addGroup(jPanel1Layout.createSequentialGroup() .addContainerGap() - .addComponent(txtSearchFilter) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnCreateIncident, javax.swing.GroupLayout.PREFERRED_SIZE, 123, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(23, 23, 23)) + .addComponent(btnCreateIncident) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); jPanel1Layout.setVerticalGroup( @@ -328,13 +316,10 @@ .addGroup(jPanel1Layout.createSequentialGroup() .addContainerGap() - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(txtSearchFilter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(btnCreateIncident)) + .addComponent(btnCreateIncident) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); tableCurrentIncidents.setModel(new javax.swing.table.DefaultTableModel( - new Object [][] - { + new Object [][] { {null, null, null}, {null, null, null}, @@ -349,26 +334,20 @@ {null, null, null} }, - new String [] - { + new String [] { "Incident #", "Start Time", "Title" } - ) - { - Class[] types = new Class [] - { + ) { + Class[] types = new Class [] { java.lang.Integer.class, java.lang.String.class, java.lang.String.class }; - boolean[] canEdit = new boolean [] - { + boolean[] canEdit = new boolean [] { false, false, false }; - public Class getColumnClass(int columnIndex) - { + public Class getColumnClass(int columnIndex) { return types [columnIndex]; } - public boolean isCellEditable(int rowIndex, int columnIndex) - { + public boolean isCellEditable(int rowIndex, int columnIndex) { return canEdit [columnIndex]; } @@ -400,8 +379,6 @@ btnClosePalette.setText("Done"); - btnClosePalette.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { + btnClosePalette.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { btnClosePaletteActionPerformed(evt); } @@ -493,9 +470,4 @@ }//GEN-LAST:event_btnClosePaletteActionPerformed - private void txtSearchFilterActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_txtSearchFilterActionPerformed - {//GEN-HEADEREND:event_txtSearchFilterActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_txtSearchFilterActionPerformed - // Variables declaration - do not modify//GEN-BEGIN:variables @@ -510,5 +482,4 @@ private javax.swing.JScrollPane scrollAddPanels; private javax.swing.JTable tableCurrentIncidents; - private javax.swing.JTextField txtSearchFilter; // End of variables declaration//GEN-END:variables Index: trunk/src/scriptbuilder/gui/IncidentPaletteFrame.form =================================================================== --- trunk/src/scriptbuilder/gui/IncidentPaletteFrame.form (revision 127) +++ trunk/src/scriptbuilder/gui/IncidentPaletteFrame.form (revision 190) @@ -2,4 +2,7 @@
+ + + @@ -51,10 +54,8 @@ - - - - - - + + + + @@ -64,8 +65,5 @@ - - - - + @@ -76,13 +74,8 @@ - + - - - - -