MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

replace assertion with check (EA-18248 - assert: ComponentTree.getSelectedComponents)

Browse Source
This commit is contained in:
Dmitry Jemerov
2010-08-29 16:59:00 +04:00
parent 06756facc9
commit 3dc20c8a55
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentPtrDescriptor.java
+2 -2
View File
@@ -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;
}
}
plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTree.java
+7 -6
View File
@@ -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);