[hg] main-silver: editor.options warnings resolved

  • From: Milutin Kristofic < >
  • To:
  • Subject: [hg] main-silver: editor.options warnings resolved
  • Date: Fri, 26 Apr 2013 11:11:18 -0700

changeset 709c33422fe5 in main-silver ((none))
details: http://hg.netbeans.org/main-silver/rev/709c33422fe5
description:
        editor.options warnings resolved

diffstat:

 options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.form 
         |   3 +
 options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.java 
         |   4 +-
 
options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.form
        |   3 +
 
options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.java
        |   8 +++-
 
options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.form 
        |   6 +++
 
options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.java 
        |   8 ++--
 
options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.form
       |   9 +++++
 
options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java
       |  16 +++++-----
 
options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.form
 |  14 +------
 
options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java
 |  11 ++----
 10 files changed, 47 insertions(+), 35 deletions(-)

diffs (305 lines):

diff --git 
a/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.form
 
b/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.form
--- 
a/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.form
+++ 
b/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.form
@@ -91,6 +91,9 @@
               <StringArray count="0"/>
             </Property>
           </Properties>
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_TypeParameters" 
type="java.lang.String" value="&lt;AttributeSet&gt;"/>
+          </AuxValues>
         </Component>
       </SubComponents>
     </Container>
diff --git 
a/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.java
 
b/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.java
--- 
a/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.java
+++ 
b/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.java
@@ -139,7 +139,7 @@
 
         lCategory = new javax.swing.JLabel();
         cpCategories = new javax.swing.JScrollPane();
-        lCategories = new javax.swing.JList();
+        lCategories = new javax.swing.JList<AttributeSet>();
         lForeground = new javax.swing.JLabel();
         lbackground = new javax.swing.JLabel();
         lWaveUnderlined = new javax.swing.JLabel();
@@ -209,7 +209,7 @@
     private javax.swing.JComboBox cbForeground;
     private javax.swing.JComboBox cbWaveUnderlined;
     private javax.swing.JScrollPane cpCategories;
-    private javax.swing.JList lCategories;
+    private javax.swing.JList<AttributeSet> lCategories;
     private javax.swing.JLabel lCategory;
     private javax.swing.JLabel lForeground;
     private javax.swing.JLabel lWaveUnderlined;
diff --git 
a/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.form
 
b/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.form
--- 
a/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.form
+++ 
b/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.form
@@ -58,6 +58,9 @@
           <StringArray count="0"/>
         </Property>
       </Properties>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" 
type="java.lang.String" value="&lt;String&gt;&#xa;"/>
+      </AuxValues>
     </Component>
     <Container class="javax.swing.JTabbedPane" name="tpCustomizers">
 
diff --git 
a/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.java
 
