[19253]: reverted back to old log behaviour. Added filter method to
JavaModelUtil and ignore not present exception by filtering them in
the actions.
diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/codemanipulation/OrganizeImportsOperation.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/codemanipulation/OrganizeImportsOperation.java
index a69e7ad..3d4073b 100644
--- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/codemanipulation/OrganizeImportsOperation.java
+++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/codemanipulation/OrganizeImportsOperation.java
@@ -457,7 +457,7 @@
typeRefsFound.add(curr);
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
namesFound.add(fullyQualifiedName);
}
diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/JavaContext.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/JavaContext.java
index b166254..a3e458d 100644
--- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/JavaContext.java
+++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/JavaContext.java
@@ -282,7 +282,7 @@
return localCollections[localCollections.length - 1].name;
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return null;
diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/util/JavaModelUtil.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/util/JavaModelUtil.java
index 3bcdbcd0..baa7084 100644
--- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/util/JavaModelUtil.java
+++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/util/JavaModelUtil.java
@@ -5,11 +5,11 @@
package org.eclipse.jdt.internal.corext.util;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IClassFile;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IImportDeclaration;
@@ -25,7 +25,6 @@
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
/**
@@ -515,5 +514,28 @@
return type;
}
-
+ /*
+ * http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
+ *
+ * Reconciling happens in a separate thread. This can cause a situation where the
+ * Java element gets disposed after an exists test has been done. So we should not
+ * log not present exceptions when they happen in working copies.
+ */
+ public static boolean filterNotPresentException(CoreException exception) {
+ if (!(exception instanceof JavaModelException))
+ return true;
+ JavaModelException je= (JavaModelException)exception;
+ if (!je.isDoesNotExist())
+ return true;
+ IJavaElement[] elements= je.getJavaModelStatus().getElements();
+ for (int i= 0; i < elements.length; i++) {
+ IJavaElement element= elements[i];
+ ICompilationUnit unit= (ICompilationUnit)element.getAncestor(IJavaElement.COMPILATION_UNIT);
+ if (unit == null)
+ return true;
+ if (!unit.isWorkingCopy())
+ return true;
+ }
+ return false;
+ }
}
\ No newline at end of file
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ErrorWizardPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ErrorWizardPage.java
index 1c996f3..9742817 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ErrorWizardPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ErrorWizardPage.java
@@ -174,7 +174,7 @@
document= new Document(sc.getSource());
}
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
if (document == null || configuration == null)
return null;
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpWizard.java
index f787022..5c72240 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpWizard.java
@@ -35,7 +35,7 @@
setChangeCreationCancelable(false);
} catch (JavaModelException e){
//log and try anyway
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
addPage(new PullUpInputPage());
}
}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RenameFieldInputWizardPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RenameFieldInputWizardPage.java
index 3f46b73..5bf6184 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RenameFieldInputWizardPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RenameFieldInputWizardPage.java
@@ -79,7 +79,7 @@
String getterSig= JavaElementUtil.createMethodSignature(getter);
return RefactoringMessages.getFormattedString("RenameFiledInputWizardPage.rename_getter_to", new String[]{getterSig, createNewGetterName()}); //$NON-NLS-1$
} catch(JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
return defaultLabel;
}
}
@@ -99,7 +99,7 @@
String setterSig= JavaElementUtil.createMethodSignature(setter);
return RefactoringMessages.getFormattedString("RenameFiledInputWizardPage.rename_setter_to", new String[]{setterSig, createNewSetterName()});//$NON-NLS-1$
} catch(JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
return defaultLabel;
}
}
@@ -112,7 +112,7 @@
try {
return getRenameFieldRefactoring().canEnableGetterRenaming();
} catch(JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
return false;
}
}
@@ -121,7 +121,7 @@
try {
return getRenameFieldRefactoring().canEnableSetterRenaming();
} catch(JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
return false;
}
}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/MoveMembersAction.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/MoveMembersAction.java
index 121a6b1..1a3e57d 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/MoveMembersAction.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/MoveMembersAction.java
@@ -20,6 +20,8 @@
import org.eclipse.jdt.internal.corext.Assert;
import org.eclipse.jdt.internal.corext.refactoring.structure.MoveMembersRefactoring;
+import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
+
import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.actions.SelectionConverter;
import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor;
@@ -108,8 +110,10 @@
try{
fRefactoring= createNewRefactoringInstance(elements);
return fRefactoring.checkPreactivation().isOK();
- } catch (JavaModelException e){
- JavaPlugin.logIgnoringNotPresentException(e); //this happen on selection changes in viewers - do not show ui if fails, just log
+ } catch (JavaModelException e) {
+ // http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
+ if (JavaModelUtil.filterNotPresentException(e))
+ JavaPlugin.log(e); //this happen on selection changes in viewers - do not show ui if fails, just log
return false;
}
}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/RenameJavaElementAction.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/RenameJavaElementAction.java
index 4abdd57..6d76435 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/RenameJavaElementAction.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/RenameJavaElementAction.java
@@ -11,6 +11,7 @@
import org.eclipse.jdt.ui.actions.SelectionDispatchAction;
+import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.actions.SelectionConverter;
import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor;
@@ -85,10 +86,12 @@
private static boolean canRename(IRefactoringRenameSupport refactoringSupport, Object element){
if (refactoringSupport == null)
return false;
- try{
+ try{
return refactoringSupport.canRename(element);
- } catch (JavaModelException e){
- JavaPlugin.logIgnoringNotPresentException(e);
+ } catch (JavaModelException e) {
+ // http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
+ if (JavaModelUtil.filterNotPresentException(e))
+ JavaPlugin.log(e);
return false;
}
}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodWizard.java
index 6adcc45..4c558c5 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodWizard.java
Binary files differ
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JavaPlugin.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JavaPlugin.java
index af60823..23343b8 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JavaPlugin.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JavaPlugin.java
@@ -154,12 +154,6 @@
log(multi);
}
- public static void logIgnoringNotPresentException(Throwable e) {
- if (e instanceof JavaModelException && ((JavaModelException)e).isDoesNotExist())
- return;
- log(e);
- }
-
public static void log(Throwable e) {
log(new Status(IStatus.ERROR, getPluginId(), JavaStatusConstants.INTERNAL_ERROR, JavaUIMessages.getString("JavaPlugin.internal_error"), e)); //$NON-NLS-1$
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JavaWorkbenchAdapter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JavaWorkbenchAdapter.java
index c95ce70..debfe88 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JavaWorkbenchAdapter.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JavaWorkbenchAdapter.java
@@ -38,7 +38,7 @@
try {
return ((IParent)element).getChildren();
} catch(JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
return NO_CHILDREN;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/AddMethodStubAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/AddMethodStubAction.java
index 34a4aa6..b672676 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/AddMethodStubAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/AddMethodStubAction.java
@@ -73,7 +73,7 @@
setText(JavaUIMessages.getFormattedString("AddMethodStubAction.detailed.override", parentType.getElementName())); //$NON-NLS-1$
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
} else {
setText(JavaUIMessages.getString("AddMethodStubAction.label")); //$NON-NLS-1$
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaCompareUtilities.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaCompareUtilities.java
index 33abf31..542bc4f 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaCompareUtilities.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaCompareUtilities.java
@@ -88,7 +88,7 @@
try {
return getTypeImageDescriptor(type.isClass());
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
return JavaPluginImages.DESC_OBJS_GHOST;
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaHistoryAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaHistoryAction.java
index 1878714..5feb19c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaHistoryAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaHistoryAction.java
@@ -97,7 +97,7 @@
try {
file= (IFile) cu.getUnderlyingResource();
} catch (JavaModelException ex) {
- JavaPlugin.logIgnoringNotPresentException(ex);
+ JavaPlugin.log(ex);
}
if (file != null && file.exists())
@@ -113,7 +113,7 @@
try {
states= file.getHistory(null);
} catch (CoreException ex) {
- JavaPlugin.logIgnoringNotPresentException(ex);
+ JavaPlugin.log(ex);
}
int count= 1;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaStructureCreator.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaStructureCreator.java
index c9297d4..388552d 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaStructureCreator.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaStructureCreator.java
@@ -131,7 +131,7 @@
try {
contents= JavaCompareUtilities.readString(sca.getContents());
} catch (CoreException ex) {
- JavaPlugin.logIgnoringNotPresentException(ex);
+ JavaPlugin.log(ex);
return null;
}
}
@@ -224,7 +224,7 @@
try {
content= JavaCompareUtilities.readString(sca.getContents());
} catch (CoreException ex) {
- JavaPlugin.logIgnoringNotPresentException(ex);
+ JavaPlugin.log(ex);
return null;
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaTextViewer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaTextViewer.java
index 3bed99b..5ade999 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaTextViewer.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaTextViewer.java
@@ -85,7 +85,7 @@
try {
return JavaCompareUtilities.readString(sca.getContents());
} catch (CoreException ex) {
- JavaPlugin.logIgnoringNotPresentException(ex);
+ JavaPlugin.log(ex);
}
}
return ""; //$NON-NLS-1$
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/PropertiesStructureCreator.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/PropertiesStructureCreator.java
index 76a3544..9dec82f 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/PropertiesStructureCreator.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/PropertiesStructureCreator.java
@@ -111,7 +111,7 @@
try {
content= JavaCompareUtilities.readString(((IStreamContentAccessor) input).getContents());
} catch(CoreException ex) {
- JavaPlugin.logIgnoringNotPresentException(ex);
+ JavaPlugin.log(ex);
}
}
@@ -169,7 +169,7 @@
try {
return JavaCompareUtilities.readString(sca.getContents());
} catch (CoreException ex) {
- JavaPlugin.logIgnoringNotPresentException(ex);
+ JavaPlugin.log(ex);
}
}
return null;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocLinkDialogLabelProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocLinkDialogLabelProvider.java
index 8f40f87..5b16b69 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocLinkDialogLabelProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocLinkDialogLabelProvider.java
@@ -34,7 +34,7 @@
return JavadocExportMessages.getFormattedString("JavadocLinkDialogLabelProvider.notconfiguredentry", text); //$NON-NLS-1$
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
return text;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocMemberContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocMemberContentProvider.java
index c5063de..eeb975f 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocMemberContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocMemberContentProvider.java
@@ -57,7 +57,7 @@
return cu;
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return new Object[0];
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocOptionsManager.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocOptionsManager.java
index 17da864..31fd346 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocOptionsManager.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocOptionsManager.java
Binary files differ
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocProjectContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocProjectContentProvider.java
index 16b02bc..22d118a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocProjectContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocProjectContentProvider.java
@@ -34,7 +34,7 @@
return getPackageFragments((IPackageFragmentRoot) parentElement);
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return new Object[0];
}
@@ -58,7 +58,7 @@
}
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return list.toArray();
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java
index 4fbf2da..ea70d1a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java
@@ -266,7 +266,7 @@
try {
url= JavaDocLocations.getJavadocBaseLocation(element);
} catch(JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
continue;
}
StringTokenizer tokenizer = new StringTokenizer(hrefs, ";"); //$NON-NLS-1$
@@ -404,7 +404,7 @@
IJavaElement element = (IJavaElement) iterator.next();
url = JavaDocLocations.getJavadocBaseLocation(element);
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
continue;
}
if (url != null) {
@@ -448,7 +448,7 @@
checkListDialogFieldElements(referencedClasses);
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocTreeWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocTreeWizardPage.java
index 944e5f6..63fff36 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocTreeWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocTreeWizardPage.java
@@ -191,7 +191,7 @@
try {
setTreeChecked(fStore.getSelectedElements(), fStore.getJavaProject());
} catch(JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
fInputGroup.aboutToOpen();
@@ -437,7 +437,7 @@
}
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return buf.toString();
}
@@ -461,7 +461,7 @@
nAdded++;
}
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return buf.toString();
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocWizard.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocWizard.java
index a734523..d0a4b4f 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocWizard.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocWizard.java
@@ -160,7 +160,7 @@
if (!executeJavadocGeneration(args))
return false;
} catch(CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
return false;
}
@@ -197,7 +197,7 @@
DebugPlugin.getDefault().getLaunchManager().addLaunch(newLaunch);
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return true;
@@ -220,7 +220,7 @@
resources.add(elements[i].getCorrespondingResource());
}
} catch(JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
@@ -378,7 +378,7 @@
try {
fRoot.refreshLocal(fJTWPage.fRoot.DEPTH_INFINITE, null);
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaMarkerAnnotation.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaMarkerAnnotation.java
index 10d6e46..d4e4394 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaMarkerAnnotation.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaMarkerAnnotation.java
@@ -74,7 +74,7 @@
try {
fIsProblemMarker= marker.isSubtypeOf(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
} catch(CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
super.initialize();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaOutlinePage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaOutlinePage.java
index e2d8f30..0f24c0d 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaOutlinePage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaOutlinePage.java
@@ -210,7 +210,7 @@
try {
return filter(c.getChildren());
} catch (JavaModelException x) {
- JavaPlugin.logIgnoringNotPresentException(x); //$NON-NLS-1$
+ JavaPlugin.log(x); //$NON-NLS-1$
}
}
return new Object[0];
@@ -235,7 +235,7 @@
IJavaElement[] children= filter(c.getChildren());
return (children != null && children.length > 0);
} catch (JavaModelException x) {
- JavaPlugin.logIgnoringNotPresentException(x);
+ JavaPlugin.log(x);
}
}
return false;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/structureselection/StructureSelectionAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/structureselection/StructureSelectionAction.java
index c394f4c..30e4241 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/structureselection/StructureSelectionAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/structureselection/StructureSelectionAction.java
@@ -77,7 +77,7 @@
root.accept(selAnalyzer);
return internalGetNewSelectionRange(oldSourceRange, cu, selAnalyzer);
} catch (JavaModelException e){
- JavaPlugin.logIgnoringNotPresentException(e); //dialog would be too heavy here
+ JavaPlugin.log(e); //dialog would be too heavy here
return new SourceRange(oldSourceRange.getOffset(), oldSourceRange.getLength());
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerContentProvider.java
index c570f86..e0377be 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerContentProvider.java
Binary files differ
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/BuildPathsPropertyPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/BuildPathsPropertyPage.java
index 5519443..f195714 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/BuildPathsPropertyPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/BuildPathsPropertyPage.java
@@ -115,7 +115,7 @@
try {
return proj.hasNature(JavaCore.NATURE_ID);
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return false;
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/EditTemplateDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/EditTemplateDialog.java
index fe452ba..a366966 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/EditTemplateDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/EditTemplateDialog.java
@@ -359,7 +359,7 @@
try {
fTranslator.translate(event.getDocumentEvent().getDocument().get());
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
updateUndoAction();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaElementInfoPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaElementInfoPage.java
index 8b08e65..7fe3445 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaElementInfoPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaElementInfoPage.java
Binary files differ
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationBlock.java
index a7afee4..469a607 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationBlock.java
@@ -121,7 +121,7 @@
if (fJavaDocLocation != null)
initialValue = fJavaDocLocation.toExternalForm();
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
fJavaDocField.setText(initialValue);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationPropertyPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationPropertyPage.java
index 346e0a7..5f39f87 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationPropertyPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationPropertyPage.java
@@ -85,7 +85,7 @@
}
}
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
return elem;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/ClipboardActionUtil.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/ClipboardActionUtil.java
index 05fc162..8a2314a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/ClipboardActionUtil.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/ClipboardActionUtil.java
@@ -122,7 +122,7 @@
} catch (JavaModelException e) {
if (!e.isDoesNotExist()) {
//do not show error dialogs in a loop
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/CopySourceReferencesToClipboardAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/CopySourceReferencesToClipboardAction.java
index cae7c5c..c6a39a2 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/CopySourceReferencesToClipboardAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/CopySourceReferencesToClipboardAction.java
@@ -106,7 +106,7 @@
if ((refs[i] instanceof IType) && JavaElementUtil.isMainType((IType)refs[i]))
mainTypes.add(refs[i]);
} catch(JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);//cannot show dialog
+ JavaPlugin.log(e);//cannot show dialog
}
}
return (IType[]) mainTypes.toArray(new IType[mainTypes.size()]);
@@ -116,7 +116,7 @@
try {
return ResourceUtil.getResource(type);
} catch(JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);//cannot show a dialog here
+ JavaPlugin.log(e);//cannot show a dialog here
return null;
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/PasteSourceReferencesFromClipboardAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/PasteSourceReferencesFromClipboardAction.java
index b5d2188..d103a90 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/PasteSourceReferencesFromClipboardAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/PasteSourceReferencesFromClipboardAction.java
@@ -87,8 +87,10 @@
return false;
return canPaste((ISourceReference)selected, getContentsToPaste());
- } catch (JavaModelException e){
- JavaPlugin.logIgnoringNotPresentException(e);
+ } catch (JavaModelException e) {
+ // http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
+ if (JavaModelUtil.filterNotPresentException(e))
+ JavaPlugin.log(e);
return false;
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/ReorgDestinationAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/ReorgDestinationAction.java
index b01f190..6505c54 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/ReorgDestinationAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/ReorgDestinationAction.java
@@ -367,7 +367,7 @@
else
return null;
} catch (JavaModelException e){
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
return null;
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/SourceReferenceAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/SourceReferenceAction.java
index 69e758e..1ea58d2 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/SourceReferenceAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/SourceReferenceAction.java
@@ -74,7 +74,9 @@
}
return true;
} catch (JavaModelException e){
- JavaPlugin.logIgnoringNotPresentException(e);
+ // http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
+ if (JavaModelUtil.filterNotPresentException(e))
+ JavaPlugin.log(e);
return false;
}
}
@@ -154,7 +156,7 @@
if (wcElement != null && wcElement.exists())
wcList.add(wcElement);
} catch(JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e); //cannot show dialog here
+ JavaPlugin.log(e); //cannot show dialog here
//do nothing - do not add to selection (?)
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CUCorrectionProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CUCorrectionProposal.java
index 7b2f5aa..0a44caa 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CUCorrectionProposal.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CUCorrectionProposal.java
@@ -91,7 +91,7 @@
}
} catch(CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return buf.toString();
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/ChangeCorrectionProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/ChangeCorrectionProposal.java
index ac49cfb..af7d846 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/ChangeCorrectionProposal.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/ChangeCorrectionProposal.java
@@ -60,7 +60,7 @@
} catch(ChangeAbortException e) {
JavaPlugin.log(e);
} catch(CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
} finally {
if (change != null) {
change.performed();
@@ -82,7 +82,7 @@
return null;
}
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
buf.append(getDisplayString());
}
buf.append("</p>"); //$NON-NLS-1$
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectPackageDeclarationProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectPackageDeclarationProposal.java
index f44765e..0150bdf 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectPackageDeclarationProposal.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectPackageDeclarationProposal.java
@@ -79,7 +79,7 @@
return (CorrectionMessages.getFormattedString("CorrectPackageDeclarationProposal.add.description", parentPack.getElementName())); //$NON-NLS-1$
}
} catch(JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return (CorrectionMessages.getFormattedString("CorrectPackageDeclarationProposal.change.description", parentPack.getElementName())); //$NON-NLS-1$
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectionMarkerResolutionGenerator.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectionMarkerResolutionGenerator.java
index c32707d..f780e2d 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectionMarkerResolutionGenerator.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectionMarkerResolutionGenerator.java
@@ -97,7 +97,7 @@
}
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return new IMarkerResolution[0];
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/JavaCorrectionProcessor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/JavaCorrectionProcessor.java
index dbd2166..96d33d0 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/JavaCorrectionProcessor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/JavaCorrectionProcessor.java
@@ -207,7 +207,7 @@
//proposals.add(new NoCorrectionProposal(problemPos));
}
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/LocalCorrectionsSubProcessor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/LocalCorrectionsSubProcessor.java
index 6527981..5e441dd 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/LocalCorrectionsSubProcessor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/LocalCorrectionsSubProcessor.java
@@ -275,7 +275,7 @@
String dialogTitle= CorrectionMessages.getString("LocalCorrectionsSubProcessor.externalizestrings.dialog.title"); //$NON-NLS-1$
new RefactoringStarter().activate(refactoring, wizard, dialogTitle, true);
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
};
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/NewCUCompletionProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/NewCUCompletionProposal.java
index 0d47003..6cac53e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/NewCUCompletionProposal.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/NewCUCompletionProposal.java
@@ -50,7 +50,7 @@
} catch (PartInitException e) {
JavaPlugin.log(e);
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/NewConstructorCompletionProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/NewConstructorCompletionProposal.java
index 22f2120..33bef73 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/NewConstructorCompletionProposal.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/NewConstructorCompletionProposal.java
@@ -196,7 +196,7 @@
} catch (PartInitException e) {
JavaPlugin.log(e);
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/NewMethodCompletionProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/NewMethodCompletionProposal.java
index 99c51aa..76ee2f2 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/NewMethodCompletionProposal.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/NewMethodCompletionProposal.java
@@ -253,7 +253,7 @@
} catch (PartInitException e) {
JavaPlugin.log(e);
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/AnonymousTypeCompletionProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/AnonymousTypeCompletionProposal.java
index 5cae472..f9982b6 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/AnonymousTypeCompletionProposal.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/AnonymousTypeCompletionProposal.java
@@ -58,7 +58,7 @@
imageName= JavaPluginImages.IMG_OBJS_INTERFACE;
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
return JavaPluginImages.get(imageName);
@@ -68,7 +68,7 @@
try {
return project.findType(typeName);
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return null;
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/JavaTypeCompletionProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/JavaTypeCompletionProposal.java
index 253edb2..998f131 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/JavaTypeCompletionProposal.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/JavaTypeCompletionProposal.java
@@ -79,7 +79,7 @@
setReplacementOffset(getReplacementOffset() + document.getLength() - oldLen);
}
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
} catch (BadLocationException e) {
JavaPlugin.log(e);
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/ProposalInfo.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/ProposalInfo.java
index 2fdfb2d..7ebd69e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/ProposalInfo.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/ProposalInfo.java
@@ -107,7 +107,7 @@
}
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
} catch (IOException e) {
JavaPlugin.log(e);
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavaDocCompletionProcessor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavaDocCompletionProcessor.java
index 58a173f..c93bf48 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavaDocCompletionProcessor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavaDocCompletionProcessor.java
@@ -156,7 +156,7 @@
results= evaluator.computeProposals();
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
if (fTemplateEngine != null) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsContentProvider.java
index 1ac2ee5..dfb1c70 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsContentProvider.java
@@ -107,7 +107,7 @@
addAll(type.getFields(), res);
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return res.toArray();
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsViewer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsViewer.java
index e18a21b..23bcd40 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsViewer.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsViewer.java
@@ -223,7 +223,7 @@
newSelection= new StructuredSelection(currElements[0]);
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
setSelection(newSelection);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyContentProvider.java
index d80cfb8..67a94fb 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyContentProvider.java
@@ -172,7 +172,7 @@
}
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
@@ -184,7 +184,7 @@
}
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyLifeCycle.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyLifeCycle.java
index 5128251..6eac2eb 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyLifeCycle.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyLifeCycle.java
@@ -239,7 +239,7 @@
}
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
} else {
processChildrenDelta(delta, changedTypes);
@@ -251,7 +251,7 @@
IType type= ((IClassFile) element).getType();
processTypeDelta(type, changedTypes);
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
} else {
processChildrenDelta(delta, changedTypes);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java
index e2203b5..0de3c94 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java
@@ -314,7 +314,7 @@
return;
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
return;
}
}
@@ -406,7 +406,7 @@
try {
fHierarchyLifeCycle.ensureRefreshedTypeHierarchy(fInputElement, new BusyIndicatorRunnableContext());
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
clearInput();
return;
}
@@ -1013,7 +1013,7 @@
EditorUtility.revealInEditor(editorPart, (IJavaElement) elem);
getSite().getPage().addPartListener(fPartListener);
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/JavaUIHelp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/JavaUIHelp.java
index 79189a4..91aa90b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/JavaUIHelp.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/JavaUIHelp.java
@@ -99,7 +99,7 @@
WorkbenchHelp.displayHelp(context);
} catch (CoreException ex) {
- JavaPlugin.logIgnoringNotPresentException(ex);
+ JavaPlugin.log(ex);
}
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/OpenTypeHierarchyUtil.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/OpenTypeHierarchyUtil.java
index acaed8a..8dc2cba 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/OpenTypeHierarchyUtil.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/OpenTypeHierarchyUtil.java
Binary files differ
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabels.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabels.java
index 0a14409..9372038 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabels.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabels.java
@@ -400,7 +400,7 @@
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e); // NotExistsException will not reach this point
+ JavaPlugin.log(e); // NotExistsException will not reach this point
}
}
@@ -433,7 +433,7 @@
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e); // NotExistsException will not reach this point
+ JavaPlugin.log(e); // NotExistsException will not reach this point
}
}
@@ -592,7 +592,7 @@
}
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e); // problems with class path
+ JavaPlugin.log(e); // problems with class path
}
}
if (root.isExternal()) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemMarkerManager.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemMarkerManager.java
index d88b27e..8cbce10 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemMarkerManager.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemMarkerManager.java
Binary files differ
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewClassCreationWizard.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewClassCreationWizard.java
index 5ab0105..8d2e9d3 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewClassCreationWizard.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewClassCreationWizard.java
@@ -49,7 +49,7 @@
selectAndReveal(resource);
openResource(resource);
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
// let pass, only reveal and open will fail
}
return true;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewInterfaceCreationWizard.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewInterfaceCreationWizard.java
index 2de7351..dea8e85 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewInterfaceCreationWizard.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewInterfaceCreationWizard.java
@@ -50,7 +50,7 @@
selectAndReveal(resource);
openResource(resource);
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
// let pass, only reveal and open will fail
}
return true;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewProjectCreationWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewProjectCreationWizardPage.java
index 242b46a..d49f332 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewProjectCreationWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewProjectCreationWizardPage.java
@@ -260,7 +260,7 @@
try {
fMainPage.getProjectHandle().delete(false, false, null);
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderCreationWizard.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderCreationWizard.java
index ca22e94..ac59b5e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderCreationWizard.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderCreationWizard.java
@@ -45,7 +45,7 @@
selectAndReveal(resource);
openResource(resource);
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
// let pass, only reveal and open will fail
}
return true;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderWizardPage.java
index 1288c20..5285fed 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderWizardPage.java
@@ -449,7 +449,7 @@
try {
projects= JavaCore.create(fWorkspaceRoot).getJavaProjects();
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
projects= new IJavaProject[0];
}
@@ -476,7 +476,7 @@
res.add(container);
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
for (int i= 0; i < fEntries.length; i++) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java
index 3e0025e..1a1dc85 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java
@@ -290,7 +290,7 @@
newClassPath= getExistingEntries(classpathEntries);
}
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
if (newClassPath == null) {
newClassPath= getDefaultClassPath(jproject);
@@ -572,7 +572,7 @@
}
}
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDescriptor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDescriptor.java
index d527821..abdb33c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDescriptor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDescriptor.java
@@ -90,7 +90,7 @@
containers.add(curr);
}
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
if (defaultPageName != null && containers.isEmpty()) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/JavaElementContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/JavaElementContentProvider.java
index b7db7e2..2b5c73f 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/JavaElementContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/JavaElementContentProvider.java
Binary files differ
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/JavaElementSorter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/JavaElementSorter.java
index 83cb352..c76ebc1 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/JavaElementSorter.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/JavaElementSorter.java
@@ -129,7 +129,7 @@
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return JAVAELEMENTS;
} else if (element instanceof IFile) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/ProblemsLabelDecorator.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/ProblemsLabelDecorator.java
index eb18782..d8705a2 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/ProblemsLabelDecorator.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/ProblemsLabelDecorator.java
@@ -33,6 +33,7 @@
import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.ISourceReference;
+import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.viewsupport.IProblemChangedListener;
import org.eclipse.jdt.internal.ui.viewsupport.ImageDescriptorRegistry;
@@ -155,7 +156,9 @@
return getErrorTicksFromMarkers((IResource) obj, IResource.DEPTH_INFINITE, null);
}
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ // http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
+ if (JavaModelUtil.filterNotPresentException(e))
+ JavaPlugin.log(e);
}
return 0;
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddGetterSetterAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddGetterSetterAction.java
index 1c43631..2a65b05 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddGetterSetterAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddGetterSetterAction.java
@@ -125,7 +125,9 @@
try {
setEnabled(canEnable(selection));
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ // http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
+ if (JavaModelUtil.filterNotPresentException(e))
+ JavaPlugin.log(e);
setEnabled(false);
}
}
@@ -483,7 +485,7 @@
return null;
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
return null;
}
@@ -541,7 +543,7 @@
try {
flags= ((GetterSetterEntry) element).field.getFlags();
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
ImageDescriptor desc= JavaElementImageProvider.getFieldImageDescriptor(false, Flags.AccPublic);
int adornmentFlags= Flags.isStatic(flags) ? JavaElementImageDescriptor.STATIC : 0;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddUnimplementedConstructorsAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddUnimplementedConstructorsAction.java
index 9b1bde2..9a3e67f 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddUnimplementedConstructorsAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddUnimplementedConstructorsAction.java
@@ -94,6 +94,9 @@
IType selected= getSelectedType(selection);
enabled= (selected != null) && JavaModelUtil.isEditable(selected.getCompilationUnit());
} catch (JavaModelException e) {
+ // http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
+ if (JavaModelUtil.filterNotPresentException(e))
+ JavaPlugin.log(e);
}
setEnabled(enabled);
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ModifyParametersAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ModifyParametersAction.java
index a31830c..9a9acfc 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ModifyParametersAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ModifyParametersAction.java
@@ -13,6 +13,8 @@
import org.eclipse.jdt.internal.corext.refactoring.Assert;
import org.eclipse.jdt.internal.corext.refactoring.structure.ModifyParametersRefactoring;
+import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
+
import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
import org.eclipse.jdt.internal.ui.JavaPlugin;
@@ -95,8 +97,10 @@
try{
fRefactoring= new ModifyParametersRefactoring(method);
return fRefactoring.checkPreactivation().isOK();
- } catch (JavaModelException e){
- JavaPlugin.logIgnoringNotPresentException(e); //this happen on selection changes in viewers - do not show ui if fails, just log
+ } catch (JavaModelException e) {
+ // http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
+ if (JavaModelUtil.filterNotPresentException(e))
+ JavaPlugin.log(e); //this happen on selection changes in viewers - do not show ui if fails, just log
return false;
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OpenSuperImplementationAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OpenSuperImplementationAction.java
index 31e8e56..a7debfc 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OpenSuperImplementationAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OpenSuperImplementationAction.java
@@ -183,7 +183,7 @@
}
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return null;
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OrganizeImportsAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OrganizeImportsAction.java
index c1c641d..d16844b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OrganizeImportsAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OrganizeImportsAction.java
@@ -149,7 +149,7 @@
}
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
return (ICompilationUnit[]) result.toArray(new ICompilationUnit[result.size()]);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OverrideMethodsAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OverrideMethodsAction.java
index 22aafc0..e8c6467 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OverrideMethodsAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OverrideMethodsAction.java
@@ -98,6 +98,9 @@
IType selected= getSelectedType(selection);
enabled= (selected != null) && JavaModelUtil.isEditable(selected.getCompilationUnit());
} catch (JavaModelException e) {
+ // http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
+ if (JavaModelUtil.filterNotPresentException(e))
+ JavaPlugin.log(e);
}
setEnabled(enabled);
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/PullUpAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/PullUpAction.java
index b249e62..309b1da 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/PullUpAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/PullUpAction.java
@@ -18,6 +18,8 @@
import org.eclipse.jdt.internal.corext.Assert;
import org.eclipse.jdt.internal.corext.refactoring.structure.PullUpRefactoring;
+import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
+
import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.actions.ActionMessages;
@@ -105,7 +107,9 @@
fRefactoring= createNewRefactoringInstance(elements);
return fRefactoring.checkPreactivation().isOK();
} catch (JavaModelException e){
- JavaPlugin.logIgnoringNotPresentException(e); //this happen on selection changes in viewers - do not show ui if fails, just log
+ // http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
+ if (JavaModelUtil.filterNotPresentException(e))
+ JavaPlugin.log(e); //this happen on selection changes in viewers - do not show ui if fails, just log
return false;
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ShowInNavigatorViewAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ShowInNavigatorViewAction.java
index e685085..ea43e79 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ShowInNavigatorViewAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ShowInNavigatorViewAction.java
@@ -94,7 +94,9 @@
try {
setEnabled(getResource(selection) != null);
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ // http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
+ if (JavaModelUtil.filterNotPresentException(e))
+ JavaPlugin.log(e);
setEnabled(false);
}
}
@@ -112,7 +114,7 @@
} catch(JavaModelException e) {
// This shouldn't happen. If we can't convert the selection the
// action is disabled.
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
@@ -125,7 +127,7 @@
} catch (JavaModelException e) {
// This shouldn't happen. If we can't convert the selection the
// action is disabled.
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/jarpackager/JarWriter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/jarpackager/JarWriter.java
index 616aefc..a2be1b0 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/jarpackager/JarWriter.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/jarpackager/JarWriter.java
@@ -244,7 +244,7 @@
containingFolder.refreshLocal(IResource.DEPTH_ONE, null);
} catch (CoreException ex) {
// don't refresh the folder but log the problem
- JavaPlugin.logIgnoringNotPresentException(ex);
+ JavaPlugin.log(ex);
} finally {
return;
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewTypeWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewTypeWizardPage.java
index c11faaa..1333a6c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewTypeWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewTypeWizardPage.java
@@ -335,7 +335,7 @@
}
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
// ignore this exception now
}
}
@@ -826,7 +826,7 @@
}
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
// let pass
}
}
@@ -1079,7 +1079,7 @@
}
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
// let pass, checking is an extra
}
}
@@ -1112,7 +1112,7 @@
packages= froot.getChildren();
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
if (packages == null) {
packages= new IJavaElement[0];
@@ -1439,7 +1439,7 @@
return JavaContext.evaluateTemplate(templates[0], parentCU, pos);
}
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return null;
}
