diff options
80 files changed, 176 insertions, 128 deletions
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 a69e7ad5e9..3d4073b8b7 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 @@ public class OrganizeImportsOperation implements IWorkspaceRunnable { 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 b166254a25..a3e458da01 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 @@ public class JavaContext extends CompilationUnitContext { 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 3bcdbcd0ed..baa7084c73 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.ITypeHierarchy; 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 @@ public class JavaModelUtil { 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 1c996f33a3..97428176b5 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 @@ public class ErrorWizardPage extends RefactoringWizardPage { 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 f787022935..5c72240962 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 @@ public class PullUpWizard extends RefactoringWizard { 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 3f46b73e04..5bf6184f35 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 @@ public class RenameFieldInputWizardPage extends RenameInputWizardPage { 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 @@ public class RenameFieldInputWizardPage extends RenameInputWizardPage { 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 @@ public class RenameFieldInputWizardPage extends RenameInputWizardPage { try {
return getRenameFieldRefactoring().canEnableGetterRenaming();
} catch(JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
return false;
}
}
@@ -121,7 +121,7 @@ public class RenameFieldInputWizardPage extends RenameInputWizardPage { 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 121a6b1846..1a3e57d160 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.ui.actions.SelectionDispatchAction; 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 @@ public class MoveMembersAction extends SelectionDispatchAction{ 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 4abdd575ce..6d76435f4a 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.core.JavaModelException; 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 @@ public class RenameJavaElementAction extends SelectionDispatchAction { 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 6adcc45414..4c558c5428 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 @@ -32,7 +32,7 @@ public class ExtractMethodWizard extends RefactoringWizard { try {
return getRefactoring().createChange(new NullProgressMonitor());
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
return null;
}
}
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 af608233bb..23343b81ce 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 @@ public class JavaPlugin extends AbstractUIPlugin { 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 c95ce70ae6..debfe88e69 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 @@ public class JavaWorkbenchAdapter implements IWorkbenchAdapter { 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 34a4aa6bc2..b672676cd9 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 @@ public class AddMethodStubAction extends Action { 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 33abf3145e..542bc4f4f9 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 @@ class JavaCompareUtilities { 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 1878714077..5feb19c063 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 @@ public abstract class JavaHistoryAction implements IActionDelegate { try {
file= (IFile) cu.getUnderlyingResource();
} catch (JavaModelException ex) {
- JavaPlugin.logIgnoringNotPresentException(ex);
+ JavaPlugin.log(ex);
}
if (file != null && file.exists())
@@ -113,7 +113,7 @@ public abstract class JavaHistoryAction implements IActionDelegate { 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 c9297d438a..388552dc75 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 @@ public class JavaStructureCreator implements IStructureCreator { try {
contents= JavaCompareUtilities.readString(sca.getContents());
} catch (CoreException ex) {
- JavaPlugin.logIgnoringNotPresentException(ex);
+ JavaPlugin.log(ex);
return null;
}
}
@@ -224,7 +224,7 @@ public class JavaStructureCreator implements IStructureCreator { 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 3bed99b919..5ade999f79 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 @@ public class JavaTextViewer extends Viewer { 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 76a3544a25..9dec82f6b7 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 @@ public class PropertiesStructureCreator implements IStructureCreator { try {
content= JavaCompareUtilities.readString(((IStreamContentAccessor) input).getContents());
} catch(CoreException ex) {
- JavaPlugin.logIgnoringNotPresentException(ex);
+ JavaPlugin.log(ex);
}
}
@@ -169,7 +169,7 @@ public class PropertiesStructureCreator implements IStructureCreator { 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 8f40f8738a..5b16b69a9a 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 @@ public class JavadocLinkDialogLabelProvider extends JavaUILabelProvider { 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 c5063de457..eeb975fdc2 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 @@ public class JavadocMemberContentProvider implements ITreeContentProvider { 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 17da8646eb..31fd346f96 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 @@ -422,7 +422,7 @@ public class JavadocOptionsManager { }
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
@@ -667,7 +667,7 @@ public class JavadocOptionsManager { } catch (IOException e) {
JavaPlugin.log(e);
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
} finally {
if (objectStreamOutput != null) {
try { objectStreamOutput.close(); } catch (IOException e) {}
@@ -908,7 +908,7 @@ public class JavadocOptionsManager { }
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
IJavaProject project= je.getJavaProject();
if (getValidProject(project))
@@ -928,7 +928,7 @@ public class JavadocOptionsManager { }
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
return false;
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 16b02bca14..22d118a9a8 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 @@ public class JavadocProjectContentProvider implements ITreeContentProvider { return getPackageFragments((IPackageFragmentRoot) parentElement);
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return new Object[0];
}
@@ -58,7 +58,7 @@ public class JavadocProjectContentProvider implements ITreeContentProvider { }
}
} 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 4fbf2dad74..ea70d1a88c 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 @@ public class JavadocStandardWizardPage extends JavadocWizardPage { 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 @@ public class JavadocStandardWizardPage extends JavadocWizardPage { 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 @@ public class JavadocStandardWizardPage extends JavadocWizardPage { 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 944e5f61c7..63fff365d2 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 @@ public class JavadocTreeWizardPage extends JavadocWizardPage { try {
setTreeChecked(fStore.getSelectedElements(), fStore.getJavaProject());
} catch(JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
fInputGroup.aboutToOpen();
@@ -437,7 +437,7 @@ public class JavadocTreeWizardPage extends JavadocWizardPage { }
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return buf.toString();
}
@@ -461,7 +461,7 @@ public class JavadocTreeWizardPage extends JavadocWizardPage { 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 a734523a3d..d0a4b4f503 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 @@ public class JavadocWizard extends Wizard implements IExportWizard { if (!executeJavadocGeneration(args))
return false;
} catch(CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
return false;
}
@@ -197,7 +197,7 @@ public class JavadocWizard extends Wizard implements IExportWizard { DebugPlugin.getDefault().getLaunchManager().addLaunch(newLaunch);
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return true;
@@ -220,7 +220,7 @@ public class JavadocWizard extends Wizard implements IExportWizard { resources.add(elements[i].getCorrespondingResource());
}
} catch(JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
} }
@@ -378,7 +378,7 @@ public class JavadocWizard extends Wizard implements IExportWizard { 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 10d6e4695c..d4e439400b 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 @@ public class JavaMarkerAnnotation extends MarkerAnnotation implements IProblemAn 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 e2d8f30b1d..0f24c0d0f4 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 @@ class JavaOutlinePage extends Page implements IContentOutlinePage { 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 @@ class JavaOutlinePage extends Page implements IContentOutlinePage { 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 c394f4c192..30e42417a3 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 @@ public abstract class StructureSelectionAction extends Action { 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 c570f86b11..e0377bed9d 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 @@ -63,7 +63,7 @@ public class PackageExplorerContentProvider extends StandardJavaElementContentPr try { processDelta(event.getDelta()); } catch(JavaModelException e) { - JavaPlugin.logIgnoringNotPresentException(e); + JavaPlugin.log(e); } } 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 55194432f3..f19571459a 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 @@ public class BuildPathsPropertyPage extends PropertyPage implements IStatusChang 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 fe452ba501..a3669668dc 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 @@ public class EditTemplateDialog extends StatusDialog { 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 8b08e6512b..7fe3445e4c 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 @@ -42,7 +42,7 @@ public class JavaElementInfoPage extends PropertyPage { try {
resource= element.getUnderlyingResource();
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
Composite composite= new Composite(parent, SWT.NONE);
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 a7afee47dc..469a607a01 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 @@ public class JavadocConfigurationBlock { 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 346e0a7521..5f39f87f30 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 @@ public class JavadocConfigurationPropertyPage extends PropertyPage implements IS } } } 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 05fc162679..8a2314af80 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 @@ class ClipboardActionUtil { } 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 cae7c5cd4f..c6a39a2cdd 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 @@ public class CopySourceReferencesToClipboardAction extends SourceReferenceAction 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 @@ public class CopySourceReferencesToClipboardAction extends SourceReferenceAction 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 b5d2188c63..d103a90785 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 @@ public class PasteSourceReferencesFromClipboardAction extends SelectionDispatchA 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 b01f1900c7..6505c54037 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 @@ public abstract class ReorgDestinationAction extends SelectionDispatchAction { 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 69e758ee5d..1ea58d2e38 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 @@ public abstract class SourceReferenceAction extends SelectionDispatchAction { }
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 @@ public abstract class SourceReferenceAction extends SelectionDispatchAction { 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 7b2f5aa35b..0a44caac23 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 @@ public class CUCorrectionProposal extends ChangeCorrectionProposal { } } 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 ac49cfb6e2..af7d846503 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 @@ public class ChangeCorrectionProposal implements ICompletionProposal { } 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 @@ public class ChangeCorrectionProposal implements ICompletionProposal { 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 f44765e652..0150bdf298 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 @@ public class CorrectPackageDeclarationProposal extends CUCorrectionProposal { 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 c32707df0f..f780e2db8d 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 @@ public class CorrectionMarkerResolutionGenerator implements IMarkerResolutionGen } } } 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 dbd216624b..96d33d046d 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 @@ public class JavaCorrectionProcessor implements IContentAssistProcessor { //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 6527981dd7..5e441ddc99 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 @@ public class LocalCorrectionsSubProcessor { 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 0d47003bdc..6cac53e919 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 @@ public class NewCUCompletionProposal extends ChangeCorrectionProposal { } 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 22f21208d0..33bef73c31 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 @@ public class NewConstructorCompletionProposal extends CUCorrectionProposal { } 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 99c51aaf71..76ee2f25e3 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 @@ public class NewMethodCompletionProposal extends CUCorrectionProposal { } 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 5cae472488..f9982b68ce 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 @@ public class AnonymousTypeCompletionProposal extends JavaTypeCompletionProposal imageName= JavaPluginImages.IMG_OBJS_INTERFACE;
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
return JavaPluginImages.get(imageName);
@@ -68,7 +68,7 @@ public class AnonymousTypeCompletionProposal extends JavaTypeCompletionProposal 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 253edb29c6..998f131528 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 @@ public class JavaTypeCompletionProposal extends JavaCompletionProposal { 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 2fdfb2d504..7ebd69ecb6 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 @@ public class ProposalInfo { }
}
} 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 58a173f440..c93bf48ef7 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 @@ public class JavaDocCompletionProcessor implements IContentAssistProcessor { 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 1ac2ee53fb..dfb1c70fd7 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 @@ public class MethodsContentProvider implements IStructuredContentProvider, IWork 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 e18a21ba55..23bcd4016c 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 @@ public class MethodsViewer extends ProblemTableViewer { 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 d80cfb8c53..67a94fb3b0 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 @@ public abstract class TypeHierarchyContentProvider implements ITreeContentProvid }
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
@@ -184,7 +184,7 @@ public abstract class TypeHierarchyContentProvider implements ITreeContentProvid }
}
} 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 5128251050..6eac2eb839 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 @@ public class TypeHierarchyLifeCycle implements ITypeHierarchyChangedListener, IE }
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
} else {
processChildrenDelta(delta, changedTypes);
@@ -251,7 +251,7 @@ public class TypeHierarchyLifeCycle implements ITypeHierarchyChangedListener, IE 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 e2203b5ce9..0de3c94fc4 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 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie return;
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
return;
}
}
@@ -406,7 +406,7 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie try {
fHierarchyLifeCycle.ensureRefreshedTypeHierarchy(fInputElement, new BusyIndicatorRunnableContext());
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
clearInput();
return;
}
@@ -1013,7 +1013,7 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie 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 79189a4b72..91aa90bae1 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 @@ public class JavaUIHelp { 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 acaed8a3d2..8dc2cba742 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 @@ -239,7 +239,7 @@ public class OpenTypeHierarchyUtil { default:
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return null;
}
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 0a14409b59..93720382b5 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 @@ public class JavaElementLabels { }
} 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 @@ public class JavaElementLabels { }
} 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 @@ public class JavaElementLabels { }
}
} 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 d88b27eb65..8cbce10614 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 @@ -57,7 +57,7 @@ public class ProblemMarkerManager implements IResourceChangeListener, IAnnotatio return false;
}
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
return false;
}
}
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 5ab0105f59..8d2e9d359e 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 @@ public class NewClassCreationWizard extends NewElementWizard { 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 2de7351257..dea8e855d8 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 @@ public class NewInterfaceCreationWizard extends NewElementWizard { 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 242b46a64a..d49f332369 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 @@ public class NewProjectCreationWizardPage extends JavaCapabilityConfigurationPag 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 ca22e94697..ac59b5e97a 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 @@ public class NewSourceFolderCreationWizard extends NewElementWizard { 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 1288c20a45..5285fed6ce 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 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage { try {
projects= JavaCore.create(fWorkspaceRoot).getJavaProjects();
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
projects= new IJavaProject[0];
}
@@ -476,7 +476,7 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage { 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 3e0025edfa..1a1dc856b5 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 @@ public class BuildPathsBlock { newClassPath= getExistingEntries(classpathEntries);
}
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
if (newClassPath == null) {
newClassPath= getDefaultClassPath(jproject);
@@ -572,7 +572,7 @@ public class BuildPathsBlock { }
}
} 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 d5278215b3..abdb33c50c 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 @@ public class ClasspathContainerDescriptor { 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 b7db7e251a..2b5c73f5da 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 @@ -66,7 +66,7 @@ public class JavaElementContentProvider extends StandardJavaElementContentProvid try {
processDelta(event.getDelta());
} catch(JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
}
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 83cb352935..c76ebc1993 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 @@ public class JavaElementSorter extends ViewerSorter { }
} 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 eb18782cd0..d8705a2190 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.IJavaElement; 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 @@ public class ProblemsLabelDecorator implements ILabelDecorator { 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 1c43631602..2a65b05a4c 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 @@ public class AddGetterSetterAction extends SelectionDispatchAction { 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 @@ public class AddGetterSetterAction extends SelectionDispatchAction { return null; } } catch (JavaModelException e) { - JavaPlugin.logIgnoringNotPresentException(e); + JavaPlugin.log(e); return null; } @@ -541,7 +543,7 @@ public class AddGetterSetterAction extends SelectionDispatchAction { 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 9b1bde2a9f..9a3e67ffb2 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 @@ public class AddUnimplementedConstructorsAction extends SelectionDispatchAction 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 a31830c796..9a9acfc28c 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.core.JavaModelException; 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 @@ public class ModifyParametersAction extends SelectionDispatchAction { 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 31e8e56ee9..a7debfc195 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 @@ public class OpenSuperImplementationAction extends SelectionDispatchAction { } } } 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 c1c641d21d..d16844b818 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 @@ public class OrganizeImportsAction extends SelectionDispatchAction { } } } 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 22aafc021e..e8c6467980 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 @@ public class OverrideMethodsAction extends SelectionDispatchAction { 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 b249e620a4..309b1da55b 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.core.JavaModelException; 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 @@ public class PullUpAction extends SelectionDispatchAction{ 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 e685085fc2..ea43e796a0 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 @@ public class ShowInNavigatorViewAction extends SelectionDispatchAction { 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 @@ public class ShowInNavigatorViewAction extends SelectionDispatchAction { } 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 @@ public class ShowInNavigatorViewAction extends SelectionDispatchAction { } 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 616aefc973..a2be1b03b3 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 @@ public class JarWriter { 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 c11faaa964..1333a6c836 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 @@ public abstract class NewTypeWizardPage extends NewContainerWizardPage { }
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
// ignore this exception now
}
}
@@ -826,7 +826,7 @@ public abstract class NewTypeWizardPage extends NewContainerWizardPage { }
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
// let pass
}
}
@@ -1079,7 +1079,7 @@ public abstract class NewTypeWizardPage extends NewContainerWizardPage { }
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
// let pass, checking is an extra
}
}
@@ -1112,7 +1112,7 @@ public abstract class NewTypeWizardPage extends NewContainerWizardPage { packages= froot.getChildren();
}
} catch (JavaModelException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
if (packages == null) {
packages= new IJavaElement[0];
@@ -1439,7 +1439,7 @@ public abstract class NewTypeWizardPage extends NewContainerWizardPage { return JavaContext.evaluateTemplate(templates[0], parentCU, pos);
}
} catch (CoreException e) {
- JavaPlugin.logIgnoringNotPresentException(e);
+ JavaPlugin.log(e);
}
return null;
}
|