Bug 510218: Never invoke the callin marker creater on type j.l.Object

1 files changed, 8 insertions, 0 deletions

diff --git a/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/callinmarkers/CallinMarkerCreator2.java b/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/callinmarkers/CallinMarkerCreator2.java
index 21b68ad5f..c026a421e 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/callinmarkers/CallinMarkerCreator2.java
+++ b/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/callinmarkers/CallinMarkerCreator2.java
@@ -270,6 +270,14 @@ public class CallinMarkerCreator2 extends JavaEditorActivationListener
      */
     public void updateCallinMarkers(final IMarkableJavaElement target, IStatusLineManager statusLine)
     {
+    	IJavaElement javaElement = target.getJavaElement();
+		IJavaElement pack = javaElement.getAncestor(IJavaElement.PACKAGE_FRAGMENT);
+    	if (pack != null) {
+			if (pack.getElementName().startsWith("java.lang")) //$NON-NLS-1$
+				return;
+			if (pack.getElementName().equals("java.io") && javaElement.getElementName().startsWith("Serializable")) //$NON-NLS-1$ //$NON-NLS-2$
+				return;
+		}
 		CallinMarkerJob job = new CallinMarkerJob(target) {
 			protected void updateMarkers(IProgressMonitor monitor) throws Exception {
 				updateCallinMarkers(target, monitor);