From e2d7315aee1e2851de96dfc437c9757b40a7564f Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Sun, 26 Feb 2012 15:37:35 +0400
Subject: [PATCH] cleanup

---
 .../src/com/intellij/openapi/extensions/Extensions.java     | 2 +-
 .../src/com/intellij/ide/plugins/PluginManager.java         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/extensions/src/com/intellij/openapi/extensions/Extensions.java b/platform/extensions/src/com/intellij/openapi/extensions/Extensions.java
index 04642acee638..6e0af9b95f0a 100644
--- a/platform/extensions/src/com/intellij/openapi/extensions/Extensions.java
+++ b/platform/extensions/src/com/intellij/openapi/extensions/Extensions.java
@@ -147,7 +147,7 @@ public class Extensions {
     return getRootArea().getExtensionPoint(AREA_LISTENER_EXTENSION_POINT).getExtensions();
   }
 
-  public static void registerAreaClass(@NonNls String areaClass, @NonNls String parentAreaClass) {
+  public static void registerAreaClass(@NonNls String areaClass, @Nullable @NonNls String parentAreaClass) {
     if (ourAreaClass2Configuration.containsKey(areaClass)) {
       // allow duplicate area class registrations if they are the same - fixing duplicate registration in tests is much more trouble
       AreaClassConfiguration configuration = ourAreaClass2Configuration.get(areaClass);
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java
index 3257425964e4..b07c594c0fdf 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java
@@ -358,7 +358,7 @@ public class PluginManager {
     //noinspection HardCodedStringLiteral
     final String pluginId = System.getProperty("idea.load.plugins.id");
     if (pluginId == null) {
-      if (descriptor instanceof IdeaPluginDescriptorImpl && !((IdeaPluginDescriptorImpl)descriptor).isEnabled()) return true;
+      if (descriptor instanceof IdeaPluginDescriptorImpl && !descriptor.isEnabled()) return true;
 
       if (!shouldLoadPlugins()) return true;
     }
@@ -443,7 +443,7 @@ public class PluginManager {
   }
 
   public static boolean isIncompatible(final IdeaPluginDescriptor descriptor) {
-    BuildNumber buildNumber = null;
+    BuildNumber buildNumber;
     try {
       buildNumber = getBuildNumber();
     }
@@ -614,7 +614,7 @@ public class PluginManager {
     final String pathProperty = System.getProperty(PROPERTY_PLUGIN_PATH);
     if (pathProperty == null) return;
 
-    for (java.util.StringTokenizer t = new java.util.StringTokenizer(pathProperty, File.pathSeparator); t.hasMoreTokens();) {
+    for (StringTokenizer t = new StringTokenizer(pathProperty, File.pathSeparator); t.hasMoreTokens();) {
       String s = t.nextToken();
       final IdeaPluginDescriptorImpl ideaPluginDescriptor = loadDescriptor(new File(s), PLUGIN_XML);
       if (ideaPluginDescriptor != null) {