diff --git a/enterprise/web.core/src/org/netbeans/modules/web/core/api/JspColoringData.java b/enterprise/web.core/src/org/netbeans/modules/web/core/api/JspColoringData.java index 81ea6f55cc76..150efed28caa 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/core/api/JspColoringData.java +++ b/enterprise/web.core/src/org/netbeans/modules/web/core/api/JspColoringData.java @@ -44,7 +44,7 @@ public final class JspColoringData extends PropertyChangeSupport { public static final String PROP_PARSING_IN_PROGRESS = "parsingInProgress"; //NOI18N /** Taglib id -> TagLibraryInfo */ - private Map taglibs; + private Map taglibs; /** Prefix -> Taglib id */ private Map prefixMapper; @@ -120,7 +120,7 @@ public void parsingStarted() { * @param newPrefixMapper the new map of (prefix, uri) * @param parseSuccessful whether parsing was successful. If false, then the new information is partial only */ - public void applyParsedData(Map newTaglibs, Map newPrefixMapper, boolean newELIgnored, boolean newXMLSyntax, boolean parseSuccessful) { + public void applyParsedData(Map newTaglibs, Map newPrefixMapper, boolean newELIgnored, boolean newXMLSyntax, boolean parseSuccessful) { initialized = true; @@ -165,7 +165,7 @@ public void applyParsedData(Map newTaglibs, Map newPrefixMapper, String uri = newPrefixMapper.get(prefix); String uriOld = prefixMapper.get(prefix); if ((uriOld == null) || !uri.equals(uriOld)) { - Object newTaglib = newTaglibs.get(uri); + TagLibraryInfo newTaglib = newTaglibs.get(uri); if (newTaglib != null) { // change - merge it prefixMapper.put(prefix, uri); @@ -180,8 +180,8 @@ public void applyParsedData(Map newTaglibs, Map newPrefixMapper, } } - private static boolean equalsColoringInformation(Map taglibs1, Map prefixMapper1, - Map taglibs2, Map prefixMapper2) { + private static boolean equalsColoringInformation(Map taglibs1, Map prefixMapper1, + Map taglibs2, Map prefixMapper2) { if ((taglibs1 == null) != (taglibs2 == null)) { return false; @@ -203,8 +203,8 @@ private static boolean equalsColoringInformation(Map taglibs1, Map weakListener; Listener() { } private void register(FileObject fo) { - EventListener el = WeakListeners.create(FileChangeListener.class, this, fo); - fo.addFileChangeListener((FileChangeListener) el); - weakListener = new WeakReference(el); + FileChangeListener el = WeakListeners.create(FileChangeListener.class, this, fo); + fo.addFileChangeListener(el); + weakListener = new WeakReference<>(el); } private void unregister(FileObject fo) { - FileChangeListener listener = (FileChangeListener) weakListener.get(); + FileChangeListener listener = weakListener.get(); if (listener != null) { fo.removeFileChangeListener(listener); } @@ -549,31 +514,6 @@ public void propertyChange(PropertyChangeEvent evt) { public void fileRenamed(FileRenameEvent fe) { refreshPlugin(true); } - - // implementation of ServerRegistryImpl.ServerRegistryListener - /* - PENDING - public void added(ServerRegistryImpl.ServerEvent added) { - serverChange(); - } - - public void setAppDefault(ServerRegistryImpl.InstanceEvent inst) { - serverChange(); - } - - public void setWebDefault(ServerRegistryImpl.InstanceEvent inst) { - serverChange(); - } - - public void removed(ServerRegistryImpl.ServerEvent removed) { - serverChange(); - } - */ - /* - private void serverChange() { - refreshPlugin(true); - firePropertyChange0(PROP_SERVER_CHANGE, null, null); - }*/ } } diff --git a/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/JspNode.java b/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/JspNode.java index 3bf08c71261e..9c8768820f31 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/JspNode.java +++ b/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/JspNode.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; +import javax.swing.Action; import org.openide.nodes.*; import org.openide.loaders.DataNode; import org.openide.loaders.DataObject; @@ -58,7 +59,6 @@ public JspNode (JspDataObject jdo) { private void initialize () { setIconBaseWithExtension(getIconBase()); - setDefaultAction (SystemAction.get (OpenAction.class)); if (isTagFile()) setShortDescription (NbBundle.getMessage(JspNode.class, "LBL_tagNodeShortDesc")); //NOI18N @@ -66,6 +66,11 @@ private void initialize () { setShortDescription (NbBundle.getMessage(JspNode.class, "LBL_jspNodeShortDesc")); //NOI18N } + @Override + public Action getPreferredAction() { + return SystemAction.get (OpenAction.class); + } + private String getExtension(){ return getDataObject().getPrimaryFile().getExt(); } @@ -98,26 +103,21 @@ protected Sheet createSheet () { ps.setDisplayName(NbBundle.getBundle(JspNode.class).getString("PROP_executionSetName")); //NOI18N ps.setShortDescription(NbBundle.getBundle(JspNode.class).getString("HINT_executionSetName")); //NOI18N - ps.put(new PropertySupport.ReadWrite ( + ps.put(new PropertySupport.ReadWrite ( PROP_REQUEST_PARAMS, String.class, NbBundle.getBundle(JspNode.class).getString("PROP_requestParams"), //NOI18N NbBundle.getBundle(JspNode.class).getString("HINT_requestParams") //NOI18N ) { - public Object getValue() { + public String getValue() { return getRequestParams(((MultiDataObject)getDataObject()).getPrimaryEntry()); } - public void setValue (Object val) throws InvocationTargetException { - if (val instanceof String) { - try { - setRequestParams(((MultiDataObject)getDataObject()).getPrimaryEntry(), (String)val); - } catch(IOException e) { - throw new InvocationTargetException (e); - } - } - else { - throw new IllegalArgumentException(); - } + public void setValue (String val) throws InvocationTargetException { + try { + setRequestParams(((MultiDataObject)getDataObject()).getPrimaryEntry(), (String)val); + } catch(IOException e) { + throw new InvocationTargetException (e); + } } } ); @@ -136,13 +136,13 @@ public void setValue (Object val) throws InvocationTargetException { ps.setShortDescription(NbBundle.getBundle(JspNode.class).getString("HINT_textfileSetName")); // NOI18N sheet.put(ps); - ps.put(new PropertySupport.ReadOnly( + ps.put(new PropertySupport.ReadOnly( PROP_FILE_ENCODING, String.class, NbBundle.getBundle(JspNode.class).getString("PROP_fileEncoding"), //NOI18N NbBundle.getBundle(JspNode.class).getString("HINT_fileEncoding") //NOI18N ) { - public Object getValue() { + public String getValue() { return ((JspDataObject)getDataObject()).getFileEncoding(); } } diff --git a/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/TagLibParseSupport.java b/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/TagLibParseSupport.java index cb9440c0bfaa..716c11b2e106 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/TagLibParseSupport.java +++ b/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/TagLibParseSupport.java @@ -22,6 +22,7 @@ import java.lang.ref.WeakReference; import java.lang.ref.SoftReference; import java.util.ArrayList; +import java.util.List; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; @@ -67,7 +68,7 @@ public class TagLibParseSupport implements org.openide.nodes.Node.Cookie, TagLib // private static final int WAIT_FOR_EDITOR_TIMEOUT = 15 * 1000; //15 seconds /** Holds a reference to the JSP coloring data. */ - private WeakReference jspColoringDataRef; + private WeakReference jspColoringDataRef; /** Holds a time-based cache of the JspOpenInfo structure. */ private TimeReference jspOpenInfoRef; @@ -76,13 +77,13 @@ public class TagLibParseSupport implements org.openide.nodes.Node.Cookie, TagLib * The editor should hold a strong reference to this object. That way, if the editor window * is closed, memory is reclaimed, but important data is kept when it is needed. */ - private SoftReference parseResultRef; + private SoftReference parseResultRef; /** Holds the last successful parse result: JspParserAPI.ParseResult. * The editor should hold a strong reference to this object. That way, if the editor window * is closed, memory is reclaimed, but important data is kept when it is needed. */ - private SoftReference parseResultSuccessfulRef; + private SoftReference parseResultSuccessfulRef; private final Object parseResultLock = new Object(); private final Object openInfoLock = new Object(); @@ -136,7 +137,7 @@ JspColoringData getJSPColoringData(boolean prepare) { return (JspColoringData)o; } JspColoringData jcd = new JspColoringData(this); - jspColoringDataRef = new WeakReference(jcd); + jspColoringDataRef = new WeakReference<>(jcd); if (prepare) { prepare(); } @@ -280,9 +281,9 @@ public JspParserAPI.ParseResult getCachedParseResult(boolean successfulOnly, boo } JspParserAPI.ParseResult ret = null; - SoftReference myRef = successfulOnly ? parseResultSuccessfulRef : parseResultRef; + SoftReference myRef = successfulOnly ? parseResultSuccessfulRef : parseResultRef; if (myRef != null) { - ret = (JspParserAPI.ParseResult)myRef.get(); + ret = myRef.get(); } if ((ret == null) && (!successfulOnly)) { @@ -341,9 +342,9 @@ public void run() { assert locResult != null; synchronized (TagLibParseSupport.this.parseResultLock) { - parseResultRef = new SoftReference(locResult); + parseResultRef = new SoftReference<>(locResult); if (locResult.isParsingSuccess()) { - parseResultSuccessfulRef = new SoftReference(locResult); + parseResultSuccessfulRef = new SoftReference<>(locResult); //hold a reference to the parsing data until last editor pane is closed //motivation: the editor doesn't always hold a strogref to this object //so the SoftRef is sometime cleaned even if there is an editor pane opened. @@ -361,7 +362,7 @@ public void run() { } else { SwingUtilities.invokeLater(new Runnable() { public void run() { - ArrayList errors = new ArrayList(locResult.getErrors().length); + List errors = new ArrayList<>(locResult.getErrors().length); for (int i = 0; i < locResult.getErrors().length; i ++){ JspParserAPI.ErrorDescriptor err = locResult.getErrors()[i]; if (err != null && checkError(err)) { @@ -387,9 +388,6 @@ public void run() { parsingTask = null; if (pageInfo == null) return; - //Map prefixMapper = (pageInfo.getXMLPrefixMapper().size() > 0) ? - // pageInfo.getApproxXmlPrefixMapper() : pageInfo.getJspPrefixMapper(); - //Map prefixMapper = pageInfo.getJspPrefixMapper(); Map prefixMapper = null; if (pageInfo.getXMLPrefixMapper().size() > 0) { prefixMapper = pageInfo.getApproxXmlPrefixMapper(); diff --git a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/JspPaletteUtilities.java b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/JspPaletteUtilities.java index 320844bb38e9..4250009ab209 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/JspPaletteUtilities.java +++ b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/JspPaletteUtilities.java @@ -272,32 +272,29 @@ private static void insertTagLibRef(JTextComponent target, String prefix, String Document doc = target.getDocument(); if (doc instanceof BaseDocument) { BaseDocument baseDoc = (BaseDocument)doc; - baseDoc.atomicLock(); - try { - int pos = 0; // FIXME: compute better where to insert tag lib definition? - String definition = "<%@taglib prefix=\""+prefix+"\" uri=\""+uri+"\"%>\n"; //NOI18N - - //test for .jspx. FIXME: find better way to detect xml syntax?. - FileObject fobj = getFileObject(target); - if (fobj != null && "jspx".equals(fobj.getExt())) { - int baseDocLength = baseDoc.getLength(); - String text = baseDoc.getText(0, baseDocLength); - String jspRootBegin = " { + try { + int pos = 0; // FIXME: compute better where to insert tag lib definition? + String definition = "<%@taglib prefix=\"" + prefix + "\" uri=\"" + uri + "\"%>\n"; //NOI18N + + //test for .jspx. FIXME: find better way to detect xml syntax?. + FileObject fobj = getFileObject(target); + if (fobj != null && "jspx".equals(fobj.getExt())) { + int baseDocLength = baseDoc.getLength(); + String text = baseDoc.getText(0, baseDocLength); + String jspRootBegin = " + @@ -73,6 +74,9 @@ + + + @@ -109,6 +113,9 @@ + + + diff --git a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/GetPropertyCustomizer.java b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/GetPropertyCustomizer.java index 98bed5d1f900..f47ec1237bae 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/GetPropertyCustomizer.java +++ b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/GetPropertyCustomizer.java @@ -30,6 +30,7 @@ import javax.swing.event.DocumentListener; import javax.swing.text.JTextComponent; import org.netbeans.modules.web.core.palette.JspPaletteUtilities; +import org.netbeans.modules.web.core.palette.items.GetProperty.BeanDescr; import org.openide.DialogDescriptor; import org.openide.DialogDisplayer; import org.openide.util.Exceptions; @@ -54,7 +55,7 @@ public GetPropertyCustomizer(GetProperty getProperty, JTextComponent target) { initComponents(); - beanNameCb.setModel(new DefaultComboBoxModel(getProperty.getAllBeans().toArray())); + beanNameCb.setModel(new DefaultComboBoxModel<>(getProperty.getAllBeans().toArray(new BeanDescr[]{}))); beanNameCb.setSelectedIndex(getProperty.getBeanIndex()); addDocumentListener(beanNameCb); } @@ -129,10 +130,10 @@ private void updateProperties() { } if (currentBean == null) { - propertyNameCb.setModel(new DefaultComboBoxModel()); + propertyNameCb.setModel(new DefaultComboBoxModel<>()); } else { String[] pref = {"get", "is"}; // NOI18N - propertyNameCb.setModel(new DefaultComboBoxModel(JspPaletteUtilities.getTypeProperties(target, currentBean.getFqcn(), pref).toArray())); + propertyNameCb.setModel(new DefaultComboBoxModel<>(JspPaletteUtilities.getTypeProperties(target, currentBean.getFqcn(), pref).toArray(new String[]{}))); } } @@ -146,9 +147,9 @@ private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; jLabel1 = new javax.swing.JLabel(); - beanNameCb = new javax.swing.JComboBox(); + beanNameCb = new javax.swing.JComboBox<>(); jLabel3 = new javax.swing.JLabel(); - propertyNameCb = new javax.swing.JComboBox(); + propertyNameCb = new javax.swing.JComboBox<>(); setLayout(new java.awt.GridBagLayout()); @@ -204,9 +205,9 @@ private void beanNameCbActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI updateProperties(); }//GEN-LAST:event_beanNameCbActionPerformed // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JComboBox beanNameCb; + private javax.swing.JComboBox beanNameCb; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel3; - private javax.swing.JComboBox propertyNameCb; + private javax.swing.JComboBox propertyNameCb; // End of variables declaration//GEN-END:variables } diff --git a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/IfCustomizer.form b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/IfCustomizer.form index 53c310da75ee..d4f8d92e755a 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/IfCustomizer.form +++ b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/IfCustomizer.form @@ -37,6 +37,7 @@ + @@ -135,6 +136,12 @@ + + + + + + diff --git a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/IfCustomizer.java b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/IfCustomizer.java index 53f236910e30..60b4056713e7 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/IfCustomizer.java +++ b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/IfCustomizer.java @@ -46,7 +46,7 @@ public IfCustomizer(If iF, JTextComponent target) { initComponents(); - jComboBox2.setModel(new DefaultComboBoxModel(If.scopes)); + jComboBox2.setModel(new DefaultComboBoxModel<>(If.scopes)); jComboBox2.setSelectedIndex(iF.getScopeIndex()); } @@ -105,7 +105,7 @@ private void initComponents() { jTextField1 = new javax.swing.JTextField(); jLabel1 = new javax.swing.JLabel(); jLabel2 = new javax.swing.JLabel(); - jComboBox2 = new javax.swing.JComboBox(); + jComboBox2 = new javax.swing.JComboBox<>(); jTextField2 = new javax.swing.JTextField(); jLabel3 = new javax.swing.JLabel(); @@ -191,7 +191,7 @@ private void initComponents() { // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JComboBox jComboBox2; + private javax.swing.JComboBox jComboBox2; private javax.swing.JFileChooser jFileChooser1; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; diff --git a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/SQLStmtCustomizer.form b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/SQLStmtCustomizer.form index 259b6e087b86..45f2455692ee 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/SQLStmtCustomizer.form +++ b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/SQLStmtCustomizer.form @@ -100,6 +100,9 @@ + + + diff --git a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/SQLStmtCustomizer.java b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/SQLStmtCustomizer.java index 9cf8757fd78b..5c293189e59b 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/SQLStmtCustomizer.java +++ b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/SQLStmtCustomizer.java @@ -92,7 +92,7 @@ public void changedUpdate(DocumentEvent evt) { }); } - jComboBox2.setModel(new DefaultComboBoxModel(SQLStmt.scopes)); + jComboBox2.setModel(new DefaultComboBoxModel<>(SQLStmt.scopes)); jComboBox2.setSelectedIndex(stmt.getScopeIndex()); jTextField2.setText(stmt.getDataSource()); jTextArea1.setText(stmt.getStmt()); @@ -164,7 +164,7 @@ private void initComponents() { jFileChooser1 = new javax.swing.JFileChooser(); jLabel4 = new javax.swing.JLabel(); jLabel2 = new javax.swing.JLabel(); - jComboBox2 = new javax.swing.JComboBox(); + jComboBox2 = new javax.swing.JComboBox<>(); jTextField1 = new javax.swing.JTextField(); jLabel1 = new javax.swing.JLabel(); jScrollPane1 = new javax.swing.JScrollPane(); @@ -267,7 +267,7 @@ private void initComponents() { // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JComboBox jComboBox2; + private javax.swing.JComboBox jComboBox2; private javax.swing.JFileChooser jFileChooser1; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; diff --git a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/SetPropertyCustomizer.form b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/SetPropertyCustomizer.form index 170c8cc860f3..4be18e8eab13 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/SetPropertyCustomizer.form +++ b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/SetPropertyCustomizer.form @@ -30,6 +30,7 @@ + @@ -73,6 +74,9 @@ + + + @@ -136,6 +140,9 @@ + + + diff --git a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/SetPropertyCustomizer.java b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/SetPropertyCustomizer.java index 429dc90c3a33..ab577ee65432 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/SetPropertyCustomizer.java +++ b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/SetPropertyCustomizer.java @@ -30,6 +30,7 @@ import javax.swing.event.DocumentListener; import javax.swing.text.JTextComponent; import org.netbeans.modules.web.core.palette.JspPaletteUtilities; +import org.netbeans.modules.web.core.palette.items.GetProperty.BeanDescr; import org.openide.DialogDescriptor; import org.openide.DialogDisplayer; import org.openide.util.NbBundle; @@ -52,7 +53,7 @@ public SetPropertyCustomizer(SetProperty setProperty, JTextComponent target) { initComponents(); - beanNameCb.setModel(new DefaultComboBoxModel(setProperty.getAllBeans().toArray())); + beanNameCb.setModel(new DefaultComboBoxModel<>(setProperty.getAllBeans().toArray(new BeanDescr[]{}))); beanNameCb.setSelectedIndex(setProperty.getBeanIndex()); addDocumentListener(beanNameCb); } @@ -115,10 +116,10 @@ private void updateProperties() { } if (currentBean == null) { - propertyNameCb.setModel(new DefaultComboBoxModel()); + propertyNameCb.setModel(new DefaultComboBoxModel<>()); } else { String[] pref = {"set"}; // NOI18N - propertyNameCb.setModel(new DefaultComboBoxModel(JspPaletteUtilities.getTypeProperties(target, currentBean.getFqcn(), pref).toArray())); + propertyNameCb.setModel(new DefaultComboBoxModel<>(JspPaletteUtilities.getTypeProperties(target, currentBean.getFqcn(), pref).toArray(new String[]{}))); } } @@ -148,11 +149,11 @@ private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; jLabel1 = new javax.swing.JLabel(); - beanNameCb = new javax.swing.JComboBox(); + beanNameCb = new javax.swing.JComboBox<>(); jLabel3 = new javax.swing.JLabel(); jLabel4 = new javax.swing.JLabel(); propertyValueTf = new javax.swing.JTextField(); - propertyNameCb = new javax.swing.JComboBox(); + propertyNameCb = new javax.swing.JComboBox<>(); setLayout(new java.awt.GridBagLayout()); @@ -231,11 +232,11 @@ private void beanNameCbActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JComboBox beanNameCb; + private javax.swing.JComboBox beanNameCb; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; - private javax.swing.JComboBox propertyNameCb; + private javax.swing.JComboBox propertyNameCb; private javax.swing.JTextField propertyValueTf; // End of variables declaration//GEN-END:variables diff --git a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/UseBeanCustomizer.form b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/UseBeanCustomizer.form index 4cb9804c3eb2..b26fd7ccd712 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/UseBeanCustomizer.form +++ b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/UseBeanCustomizer.form @@ -1,4 +1,4 @@ - + -
+ @@ -32,7 +32,11 @@ + + + + @@ -120,6 +124,9 @@ + + + diff --git a/enterprise/web.core/src/org/netbeans/modules/web/wizards/AttrDialog.java b/enterprise/web.core/src/org/netbeans/modules/web/wizards/AttrDialog.java index df5195eb0e3a..f4690faa23c8 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/wizards/AttrDialog.java +++ b/enterprise/web.core/src/org/netbeans/modules/web/wizards/AttrDialog.java @@ -62,14 +62,15 @@ javax.swing.JTextField getAttrNameTF() { * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - private void initComponents() {//GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents + private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; buttonGroup1 = new javax.swing.ButtonGroup(); jLabel1 = new javax.swing.JLabel(); jLabel2 = new javax.swing.JLabel(); jTextField1 = new javax.swing.JTextField(); - jComboBox1 = new javax.swing.JComboBox(); + jComboBox1 = new javax.swing.JComboBox<>(); jCheckBox1 = new javax.swing.JCheckBox(); jPanel1 = new javax.swing.JPanel(); jRadioButton1 = new javax.swing.JRadioButton(); @@ -77,10 +78,9 @@ private void initComponents() {//GEN-BEGIN:initComponents setLayout(new java.awt.GridBagLayout()); - getAccessibleContext().setAccessibleDescription(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/wizards/Bundle").getString("A11Y_DESC_AttrDialog")); jLabel1.setDisplayedMnemonic(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/wizards/Bundle").getString("A11Y_AttrName_mnem").charAt(0)); jLabel1.setLabelFor(jTextField1); - jLabel1.setText(org.openide.util.NbBundle.getMessage(AttrDialog.class, "LBL_AttrName")); + jLabel1.setText(org.openide.util.NbBundle.getMessage(AttrDialog.class, "LBL_AttrName")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 0; @@ -91,24 +91,24 @@ private void initComponents() {//GEN-BEGIN:initComponents jLabel2.setDisplayedMnemonic(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/wizards/Bundle").getString("A11Y_AttrType_mnem").charAt(0)); jLabel2.setLabelFor(jComboBox1); - jLabel2.setText(org.openide.util.NbBundle.getMessage(AttrDialog.class, "LBL_AttrType")); + jLabel2.setText(org.openide.util.NbBundle.getMessage(AttrDialog.class, "LBL_AttrType")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(0, 6, 6, 0); add(jLabel2, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.weightx = 1.0; gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 0); add(jTextField1, gridBagConstraints); - jTextField1.getAccessibleContext().setAccessibleDescription(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/wizards/Bundle").getString("LBL_AttrName")); + java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/netbeans/modules/web/wizards/Bundle"); // NOI18N + jTextField1.getAccessibleContext().setAccessibleDescription(bundle.getString("LBL_AttrName")); // NOI18N jComboBox1.setEditable(true); - jComboBox1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "java.lang.String", "boolean", "char", "byte", "short", "int", "long", "float", "double", "java.lang.Boolean", "java.lang.Character", "java.lang.Byte", "java.lang.Short", "java.lang.Integer", "java.lang.Long", "java.lang.Float", "java.lang.Double", "java.lang.Object" })); + jComboBox1.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "java.lang.String", "boolean", "char", "byte", "short", "int", "long", "float", "double", "java.lang.Boolean", "java.lang.Character", "java.lang.Byte", "java.lang.Short", "java.lang.Integer", "java.lang.Long", "java.lang.Float", "java.lang.Double", "java.lang.Object" })); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 1; @@ -117,10 +117,10 @@ private void initComponents() {//GEN-BEGIN:initComponents gridBagConstraints.weightx = 1.0; gridBagConstraints.insets = new java.awt.Insets(0, 6, 6, 0); add(jComboBox1, gridBagConstraints); - jComboBox1.getAccessibleContext().setAccessibleDescription(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/wizards/Bundle").getString("LBL_AttrType")); + jComboBox1.getAccessibleContext().setAccessibleDescription(bundle.getString("LBL_AttrType")); // NOI18N jCheckBox1.setMnemonic(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/wizards/Bundle").getString("A11Y_AttrRequired_mnem").charAt(0)); - jCheckBox1.setText(org.openide.util.NbBundle.getMessage(AttrDialog.class, "OPT_attrRequired")); + jCheckBox1.setText(org.openide.util.NbBundle.getMessage(AttrDialog.class, "OPT_attrRequired")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 2; @@ -128,17 +128,17 @@ private void initComponents() {//GEN-BEGIN:initComponents gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(0, 6, 6, 0); add(jCheckBox1, gridBagConstraints); - jCheckBox1.getAccessibleContext().setAccessibleDescription(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/wizards/Bundle").getString("OPT_attrRequired")); + jCheckBox1.getAccessibleContext().setAccessibleDescription(bundle.getString("OPT_attrRequired")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.weightx = 3.0; add(jPanel1, gridBagConstraints); + buttonGroup1.add(jRadioButton1); jRadioButton1.setMnemonic(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/wizards/Bundle").getString("A11Y_AttrRequestTime_mnem").charAt(0)); jRadioButton1.setSelected(true); - jRadioButton1.setText(org.openide.util.NbBundle.getMessage(AttrDialog.class, "OPT_attrRequestTime")); - buttonGroup1.add(jRadioButton1); + jRadioButton1.setText(org.openide.util.NbBundle.getMessage(AttrDialog.class, "OPT_attrRequestTime")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 3; @@ -146,11 +146,11 @@ private void initComponents() {//GEN-BEGIN:initComponents gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(0, 6, 0, 6); add(jRadioButton1, gridBagConstraints); - jRadioButton1.getAccessibleContext().setAccessibleDescription(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/wizards/Bundle").getString("OPT_attrRequestTime")); + jRadioButton1.getAccessibleContext().setAccessibleDescription(bundle.getString("OPT_attrRequestTime")); // NOI18N - jRadioButton2.setMnemonic(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/wizards/Bundle").getString("A11Y_AttrJspTranslationTime_mnem").charAt(0)); - jRadioButton2.setText(org.openide.util.NbBundle.getMessage(AttrDialog.class, "OPT_attrTranslationTime")); buttonGroup1.add(jRadioButton2); + jRadioButton2.setMnemonic(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/wizards/Bundle").getString("A11Y_AttrJspTranslationTime_mnem").charAt(0)); + jRadioButton2.setText(org.openide.util.NbBundle.getMessage(AttrDialog.class, "OPT_attrTranslationTime")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 4; @@ -158,15 +158,16 @@ private void initComponents() {//GEN-BEGIN:initComponents gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(0, 6, 6, 6); add(jRadioButton2, gridBagConstraints); - jRadioButton2.getAccessibleContext().setAccessibleDescription(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/wizards/Bundle").getString("OPT_attrTranslationTime")); + jRadioButton2.getAccessibleContext().setAccessibleDescription(bundle.getString("OPT_attrTranslationTime")); // NOI18N - }//GEN-END:initComponents + getAccessibleContext().setAccessibleDescription(bundle.getString("A11Y_DESC_AttrDialog")); // 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.JComboBox jComboBox1; + private javax.swing.JComboBox jComboBox1; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; private javax.swing.JPanel jPanel1; diff --git a/enterprise/web.core/src/org/netbeans/modules/web/wizards/FinishableProxyWizardPanel.java b/enterprise/web.core/src/org/netbeans/modules/web/wizards/FinishableProxyWizardPanel.java index 98ce0f86f916..738e69e76455 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/wizards/FinishableProxyWizardPanel.java +++ b/enterprise/web.core/src/org/netbeans/modules/web/wizards/FinishableProxyWizardPanel.java @@ -53,22 +53,27 @@ public FinishableProxyWizardPanel(WizardDescriptor.Panel original) { this(original, null); } + @Override public void addChangeListener(javax.swing.event.ChangeListener l) { original.addChangeListener(l); } + @Override public void removeChangeListener(javax.swing.event.ChangeListener l) { original.removeChangeListener(l); } + @Override public void storeSettings(Object settings) { original.storeSettings(settings); } + @Override public void readSettings(Object settings) { original.readSettings(settings); } + @Override public boolean isValid() { if ( !isOriginallyValid ){ return false; @@ -76,14 +81,17 @@ public boolean isValid() { return original.isValid(); } + @Override public boolean isFinishPanel() { return true; } + @Override public java.awt.Component getComponent() { return original.getComponent(); } + @Override public org.openide.util.HelpCtx getHelp() { if (helpCtx != null) { return helpCtx; diff --git a/enterprise/web.core/src/org/netbeans/modules/web/wizards/MappingEditor.java b/enterprise/web.core/src/org/netbeans/modules/web/wizards/MappingEditor.java index 42b5fc24c749..67b80d80c004 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/wizards/MappingEditor.java +++ b/enterprise/web.core/src/org/netbeans/modules/web/wizards/MappingEditor.java @@ -49,7 +49,7 @@ public class MappingEditor extends JPanel implements ActionListener { private JRadioButton urlRadio; private JRadioButton servletRadio; private JTextField mappingField; - private ToolTipCombo servletCombo; + private ToolTipCombo servletCombo; private JCheckBox[] cb; private Dialog dialog; private DialogDescriptor editDialog; diff --git a/enterprise/web.core/src/org/netbeans/modules/web/wizards/TagHandlerIterator.java b/enterprise/web.core/src/org/netbeans/modules/web/wizards/TagHandlerIterator.java index 1a2cb78a13ca..1c497b13aacd 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/wizards/TagHandlerIterator.java +++ b/enterprise/web.core/src/org/netbeans/modules/web/wizards/TagHandlerIterator.java @@ -63,10 +63,10 @@ */ public class TagHandlerIterator implements TemplateWizard.AsynchronousInstantiatingIterator { private static final Logger LOG = Logger.getLogger(TagHandlerIterator.class.getName()); - private WizardDescriptor.Panel packageChooserPanel,tagHandlerSelectionPanel,tagInfoPanel; + private WizardDescriptor.Panel packageChooserPanel,tagHandlerSelectionPanel,tagInfoPanel; // You should define what panels you want to use here: - protected WizardDescriptor.Panel[] createPanels (Project project,TemplateWizard wiz) { + protected WizardDescriptor.Panel[] createPanels (Project project,TemplateWizard wiz) { Sources sources = (Sources) project.getLookup().lookup(org.netbeans.api.project.Sources.class); SourceGroup[] sourceGroups = Util.getJavaSourceGroups(project); tagHandlerSelectionPanel = new TagHandlerSelection(wiz); diff --git a/enterprise/web.core/src/org/netbeans/modules/web/wizards/ToolTipCombo.java b/enterprise/web.core/src/org/netbeans/modules/web/wizards/ToolTipCombo.java index 58b1fabf62b9..852338f39c95 100644 --- a/enterprise/web.core/src/org/netbeans/modules/web/wizards/ToolTipCombo.java +++ b/enterprise/web.core/src/org/netbeans/modules/web/wizards/ToolTipCombo.java @@ -26,11 +26,11 @@ import javax.swing.JList; import javax.swing.ListCellRenderer; -class ToolTipCombo extends JComboBox { +class ToolTipCombo extends JComboBox { private static final long serialVersionUID = 1189442122448524856L; - ToolTipCombo(Object[] o) { + ToolTipCombo(T[] o) { super(o); this.setRenderer(new PathRenderer()); addItemListener(new ItemListener() { diff --git a/enterprise/web.core/test/unit/src/org/netbeans/modules/web/core/TestWebModuleImplementation.java b/enterprise/web.core/test/unit/src/org/netbeans/modules/web/core/TestWebModuleImplementation.java index 62a930c58f24..1846246d1505 100644 --- a/enterprise/web.core/test/unit/src/org/netbeans/modules/web/core/TestWebModuleImplementation.java +++ b/enterprise/web.core/test/unit/src/org/netbeans/modules/web/core/TestWebModuleImplementation.java @@ -24,8 +24,6 @@ import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel; import org.netbeans.modules.web.spi.webmodule.WebModuleImplementation; import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileSystem; -import org.openide.filesystems.FileUtil; /** * diff --git a/enterprise/web.core/test/unit/src/org/netbeans/modules/web/core/WebInjectionTargetQueryImplementationTest.java b/enterprise/web.core/test/unit/src/org/netbeans/modules/web/core/WebInjectionTargetQueryImplementationTest.java index 258fc908b6b7..4396d59ba6cb 100644 --- a/enterprise/web.core/test/unit/src/org/netbeans/modules/web/core/WebInjectionTargetQueryImplementationTest.java +++ b/enterprise/web.core/test/unit/src/org/netbeans/modules/web/core/WebInjectionTargetQueryImplementationTest.java @@ -82,7 +82,7 @@ private void isInjectionTarget( Profile profile , boolean jee5Profile ) throws E final List source = new ArrayList(1); final boolean[] result = {false}; - CancellableTask task = new CancellableTask() { + CancellableTask task = new CancellableTask() { public void run(CompilationController controller) throws IOException { controller.toPhase(Phase.ELEMENTS_RESOLVED); TypeElement thisTypeEl = controller.getElements().getTypeElement(source.get(0)); @@ -91,7 +91,7 @@ public void run(CompilationController controller) throws IOException { public void cancel() {} }; - IndexingManager.getDefault().refreshIndexAndWait(srcFO.getURL(), null); + IndexingManager.getDefault().refreshIndexAndWait(srcFO.toURL(), null); ClasspathInfo cpi = ClasspathInfo.create(srcFO); JavaSource javaSrc; diff --git a/enterprise/web.core/test/unit/src/org/netbeans/modules/web/core/test/TestUtil.java b/enterprise/web.core/test/unit/src/org/netbeans/modules/web/core/test/TestUtil.java index 433c73638e39..9859732f425e 100644 --- a/enterprise/web.core/test/unit/src/org/netbeans/modules/web/core/test/TestUtil.java +++ b/enterprise/web.core/test/unit/src/org/netbeans/modules/web/core/test/TestUtil.java @@ -37,6 +37,7 @@ import java.util.zip.ZipInputStream; import org.junit.Assert; import org.netbeans.api.project.Project; +import org.netbeans.api.project.ProjectManagerTest; import org.netbeans.junit.NbTestCase; import org.netbeans.modules.j2ee.deployment.impl.ServerRegistry; import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties; @@ -57,7 +58,6 @@ import org.openide.util.Lookup; import org.openide.util.lookup.Lookups; import org.openide.util.lookup.ProxyLookup; -import org.openide.util.test.MockLookup; import org.xml.sax.SAXException;