b/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.java
--- 
a/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.java
+++ 
b/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.java
@@ -152,7 +152,8 @@
     private void initComponents() {
 
         lProfile = new javax.swing.JLabel();
-        cbProfile = new javax.swing.JComboBox();
+        cbProfile = new javax.swing.JComboBox<String>
+        ();
         tpCustomizers = new javax.swing.JTabbedPane();
         bDuplicate = new javax.swing.JButton();
         bDelete = new javax.swing.JButton();
@@ -207,7 +208,8 @@
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton bDelete;
     private javax.swing.JButton bDuplicate;
-    private javax.swing.JComboBox cbProfile;
+    private javax.swing.JComboBox<String>
+    cbProfile;
     private javax.swing.JLabel lProfile;
     private javax.swing.JTabbedPane tpCustomizers;
     // End of variables declaration//GEN-END:variables
@@ -255,7 +257,7 @@
 
         // init schemes
         listen = false;
-        Iterator it = colorModel.getProfiles ().iterator ();
+        Iterator<String> it = colorModel.getProfiles ().iterator ();
         cbProfile.removeAllItems ();
         while (it.hasNext ())
             cbProfile.addItem (it.next ());
diff --git 
a/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.form
 
b/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.form
--- 
a/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.form
+++ 
b/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.form
@@ -108,6 +108,9 @@
               <StringArray count="0"/>
             </Property>
           </Properties>
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_TypeParameters" 
type="java.lang.String" value="&lt;AttributeSet&gt;"/>
+          </AuxValues>
         </Component>
       </SubComponents>
     </Container>
@@ -151,6 +154,9 @@
           <StringArray count="0"/>
         </Property>
       </Properties>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" 
type="java.lang.String" value="&lt;String&gt;"/>
+      </AuxValues>
     </Component>
     <Component class="javax.swing.JComboBox" name="cbEffectColor">
       <Properties>
diff --git 
a/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.java
 
b/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.java
--- 
a/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.java
+++ 
b/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.java
@@ -141,12 +141,12 @@
 
         lCategory = new javax.swing.JLabel();
         cpCategories = new javax.swing.JScrollPane();
-        lCategories = new javax.swing.JList();
+        lCategories = new javax.swing.JList<AttributeSet>();
         lForeground = new javax.swing.JLabel();
         lBackground = new javax.swing.JLabel();
         cbBackground = new ColorComboBox();
         cbForeground = new ColorComboBox();
-        cbEffects = new javax.swing.JComboBox();
+        cbEffects = new javax.swing.JComboBox<String>();
         cbEffectColor = new ColorComboBox();
         lEffects = new javax.swing.JLabel();
         lEffectColor = new javax.swing.JLabel();
@@ -227,11 +227,11 @@
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JComboBox cbBackground;
     private javax.swing.JComboBox cbEffectColor;
-    private javax.swing.JComboBox cbEffects;
+    private javax.swing.JComboBox<String> cbEffects;
     private javax.swing.JComboBox cbForeground;
     private javax.swing.JScrollPane cpCategories;
     private javax.swing.JLabel lBackground;
-    private javax.swing.JList lCategories;
+    private javax.swing.JList<AttributeSet> lCategories;
     private javax.swing.JLabel lCategory;
     private javax.swing.JLabel lEffectColor;
     private javax.swing.JLabel lEffects;
diff --git 
a/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.form
 
b/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.form
--- 
a/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.form
+++ 
b/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.form
@@ -122,6 +122,9 @@
           <StringArray count="0"/>
         </Property>
       </Properties>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" 
type="java.lang.String" value="&lt;String&gt;"/>
+      </AuxValues>
     </Component>
     <Component class="javax.swing.JLabel" name="lCategory">
       <Properties>
@@ -144,6 +147,9 @@
               <StringArray count="0"/>
             </Property>
           </Properties>
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_TypeParameters" 
type="java.lang.String" value="&lt;AttributeSet&gt;"/>
+          </AuxValues>
         </Component>
       </SubComponents>
     </Container>
@@ -239,6 +245,9 @@
           <StringArray count="0"/>
         </Property>
       </Properties>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" 
type="java.lang.String" value="&lt;String&gt;"/>
+      </AuxValues>
     </Component>
     <Component class="javax.swing.JComboBox" name="cbEffectColor">
       <Properties>
diff --git 
a/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java
 
b/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java
--- 
a/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java
+++ 
b/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java
@@ -202,10 +202,10 @@
     private void initComponents() {
 
         lLanguage = new javax.swing.JLabel();
-        cbLanguage = new javax.swing.JComboBox();
+        cbLanguage = new javax.swing.JComboBox<String>();
         lCategory = new javax.swing.JLabel();
         spCategories = new javax.swing.JScrollPane();
-        lCategories = new javax.swing.JList();
+        lCategories = new javax.swing.JList<AttributeSet>();
         lPreview = new javax.swing.JLabel();
         spPreview = new javax.swing.JScrollPane();
         pPreview = new javax.swing.JPanel();
@@ -216,7 +216,7 @@
         lEffectColor = new javax.swing.JLabel();
         cbForeground = new org.openide.awt.ColorComboBox();
         cbBackground = new ColorComboBox();
-        cbEffects = new javax.swing.JComboBox();
+        cbEffects = new javax.swing.JComboBox<String>();
         cbEffectColor = new ColorComboBox();
         tfFont = new javax.swing.JTextField();
         bFont = new javax.swing.JButton();
@@ -338,11 +338,11 @@
     private javax.swing.JButton bFont;
     private javax.swing.JComboBox cbBackground;
     private javax.swing.JComboBox cbEffectColor;
-    private javax.swing.JComboBox cbEffects;
+    private javax.swing.JComboBox<String> cbEffects;
     private javax.swing.JComboBox cbForeground;
-    private javax.swing.JComboBox cbLanguage;
+    private javax.swing.JComboBox<String> cbLanguage;
     private javax.swing.JLabel lBackground;
-    private javax.swing.JList lCategories;
+    private javax.swing.JList<AttributeSet> lCategories;
     private javax.swing.JLabel lCategory;
     private javax.swing.JLabel lEffectColor;
     private javax.swing.JLabel lEffects;
@@ -474,7 +474,7 @@
                     public void run() {
                         languages.remove("text/x-all-languages");
                         Collections.sort(languages, new 
LanguagesComparator());
-                        Iterator it = languages.iterator();
+                        Iterator<String> it = languages.iterator();
                         Object lastLanguage = cbLanguage.getSelectedItem();
                         cbLanguage.removeAllItems();
                         while (it.hasNext()) {
@@ -531,7 +531,7 @@
             !profiles.containsKey (currentProfile)
         )
             cloneScheme (oldProfile, currentProfile);
-        Vector categories = getCategories (currentProfile, currentLanguage);
+        Vector<AttributeSet> categories = getCategories (currentProfile, 
currentLanguage);
         lCategories.setListData (categories);
         blink = false;
         lCategories.setSelectedIndex (0);
diff --git 
a/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.form
 
b/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.form
--- 
a/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.form
+++ 
b/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.form
@@ -41,7 +41,6 @@
                               <Component id="lCamelCaseBehaviorExample" 
min="-2" max="-2" attributes="0"/>
                           </Group>
                       </Group>
-                      <EmptySpace min="-2" pref="26" max="-2" 
attributes="0"/>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
                       <EmptySpace max="-2" attributes="0"/>
@@ -161,16 +160,9 @@
       </Properties>
     </Component>
     <Component class="javax.swing.JComboBox" name="cboEditorSearchType">
-      <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" 
editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="4">
-            <StringItem index="0" value="Item 1"/>
-            <StringItem index="1" value="Item 2"/>
-            <StringItem index="2" value="Item 3"/>
-            <StringItem index="3" value="Item 4"/>
-          </StringArray>
-        </Property>
-      </Properties>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" 
type="java.lang.String" value="&lt;String&gt;"/>
+      </AuxValues>
     </Component>
     <Component class="javax.swing.JLabel" name="lSearchtypeTooltip">
       <Properties>
diff --git 
a/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java
 
b/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java
--- 
a/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java
+++ 
b/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java
@@ -88,7 +88,7 @@
         loc (cbShowBraceOutline, "Brace_Show_Outline");
                 
         cboEditorSearchType.setRenderer(new 
EditorSearchTypeRenderer(cboEditorSearchType.getRenderer()));
-        cboEditorSearchType.setModel(new DefaultComboBoxModel(new Object [] 
{ "default", "closing"})); //NOI18N
+        cboEditorSearchType.setModel(new DefaultComboBoxModel<String>(new 
String [] { "default", "closing"})); //NOI18N
         cboEditorSearchType.addActionListener( new ActionListener() {
 
             @Override
@@ -121,7 +121,7 @@
         lEditorSearchType = new javax.swing.JLabel();
         jSeparator5 = new javax.swing.JSeparator();
         lSearch = new javax.swing.JLabel();
-        cboEditorSearchType = new javax.swing.JComboBox();
+        cboEditorSearchType = new javax.swing.JComboBox<String>();
         lSearchtypeTooltip = new javax.swing.JLabel();
 
         setForeground(new java.awt.Color(99, 130, 191));
@@ -142,8 +142,6 @@
 
         lSearch.setText("Search");
 
-        cboEditorSearchType.setModel(new 
javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", 
"Item 4" }));
-
         lSearchtypeTooltip.setText("<html>In Closing type Enter accepts 
search match, Esc jumps to start. Both close searchbar. <br /> Default type 
closes searchbar by Esc or button. Enter means find a new instance.</html>");
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
@@ -165,8 +163,7 @@
                             .addComponent(cbCamelCaseBehavior)
                             .addGroup(layout.createSequentialGroup()
                                 .addGap(21, 21, 21)
-                                .addComponent(lCamelCaseBehaviorExample, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)))
-                        .addGap(26, 26, 26))
+                                .addComponent(lCamelCaseBehaviorExample, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))))
                     .addGroup(layout.createSequentialGroup()
                         .addContainerGap()
                         .addComponent(lEditorSearchType)
@@ -225,7 +222,7 @@
     private javax.swing.JCheckBox cbBraceTooltip;
     private javax.swing.JCheckBox cbCamelCaseBehavior;
     private javax.swing.JCheckBox cbShowBraceOutline;
-    private javax.swing.JComboBox cboEditorSearchType;
+    private javax.swing.JComboBox<String> cboEditorSearchType;
     private javax.swing.JSeparator jSeparator3;
     private javax.swing.JSeparator jSeparator5;
     private javax.swing.JSeparator jSeparator6;

[hg] main-silver: editor.options warnings resolved

Milutin Kristofic 04/26/2013

Project Features

About this Project

Editor was started in November 2009, is owned by Martin Ryzl, and has 147 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20140418.2d69abc). © 2013, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close