# HG changeset patch
# User Matthias Bläsing <matthias42@netbeans.org>
# Date 1343563512 -7200
# Branch mb-patches3
# Node ID e9bf32164ce3c22130869d951e7c728c6c83367f
# Parent  2c3bff024d0d2452b2ad013583304875476b9ad9
Bug 214881 - part 2 - Fix warnings at compile time and cleanup code (fix IDE warnings where files were edited)

diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBColumn.java b/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBColumn.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBColumn.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBColumn.java
@@ -48,7 +48,7 @@
  * 
  * @author Ahimanikya Satapathy
  */
-public final class DBColumn extends DBObject<DBTable> implements Comparable {
+public final class DBColumn extends DBObject<DBTable> implements Comparable<DBColumn> {
 
     public static final int POSITION_UNKNOWN = Integer.MIN_VALUE;
     private boolean foreignKey;
@@ -81,25 +81,24 @@
         editable = (!table.getName().equals("") && !isGenerated);
     }
 
-    public int compareTo(Object refObj) {
-        if (refObj == null) {
+    @Override
+    public int compareTo(DBColumn refColumn) {
+        if (refColumn == null) {
             return -1;
         }
 
-        if (refObj == this) {
+        if (refColumn == this) {
             return 0;
         }
 
         String myName = getDisplayName();
         myName = (myName == null) ? columnName : myName;
 
-        String refName = null;
-        if (!(refObj instanceof DBColumn)) {
+        if (!(refColumn instanceof DBColumn)) {
             return -1;
         }
 
-        DBColumn refColumn = (DBColumn) refObj;
-        refName = refColumn.getName();
+        String refName = refColumn.getName();
 
         // compare primary keys
         if (this.isPrimaryKey() && !refColumn.isPrimaryKey()) {
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBMetaDataFactory.java b/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBMetaDataFactory.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBMetaDataFactory.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBMetaDataFactory.java
@@ -114,7 +114,7 @@
     }
 
     private static int getDBTypeFromURL(String url) {
-        int dbtype = -1;
+        int dbtype;
 
         // get the database type based on the product name converted to lowercase
         url = url.toLowerCase();
@@ -237,7 +237,7 @@
                         nfe);
             }
 
-            boolean isNullable = (rsMeta.isNullable(i) == rsMeta.columnNullable);
+            boolean isNullable = (rsMeta.isNullable(i) == ResultSetMetaData.columnNullable);
             String displayName = rsMeta.getColumnLabel(i);
             int displaySize = rsMeta.getColumnDisplaySize(i);
             boolean autoIncrement = rsMeta.isAutoIncrement(i);
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewDBTable.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewDBTable.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewDBTable.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewDBTable.java
@@ -114,7 +114,7 @@
         return columns.size();
     }
 
-    public synchronized Map getColumns() {
+    public synchronized Map<String,DBColumn> getColumns() {
         Map<String, DBColumn> colMap = new HashMap<String, DBColumn>();
         for (DBTable tbl : dbTables) {
             colMap.putAll(tbl.getColumns());
@@ -138,6 +138,7 @@
         private ColumnOrderComparator() {
         }
 
+        @Override
         public int compare(DBColumn col1, DBColumn col2) {
             return col1.getOrdinalPosition() - col2.getOrdinalPosition();
         }
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLExecutionHelper.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLExecutionHelper.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLExecutionHelper.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLExecutionHelper.java
@@ -207,7 +207,7 @@
             }
         }
         Loader l = new Loader();
-        Future f = rp.submit(l);
+        Future<?> f = rp.submit(l);
         try {
             f.get();
         } catch (InterruptedException ex) {
@@ -409,11 +409,6 @@
                 pstmt = conn.prepareStatement(updateStmt);
                 int pos = 1;
                 for (Object val : values) {
-                    // Check for Constant e.g <NULL>, <DEFAULT>, <CURRENT_TIMESTAMP> etc
-                    if (DataViewUtils.isSQLConstantString(val)) {
-                        continue;
-                    }
-
                     DBReadWriteHelper.setAttributeValue(pstmt, pos, types.get(pos - 1), val);
                     pos++;
                 }
@@ -654,7 +649,7 @@
                 }
             }
         } catch (SQLException ex) {
-            LOGGER.log(Level.SEVERE, "Could not get total row count " + ex); // NOI18N
+            LOGGER.log(Level.SEVERE, "Could not get total row count ", ex); // NOI18N
         }
     }
 
@@ -682,7 +677,7 @@
                 stmt.setFetchSize(pageSize);
             } catch (SQLException e) {
                 // ignore -  used only as a hint to the driver to optimize
-                LOGGER.log(Level.WARNING, "Unable to set Fetch size" + e); // NOI18N
+                LOGGER.log(Level.WARNING, "Unable to set Fetch size", e); // NOI18N
             }
 
             try {
@@ -692,7 +687,7 @@
                     stmt.setMaxRows(dataView.getDataViewPageContext().getCurrentPos() + pageSize);
                 }
             } catch (SQLException exc) {
-                LOGGER.log(Level.WARNING, "Unable to set Max row size" + exc); // NOI18N
+                LOGGER.log(Level.WARNING, "Unable to set Max row size", exc); // NOI18N
             }
         } else {
             stmt = conn.createStatement();
@@ -701,7 +696,7 @@
     }
 
     private void executeSQLStatement(Statement stmt, String sql) throws SQLException {
-        LOGGER.log(Level.FINE, "Statement: " + sql); // NOI18N
+        LOGGER.log(Level.FINE, "Statement: {0}", sql); // NOI18N
         dataView.setInfoStatusText(NbBundle.getMessage(SQLExecutionHelper.class, "LBL_sql_executestmt") + sql);
 
         long startTime = System.currentTimeMillis();
@@ -712,13 +707,13 @@
             try {
                 isResultSet = stmt.execute(appendLimitIfRequired(sql));
             } catch (NullPointerException ex) {
-                LOGGER.log(Level.SEVERE, "Failed to execute SQL Statement [" + sql + "], cause: " + ex);
+                LOGGER.log(Level.SEVERE, "Failed to execute SQL Statement [{0}], cause: {1}", new Object[] {sql, ex});
                 throw new SQLException(ex);
             } catch (SQLException sqlExc) {
                 if (sqlExc.getErrorCode() == 1064 && sqlExc.getSQLState().equals("37000")) {
                     isResultSet = stmt.execute(sql);
                 } else {
-                    LOGGER.log(Level.SEVERE, "Failed to execute SQL Statement [" + sql + "], cause: " + sqlExc);
+                    LOGGER.log(Level.SEVERE, "Failed to execute SQL Statement [{0}], cause: {1}", new Object[] {sql, sqlExc});
                     throw sqlExc;
                 }
             }
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java
@@ -101,7 +101,7 @@
         });
     }
 
