This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 62d04cf458 Getting rid of some console warnings by: * Using generic
types to get rid of `unchecked` warnings * Replacing deprecated calls with
suggested alternatives
new 0655f75bd9 Merge pull request #6118 from asbachb/web.core-unchecked
62d04cf458 is described below
commit 62d04cf45810fe32965b72c3ba422daefc95c366
Author: Benjamin Asbach <[email protected]>
AuthorDate: Fri Jun 23 22:51:41 2023 +0800
Getting rid of some console warnings by:
* Using generic types to get rid of `unchecked` warnings
* Replacing deprecated calls with suggested alternatives
Minor code improvements:
* Removing unused imports
* Removing unused and commented out code (not touched since years)
* Removed empty if statement and unnecessary double braces
* Adding missing `@Override` annotation
---
.../modules/web/core/api/JspColoringData.java | 14 ++---
.../modules/web/core/jsploader/JspDataObject.java | 72 ++--------------------
.../modules/web/core/jsploader/JspNode.java | 32 +++++-----
.../web/core/jsploader/TagLibParseSupport.java | 22 +++----
.../web/core/palette/JspPaletteUtilities.java | 45 +++++++-------
.../core/palette/items/GetPropertyCustomizer.form | 7 +++
.../core/palette/items/GetPropertyCustomizer.java | 15 ++---
.../web/core/palette/items/IfCustomizer.form | 7 +++
.../web/core/palette/items/IfCustomizer.java | 6 +-
.../web/core/palette/items/SQLStmtCustomizer.form | 3 +
.../web/core/palette/items/SQLStmtCustomizer.java | 6 +-
.../core/palette/items/SetPropertyCustomizer.form | 7 +++
.../core/palette/items/SetPropertyCustomizer.java | 15 ++---
.../web/core/palette/items/UseBeanCustomizer.form | 5 +-
.../web/core/palette/items/UseBeanCustomizer.java | 6 +-
.../modules/web/jspcompiler/SmapResolver.java | 37 +++++------
.../netbeans/modules/web/taglib/TLDDataObject.java | 1 -
.../netbeans/modules/web/taglib/TaglibCatalog.java | 1 -
.../netbeans/modules/web/wizards/AttrDialog.form | 9 ++-
.../netbeans/modules/web/wizards/AttrDialog.java | 39 ++++++------
.../web/wizards/FinishableProxyWizardPanel.java | 8 +++
.../modules/web/wizards/MappingEditor.java | 2 +-
.../modules/web/wizards/TagHandlerIterator.java | 4 +-
.../netbeans/modules/web/wizards/ToolTipCombo.java | 4 +-
.../web/core/TestWebModuleImplementation.java | 2 -
.../WebInjectionTargetQueryImplementationTest.java | 4 +-
.../netbeans/modules/web/core/test/TestUtil.java | 2 +-
27 files changed, 176 insertions(+), 199 deletions(-)
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 81ea6f55cc..150efed28c 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<String, TagLibraryInfo> taglibs;
/** Prefix -> Taglib id */
private Map<String, String> prefixMapper;
@@ -120,7 +120,7 @@ public final class JspColoringData extends
PropertyChangeSupport {
* @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<String, String>
newPrefixMapper, boolean newELIgnored, boolean newXMLSyntax, boolean
parseSuccessful) {
+ public void applyParsedData(Map<String, TagLibraryInfo> newTaglibs,
Map<String, String> newPrefixMapper, boolean newELIgnored, boolean
newXMLSyntax, boolean parseSuccessful) {
initialized = true;
@@ -165,7 +165,7 @@ public final class JspColoringData extends
PropertyChangeSupport {
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 final class JspColoringData extends
PropertyChangeSupport {
}
}
- private static boolean equalsColoringInformation(Map taglibs1, Map<String,
String> prefixMapper1,
- Map taglibs2, Map<String, String> prefixMapper2) {
+ private static boolean equalsColoringInformation(Map<String,
TagLibraryInfo> taglibs1, Map<String, String> prefixMapper1,
+ Map<String, TagLibraryInfo> taglibs2, Map<String, String>
prefixMapper2) {
if ((taglibs1 == null) != (taglibs2 == null)) {
return false;
@@ -203,8 +203,8 @@ public final class JspColoringData extends
PropertyChangeSupport {
return false;
}
- TagLibraryInfo tli1 = (TagLibraryInfo)taglibs1.get(key1);
- TagLibraryInfo tli2 = (TagLibraryInfo)taglibs2.get(key2);
+ TagLibraryInfo tli1 = taglibs1.get(key1);
+ TagLibraryInfo tli2 = taglibs2.get(key2);
if ((tli1 == null) || (tli2 == null)) {
return false;
}
diff --git
a/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/JspDataObject.java
b/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/JspDataObject.java
index a5c7078dee..87c0cfb7b2 100644
---
a/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/JspDataObject.java
+++
b/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/JspDataObject.java
@@ -22,8 +22,6 @@ package org.netbeans.modules.web.core.jsploader;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeEvent;
import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.Serializable;
import java.lang.ref.WeakReference;
import java.nio.charset.Charset;
import java.nio.charset.IllegalCharsetNameException;
@@ -273,14 +271,6 @@ public class JspDataObject extends MultiDataObject
implements QueryStringCookie
return "text/x-java"; // NOI18N
}
- /**
- * Ensures the file encoding is determined. The call may may access
- * JSP parser and obtain project's lock.
- */
- void loadFileEncoding() {
- getFileEncoding();
- }
-
String getFileEncoding() {
//just assure we do not return the initial null value
encoding.compareAndSet(null, findFileEncoding(false));
@@ -349,10 +339,6 @@ public class JspDataObject extends MultiDataObject
implements QueryStringCookie
((dObj == null) ? "null" :
dObj.getClass().getName()) + // NOI18N
"/" + dObj); // NOI18N
}
- /*if (!(dObj instanceof JspServletDataObject)) {
- // need to re-recognize
- dObj = rerecognize(dObj);
- }*/
if (dObj instanceof JspServletDataObject) {
servletDataObject = (JspServletDataObject)dObj;
servletDataObjectDate =
dObj.getPrimaryFile().lastModified();
@@ -385,8 +371,7 @@ public class JspDataObject extends MultiDataObject
implements QueryStringCookie
}
// editor
- if ((oldServlet == null)/*&&(servletDataObject != null)*/) {
- } else {
+ if (oldServlet != null) {
RequestProcessor.postRequest(
new Runnable() {
public void run() {
@@ -401,26 +386,6 @@ public class JspDataObject extends MultiDataObject
implements QueryStringCookie
}
}
- /** This method causes a DataObject to be re-recognized by the loader
system.
- * This is a poor practice and should not be normally used, as it uses
reflection
- * to call a protected method DataObject.dispose().
- */
- /* private DataObject rerecognize(DataObject dObj) {
- // invalidate the object so it can be rerecognized
- FileObject prim = dObj.getPrimaryFile();
- try {
- dObj.setValid(false);
- return DataObject.find(prim);
- }
- catch (java.beans.PropertyVetoException e) {
- ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
- }
- catch (DataObjectNotFoundException e) {
- ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
- }
- return dObj;
- }*/
-
/** JDK 1.2 compiler hack. */
public void firePropertyChange0(String propertyName, Object oldValue,
Object newValue) {
super.firePropertyChange(propertyName, oldValue, newValue);
@@ -497,18 +462,18 @@ public class JspDataObject extends MultiDataObject
implements QueryStringCookie
////// -------- INNER CLASSES ---------
private class Listener extends FileChangeAdapter implements
PropertyChangeListener/*, ServerRegistryImpl.ServerRegistryListener */{
- WeakReference weakListener;
+ WeakReference<FileChangeListener> 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 class JspDataObject extends MultiDataObject
implements QueryStringCookie
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 3bf08c7126..9c8768820f 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 @@ package org.netbeans.modules.web.core.jsploader;
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 class JspNode extends DataNode {
private void initialize () {
setIconBaseWithExtension(getIconBase());
- setDefaultAction (SystemAction.get (OpenAction.class));
if (isTagFile())
setShortDescription (NbBundle.getMessage(JspNode.class,
"LBL_tagNodeShortDesc")); //NOI18N
@@ -66,6 +66,11 @@ public class JspNode extends DataNode {
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 @@ public class JspNode extends DataNode {
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<String> (
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 class JspNode extends DataNode {
ps.setShortDescription(NbBundle.getBundle(JspNode.class).getString("HINT_textfileSetName"));
// NOI18N
sheet.put(ps);
- ps.put(new PropertySupport.ReadOnly(
+ ps.put(new PropertySupport.ReadOnly<String>(
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 cb9440c0bf..716c11b2e1 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 @@ package org.netbeans.modules.web.core.jsploader;
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<JspColoringData> 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<JspParserAPI.ParseResult> 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<JspParserAPI.ParseResult> parseResultSuccessfulRef;
private final Object parseResultLock = new Object();
private final Object openInfoLock = new Object();
@@ -136,7 +137,7 @@ public class TagLibParseSupport implements
org.openide.nodes.Node.Cookie, TagLib
return (JspColoringData)o;
}
JspColoringData jcd = new JspColoringData(this);
- jspColoringDataRef = new WeakReference(jcd);
+ jspColoringDataRef = new WeakReference<>(jcd);
if (prepare) {
prepare();
}
@@ -280,9 +281,9 @@ public class TagLibParseSupport implements
org.openide.nodes.Node.Cookie, TagLib
}
JspParserAPI.ParseResult ret = null;
- SoftReference myRef = successfulOnly ? parseResultSuccessfulRef :
parseResultRef;
+ SoftReference<JspParserAPI.ParseResult> myRef = successfulOnly ?
parseResultSuccessfulRef : parseResultRef;
if (myRef != null) {
- ret = (JspParserAPI.ParseResult)myRef.get();
+ ret = myRef.get();
}
if ((ret == null) && (!successfulOnly)) {
@@ -341,9 +342,9 @@ public class TagLibParseSupport implements
org.openide.nodes.Node.Cookie, TagLib
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 class TagLibParseSupport implements
org.openide.nodes.Node.Cookie, TagLib
} else {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
- ArrayList<ErrorInfo> errors = new
ArrayList<ErrorInfo>(locResult.getErrors().length);
+ List<ErrorInfo> 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 class TagLibParseSupport implements
org.openide.nodes.Node.Cookie, TagLib
parsingTask = null;
if (pageInfo == null) return;
- //Map prefixMapper = (pageInfo.getXMLPrefixMapper().size()
> 0) ?
- // pageInfo.getApproxXmlPrefixMapper() :
pageInfo.getJspPrefixMapper();
- //Map prefixMapper = pageInfo.getJspPrefixMapper();
Map<String, String> 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 320844bb38..4250009ab2 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 @@ public final class JspPaletteUtilities {
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 = "<jsp:root "; //NOI18N
- int jspRootIndex = text.indexOf(jspRootBegin);
- if (jspRootIndex != -1) {
- pos = jspRootIndex + jspRootBegin.length();
- definition = "xmlns:" + prefix + "=\"" + uri + "\" ";
//NOI18N
+ baseDoc.runAtomic(() -> {
+ 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 = "<jsp:root "; //NOI18N
+ int jspRootIndex = text.indexOf(jspRootBegin);
+ if (jspRootIndex != -1) {
+ pos = jspRootIndex + jspRootBegin.length();
+ definition = "xmlns:" + prefix + "=\"" + uri + "\"
"; //NOI18N
+ }
}
- }
- doc.insertString(pos, definition, null);
- }
- catch (BadLocationException e) {
- Exceptions.printStackTrace(e);
- }
- finally {
- baseDoc.atomicUnlock();
- }
+ doc.insertString(pos, definition, null);
+ } catch (BadLocationException e) {
+ Exceptions.printStackTrace(e);
+ }
+ });
}
}
diff --git
a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/GetPropertyCustomizer.form
b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/GetPropertyCustomizer.form
index 4636528eff..e0852d1a51 100644
---
a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/GetPropertyCustomizer.form
+++
b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/GetPropertyCustomizer.form
@@ -30,6 +30,7 @@
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer"
value="0"/>
<AuxValue name="FormSettings_autoSetComponentName"
type="java.lang.Boolean" value="false"/>
+ <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean"
value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode"
type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean"
value="false"/>
<AuxValue name="FormSettings_listenerGenerationStyle"
type="java.lang.Integer" value="0"/>
@@ -73,6 +74,9 @@
<Events>
<EventHandler event="actionPerformed"
listener="java.awt.event.ActionListener"
parameters="java.awt.event.ActionEvent" handler="beanNameCbActionPerformed"/>
</Events>
+ <AuxValues>
+ <AuxValue name="JavaCodeGenerator_TypeParameters"
type="java.lang.String" value="<BeanDescr>"/>
+ </AuxValues>
<Constraints>
<Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1"
fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="12" insetsBottom="0"
insetsRight="12" anchor="10" weightX="0.0" weightY="0.0"/>
@@ -109,6 +113,9 @@
<StringArray count="0"/>
</Property>
</Properties>
+ <AuxValues>
+ <AuxValue name="JavaCodeGenerator_TypeParameters"
type="java.lang.String" value="<String>"/>
+ </AuxValues>
<Constraints>
<Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1"
fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="12" insetsBottom="0"
insetsRight="12" anchor="10" weightX="0.0" weightY="0.0"/>
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 98bed5d1f9..f47ec1237b 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.DocumentEvent;
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 class GetPropertyCustomizer extends javax.swing.JPanel
{
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 @@ public class GetPropertyCustomizer extends
javax.swing.JPanel {
}
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 @@ public class GetPropertyCustomizer extends
javax.swing.JPanel {
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 @@ public class GetPropertyCustomizer extends
javax.swing.JPanel {
updateProperties();
}//GEN-LAST:event_beanNameCbActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JComboBox beanNameCb;
+ private javax.swing.JComboBox<BeanDescr> beanNameCb;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel3;
- private javax.swing.JComboBox propertyNameCb;
+ private javax.swing.JComboBox<String> 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 53c310da75..d4f8d92e75 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 @@
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer"
value="0"/>
<AuxValue name="FormSettings_autoSetComponentName"
type="java.lang.Boolean" value="false"/>
+ <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean"
value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode"
type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean"
value="false"/>
<AuxValue name="FormSettings_listenerGenerationStyle"
type="java.lang.Integer" value="0"/>
@@ -135,6 +136,12 @@
<StringArray count="0"/>
</Property>
</Properties>
+ <Events>
+ <EventHandler event="actionPerformed"
listener="java.awt.event.ActionListener"
parameters="java.awt.event.ActionEvent" handler="jComboBox2ActionPerformed"/>
+ </Events>
+ <AuxValues>
+ <AuxValue name="JavaCodeGenerator_TypeParameters"
type="java.lang.String" value="<String>"/>
+ </AuxValues>
<Constraints>
<Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="1" gridY="3" gridWidth="1" gridHeight="1"
fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="12" insetsBottom="12"
insetsRight="12" anchor="18" weightX="1.0" weightY="1.0"/>
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 53f236910e..60b4056713 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 class IfCustomizer extends javax.swing.JPanel {
initComponents();
- jComboBox2.setModel(new DefaultComboBoxModel(If.scopes));
+ jComboBox2.setModel(new DefaultComboBoxModel<>(If.scopes));
jComboBox2.setSelectedIndex(iF.getScopeIndex());
}
@@ -105,7 +105,7 @@ public class IfCustomizer extends javax.swing.JPanel {
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 @@ public class IfCustomizer extends javax.swing.JPanel {
// Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JComboBox jComboBox2;
+ private javax.swing.JComboBox<String> 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 259b6e087b..45f2455692 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 @@
<StringArray count="0"/>
</Property>
</Properties>
+ <AuxValues>
+ <AuxValue name="JavaCodeGenerator_TypeParameters"
type="java.lang.String" value="<String>"/>
+ </AuxValues>
<Constraints>
<Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1"
fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="12" insetsBottom="0"
insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
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 9cf8757fd7..5c293189e5 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 class SQLStmtCustomizer extends javax.swing.JPanel {
});
}
- 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 @@ public class SQLStmtCustomizer extends javax.swing.JPanel {
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 @@ public class SQLStmtCustomizer extends javax.swing.JPanel {
// Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JComboBox jComboBox2;
+ private javax.swing.JComboBox<String> 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 170c8cc860..4be18e8eab 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 @@
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer"
value="0"/>
<AuxValue name="FormSettings_autoSetComponentName"
type="java.lang.Boolean" value="false"/>
+ <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean"
value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode"
type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean"
value="false"/>
<AuxValue name="FormSettings_listenerGenerationStyle"
type="java.lang.Integer" value="0"/>
@@ -73,6 +74,9 @@
<Events>
<EventHandler event="actionPerformed"
listener="java.awt.event.ActionListener"
parameters="java.awt.event.ActionEvent" handler="beanNameCbActionPerformed"/>
</Events>
+ <AuxValues>
+ <AuxValue name="JavaCodeGenerator_TypeParameters"
type="java.lang.String" value="<BeanDescr>"/>
+ </AuxValues>
<Constraints>
<Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1"
fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="12" insetsBottom="0"
insetsRight="12" anchor="10" weightX="0.0" weightY="0.0"/>
@@ -136,6 +140,9 @@
<StringArray count="0"/>
</Property>
</Properties>
+ <AuxValues>
+ <AuxValue name="JavaCodeGenerator_TypeParameters"
type="java.lang.String" value="<String>"/>
+ </AuxValues>
<Constraints>
<Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1"
fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="12" insetsBottom="0"
insetsRight="12" anchor="10" weightX="0.0" weightY="0.0"/>
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 429dc90c3a..ab577ee654 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.DocumentEvent;
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 class SetPropertyCustomizer extends javax.swing.JPanel
{
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 @@ public class SetPropertyCustomizer extends
javax.swing.JPanel {
}
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 @@ public class SetPropertyCustomizer extends
javax.swing.JPanel {
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 @@ public class SetPropertyCustomizer extends
javax.swing.JPanel {
// Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JComboBox beanNameCb;
+ private javax.swing.JComboBox<BeanDescr> 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<String> 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 4cb9804c3e..b26fd7ccd7 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 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
@@ -137,6 +137,9 @@
<StringArray count="0"/>
</Property>
</Properties>
+ <AuxValues>
+ <AuxValue name="JavaCodeGenerator_TypeParameters"
type="java.lang.String" value="<String>"/>
+ </AuxValues>
<Constraints>
<Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="1" gridY="2" gridWidth="1" gridHeight="1"
fill="2" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="12" insetsBottom="0"
insetsRight="12" anchor="18" weightX="1.0" weightY="1.0"/>
diff --git
a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/UseBeanCustomizer.java
b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/UseBeanCustomizer.java
index 738cecb45a..d7ef5df797 100644
---
a/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/UseBeanCustomizer.java
+++
b/enterprise/web.core/src/org/netbeans/modules/web/core/palette/items/UseBeanCustomizer.java
@@ -57,7 +57,7 @@ public class UseBeanCustomizer extends javax.swing.JPanel {
initComponents();
- jComboBox2.setModel(new DefaultComboBoxModel(UseBean.scopes));
+ jComboBox2.setModel(new DefaultComboBoxModel<>(UseBean.scopes));
jComboBox2.setSelectedIndex(useBean.getScopeIndex());
jTextField2.getDocument().addDocumentListener(new DocumentListener(){
public void insertUpdate(DocumentEvent arg0) {
@@ -165,7 +165,7 @@ public class UseBeanCustomizer extends javax.swing.JPanel {
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();
@@ -244,7 +244,7 @@ public class UseBeanCustomizer extends javax.swing.JPanel {
// Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JComboBox jComboBox2;
+ private javax.swing.JComboBox<String> 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/jspcompiler/SmapResolver.java
b/enterprise/web.core/src/org/netbeans/modules/web/jspcompiler/SmapResolver.java
index c319784d1e..3b7428bdcd 100644
---
a/enterprise/web.core/src/org/netbeans/modules/web/jspcompiler/SmapResolver.java
+++
b/enterprise/web.core/src/org/netbeans/modules/web/jspcompiler/SmapResolver.java
@@ -21,9 +21,11 @@ package org.netbeans.modules.web.jspcompiler;
import java.io.IOException;
import java.util.Collection;
+import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.TreeMap;
@@ -86,11 +88,11 @@ public class SmapResolver {
/** contains jsp -> servlet line mappings
*/
- private Map jsp2java = new TreeMap();
+ private Map<String, String> jsp2java = new TreeMap<>();
/** contains servlet -> jsp line mappings
*/
- private Map java2jsp = new TreeMap();
+ private Map<String, String> java2jsp = new TreeMap<>();
/** Creates a new instance of SmapResolver
* @param reader reader provides readSmap() method which returns SMAP
iformation as a String
@@ -288,7 +290,7 @@ public class SmapResolver {
* @return filename
*/
private String getFileNameByIndex(String index) {
- return (String)fsection.get(index);
+ return fsection.get(index);
}
/** access index by the filename
@@ -296,11 +298,11 @@ public class SmapResolver {
* @return index of the file in SMAP
*/
private String getIndexByFileName(String fname) {
- Set s = fsection.entrySet();
- Iterator i = s.iterator();
+ Set<Entry<String, String>> s = fsection.entrySet();
+ Iterator<Entry<String, String>> i = s.iterator();
while (i.hasNext()) {
- Map.Entry mentry = (Map.Entry)i.next();
- String value = (String)mentry.getValue();
+ Map.Entry<String, String> mentry = i.next();
+ String value = mentry.getValue();
if (value.equalsIgnoreCase(fname)) {
return mentry.getKey().toString();
}
@@ -318,10 +320,10 @@ public class SmapResolver {
/**
* get all the filenames in the SMAP
*/
- public Map getFileNames() {
- Hashtable h = new Hashtable(fsection.size());
- Collection c = fsection.values();
- Iterator i = c.iterator();
+ public Map<Integer, String> getFileNames() {
+ Map<Integer, String> h = new Hashtable<>(fsection.size());
+ Collection<String> c = fsection.values();
+ Iterator<String> i = c.iterator();
int counter = 0;
while (i.hasNext()) {
h.put(counter++, i.next());
@@ -333,10 +335,9 @@ public class SmapResolver {
* get primary jsp filename
*/
public String getPrimaryJspFileName() {
- TreeMap tm = new TreeMap(fsection);
- Object o = tm.firstKey();
- String s = (String)fsection.get(o);
- return s;
+ TreeMap<String, String> tm = new TreeMap<>(fsection);
+ String firstKey = tm.firstKey();
+ return fsection.get(firstKey);
}
/** if there are included files in the jsp or not
@@ -360,7 +361,7 @@ public class SmapResolver {
*/
public String getJspFileName(int line, int col) throws IOException {
String key = Integer.toString(line);
- String value = (String)java2jsp.get(key);
+ String value = java2jsp.get(key);
if (value == null) return null;
String index = value.substring(value.indexOf(FID_DELIM)+1);
return getFileNameByIndex(index);
@@ -370,14 +371,14 @@ public class SmapResolver {
String fileIndex = getIndexByFileName(jspFileName);
if (fileIndex == null) return -1;
String key =
"".concat(Integer.toString(line)).concat("#").concat(fileIndex);
- String value = (String)jsp2java.get(key);
+ String value = jsp2java.get(key);
if (value == null) return -1;
return Integer.parseInt(value);
}
public int unmangle(int line, int col) {
String key = Integer.toString(line);
- String value = (String)java2jsp.get(key);
+ String value = java2jsp.get(key);
if (value == null) return -1;
int jspline = Integer.parseInt(value.substring(0, value.indexOf("#")));
return jspline;
diff --git
a/enterprise/web.core/src/org/netbeans/modules/web/taglib/TLDDataObject.java
b/enterprise/web.core/src/org/netbeans/modules/web/taglib/TLDDataObject.java
index a08a0f1f62..c29da411fa 100644
--- a/enterprise/web.core/src/org/netbeans/modules/web/taglib/TLDDataObject.java
+++ b/enterprise/web.core/src/org/netbeans/modules/web/taglib/TLDDataObject.java
@@ -28,7 +28,6 @@ import org.netbeans.api.xml.cookies.ValidateXMLCookie;
import org.netbeans.api.xml.cookies.CheckXMLCookie;
import org.netbeans.core.spi.multiview.MultiViewElement;
import org.netbeans.core.spi.multiview.text.MultiViewEditorElement;
-import org.netbeans.modules.web.core.jsploader.JspLoader;
import org.netbeans.modules.web.taglib.model.Taglib;
import org.netbeans.modules.xml.api.XmlFileEncodingQueryImpl;
import org.netbeans.spi.queries.FileEncodingQueryImplementation;
diff --git
a/enterprise/web.core/src/org/netbeans/modules/web/taglib/TaglibCatalog.java
b/enterprise/web.core/src/org/netbeans/modules/web/taglib/TaglibCatalog.java
index 1358ed3765..366a7279af 100644
--- a/enterprise/web.core/src/org/netbeans/modules/web/taglib/TaglibCatalog.java
+++ b/enterprise/web.core/src/org/netbeans/modules/web/taglib/TaglibCatalog.java
@@ -27,7 +27,6 @@ import org.netbeans.modules.xml.catalog.spi.CatalogListener;
import org.netbeans.modules.xml.catalog.spi.CatalogReader;
import org.openide.util.ImageUtilities;
import org.openide.util.NbBundle;
-import org.openide.util.Utilities;
/** Catalog for taglib DTDs and schemas that enables code completion and XML
validation in editor.
*
diff --git
a/enterprise/web.core/src/org/netbeans/modules/web/wizards/AttrDialog.form
b/enterprise/web.core/src/org/netbeans/modules/web/wizards/AttrDialog.form
index d03ea5eec3..d069d2aeda 100644
--- a/enterprise/web.core/src/org/netbeans/modules/web/wizards/AttrDialog.form
+++ b/enterprise/web.core/src/org/netbeans/modules/web/wizards/AttrDialog.form
@@ -21,7 +21,7 @@
-->
-<Form version="1.2" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+<Form version="1.2" maxVersion="1.2"
type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<NonVisualComponents>
<Component class="javax.swing.ButtonGroup" name="buttonGroup1">
</Component>
@@ -32,7 +32,11 @@
</Property>
</AccessibilityProperties>
<AuxValues>
+ <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer"
value="0"/>
+ <AuxValue name="FormSettings_autoSetComponentName"
type="java.lang.Boolean" value="false"/>
+ <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean"
value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode"
type="java.lang.Boolean" value="false"/>
+ <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean"
value="false"/>
<AuxValue name="FormSettings_listenerGenerationStyle"
type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean"
value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer"
value="2"/>
@@ -120,6 +124,9 @@
<ResourceString
bundle="org/netbeans/modules/web/wizards/Bundle.properties" key="LBL_AttrType"
replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
</Property>
</AccessibilityProperties>
+ <AuxValues>
+ <AuxValue name="JavaCodeGenerator_TypeParameters"
type="java.lang.String" value="<String>"/>
+ </AuxValues>
<Constraints>
<Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1"
fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="6" insetsBottom="6"
insetsRight="0" anchor="17" weightX="1.0" weightY="0.0"/>
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 df5195eb0e..f4690faa23 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 @@ public class AttrDialog extends javax.swing.JPanel {
* WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor.
*/
- private void initComponents() {//GEN-BEGIN:initComponents
+ // <editor-fold defaultstate="collapsed" desc="Generated
Code">//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 @@ public class AttrDialog extends javax.swing.JPanel {
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 @@ public class AttrDialog extends javax.swing.JPanel {
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 @@ public class AttrDialog extends javax.swing.JPanel {
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 @@ public class AttrDialog extends javax.swing.JPanel {
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 @@ public class AttrDialog extends javax.swing.JPanel {
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 @@ public class AttrDialog extends javax.swing.JPanel {
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
+ }// </editor-fold>//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<String> 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 98ce0f86f9..738e69e764 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 class FinishableProxyWizardPanel implements
WizardDescriptor.Panel, Wizar
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 class FinishableProxyWizardPanel implements
WizardDescriptor.Panel, Wizar
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 42b5fc24c7..67b80d80c0 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<String> 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 1a2cb78a13..1c497b13aa 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 @@ import
org.netbeans.modules.web.taglib.model.TldAttributeType;
*/
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<WizardDescriptor>
packageChooserPanel,tagHandlerSelectionPanel,tagInfoPanel;
// You should define what panels you want to use here:
- protected WizardDescriptor.Panel[] createPanels (Project
project,TemplateWizard wiz) {
+ protected WizardDescriptor.Panel<WizardDescriptor>[] 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 58b1fabf62..852338f39c 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.JLabel;
import javax.swing.JList;
import javax.swing.ListCellRenderer;
-class ToolTipCombo extends JComboBox {
+class ToolTipCombo<T> extends JComboBox<T> {
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 62a930c58f..1846246d15 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.dd.api.web.WebAppMetadata;
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 258fc908b6..4396d59ba6 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 @@ public class WebInjectionTargetQueryImplementationTest
extends JavaSourceTestCas
final List<String> source = new ArrayList<String>(1);
final boolean[] result = {false};
- CancellableTask task = new CancellableTask<CompilationController>() {
+ CancellableTask<CompilationController> task = new
CancellableTask<CompilationController>() {
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 class WebInjectionTargetQueryImplementationTest
extends JavaSourceTestCas
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 433c73638e..9859732f42 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.ZipEntry;
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.modules.InstalledFileLocator;
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
