mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-17 14:05:23 +02:00
Code Issues Wiki Activity

[228774][regression] AssertionFailedException when connecting to New Connection

Browse source 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=228774
This commit is contained in:
David Dykstal 2008-04-24 22:39:43 +00:00
parent f3aa90026a
commit a9f710ebd4
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/ElementComparer.java
View file

@ -14,14 +14,13 @@
* Kevin Doyle (IBM) - [195537] Move ElementComparer From SystemView to Separate File * Kevin Doyle (IBM) - [195537] Move ElementComparer From SystemView to Separate File
* Martin Oberhuber (Wind River) - [215820] Move SystemRegistry implementation to Core * Martin Oberhuber (Wind River) - [215820] Move SystemRegistry implementation to Core
* David Dykstal (IBM) - [225911] Exception received after deleting a profile containing a connection * David Dykstal (IBM) - [225911] Exception received after deleting a profile containing a connection
* David Dykstal (IBM) - [228774] [regression] AssertionFailedException when connecting to New Connection
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.viewers.IElementComparer; import org.eclipse.jface.viewers.IElementComparer;
import org.eclipse.osgi.util.NLS;
import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.internal.core.model.SystemRegistry; import org.eclipse.rse.internal.core.model.SystemRegistry;
@ -54,18 +53,22 @@ public class ElementComparer implements IElementComparer {
* Therefore, if there is no absolute name, play it safe and return the adapter's hashCode which won't ever change. * Therefore, if there is no absolute name, play it safe and return the adapter's hashCode which won't ever change.
*/ */
int result = 0; int result = 0;
ISystemViewElementAdapter ident = null; if (element != null) {
if (element instanceof IAdaptable) { if (element instanceof IAdaptable) {
ident = (ISystemViewElementAdapter) ((IAdaptable) element).getAdapter(ISystemViewElementAdapter.class); ISystemViewElementAdapter ident = (ISystemViewElementAdapter) ((IAdaptable) element).getAdapter(ISystemViewElementAdapter.class);
Assert.isNotNull(ident, NLS.bind("no adapter found for element {0}", element)); //$NON-NLS-1$ if (ident != null) {
String absName = ident.getAbsoluteName(element); String absName = ident.getAbsoluteName(element);
if (absName != null) { if (absName != null) {
result = absName.hashCode(); result = absName.hashCode();
} else {
result = ident.hashCode();
}
} else {
result = element.hashCode();
}
} else { } else {
result = ident.hashCode(); result = element.hashCode();
} }
} else if (element != null) {
result = element.hashCode();
} }
return result; return result;
} }