# HG changeset patch
# User Matthias Bläsing <matthias42@netbeans.org>
# Date 1340820475 -7200
# Branch mb-patches2
# Node ID 9f0f9fe2280a00c9fe239871c14fba39e684a3f2
# Parent  eb58e9e2897c0bb7c785834f3fa83c995640b2e1
Fix compile warnings (mostly generics)

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,7 +81,8 @@
         editable = (!table.getName().equals("") && !isGenerated);
     }
 
-    public int compareTo(Object refObj) {
+    @Override
+    public int compareTo(DBColumn refObj) {
         if (refObj == null) {
             return -1;
         }
@@ -98,7 +99,7 @@
             return -1;
         }
 
-        DBColumn refColumn = (DBColumn) refObj;
+        DBColumn refColumn = refObj;
         refName = refColumn.getName();
 
         // compare primary keys
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
@@ -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());
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) {
@@ -410,7 +410,7 @@
                 int pos = 1;
                 for (Object val : values) {
                     // Check for Constant e.g <NULL>, <DEFAULT>, <CURRENT_TIMESTAMP> etc
-                    if (DataViewUtils.isSQLConstantString(val)) {
+                    if (DataViewUtils.isSQLConstantString(val, rsTable.getDBColumn(pos - 1))) {
                         continue;
                     }
 
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
@@ -105,7 +105,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/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/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());
@@ -755,11 +752,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) {
@@ -1606,5 +1600,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
@@ -277,18 +277,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
                     }
                 }
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
@@ -916,6 +916,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)));
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
@@ -110,13 +110,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
@@ -68,18 +68,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(jars[i].toURI().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"),
@@ -284,11 +284,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(jars[i].toURI().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;
     }
     
@@ -150,14 +150,14 @@
     
     private String[] parseContent(File f) throws  Exception{
         BufferedReader br=new BufferedReader(new InputStreamReader(new FileInputStream(f.getAbsolutePath())));
-        List array=new ArrayList();
+        List<String> array=new ArrayList<String>();
         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]);
+        return array.toArray(new String[0]);
     }
     
     private  String getContent(File f) throws Exception{
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];
@@ -122,7 +122,7 @@
                 });
                 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);