wlu: updated
diff --git a/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/LibraryDiffAnalyzor.java b/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/LibraryDiffAnalyzor.java
index 0b91574..0571b85 100644
--- a/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/LibraryDiffAnalyzor.java
+++ b/org.eclipse.epf.library.tests/src/org/eclipse/epf/library/tests/exportimport/LibraryDiffAnalyzor.java
@@ -390,10 +390,20 @@
trace(prompt + "msg: " + msg);
MethodElement elem0 = (MethodElement) path.get(path.size() - 1);
if (elem0 != elem1) {
- trace(prompt + "elem0 -> type: " + getClassLastName(elem0) + ", name: " + elem0.getName() + ", guid: " + elem0.getGuid());
+ trace(prompt + getElemString(elem0, "elem0"));
}
- trace(prompt + "elem1 -> type: " + getClassLastName(elem1) + ", name: " + elem1.getName() + ", guid: " + elem1.getGuid());
- trace(prompt + "elem2 -> type: " + getClassLastName(elem2) + ", name: " + elem2.getName() + ", guid: " + elem2.getGuid());
+ trace(prompt + getElemString(elem1, "elem1"));
+ trace(prompt + getElemString(elem2, "elem2"));
+ }
+
+ private String getElemString(MethodElement elem, String label) {
+ String str = label;
+ if (elem == null) {
+ str += " -> null";
+ } else {
+ str += " -> type: " + getClassLastName(elem) + ", name: " + elem.getName() + ", guid: " + elem.getGuid();
+ }
+ return str;
}
private String getClassLastName(Object obj) {
