# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: /home/vriha/Documents/repository/main # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: html/src/org/netbeans/modules/html/palette/items/BUTTON.java --- html/src/org/netbeans/modules/html/palette/items/BUTTON.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/BUTTON.java Locally Modified (Based On LOCAL) @@ -63,6 +63,8 @@ private String type = TYPE_SUBMIT; private boolean disabled = false; private String name = ""; + private boolean generateID = false; + private boolean generateLabel = false; public BUTTON() { } @@ -94,9 +96,10 @@ strName = " name=\"" + name + "\""; // NOI18N String strDisabled = (disabled ? " disabled=\"disabled\"" : ""); // NOI18N + String strId = (generateID ? " id=\""+name+"\" " : ""); // NOI18N + String strLabel = (generateLabel? "":""); + String inputBody = strLabel+""; // NOI18N - String inputBody = ""; // NOI18N - return inputBody; } @@ -132,4 +135,32 @@ this.name = name; } + /** + * @return the generateID + */ + public boolean isGenerateID() { + return generateID; } + + /** + * @param generateID the generateID to set + */ + public void setGenerateID(boolean generateID) { + this.generateID = generateID; + } + + /** + * @return the generateLabel + */ + public boolean isGenerateLabel() { + return generateLabel; + } + + /** + * @param generateLabel the generateLabel to set + */ + public void setGenerateLabel(boolean generateLabel) { + this.generateLabel = generateLabel; + } + +} Index: html/src/org/netbeans/modules/html/palette/items/BUTTONCustomizer.form --- html/src/org/netbeans/modules/html/palette/items/BUTTONCustomizer.form Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/BUTTONCustomizer.form Locally Modified (Based On LOCAL) @@ -1,6 +1,6 @@ -
+ @@ -230,7 +230,7 @@ - + @@ -253,9 +253,100 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: html/src/org/netbeans/modules/html/palette/items/BUTTONCustomizer.java --- html/src/org/netbeans/modules/html/palette/items/BUTTONCustomizer.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/BUTTONCustomizer.java Locally Modified (Based On LOCAL) @@ -119,6 +119,10 @@ button.setDisabled(jCheckBox1.isSelected()); + button.setGenerateID(jCheckBox2.isSelected()); + + button.setGenerateLabel(jCheckBox3.isSelected()); + String name = jTextField2.getText(); button.setName(name); @@ -144,6 +148,10 @@ jCheckBox1 = new javax.swing.JCheckBox(); jTextField2 = new javax.swing.JTextField(); jLabel4 = new javax.swing.JLabel(); + jLabel5 = new javax.swing.JLabel(); + jCheckBox2 = new javax.swing.JCheckBox(); + jLabel6 = new javax.swing.JLabel(); + jCheckBox3 = new javax.swing.JCheckBox(); setLayout(new java.awt.GridBagLayout()); @@ -249,7 +257,7 @@ jTextField2.setColumns(30); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; - gridBagConstraints.gridy = 5; + gridBagConstraints.gridy = 7; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; gridBagConstraints.weighty = 1.0; @@ -260,7 +268,7 @@ org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "LBL_BUTTON_Name")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 5; + gridBagConstraints.gridy = 7; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 0); @@ -268,6 +276,53 @@ jLabel4.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "ACSN_BUTTON_Name")); // NOI18N jLabel4.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "ACSD_BUTTON_Name")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(jLabel5, org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "LBL_BUTTON_Id")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 5; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); + add(jLabel5, gridBagConstraints); + jLabel5.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "ACSN_BUTTON_Id")); // NOI18N + jLabel5.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "ACSD_BUTTON_Id")); // NOI18N + + jCheckBox2.setSelected(true); + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox2, org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "LBL_CHECKBOX_IdSelected")); // NOI18N + jCheckBox2.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 5; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); + add(jCheckBox2, gridBagConstraints); + jCheckBox2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "ACSN_BUTTON_IdSelected")); // NOI18N + jCheckBox2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "ACSD_BUTTON_IdSelected")); // NOI18N + + org.openide.awt.Mnemonics.setLocalizedText(jLabel6, org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "LBL_BUTTON_LabelElement")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 6; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); + add(jLabel6, gridBagConstraints); + jLabel6.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "ACSN_BUTTON_LabelElement")); // NOI18N + jLabel6.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "ACSD_BUTTON_LabelElement")); // NOI18N + + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox3, org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "LBL_BUTTON_LabelElementSelected")); // NOI18N + jCheckBox3.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 6; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); + add(jCheckBox3, gridBagConstraints); + jCheckBox3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "ACSN_BUTTON_LabelElementSelected")); // NOI18N + jCheckBox3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "ACSD_BUTTON_LabelElementSelected")); // NOI18N + getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "ACSN_BUTTON_Form")); // NOI18N getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(BUTTONCustomizer.class, "ACSD_BUTTON_Form")); // NOI18N }// //GEN-END:initComponents @@ -276,10 +331,14 @@ // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.ButtonGroup buttonGroup1; private javax.swing.JCheckBox jCheckBox1; + private javax.swing.JCheckBox jCheckBox2; + private javax.swing.JCheckBox jCheckBox3; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; + private javax.swing.JLabel jLabel5; + private javax.swing.JLabel jLabel6; private javax.swing.JRadioButton jRadioButton1; private javax.swing.JRadioButton jRadioButton2; private javax.swing.JRadioButton jRadioButton3; Index: html/src/org/netbeans/modules/html/palette/items/Bundle.properties --- html/src/org/netbeans/modules/html/palette/items/Bundle.properties Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/Bundle.properties Locally Modified (Based On LOCAL) @@ -1,4 +1,4 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +S# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # # Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. # @@ -139,6 +139,30 @@ ACSN_BUTTON_standard=standard +ACSD_BUTTON_Id=Element ID + +LBL_BUTTON_Id=ID\: + +ACSN_BUTTON_Id=ID + +ACSD_BUTTON_IdSelected=Select if the button should have ID attribute + +LBL_BUTTON_IdSelected=&generate + +ACSN_BUTTON_IdSelected=generate attribute + +ACSD_BUTTON_LabelElement=Element label + +LBL_BUTTON_LabelElement=Label Element\: + +ACSN_BUTTON_LabelElement=Label Element + +ACSD_BUTTON_LabelElementSelected=Select if label element should be generated for the button + +LBL_BUTTON_LabelElementSelected=&create label + +ACSN_BUTTON_LabelElementSelected=create label + #Checkbox LBL_CHECKBOX_Name=&Name\: @@ -180,6 +204,30 @@ LBL_CHECKBOX_disabled=&disabled +ACSD_CHECKBOX_Id=Element ID + +LBL_CHECKBOX_Id=ID\: + +ACSN_CHECKBOX_Id=ID + +ACSD_CHECKBOX_IdSelected=Select if the checkbox should have ID attribute + +LBL_CHECKBOX_IdSelected=&generate + +ACSN_CHECKBOX_IdSelected=generate attribute + +ACSD_CHECKBOX_Label=Element label + +LBL_CHECKBOX_Label=Label Element\: + +ACSN_CHECKBOX_Label=Label Element + +ACSD_CHECKBOX_LabelSelected=Select if label element should be generated for the checkbox + +LBL_CHECKBOX_LabelSelected=&create label + +ACSN_CHECKBOX_LabelSelected=create label + #File select LBL_FILESEL_Name=&Name\: @@ -209,6 +257,31 @@ ACSD_FILESEL_disabled=Select if the file select should be initially disabled. +ACSD_FILESEL_Id=Element ID + +LBL_FILESEL_Id=ID\: + +ACSN_FILESEL_Id=ID + +ACSD_FILESEL_IdSelected=Select if the file select should have ID attribute + +LBL_FILESEL_IdSelected=&generate + +ACSN_FILESEL_IdSelected=generate attribute + +ACSD_FILESEL_Label=Element label + +LBL_FILESEL_Label=Label Element\: + +ACSN_FILESEL_Label=Label Element + +ACSD_FILESEL_LabelSelected=Select if label element should be generated for the file select + +LBL_FILESEL_LabelSelected=&create label + +ACSN_FILESEL_LabelSelected=create label + + #Form LBL_FORM_Action=&Action\: @@ -252,6 +325,12 @@ ACSD_FORM_Name=Form object name +ACSD_FORM_Id=Form ID attribute + +LBL_FORM_Id=&ID\: + +ACSN_FORM_Id=ID + #Image LBL_IMG_Location=&Location\: @@ -285,6 +364,18 @@ LBL_IMG_FileChooserDesc=Image Files +ACSD_IMG_Figure=HTML5 figure + +LBL_IMG_Figure=As HTML5 figure\: + +ACSN_IMG_Figure=HTML5 figure + +ACSD_IMG_FigureSelected=Select if image should be HTML5 figure with figcaption + +LBL_IMG_FigureSelected=&generate + +ACSN_IMG_FigureSelected=generate as HTML5 figure + #Input LBL_INPUT_Name=&Name\: @@ -350,6 +441,32 @@ ACSD_INPUT_Width=Input width +ACSD_INPUT_Id=Element ID + +LBL_INPUT_Id=ID\: + +ACSN_INPUT_Id=ID + +ACSD_INPUT_IdSelected=Select if the input should have ID attribute + +LBL_INPUT_IdSelected=&generate + +ACSN_INPUT_IdSelected=generate attribute + +ACSD_INPUT_Label=Element label + +LBL_INPUT_Label=Label Element\: + +ACSN_INPUT_Label=Label Element + +ACSD_INPUT_LabelSelected=Select if label element should be generated for the input + +LBL_INPUT_LabelSelected=&create label + +ACSN_INPUT_LabelSelected=create label + + + #Meta LBL_META_Type=Type\: @@ -463,6 +580,17 @@ ACSD_RADIO_disabled=Radio button initially disabled. +ACSD_RADIO_Id=Element ID + +LBL_RADIO_Id=ID\: + +ACSN_RADIO_Id=ID + +ACSD_RADIO_IdSelected=Select if the radio should have ID attribute + +LBL_RADIO_IdSelected=&generate + +ACSN_RADIO_IdSelected=generate attribute #Select LBL_SELECT_Name=&Name\: @@ -512,6 +640,30 @@ ACSD_SELECT_disabled=When selected then initial state is disabled +ACSD_SELECT_Id=Element ID + +LBL_SELECT_Id=ID\: + +ACSN_SELECT_Id=ID + +ACSD_SELECT_IdSelected=Select if the select input should have ID attribute + +LBL_SELECT_IdSelected=&generate + +ACSN_SELECT_IdSelected=generate attribute + +ACSD_SELECT_Label=Element label + +LBL_SELECT_Label=Label Element\: + +ACSN_SELECT_Label=Label Element + +ACSD_SELECT_LabelSelected=Select if label element should be generated for the select input + +LBL_SELECT_LabelSelected=&create label + +ACSN_SELECT_LabelSelected=create label + #Table LBL_TABLE_Name=&Name\: @@ -571,6 +723,12 @@ LBL_TABLE_PaddingHelp=The amount of space between the border of the cell and its content. +ACSD_TABLE_Caption=Table caption + +LBL_TABLE_Caption=Captio&n\: + +ACSN_TABLE_Caption=Caption + #Textarea LBL_TEXTAREA_Name=&Name\: @@ -618,6 +776,29 @@ ACSD_TEXTAREA_Columns=Number of columns +ACSD_TEXTAREA_Id=Element ID + +LBL_TEXTAREA_Id=ID\: + +ACSN_TEXTAREA_Id=ID + +ACSD_TEXTAREA_IdSelected=Select if the textarea should have ID attribute + +LBL_TEXTAREA_IdSelected=&generate + +ACSN_TEXTAREA_IdSelected=generate attribute + +ACSD_TEXTAREA_Label=Element label + +LBL_TEXTAREA_Label=Label Element\: + +ACSN_TEXTAREA_Label=Label Element + +ACSD_TEXTAREA_LabelSelected=Select if label element should be generated for the textarea + +LBL_TEXTAREA_LabelSelected=&create label + +ACSN_TEXTAREA_LabelSelected=create label #Unordered class LBL_UL_Items=&Number of Items\: Index: html/src/org/netbeans/modules/html/palette/items/CHECKBOX.java --- html/src/org/netbeans/modules/html/palette/items/CHECKBOX.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/CHECKBOX.java Locally Modified (Based On LOCAL) @@ -61,6 +61,8 @@ private String value = VALUE_DEFAULT; private boolean selected = false; private boolean disabled = false; + private boolean generateID = false; + private boolean generateLabel = false; public CHECKBOX() { } @@ -91,7 +93,9 @@ String strDisabled = (disabled ? " disabled=\"disabled\"" : ""); // NOI18N - String inputBody = ""; // NOI18N + String strId = (generateID ? " id=\""+name+"\" " : ""); // NOI18N + String strLabel = (generateLabel? "":""); + String inputBody = strLabel+""; // NOI18N return inputBody; } @@ -128,4 +132,26 @@ this.disabled = disabled; } + public boolean isGenerateId() { + return generateID; } + + public void setGenerateId(boolean generateId) { + this.generateID = generateId; + } + + /** + * @return the generateLabel + */ + public boolean isGenerateLabel() { + return generateLabel; + } + + /** + * @param generateLabel the generateLabel to set + */ + public void setGenerateLabel(boolean generateLabel) { + this.generateLabel = generateLabel; + } + +} Index: html/src/org/netbeans/modules/html/palette/items/CHECKBOXCustomizer.form --- html/src/org/netbeans/modules/html/palette/items/CHECKBOXCustomizer.form Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/CHECKBOXCustomizer.form Locally Modified (Based On LOCAL) @@ -5,12 +5,21 @@
+ + + + + + + + + @@ -121,7 +130,7 @@ - + @@ -181,5 +190,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: html/src/org/netbeans/modules/html/palette/items/CHECKBOXCustomizer.java --- html/src/org/netbeans/modules/html/palette/items/CHECKBOXCustomizer.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/CHECKBOXCustomizer.java Locally Modified (Based On LOCAL) @@ -116,6 +116,8 @@ checkbox.setDisabled(jCheckBox2.isSelected()); + checkbox.setGenerateId(jCheckBox3.isSelected()); + checkbox.setGenerateLabel(jCheckBox4.isSelected()); } /** This method is called from within the constructor to @@ -123,7 +125,7 @@ * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - // //GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; @@ -136,7 +138,13 @@ jLabel5 = new javax.swing.JLabel(); jTextField2 = new javax.swing.JTextField(); jLabel2 = new javax.swing.JLabel(); + jLabel4 = new javax.swing.JLabel(); + jCheckBox3 = new javax.swing.JCheckBox(); + jLabel6 = new javax.swing.JLabel(); + jCheckBox4 = new javax.swing.JCheckBox(); + setMinimumSize(new java.awt.Dimension(502, 220)); + setPreferredSize(new java.awt.Dimension(516, 220)); setLayout(new java.awt.GridBagLayout()); jTextField1.setColumns(30); @@ -150,7 +158,7 @@ add(jTextField1, gridBagConstraints); jLabel1.setLabelFor(jTextField1); - org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "LBL_CHECKBOX_Name")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "LBL_CHECKBOX_Name")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 0; @@ -158,10 +166,10 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jLabel1, gridBagConstraints); - jLabel1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSN_CHECKBOX_Name")); - jLabel1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSD_CHECKBOX_Name")); + jLabel1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSN_CHECKBOX_Name")); // NOI18N + jLabel1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSD_CHECKBOX_Name")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "LBL_CHECKBOX_ValueHelp")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "LBL_CHECKBOX_ValueHelp")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 2; @@ -169,12 +177,11 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(5, 12, 0, 12); add(jLabel3, gridBagConstraints); - jLabel3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSN_CHECKBOX_ValueHelp")); - jLabel3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSD_CHECKBOX_ValueHelp")); + jLabel3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSN_CHECKBOX_ValueHelp")); // NOI18N + jLabel3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSD_CHECKBOX_ValueHelp")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(jCheckBox1, org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "LBL_CHECKBOX_selected")); - jCheckBox1.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(0, 0, 0, 0))); - jCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0)); + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox1, org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "LBL_CHECKBOX_selected")); // NOI18N + jCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 3; @@ -182,24 +189,22 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); add(jCheckBox1, gridBagConstraints); - jCheckBox1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSN_CHECKBOX_selected")); - jCheckBox1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSD_CHECKBOX_selected")); + jCheckBox1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSN_CHECKBOX_selected")); // NOI18N + jCheckBox1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSD_CHECKBOX_selected")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(jCheckBox2, org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "LBL_CHECKBOX_disabled")); - jCheckBox2.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(0, 0, 0, 0))); - jCheckBox2.setMargin(new java.awt.Insets(0, 0, 0, 0)); + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox2, org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "LBL_CHECKBOX_disabled")); // NOI18N + jCheckBox2.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 4; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weighty = 1.0; gridBagConstraints.insets = new java.awt.Insets(5, 12, 12, 12); add(jCheckBox2, gridBagConstraints); - jCheckBox2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSN_CHECKBOX_disabled")); - jCheckBox2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSD_CHECKBOX_disabled")); + jCheckBox2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSN_CHECKBOX_disabled")); // NOI18N + jCheckBox2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSD_CHECKBOX_disabled")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(jLabel5, org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "LBL_CHECKBOX_InitState")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel5, org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "LBL_CHECKBOX_InitState")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 3; @@ -207,8 +212,8 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jLabel5, gridBagConstraints); - jLabel5.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSN_CHECKBOX_InitState")); - jLabel5.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSD_CHECKBOX_InitState")); + jLabel5.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSN_CHECKBOX_InitState")); // NOI18N + jLabel5.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSD_CHECKBOX_InitState")); // NOI18N jTextField2.setColumns(30); jTextField2.setText(checkbox.getValue()); @@ -221,7 +226,7 @@ add(jTextField2, gridBagConstraints); jLabel2.setLabelFor(jTextField2); - org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "LBL_CHECKBOX_Value")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "LBL_CHECKBOX_Value")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; @@ -229,21 +234,73 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(5, 12, 0, 0); add(jLabel2, gridBagConstraints); - jLabel2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSN_CHECKBOX_Value")); - jLabel2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSD_CHECKBOX_Value")); + jLabel2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSN_CHECKBOX_Value")); // NOI18N + jLabel2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSD_CHECKBOX_Value")); // NOI18N - } - // //GEN-END:initComponents + jLabel4.setLabelFor(jCheckBox3); + org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "LBL_CHECKBOX_Id")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 4; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(36, 12, 0, 0); + add(jLabel4, gridBagConstraints); + jLabel4.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSN_CHECKBOX_Id")); // NOI18N + jLabel4.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSD_CHECKBOX_Id")); // NOI18N + jCheckBox3.setSelected(true); + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox3, org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "LBL_CHECKBOX_IdSelected")); // NOI18N + jCheckBox3.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 4; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(36, 12, 0, 12); + add(jCheckBox3, gridBagConstraints); + jCheckBox3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSN_CHECKBOX_IdSelected")); // NOI18N + jCheckBox3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSD_CHECKBOX_IdSelected")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(jLabel6, org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "LBL_CHECKBOX_Label")); // NOI18N + jLabel6.setToolTipText(""); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 5; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(6, 12, 0, 0); + add(jLabel6, gridBagConstraints); + jLabel6.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSN_CHECKBOX_Label")); // NOI18N + jLabel6.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSD_CHECKBOX_Label")); // NOI18N + + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox4, org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "LBL_CHECKBOX_LabelSelected")); // NOI18N + jCheckBox4.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 5; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.weighty = 1.0; + gridBagConstraints.insets = new java.awt.Insets(6, 12, 0, 12); + add(jCheckBox4, gridBagConstraints); + jCheckBox4.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSN_CHECKBOX_LabelSelected")); // NOI18N + jCheckBox4.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CHECKBOXCustomizer.class, "ACSD_CHECKBOX_LabelSelected")); // NOI18N + }// //GEN-END:initComponents + + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.ButtonGroup buttonGroup1; private javax.swing.JCheckBox jCheckBox1; private javax.swing.JCheckBox jCheckBox2; + private javax.swing.JCheckBox jCheckBox3; + private javax.swing.JCheckBox jCheckBox4; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; + private javax.swing.JLabel jLabel4; private javax.swing.JLabel jLabel5; + private javax.swing.JLabel jLabel6; private javax.swing.JTextField jTextField1; private javax.swing.JTextField jTextField2; // End of variables declaration//GEN-END:variables Index: html/src/org/netbeans/modules/html/palette/items/FILESEL.java --- html/src/org/netbeans/modules/html/palette/items/FILESEL.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/FILESEL.java Locally Modified (Based On LOCAL) @@ -41,14 +41,13 @@ * Version 2 license, then the option applies only if the new code is * made subject to such option by the copyright holder. */ - package org.netbeans.modules.html.palette.items; + import javax.swing.text.BadLocationException; import javax.swing.text.JTextComponent; import org.netbeans.modules.html.palette.HtmlPaletteUtilities; import org.openide.text.ActiveEditorDrop; - /** * * @author Libor Kotouc @@ -58,6 +57,8 @@ private String name = ""; private String width = ""; private boolean disabled = false; + private boolean generateID = false; + private boolean generateLabel = false; public FILESEL() { } @@ -83,13 +84,14 @@ String strName = " name=\"" + name + "\""; // NOI18N String strWidth = ""; - if (width.length() > 0) + if (width.length() > 0) { strWidth = " width=\"" + width + "\""; // NOI18N - + } String strDisabled = (disabled ? " disabled=\"disabled\"" : ""); // NOI18N + String strId = (generateID ? " id=\"" + name + "\" " : ""); // NOI18N + String strLabel = (generateLabel ? "" : ""); + String fileselBody = strLabel+""; // NOI18N - String fileselBody = ""; // NOI18N - return fileselBody; } @@ -117,4 +119,31 @@ this.disabled = disabled; } + /** + * @return the generateID + */ + public boolean isGenerateID() { + return generateID; } + + /** + * @param generateID the generateID to set + */ + public void setGenerateID(boolean generateID) { + this.generateID = generateID; + } + + /** + * @return the generateLabel + */ + public boolean isGenerateLabel() { + return generateLabel; + } + + /** + * @param generateLabel the generateLabel to set + */ + public void setGenerateLabel(boolean generateLabel) { + this.generateLabel = generateLabel; + } +} Index: html/src/org/netbeans/modules/html/palette/items/FILESELCustomizer.form --- html/src/org/netbeans/modules/html/palette/items/FILESELCustomizer.form Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/FILESELCustomizer.form Locally Modified (Based On LOCAL) @@ -94,7 +94,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -130,5 +130,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: html/src/org/netbeans/modules/html/palette/items/FILESELCustomizer.java --- html/src/org/netbeans/modules/html/palette/items/FILESELCustomizer.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/FILESELCustomizer.java Locally Modified (Based On LOCAL) @@ -113,7 +113,8 @@ filesel.setWidth(width); filesel.setDisabled(jCheckBox1.isSelected()); - + filesel.setGenerateID(jCheckBox2.isSelected()); + filesel.setGenerateLabel(jCheckBox3.isSelected()); } /** This method is called from within the constructor to @@ -121,7 +122,7 @@ * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - // //GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; @@ -132,6 +133,10 @@ jLabel3 = new javax.swing.JLabel(); jCheckBox1 = new javax.swing.JCheckBox(); jTextField2 = new javax.swing.JTextField(); + jLabel4 = new javax.swing.JLabel(); + jCheckBox2 = new javax.swing.JCheckBox(); + jLabel5 = new javax.swing.JLabel(); + jCheckBox3 = new javax.swing.JCheckBox(); setLayout(new java.awt.GridBagLayout()); @@ -147,7 +152,7 @@ add(jTextField1, gridBagConstraints); jLabel1.setLabelFor(jTextField1); - org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "LBL_FILESEL_Name")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "LBL_FILESEL_Name")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 0; @@ -155,11 +160,11 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jLabel1, gridBagConstraints); - jLabel1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSN_FILESEL_Name")); - jLabel1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSD_FILESEL_Name")); + jLabel1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSN_FILESEL_Name")); // NOI18N + jLabel1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSD_FILESEL_Name")); // NOI18N jLabel2.setLabelFor(jTextField2); - org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "LBL_FILESEL_Width")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "LBL_FILESEL_Width")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; @@ -167,33 +172,31 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jLabel2, gridBagConstraints); - jLabel2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSN_FILESEL_Width")); - jLabel2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSD_FILESEL_Width")); + jLabel2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSN_FILESEL_Width")); // NOI18N + jLabel2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSD_FILESEL_Width")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "LBL_FILESEL_InitState")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "LBL_FILESEL_InitState")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 0); + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jLabel3, gridBagConstraints); - jLabel3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSN_FILESEL_InitState")); - jLabel3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSD_FILESEL_InitState")); + jLabel3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSN_FILESEL_InitState")); // NOI18N + jLabel3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSD_FILESEL_InitState")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(jCheckBox1, org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "LBL_FILESEL_disabled")); - jCheckBox1.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(0, 0, 0, 0))); - jCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0)); + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox1, org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "LBL_FILESEL_disabled")); // NOI18N + jCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 2; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 12); + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); add(jCheckBox1, gridBagConstraints); - jCheckBox1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSN_FILESEL_disabled")); - jCheckBox1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSD_FILESEL_disabled")); + jCheckBox1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSN_FILESEL_disabled")); // NOI18N + jCheckBox1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSD_FILESEL_disabled")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; @@ -203,16 +206,66 @@ gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); add(jTextField2, gridBagConstraints); - } - // //GEN-END:initComponents + org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "LBL_FILESEL_Id")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 3; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); + add(jLabel4, gridBagConstraints); + jLabel4.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSN_FILESEL_Id")); // NOI18N + jLabel4.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSD_FILESEL_Id")); // NOI18N + jCheckBox2.setSelected(true); + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox2, org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "LBL_FILESEL_IdSelected")); // NOI18N + jCheckBox2.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 3; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); + add(jCheckBox2, gridBagConstraints); + jCheckBox2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSN_FILESEL_IdSelected")); // NOI18N + jCheckBox2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSD_FILESEL_IdSelected")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(jLabel5, org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "LBL_FILESEL_Label")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 4; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); + add(jLabel5, gridBagConstraints); + jLabel5.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSN_FILESEL_Label")); // NOI18N + jLabel5.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSD_FILESEL_Label")); // NOI18N + + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox3, org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "LBL_FILESEL_LabelSelected")); // NOI18N + jCheckBox3.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 4; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.weighty = 1.0; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); + add(jCheckBox3, gridBagConstraints); + jCheckBox3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSN_FILESEL_LabelSelected")); // NOI18N + jCheckBox3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FILESELCustomizer.class, "ACSD_FILESEL_LabelSelected")); // NOI18N + }// //GEN-END:initComponents + + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.ButtonGroup buttonGroup1; private javax.swing.JCheckBox jCheckBox1; + private javax.swing.JCheckBox jCheckBox2; + private javax.swing.JCheckBox jCheckBox3; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; + private javax.swing.JLabel jLabel4; + private javax.swing.JLabel jLabel5; private javax.swing.JTextField jTextField1; private javax.swing.JTextField jTextField2; // End of variables declaration//GEN-END:variables Index: html/src/org/netbeans/modules/html/palette/items/FORM.java --- html/src/org/netbeans/modules/html/palette/items/FORM.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/FORM.java Locally Modified (Based On LOCAL) @@ -68,6 +68,7 @@ private String method = METHOD_DEFAULT; private String enc = ENC_DEFAULT; private String name = ""; + private String id= ""; public FORM() { } @@ -105,9 +106,11 @@ String strName = ""; if (name.length() > 0) strName = " name=\"" + name + "\""; // NOI18N + String strId = ""; + if(id.length()>0) + strId= " id=\""+id+"\""; + String formBody = "\n"; // NOI18N - String formBody = "\n"; // NOI18N - return formBody; } @@ -143,4 +146,18 @@ this.name = name; } + /** + * @return the id + */ + public String getId() { + return id; } + + /** + * @param id the id to set + */ + public void setId(String id) { + this.id = id; + } + +} Index: html/src/org/netbeans/modules/html/palette/items/FORMCustomizer.form --- html/src/org/netbeans/modules/html/palette/items/FORMCustomizer.form Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/FORMCustomizer.form Locally Modified (Based On LOCAL) @@ -45,7 +45,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -271,5 +271,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: html/src/org/netbeans/modules/html/palette/items/FORMCustomizer.java --- html/src/org/netbeans/modules/html/palette/items/FORMCustomizer.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/FORMCustomizer.java Locally Modified (Based On LOCAL) @@ -131,6 +131,7 @@ form.setEnc(FORM.ENC_MULTI); String name = jTextField4.getText(); + form.setId(jTextField2.getText()); form.setName(name); } @@ -172,6 +173,8 @@ jRadioButton2 = new javax.swing.JRadioButton(); jRadioButton3 = new javax.swing.JRadioButton(); jRadioButton4 = new javax.swing.JRadioButton(); + jLabel5 = new javax.swing.JLabel(); + jTextField2 = new javax.swing.JTextField(); jFileChooser1.setCurrentDirectory(null); @@ -184,7 +187,6 @@ gridBagConstraints.gridy = 6; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weighty = 1.0; gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 0); add(jLabel4, gridBagConstraints); jLabel4.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(FORMCustomizer.class, "ACSN_FORM_Name")); // NOI18N @@ -255,8 +257,7 @@ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; gridBagConstraints.weightx = 1.0; - gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 0); + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jTextField4, gridBagConstraints); buttonGroup1.add(jRadioButton1); @@ -325,6 +326,26 @@ add(jRadioButton4, gridBagConstraints); jRadioButton4.getAccessibleContext().setAccessibleName("multipart/form-data"); jRadioButton4.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FORMCustomizer.class, "ACSD_FORM_multi")); // NOI18N + + org.openide.awt.Mnemonics.setLocalizedText(jLabel5, org.openide.util.NbBundle.getMessage(FORMCustomizer.class, "LBL_FORM_Id")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 7; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 0); + add(jLabel5, gridBagConstraints); + jLabel5.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(FORMCustomizer.class, "ACSN_FORM_Id")); // NOI18N + jLabel5.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FORMCustomizer.class, "ACSD_FORM_Id")); // NOI18N + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 7; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.weighty = 1.0; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 0); + add(jTextField2, gridBagConstraints); }// //GEN-END:initComponents private void jRadioButton2ItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_jRadioButton2ItemStateChanged @@ -381,11 +402,13 @@ private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; + private javax.swing.JLabel jLabel5; private javax.swing.JRadioButton jRadioButton1; private javax.swing.JRadioButton jRadioButton2; private javax.swing.JRadioButton jRadioButton3; private javax.swing.JRadioButton jRadioButton4; private javax.swing.JTextField jTextField1; + private javax.swing.JTextField jTextField2; private javax.swing.JTextField jTextField4; // End of variables declaration//GEN-END:variables Index: html/src/org/netbeans/modules/html/palette/items/IMG.java --- html/src/org/netbeans/modules/html/palette/items/IMG.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/IMG.java Locally Modified (Based On LOCAL) @@ -59,7 +59,7 @@ private String width = ""; private String height = ""; private String alttext = ""; - + private boolean generateFigure; public IMG() { } @@ -98,7 +98,8 @@ strAlt = " alt=\"" + alttext + "\""; // NOI18N String imgBody = "\n"; // NOI18N - + if(generateFigure) + imgBody = "
\n"+imgBody+"\n
"+strAlt+"
\n
"; return imgBody; } @@ -134,4 +135,18 @@ this.alttext = alttext; } + /** + * @return the figure + */ + public boolean isFigure() { + return generateFigure; } + + /** + * @param figure the figure to set + */ + public void setFigure(boolean figure) { + this.generateFigure = figure; + } + +} Index: html/src/org/netbeans/modules/html/palette/items/IMGCustomizer.form --- html/src/org/netbeans/modules/html/palette/items/IMGCustomizer.form Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/IMGCustomizer.form Locally Modified (Based On LOCAL) @@ -1,6 +1,6 @@ -
+ @@ -10,6 +10,8 @@ + + @@ -39,7 +41,7 @@ - + @@ -186,9 +188,49 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: html/src/org/netbeans/modules/html/palette/items/IMGCustomizer.java --- html/src/org/netbeans/modules/html/palette/items/IMGCustomizer.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/IMGCustomizer.java Locally Modified (Based On LOCAL) @@ -143,7 +143,7 @@ String height = jTextField3.getText(); img.setHeight(height); - + img.setFigure(jCheckBox1.isSelected()); String alt = jTextField4.getText(); img.setAlttext(alt); @@ -154,7 +154,7 @@ * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - // //GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; @@ -168,23 +168,24 @@ jLabel2 = new javax.swing.JLabel(); jLabel3 = new javax.swing.JLabel(); jTextField4 = new javax.swing.JTextField(); + jLabel5 = new javax.swing.JLabel(); + jCheckBox1 = new javax.swing.JCheckBox(); jFileChooser1.setCurrentDirectory(null); setLayout(new java.awt.GridBagLayout()); jLabel4.setLabelFor(jTextField4); - org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "LBL_IMG_Alt")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "LBL_IMG_Alt")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 3; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 0); + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jLabel4, gridBagConstraints); - jLabel4.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSN_IMG_Alt")); - jLabel4.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSD_IMG_Alt")); + jLabel4.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSN_IMG_Alt")); // NOI18N + jLabel4.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSD_IMG_Alt")); // NOI18N jTextField1.setColumns(30); gridBagConstraints = new java.awt.GridBagConstraints(); @@ -196,21 +197,20 @@ gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jTextField1, gridBagConstraints); - org.openide.awt.Mnemonics.setLocalizedText(jButton1, org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "LBL_IMG_Browse")); + org.openide.awt.Mnemonics.setLocalizedText(jButton1, org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "LBL_IMG_Browse")); // NOI18N jButton1.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { jButton1ActionPerformed(evt); } }); - gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 3; gridBagConstraints.gridy = 0; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); add(jButton1, gridBagConstraints); - jButton1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSN_IMG_Browse")); - jButton1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSD_IMG_Browse")); + jButton1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSN_IMG_Browse")); // NOI18N + jButton1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSD_IMG_Browse")); // NOI18N jTextField2.setColumns(10); jTextField2.setMinimumSize(new java.awt.Dimension(100, 19)); @@ -233,7 +233,7 @@ add(jTextField3, gridBagConstraints); jLabel1.setLabelFor(jTextField1); - org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "LBL_IMG_Location")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "LBL_IMG_Location")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 0; @@ -241,11 +241,11 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jLabel1, gridBagConstraints); - jLabel1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSN_IMG_Location")); - jLabel1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSD_IMG_Location")); + jLabel1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSN_IMG_Location")); // NOI18N + jLabel1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSD_IMG_Location")); // NOI18N jLabel2.setLabelFor(jTextField2); - org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "LBL_IMG_Width")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "LBL_IMG_Width")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; @@ -253,11 +253,11 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jLabel2, gridBagConstraints); - jLabel2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSN_IMG_Width")); - jLabel2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSD_IMG_Width")); + jLabel2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSN_IMG_Width")); // NOI18N + jLabel2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSD_IMG_Width")); // NOI18N jLabel3.setLabelFor(jTextField3); - org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "LBL_IMG_Height")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "LBL_IMG_Height")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; @@ -265,8 +265,8 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(5, 12, 0, 0); add(jLabel3, gridBagConstraints); - jLabel3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSN_IMG_Height")); - jLabel3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSD_IMG_Height")); + jLabel3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSN_IMG_Height")); // NOI18N + jLabel3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSD_IMG_Height")); // NOI18N jTextField4.setColumns(30); gridBagConstraints = new java.awt.GridBagConstraints(); @@ -276,10 +276,31 @@ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; gridBagConstraints.weightx = 1.0; - gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 0); + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jTextField4, gridBagConstraints); + org.openide.awt.Mnemonics.setLocalizedText(jLabel5, org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "LBL_IMG_Figure")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 4; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 0); + add(jLabel5, gridBagConstraints); + jLabel5.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSN_IMG_Figure")); // NOI18N + jLabel5.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSD_IMG_Figure")); // NOI18N + + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox1, org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "LBL_IMG_FigureSelected")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 4; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.weighty = 1.0; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 0); + add(jCheckBox1, gridBagConstraints); + jCheckBox1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSN_IMG_FigureSelected")); // NOI18N + jCheckBox1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(IMGCustomizer.class, "ACSD_IMG_FigureSelected")); // NOI18N }// //GEN-END:initComponents private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed @@ -333,11 +354,13 @@ // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton jButton1; + private javax.swing.JCheckBox jCheckBox1; private javax.swing.JFileChooser jFileChooser1; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; + private javax.swing.JLabel jLabel5; private javax.swing.JTextField jTextField1; private javax.swing.JTextField jTextField2; private javax.swing.JTextField jTextField3; Index: html/src/org/netbeans/modules/html/palette/items/INPUT.java --- html/src/org/netbeans/modules/html/palette/items/INPUT.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/INPUT.java Locally Modified (Based On LOCAL) @@ -41,14 +41,13 @@ * Version 2 license, then the option applies only if the new code is * made subject to such option by the copyright holder. */ - package org.netbeans.modules.html.palette.items; + import javax.swing.text.BadLocationException; import javax.swing.text.JTextComponent; import org.netbeans.modules.html.palette.HtmlPaletteUtilities; import org.openide.text.ActiveEditorDrop; - /** * * @author Libor Kotouc @@ -60,7 +59,6 @@ public static final String TYPE_HIDDEN = "hidden"; // NOI18N public static final String STATE_DISABLED = "disabled"; // NOI18N public static final String STATE_READONLY = "readonly"; // NOI18N - private String name = ""; private String value = ""; private String type = TYPE_TEXT; @@ -68,6 +66,8 @@ private boolean hidden = false; private boolean readonly = false; private String width = ""; + private boolean generateID = false; + private boolean generateLabel = false; public INPUT() { } @@ -100,11 +100,13 @@ String strDisabled = (disabled ? " disabled=\"disabled\"" : ""); // NOI18N String strWidth = ""; - if (width.length() > 0) + if (width.length() > 0) { strWidth = " size=\"" + width + "\""; // NOI18N + } + String strId = (generateID ? " id=\"" + name + "\" " : ""); // NOI18N + String strLabel = (generateLabel ? "" : ""); + String inputBody = strLabel+""; // NOI18N - String inputBody = ""; // NOI18N - return inputBody; } @@ -164,4 +166,31 @@ this.readonly = readonly; } + /** + * @return the generateID + */ + public boolean isGenerateID() { + return generateID; } + + /** + * @param generateID the generateID to set + */ + public void setGenerateID(boolean generateID) { + this.generateID = generateID; + } + + /** + * @return the generateLabel + */ + public boolean isGenerateLabel() { + return generateLabel; + } + + /** + * @param generateLabel the generateLabel to set + */ + public void setGenerateLabel(boolean generateLabel) { + this.generateLabel = generateLabel; + } +} Index: html/src/org/netbeans/modules/html/palette/items/INPUTCustomizer.form --- html/src/org/netbeans/modules/html/palette/items/INPUTCustomizer.form Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/INPUTCustomizer.form Locally Modified (Based On LOCAL) @@ -5,6 +5,14 @@ + + + + + + + + @@ -38,7 +46,7 @@ - + @@ -121,7 +129,7 @@ - + @@ -293,5 +301,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: html/src/org/netbeans/modules/html/palette/items/INPUTCustomizer.java --- html/src/org/netbeans/modules/html/palette/items/INPUTCustomizer.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/INPUTCustomizer.java Locally Modified (Based On LOCAL) @@ -121,7 +121,8 @@ input.setDisabled(jCheckBox1.isSelected()); input.setReadonly(jCheckBox2.isSelected()); - + input.setGenerateID(jCheckBox3.isSelected()); + input.setGenerateLabel(jCheckBox4.isSelected()); String width = jTextField4.getText(); input.setWidth(width); } @@ -131,7 +132,7 @@ * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - // //GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; @@ -149,21 +150,26 @@ jCheckBox2 = new javax.swing.JCheckBox(); jLabel5 = new javax.swing.JLabel(); jTextField2 = new javax.swing.JTextField(); + jLabel6 = new javax.swing.JLabel(); + jCheckBox3 = new javax.swing.JCheckBox(); + jLabel7 = new javax.swing.JLabel(); + jCheckBox4 = new javax.swing.JCheckBox(); + setMinimumSize(new java.awt.Dimension(493, 311)); + setPreferredSize(new java.awt.Dimension(685, 311)); setLayout(new java.awt.GridBagLayout()); jLabel4.setLabelFor(jTextField4); - org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_Width")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_Width")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 7; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 0); + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jLabel4, gridBagConstraints); - jLabel4.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_Width")); - jLabel4.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_Width")); + jLabel4.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_Width")); // NOI18N + jLabel4.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_Width")); // NOI18N jTextField1.setColumns(30); gridBagConstraints = new java.awt.GridBagConstraints(); @@ -177,7 +183,7 @@ add(jTextField1, gridBagConstraints); jLabel1.setLabelFor(jTextField1); - org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_Name")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_Name")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 0; @@ -185,10 +191,10 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jLabel1, gridBagConstraints); - jLabel1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_Name")); - jLabel1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_Name")); + jLabel1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_Name")); // NOI18N + jLabel1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_Name")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_Type")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_Type")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; @@ -196,10 +202,10 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jLabel2, gridBagConstraints); - jLabel2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_Type")); - jLabel2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_Type")); + jLabel2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_Type")); // NOI18N + jLabel2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_Type")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_State")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_State")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 5; @@ -207,23 +213,21 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jLabel3, gridBagConstraints); - jLabel3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_State")); - jLabel3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_state")); + jLabel3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_State")); // NOI18N + jLabel3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_state")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 7; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 12); + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); add(jTextField4, gridBagConstraints); buttonGroup1.add(jRadioButton1); jRadioButton1.setSelected(true); - org.openide.awt.Mnemonics.setLocalizedText(jRadioButton1, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_text")); - jRadioButton1.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(0, 0, 0, 0))); - jRadioButton1.setMargin(new java.awt.Insets(0, 0, 0, 0)); + org.openide.awt.Mnemonics.setLocalizedText(jRadioButton1, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_text")); // NOI18N + jRadioButton1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 2; @@ -231,13 +235,12 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); add(jRadioButton1, gridBagConstraints); - jRadioButton1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_text")); - jRadioButton1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_text")); + jRadioButton1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_text")); // NOI18N + jRadioButton1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_text")); // NOI18N buttonGroup1.add(jRadioButton2); - org.openide.awt.Mnemonics.setLocalizedText(jRadioButton2, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_password")); - jRadioButton2.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(0, 0, 0, 0))); - jRadioButton2.setMargin(new java.awt.Insets(0, 0, 0, 0)); + org.openide.awt.Mnemonics.setLocalizedText(jRadioButton2, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_password")); // NOI18N + jRadioButton2.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 3; @@ -245,13 +248,12 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(5, 12, 0, 12); add(jRadioButton2, gridBagConstraints); - jRadioButton2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_password")); - jRadioButton2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_password")); + jRadioButton2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_password")); // NOI18N + jRadioButton2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_password")); // NOI18N buttonGroup1.add(jRadioButton3); - org.openide.awt.Mnemonics.setLocalizedText(jRadioButton3, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_hidden")); - jRadioButton3.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(0, 0, 0, 0))); - jRadioButton3.setMargin(new java.awt.Insets(0, 0, 0, 0)); + org.openide.awt.Mnemonics.setLocalizedText(jRadioButton3, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_hidden")); // NOI18N + jRadioButton3.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 4; @@ -259,12 +261,11 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(5, 12, 0, 12); add(jRadioButton3, gridBagConstraints); - jRadioButton3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_hidden")); - jRadioButton3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_hidden")); + jRadioButton3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_hidden")); // NOI18N + jRadioButton3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_hidden")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(jCheckBox1, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_disabled")); - jCheckBox1.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(0, 0, 0, 0))); - jCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0)); + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox1, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_disabled")); // NOI18N + jCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 5; @@ -272,12 +273,11 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); add(jCheckBox1, gridBagConstraints); - jCheckBox1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_disabled")); - jCheckBox1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_disabled")); + jCheckBox1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_disabled")); // NOI18N + jCheckBox1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_disabled")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(jCheckBox2, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_readonly")); - jCheckBox2.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(0, 0, 0, 0))); - jCheckBox2.setMargin(new java.awt.Insets(0, 0, 0, 0)); + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox2, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_readonly")); // NOI18N + jCheckBox2.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 6; @@ -285,11 +285,11 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(5, 12, 0, 12); add(jCheckBox2, gridBagConstraints); - jCheckBox2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_readonly")); - jCheckBox2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_readonly")); + jCheckBox2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_readonly")); // NOI18N + jCheckBox2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_readonly")); // NOI18N jLabel5.setLabelFor(jTextField2); - org.openide.awt.Mnemonics.setLocalizedText(jLabel5, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_Value")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel5, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_Value")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; @@ -297,8 +297,8 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(5, 12, 0, 0); add(jLabel5, gridBagConstraints); - jLabel5.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_Value")); - jLabel5.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_Value")); + jLabel5.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_Value")); // NOI18N + jLabel5.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_Value")); // NOI18N jTextField2.setColumns(30); gridBagConstraints = new java.awt.GridBagConstraints(); @@ -310,19 +310,70 @@ gridBagConstraints.insets = new java.awt.Insets(5, 12, 0, 12); add(jTextField2, gridBagConstraints); - } - // //GEN-END:initComponents + org.openide.awt.Mnemonics.setLocalizedText(jLabel6, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_Id")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 8; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); + add(jLabel6, gridBagConstraints); + jLabel6.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_Id")); // NOI18N + jLabel6.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_Id")); // NOI18N + jCheckBox3.setSelected(true); + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox3, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_IdSelected")); // NOI18N + jCheckBox3.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 8; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); + add(jCheckBox3, gridBagConstraints); + jCheckBox3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_IdSelected")); // NOI18N + jCheckBox3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_IdSelected")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(jLabel7, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_Label")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 9; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.weighty = 1.0; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); + add(jLabel7, gridBagConstraints); + jLabel7.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_Label")); // NOI18N + jLabel7.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_Label")); // NOI18N + + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox4, org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "LBL_INPUT_LabelSelected")); // NOI18N + jCheckBox4.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 9; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.weighty = 1.0; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); + add(jCheckBox4, gridBagConstraints); + jCheckBox4.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSN_INPUT_LabelSelected")); // NOI18N + jCheckBox4.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(INPUTCustomizer.class, "ACSD_INPUT_LabelSelected")); // NOI18N + }// //GEN-END:initComponents + + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.ButtonGroup buttonGroup1; private javax.swing.JCheckBox jCheckBox1; private javax.swing.JCheckBox jCheckBox2; + private javax.swing.JCheckBox jCheckBox3; + private javax.swing.JCheckBox jCheckBox4; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; private javax.swing.JLabel jLabel5; + private javax.swing.JLabel jLabel6; + private javax.swing.JLabel jLabel7; private javax.swing.JRadioButton jRadioButton1; private javax.swing.JRadioButton jRadioButton2; private javax.swing.JRadioButton jRadioButton3; Index: html/src/org/netbeans/modules/html/palette/items/RADIO.java --- html/src/org/netbeans/modules/html/palette/items/RADIO.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/RADIO.java Locally Modified (Based On LOCAL) @@ -72,6 +72,7 @@ private boolean selected = false; private boolean disabled = false; private String[] groups = new String[0]; + private boolean generateID = false; public RADIO() { } @@ -139,9 +140,9 @@ String strSelected = (selected ? " checked=\"checked\"" : ""); // NOI18N String strDisabled = (disabled ? " disabled=\"disabled\"" : ""); // NOI18N + String strId = (generateID ? " id=\"\" " : ""); // NOI18N + String radioBody = ""; // NOI18N - String radioBody = ""; // NOI18N - return radioBody; } @@ -166,7 +167,7 @@ //search for the input tags HtmlSource source = new HtmlSource(code); Iterator elements = new ElementsIterator(source); - while(elements.hasNext()) { + while (elements.hasNext()) { Element e = elements.next(); if (e.type() == ElementType.OPEN_TAG) { OpenTag tag = (OpenTag) e; @@ -176,7 +177,7 @@ if (typeAttr != null && nameAttr != null) { if (LexerUtils.equals("radio", typeAttr.unquotedValue(), true, true)) { //NOI18N CharSequence value = nameAttr.unquotedValue(); - if(value != null) { + if (value != null) { names.add(value.toString()); } } @@ -234,4 +235,18 @@ public void setGroups(String[] groups) { this.groups = groups; } + + /** + * @return the generateID + */ + public boolean isGenerateID() { + return generateID; } + + /** + * @param generateID the generateID to set + */ + public void setGenerateID(boolean generateID) { + this.generateID = generateID; + } +} Index: html/src/org/netbeans/modules/html/palette/items/RADIOCustomizer.form --- html/src/org/netbeans/modules/html/palette/items/RADIOCustomizer.form Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/RADIOCustomizer.form Locally Modified (Based On LOCAL) @@ -91,7 +91,7 @@ - + @@ -158,5 +158,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: html/src/org/netbeans/modules/html/palette/items/RADIOCustomizer.java --- html/src/org/netbeans/modules/html/palette/items/RADIOCustomizer.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/RADIOCustomizer.java Locally Modified (Based On LOCAL) @@ -120,7 +120,7 @@ radio.setValue(value); radio.setSelected(jCheckBox1.isSelected()); - + radio.setGenerateID(jCheckBox3.isSelected()); radio.setDisabled(jCheckBox2.isSelected()); } @@ -130,7 +130,7 @@ * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - // //GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; @@ -142,11 +142,13 @@ jTextField2 = new javax.swing.JTextField(); jLabel2 = new javax.swing.JLabel(); jComboBox1 = new javax.swing.JComboBox(); + jLabel3 = new javax.swing.JLabel(); + jCheckBox3 = new javax.swing.JCheckBox(); setLayout(new java.awt.GridBagLayout()); jLabel1.setLabelFor(jComboBox1); - org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "LBL_RADIO_Group")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "LBL_RADIO_Group")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 0; @@ -154,12 +156,11 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jLabel1, gridBagConstraints); - jLabel1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSN_RADIO_Group")); - jLabel1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSD_RADIO_Group")); + jLabel1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSN_RADIO_Group")); // NOI18N + jLabel1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSD_RADIO_Group")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(jCheckBox1, org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "LBL_RADIO_selected")); - jCheckBox1.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(0, 0, 0, 0))); - jCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0)); + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox1, org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "LBL_RADIO_selected")); // NOI18N + jCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 2; @@ -167,24 +168,22 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); add(jCheckBox1, gridBagConstraints); - jCheckBox1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSN_RADIO_selected")); - jCheckBox1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSD_RADIO_selected")); + jCheckBox1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSN_RADIO_selected")); // NOI18N + jCheckBox1.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSD_RADIO_selected")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(jCheckBox2, org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "LBL_RADIO_disabled")); - jCheckBox2.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(0, 0, 0, 0))); - jCheckBox2.setMargin(new java.awt.Insets(0, 0, 0, 0)); + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox2, org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "LBL_RADIO_disabled")); // NOI18N + jCheckBox2.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 3; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(5, 12, 12, 12); + gridBagConstraints.insets = new java.awt.Insets(5, 12, 0, 12); add(jCheckBox2, gridBagConstraints); - jCheckBox2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSN_RADIO_disabled")); - jCheckBox2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSD_RADIO_disabled")); + jCheckBox2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSN_RADIO_disabled")); // NOI18N + jCheckBox2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSD_RADIO_disabled")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(jLabel5, org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "LBL_RADIO_")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel5, org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "LBL_RADIO_")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; @@ -192,8 +191,8 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jLabel5, gridBagConstraints); - jLabel5.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSN_RADIO_State")); - jLabel5.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSD_RADIO_State")); + jLabel5.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSN_RADIO_State")); // NOI18N + jLabel5.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSD_RADIO_State")); // NOI18N jTextField2.setColumns(30); gridBagConstraints = new java.awt.GridBagConstraints(); @@ -205,7 +204,7 @@ add(jTextField2, gridBagConstraints); jLabel2.setLabelFor(jTextField2); - org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "LBL_RADIO_Value")); + org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "LBL_RADIO_Value")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; @@ -213,8 +212,8 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(5, 12, 0, 0); add(jLabel2, gridBagConstraints); - jLabel2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSN_RADIO_Value")); - jLabel2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSD_RADIO_Value")); + jLabel2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSN_RADIO_Value")); // NOI18N + jLabel2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSD_RADIO_Value")); // NOI18N jComboBox1.setEditable(true); gridBagConstraints = new java.awt.GridBagConstraints(); @@ -224,17 +223,42 @@ gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); add(jComboBox1, gridBagConstraints); - } - // //GEN-END:initComponents + org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "LBL_RADIO_Id")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 4; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); + add(jLabel3, gridBagConstraints); + jLabel3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSN_RADIO_Id")); // NOI18N + jLabel3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSD_RADIO_Id")); // NOI18N + jCheckBox3.setSelected(true); + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox3, org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "LBL_RADIO_IdSelected")); // NOI18N + jCheckBox3.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 4; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.weighty = 1.0; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); + add(jCheckBox3, gridBagConstraints); + jCheckBox3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSN_RADIO_IdSelected")); // NOI18N + jCheckBox3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RADIOCustomizer.class, "ACSD_RADIO_IdSelected")); // NOI18N + }// //GEN-END:initComponents + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.ButtonGroup buttonGroup1; private javax.swing.JCheckBox jCheckBox1; private javax.swing.JCheckBox jCheckBox2; + private javax.swing.JCheckBox jCheckBox3; private javax.swing.JComboBox jComboBox1; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; + private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel5; private javax.swing.JTextField jTextField2; // End of variables declaration//GEN-END:variables Index: html/src/org/netbeans/modules/html/palette/items/SELECT.java --- html/src/org/netbeans/modules/html/palette/items/SELECT.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/SELECT.java Locally Modified (Based On LOCAL) @@ -63,8 +63,9 @@ private int optionsVisible = OPTIONS_VISIBLE_DEFAULT; private boolean disabled = false; private boolean multiple = false; + private boolean generateID = false; + private boolean generateLabel = false; - public SELECT() { } @@ -96,8 +97,9 @@ String strMulti = (multiple ? " multiple=\"multiple\"" : ""); // NOI18N String strDisabled = (disabled ? " disabled=\"disabled\"" : ""); // NOI18N - - String selBody = "\n" + // NOI18N + String strId = (generateID ? " id=\"" + name + "\" " : ""); // NOI18N + String strLabel = (generateLabel ? "" : ""); + String selBody = strLabel+"\n" + // NOI18N sBody + ""; // NOI18N @@ -108,7 +110,7 @@ StringBuffer sb = new StringBuffer(); for (int i = 0; i < options; i++) - sb.append("\n"); // NOI18N + sb.append("\n"); // NOI18N String sBody = sb.toString(); @@ -155,4 +157,32 @@ this.multiple = multiple; } + /** + * @return the generateID + */ + public boolean isGenerateID() { + return generateID; } + + /** + * @param generateID the generateID to set + */ + public void setGenerateID(boolean generateID) { + this.generateID = generateID; + } + + /** + * @return the generateLabel + */ + public boolean isGenerateLabel() { + return generateLabel; + } + + /** + * @param generateLabel the generateLabel to set + */ + public void setGenerateLabel(boolean generateLabel) { + this.generateLabel = generateLabel; + } + +} Index: html/src/org/netbeans/modules/html/palette/items/SELECTCustomizer.form --- html/src/org/netbeans/modules/html/palette/items/SELECTCustomizer.form Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/SELECTCustomizer.form Locally Modified (Based On LOCAL) @@ -7,6 +7,7 @@ + @@ -171,7 +172,7 @@ - + @@ -217,7 +218,7 @@ - + @@ -247,5 +248,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: html/src/org/netbeans/modules/html/palette/items/SELECTCustomizer.java --- html/src/org/netbeans/modules/html/palette/items/SELECTCustomizer.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/SELECTCustomizer.java Locally Modified (Based On LOCAL) @@ -129,7 +129,8 @@ select.setOptionsVisible(optionsVisible); select.setMultiple(jCheckBox1.isSelected()); - + select.setGenerateID(jCheckBox3.isSelected()); + select.setGenerateLabel(jCheckBox4.isSelected()); select.setDisabled(jCheckBox2.isSelected()); } @@ -153,6 +154,10 @@ jSpinner1 = new javax.swing.JSpinner(); jLabel5 = new javax.swing.JLabel(); jSpinner2 = new javax.swing.JSpinner(); + jLabel6 = new javax.swing.JLabel(); + jCheckBox3 = new javax.swing.JCheckBox(); + jLabel7 = new javax.swing.JLabel(); + jCheckBox4 = new javax.swing.JCheckBox(); setLayout(new java.awt.GridBagLayout()); @@ -234,8 +239,7 @@ gridBagConstraints.gridy = 4; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 12); + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); add(jCheckBox2, gridBagConstraints); jCheckBox2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "ACSN_SELECT_disabled")); // NOI18N jCheckBox2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "ACSD_SELECT_disabled")); // NOI18N @@ -258,7 +262,7 @@ gridBagConstraints.gridy = 4; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 0); + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); add(jLabel5, gridBagConstraints); jLabel5.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "ACSN_SELECT_State")); // NOI18N jLabel5.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "ACSD_SELECT_State")); // NOI18N @@ -274,17 +278,69 @@ add(jSpinner2, gridBagConstraints); jSpinner2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "ACSN_SELECT_Visible_Options_Spinner")); // NOI18N jSpinner2.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "ACSD_SELECT_Visible_Options_Spinner")); // NOI18N + + org.openide.awt.Mnemonics.setLocalizedText(jLabel6, org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "LBL_SELECT_Id")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 5; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); + add(jLabel6, gridBagConstraints); + jLabel6.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "ACSN_SELECT_Id")); // NOI18N + jLabel6.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "ACSD_SELECT_Id")); // NOI18N + + jCheckBox3.setSelected(true); + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox3, org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "LBL_SELECT_IdSelected")); // NOI18N + jCheckBox3.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 5; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12); + add(jCheckBox3, gridBagConstraints); + jCheckBox3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "ACSN_SELECT_IdSelected")); // NOI18N + jCheckBox3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "ACSD_SELECT_IdSelected")); // NOI18N + + org.openide.awt.Mnemonics.setLocalizedText(jLabel7, org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "LBL_SELECT_Label")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 6; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); + add(jLabel7, gridBagConstraints); + jLabel7.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "ACSN_SELECT_Label")); // NOI18N + jLabel7.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "ACSD_SELECT_Label")); // NOI18N + + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox4, org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "LBL_SELECT_LabelSelected")); // NOI18N + jCheckBox4.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 6; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.weighty = 1.0; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 12, 12); + add(jCheckBox4, gridBagConstraints); + jCheckBox4.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "ACSN_SELECT_LabelSelected")); // NOI18N + jCheckBox4.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(SELECTCustomizer.class, "ACSD_SELECT_LabelSelected")); // NOI18N }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JCheckBox jCheckBox1; private javax.swing.JCheckBox jCheckBox2; + private javax.swing.JCheckBox jCheckBox3; + private javax.swing.JCheckBox jCheckBox4; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; private javax.swing.JLabel jLabel5; + private javax.swing.JLabel jLabel6; + private javax.swing.JLabel jLabel7; private javax.swing.JSpinner jSpinner1; private javax.swing.JSpinner jSpinner2; private javax.swing.JTextField jTextField1; Index: html/src/org/netbeans/modules/html/palette/items/TABLE.java --- html/src/org/netbeans/modules/html/palette/items/TABLE.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/TABLE.java Locally Modified (Based On LOCAL) @@ -41,14 +41,13 @@ * Version 2 license, then the option applies only if the new code is * made subject to such option by the copyright holder. */ - package org.netbeans.modules.html.palette.items; + import javax.swing.text.BadLocationException; import javax.swing.text.JTextComponent; import org.netbeans.modules.html.palette.HtmlPaletteUtilities; import org.openide.text.ActiveEditorDrop; - /** * * @author Libor Kotouc @@ -61,13 +60,13 @@ private static final int WIDTH_DEFAULT = 0; private static final int CSPAC_DEFAULT = 0; private static final int CPADD_DEFAULT = 0; - private int rows = ROWS_DEFAULT; private int cols = COLS_DEFAULT; private int border = BORDER_DEFAULT; private int width = WIDTH_DEFAULT; private int cspac = CSPAC_DEFAULT; private int cpadd = CPADD_DEFAULT; + private String caption = ""; public TABLE() { } @@ -96,21 +95,24 @@ String strBorder = " border=\"" + border + "\""; // NOI18N String strWidth = ""; - if (width != WIDTH_DEFAULT) + if (width != WIDTH_DEFAULT) { strWidth = " width=\"" + width + "\""; // NOI18N - + } String strCspac = ""; - if (cspac != CSPAC_DEFAULT) + if (cspac != CSPAC_DEFAULT) { strCspac = " cellspacing=\"" + cspac + "\""; // NOI18N - + } String strCpadd = ""; - if (cpadd != CPADD_DEFAULT) + if (cpadd != CPADD_DEFAULT) { strCpadd = " cellpadding=\"" + cpadd + "\""; // NOI18N + } - - String body = - "\n" + // NOI18N - "\n" + tHead + "\n" + // NOI18N + String body = "\n"; + if (caption.length() > 0) { + body += "" + caption + "\n"; + } + body += "\n" + tHead + "\n" + // NOI18N + "\n" + tHead + "\n" + // NOI18N "\n" + tBody + "\n" + // NOI18N "\n"; // NOI18N @@ -120,9 +122,9 @@ private String generateTHead() { StringBuffer sb = new StringBuffer(); - for (int i = 0; i < cols; i++) + for (int i = 0; i < cols; i++) { sb.append("\n"); // NOI18N - + } String thead = "\n" + sb.toString() + "\n"; // NOI18N return thead; @@ -133,8 +135,9 @@ StringBuffer sb = new StringBuffer(); for (int i = 0; i < rows; i++) { sb.append("\n"); // NOI18N - for (int j = 0; j < cols; j++) + for (int j = 0; j < cols; j++) { sb.append("\n"); // NOI18N + } sb.append("\n"); // NOI18N } @@ -191,4 +194,17 @@ return cpadd; } + /** + * @return the caption + */ + public String getCaption() { + return caption; } + + /** + * @param caption the caption to set + */ + public void setCaption(String caption) { + this.caption = caption; + } +} Index: html/src/org/netbeans/modules/html/palette/items/TABLECustomizer.form --- html/src/org/netbeans/modules/html/palette/items/TABLECustomizer.form Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/TABLECustomizer.form Locally Modified (Based On LOCAL) @@ -16,7 +16,7 @@ - + @@ -28,26 +28,35 @@ - + - + - + + + - - + + + + + + + + + @@ -86,6 +95,11 @@ + + + + + @@ -359,5 +373,22 @@ + + + + + + + + + + + + + + + + + Index: html/src/org/netbeans/modules/html/palette/items/TABLECustomizer.java --- html/src/org/netbeans/modules/html/palette/items/TABLECustomizer.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/TABLECustomizer.java Locally Modified (Based On LOCAL) @@ -142,6 +142,8 @@ int cpadd = ((Integer)jSpinner5.getValue()).intValue(); table.setCpadd(cpadd); + table.setCaption(jTextField1.getText()); + } /** This method is called from within the constructor to @@ -166,6 +168,8 @@ jSpinner4 = new javax.swing.JSpinner(); jSpinner5 = new javax.swing.JSpinner(); widthSpinner = new javax.swing.JSpinner(); + jLabel9 = new javax.swing.JLabel(); + jTextField1 = new javax.swing.JTextField(); jLabel1.setLabelFor(jSpinner2); org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(TABLECustomizer.class, "LBL_TABLE_Columns")); // NOI18N @@ -213,6 +217,8 @@ widthSpinner.setEditor(new JSpinner.NumberEditor(widthSpinner, "#")); widthSpinner.setValue(new Integer(table.getWidth())); + org.openide.awt.Mnemonics.setLocalizedText(jLabel9, org.openide.util.NbBundle.getMessage(TABLECustomizer.class, "LBL_TABLE_Caption")); // NOI18N + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( @@ -228,21 +234,27 @@ .addComponent(jLabel6)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jSpinner1, javax.swing.GroupLayout.DEFAULT_SIZE, 150, Short.MAX_VALUE) + .addComponent(jSpinner1) .addComponent(jSpinner2) .addComponent(jSpinner3) - .addComponent(widthSpinner, javax.swing.GroupLayout.DEFAULT_SIZE, 150, Short.MAX_VALUE) + .addComponent(widthSpinner) .addComponent(jSpinner4) - .addComponent(jSpinner5, javax.swing.GroupLayout.DEFAULT_SIZE, 147, Short.MAX_VALUE)) + .addComponent(jSpinner5)) .addGap(245, 245, 245)) .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() .addGap(44, 44, 44) - .addComponent(jLabel7) - .addContainerGap(216, Short.MAX_VALUE)) + .addComponent(jLabel7)) .addGroup(layout.createSequentialGroup() .addGap(44, 44, 44) - .addComponent(jLabel8) - .addContainerGap(38, Short.MAX_VALUE)) + .addComponent(jLabel8)) + .addGroup(layout.createSequentialGroup() + .addContainerGap() + .addComponent(jLabel9) + .addGap(43, 43, 43) + .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, 221, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addContainerGap()) ); layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jSpinner1, jSpinner2, jSpinner3, jSpinner4, jSpinner5, widthSpinner}); @@ -278,6 +290,10 @@ .addComponent(jSpinner5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jLabel8) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jLabel9) + .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); @@ -309,6 +325,8 @@ jSpinner5.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(TABLECustomizer.class, "ACSD_TABLE_Padding_Spinner")); // NOI18N widthSpinner.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(TABLECustomizer.class, "ACSN_TABLE_Width_Spinner")); // NOI18N widthSpinner.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(TABLECustomizer.class, "ACSD_TABLE_Width_Spinner")); // NOI18N + jLabel9.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(TABLECustomizer.class, "ACSN_TABLE_Caption")); // NOI18N + jLabel9.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(TABLECustomizer.class, "ACSD_TABLE_Caption")); // NOI18N }// //GEN-END:initComponents @@ -321,11 +339,13 @@ private javax.swing.JLabel jLabel6; private javax.swing.JLabel jLabel7; private javax.swing.JLabel jLabel8; + private javax.swing.JLabel jLabel9; private javax.swing.JSpinner jSpinner1; private javax.swing.JSpinner jSpinner2; private javax.swing.JSpinner jSpinner3; private javax.swing.JSpinner jSpinner4; private javax.swing.JSpinner jSpinner5; + private javax.swing.JTextField jTextField1; private javax.swing.JSpinner widthSpinner; // End of variables declaration//GEN-END:variables Index: html/src/org/netbeans/modules/html/palette/items/TEXTAREA.java --- html/src/org/netbeans/modules/html/palette/items/TEXTAREA.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/TEXTAREA.java Locally Modified (Based On LOCAL) @@ -67,6 +67,8 @@ private boolean readonly = false; private int rows = ROWS_DEFAULT; private int cols = COLS_DEFAULT; + private boolean generateID = false; + private boolean generateLabel = false; public TEXTAREA() { } @@ -100,8 +102,9 @@ String strRows = " rows=\"" + rows + "\""; // NOI18N String strCols = " cols=\"" + cols + "\""; // NOI18N - - String taBody = "\n" + // NOI18N + String strId = (generateID ? " id=\"" + name + "\" " : ""); // NOI18N + String strLabel = (generateLabel ? "" : ""); + String taBody = strLabel+"\n" + // NOI18N strValue + ""; // NOI18N @@ -156,4 +159,32 @@ this.value = value; } + /** + * @return the generateID + */ + public boolean isGenerateID() { + return generateID; } + + /** + * @param generateID the generateID to set + */ + public void setGenerateID(boolean generateID) { + this.generateID = generateID; + } + + /** + * @return the generateLabel + */ + public boolean isGenerateLabel() { + return generateLabel; + } + + /** + * @param generateLabel the generateLabel to set + */ + public void setGenerateLabel(boolean generateLabel) { + this.generateLabel = generateLabel; + } + +} Index: html/src/org/netbeans/modules/html/palette/items/TEXTAREACustomizer.form --- html/src/org/netbeans/modules/html/palette/items/TEXTAREACustomizer.form Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/TEXTAREACustomizer.form Locally Modified (Based On LOCAL) @@ -1,4 +1,4 @@ - +
@@ -216,7 +216,7 @@ - + @@ -263,5 +263,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: html/src/org/netbeans/modules/html/palette/items/TEXTAREACustomizer.java --- html/src/org/netbeans/modules/html/palette/items/TEXTAREACustomizer.java Base (BASE) +++ html/src/org/netbeans/modules/html/palette/items/TEXTAREACustomizer.java Locally Modified (Based On LOCAL) @@ -130,7 +130,8 @@ int rows = ((Integer)jSpinner1.getValue()).intValue(); textArea.setRows(rows); - + textArea.setGenerateID(jCheckBox3.isSelected()); + textArea.setGenerateLabel(jCheckBox4.isSelected()); int cols = ((Integer)jSpinner2.getValue()).intValue(); textArea.setCols(cols); @@ -157,6 +158,10 @@ jLabel2 = new javax.swing.JLabel(); jScrollPane1 = new javax.swing.JScrollPane(); jTextArea1 = new javax.swing.JTextArea(); + jLabel6 = new javax.swing.JLabel(); + jCheckBox3 = new javax.swing.JCheckBox(); + jLabel7 = new javax.swing.JLabel(); + jCheckBox4 = new javax.swing.JCheckBox(); setLayout(new java.awt.GridBagLayout()); @@ -261,7 +266,6 @@ gridBagConstraints.gridy = 5; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; gridBagConstraints.weightx = 1.0; - gridBagConstraints.weighty = 1.0; gridBagConstraints.insets = new java.awt.Insets(5, 12, 12, 12); add(jSpinner2, gridBagConstraints); jSpinner2.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(TEXTAREACustomizer.class, "ACSN_TEXTAREA_Columns_Spinner")); // NOI18N @@ -290,17 +294,69 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(5, 12, 0, 12); add(jScrollPane1, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(jLabel6, org.openide.util.NbBundle.getMessage(TEXTAREACustomizer.class, "LBL_TEXTAREA_Id")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 6; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); + add(jLabel6, gridBagConstraints); + jLabel6.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(TEXTAREACustomizer.class, "ACSN_TEXTAREA_Id")); // NOI18N + jLabel6.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(TEXTAREACustomizer.class, "ACSD_TEXTAREA_Id")); // NOI18N + + jCheckBox3.setSelected(true); + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox3, org.openide.util.NbBundle.getMessage(TEXTAREACustomizer.class, "LBL_TEXTAREA_IdSelected")); // NOI18N + jCheckBox3.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 6; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); + add(jCheckBox3, gridBagConstraints); + jCheckBox3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(TEXTAREACustomizer.class, "ACSN_TEXTAREA_IdSelected")); // NOI18N + jCheckBox3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(TEXTAREACustomizer.class, "ACSD_TEXTAREA_IdSelected")); // NOI18N + + org.openide.awt.Mnemonics.setLocalizedText(jLabel7, org.openide.util.NbBundle.getMessage(TEXTAREACustomizer.class, "LBL_TEXTAREA_Label")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 7; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); + add(jLabel7, gridBagConstraints); + jLabel7.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(TEXTAREACustomizer.class, "ACSN_TEXTAREA_Label")); // NOI18N + jLabel7.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(TEXTAREACustomizer.class, "ACSD_TEXTAREA_Label")); // NOI18N + + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox4, org.openide.util.NbBundle.getMessage(TEXTAREACustomizer.class, "LBL_TEXTAREA_LabelSelected")); // NOI18N + jCheckBox4.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 7; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.weighty = 1.0; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0); + add(jCheckBox4, gridBagConstraints); + jCheckBox4.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(TEXTAREACustomizer.class, "ACSN_TEXTAREA_LabelSelected")); // NOI18N + jCheckBox4.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(TEXTAREACustomizer.class, "ACSD_TEXTAREA_LabelSelected")); // NOI18N }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JCheckBox jCheckBox1; private javax.swing.JCheckBox jCheckBox2; + private javax.swing.JCheckBox jCheckBox3; + private javax.swing.JCheckBox jCheckBox4; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; private javax.swing.JLabel jLabel5; + private javax.swing.JLabel jLabel6; + private javax.swing.JLabel jLabel7; private javax.swing.JScrollPane jScrollPane1; private javax.swing.JSpinner jSpinner1; private javax.swing.JSpinner jSpinner2;