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 33f8ee2 [NETBEANS-3240] - more cleanup of raw type warnings..
33f8ee2 is described below
commit 33f8ee20c31f67ff0e449f6d21575d1d29a28f38
Author: Brad Walker <[email protected]>
AuthorDate: Tue Oct 15 14:57:13 2019 -0600
[NETBEANS-3240] - more cleanup of raw type warnings..
Clean up a bunch of raw type warnings..
---
.../modules/web/jsf/api/ConfigurationUtils.java | 4 +--
.../websvc.manager/nbproject/project.properties | 2 +-
.../websvc/manager/model/WebServiceGroup.java | 10 +++---
.../websvc/manager/ui/ReflectionHelper.java | 38 ++++++++++----------
.../nbproject/project.properties | 2 +-
.../j2ee/core/api/support/SourceGroups.java | 26 +++++++-------
.../org/netbeans/core/startup/layers/BinaryFS.java | 8 ++---
.../src/org/netbeans/ModuleManager.java | 4 +--
.../src/org/netbeans/ProxyClassLoader.java | 6 ++--
.../src/org/netbeans/TopSecurityManager.java | 24 ++++++-------
.../org/openide/filesystems/DefaultAttributes.java | 42 +++++++++++-----------
.../src/org/openide/filesystems/FileUtil.java | 10 +++---
.../src/org/openide/loaders/DataNode.java | 6 ++--
.../src/org/openide/loaders/XMLDataObject.java | 8 ++---
.../src/org/openide/nodes/TMUtil.java | 6 ++--
15 files changed, 98 insertions(+), 98 deletions(-)
diff --git
a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/ConfigurationUtils.java
b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/ConfigurationUtils.java
index ea8411d..cef5c17 100644
---
a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/ConfigurationUtils.java
+++
b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/ConfigurationUtils.java
@@ -50,8 +50,8 @@ public class ConfigurationUtils {
// We can override equals() and hashcode() methods here for accepting 2
keys in HashMap
// However due to the performance issue and clear codes, use 2 HashMap
here will be better
- private static WeakHashMap<FileObject, WeakReference<JSFConfigModel>>
configModelsEditable = new WeakHashMap();
- private static WeakHashMap<FileObject, WeakReference<JSFConfigModel>>
configModelsNonEditable = new WeakHashMap();
+ private static WeakHashMap<FileObject, WeakReference<JSFConfigModel>>
configModelsEditable = new WeakHashMap<>();
+ private static WeakHashMap<FileObject, WeakReference<JSFConfigModel>>
configModelsNonEditable = new WeakHashMap<>();
/**
* This methods returns the model source for the faces config file.
diff --git a/enterprise/websvc.manager/nbproject/project.properties
b/enterprise/websvc.manager/nbproject/project.properties
index b755996..4d969e8 100644
--- a/enterprise/websvc.manager/nbproject/project.properties
+++ b/enterprise/websvc.manager/nbproject/project.properties
@@ -16,5 +16,5 @@
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
test-unit-sys-prop.java.endorsed.dirs=${websvc.jaxws21.dir}/modules/ext/jaxws21/api
diff --git
a/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/model/WebServiceGroup.java
b/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/model/WebServiceGroup.java
index fc05d61..7dc94b6 100644
---
a/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/model/WebServiceGroup.java
+++
b/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/model/WebServiceGroup.java
@@ -36,7 +36,7 @@ import java.util.logging.Logger;
public class WebServiceGroup {
- Set listeners = new HashSet();
+ Set<WebServiceGroupListener> listeners = new HashSet<>();
String groupId = null;
String groupName = null;
boolean userDefined = true;
@@ -99,7 +99,7 @@ public class WebServiceGroup {
webserviceIds.add(webServiceId);
if (quietly) return;
- Iterator iter = listeners.iterator();
+ Iterator<WebServiceGroupListener> iter = listeners.iterator();
while(iter.hasNext()) {
WebServiceGroupEvent evt = new
WebServiceGroupEvent(webServiceId, getId());
((WebServiceGroupListener)iter.next()).webServiceAdded(evt);
@@ -107,7 +107,7 @@ public class WebServiceGroup {
}else if (!quietly) {
// This is a hack to make the nodes to appear while restoring
// the W/S meta data at IDE start (lag due to WSDL parsing)
- Iterator iter = listeners.iterator();
+ Iterator<WebServiceGroupListener> iter = listeners.iterator();
while(iter.hasNext()) {
WebServiceGroupEvent evt = new
WebServiceGroupEvent(webServiceId, getId());
((WebServiceGroupListener)iter.next()).webServiceAdded(evt);
@@ -121,7 +121,7 @@ public class WebServiceGroup {
webserviceIds.remove(webServiceId);
if (quietly) return;
- Iterator iter = listeners.iterator();
+ Iterator<WebServiceGroupListener> iter = listeners.iterator();
while(iter.hasNext()) {
WebServiceGroupEvent evt = new
WebServiceGroupEvent(webServiceId, getId());
((WebServiceGroupListener)iter.next()).webServiceRemoved(evt);
@@ -131,7 +131,7 @@ public class WebServiceGroup {
public void modify(String webServiceId) {
// It is here solely to notify the listners
- Iterator iter = listeners.iterator();
+ Iterator<WebServiceGroupListener> iter = listeners.iterator();
while(iter.hasNext()) {
WebServiceGroupEvent evt = new WebServiceGroupEvent(webServiceId,
getId());
((WebServiceGroupListener)iter.next()).webServiceRemoved(evt);
diff --git
a/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/ui/ReflectionHelper.java
b/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/ui/ReflectionHelper.java
index 75f213c..a485f71 100644
---
a/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/ui/ReflectionHelper.java
+++
b/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/ui/ReflectionHelper.java
@@ -102,7 +102,7 @@ public class ReflectionHelper {
public static boolean isComplexType(String className, ClassLoader
runtimeClassLoader) {
try {
- Class type = Class.forName(className, true, runtimeClassLoader);
+ Class<?> type = Class.forName(className, true, runtimeClassLoader);
Class xmlType = Class.forName(XmlType.class.getName(), true,
runtimeClassLoader);
Annotation xmlAnnotation = type.getAnnotation(xmlType);
@@ -116,7 +116,7 @@ public class ReflectionHelper {
public static boolean isCollection(String className, ClassLoader
runtimeClassLoader) {
try {
- Class cls = Class.forName(className, true, runtimeClassLoader);
+ Class<?> cls = Class.forName(className, true, runtimeClassLoader);
return Collection.class.isAssignableFrom(cls);
} catch (ClassNotFoundException cnfe) {
return false;
@@ -133,8 +133,8 @@ public class ReflectionHelper {
public static boolean isEnumeration(String className, ClassLoader loader) {
try {
- Class cls = Class.forName(className, true, loader);
- Class enumClass = Class.forName(Enum.class.getName(), true,
loader);
+ Class<?> cls = Class.forName(className, true, loader);
+ Class<?> enumClass = Class.forName(Enum.class.getName(), true,
loader);
return enumClass.isAssignableFrom(cls);
} catch (ClassNotFoundException cnfe) {
@@ -161,7 +161,7 @@ public class ReflectionHelper {
public static Object makeGenericArray(String componentType, int length,
ClassLoader loader)
throws WebServiceReflectionException {
try {
- Class componentClass;
+ Class<?> componentClass;
if (isPrimitiveClass(componentType)) {
componentClass = getPrimitiveClass(componentType);
} else {
@@ -183,15 +183,15 @@ public class ReflectionHelper {
}
Thread.currentThread().setContextClassLoader(loader);
- Class declaredClass;
+ Class<?> declaredClass;
if (isPrimitiveClass(valueType)) {
declaredClass = getPrimitiveClass(valueType);
} else {
declaredClass = Class.forName(valueType, true, loader);
}
- Class qNameClass = Class.forName(QName.class.getName(), true,
loader);
- Class jaxBClass = Class.forName(JAXBElement.class.getName(), true,
loader);
+ Class<?> qNameClass = Class.forName(QName.class.getName(), true,
loader);
+ Class<?> jaxBClass = Class.forName(JAXBElement.class.getName(),
true, loader);
Constructor qNameConstr = qNameClass.getConstructor(new
Class[]{String.class});
Object qName = qNameConstr.newInstance(localPart);
@@ -249,7 +249,7 @@ public class ReflectionHelper {
if (!isCollection(className, loader)) {
return null;
} else {
- Class cls = Class.forName(className, true, loader);
+ Class<?> cls = Class.forName(className, true, loader);
if (cls.isInterface()) {
return new ArrayList();
} else {
@@ -278,7 +278,7 @@ public class ReflectionHelper {
}
Thread.currentThread().setContextClassLoader(loader);
- Class typeClass = Class.forName(typeName, true, loader);
+ Class<?> typeClass = Class.forName(typeName, true, loader);
Object result = typeClass.newInstance();
return result;
@@ -299,7 +299,7 @@ public class ReflectionHelper {
throws WebServiceReflectionException {
try {
List<String> enumerations = new ArrayList<String>();
- Class enumerClass = Class.forName(enumeration, true, loader);
+ Class<?> enumerClass = Class.forName(enumeration, true, loader);
Field[] fields = enumerClass.getDeclaredFields();
for (int i = 0; i < fields.length; i++) {
@@ -323,7 +323,7 @@ public class ReflectionHelper {
savedLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(loader);
- Class nextClass = Class.forName(complexType, true, loader);
+ Class<?> nextClass = Class.forName(complexType, true, loader);
Class xmlTypeClass = Class.forName(XmlType.class.getName(), true,
loader);
for (; nextClass != null; nextClass = nextClass.getSuperclass()) {
@@ -359,7 +359,7 @@ public class ReflectionHelper {
throws WebServiceReflectionException {
ClassLoader savedLoader = null;
try {
- Class typeClass = Class.forName(type, true, loader);
+ Class<?> typeClass = Class.forName(type, true, loader);
char[] name = propName.toCharArray();
Method method = null;
@@ -450,7 +450,7 @@ public class ReflectionHelper {
savedLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(classLoader);
- Class structClass = Class.forName(className, true, classLoader);
+ Class<?> structClass = Class.forName(className, true, classLoader);
Method[] methods = structClass.getMethods();
for (int i = 0; i < methods.length; i++) {
Method curMethod = methods[i];
@@ -474,7 +474,7 @@ public class ReflectionHelper {
String propType, Object propValue, ClassLoader classLoader) throws
WebServiceReflectionException {
ClassLoader savedLoader = null;
try {
- Class typeClass = objValue.getClass();
+ Class<?> typeClass = objValue.getClass();
Class propClass;
savedLoader = Thread.currentThread().getContextClassLoader();
@@ -529,7 +529,7 @@ public class ReflectionHelper {
ClassLoader classLoader) throws WebServiceReflectionException {
ClassLoader savedLoader = null;
try {
- Class typeClass = obj.getClass();
+ Class<?> typeClass = obj.getClass();
Method method = null;
savedLoader = Thread.currentThread().getContextClassLoader();
@@ -586,7 +586,7 @@ public class ReflectionHelper {
URLClassLoader urlClassLoader, WsdlData wsData, WSPort port)
throws WebServiceReflectionException {
Class<?> clazz = null;
- Class serviceClass = null;
+ Class<?> serviceClass = null;
if (null == urlClassLoader) {
return null;
}
@@ -687,7 +687,7 @@ public class ReflectionHelper {
* 1. from ArrayList to a typed array. (done prior)
* 2. from objects to primitives
*/
- LinkedList classList = new LinkedList();
+ LinkedList<Class> classList = new LinkedList<>();
List parameterList = inMethod.getParametersList();
for (int ii = 0; null != paramValues && ii < paramValues.length;
ii++) {
@@ -719,7 +719,7 @@ public class ReflectionHelper {
}
classList.add(classToAdd);
}
- Class[] paramClasses = (Class[]) classList.toArray(new Class[0]);
+ Class[] paramClasses = classList.toArray(new Class[0]);
/**
* Now instantiate the method to call.
diff --git a/java/j2ee.core.utilities/nbproject/project.properties
b/java/j2ee.core.utilities/nbproject/project.properties
index 95da0b4..fe94fbd 100644
--- a/java/j2ee.core.utilities/nbproject/project.properties
+++ b/java/j2ee.core.utilities/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
is.autoload=true
diff --git
a/java/j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/api/support/SourceGroups.java
b/java/j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/api/support/SourceGroups.java
index 7938a83..73a2201 100644
---
a/java/j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/api/support/SourceGroups.java
+++
b/java/j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/api/support/SourceGroups.java
@@ -200,12 +200,12 @@ public final class SourceGroups {
return null;
}
- private static Map createFoldersToSourceGroupsMap(final SourceGroup[]
sourceGroups) {
- Map result;
+ private static Map<FileObject, SourceGroup>
createFoldersToSourceGroupsMap(final SourceGroup[] sourceGroups) {
+ Map<FileObject, SourceGroup> result;
if (sourceGroups.length == 0) {
- result = Collections.EMPTY_MAP;
+ result = Collections.emptyMap();
} else {
- result = new HashMap(2 * sourceGroups.length, .5f);
+ result = new HashMap<>(2 * sourceGroups.length, .5f);
for (int i = 0; i < sourceGroups.length; i++) {
SourceGroup sourceGroup = sourceGroups[i];
result.put(sourceGroup.getRootFolder(), sourceGroup);
@@ -214,16 +214,16 @@ public final class SourceGroups {
return result;
}
- private static List<SourceGroup> getTestTargets(SourceGroup sourceGroup,
Map foldersToSourceGroupsMap) {
+ private static List<SourceGroup> getTestTargets(SourceGroup sourceGroup,
Map<FileObject, SourceGroup> foldersToSourceGroupsMap) {
final URL[] rootURLs =
UnitTestForSourceQuery.findUnitTests(sourceGroup.getRootFolder());
if (rootURLs.length == 0) {
- return new ArrayList();
+ return new ArrayList<>();
}
- List result = new ArrayList();
- List sourceRoots = getFileObjects(rootURLs);
+ List<SourceGroup> result = new ArrayList<>();
+ List<FileObject> sourceRoots = getFileObjects(rootURLs);
for (int i = 0; i < sourceRoots.size(); i++) {
- FileObject sourceRoot = (FileObject) sourceRoots.get(i);
- SourceGroup srcGroup = (SourceGroup)
foldersToSourceGroupsMap.get(sourceRoot);
+ FileObject sourceRoot = sourceRoots.get(i);
+ SourceGroup srcGroup = foldersToSourceGroupsMap.get(sourceRoot);
if (srcGroup != null) {
result.add(srcGroup);
}
@@ -232,7 +232,7 @@ public final class SourceGroups {
}
private static List<FileObject> getFileObjects(URL[] urls) {
- List result = new ArrayList();
+ List<FileObject> result = new ArrayList<>();
for (int i = 0; i < urls.length; i++) {
FileObject sourceRoot = URLMapper.findFileObject(urls[i]);
if (sourceRoot != null) {
@@ -243,8 +243,8 @@ public final class SourceGroups {
}
private static Set<SourceGroup> getTestSourceGroups(SourceGroup[]
sourceGroups) {
- Map foldersToSourceGroupsMap =
createFoldersToSourceGroupsMap(sourceGroups);
- Set testGroups = new HashSet();
+ Map<FileObject, SourceGroup> foldersToSourceGroupsMap =
createFoldersToSourceGroupsMap(sourceGroups);
+ Set<SourceGroup> testGroups = new HashSet<>();
for (int i = 0; i < sourceGroups.length; i++) {
testGroups.addAll(getTestTargets(sourceGroups[i],
foldersToSourceGroupsMap));
}
diff --git
a/platform/core.startup/src/org/netbeans/core/startup/layers/BinaryFS.java
b/platform/core.startup/src/org/netbeans/core/startup/layers/BinaryFS.java
index 008dcad..0224ba2 100644
--- a/platform/core.startup/src/org/netbeans/core/startup/layers/BinaryFS.java
+++ b/platform/core.startup/src/org/netbeans/core/startup/layers/BinaryFS.java
@@ -510,7 +510,7 @@ final class BinaryFS extends FileSystem implements
DataInput {
FileObject topFO = null;
// XXX big hack! See #29356 for explanation for this nonsense.
try {
- Class mfoClass =
Class.forName("org.openide.filesystems.MultiFileObject"); //NOI18N
+ Class<?> mfoClass =
Class.forName("org.openide.filesystems.MultiFileObject"); //NOI18N
Field field =
mfoClass.getDeclaredField("attrAskedFileObject"); //NOI18N
field.setAccessible(true);
@@ -744,12 +744,12 @@ final class BinaryFS extends FileSystem implements
DataInput {
// Cf. XMLMapAttr.Attr.methodValue:
Class<?> cls = findClass(method.substring(0, i));
String methodName = method.substring(i + 1);
- Class[][] paramArray = {
+ Class<?>[][] paramArray = {
{FileObject.class, String.class}, {String.class,
FileObject.class},
{FileObject.class}, {String.class}, {},
{Map.class, String.class}, {Map.class},
};
- for (Class[] paramTypes : paramArray) {
+ for (Class<?>[] paramTypes : paramArray) {
Method m;
try {
m = cls.getDeclaredMethod(methodName, paramTypes);
@@ -795,7 +795,7 @@ final class BinaryFS extends FileSystem implements
DataInput {
* @return the class
* @exception ClassNotFoundException if class was not found
*/
- private Class findClass (String name) throws ClassNotFoundException {
+ private Class<?> findClass (String name) throws ClassNotFoundException
{
ClassLoader c = Lookup.getDefault().lookup(ClassLoader.class);
String tname = BaseUtilities.translate (name);
try {
diff --git a/platform/o.n.bootstrap/src/org/netbeans/ModuleManager.java
b/platform/o.n.bootstrap/src/org/netbeans/ModuleManager.java
index 4ca63b0..af7fcdd 100644
--- a/platform/o.n.bootstrap/src/org/netbeans/ModuleManager.java
+++ b/platform/o.n.bootstrap/src/org/netbeans/ModuleManager.java
@@ -735,8 +735,8 @@ public final class ModuleManager extends Modules {
ProxyClassLoader priviledged = null;
NetigsoLoader osgi = null;
if (!name.startsWith("java.")) { // NOI18N
- Class[] stack = TopSecurityManager.getStack();
- for (Class c: stack) {
+ Class<?>[] stack = TopSecurityManager.getStack();
+ for (Class<?> c: stack) {
ClassLoader l = c.getClassLoader();
if (l == this) {
continue;
diff --git a/platform/o.n.bootstrap/src/org/netbeans/ProxyClassLoader.java
b/platform/o.n.bootstrap/src/org/netbeans/ProxyClassLoader.java
index 2a019ba..cdc090b 100644
--- a/platform/o.n.bootstrap/src/org/netbeans/ProxyClassLoader.java
+++ b/platform/o.n.bootstrap/src/org/netbeans/ProxyClassLoader.java
@@ -139,7 +139,7 @@ public class ProxyClassLoader extends ClassLoader {
new Object[] {this, name});
}
- Class cls = null;
+ Class<?> cls = null;
int last = name.lastIndexOf('.');
if (last == -1) {
@@ -180,7 +180,7 @@ public class ProxyClassLoader extends ClassLoader {
// multicovered package, search in order
for (ProxyClassLoader pcl : parents.loaders()) { // all our
accessible parents
if (del.contains(pcl) && shouldDelegateResource(path, pcl)) {
// that cover given package
- Class _cls = pcl.selfLoadClass(pkg, name);
+ Class<?> _cls = pcl.selfLoadClass(pkg, name);
if (_cls != null) {
if (cls == null) {
cls = _cls;
@@ -240,7 +240,7 @@ public class ProxyClassLoader extends ClassLoader {
/** May return null */
private synchronized Class selfLoadClass(String pkg, String name) {
- Class cls = findLoadedClass(name);
+ Class<?> cls = findLoadedClass(name);
if (cls == null) {
try {
cls = doLoadClass(pkg, name);
diff --git a/platform/o.n.bootstrap/src/org/netbeans/TopSecurityManager.java
b/platform/o.n.bootstrap/src/org/netbeans/TopSecurityManager.java
index 8163611..71cccf1 100644
--- a/platform/o.n.bootstrap/src/org/netbeans/TopSecurityManager.java
+++ b/platform/o.n.bootstrap/src/org/netbeans/TopSecurityManager.java
@@ -57,10 +57,10 @@ public class TopSecurityManager extends SecurityManager {
and Class.forName
*/
private static final Class<?> classLoaderClass = ClassLoader.class;
- private static final Class URLClass = URL.class;
- private static final Class runtimePermissionClass =
RuntimePermission.class;
- private static final Class accessControllerClass = AccessController.class;
- private static final Class awtPermissionClass = AWTPermission.class;
+ private static final Class<?> URLClass = URL.class;
+ private static final Class<?> runtimePermissionClass =
RuntimePermission.class;
+ private static final Class<?> accessControllerClass =
AccessController.class;
+ private static final Class<?> awtPermissionClass = AWTPermission.class;
private static SecurityManager fsSecManager;
private static final List<SecurityManager> delegates = new
ArrayList<SecurityManager>();
@@ -125,9 +125,9 @@ public class TopSecurityManager extends SecurityManager {
}
synchronized (delegates) {
- Iterator it = delegates.iterator();
+ Iterator<SecurityManager> it = delegates.iterator();
while (it.hasNext()) {
- ((SecurityManager)it.next()).checkExit(status);
+ it.next().checkExit(status);
}
}
@@ -362,7 +362,7 @@ public class TopSecurityManager extends SecurityManager {
}
final void checkConnectImpl(String host, int port) {
- Class insecure = getInsecureClass();
+ Class<?> insecure = getInsecureClass();
if (insecure != null) {
URL ctx = getClassURL(insecure);
if (ctx != null) {
@@ -385,13 +385,13 @@ public class TopSecurityManager extends SecurityManager {
checkConnect(s, port);
}
- private final Set<Class> warnedSunMisc = new WeakSet<Class>();
+ private final Set<Class<?>> warnedSunMisc = new WeakSet<>();
private final Set<String> callerWhiteList = createCallerWhiteList();
public void checkMemberAccess(Class<?> clazz, int which) {
final String n = clazz.getName();
if (n.startsWith("sun.misc")) { // NOI18N
Class<?> caller = null;
- Class[] arr = getClassContext();
+ Class<?>[] arr = getClassContext();
for (int i = 0; i < arr.length; i++) {
if (arr[i] == TopSecurityManager.class) {
continue;
@@ -537,7 +537,7 @@ public class TopSecurityManager extends SecurityManager {
if (!check) {
return;
}
- Class[] arr = getClassContext();
+ Class<?>[] arr = getClassContext();
boolean seenJava = false;
for (int i = 0; i < arr.length; i++) {
if
(arr[i].getName().equals("org.netbeans.TopSecurityManager")) { // NOI18N
@@ -572,7 +572,7 @@ public class TopSecurityManager extends SecurityManager {
//
private Class getInsecureClass() {
- Class[] ctx = getClassContext();
+ Class<?>[] ctx = getClassContext();
boolean firstACClass = false;
LOOP: for (int i = 0; i < ctx.length; i++) {
@@ -711,7 +711,7 @@ LOOP: for (int i = 0; i < ctx.length; i++) {
Method getAppContext = appContextClass.getMethod
("getAppContext"); // NOI18N
Object appContext = getAppContext.invoke (null, new Object[0]);
- Class actionClass = javax.swing.TransferHandler.getCopyAction
().getClass ();
+ Class<?> actionClass = javax.swing.TransferHandler.getCopyAction
().getClass ();
java.lang.reflect.Field sandboxKeyField =
actionClass.getDeclaredField ("SandboxClipboardKey"); // NOI18N
sandboxKeyField.setAccessible (true);
Object value = sandboxKeyField.get (null);
diff --git
a/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java
b/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java
index 320ed97..3f1b004 100644
---
a/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java
+++
b/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java
@@ -143,7 +143,7 @@ public class DefaultAttributes extends Object implements
AbstractFileSystem.Attr
* For name of folder gives map of maps of attibutes
* (String, Reference (Table))
*/
- private transient Map cache;
+ private transient Map<String, SoftReference<Table>> cache;
/** Constructor.
* @param info file object information to use
@@ -458,10 +458,10 @@ public class DefaultAttributes extends Object implements
AbstractFileSystem.Attr
split(newName, arr);
// Remove transient attributes:
- Iterator it = v.entrySet().iterator();
+ Iterator<Map.Entry> it = v.entrySet().iterator();
while (it.hasNext()) {
- Map.Entry pair = (Map.Entry) it.next();
+ Map.Entry pair = it.next();
if (FileUtil.transientAttributes.contains(pair.getKey())) {
it.remove();
@@ -498,9 +498,9 @@ public class DefaultAttributes extends Object implements
AbstractFileSystem.Attr
/** Getter for the cache.
*/
- private Map getCache() {
+ private Map<String, SoftReference<Table>> getCache() {
if (cache == null) {
- cache = new HashMap(31);
+ cache = new HashMap<>(31);
}
return cache;
@@ -612,10 +612,10 @@ public class DefaultAttributes extends Object implements
AbstractFileSystem.Attr
*/
private Table loadTable(String name) { //throws IOException {
- Reference r = (Reference) getCache().get(name);
+ SoftReference<Table> r = getCache().get(name);
if (r != null) {
- Table m = (Table) r.get();
+ Table m = r.get();
if (m != null) {
return m;
@@ -626,7 +626,7 @@ public class DefaultAttributes extends Object implements
AbstractFileSystem.Attr
Table t = load(name);
t.attach(name, this);
- getCache().put(name, new SoftReference(t));
+ getCache().put(name, new SoftReference<Table>(t));
return t;
}
@@ -996,14 +996,14 @@ public class DefaultAttributes extends Object implements
AbstractFileSystem.Attr
return;
}
- Iterator it = mapAllowed.entrySet().iterator();
+ Iterator<Map.Entry<String, String>> it =
mapAllowed.entrySet().iterator();
while (it.hasNext()) {
- Map.Entry pair = (Map.Entry) it.next();
+ Map.Entry<String, String> pair = it.next();
- if (XMLMapAttr.Attr.isValid((String)
pair.getKey()) != -1) {
+ if (XMLMapAttr.Attr.isValid(pair.getKey()) != -1) {
XMLMapAttr.Attr attr =
XMLMapAttr.createAttributeAndDecode(
- (String) pair.getKey(), (String)
pair.getValue()
+ pair.getKey(), pair.getValue()
);
setAttr(fileName.toString(), attrName, attr);
}
@@ -1035,11 +1035,11 @@ public class DefaultAttributes extends Object
implements AbstractFileSystem.Attr
*/
public void writeToXML(PrintWriter pw) /*throws IOException */ {
// list of names
- Iterator it = new TreeSet(keySet()).iterator();
+ Iterator<String> it = new TreeSet(keySet()).iterator();
XMLMapAttr.writeHeading(pw);
while (it.hasNext()) {
- String file = (String) it.next();
+ String file = it.next();
XMLMapAttr attr = (XMLMapAttr) get(file);
if ((attr != null) && !attr.isEmpty()) {
@@ -1082,19 +1082,19 @@ public class DefaultAttributes extends Object
implements AbstractFileSystem.Attr
* @throws IOException */
public void writeExternal(ObjectOutput oo) throws IOException {
// list of names
- Iterator it = keySet().iterator();
+ Iterator<String> it = keySet().iterator();
while (it.hasNext()) {
- String file = (String) it.next();
+ String file = it.next();
Map attr = (Map) get(file);
if ((attr != null) && !attr.isEmpty()) {
oo.writeObject(file);
- Iterator entries = attr.entrySet().iterator();
+ Iterator<Map.Entry> entries = attr.entrySet().iterator();
while (entries.hasNext()) {
- Map.Entry entry = (Map.Entry) entries.next();
+ Map.Entry entry = entries.next();
String key = (String) entry.getKey();
Object value = entry.getValue();
@@ -1162,8 +1162,8 @@ public class DefaultAttributes extends Object implements
AbstractFileSystem.Attr
public void startElement(String elemName, Attributes attrs)
throws SAXException {
- HashMap mapAllowed = new HashMap();
- HashMap mapMandatory = new HashMap();
+ HashMap<String, String> mapAllowed = new HashMap<>();
+ HashMap<String, String> mapMandatory = new HashMap<>();
if (checkAttributes(attrs, mapMandatory, mapAllowed) == false) {
throw new SAXException(
@@ -1257,7 +1257,7 @@ public class DefaultAttributes extends Object implements
AbstractFileSystem.Attr
return -1;
}
- private boolean checkAttributes(Attributes attrList, HashMap
mapMandatory, HashMap mapAllowed) {
+ private boolean checkAttributes(Attributes attrList,HashMap<String,
String> mapMandatory, HashMap<String, String> mapAllowed) {
String temp;
mandatAttrCount = 0;
diff --git
a/platform/openide.filesystems/src/org/openide/filesystems/FileUtil.java
b/platform/openide.filesystems/src/org/openide/filesystems/FileUtil.java
index 9f11db0..21f2718 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/FileUtil.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/FileUtil.java
@@ -1047,8 +1047,8 @@ public final class FileUtil extends Object {
//
// apply all extended attributes
//
- for (Map.Entry entry : attributes.entrySet()) {
- String fileName = (String) entry.getKey();
+ for (Map.Entry<String, DefaultAttributes.Table> entry :
attributes.entrySet()) {
+ String fileName = entry.getKey();
int last = fileName.lastIndexOf('/');
String dirName;
@@ -1060,11 +1060,11 @@ public final class FileUtil extends Object {
String prefix = fo.isRoot() ? dirName : (fo.getPath() + '/' +
dirName);
- DefaultAttributes.Table t = (DefaultAttributes.Table)
entry.getValue();
- Iterator files = t.keySet().iterator();
+ DefaultAttributes.Table t = entry.getValue();
+ Iterator<String> files = t.keySet().iterator();
while (files.hasNext()) {
- String orig = (String) files.next();
+ String orig = files.next();
String fn = prefix + orig;
FileObject obj = fo.getFileSystem().findResource(fn);
diff --git a/platform/openide.loaders/src/org/openide/loaders/DataNode.java
b/platform/openide.loaders/src/org/openide/loaders/DataNode.java
index 2e82fef..b9320d3 100644
--- a/platform/openide.loaders/src/org/openide/loaders/DataNode.java
+++ b/platform/openide.loaders/src/org/openide/loaders/DataNode.java
@@ -914,11 +914,11 @@ public class DataNode extends AbstractNode {
// refresh current nodes display name
Map<RequestProcessor, List<DataObject>> mapping
= new HashMap<RequestProcessor, List<DataObject>>();
- Iterator it = DataObjectPool.getPOOL().getActiveDataObjects();
+ Iterator<DataObjectPool.Item> it =
DataObjectPool.getPOOL().getActiveDataObjects();
// Assign DataNodes to RequestProcessors. See bug 252073 comment
17.
while (it.hasNext()) {
- DataObject obj = ((DataObjectPool.Item)
it.next()).getDataObjectOrNull();
+ DataObject obj = it.next().getDataObjectOrNull();
if (obj != null && obj.getNodeDelegate() instanceof DataNode) {
RequestProcessor rp =
DataNodeUtils.reqProcessor(obj.getPrimaryFile());
List<DataObject> list = mapping.get(rp);
@@ -944,7 +944,7 @@ public class DataNode extends AbstractNode {
}
}
- private static Class defaultLookup;
+ private static Class<?> defaultLookup;
/** Returns true if this node is using own lookup and not the standard one.
*/
private boolean ownLookup() {
diff --git
a/platform/openide.loaders/src/org/openide/loaders/XMLDataObject.java
b/platform/openide.loaders/src/org/openide/loaders/XMLDataObject.java
index e751064..034ef21 100644
--- a/platform/openide.loaders/src/org/openide/loaders/XMLDataObject.java
+++ b/platform/openide.loaders/src/org/openide/loaders/XMLDataObject.java
@@ -1092,7 +1092,7 @@ public class XMLDataObject extends MultiDataObject {
if (!Processor.class.isAssignableFrom (proc)) {
Constructor[] arr = proc.getConstructors();
for (int i = 0; i < arr.length; i++) {
- Class[] params = arr[i].getParameterTypes();
+ Class<?>[] params = arr[i].getParameterTypes();
if (params.length == 1) {
if (
params[0] == DataObject.class ||
@@ -1235,7 +1235,7 @@ public class XMLDataObject extends MultiDataObject {
// the clazz will be null to signal, that an instance
// of object has been created
- Class next = clazz;
+ Class<?> next = clazz;
clazz = null;
try {
@@ -1253,7 +1253,7 @@ public class XMLDataObject extends MultiDataObject {
Constructor[] arr = next.getConstructors();
for (int i = 0; i < arr.length; i++) {
- Class[] params = arr[i].getParameterTypes();
+ Class<?>[] params = arr[i].getParameterTypes();
if (params.length == 1) {
if (
params[0] == DataObject.class ||
@@ -1283,7 +1283,7 @@ public class XMLDataObject extends MultiDataObject {
* @return the class of the item
*/
public Class getType () {
- Class temp = clazz;
+ Class<?> temp = clazz;
return temp != null ? temp : obj.getClass ();
}
diff --git a/platform/openide.nodes/src/org/openide/nodes/TMUtil.java
b/platform/openide.nodes/src/org/openide/nodes/TMUtil.java
index 7acb126..294002e 100644
--- a/platform/openide.nodes/src/org/openide/nodes/TMUtil.java
+++ b/platform/openide.nodes/src/org/openide/nodes/TMUtil.java
@@ -43,7 +43,7 @@ abstract class TMUtil extends Object {
* @param className name of the class
* @return the class
*/
- private static Class loadClass(String className) throws Exception {
+ private static Class<?> loadClass(String className) throws Exception {
ClassLoader loader =
org.openide.util.Lookup.getDefault().lookup(ClassLoader.class);
if (loader == null) {
@@ -166,7 +166,7 @@ abstract class TMUtil extends Object {
if (obj == null) {
try {
- Class c = Class.forName("org.openide.nodes.TMUtil$" + name);
// NOI18N
+ Class<?> c = Class.forName("org.openide.nodes.TMUtil$" +
name); // NOI18N
obj = c.newInstance();
} catch (ClassNotFoundException ex) {
obj = ex;
@@ -300,7 +300,7 @@ abstract class TMUtil extends Object {
/** Finds renderer.
*/
static final class Rend implements Runnable {
- private static Class nodeRenderer;
+ private static Class<?> nodeRenderer;
public void run() {
try {
---------------------------------------------------------------------
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
