Cleanup warnings that are related to the use of a Result raw type..

Warnings like this: [repeat] /home/bwalker/src/netbeans/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/FoldViewFactory.java:107: warning: [rawtypes] found raw type: Result [repeat] private Lookup.Result colorSource; [repeat] ^ [repeat] missing type arguments for generic class Result<T> [repeat] where T is a type-variable: [repeat] T extends Object declared in class Result This pull request reduces many of those warnings.
apache · Jul 19, 2024 · 9d43212 · 9d43212
1 parent 673cedf
commit 9d43212
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 32 deletions.
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/Runner.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/Runner.java
@@ -294,7 +294,7 @@ static boolean toBoolean(final String constant) throws CommandException {
      * is responsible for correct <code>TaskState</code> and receiveResult value
      * handling.
      */
-    Result result;
+    Result<?> result;
 
     /** Query string for this command. */
     final String query;
@@ -310,7 +310,7 @@ static boolean toBoolean(final String constant) throws CommandException {
      * Create <code>Result</code> object corresponding to command execution
      * value to be returned.
      */
-    protected abstract Result createResult();
+    protected abstract Result<?> createResult();
 
     /**
      * Send information to the server via HTTP POST.

diff --git a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/admin/Runner.java b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/admin/Runner.java
@@ -294,7 +294,7 @@ static boolean toBoolean(final String constant) throws CommandException {
      * is responsible for correct <code>TaskState</code> and receiveResult value
      * handling.
      */
-    Result result;
+    Result<?> result;
 
     /** Query string for this command. */
     final String query;

diff --git a/...websvc.clientapi/src/org/netbeans/modules/websvc/api/client/WebServicesClientSupport.java b/...websvc.clientapi/src/org/netbeans/modules/websvc/api/client/WebServicesClientSupport.java
@@ -56,7 +56,7 @@ public final class WebServicesClientSupport {
     public static final String WSCLIENTUPTODATE_CLASSPATH = "wsclientuptodate.classpath";
 
     private WebServicesClientSupportImpl impl;
-    private static final Lookup.Result implementations =
+    private static final Lookup.Result<?> implementations =
         Lookup.getDefault().lookupResult(WebServicesClientSupportProvider.class);
 
     static  {

diff --git a/...se/websvc.clientapi/src/org/netbeans/modules/websvc/api/client/WebServicesClientView.java b/...se/websvc.clientapi/src/org/netbeans/modules/websvc/api/client/WebServicesClientView.java
@@ -41,7 +41,7 @@
 public final class WebServicesClientView {
 
 	private WebServicesClientViewImpl impl;
-	private static final Lookup.Result implementations =
+	private static final Lookup.Result<?> implementations =
 		Lookup.getDefault().lookupResult(WebServicesClientViewProvider.class);
 
 	static  {

diff --git a/...websvc.clientapi/src/org/netbeans/modules/websvc/api/jaxws/client/JAXWSClientSupport.java b/...websvc.clientapi/src/org/netbeans/modules/websvc/api/jaxws/client/JAXWSClientSupport.java
@@ -44,7 +44,7 @@
 public final class JAXWSClientSupport {
 
     private JAXWSClientSupportImpl impl;
-    private static final Lookup.Result implementations =
+    private static final Lookup.Result<?> implementations =
         Lookup.getDefault().lookupResult(WebServicesClientSupportProvider.class);
 
     static  {

diff --git a/...se/websvc.clientapi/src/org/netbeans/modules/websvc/api/jaxws/client/JAXWSClientView.java b/...se/websvc.clientapi/src/org/netbeans/modules/websvc/api/jaxws/client/JAXWSClientView.java
@@ -39,7 +39,7 @@
 public final class JAXWSClientView {
 
 	private JAXWSClientViewImpl impl;
-	private static final Lookup.Result implementations =
+	private static final Lookup.Result<?> implementations =
 		Lookup.getDefault().lookupResult(JAXWSClientViewProvider.class);
 
 	static  {

diff --git a/...svc.rest/src/org/netbeans/modules/websvc/rest/projects/ProjectTestRestServicesAction.java b/...svc.rest/src/org/netbeans/modules/websvc/rest/projects/ProjectTestRestServicesAction.java
@@ -53,7 +53,7 @@ public class ProjectTestRestServicesAction extends AbstractAction implements Pre
     private JMenuItem menuPresenter;
     private Lookup lookup;
     private Class<?>[] watch;
-    private Lookup.Result results[];
+    private Lookup.Result<?>[] results;
     private boolean needsRefresh = true;
     private boolean initialized = false;
     private boolean refreshing = false;

diff --git a/ide/css.visual/src/org/netbeans/modules/css/visual/CssStylesTCController.java b/ide/css.visual/src/org/netbeans/modules/css/visual/CssStylesTCController.java
@@ -172,7 +172,7 @@ static TopComponentGroup getCssStylesTCGroup() {
     public final void resultChanged(LookupEvent ev) {
         PageInspector pageInspector = PageInspector.getDefault();
         if (pageInspector != null) {
-            Lookup.Result lookupResult = (Lookup.Result) ev.getSource();
+            Lookup.Result<?> lookupResult = (Lookup.Result<?>) ev.getSource();
             lookupResult.removeLookupListener(this);
             pageInspector.addPropertyChangeListener(this);
         }

diff --git a/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/FoldViewFactory.java b/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/FoldViewFactory.java
@@ -104,7 +104,7 @@ public static void register() {
     /**
      * Lookup results for color settings, being listened for changes.
      */
-    private Lookup.Result       colorSource;
+    private Lookup.Result<?>    colorSource;
 
     private Preferences         prefs;
 

diff --git a/ide/xml.core/src/org/netbeans/modules/xml/api/model/GrammarQueryManager.java b/ide/xml.core/src/org/netbeans/modules/xml/api/model/GrammarQueryManager.java
@@ -108,7 +108,7 @@ private static class DefaultQueryManager extends GrammarQueryManager {
 
         private static final String FOLDER = "Plugins/XML/GrammarQueryManagers";// NOI18N
 
-        private Lookup.Result registrations;
+        private Lookup.Result<?> registrations;
 
         private static ThreadLocal<GrammarQueryManager> transaction =
                 new ThreadLocal<GrammarQueryManager>();

diff --git a/platform/openide.explorer/src/org/openide/explorer/DefaultEMLookup.java b/platform/openide.explorer/src/org/openide/explorer/DefaultEMLookup.java
@@ -47,7 +47,7 @@ final class DefaultEMLookup extends ProxyLookup implements LookupListener, Prope
     private LookupListener listener;
 
     /** Map of (Node -> node Lookup.Result) the above lookup listener is attached to */
-    private Map<Lookup, Lookup.Result> attachedTo;
+    private Map<Lookup, Lookup.Result<?>> attachedTo;
 
     /** action map for the top component */
     private Lookup actionMap;
@@ -78,7 +78,7 @@ public void updateLookups(Node[] arr) {
 
         Lookup[] lookups = new Lookup[arr.length];
 
-        Map<Lookup, Lookup.Result> copy;
+        Map<Lookup, Lookup.Result<?>> copy;
 
         synchronized (this) {
             if (attachedTo == null) {
@@ -97,8 +97,8 @@ public void updateLookups(Node[] arr) {
             }
         }
 
-        for (Iterator<Lookup.Result> it = copy.values().iterator(); it.hasNext();) {
-            Lookup.Result res = it.next();
+        for (Iterator<Lookup.Result<?>> it = copy.values().iterator(); it.hasNext();) {
+            Lookup.Result<?> res = it.next();
             res.removeLookupListener(listener);
         }
 
@@ -126,10 +126,10 @@ protected synchronized void beforeLookup(Template<?> t) {
         if ((attachedTo == null) && isNodeQuery(t.getType())) {
             Lookup[] arr = getLookups();
 
-            attachedTo = new WeakHashMap<Lookup, Lookup.Result>(arr.length * 2);
+            attachedTo = new WeakHashMap<>(arr.length * 2);
 
             for (int i = 0; i < (arr.length - 2); i++) {
-                Lookup.Result res = arr[i].lookup(t);
+                Lookup.Result<?> res = arr[i].lookup(t);
                 res.addLookupListener(listener);
                 attachedTo.put(arr[i], res);
             }

diff --git a/platform/openide.loaders/src/org/openide/loaders/InstanceDataObject.java b/platform/openide.loaders/src/org/openide/loaders/InstanceDataObject.java
@@ -671,8 +671,8 @@ public Lookup getLookup() {
         }
     }
 
-    private Lookup.Result cookieResult = null;
-    private Lookup.Result nodeResult = null;
+    private Lookup.Result<?> cookieResult = null;
+    private Lookup.Result<?> nodeResult = null;
     private Lookup cookiesLkp = null;
     private LookupListener cookiesLsnr = null;
     private LookupListener nodeLsnr = null;

diff --git a/platform/openide.loaders/src/org/openide/loaders/XMLDataObjectInfoParser.java b/platform/openide.loaders/src/org/openide/loaders/XMLDataObjectInfoParser.java
@@ -95,7 +95,7 @@ private static class StopSaxException extends SAXException {
     private Reference<XMLDataObject> xml;
     private String parsedId;
     private Lookup lookup;
-    private Lookup.Result result;
+    private Lookup.Result<?> result;
     private ThreadLocal<Class<?>> QUERY = new ThreadLocal<Class<?>>();
 
     XMLDataObjectInfoParser(XMLDataObject xml) {
@@ -151,7 +151,7 @@ public Object lookupCookie(final Class<?> clazz) {
                     break;
                 }
             }
-            Lookup.Result r = result;
+            Lookup.Result<?> r = result;
             if (r != null) {
                 if (XMLDataObject.ERR.isLoggable(Level.FINE)) {
                     XMLDataObject.ERR.fine("Querying the result: " + r);
@@ -327,7 +327,7 @@ private Lookup updateLookup(XMLDataObject realXML, String previousID, String id)
             }
         }
         synchronized (this) {
-            Lookup.Result prevRes = result;
+            Lookup.Result<?> prevRes = result;
             lookup = newLookup;
             if (XMLDataObject.ERR.isLoggable(Level.FINE)) {
                 XMLDataObject.ERR.fine("Shared lookup updated: " + lookup + " for " + realXML);

diff --git a/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java b/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java
@@ -197,8 +197,8 @@ protected final void setLookups(Executor notifyIn, Lookup... lookups) {
         Set<Lookup> current;
         Lookup[] old;
 
-        Map<Result,LookupListener> toRemove = new IdentityHashMap<Lookup.Result, LookupListener>();
-        Map<Result,LookupListener> toAdd = new IdentityHashMap<Lookup.Result, LookupListener>();
+        Map<Result<?>,LookupListener> toRemove = new IdentityHashMap<>();
+        Map<Result<?>,LookupListener> toAdd = new IdentityHashMap<>();
 
         ImmutableInternalData orig;
         synchronized (ProxyLookup.this) {
@@ -211,16 +211,16 @@ protected final void setLookups(Executor notifyIn, Lookup... lookups) {
         }
 
         // better to do this later than in synchronized block
-        for (Map.Entry<Result, LookupListener> e : toRemove.entrySet()) {
+        for (Map.Entry<Result<?>, LookupListener> e : toRemove.entrySet()) {
             e.getKey().removeLookupListener(e.getValue());
         }
-        for (Map.Entry<Result, LookupListener> e : toAdd.entrySet()) {
+        for (Map.Entry<Result<?>, LookupListener> e : toAdd.entrySet()) {
             e.getKey().addLookupListener(e.getValue());
         }
 
 
         // this cannot be done from the synchronized block
-        final ArrayList<Object> evAndListeners = new ArrayList<Object>();
+        final List<Object> evAndListeners = new ArrayList<>();
         for (Reference<R> ref : arr) {
             R<?> r = ref.get();
             if (r != null) {
@@ -340,7 +340,7 @@ private ImmutableInternalData getData() {
 
     private Collection<Reference<R>> setData(
         ImmutableInternalData newData, Lookup[] current,
-        Map<Result,LookupListener> toAdd, Map<Result,LookupListener> toRemove
+        Map<Result<?>,LookupListener> toAdd, Map<Result<?>,LookupListener> toRemove
     ) {
         assert Thread.holdsLock(ProxyLookup.this);
         assert newData != null;
@@ -487,7 +487,7 @@ private Result<T>[] initResults() {
         final void lookupChange(
             ImmutableInternalData newData, Lookup[] current, ImmutableInternalData oldData,
             Set<Lookup> added, Set<Lookup> removed,
-            Map<Result,LookupListener> toAdd, Map<Result,LookupListener> toRemove
+            Map<Result<?>,LookupListener> toAdd, Map<Result<?>,LookupListener> toRemove
         ) {
             if (weakL.getResults() == null) {
                 // not computed yet, do not need to do anything
@@ -497,7 +497,7 @@ final void lookupChange(
             Lookup[] old = oldData.getLookups(false);
 
             // map (Lookup, Lookup.Result)
-            Map<Lookup,Result<T>> map = new IdentityHashMap<Lookup,Result<T>>(old.length * 2);
+            Map<Lookup, Result<T>> map = new IdentityHashMap<>(old.length * 2);
 
             for (int i = 0; i < old.length; i++) {
                 if (removed.contains(old[i])) {
@@ -609,7 +609,7 @@ private Collection computeResult(int indexToCache, boolean callBeforeLookup) {
                 }
             }
             // if caches exist, wait for finished
-            Lookup.Result[] arr = myBeforeLookup(callBeforeLookup, cachedResult != null);
+            Lookup.Result<T>[] arr = myBeforeLookup(callBeforeLookup, cachedResult != null);
             // use caches, if they exist
             Collection[] cc;
             synchronized (proxy()) {
@@ -1117,7 +1117,7 @@ private static class LazyCollection implements Collection {
         private final Object[] cc;
         private final int indexToCache;
         private final boolean callBeforeLookup;
-        private final Lookup.Result[] arr;
+        private final Lookup.Result<?>[] arr;
         /** GuardedBy("this") */
         private final Collection[] computed;
         /** GuardedBy("this") */