From 3dc20c8a55dbb2192bcb4b67ef8e8bd5eaad6a36 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Sun, 29 Aug 2010 16:59:00 +0400
Subject: [PATCH] replace assertion with check (EA-18248 - assert:
 ComponentTree.getSelectedComponents)

---
 .../componentTree/ComponentPtrDescriptor.java       |  4 ++--
 .../uiDesigner/componentTree/ComponentTree.java     | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentPtrDescriptor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentPtrDescriptor.java
index f5c09653fa01..5ec5045b6321 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentPtrDescriptor.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentPtrDescriptor.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
  * @author Anton Katilin
  * @author Vladimir Kondratyev
  */
-final class ComponentPtrDescriptor extends NodeDescriptor{
+final class ComponentPtrDescriptor extends NodeDescriptor<ComponentPtr> {
   private ComponentPtr myPtr;
   /**
    * RadComponent.getBinding() or RadRootContainer.getClassToBind()
@@ -63,7 +63,7 @@ final class ComponentPtrDescriptor extends NodeDescriptor{
     return myPtr != null ? myPtr.getComponent() : null;
   }
 
-  public Object getElement(){
+  public ComponentPtr getElement() {
     return myPtr;
   }
 }
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTree.java b/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTree.java
index 849d39f57275..4d564b290ece 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTree.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTree.java
@@ -179,8 +179,8 @@ public final class ComponentTree extends Tree implements DataProvider {
       LOG.assertTrue(node != null);
       final Object userObject = node.getUserObject();
       if (userObject instanceof ComponentPtrDescriptor) {
-        final NodeDescriptor descriptor = (NodeDescriptor)userObject;
-        final ComponentPtr ptr = (ComponentPtr)descriptor.getElement();
+        final ComponentPtrDescriptor descriptor = (ComponentPtrDescriptor)userObject;
+        final ComponentPtr ptr = descriptor.getElement();
         if (ptr != null && ptr.isValid()) {
           final RadComponent component = ptr.getComponent();
           LOG.assertTrue(component != null);
@@ -219,9 +219,10 @@ public final class ComponentTree extends Tree implements DataProvider {
       LOG.assertTrue(node != null);
       if (node.getUserObject() instanceof ComponentPtrDescriptor) {
         final ComponentPtrDescriptor descriptor = (ComponentPtrDescriptor)node.getUserObject();
-        final ComponentPtr ptr = (ComponentPtr)descriptor.getElement();
-        LOG.assertTrue(ptr != null && ptr.isValid());
-        result.add(ptr.getComponent());
+        final ComponentPtr ptr = descriptor.getElement();
+        if (ptr != null && ptr.isValid()) {
+          result.add(ptr.getComponent());
+        }
       }
     }
     return result.toArray(new RadComponent[result.size()]);
@@ -400,7 +401,7 @@ public final class ComponentTree extends Tree implements DataProvider {
       final DefaultMutableTreeNode node = (DefaultMutableTreeNode)value;
       if (node.getUserObject() instanceof ComponentPtrDescriptor) {
         final ComponentPtrDescriptor descriptor = (ComponentPtrDescriptor)node.getUserObject();
-        final ComponentPtr ptr = (ComponentPtr)descriptor.getElement();
+        final ComponentPtr ptr = descriptor.getElement();
         if (ptr == null) return;
         final RadComponent component = ptr.getComponent();
         LOG.assertTrue(component != null);