[Squirrel-sql-commits] sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/netbeans SQLSettingsInitializer.java, 1.9, 1.10

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/netbeans
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14073/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/netbeans

Modified Files:
	SQLSettingsInitializer.java 
Log Message:
1770559 (Miscellaneous Java 5 Generics) from patch submitted by Bron Eubanks

Index: SQLSettingsInitializer.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/SQLSettingsInitializer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SQLSettingsInitializer.java	11 Aug 2007 17:22:50 -0000	1.9
--- SQLSettingsInitializer.java	16 Aug 2007 01:54:10 -0000	1.10
***************
*** 1,7 ****
  package net.sourceforge.squirrel_sql.plugins.syntax.netbeans;
  
  import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPreferences;
  import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPugin;
! import org.netbeans.editor.*;
  import org.netbeans.editor.ext.ExtKit;
  import org.netbeans.editor.ext.ExtSettingsDefaults;
--- 1,22 ----
  package net.sourceforge.squirrel_sql.plugins.syntax.netbeans;
  
+ import java.awt.Font;
+ import java.awt.event.InputEvent;
+ import java.awt.event.KeyEvent;
+ import java.util.Map;
+ 
+ import javax.swing.KeyStroke;
+ 
  import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPreferences;
  import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPugin;
! 
! import org.netbeans.editor.BaseKit;
! import org.netbeans.editor.Coloring;
! import org.netbeans.editor.MultiKeyBinding;
! import org.netbeans.editor.Settings;
! import org.netbeans.editor.SettingsDefaults;
! import org.netbeans.editor.SettingsNames;
! import org.netbeans.editor.SettingsUtil;
! import org.netbeans.editor.TokenContext;
  import org.netbeans.editor.ext.ExtKit;
  import org.netbeans.editor.ext.ExtSettingsDefaults;
***************
*** 11,20 ****
  import org.netbeans.editor.ext.java.JavaSettingsNames;
  
- import javax.swing.*;
- import java.awt.*;
- import java.awt.event.InputEvent;
- import java.awt.event.KeyEvent;
- import java.util.Map;
- 
  
  public class SQLSettingsInitializer extends Settings.AbstractInitializer
--- 26,29 ----
***************
*** 26,30 ****
     public static final String NAME = "sql-settings-initializer"; // NOI18N
  
!    private Class sqlKitClass;
     private SyntaxPreferences _syntaxPreferences;
  
--- 35,39 ----
     public static final String NAME = "sql-settings-initializer"; // NOI18N
  
!    private Class<?> sqlKitClass;
     private SyntaxPreferences _syntaxPreferences;
  
***************
*** 41,45 ****
      * @param plugin
      */
!    public SQLSettingsInitializer(Class sqlKitClass, SyntaxPreferences syntaxPreferences, Font font, SyntaxPugin plugin)
     {
        super(NAME);
--- 50,54 ----
      * @param plugin
      */
!    public SQLSettingsInitializer(Class<?> sqlKitClass, SyntaxPreferences syntaxPreferences, Font font, SyntaxPugin plugin)
     {
        super(NAME);
***************
*** 59,64 ****
      *                    that updates it or if no previous initializers updated it.
      */
!    public void updateSettingsMap(Class kitClass, Map settingsMap)
     {
        // Update java colorings
        if (kitClass == BaseKit.class)
--- 68,75 ----
      *                    that updates it or if no previous initializers updated it.
      */
!    public void updateSettingsMap(Class kitClass, Map map)
     {
+        
+        Map<String, Object> settingsMap = (Map<String, Object>)map;
        // Update java colorings
        if (kitClass == BaseKit.class)