From fc43f0a34df294ced8127166419b8d73c269344b Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 13 Jun 2013 15:49:41 +0400 Subject: [PATCH] Cleanup (suppressions) --- .../extensions/impl/ExtensionPointImpl.java | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java b/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java index 9c6f782cbcc1..746857e8eb49 100644 --- a/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java +++ b/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -183,9 +183,9 @@ public class ExtensionPointImpl implements ExtensionPoint { result = myExtensionsCache; if (result == null) { processAdapters(); - final Class extensionClass = getExtensionClass(); - //noinspection unchecked - result = myExtensions.toArray((T[])Array.newInstance(extensionClass, myExtensions.size())); + Class extensionClass = getExtensionClass(); + @SuppressWarnings("unchecked") T[] a = (T[])Array.newInstance(extensionClass, myExtensions.size()); + result = myExtensions.toArray(a); for (int i = result.length - 1; i >= 0; i--) { T t = result[i]; @@ -237,8 +237,7 @@ public class ExtensionPointImpl implements ExtensionPoint { ExtensionComponentAdapter[] adapters = allAdapters.toArray(new ExtensionComponentAdapter[myExtensionAdapters.size()]); LoadingOrder.sort(adapters); for (ExtensionComponentAdapter adapter : adapters) { - //noinspection unchecked - T extension = (T)adapter.getExtension(); + @SuppressWarnings("unchecked") T extension = (T)adapter.getExtension(); assertClass(extension.getClass()); internalRegisterExtension(extension, adapter, myExtensions.size(), ArrayUtilRt.find(loadedAdapters, adapter) == -1); @@ -334,8 +333,8 @@ public class ExtensionPointImpl implements ExtensionPoint { if (myEPListeners.add(listener)) { for (ExtensionComponentAdapter componentAdapter : myLoadedAdapters.toArray(new ExtensionComponentAdapter[myLoadedAdapters.size()])) { try { - //noinspection unchecked - listener.extensionAdded((T)componentAdapter.getExtension(), componentAdapter.getPluginDescriptor()); + @SuppressWarnings("unchecked") T extension = (T)componentAdapter.getExtension(); + listener.extensionAdded(extension, componentAdapter.getPluginDescriptor()); } catch (Throwable e) { myLogger.error(e); @@ -348,8 +347,8 @@ public class ExtensionPointImpl implements ExtensionPoint { public synchronized void removeExtensionPointListener(@NotNull ExtensionPointListener listener) { for (ExtensionComponentAdapter componentAdapter : myLoadedAdapters.toArray(new ExtensionComponentAdapter[myLoadedAdapters.size()])) { try { - //noinspection unchecked - listener.extensionRemoved((T)componentAdapter.getExtension(), componentAdapter.getPluginDescriptor()); + @SuppressWarnings("unchecked") T extension = (T)componentAdapter.getExtension(); + listener.extensionRemoved(extension, componentAdapter.getPluginDescriptor()); } catch (Throwable e) { myLogger.error(e); @@ -379,10 +378,9 @@ public class ExtensionPointImpl implements ExtensionPoint { if (extensionClass == null) { try { ClassLoader pluginClassLoader = myDescriptor.getPluginClassLoader(); - //noinspection unchecked - myExtensionClass = extensionClass = pluginClassLoader == null - ? (Class)Class.forName(myClassName) - : (Class)Class.forName(myClassName, true, pluginClassLoader); + @SuppressWarnings("unchecked") Class extClass = pluginClassLoader == null + ? (Class)Class.forName(myClassName) : (Class)Class.forName(myClassName, true, pluginClassLoader); + myExtensionClass = extensionClass = extClass; } catch (ClassNotFoundException e) { throw new RuntimeException(e); @@ -422,8 +420,8 @@ public class ExtensionPointImpl implements ExtensionPoint { pluginContainer.unregisterComponent(componentKey); } - //noinspection unchecked - internalUnregisterExtension((T)componentAdapter.getExtension(), componentAdapter.getPluginDescriptor()); + @SuppressWarnings("unchecked") T extension = (T)componentAdapter.getExtension(); + internalUnregisterExtension(extension, componentAdapter.getPluginDescriptor()); return true; } return false;