From 984d7fcdaab55c00b854be4a7662e7b7b480a9a3 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 6 Sep 2011 19:07:49 +0200
Subject: [PATCH] Deprecated stuff dropped

---
 .../src/com/intellij/ide/ui/LafManager.java          | 12 +-----------
 .../com/intellij/ide/ui/HeadlessLafManagerImpl.java  | 10 +---------
 .../src/com/intellij/ide/ui/LafManagerImpl.java      | 10 +---------
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/ide/ui/LafManager.java b/platform/platform-api/src/com/intellij/ide/ui/LafManager.java
index db9be2bb4d0c..347ba6ca64df 100644
--- a/platform/platform-api/src/com/intellij/ide/ui/LafManager.java
+++ b/platform/platform-api/src/com/intellij/ide/ui/LafManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2011 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.
@@ -33,16 +33,6 @@ public abstract class LafManager {
 
   public abstract UIManager.LookAndFeelInfo getCurrentLookAndFeel();
 
-  /**
-   * @deprecated use {@link com.intellij.util.ui.UIUtil#isUnderAquaLookAndFeel()}
-   */
-  public abstract boolean isUnderAquaLookAndFeel();
-
-  /**
-   * @deprecated use {@link com.intellij.util.ui.UIUtil#isUnderQuaquaLookAndFeel()}
-   */
-  public abstract boolean isUnderQuaquaLookAndFeel();
-
   public abstract boolean checkLookAndFeel(UIManager.LookAndFeelInfo lookAndFeelInfo);
 
   public abstract void setCurrentLookAndFeel(UIManager.LookAndFeelInfo lookAndFeelInfo);
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/HeadlessLafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/HeadlessLafManagerImpl.java
index 991961d4b57c..6d8e2a06c204 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/HeadlessLafManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/HeadlessLafManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2011 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.
@@ -35,14 +35,6 @@ public class HeadlessLafManagerImpl extends LafManager implements ApplicationCom
     return null;
   }
 
-  public boolean isUnderAquaLookAndFeel() {
-    return false;
-  }
-
-  public boolean isUnderQuaquaLookAndFeel() {
-    return false;
-  }
-
   public boolean checkLookAndFeel(UIManager.LookAndFeelInfo lookAndFeelInfo) {
     return true;
   }
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java
index 952a48083a05..d1ed40e06812 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java
@@ -236,14 +236,6 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
     return myCurrentLaf;
   }
 
-  public boolean isUnderAquaLookAndFeel() {
-    return UIUtil.isUnderAquaLookAndFeel();
-  }
-
-  public boolean isUnderQuaquaLookAndFeel() {
-    return UIUtil.isUnderQuaquaLookAndFeel();
-  }
-
   /**
    * @return default LookAndFeelInfo for the running OS. For Win32 and
    * Linux the method returns Alloy LAF or IDEA LAF if first not found, for Mac OS X it returns Aqua
@@ -844,7 +836,7 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
     private static void fixPopupSize(final Popup popup, final Component contents) {
       if (!UIUtil.isUnderGTKLookAndFeel() || !(contents instanceof JPopupMenu)) return;
 
-      for (Class aClass = popup.getClass(); aClass != null && Popup.class.isAssignableFrom(aClass); aClass = aClass.getSuperclass()) {
+      for (Class<?> aClass = popup.getClass(); aClass != null && Popup.class.isAssignableFrom(aClass); aClass = aClass.getSuperclass()) {
         try {
           final Method getComponent = aClass.getDeclaredMethod("getComponent");
           getComponent.setAccessible(true);