-    public ResultSetCellRenderer(ComponentProvider componentProvider) {
+    public ResultSetCellRenderer(ComponentProvider<? extends JComponent> componentProvider) {
         super(componentProvider);
     }
 
@@ -119,7 +119,7 @@
             return NULL_RENDERER.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
         } else if (value instanceof Number) {
             return NUMNBER_RENDERER.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-        } else if (DataViewUtils.isSQLConstantString(value)) {
+        } else if (DataViewUtils.isSQLConstantString(value, null)) {
             Component c = DEFAULT_RENDERER.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
             setTableCellToolTip(c, value);
             return c;            
@@ -256,4 +256,4 @@
             return super.getTableCellRendererComponent(table, "<CLOB of unkown size>", isSelected, hasFocus, row, column);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableCellEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableCellEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableCellEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableCellEditor.java
@@ -39,7 +39,7 @@
  * 
  * Portions Copyrighted 2009-2010 Sun Microsystems, Inc.
  */
-package org.netbeans.modules.db.dataview.table.celleditor;
+package org.netbeans.modules.db.dataview.table;
 
 import java.awt.Component;
 import java.awt.event.MouseEvent;
@@ -51,7 +51,6 @@
 import javax.swing.UIManager;
 import org.jdesktop.swingx.renderer.JRendererCheckBox;
 import org.netbeans.modules.db.dataview.meta.DBColumn;
-import org.netbeans.modules.db.dataview.table.ResultSetJXTable;
 import org.netbeans.modules.db.dataview.util.DBReadWriteHelper;
 import org.netbeans.modules.db.dataview.util.DataViewUtils;
 import org.openide.awt.StatusDisplayer;
@@ -61,7 +60,7 @@
     protected Object val;
     protected boolean editable = true;
     protected JTable table;
-    static final boolean isGtk = "GTK".equals (UIManager.getLookAndFeel ().getID ()); //NOI18N
+    protected static final boolean isGtk = "GTK".equals (UIManager.getLookAndFeel ().getID ()); //NOI18N
 
     public ResultSetTableCellEditor(final JTextField textField) {
         super(textField);
@@ -105,7 +104,7 @@
 
     @Override
     public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
-        if (DataViewUtils.isSQLConstantString(value)) {
+        if (DataViewUtils.isSQLConstantString(value, null)) {
             value = "";
         }
         return super.getTableCellEditorComponent(table, value, isSelected, row, column);
@@ -161,4 +160,4 @@
             ((JComponent) c).setEnabled(editable);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java
@@ -64,7 +64,7 @@
     private Class[] collumnClasses;
     protected ResultSetJXTable table;
 
-    public static Class getTypeClass(DBColumn col) {
+    public static Class<? extends Object> getTypeClass(DBColumn col) {
         int colType = col.getJdbcType();
 
         if (colType == Types.BIT && col.getPrecision() <= 1) {
@@ -116,6 +116,7 @@
         }
     }
 
+    @SuppressWarnings("rawtypes")
     public ResultSetTableModel(ResultSetJXTable table) {
         super();
         this.table = table;
@@ -155,7 +156,8 @@
     }
 
     @Override
-    public Class getColumnClass(int columnIndex) {
+    @SuppressWarnings("unchecked")
+    public Class<? extends Object> getColumnClass(int columnIndex) {
         if (collumnClasses[columnIndex] == null) {
             return super.getColumnClass(columnIndex);
         } else {
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/BooleanTableCellEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/BooleanTableCellEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/BooleanTableCellEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/BooleanTableCellEditor.java
@@ -41,6 +41,7 @@
  */
 package org.netbeans.modules.db.dataview.table.celleditor;
 
+import org.netbeans.modules.db.dataview.table.ResultSetTableCellEditor;
 import java.awt.Component;
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/ClobFieldTableCellEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/ClobFieldTableCellEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/ClobFieldTableCellEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/ClobFieldTableCellEditor.java
@@ -79,7 +79,8 @@
                 }
             });
             charsetSelect = new JComboBox();
-            charsetSelect.setModel(new DefaultComboBoxModel(charset.toArray()));
+            charsetSelect.setModel(new DefaultComboBoxModel(
+                    charset.toArray(new Charset[charset.size()])));
             charsetSelect.setSelectedItem(Charset.defaultCharset());
             this.add(charsetSelect);
         }
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/DateTimePickerCellEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/DateTimePickerCellEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/DateTimePickerCellEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/DateTimePickerCellEditor.java
@@ -137,7 +137,7 @@
     }
 
     protected Timestamp getValueAsTimestamp(Object value) {
-        if (isEmpty(value) || DataViewUtils.isSQLConstantString(value)) {
+        if (isEmpty(value) || DataViewUtils.isSQLConstantString(value, null)) {
             return new Timestamp(System.currentTimeMillis());
         }
 
@@ -227,4 +227,4 @@
     public void addKeyListener(KeyListener kl) {
         datePicker.addKeyListener(kl);
     }
-}
\ No newline at end of file
+}
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/NumberFieldEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/NumberFieldEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/NumberFieldEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/NumberFieldEditor.java
@@ -46,6 +46,7 @@
 import javax.swing.JComponent;
 import javax.swing.JTable;
 import javax.swing.JTextField;
+import org.netbeans.modules.db.dataview.table.ResultSetTableCellEditor;
 
 public class NumberFieldEditor extends ResultSetTableCellEditor {
 
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/StringTableCellEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/StringTableCellEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/StringTableCellEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/StringTableCellEditor.java
@@ -63,6 +63,7 @@
 import javax.swing.table.TableCellEditor;
 import org.jdesktop.swingx.JXButton;
 import org.jdesktop.swingx.JXPanel;
+import org.netbeans.modules.db.dataview.table.ResultSetTableCellEditor;
 import org.openide.windows.WindowManager;
 
 public class StringTableCellEditor extends ResultSetTableCellEditor implements TableCellEditor, ActionListener {
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/util/BasicDateTimePickerUI.java b/db.dataview/src/org/netbeans/modules/db/dataview/util/BasicDateTimePickerUI.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/util/BasicDateTimePickerUI.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/util/BasicDateTimePickerUI.java
@@ -166,11 +166,8 @@
         
         popupButton = createPopupButton();
         if (popupButton != null) {
-            // this is a trick to get hold of the client prop which
-            // prevents closing of the popup
-            JComboBox box = new JComboBox();
-            Object preventHide = box.getClientProperty("doNotCancelPopup");
-            popupButton.putClientProperty("doNotCancelPopup", preventHide);
+            popupButton.putClientProperty("doNotCancelPopup", 
+                    createDoNotCancelPopupClientProperty());
             datePicker.add(popupButton);
         }
             updateChildLocale(datePicker.getLocale());
@@ -252,8 +249,9 @@
      * PRE: keybindings installed on picker.
      */
     protected void installLinkPanelKeyboardActions() {
-        if (datePicker.getLinkPanel() == null)
+        if (datePicker.getLinkPanel() == null)  {
             return;
+        }
         ActionMap map = datePicker.getLinkPanel().getActionMap();
         map.put(JXDateTimePicker.HOME_COMMIT_KEY, datePicker.getActionMap().get(
                 JXDateTimePicker.HOME_COMMIT_KEY));
@@ -277,7 +275,9 @@
      * 
      */
     protected void uninstallLinkPanelKeyboardActions(JComponent panel) {
-        if (panel == null) return;
+        if (panel == null) {
+            return;
+        }
         ActionMap map = panel.getActionMap();
         map.remove(JXDateTimePicker.HOME_COMMIT_KEY); 
         map.remove(JXDateTimePicker.HOME_NAVIGATE_KEY); 
@@ -705,7 +705,9 @@
      *    is intermediate
      */
     protected void updateFromSelectionChanged(EventType eventType, boolean adjusting) {
-        if (adjusting) return;
+        if (adjusting) {
+            return;
+        }
         updateEditorValue();
     }
 
@@ -755,11 +757,8 @@
             oldEditor.putClientProperty("doNotCancelPopup", null);
         }
         datePicker.add(datePicker.getEditor());
-        // this is a trick to get hold of the client prop which
-        // prevents closing of the popup
-        JComboBox box = new JComboBox();
-        Object preventHide = box.getClientProperty("doNotCancelPopup");
-        datePicker.getEditor().putClientProperty("doNotCancelPopup", preventHide);
+        datePicker.getEditor().putClientProperty("doNotCancelPopup", 
+                createDoNotCancelPopupClientProperty());
 
         updateEditorValue();
         if (updateListeners) {
@@ -942,7 +941,9 @@
      * control popup visibility?
      */
     public void hidePopup() {
-        if (popup != null) popup.setVisible(false);
+        if (popup != null) {
+            popup.setVisible(false);
+        }
     }
 
     public boolean isPopupVisible() {
@@ -980,7 +981,7 @@
      */
     private Action createCommitAction() {
         Action action = new AbstractAction() {
-
+            @Override
             public void actionPerformed(ActionEvent e) {
                 commit();
             }
@@ -997,7 +998,7 @@
      */
     private Action createCancelAction() {
         Action action = new AbstractAction() {
-
+            @Override
             public void actionPerformed(ActionEvent e) {
                 cancel();
             }
@@ -1008,7 +1009,7 @@
 
     private Action createHomeAction(final boolean commit) {
         Action action = new AbstractAction( ) {
-
+            @Override
             public void actionPerformed(ActionEvent e) {
                 home(commit);
                 
@@ -1054,6 +1055,7 @@
             editor.getActionMap().put(TEXT_CANCEL_KEY, this);
         }
         
+        @Override
         public void actionPerformed(ActionEvent e) {
             cancelAction.actionPerformed(null);
             cancel();
@@ -1088,6 +1090,7 @@
             datePicker.getEditor().requestFocusInWindow();
 //            datePicker.requestFocusInWindow();
             SwingUtilities.invokeLater(new Runnable() {
+                @Override
                 public void run() {
                     popup.show(datePicker,
                             0, datePicker.getHeight());
@@ -1114,6 +1117,7 @@
             super("TogglePopup");
         }
 
+        @Override
         public void actionPerformed(ActionEvent ev) {
             toggleShowPopup();
         }
@@ -1165,9 +1169,11 @@
 //------------- implement Mouse/MotionListener        
         private boolean _forwardReleaseEvent = false;
 
+        @Override
         public void mouseClicked(MouseEvent ev) {
         }
 
+        @Override
         public void mousePressed(MouseEvent ev) {
             if (!datePicker.isEnabled()) {
                 return;
@@ -1181,6 +1187,7 @@
             toggleShowPopup();
         }
 
+        @Override
         public void mouseReleased(MouseEvent ev) {
             if (!datePicker.isEnabled() || !datePicker.isEditable()) {
                 return;
@@ -1196,12 +1203,15 @@
             }
         }
 
+        @Override
         public void mouseEntered(MouseEvent ev) {
         }
 
+        @Override
         public void mouseExited(MouseEvent ev) {
         }
 
+        @Override
         public void mouseDragged(MouseEvent ev) {
             if (!datePicker.isEnabled() || !datePicker.isEditable()) {
                 return;
@@ -1219,10 +1229,11 @@
             monthView.dispatchEvent(ev);
         }
 
+        @Override
         public void mouseMoved(MouseEvent ev) {
         }
 //------------------ implement DateSelectionListener
-        
+        @Override
         public void valueChanged(DateSelectionEvent ev) {
             updateFromSelectionChanged(ev.getEventType(), ev.isAdjusting());
         }
@@ -1231,6 +1242,7 @@
         /**
          * {@inheritDoc}
          */
+        @Override
         public void propertyChange(PropertyChangeEvent e) {
             if (e.getSource() == datePicker) {
                 datePickerPropertyChange(e);
@@ -1259,8 +1271,7 @@
          */
         private void editorPropertyChange(PropertyChangeEvent evt) {
             if ("value".equals(evt.getPropertyName())) {
-                ;
-                
+
                 Object oldVal = evt.getOldValue();
                 Object newVal = evt.getNewValue();
                 
@@ -1353,19 +1364,23 @@
         }
 
 //-------------- implement LayoutManager
-        
+        @Override
         public void addLayoutComponent(String name, Component comp) { }
 
+        @Override
         public void removeLayoutComponent(Component comp) { }
 
+        @Override
         public Dimension preferredLayoutSize(Container parent) {
             return parent.getPreferredSize();
         }
 
+        @Override
         public Dimension minimumLayoutSize(Container parent) {
             return parent.getMinimumSize();
         }
 
+        @Override
         public void layoutContainer(Container parent) {
             Insets insets = datePicker.getInsets();
             int width = datePicker.getWidth() - insets.left - insets.right;
@@ -1389,9 +1404,11 @@
         }
 
 // ------------- implement actionListener (listening to monthView actionEvent)
-        
+        @Override
         public void actionPerformed(ActionEvent e) {
-            if (e == null) return;
+            if (e == null) {
+                return;
+            }
             if (e.getSource() == datePicker.getMonthView()) {
                 monthViewActionPerformed(e);
             } else if (e.getSource() == datePicker.getEditor()) {
@@ -1430,8 +1447,11 @@
          * Do the same as combo: manually pass-on the focus to the editor.
          * 
          */
+        @Override
         public void focusGained(FocusEvent e) {
-            if (e.isTemporary()) return;
+            if (e.isTemporary()) {
+                return;
+            }
             popupRemover.load();
             if (e.getSource() == datePicker) {
                datePicker.getEditor().requestFocusInWindow(); 
@@ -1460,6 +1480,7 @@
          * 
          * listen to keyboardFocusManager?
          */
+        @Override
         public void focusLost(FocusEvent e) {
             
         }
@@ -1498,6 +1519,7 @@
             unload(true);
         }
         
+        @Override
         public void propertyChange(PropertyChangeEvent evt) {
             if (!isPopupVisible()) {
                 unload(false);
@@ -1606,5 +1628,10 @@
     
 //------------ utility methods
 
-
+    private Object createDoNotCancelPopupClientProperty() {
+        // this is a trick to get hold of the client prop which
+        // prevents closing of the popup
+        JComboBox box = new JComboBox();
+        return box.getClientProperty("doNotCancelPopup");
 }
+}
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/util/DataViewUtils.java b/db.dataview/src/org/netbeans/modules/db/dataview/util/DataViewUtils.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/util/DataViewUtils.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/util/DataViewUtils.java
@@ -43,16 +43,11 @@
  */
 package org.netbeans.modules.db.dataview.util;
 
-import java.sql.Date;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.sql.Time;
-import java.sql.Timestamp;
 import java.sql.Types;
-import java.util.Iterator;
-import java.util.List;
 import org.netbeans.modules.db.dataview.meta.DBColumn;
 import org.netbeans.modules.db.dataview.meta.DBForeignKey;
 import org.netbeans.modules.db.dataview.meta.DBTable;
@@ -277,18 +272,15 @@
         String refString = column.getName() + " --> "; // NOI18N
         StringBuilder str = new StringBuilder(refString);
         DBTable table = column.getParentObject();
-        List list = table.getForeignKeys();
+        boolean firstReferencedColumn = false;
 
-        Iterator it = list.iterator();
-        while (it.hasNext()) {
-            DBForeignKey fk = (DBForeignKey) it.next();
+        for(DBForeignKey fk: table.getForeignKeys()) {
             if (fk.contains(column)) {
-                List pkColumnList = fk.getPKColumnNames();
-                Iterator it1 = pkColumnList.iterator();
-                while (it1.hasNext()) {
-                    String pkColName = (String) it1.next();
+                for(String pkColName: fk.getPKColumnNames()) {
                     str.append(pkColName);
-                    if (it1.hasNext()) {
+                    if (firstReferencedColumn) {
+                        firstReferencedColumn = false;
+                    } else {
                         str.append(", "); // NOI18N
                     }
                 }
@@ -305,7 +297,7 @@
     }
 
     public static String replaceInString(String originalString, String[] victims, String[] replacements) {
-        StringBuffer resultBuffer = new StringBuffer();
+        StringBuilder resultBuffer = new StringBuilder();
         boolean bReplaced = false;
 
         for (int charPosition = 0; charPosition < originalString.length(); charPosition++) {
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java b/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java
@@ -46,18 +46,16 @@
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.logging.Logger;
-
 import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.JComponent;
 import javax.swing.JFormattedTextField;
+import javax.swing.JFormattedTextField.AbstractFormatter;
+import javax.swing.JFormattedTextField.AbstractFormatterFactory;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.UIManager;
-import javax.swing.JFormattedTextField.AbstractFormatter;
-import javax.swing.JFormattedTextField.AbstractFormatterFactory;
 import javax.swing.text.DefaultFormatterFactory;
-
 import org.jdesktop.swingx.JXHyperlink;
 import org.jdesktop.swingx.JXMonthView;
 import org.jdesktop.swingx.JXPanel;
@@ -318,7 +316,7 @@
     }
 
     protected class SelectedValuesComparator implements Comparator<Calendar> {
-
+        @Override
         public int compare(Calendar cal1, Calendar cal2) {
 
             if (cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
@@ -372,7 +370,7 @@
     private PropertyChangeListener getMonthViewListener() {
         if (monthViewListener == null) {
             monthViewListener = new PropertyChangeListener() {
-
+                @Override
                 public void propertyChange(PropertyChangeEvent evt) {
                     if ("timeZone".equals(evt.getPropertyName())) {
                         updateTimeZone((TimeZone) evt.getOldValue(), (TimeZone) evt.getNewValue());
@@ -849,6 +847,7 @@
      * @param height Height of the component to determine baseline for.
      * @return baseline for the specified component
      */
+    @Override
     public int getBaseline(int width, int height) {
         return ((BasicDateTimePickerUI) ui).getBaseline(width, height);
     }
@@ -916,6 +915,7 @@
         private TodayAction todayAction;
         private JXHyperlink todayLink;
 
+        @SuppressWarnings("rawtypes")
         TodayPanel() {
             super(new FlowLayout());
             setBackgroundPainter(new MattePainter(new GradientPaint(0, 0, new Color(238, 238, 238), 0, 1, Color.WHITE)));
@@ -936,7 +936,9 @@
 
                 @Override
                 public void mousePressed(MouseEvent e) {
-                    if (e.getClickCount() != 2) return;
+                    if (e.getClickCount() != 2) {
+                        return;
+                    }
                     todayAction.select = true;
                 }
                 
@@ -973,6 +975,7 @@
                 putValue(NAME, getLinkFormat().format(new Object[] {cal.getTime()}));
             }
 
+            @Override
             public void actionPerformed(ActionEvent ae) {
                 String key = select ? JXDateTimePicker.HOME_COMMIT_KEY : JXDateTimePicker.HOME_NAVIGATE_KEY;
                 select = false;
diff --git a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/spi/DBConnectionProviderImpl.java b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/spi/DBConnectionProviderImpl.java
--- a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/spi/DBConnectionProviderImpl.java
+++ b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/spi/DBConnectionProviderImpl.java
@@ -63,7 +63,7 @@
 //@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.db.dataview.spi.DBConnectionProvider.class)
 public class DBConnectionProviderImpl implements DBConnectionProvider{
 
-/** Creates a new instance of DBConnectionProviderImpl */
+    /** Creates a new instance of DBConnectionProviderImpl */
     public DBConnectionProviderImpl() {
     }
     
@@ -80,6 +80,7 @@
         return null;
     }
 
+    @Override
     public void closeConnection(Connection con) {
         try {
             if(con != null) {
@@ -98,6 +99,7 @@
         }
     }
 
+    @Override
     public Connection getConnection(DatabaseConnection dbConn) {
         try {
             String driver = dbConn.getDriverClass();
@@ -110,13 +112,13 @@
 
             TestCaseContext context = DbUtil.getContext();
             File[] jars = context.getJars();
-            ArrayList list = new java.util.ArrayList();
+            ArrayList<URL> list = new java.util.ArrayList<URL>();
             for (int i = 0; i < jars.length; i++) {
-                list.add((URL)jars[i].toURI().toURL());
+                list.add(jars[i].toURI().toURL());
             }
-            URL[] driverURLs = (URL[]) list.toArray(new URL[0]);
+            URL[] driverURLs = list.toArray(new URL[0]);
             URLClassLoader l = new URLClassLoader(driverURLs);
-            Class c = Class.forName(driver, true, l);
+            Class<?> c = Class.forName(driver, true, l);
             Driver drv = (Driver) c.newInstance();
             Connection con = drv.connect(url, prop);
             return con;
diff --git a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/DbUtil.java b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/DbUtil.java
--- a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/DbUtil.java
+++ b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/DbUtil.java
@@ -57,6 +57,7 @@
 import org.netbeans.api.db.explorer.JDBCDriverManager;
 import org.netbeans.modules.db.dataview.spi.DBConnectionProviderImpl;
 import org.openide.util.Exceptions;
+import org.openide.util.Utilities;
 
 /**
  *
@@ -68,18 +69,18 @@
     public static String USER = "user";
     public static String PASSWORD = "password";
     public static final String AXION_DRIVER = "org.axiondb.jdbc.AxionDriver";
-    private static List localConnectionList = new ArrayList();
+    private static List<Connection> localConnectionList = new ArrayList<Connection>();
 
     public static DatabaseConnection getDBConnection() {
         try {
             TestCaseContext context = getContext();
             Properties prop = context.getProperties();
             File[] jars = context.getJars();
-            ArrayList list = new java.util.ArrayList();
+            ArrayList<URL> list = new java.util.ArrayList<URL>();
             for (int i = 0; i < jars.length; i++) {
-                list.add((URL)jars[i].toURI().toURL());
+                list.add(Utilities.toURI(jars[i]).toURL());
             }
-            URL[] urls = (URL[]) list.toArray(new URL[0]);
+            URL[] urls = list.toArray(new URL[0]);
             Class.forName(AXION_DRIVER);
             JDBCDriver driver = JDBCDriver.create(AXION_DRIVER, "MashupDB", AXION_DRIVER, urls);
             DatabaseConnection dbconn = DatabaseConnection.create(driver, prop.getProperty("url"), prop.getProperty("user"),
@@ -153,12 +154,10 @@
     public static Connection createConnection(String driverName, String url, String username, String password) throws Exception {
         // Try to get the connection directly. Dont go through DB Explorer.
         // It may pop up a window asking for password.
-        JDBCDriver drv = null;
         Connection conn = null;
         try {
-           
-                //url = adjustDatabaseURL(url);
-            drv = registerDriver(driverName);
+            //url = adjustDatabaseURL(url);
+            JDBCDriver drv  = registerDriver(driverName);
 
             conn = getConnection(drv, driverName, url, username, password);
             if (conn == null) { // get from db explorer
@@ -208,12 +207,9 @@
 
     public static DatabaseConnection createDatabaseConnection(String driverName, String url, String username, String password) throws Exception {
         DatabaseConnection dbconn = null;
-        JDBCDriver drv = null;
-        String schema = null;
         try {
-            
-                //url = adjustDatabaseURL(url);
-            drv = registerDriver(driverName);
+            //url = adjustDatabaseURL(url);
+            JDBCDriver drv = registerDriver(driverName);
 
             // check if connection exists in DB Explorer. Else add the connection to DB Explorer.
 
@@ -227,6 +223,7 @@
 
             // dont add instance db and monitor db and local dbs connections to db explorer.
             if (dbconn == null) {
+                String schema;
                 if (url.startsWith(AXION_URL_PREFIX)) {
                     schema = "";
                 } else {
@@ -284,11 +281,11 @@
             // if axion db driver not available in db explorer, add it.
             //URL[] url = new URL[1];
             File[] jars = cxt.getJars();
-            ArrayList list = new java.util.ArrayList();
+            ArrayList<URL> list = new java.util.ArrayList<URL>();
             for (int i = 0; i < jars.length; i++) {
-                list.add((URL)jars[i].toURI().toURL());
+                list.add(Utilities.toURI(jars[i]).toURL());
             }
-            URL[] url = (URL[]) list.toArray(new URL[0]);
+            URL[] url = list.toArray(new URL[0]);
             driver = JDBCDriver.create(driverName, "Mashup DB", driverName, url);
             JDBCDriverManager.getDefault().addDriver(driver);
         }
diff --git a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java
--- a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java
+++ b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java
@@ -69,7 +69,7 @@
     private File[] jars;
     private String name;
     
-    public TestCaseContext(HashMap map,String name)  throws Exception{
+    public TestCaseContext(HashMap<String,Object> map,String name)  throws Exception{
         this.name=name;
         setProperties((File)map.get(TestCaseDataFactory.DB_PROP));
         setJars((File[])map.get(TestCaseDataFactory.DB_JARS));
@@ -132,7 +132,7 @@
         sql_del=getContent(f);
     }
     
-    public Map getData(){
+    public Properties getData(){
         return data;
     }
     
@@ -148,27 +148,16 @@
         jars=f;
     }
     
-    private String[] parseContent(File f) throws  Exception{
-        BufferedReader br=new BufferedReader(new InputStreamReader(new FileInputStream(f.getAbsolutePath())));
-        List array=new ArrayList();
-        String s=null;
-        while((s=br.readLine())!=null){
-          array.add(s);
-        }
-        if(array.size()==0)
-            throw new RuntimeException(name+": File "+f.getName()+" doesn't containt the data !");
-        return (String[])array.toArray(new String[0]);
-    }
-    
     private  String getContent(File f) throws Exception{
         BufferedReader br=new BufferedReader(new InputStreamReader(new FileInputStream(f.getAbsolutePath())));
-        StringBuffer sb=new StringBuffer();
-        String s=null;
+        StringBuilder sb=new StringBuilder();
+        String s;
         while((s=br.readLine())!=null){
           sb.append(s);
         }
-        if(sb.length()==0)
+        if(sb.length()==0) {
             throw new RuntimeException(name+": File called "+f.getName()+" doesn't contain the data.");
+        }
         return sb.toString();
     }
     
diff --git a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java
--- a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java
+++ b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java
@@ -67,7 +67,7 @@
     public static String DB_SQLDEL="dbdel.sql";
     public static String DB_JARS="jar";
     public static String[] FILES={DB_SQLCREATE,DB_SQLINSERT,DB_SQLUPDATE,DB_PROP,DB_SQLDEL,DB_SQLSELECT,DB_TEXT};
-    private List list=new ArrayList();
+    private List<TestCaseContext> list=new ArrayList<TestCaseContext>();
     private static  TestCaseDataFactory factory;
     
     public static TestCaseDataFactory  getTestCaseFactory() throws Exception{
@@ -101,7 +101,7 @@
     
     private void process() throws Exception{
        File data_dir=getDataDir();
-       HashMap map=new HashMap();
+       HashMap<String,Object> map=new HashMap<String,Object>();
        String[] dir=data_dir.list();
        for(int i=0;i<dir.length;i++){
            String dir_name=dir[i];
@@ -110,19 +110,22 @@
                 
                 for(int index=0;index<FILES.length;index++){
                     File f=new File(path+File.separator+FILES[index]);
-                    if(!f.exists())
+                    if(!f.exists()) {
                         throw new RuntimeException("File called "+FILES[index] +"in directory "+dir_name+"doesn't exist");
+                    }
                     map.put(FILES[index],f);
                     
                 }
                 String[] s=new File(path).list(new FilenameFilter() {
+                    @Override
                     public boolean accept(File dir, String name) {
                          return  name.endsWith(".jar") || name.endsWith(".zip") ? true : false;
                     }
                 });
-                if(s.length==0)
+                if(s.length==0) {
                     throw new RuntimeException("the driver doesn't  extist for test case called: "+dir_name);
-                ArrayList drivers=new ArrayList();
+                }
+                ArrayList<File> drivers=new ArrayList<File>();
                 for(int myint=0;myint<s.length;myint++){
                    File file=new File(path+File.separator+s[myint]);
                    drivers.add(file);
# HG changeset patch
# User Matthias Bläsing <matthias42@netbeans.org>
# Date 1343565162 -7200
# Branch mb-patches3
# Node ID b8e69594322215ae6886eaa944d3b5ebad4dfb26
# Parent  52f7c6f20ae75376e0c5a15dd99dffe943cc4fed
Bug 214881 - part 2 - Fix warnings at compile time and cleanup code (fix IDE warnings where files were edited)

diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBColumn.java b/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBColumn.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBColumn.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBColumn.java
@@ -48,7 +48,7 @@
  * 
  * @author Ahimanikya Satapathy
  */
-public final class DBColumn extends DBObject<DBTable> implements Comparable {
+public final class DBColumn extends DBObject<DBTable> implements Comparable<DBColumn> {
 
     public static final int POSITION_UNKNOWN = Integer.MIN_VALUE;
     private boolean foreignKey;
@@ -81,25 +81,24 @@
         editable = (!table.getName().equals("") && !isGenerated);
     }
 
-    public int compareTo(Object refObj) {
-        if (refObj == null) {
+    @Override
+    public int compareTo(DBColumn refColumn) {
+        if (refColumn == null) {
             return -1;
         }
 
-        if (refObj == this) {
+        if (refColumn == this) {
             return 0;
         }
 
         String myName = getDisplayName();
         myName = (myName == null) ? columnName : myName;
 
-        String refName = null;
-        if (!(refObj instanceof DBColumn)) {
+        if (!(refColumn instanceof DBColumn)) {
             return -1;
         }
 
-        DBColumn refColumn = (DBColumn) refObj;
-        refName = refColumn.getName();
+        String refName = refColumn.getName();
 
         // compare primary keys
         if (this.isPrimaryKey() && !refColumn.isPrimaryKey()) {
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBMetaDataFactory.java b/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBMetaDataFactory.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBMetaDataFactory.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBMetaDataFactory.java
@@ -114,7 +114,7 @@
     }
 
     private static int getDBTypeFromURL(String url) {
-        int dbtype = -1;
+        int dbtype;
 
         // get the database type based on the product name converted to lowercase
         url = url.toLowerCase();
@@ -237,7 +237,7 @@
                         nfe);
             }
 
-            boolean isNullable = (rsMeta.isNullable(i) == rsMeta.columnNullable);
+            boolean isNullable = (rsMeta.isNullable(i) == ResultSetMetaData.columnNullable);
             String displayName = rsMeta.getColumnLabel(i);
             int displaySize = rsMeta.getColumnDisplaySize(i);
             boolean autoIncrement = rsMeta.isAutoIncrement(i);
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewDBTable.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewDBTable.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewDBTable.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewDBTable.java
@@ -114,7 +114,7 @@
         return columns.size();
     }
 
-    public synchronized Map getColumns() {
+    public synchronized Map<String,DBColumn> getColumns() {
         Map<String, DBColumn> colMap = new HashMap<String, DBColumn>();
         for (DBTable tbl : dbTables) {
             colMap.putAll(tbl.getColumns());
@@ -138,6 +138,7 @@
         private ColumnOrderComparator() {
         }
 
+        @Override
         public int compare(DBColumn col1, DBColumn col2) {
             return col1.getOrdinalPosition() - col2.getOrdinalPosition();
         }
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLExecutionHelper.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLExecutionHelper.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLExecutionHelper.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLExecutionHelper.java
@@ -207,7 +207,7 @@
             }
         }
         Loader l = new Loader();
-        Future f = rp.submit(l);
+        Future<?> f = rp.submit(l);
         try {
             f.get();
         } catch (InterruptedException ex) {
@@ -409,11 +409,6 @@
                 pstmt = conn.prepareStatement(updateStmt);
                 int pos = 1;
                 for (Object val : values) {
-                    // Check for Constant e.g <NULL>, <DEFAULT>, <CURRENT_TIMESTAMP> etc
-                    if (DataViewUtils.isSQLConstantString(val)) {
-                        continue;
-                    }
-
                     DBReadWriteHelper.setAttributeValue(pstmt, pos, types.get(pos - 1), val);
                     pos++;
                 }
@@ -654,7 +649,7 @@
                 }
             }
         } catch (SQLException ex) {
-            LOGGER.log(Level.SEVERE, "Could not get total row count " + ex); // NOI18N
+            LOGGER.log(Level.SEVERE, "Could not get total row count ", ex); // NOI18N
         }
     }
 
@@ -682,7 +677,7 @@
                 stmt.setFetchSize(pageSize);
             } catch (SQLException e) {
                 // ignore -  used only as a hint to the driver to optimize
-                LOGGER.log(Level.WARNING, "Unable to set Fetch size" + e); // NOI18N
+                LOGGER.log(Level.WARNING, "Unable to set Fetch size", e); // NOI18N
             }
 
             try {
@@ -692,7 +687,7 @@
                     stmt.setMaxRows(dataView.getDataViewPageContext().getCurrentPos() + pageSize);
                 }
             } catch (SQLException exc) {
-                LOGGER.log(Level.WARNING, "Unable to set Max row size" + exc); // NOI18N
+                LOGGER.log(Level.WARNING, "Unable to set Max row size", exc); // NOI18N
             }
         } else {
             stmt = conn.createStatement();
@@ -701,7 +696,7 @@
     }
 
     private void executeSQLStatement(Statement stmt, String sql) throws SQLException {
-        LOGGER.log(Level.FINE, "Statement: " + sql); // NOI18N
+        LOGGER.log(Level.FINE, "Statement: {0}", sql); // NOI18N
         dataView.setInfoStatusText(NbBundle.getMessage(SQLExecutionHelper.class, "LBL_sql_executestmt") + sql);
 
         long startTime = System.currentTimeMillis();
@@ -712,13 +707,13 @@
             try {
                 isResultSet = stmt.execute(appendLimitIfRequired(sql));
             } catch (NullPointerException ex) {
-                LOGGER.log(Level.SEVERE, "Failed to execute SQL Statement [" + sql + "], cause: " + ex);
+                LOGGER.log(Level.SEVERE, "Failed to execute SQL Statement [{0}], cause: {1}", new Object[] {sql, ex});
                 throw new SQLException(ex);
             } catch (SQLException sqlExc) {
                 if (sqlExc.getErrorCode() == 1064 && sqlExc.getSQLState().equals("37000")) {
                     isResultSet = stmt.execute(sql);
                 } else {
-                    LOGGER.log(Level.SEVERE, "Failed to execute SQL Statement [" + sql + "], cause: " + sqlExc);
+                    LOGGER.log(Level.SEVERE, "Failed to execute SQL Statement [{0}], cause: {1}", new Object[] {sql, sqlExc});
                     throw sqlExc;
                 }
             }
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementExecutor.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementExecutor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementExecutor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementExecutor.java
@@ -45,10 +45,10 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import org.netbeans.modules.db.dataview.meta.DBException;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
 import org.netbeans.modules.db.dataview.meta.DBConnectionFactory;
+import org.netbeans.modules.db.dataview.meta.DBException;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.util.Cancellable;
@@ -81,6 +81,7 @@
         this.task = task;
     }
 
+    @Override
     public void run() {
         assert task != null;
         try {
@@ -95,8 +96,8 @@
                 dataView.disableButtons();
 
                 conn = DBConnectionFactory.getInstance().getConnection(dataView.getDatabaseConnection());
-                String msg = "";
                 if (conn == null) {
+                    String msg;
                     Throwable connEx = DBConnectionFactory.getInstance().getLastException();
                     if (connEx != null) {
                         msg = connEx.getMessage();
@@ -124,6 +125,7 @@
         }
     }
 
+    @Override
     public boolean cancel() {
         return task.cancel();
     }
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementGenerator.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementGenerator.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementGenerator.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementGenerator.java
@@ -77,8 +77,8 @@
         StringBuilder insertSql = new StringBuilder();
         insertSql.append("INSERT INTO "); // NOI18N
 
-        String colNames = " ("; // NOI18N
-        String values = "";     // NOI18N
+        StringBuilder colNames = new StringBuilder(" ("); // NOI18N
+        StringBuilder values = new StringBuilder();
         String commaStr = ", "; // NOI18N
         boolean comma = false;
         for (int i = 0; i < insertedRow.length; i++) {
@@ -94,8 +94,8 @@
             }
 
             if (comma) {
-                values += commaStr;
-                colNames += commaStr;
+                values.append(commaStr);
+                colNames.append(commaStr);
             } else {
                 comma = true;
             }
@@ -103,15 +103,19 @@
             // Check for Constant e.g <NULL>, <DEFAULT>, <CURRENT_TIMESTAMP> etc
             if (val != null && DataViewUtils.isSQLConstantString(val, dbcol)) {
                 String constStr = ((String) val).substring(1, ((String) val).length() - 1);
-                values += constStr;
+                values.append(constStr);
             } else { // ELSE literals
-                values += insertedRow[i] == null ? " NULL " : "?"; // NOI18N
+                values.append(insertedRow[i] == null ? " NULL " : "?"); // NOI18N
             }
-            colNames += dbcol.getQualifiedName(true);
+            colNames.append(dbcol.getQualifiedName(true));
         }
 
-        colNames += ")"; // NOI18N
-        insertSql.append(tblMeta.getFullyQualifiedName(0, true) + colNames + " Values(" + values + ")"); // NOI18N
+        colNames.append(")"); // NOI18N
+        insertSql.append(tblMeta.getFullyQualifiedName(0, true));
+        insertSql.append(colNames.toString());
+        insertSql.append(" Values("); // NOI18N
+        insertSql.append(values.toString());
+        insertSql.append(")"); // NOI18N
 
         return insertSql.toString();
     }
@@ -154,7 +158,11 @@
         }
 
         rawcolNames += ")"; // NOI18N
-        rawInsertSql.append(tblMeta.getFullyQualifiedName(0, false) + rawcolNames + " \n\tVALUES (" + rawvalues + ")"); // NOI18N
+        rawInsertSql.append(tblMeta.getFullyQualifiedName(0, false));
+        rawInsertSql.append(rawcolNames);
+        rawInsertSql.append(" \n\tVALUES (");  // NOI18N
+        rawInsertSql.append(rawvalues);
+        rawInsertSql.append(")"); // NOI18N
 
         return rawInsertSql.toString();
     }
@@ -269,7 +277,7 @@
 
         boolean isdb2 = table.getParentObject().getDBType() == DBMetaDataFactory.DB2 ? true : false;
 
-        StringBuffer sql = new StringBuffer();
+        StringBuilder sql = new StringBuilder();
         List<DBColumn> columns = table.getColumnList();
         sql.append("CREATE TABLE ").append(table.getQualifiedName(false)).append(" ("); // NOI18N
         int count = 0;
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java
@@ -101,7 +101,7 @@
         });
     }
 
-    public ResultSetCellRenderer(ComponentProvider componentProvider) {
+    public ResultSetCellRenderer(ComponentProvider<? extends JComponent> componentProvider) {
         super(componentProvider);
     }
 
@@ -119,7 +119,7 @@
             return NULL_RENDERER.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
         } else if (value instanceof Number) {
             return NUMNBER_RENDERER.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-        } else if (DataViewUtils.isSQLConstantString(value)) {
+        } else if (DataViewUtils.isSQLConstantString(value, null)) {
             Component c = DEFAULT_RENDERER.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
             setTableCellToolTip(c, value);
             return c;            
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableCellEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableCellEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableCellEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableCellEditor.java
@@ -39,7 +39,7 @@
  * 
  * Portions Copyrighted 2009-2010 Sun Microsystems, Inc.
  */
-package org.netbeans.modules.db.dataview.table.celleditor;
+package org.netbeans.modules.db.dataview.table;
 
 import java.awt.Component;
 import java.awt.event.MouseEvent;
@@ -51,7 +51,6 @@
 import javax.swing.UIManager;
 import org.jdesktop.swingx.renderer.JRendererCheckBox;
 import org.netbeans.modules.db.dataview.meta.DBColumn;
-import org.netbeans.modules.db.dataview.table.ResultSetJXTable;
 import org.netbeans.modules.db.dataview.util.DBReadWriteHelper;
 import org.netbeans.modules.db.dataview.util.DataViewUtils;
 import org.openide.awt.StatusDisplayer;
@@ -61,7 +60,7 @@
     protected Object val;
     protected boolean editable = true;
     protected JTable table;
-    static final boolean isGtk = "GTK".equals (UIManager.getLookAndFeel ().getID ()); //NOI18N
+    protected static final boolean isGtk = "GTK".equals (UIManager.getLookAndFeel ().getID ()); //NOI18N
 
     public ResultSetTableCellEditor(final JTextField textField) {
         super(textField);
@@ -105,7 +104,7 @@
 
     @Override
     public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
-        if (DataViewUtils.isSQLConstantString(value)) {
+        if (DataViewUtils.isSQLConstantString(value, null)) {
             value = "";
         }
         return super.getTableCellEditorComponent(table, value, isSelected, row, column);
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java
@@ -64,7 +64,7 @@
     private Class[] collumnClasses;
     protected ResultSetJXTable table;
 
-    public static Class getTypeClass(DBColumn col) {
+    public static Class<? extends Object> getTypeClass(DBColumn col) {
         int colType = col.getJdbcType();
 
         if (colType == Types.BIT && col.getPrecision() <= 1) {
@@ -116,6 +116,7 @@
         }
     }
 
+    @SuppressWarnings("rawtypes")
     public ResultSetTableModel(ResultSetJXTable table) {
         super();
         this.table = table;
@@ -155,7 +156,8 @@
     }
 
     @Override
-    public Class getColumnClass(int columnIndex) {
+    @SuppressWarnings("unchecked")
+    public Class<? extends Object> getColumnClass(int columnIndex) {
         if (collumnClasses[columnIndex] == null) {
             return super.getColumnClass(columnIndex);
         } else {
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/BooleanTableCellEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/BooleanTableCellEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/BooleanTableCellEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/BooleanTableCellEditor.java
@@ -41,6 +41,7 @@
  */
 package org.netbeans.modules.db.dataview.table.celleditor;
 
+import org.netbeans.modules.db.dataview.table.ResultSetTableCellEditor;
 import java.awt.Component;
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/ClobFieldTableCellEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/ClobFieldTableCellEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/ClobFieldTableCellEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/ClobFieldTableCellEditor.java
@@ -79,7 +79,8 @@
                 }
             });
             charsetSelect = new JComboBox();
-            charsetSelect.setModel(new DefaultComboBoxModel(charset.toArray()));
+            charsetSelect.setModel(new DefaultComboBoxModel(
+                    charset.toArray(new Charset[charset.size()])));
             charsetSelect.setSelectedItem(Charset.defaultCharset());
             this.add(charsetSelect);
         }
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/DateTimePickerCellEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/DateTimePickerCellEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/DateTimePickerCellEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/DateTimePickerCellEditor.java
@@ -137,7 +137,7 @@
     }
 
     protected Timestamp getValueAsTimestamp(Object value) {
-        if (isEmpty(value) || DataViewUtils.isSQLConstantString(value)) {
+        if (isEmpty(value) || DataViewUtils.isSQLConstantString(value, null)) {
             return new Timestamp(System.currentTimeMillis());
         }
 
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/NumberFieldEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/NumberFieldEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/NumberFieldEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/NumberFieldEditor.java
@@ -46,6 +46,7 @@
 import javax.swing.JComponent;
 import javax.swing.JTable;
 import javax.swing.JTextField;
+import org.netbeans.modules.db.dataview.table.ResultSetTableCellEditor;
 
 public class NumberFieldEditor extends ResultSetTableCellEditor {
 
@@ -64,4 +65,4 @@
         setEditable(column, c, table.isCellEditable(row, column));
         return c;
     }
-}
\ No newline at end of file
+}
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/StringTableCellEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/StringTableCellEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/StringTableCellEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/StringTableCellEditor.java
@@ -63,6 +63,7 @@
 import javax.swing.table.TableCellEditor;
 import org.jdesktop.swingx.JXButton;
 import org.jdesktop.swingx.JXPanel;
+import org.netbeans.modules.db.dataview.table.ResultSetTableCellEditor;
 import org.openide.windows.WindowManager;
 
 public class StringTableCellEditor extends ResultSetTableCellEditor implements TableCellEditor, ActionListener {
@@ -151,4 +152,4 @@
             JOptionPane.showMessageDialog(parent, pane, table.getColumnName(column), JOptionPane.PLAIN_MESSAGE, null);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/util/BasicDateTimePickerUI.java b/db.dataview/src/org/netbeans/modules/db/dataview/util/BasicDateTimePickerUI.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/util/BasicDateTimePickerUI.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/util/BasicDateTimePickerUI.java
@@ -166,11 +166,8 @@
         
         popupButton = createPopupButton();
         if (popupButton != null) {
-            // this is a trick to get hold of the client prop which
-            // prevents closing of the popup
-            JComboBox box = new JComboBox();
-            Object preventHide = box.getClientProperty("doNotCancelPopup");
-            popupButton.putClientProperty("doNotCancelPopup", preventHide);
+            popupButton.putClientProperty("doNotCancelPopup", 
+                    createDoNotCancelPopupClientProperty());
             datePicker.add(popupButton);
         }
             updateChildLocale(datePicker.getLocale());
@@ -252,8 +249,9 @@
      * PRE: keybindings installed on picker.
      */
     protected void installLinkPanelKeyboardActions() {
-        if (datePicker.getLinkPanel() == null)
+        if (datePicker.getLinkPanel() == null)  {
             return;
+        }
         ActionMap map = datePicker.getLinkPanel().getActionMap();
         map.put(JXDateTimePicker.HOME_COMMIT_KEY, datePicker.getActionMap().get(
                 JXDateTimePicker.HOME_COMMIT_KEY));
@@ -277,7 +275,9 @@
      * 
      */
     protected void uninstallLinkPanelKeyboardActions(JComponent panel) {
-        if (panel == null) return;
+        if (panel == null) {
+            return;
+        }
         ActionMap map = panel.getActionMap();
         map.remove(JXDateTimePicker.HOME_COMMIT_KEY); 
         map.remove(JXDateTimePicker.HOME_NAVIGATE_KEY); 
@@ -705,7 +705,9 @@
      *    is intermediate
      */
     protected void updateFromSelectionChanged(EventType eventType, boolean adjusting) {
-        if (adjusting) return;
+        if (adjusting) {
+            return;
+        }
         updateEditorValue();
     }
 
@@ -755,11 +757,8 @@
             oldEditor.putClientProperty("doNotCancelPopup", null);
         }
         datePicker.add(datePicker.getEditor());
-        // this is a trick to get hold of the client prop which
-        // prevents closing of the popup
-        JComboBox box = new JComboBox();
-        Object preventHide = box.getClientProperty("doNotCancelPopup");
-        datePicker.getEditor().putClientProperty("doNotCancelPopup", preventHide);
+        datePicker.getEditor().putClientProperty("doNotCancelPopup", 
+                createDoNotCancelPopupClientProperty());
 
         updateEditorValue();
         if (updateListeners) {
@@ -942,7 +941,9 @@
      * control popup visibility?
      */
     public void hidePopup() {
-        if (popup != null) popup.setVisible(false);
+        if (popup != null) {
+            popup.setVisible(false);
+        }
     }
 
     public boolean isPopupVisible() {
@@ -980,7 +981,7 @@
      */
     private Action createCommitAction() {
         Action action = new AbstractAction() {
-
+            @Override
             public void actionPerformed(ActionEvent e) {
                 commit();
             }
@@ -997,7 +998,7 @@
      */
     private Action createCancelAction() {
         Action action = new AbstractAction() {
-
+            @Override
             public void actionPerformed(ActionEvent e) {
                 cancel();
             }
@@ -1008,7 +1009,7 @@
 
     private Action createHomeAction(final boolean commit) {
         Action action = new AbstractAction( ) {
-
+            @Override
             public void actionPerformed(ActionEvent e) {
                 home(commit);
                 
@@ -1054,6 +1055,7 @@
             editor.getActionMap().put(TEXT_CANCEL_KEY, this);
         }
         
+        @Override
         public void actionPerformed(ActionEvent e) {
             cancelAction.actionPerformed(null);
             cancel();
@@ -1088,6 +1090,7 @@
             datePicker.getEditor().requestFocusInWindow();
 //            datePicker.requestFocusInWindow();
             SwingUtilities.invokeLater(new Runnable() {
+                @Override
                 public void run() {
                     popup.show(datePicker,
                             0, datePicker.getHeight());
@@ -1114,6 +1117,7 @@
             super("TogglePopup");
         }
 
+        @Override
         public void actionPerformed(ActionEvent ev) {
             toggleShowPopup();
         }
@@ -1165,9 +1169,11 @@
 //------------- implement Mouse/MotionListener        
         private boolean _forwardReleaseEvent = false;
 
+        @Override
         public void mouseClicked(MouseEvent ev) {
         }
 
+        @Override
         public void mousePressed(MouseEvent ev) {
             if (!datePicker.isEnabled()) {
                 return;
@@ -1181,6 +1187,7 @@
             toggleShowPopup();
         }
 
+        @Override
         public void mouseReleased(MouseEvent ev) {
             if (!datePicker.isEnabled() || !datePicker.isEditable()) {
                 return;
@@ -1196,12 +1203,15 @@
             }
         }
 
+        @Override
         public void mouseEntered(MouseEvent ev) {
         }
 
+        @Override
         public void mouseExited(MouseEvent ev) {
         }
 
+        @Override
         public void mouseDragged(MouseEvent ev) {
             if (!datePicker.isEnabled() || !datePicker.isEditable()) {
                 return;
@@ -1219,10 +1229,11 @@
             monthView.dispatchEvent(ev);
         }
 
+        @Override
         public void mouseMoved(MouseEvent ev) {
         }
 //------------------ implement DateSelectionListener
-        
+        @Override
         public void valueChanged(DateSelectionEvent ev) {
             updateFromSelectionChanged(ev.getEventType(), ev.isAdjusting());
         }
@@ -1231,6 +1242,7 @@
         /**
          * {@inheritDoc}
          */
+        @Override
         public void propertyChange(PropertyChangeEvent e) {
             if (e.getSource() == datePicker) {
                 datePickerPropertyChange(e);
@@ -1259,8 +1271,7 @@
          */
         private void editorPropertyChange(PropertyChangeEvent evt) {
             if ("value".equals(evt.getPropertyName())) {
-                ;
-                
+
                 Object oldVal = evt.getOldValue();
                 Object newVal = evt.getNewValue();
                 
@@ -1353,19 +1364,23 @@
         }
 
 //-------------- implement LayoutManager
-        
+        @Override
         public void addLayoutComponent(String name, Component comp) { }
 
+        @Override
         public void removeLayoutComponent(Component comp) { }
 
+        @Override
         public Dimension preferredLayoutSize(Container parent) {
             return parent.getPreferredSize();
         }
 
+        @Override
         public Dimension minimumLayoutSize(Container parent) {
             return parent.getMinimumSize();
         }
 
+        @Override
         public void layoutContainer(Container parent) {
             Insets insets = datePicker.getInsets();
             int width = datePicker.getWidth() - insets.left - insets.right;
@@ -1389,9 +1404,11 @@
         }
 
 // ------------- implement actionListener (listening to monthView actionEvent)
-        
+        @Override
         public void actionPerformed(ActionEvent e) {
-            if (e == null) return;
+            if (e == null) {
+                return;
+            }
             if (e.getSource() == datePicker.getMonthView()) {
                 monthViewActionPerformed(e);
             } else if (e.getSource() == datePicker.getEditor()) {
@@ -1430,8 +1447,11 @@
          * Do the same as combo: manually pass-on the focus to the editor.
          * 
          */
+        @Override
         public void focusGained(FocusEvent e) {
-            if (e.isTemporary()) return;
+            if (e.isTemporary()) {
+                return;
+            }
             popupRemover.load();
             if (e.getSource() == datePicker) {
                datePicker.getEditor().requestFocusInWindow(); 
@@ -1460,6 +1480,7 @@
          * 
          * listen to keyboardFocusManager?
          */
+        @Override
         public void focusLost(FocusEvent e) {
             
         }
@@ -1498,6 +1519,7 @@
             unload(true);
         }
         
+        @Override
         public void propertyChange(PropertyChangeEvent evt) {
             if (!isPopupVisible()) {
                 unload(false);
@@ -1606,5 +1628,10 @@
     
 //------------ utility methods
 
-
+    private Object createDoNotCancelPopupClientProperty() {
+        // this is a trick to get hold of the client prop which
+        // prevents closing of the popup
+        JComboBox box = new JComboBox();
+        return box.getClientProperty("doNotCancelPopup");
 }
+}
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/util/DataViewUtils.java b/db.dataview/src/org/netbeans/modules/db/dataview/util/DataViewUtils.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/util/DataViewUtils.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/util/DataViewUtils.java
@@ -43,16 +43,11 @@
  */
 package org.netbeans.modules.db.dataview.util;
 
-import java.sql.Date;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.sql.Time;
-import java.sql.Timestamp;
 import java.sql.Types;
-import java.util.Iterator;
-import java.util.List;
 import org.netbeans.modules.db.dataview.meta.DBColumn;
 import org.netbeans.modules.db.dataview.meta.DBForeignKey;
 import org.netbeans.modules.db.dataview.meta.DBTable;
@@ -277,18 +272,15 @@
         String refString = column.getName() + " --> "; // NOI18N
         StringBuilder str = new StringBuilder(refString);
         DBTable table = column.getParentObject();
-        List list = table.getForeignKeys();
+        boolean firstReferencedColumn = false;
 
-        Iterator it = list.iterator();
-        while (it.hasNext()) {
-            DBForeignKey fk = (DBForeignKey) it.next();
+        for(DBForeignKey fk: table.getForeignKeys()) {
             if (fk.contains(column)) {
-                List pkColumnList = fk.getPKColumnNames();
-                Iterator it1 = pkColumnList.iterator();
-                while (it1.hasNext()) {
-                    String pkColName = (String) it1.next();
+                for(String pkColName: fk.getPKColumnNames()) {
                     str.append(pkColName);
-                    if (it1.hasNext()) {
+                    if (firstReferencedColumn) {
+                        firstReferencedColumn = false;
+                    } else {
                         str.append(", "); // NOI18N
                     }
                 }
@@ -305,7 +297,7 @@
     }
 
     public static String replaceInString(String originalString, String[] victims, String[] replacements) {
-        StringBuffer resultBuffer = new StringBuffer();
+        StringBuilder resultBuffer = new StringBuilder();
         boolean bReplaced = false;
 
         for (int charPosition = 0; charPosition < originalString.length(); charPosition++) {
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java b/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java
@@ -46,18 +46,16 @@
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.logging.Logger;
-
 import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.JComponent;
 import javax.swing.JFormattedTextField;
+import javax.swing.JFormattedTextField.AbstractFormatter;
+import javax.swing.JFormattedTextField.AbstractFormatterFactory;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.UIManager;
-import javax.swing.JFormattedTextField.AbstractFormatter;
-import javax.swing.JFormattedTextField.AbstractFormatterFactory;
 import javax.swing.text.DefaultFormatterFactory;
-
 import org.jdesktop.swingx.JXHyperlink;
 import org.jdesktop.swingx.JXMonthView;
 import org.jdesktop.swingx.JXPanel;
@@ -318,7 +316,7 @@
     }
 
     protected class SelectedValuesComparator implements Comparator<Calendar> {
-
+        @Override
         public int compare(Calendar cal1, Calendar cal2) {
 
             if (cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
@@ -372,7 +370,7 @@
     private PropertyChangeListener getMonthViewListener() {
         if (monthViewListener == null) {
             monthViewListener = new PropertyChangeListener() {
-
+                @Override
                 public void propertyChange(PropertyChangeEvent evt) {
                     if ("timeZone".equals(evt.getPropertyName())) {
                         updateTimeZone((TimeZone) evt.getOldValue(), (TimeZone) evt.getNewValue());
@@ -849,6 +847,7 @@
      * @param height Height of the component to determine baseline for.
      * @return baseline for the specified component
      */
+    @Override
     public int getBaseline(int width, int height) {
         return ((BasicDateTimePickerUI) ui).getBaseline(width, height);
     }
@@ -916,6 +915,7 @@
         private TodayAction todayAction;
         private JXHyperlink todayLink;
 
+        @SuppressWarnings("rawtypes")
         TodayPanel() {
             super(new FlowLayout());
             setBackgroundPainter(new MattePainter(new GradientPaint(0, 0, new Color(238, 238, 238), 0, 1, Color.WHITE)));
@@ -936,7 +936,9 @@
 
                 @Override
                 public void mousePressed(MouseEvent e) {
-                    if (e.getClickCount() != 2) return;
+                    if (e.getClickCount() != 2) {
+                        return;
+                    }
                     todayAction.select = true;
                 }
                 
@@ -973,6 +975,7 @@
                 putValue(NAME, getLinkFormat().format(new Object[] {cal.getTime()}));
             }
 
+            @Override
             public void actionPerformed(ActionEvent ae) {
                 String key = select ? JXDateTimePicker.HOME_COMMIT_KEY : JXDateTimePicker.HOME_NAVIGATE_KEY;
                 select = false;
diff --git a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/spi/DBConnectionProviderImpl.java b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/spi/DBConnectionProviderImpl.java
--- a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/spi/DBConnectionProviderImpl.java
+++ b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/spi/DBConnectionProviderImpl.java
@@ -63,7 +63,7 @@
 //@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.db.dataview.spi.DBConnectionProvider.class)
 public class DBConnectionProviderImpl implements DBConnectionProvider{
 
-/** Creates a new instance of DBConnectionProviderImpl */
+    /** Creates a new instance of DBConnectionProviderImpl */
     public DBConnectionProviderImpl() {
     }
     
@@ -80,6 +80,7 @@
         return null;
     }
 
+    @Override
     public void closeConnection(Connection con) {
         try {
             if(con != null) {
@@ -98,6 +99,7 @@
         }
     }
 
+    @Override
     public Connection getConnection(DatabaseConnection dbConn) {
         try {
             String driver = dbConn.getDriverClass();
@@ -110,13 +112,13 @@
 
             TestCaseContext context = DbUtil.getContext();
             File[] jars = context.getJars();
-            ArrayList list = new java.util.ArrayList();
+            ArrayList<URL> list = new java.util.ArrayList<URL>();
             for (int i = 0; i < jars.length; i++) {
-                list.add((URL)jars[i].toURI().toURL());
+                list.add(jars[i].toURI().toURL());
             }
-            URL[] driverURLs = (URL[]) list.toArray(new URL[0]);
+            URL[] driverURLs = list.toArray(new URL[0]);
             URLClassLoader l = new URLClassLoader(driverURLs);
-            Class c = Class.forName(driver, true, l);
+            Class<?> c = Class.forName(driver, true, l);
             Driver drv = (Driver) c.newInstance();
             Connection con = drv.connect(url, prop);
             return con;
diff --git a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/DbUtil.java b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/DbUtil.java
--- a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/DbUtil.java
+++ b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/DbUtil.java
@@ -57,6 +57,7 @@
 import org.netbeans.api.db.explorer.JDBCDriverManager;
 import org.netbeans.modules.db.dataview.spi.DBConnectionProviderImpl;
 import org.openide.util.Exceptions;
+import org.openide.util.Utilities;
 
 /**
  *
@@ -68,18 +69,18 @@
     public static String USER = "user";
     public static String PASSWORD = "password";
     public static final String AXION_DRIVER = "org.axiondb.jdbc.AxionDriver";
-    private static List localConnectionList = new ArrayList();
+    private static List<Connection> localConnectionList = new ArrayList<Connection>();
 
     public static DatabaseConnection getDBConnection() {
         try {
             TestCaseContext context = getContext();
             Properties prop = context.getProperties();
             File[] jars = context.getJars();
-            ArrayList list = new java.util.ArrayList();
+            ArrayList<URL> list = new java.util.ArrayList<URL>();
             for (int i = 0; i < jars.length; i++) {
-                list.add((URL)jars[i].toURI().toURL());
+                list.add(Utilities.toURI(jars[i]).toURL());
             }
-            URL[] urls = (URL[]) list.toArray(new URL[0]);
+            URL[] urls = list.toArray(new URL[0]);
             Class.forName(AXION_DRIVER);
             JDBCDriver driver = JDBCDriver.create(AXION_DRIVER, "MashupDB", AXION_DRIVER, urls);
             DatabaseConnection dbconn = DatabaseConnection.create(driver, prop.getProperty("url"), prop.getProperty("user"),
@@ -153,12 +154,10 @@
     public static Connection createConnection(String driverName, String url, String username, String password) throws Exception {
         // Try to get the connection directly. Dont go through DB Explorer.
         // It may pop up a window asking for password.
-        JDBCDriver drv = null;
         Connection conn = null;
         try {
-           
-                //url = adjustDatabaseURL(url);
-            drv = registerDriver(driverName);
+            //url = adjustDatabaseURL(url);
+            JDBCDriver drv  = registerDriver(driverName);
 
             conn = getConnection(drv, driverName, url, username, password);
             if (conn == null) { // get from db explorer
@@ -208,12 +207,9 @@
 
     public static DatabaseConnection createDatabaseConnection(String driverName, String url, String username, String password) throws Exception {
         DatabaseConnection dbconn = null;
-        JDBCDriver drv = null;
-        String schema = null;
         try {
-            
-                //url = adjustDatabaseURL(url);
-            drv = registerDriver(driverName);
+            //url = adjustDatabaseURL(url);
+            JDBCDriver drv = registerDriver(driverName);
 
             // check if connection exists in DB Explorer. Else add the connection to DB Explorer.
 
@@ -227,6 +223,7 @@
 
             // dont add instance db and monitor db and local dbs connections to db explorer.
             if (dbconn == null) {
+                String schema;
                 if (url.startsWith(AXION_URL_PREFIX)) {
                     schema = "";
                 } else {
@@ -284,11 +281,11 @@
             // if axion db driver not available in db explorer, add it.
             //URL[] url = new URL[1];
             File[] jars = cxt.getJars();
-            ArrayList list = new java.util.ArrayList();
+            ArrayList<URL> list = new java.util.ArrayList<URL>();
             for (int i = 0; i < jars.length; i++) {
-                list.add((URL)jars[i].toURI().toURL());
+                list.add(Utilities.toURI(jars[i]).toURL());
             }
-            URL[] url = (URL[]) list.toArray(new URL[0]);
+            URL[] url = list.toArray(new URL[0]);
             driver = JDBCDriver.create(driverName, "Mashup DB", driverName, url);
             JDBCDriverManager.getDefault().addDriver(driver);
         }
diff --git a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java
--- a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java
+++ b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java
@@ -69,7 +69,7 @@
     private File[] jars;
     private String name;
     
-    public TestCaseContext(HashMap map,String name)  throws Exception{
+    public TestCaseContext(HashMap<String,Object> map,String name)  throws Exception{
         this.name=name;
         setProperties((File)map.get(TestCaseDataFactory.DB_PROP));
         setJars((File[])map.get(TestCaseDataFactory.DB_JARS));
@@ -132,7 +132,7 @@
         sql_del=getContent(f);
     }
     
-    public Map getData(){
+    public Properties getData(){
         return data;
     }
     
@@ -148,27 +148,16 @@
         jars=f;
     }
     
-    private String[] parseContent(File f) throws  Exception{
-        BufferedReader br=new BufferedReader(new InputStreamReader(new FileInputStream(f.getAbsolutePath())));
-        List array=new ArrayList();
-        String s=null;
-        while((s=br.readLine())!=null){
-          array.add(s);
-        }
-        if(array.size()==0)
-            throw new RuntimeException(name+": File "+f.getName()+" doesn't containt the data !");
-        return (String[])array.toArray(new String[0]);
-    }
-    
     private  String getContent(File f) throws Exception{
         BufferedReader br=new BufferedReader(new InputStreamReader(new FileInputStream(f.getAbsolutePath())));
-        StringBuffer sb=new StringBuffer();
-        String s=null;
+        StringBuilder sb=new StringBuilder();
+        String s;
         while((s=br.readLine())!=null){
           sb.append(s);
         }
-        if(sb.length()==0)
+        if(sb.length()==0) {
             throw new RuntimeException(name+": File called "+f.getName()+" doesn't contain the data.");
+        }
         return sb.toString();
     }
     
diff --git a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java
--- a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java
+++ b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java
@@ -67,7 +67,7 @@
     public static String DB_SQLDEL="dbdel.sql";
     public static String DB_JARS="jar";
     public static String[] FILES={DB_SQLCREATE,DB_SQLINSERT,DB_SQLUPDATE,DB_PROP,DB_SQLDEL,DB_SQLSELECT,DB_TEXT};
-    private List list=new ArrayList();
+    private List<TestCaseContext> list=new ArrayList<TestCaseContext>();
     private static  TestCaseDataFactory factory;
     
     public static TestCaseDataFactory  getTestCaseFactory() throws Exception{
@@ -101,7 +101,7 @@
     
     private void process() throws Exception{
        File data_dir=getDataDir();
-       HashMap map=new HashMap();
+       HashMap<String,Object> map=new HashMap<String,Object>();
        String[] dir=data_dir.list();
        for(int i=0;i<dir.length;i++){
            String dir_name=dir[i];
@@ -110,19 +110,22 @@
                 
                 for(int index=0;index<FILES.length;index++){
                     File f=new File(path+File.separator+FILES[index]);
-                    if(!f.exists())
+                    if(!f.exists()) {
                         throw new RuntimeException("File called "+FILES[index] +"in directory "+dir_name+"doesn't exist");
+                    }
                     map.put(FILES[index],f);
                     
                 }
                 String[] s=new File(path).list(new FilenameFilter() {
+                    @Override
                     public boolean accept(File dir, String name) {
                          return  name.endsWith(".jar") || name.endsWith(".zip") ? true : false;
                     }
                 });
-                if(s.length==0)
+                if(s.length==0) {
                     throw new RuntimeException("the driver doesn't  extist for test case called: "+dir_name);
-                ArrayList drivers=new ArrayList();
+                }
+                ArrayList<File> drivers=new ArrayList<File>();
                 for(int myint=0;myint<s.length;myint++){
                    File file=new File(path+File.separator+s[myint]);
                    drivers.add(file);
# HG changeset patch
# User Matthias Bläsing <matthias42@netbeans.org>
# Date 1343569114 -7200
# Branch mb-patches3
# Node ID 7f9015a08ce26821bb3294fe56e2da21011f2a23
# Parent  ccd7210f11b6842b714dfb6247712f4bab7dffb8
Bug 214881 - part 2 - Fix warnings at compile time and cleanup code (fix IDE warnings where files were edited)

diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBColumn.java b/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBColumn.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBColumn.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBColumn.java
@@ -48,7 +48,7 @@
  * 
  * @author Ahimanikya Satapathy
  */
-public final class DBColumn extends DBObject<DBTable> implements Comparable {
+public final class DBColumn extends DBObject<DBTable> implements Comparable<DBColumn> {
 
     public static final int POSITION_UNKNOWN = Integer.MIN_VALUE;
     private boolean foreignKey;
@@ -81,25 +81,24 @@
         editable = (!table.getName().equals("") && !isGenerated);
     }
 
-    public int compareTo(Object refObj) {
-        if (refObj == null) {
+    @Override
+    public int compareTo(DBColumn refColumn) {
+        if (refColumn == null) {
             return -1;
         }
 
-        if (refObj == this) {
+        if (refColumn == this) {
             return 0;
         }
 
         String myName = getDisplayName();
         myName = (myName == null) ? columnName : myName;
 
-        String refName = null;
-        if (!(refObj instanceof DBColumn)) {
+        if (!(refColumn instanceof DBColumn)) {
             return -1;
         }
 
-        DBColumn refColumn = (DBColumn) refObj;
-        refName = refColumn.getName();
+        String refName = refColumn.getName();
 
         // compare primary keys
         if (this.isPrimaryKey() && !refColumn.isPrimaryKey()) {
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBMetaDataFactory.java b/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBMetaDataFactory.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBMetaDataFactory.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/meta/DBMetaDataFactory.java
@@ -114,7 +114,7 @@
     }
 
     private static int getDBTypeFromURL(String url) {
-        int dbtype = -1;
+        int dbtype;
 
         // get the database type based on the product name converted to lowercase
         url = url.toLowerCase();
@@ -237,7 +237,7 @@
                         nfe);
             }
 
-            boolean isNullable = (rsMeta.isNullable(i) == rsMeta.columnNullable);
+            boolean isNullable = (rsMeta.isNullable(i) == ResultSetMetaData.columnNullable);
             String displayName = rsMeta.getColumnLabel(i);
             int displaySize = rsMeta.getColumnDisplaySize(i);
             boolean autoIncrement = rsMeta.isAutoIncrement(i);
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewDBTable.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewDBTable.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewDBTable.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewDBTable.java
@@ -114,7 +114,7 @@
         return columns.size();
     }
 
-    public synchronized Map getColumns() {
+    public synchronized Map<String,DBColumn> getColumns() {
         Map<String, DBColumn> colMap = new HashMap<String, DBColumn>();
         for (DBTable tbl : dbTables) {
             colMap.putAll(tbl.getColumns());
@@ -138,6 +138,7 @@
         private ColumnOrderComparator() {
         }
 
+        @Override
         public int compare(DBColumn col1, DBColumn col2) {
             return col1.getOrdinalPosition() - col2.getOrdinalPosition();
         }
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java
@@ -108,6 +108,7 @@
     }
 
     @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public void setModel(TableModel dataModel) {
         RowFilter oldFilter = getRowFilter();
         super.setModel(dataModel);
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLExecutionHelper.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLExecutionHelper.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLExecutionHelper.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLExecutionHelper.java
@@ -207,7 +207,7 @@
             }
         }
         Loader l = new Loader();
-        Future f = rp.submit(l);
+        Future<?> f = rp.submit(l);
         try {
             f.get();
         } catch (InterruptedException ex) {
@@ -409,11 +409,6 @@
                 pstmt = conn.prepareStatement(updateStmt);
                 int pos = 1;
                 for (Object val : values) {
-                    // Check for Constant e.g <NULL>, <DEFAULT>, <CURRENT_TIMESTAMP> etc
-                    if (DataViewUtils.isSQLConstantString(val)) {
-                        continue;
-                    }
-
                     DBReadWriteHelper.setAttributeValue(pstmt, pos, types.get(pos - 1), val);
                     pos++;
                 }
@@ -654,7 +649,7 @@
                 }
             }
         } catch (SQLException ex) {
-            LOGGER.log(Level.SEVERE, "Could not get total row count " + ex); // NOI18N
+            LOGGER.log(Level.SEVERE, "Could not get total row count ", ex); // NOI18N
         }
     }
 
@@ -682,7 +677,7 @@
                 stmt.setFetchSize(pageSize);
             } catch (SQLException e) {
                 // ignore -  used only as a hint to the driver to optimize
-                LOGGER.log(Level.WARNING, "Unable to set Fetch size" + e); // NOI18N
+                LOGGER.log(Level.WARNING, "Unable to set Fetch size", e); // NOI18N
             }
 
             try {
@@ -692,7 +687,7 @@
                     stmt.setMaxRows(dataView.getDataViewPageContext().getCurrentPos() + pageSize);
                 }
             } catch (SQLException exc) {
-                LOGGER.log(Level.WARNING, "Unable to set Max row size" + exc); // NOI18N
+                LOGGER.log(Level.WARNING, "Unable to set Max row size", exc); // NOI18N
             }
         } else {
             stmt = conn.createStatement();
@@ -701,7 +696,7 @@
     }
 
     private void executeSQLStatement(Statement stmt, String sql) throws SQLException {
-        LOGGER.log(Level.FINE, "Statement: " + sql); // NOI18N
+        LOGGER.log(Level.FINE, "Statement: {0}", sql); // NOI18N
         dataView.setInfoStatusText(NbBundle.getMessage(SQLExecutionHelper.class, "LBL_sql_executestmt") + sql);
 
         long startTime = System.currentTimeMillis();
@@ -712,13 +707,13 @@
             try {
                 isResultSet = stmt.execute(appendLimitIfRequired(sql));
             } catch (NullPointerException ex) {
-                LOGGER.log(Level.SEVERE, "Failed to execute SQL Statement [" + sql + "], cause: " + ex);
+                LOGGER.log(Level.SEVERE, "Failed to execute SQL Statement [{0}], cause: {1}", new Object[] {sql, ex});
                 throw new SQLException(ex);
             } catch (SQLException sqlExc) {
                 if (sqlExc.getErrorCode() == 1064 && sqlExc.getSQLState().equals("37000")) {
                     isResultSet = stmt.execute(sql);
                 } else {
-                    LOGGER.log(Level.SEVERE, "Failed to execute SQL Statement [" + sql + "], cause: " + sqlExc);
+                    LOGGER.log(Level.SEVERE, "Failed to execute SQL Statement [{0}], cause: {1}", new Object[] {sql, sqlExc});
                     throw sqlExc;
                 }
             }
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementExecutor.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementExecutor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementExecutor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementExecutor.java
@@ -45,10 +45,10 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import org.netbeans.modules.db.dataview.meta.DBException;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
 import org.netbeans.modules.db.dataview.meta.DBConnectionFactory;
+import org.netbeans.modules.db.dataview.meta.DBException;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.util.Cancellable;
@@ -81,6 +81,7 @@
         this.task = task;
     }
 
+    @Override
     public void run() {
         assert task != null;
         try {
@@ -95,8 +96,8 @@
                 dataView.disableButtons();
 
                 conn = DBConnectionFactory.getInstance().getConnection(dataView.getDatabaseConnection());
-                String msg = "";
                 if (conn == null) {
+                    String msg;
                     Throwable connEx = DBConnectionFactory.getInstance().getLastException();
                     if (connEx != null) {
                         msg = connEx.getMessage();
@@ -124,6 +125,7 @@
         }
     }
 
+    @Override
     public boolean cancel() {
         return task.cancel();
     }
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementGenerator.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementGenerator.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementGenerator.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementGenerator.java
@@ -77,8 +77,8 @@
         StringBuilder insertSql = new StringBuilder();
         insertSql.append("INSERT INTO "); // NOI18N
 
-        String colNames = " ("; // NOI18N
-        String values = "";     // NOI18N
+        StringBuilder colNames = new StringBuilder(" ("); // NOI18N
+        StringBuilder values = new StringBuilder();
         String commaStr = ", "; // NOI18N
         boolean comma = false;
         for (int i = 0; i < insertedRow.length; i++) {
@@ -94,8 +94,8 @@
             }
 
             if (comma) {
-                values += commaStr;
-                colNames += commaStr;
+                values.append(commaStr);
+                colNames.append(commaStr);
             } else {
                 comma = true;
             }
@@ -103,15 +103,19 @@
             // Check for Constant e.g <NULL>, <DEFAULT>, <CURRENT_TIMESTAMP> etc
             if (val != null && DataViewUtils.isSQLConstantString(val, dbcol)) {
                 String constStr = ((String) val).substring(1, ((String) val).length() - 1);
-                values += constStr;
+                values.append(constStr);
             } else { // ELSE literals
-                values += insertedRow[i] == null ? " NULL " : "?"; // NOI18N
+                values.append(insertedRow[i] == null ? " NULL " : "?"); // NOI18N
             }
-            colNames += dbcol.getQualifiedName(true);
+            colNames.append(dbcol.getQualifiedName(true));
         }
 
-        colNames += ")"; // NOI18N
-        insertSql.append(tblMeta.getFullyQualifiedName(0, true) + colNames + " Values(" + values + ")"); // NOI18N
+        colNames.append(")"); // NOI18N
+        insertSql.append(tblMeta.getFullyQualifiedName(0, true));
+        insertSql.append(colNames.toString());
+        insertSql.append(" Values("); // NOI18N
+        insertSql.append(values.toString());
+        insertSql.append(")"); // NOI18N
 
         return insertSql.toString();
     }
@@ -154,7 +158,11 @@
         }
 
         rawcolNames += ")"; // NOI18N
-        rawInsertSql.append(tblMeta.getFullyQualifiedName(0, false) + rawcolNames + " \n\tVALUES (" + rawvalues + ")"); // NOI18N
+        rawInsertSql.append(tblMeta.getFullyQualifiedName(0, false));
+        rawInsertSql.append(rawcolNames);
+        rawInsertSql.append(" \n\tVALUES (");  // NOI18N
+        rawInsertSql.append(rawvalues);
+        rawInsertSql.append(")"); // NOI18N
 
         return rawInsertSql.toString();
     }
@@ -269,7 +277,7 @@
 
         boolean isdb2 = table.getParentObject().getDBType() == DBMetaDataFactory.DB2 ? true : false;
 
-        StringBuffer sql = new StringBuffer();
+        StringBuilder sql = new StringBuilder();
         List<DBColumn> columns = table.getColumnList();
         sql.append("CREATE TABLE ").append(table.getQualifiedName(false)).append(" ("); // NOI18N
         int count = 0;
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/JXTableRowHeader.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/JXTableRowHeader.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/JXTableRowHeader.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/JXTableRowHeader.java
@@ -243,7 +243,7 @@
     private final CountingTableModel ctm = new CountingTableModel();
     private final JXTable headerTable;
     private JXTable backingTable;
-    private RowSorter backingSorter;
+    private RowSorter<?> backingSorter;
 
     /**
      * Create a row header from the given {@code JTable}. This row header will
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java
@@ -101,7 +101,7 @@
         });
     }
 
-    public ResultSetCellRenderer(ComponentProvider componentProvider) {
+    public ResultSetCellRenderer(ComponentProvider<? extends JComponent> componentProvider) {
         super(componentProvider);
     }
 
@@ -119,7 +119,7 @@
             return NULL_RENDERER.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
         } else if (value instanceof Number) {
             return NUMNBER_RENDERER.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-        } else if (DataViewUtils.isSQLConstantString(value)) {
+        } else if (DataViewUtils.isSQLConstantString(value, null)) {
             Component c = DEFAULT_RENDERER.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
             setTableCellToolTip(c, value);
             return c;            
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableCellEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableCellEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableCellEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableCellEditor.java
@@ -39,7 +39,7 @@
  * 
  * Portions Copyrighted 2009-2010 Sun Microsystems, Inc.
  */
-package org.netbeans.modules.db.dataview.table.celleditor;
+package org.netbeans.modules.db.dataview.table;
 
 import java.awt.Component;
 import java.awt.event.MouseEvent;
@@ -51,7 +51,6 @@
 import javax.swing.UIManager;
 import org.jdesktop.swingx.renderer.JRendererCheckBox;
 import org.netbeans.modules.db.dataview.meta.DBColumn;
-import org.netbeans.modules.db.dataview.table.ResultSetJXTable;
 import org.netbeans.modules.db.dataview.util.DBReadWriteHelper;
 import org.netbeans.modules.db.dataview.util.DataViewUtils;
 import org.openide.awt.StatusDisplayer;
@@ -61,7 +60,7 @@
     protected Object val;
     protected boolean editable = true;
     protected JTable table;
-    static final boolean isGtk = "GTK".equals (UIManager.getLookAndFeel ().getID ()); //NOI18N
+    protected static final boolean isGtk = "GTK".equals (UIManager.getLookAndFeel ().getID ()); //NOI18N
 
     public ResultSetTableCellEditor(final JTextField textField) {
         super(textField);
@@ -105,7 +104,7 @@
 
     @Override
     public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
-        if (DataViewUtils.isSQLConstantString(value)) {
+        if (DataViewUtils.isSQLConstantString(value, null)) {
             value = "";
         }
         return super.getTableCellEditorComponent(table, value, isSelected, row, column);
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java
@@ -64,7 +64,7 @@
     private Class[] collumnClasses;
     protected ResultSetJXTable table;
 
-    public static Class getTypeClass(DBColumn col) {
+    public static Class<? extends Object> getTypeClass(DBColumn col) {
         int colType = col.getJdbcType();
 
         if (colType == Types.BIT && col.getPrecision() <= 1) {
@@ -116,6 +116,7 @@
         }
     }
 
+    @SuppressWarnings("rawtypes")
     public ResultSetTableModel(ResultSetJXTable table) {
         super();
         this.table = table;
@@ -155,7 +156,8 @@
     }
 
     @Override
-    public Class getColumnClass(int columnIndex) {
+    @SuppressWarnings("unchecked")
+    public Class<? extends Object> getColumnClass(int columnIndex) {
         if (collumnClasses[columnIndex] == null) {
             return super.getColumnClass(columnIndex);
         } else {
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/BooleanTableCellEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/BooleanTableCellEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/BooleanTableCellEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/BooleanTableCellEditor.java
@@ -41,6 +41,7 @@
  */
 package org.netbeans.modules.db.dataview.table.celleditor;
 
+import org.netbeans.modules.db.dataview.table.ResultSetTableCellEditor;
 import java.awt.Component;
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/ClobFieldTableCellEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/ClobFieldTableCellEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/ClobFieldTableCellEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/ClobFieldTableCellEditor.java
@@ -79,7 +79,8 @@
                 }
             });
             charsetSelect = new JComboBox();
-            charsetSelect.setModel(new DefaultComboBoxModel(charset.toArray()));
+            charsetSelect.setModel(new DefaultComboBoxModel(
+                    charset.toArray(new Charset[charset.size()])));
             charsetSelect.setSelectedItem(Charset.defaultCharset());
             this.add(charsetSelect);
         }
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/DateTimePickerCellEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/DateTimePickerCellEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/DateTimePickerCellEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/DateTimePickerCellEditor.java
@@ -137,7 +137,7 @@
     }
 
     protected Timestamp getValueAsTimestamp(Object value) {
-        if (isEmpty(value) || DataViewUtils.isSQLConstantString(value)) {
+        if (isEmpty(value) || DataViewUtils.isSQLConstantString(value, null)) {
             return new Timestamp(System.currentTimeMillis());
         }
 
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/NumberFieldEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/NumberFieldEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/NumberFieldEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/NumberFieldEditor.java
@@ -46,6 +46,7 @@
 import javax.swing.JComponent;
 import javax.swing.JTable;
 import javax.swing.JTextField;
+import org.netbeans.modules.db.dataview.table.ResultSetTableCellEditor;
 
 public class NumberFieldEditor extends ResultSetTableCellEditor {
 
@@ -64,4 +65,4 @@
         setEditable(column, c, table.isCellEditable(row, column));
         return c;
     }
-}
\ No newline at end of file
+}
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/StringTableCellEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/StringTableCellEditor.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/StringTableCellEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/StringTableCellEditor.java
@@ -63,6 +63,7 @@
 import javax.swing.table.TableCellEditor;
 import org.jdesktop.swingx.JXButton;
 import org.jdesktop.swingx.JXPanel;
+import org.netbeans.modules.db.dataview.table.ResultSetTableCellEditor;
 import org.openide.windows.WindowManager;
 
 public class StringTableCellEditor extends ResultSetTableCellEditor implements TableCellEditor, ActionListener {
@@ -151,4 +152,4 @@
             JOptionPane.showMessageDialog(parent, pane, table.getColumnName(column), JOptionPane.PLAIN_MESSAGE, null);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/util/BasicDateTimePickerUI.java b/db.dataview/src/org/netbeans/modules/db/dataview/util/BasicDateTimePickerUI.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/util/BasicDateTimePickerUI.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/util/BasicDateTimePickerUI.java
@@ -166,11 +166,8 @@
         
         popupButton = createPopupButton();
         if (popupButton != null) {
-            // this is a trick to get hold of the client prop which
-            // prevents closing of the popup
-            JComboBox box = new JComboBox();
-            Object preventHide = box.getClientProperty("doNotCancelPopup");
-            popupButton.putClientProperty("doNotCancelPopup", preventHide);
+            popupButton.putClientProperty("doNotCancelPopup", 
+                    createDoNotCancelPopupClientProperty());
             datePicker.add(popupButton);
         }
             updateChildLocale(datePicker.getLocale());
@@ -252,8 +249,9 @@
      * PRE: keybindings installed on picker.
      */
     protected void installLinkPanelKeyboardActions() {
-        if (datePicker.getLinkPanel() == null)
+        if (datePicker.getLinkPanel() == null)  {
             return;
+        }
         ActionMap map = datePicker.getLinkPanel().getActionMap();
         map.put(JXDateTimePicker.HOME_COMMIT_KEY, datePicker.getActionMap().get(
                 JXDateTimePicker.HOME_COMMIT_KEY));
@@ -277,7 +275,9 @@
      * 
      */
     protected void uninstallLinkPanelKeyboardActions(JComponent panel) {
-        if (panel == null) return;
+        if (panel == null) {
+            return;
+        }
         ActionMap map = panel.getActionMap();
         map.remove(JXDateTimePicker.HOME_COMMIT_KEY); 
         map.remove(JXDateTimePicker.HOME_NAVIGATE_KEY); 
@@ -705,7 +705,9 @@
      *    is intermediate
      */
     protected void updateFromSelectionChanged(EventType eventType, boolean adjusting) {
-        if (adjusting) return;
+        if (adjusting) {
+            return;
+        }
         updateEditorValue();
     }
 
@@ -755,11 +757,8 @@
             oldEditor.putClientProperty("doNotCancelPopup", null);
         }
         datePicker.add(datePicker.getEditor());
-        // this is a trick to get hold of the client prop which
-        // prevents closing of the popup
-        JComboBox box = new JComboBox();
-        Object preventHide = box.getClientProperty("doNotCancelPopup");
-        datePicker.getEditor().putClientProperty("doNotCancelPopup", preventHide);
+        datePicker.getEditor().putClientProperty("doNotCancelPopup", 
+                createDoNotCancelPopupClientProperty());
 
         updateEditorValue();
         if (updateListeners) {
@@ -942,7 +941,9 @@
      * control popup visibility?
      */
     public void hidePopup() {
-        if (popup != null) popup.setVisible(false);
+        if (popup != null) {
+            popup.setVisible(false);
+        }
     }
 
     public boolean isPopupVisible() {
@@ -980,7 +981,7 @@
      */
     private Action createCommitAction() {
         Action action = new AbstractAction() {
-
+            @Override
             public void actionPerformed(ActionEvent e) {
                 commit();
             }
@@ -997,7 +998,7 @@
      */
     private Action createCancelAction() {
         Action action = new AbstractAction() {
-
+            @Override
             public void actionPerformed(ActionEvent e) {
                 cancel();
             }
@@ -1008,7 +1009,7 @@
 
     private Action createHomeAction(final boolean commit) {
         Action action = new AbstractAction( ) {
-
+            @Override
             public void actionPerformed(ActionEvent e) {
                 home(commit);
                 
@@ -1054,6 +1055,7 @@
             editor.getActionMap().put(TEXT_CANCEL_KEY, this);
         }
         
+        @Override
         public void actionPerformed(ActionEvent e) {
             cancelAction.actionPerformed(null);
             cancel();
@@ -1088,6 +1090,7 @@
             datePicker.getEditor().requestFocusInWindow();
 //            datePicker.requestFocusInWindow();
             SwingUtilities.invokeLater(new Runnable() {
+                @Override
                 public void run() {
                     popup.show(datePicker,
                             0, datePicker.getHeight());
@@ -1114,6 +1117,7 @@
             super("TogglePopup");
         }
 
+        @Override
         public void actionPerformed(ActionEvent ev) {
             toggleShowPopup();
         }
@@ -1165,9 +1169,11 @@
 //------------- implement Mouse/MotionListener        
         private boolean _forwardReleaseEvent = false;
 
+        @Override
         public void mouseClicked(MouseEvent ev) {
         }
 
+        @Override
         public void mousePressed(MouseEvent ev) {
             if (!datePicker.isEnabled()) {
                 return;
@@ -1181,6 +1187,7 @@
             toggleShowPopup();
         }
 
+        @Override
         public void mouseReleased(MouseEvent ev) {
             if (!datePicker.isEnabled() || !datePicker.isEditable()) {
                 return;
@@ -1196,12 +1203,15 @@
             }
         }
 
+        @Override
         public void mouseEntered(MouseEvent ev) {
         }
 
+        @Override
         public void mouseExited(MouseEvent ev) {
         }
 
+        @Override
         public void mouseDragged(MouseEvent ev) {
             if (!datePicker.isEnabled() || !datePicker.isEditable()) {
                 return;
@@ -1219,10 +1229,11 @@
             monthView.dispatchEvent(ev);
         }
 
+        @Override
         public void mouseMoved(MouseEvent ev) {
         }
 //------------------ implement DateSelectionListener
-        
+        @Override
         public void valueChanged(DateSelectionEvent ev) {
             updateFromSelectionChanged(ev.getEventType(), ev.isAdjusting());
         }
@@ -1231,6 +1242,7 @@
         /**
          * {@inheritDoc}
          */
+        @Override
         public void propertyChange(PropertyChangeEvent e) {
             if (e.getSource() == datePicker) {
                 datePickerPropertyChange(e);
@@ -1259,8 +1271,7 @@
          */
         private void editorPropertyChange(PropertyChangeEvent evt) {
             if ("value".equals(evt.getPropertyName())) {
-                ;
-                
+
                 Object oldVal = evt.getOldValue();
                 Object newVal = evt.getNewValue();
                 
@@ -1353,19 +1364,23 @@
         }
 
 //-------------- implement LayoutManager
-        
+        @Override
         public void addLayoutComponent(String name, Component comp) { }
 
+        @Override
         public void removeLayoutComponent(Component comp) { }
 
+        @Override
         public Dimension preferredLayoutSize(Container parent) {
             return parent.getPreferredSize();
         }
 
+        @Override
         public Dimension minimumLayoutSize(Container parent) {
             return parent.getMinimumSize();
         }
 
+        @Override
         public void layoutContainer(Container parent) {
             Insets insets = datePicker.getInsets();
             int width = datePicker.getWidth() - insets.left - insets.right;
@@ -1389,9 +1404,11 @@
         }
 
 // ------------- implement actionListener (listening to monthView actionEvent)
-        
+        @Override
         public void actionPerformed(ActionEvent e) {
-            if (e == null) return;
+            if (e == null) {
+                return;
+            }
             if (e.getSource() == datePicker.getMonthView()) {
                 monthViewActionPerformed(e);
             } else if (e.getSource() == datePicker.getEditor()) {
@@ -1430,8 +1447,11 @@
          * Do the same as combo: manually pass-on the focus to the editor.
          * 
          */
+        @Override
         public void focusGained(FocusEvent e) {
-            if (e.isTemporary()) return;
+            if (e.isTemporary()) {
+                return;
+            }
             popupRemover.load();
             if (e.getSource() == datePicker) {
                datePicker.getEditor().requestFocusInWindow(); 
@@ -1460,6 +1480,7 @@
          * 
          * listen to keyboardFocusManager?
          */
+        @Override
         public void focusLost(FocusEvent e) {
             
         }
@@ -1498,6 +1519,7 @@
             unload(true);
         }
         
+        @Override
         public void propertyChange(PropertyChangeEvent evt) {
             if (!isPopupVisible()) {
                 unload(false);
@@ -1606,5 +1628,10 @@
     
 //------------ utility methods
 
-
+    private Object createDoNotCancelPopupClientProperty() {
+        // this is a trick to get hold of the client prop which
+        // prevents closing of the popup
+        JComboBox box = new JComboBox();
+        return box.getClientProperty("doNotCancelPopup");
 }
+}
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/util/DataViewUtils.java b/db.dataview/src/org/netbeans/modules/db/dataview/util/DataViewUtils.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/util/DataViewUtils.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/util/DataViewUtils.java
@@ -43,16 +43,11 @@
  */
 package org.netbeans.modules.db.dataview.util;
 
-import java.sql.Date;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.sql.Time;
-import java.sql.Timestamp;
 import java.sql.Types;
-import java.util.Iterator;
-import java.util.List;
 import org.netbeans.modules.db.dataview.meta.DBColumn;
 import org.netbeans.modules.db.dataview.meta.DBForeignKey;
 import org.netbeans.modules.db.dataview.meta.DBTable;
@@ -277,18 +272,15 @@
         String refString = column.getName() + " --> "; // NOI18N
         StringBuilder str = new StringBuilder(refString);
         DBTable table = column.getParentObject();
-        List list = table.getForeignKeys();
+        boolean firstReferencedColumn = false;
 
-        Iterator it = list.iterator();
-        while (it.hasNext()) {
-            DBForeignKey fk = (DBForeignKey) it.next();
+        for(DBForeignKey fk: table.getForeignKeys()) {
             if (fk.contains(column)) {
-                List pkColumnList = fk.getPKColumnNames();
-                Iterator it1 = pkColumnList.iterator();
-                while (it1.hasNext()) {
-                    String pkColName = (String) it1.next();
+                for(String pkColName: fk.getPKColumnNames()) {
                     str.append(pkColName);
-                    if (it1.hasNext()) {
+                    if (firstReferencedColumn) {
+                        firstReferencedColumn = false;
+                    } else {
                         str.append(", "); // NOI18N
                     }
                 }
@@ -305,7 +297,7 @@
     }
 
     public static String replaceInString(String originalString, String[] victims, String[] replacements) {
-        StringBuffer resultBuffer = new StringBuffer();
+        StringBuilder resultBuffer = new StringBuilder();
         boolean bReplaced = false;
 
         for (int charPosition = 0; charPosition < originalString.length(); charPosition++) {
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java b/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java
@@ -46,18 +46,16 @@
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.logging.Logger;
-
 import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.JComponent;
 import javax.swing.JFormattedTextField;
+import javax.swing.JFormattedTextField.AbstractFormatter;
+import javax.swing.JFormattedTextField.AbstractFormatterFactory;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.UIManager;
-import javax.swing.JFormattedTextField.AbstractFormatter;
-import javax.swing.JFormattedTextField.AbstractFormatterFactory;
 import javax.swing.text.DefaultFormatterFactory;
-
 import org.jdesktop.swingx.JXHyperlink;
 import org.jdesktop.swingx.JXMonthView;
 import org.jdesktop.swingx.JXPanel;
@@ -318,7 +316,7 @@
     }
 
     protected class SelectedValuesComparator implements Comparator<Calendar> {
-
+        @Override
         public int compare(Calendar cal1, Calendar cal2) {
 
             if (cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
@@ -372,7 +370,7 @@
     private PropertyChangeListener getMonthViewListener() {
         if (monthViewListener == null) {
             monthViewListener = new PropertyChangeListener() {
-
+                @Override
                 public void propertyChange(PropertyChangeEvent evt) {
                     if ("timeZone".equals(evt.getPropertyName())) {
                         updateTimeZone((TimeZone) evt.getOldValue(), (TimeZone) evt.getNewValue());
@@ -849,6 +847,7 @@
      * @param height Height of the component to determine baseline for.
      * @return baseline for the specified component
      */
+    @Override
     public int getBaseline(int width, int height) {
         return ((BasicDateTimePickerUI) ui).getBaseline(width, height);
     }
@@ -916,6 +915,7 @@
         private TodayAction todayAction;
         private JXHyperlink todayLink;
 
+        @SuppressWarnings("rawtypes")
         TodayPanel() {
             super(new FlowLayout());
             setBackgroundPainter(new MattePainter(new GradientPaint(0, 0, new Color(238, 238, 238), 0, 1, Color.WHITE)));
@@ -936,7 +936,9 @@
 
                 @Override
                 public void mousePressed(MouseEvent e) {
-                    if (e.getClickCount() != 2) return;
+                    if (e.getClickCount() != 2) {
+                        return;
+                    }
                     todayAction.select = true;
                 }
                 
@@ -973,6 +975,7 @@
                 putValue(NAME, getLinkFormat().format(new Object[] {cal.getTime()}));
             }
 
+            @Override
             public void actionPerformed(ActionEvent ae) {
                 String key = select ? JXDateTimePicker.HOME_COMMIT_KEY : JXDateTimePicker.HOME_NAVIGATE_KEY;
                 select = false;
diff --git a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/spi/DBConnectionProviderImpl.java b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/spi/DBConnectionProviderImpl.java
--- a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/spi/DBConnectionProviderImpl.java
+++ b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/spi/DBConnectionProviderImpl.java
@@ -63,7 +63,7 @@
 //@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.db.dataview.spi.DBConnectionProvider.class)
 public class DBConnectionProviderImpl implements DBConnectionProvider{
 
-/** Creates a new instance of DBConnectionProviderImpl */
+    /** Creates a new instance of DBConnectionProviderImpl */
     public DBConnectionProviderImpl() {
     }
     
@@ -80,6 +80,7 @@
         return null;
     }
 
+    @Override
     public void closeConnection(Connection con) {
         try {
             if(con != null) {
@@ -98,6 +99,7 @@
         }
     }
 
+    @Override
     public Connection getConnection(DatabaseConnection dbConn) {
         try {
             String driver = dbConn.getDriverClass();
@@ -110,13 +112,13 @@
 
             TestCaseContext context = DbUtil.getContext();
             File[] jars = context.getJars();
-            ArrayList list = new java.util.ArrayList();
+            ArrayList<URL> list = new java.util.ArrayList<URL>();
             for (int i = 0; i < jars.length; i++) {
-                list.add((URL)jars[i].toURI().toURL());
+                list.add(jars[i].toURI().toURL());
             }
-            URL[] driverURLs = (URL[]) list.toArray(new URL[0]);
+            URL[] driverURLs = list.toArray(new URL[0]);
             URLClassLoader l = new URLClassLoader(driverURLs);
-            Class c = Class.forName(driver, true, l);
+            Class<?> c = Class.forName(driver, true, l);
             Driver drv = (Driver) c.newInstance();
             Connection con = drv.connect(url, prop);
             return con;
diff --git a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/DbUtil.java b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/DbUtil.java
--- a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/DbUtil.java
+++ b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/DbUtil.java
@@ -57,6 +57,7 @@
 import org.netbeans.api.db.explorer.JDBCDriverManager;
 import org.netbeans.modules.db.dataview.spi.DBConnectionProviderImpl;
 import org.openide.util.Exceptions;
+import org.openide.util.Utilities;
 
 /**
  *
@@ -68,18 +69,18 @@
     public static String USER = "user";
     public static String PASSWORD = "password";
     public static final String AXION_DRIVER = "org.axiondb.jdbc.AxionDriver";
-    private static List localConnectionList = new ArrayList();
+    private static List<Connection> localConnectionList = new ArrayList<Connection>();
 
     public static DatabaseConnection getDBConnection() {
         try {
             TestCaseContext context = getContext();
             Properties prop = context.getProperties();
             File[] jars = context.getJars();
-            ArrayList list = new java.util.ArrayList();
+            ArrayList<URL> list = new java.util.ArrayList<URL>();
             for (int i = 0; i < jars.length; i++) {
-                list.add((URL)jars[i].toURI().toURL());
+                list.add(Utilities.toURI(jars[i]).toURL());
             }
-            URL[] urls = (URL[]) list.toArray(new URL[0]);
+            URL[] urls = list.toArray(new URL[0]);
             Class.forName(AXION_DRIVER);
             JDBCDriver driver = JDBCDriver.create(AXION_DRIVER, "MashupDB", AXION_DRIVER, urls);
             DatabaseConnection dbconn = DatabaseConnection.create(driver, prop.getProperty("url"), prop.getProperty("user"),
@@ -153,12 +154,10 @@
     public static Connection createConnection(String driverName, String url, String username, String password) throws Exception {
         // Try to get the connection directly. Dont go through DB Explorer.
         // It may pop up a window asking for password.
-        JDBCDriver drv = null;
         Connection conn = null;
         try {
-           
-                //url = adjustDatabaseURL(url);
-            drv = registerDriver(driverName);
+            //url = adjustDatabaseURL(url);
+            JDBCDriver drv  = registerDriver(driverName);
 
             conn = getConnection(drv, driverName, url, username, password);
             if (conn == null) { // get from db explorer
@@ -208,12 +207,9 @@
 
     public static DatabaseConnection createDatabaseConnection(String driverName, String url, String username, String password) throws Exception {
         DatabaseConnection dbconn = null;
-        JDBCDriver drv = null;
-        String schema = null;
         try {
-            
-                //url = adjustDatabaseURL(url);
-            drv = registerDriver(driverName);
+            //url = adjustDatabaseURL(url);
+            JDBCDriver drv = registerDriver(driverName);
 
             // check if connection exists in DB Explorer. Else add the connection to DB Explorer.
 
@@ -227,6 +223,7 @@
 
             // dont add instance db and monitor db and local dbs connections to db explorer.
             if (dbconn == null) {
+                String schema;
                 if (url.startsWith(AXION_URL_PREFIX)) {
                     schema = "";
                 } else {
@@ -284,11 +281,11 @@
             // if axion db driver not available in db explorer, add it.
             //URL[] url = new URL[1];
             File[] jars = cxt.getJars();
-            ArrayList list = new java.util.ArrayList();
+            ArrayList<URL> list = new java.util.ArrayList<URL>();
             for (int i = 0; i < jars.length; i++) {
-                list.add((URL)jars[i].toURI().toURL());
+                list.add(Utilities.toURI(jars[i]).toURL());
             }
-            URL[] url = (URL[]) list.toArray(new URL[0]);
+            URL[] url = list.toArray(new URL[0]);
             driver = JDBCDriver.create(driverName, "Mashup DB", driverName, url);
             JDBCDriverManager.getDefault().addDriver(driver);
         }
diff --git a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java
--- a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java
+++ b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java
@@ -69,7 +69,7 @@
     private File[] jars;
     private String name;
     
-    public TestCaseContext(HashMap map,String name)  throws Exception{
+    public TestCaseContext(HashMap<String,Object> map,String name)  throws Exception{
         this.name=name;
         setProperties((File)map.get(TestCaseDataFactory.DB_PROP));
         setJars((File[])map.get(TestCaseDataFactory.DB_JARS));
@@ -132,7 +132,7 @@
         sql_del=getContent(f);
     }
     
-    public Map getData(){
+    public Properties getData(){
         return data;
     }
     
@@ -148,27 +148,16 @@
         jars=f;
     }
     
-    private String[] parseContent(File f) throws  Exception{
-        BufferedReader br=new BufferedReader(new InputStreamReader(new FileInputStream(f.getAbsolutePath())));
-        List array=new ArrayList();
-        String s=null;
-        while((s=br.readLine())!=null){
-          array.add(s);
-        }
-        if(array.size()==0)
-            throw new RuntimeException(name+": File "+f.getName()+" doesn't containt the data !");
-        return (String[])array.toArray(new String[0]);
-    }
-    
     private  String getContent(File f) throws Exception{
         BufferedReader br=new BufferedReader(new InputStreamReader(new FileInputStream(f.getAbsolutePath())));
-        StringBuffer sb=new StringBuffer();
-        String s=null;
+        StringBuilder sb=new StringBuilder();
+        String s;
         while((s=br.readLine())!=null){
           sb.append(s);
         }
-        if(sb.length()==0)
+        if(sb.length()==0) {
             throw new RuntimeException(name+": File called "+f.getName()+" doesn't contain the data.");
+        }
         return sb.toString();
     }
     
diff --git a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java
--- a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java
+++ b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java
@@ -67,7 +67,7 @@
     public static String DB_SQLDEL="dbdel.sql";
     public static String DB_JARS="jar";
     public static String[] FILES={DB_SQLCREATE,DB_SQLINSERT,DB_SQLUPDATE,DB_PROP,DB_SQLDEL,DB_SQLSELECT,DB_TEXT};
-    private List list=new ArrayList();
+    private List<TestCaseContext> list=new ArrayList<TestCaseContext>();
     private static  TestCaseDataFactory factory;
     
     public static TestCaseDataFactory  getTestCaseFactory() throws Exception{
@@ -101,7 +101,7 @@
     
     private void process() throws Exception{
        File data_dir=getDataDir();
-       HashMap map=new HashMap();
+       HashMap<String,Object> map=new HashMap<String,Object>();
        String[] dir=data_dir.list();
        for(int i=0;i<dir.length;i++){
            String dir_name=dir[i];
@@ -110,19 +110,22 @@
                 
                 for(int index=0;index<FILES.length;index++){
                     File f=new File(path+File.separator+FILES[index]);
-                    if(!f.exists())
+                    if(!f.exists()) {
                         throw new RuntimeException("File called "+FILES[index] +"in directory "+dir_name+"doesn't exist");
+                    }
                     map.put(FILES[index],f);
                     
                 }
                 String[] s=new File(path).list(new FilenameFilter() {
+                    @Override
                     public boolean accept(File dir, String name) {
                          return  name.endsWith(".jar") || name.endsWith(".zip") ? true : false;
                     }
                 });
-                if(s.length==0)
+                if(s.length==0) {
                     throw new RuntimeException("the driver doesn't  extist for test case called: "+dir_name);
-                ArrayList drivers=new ArrayList();
+                }
+                ArrayList<File> drivers=new ArrayList<File>();
                 for(int myint=0;myint<s.length;myint++){
                    File file=new File(path+File.separator+s[myint]);
                    drivers.add(file);