diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java index 0b27b8d4d2a..9c1aba58ce7 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java @@ -23,7 +23,6 @@ import org.eclipse.cdt.managedbuilder.core.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration; import org.eclipse.cdt.managedbuilder.core.ITool; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; -import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.wizards.CWizardHandler; import org.eclipse.core.runtime.CoreException; import org.eclipse.swt.SWT; @@ -226,7 +225,7 @@ public class ArtifactTab extends AbstractCBuildPropertyTab { } } } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + ManagedBuilderUIPlugin.log(e); } } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java index 820fa783e61..9445c736ff7 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java @@ -23,7 +23,6 @@ import org.eclipse.cdt.managedbuilder.internal.core.Builder; import org.eclipse.cdt.managedbuilder.internal.core.Configuration; import org.eclipse.cdt.managedbuilder.internal.core.MultiConfiguration; import org.eclipse.cdt.newmake.core.IMakeBuilderInfo; -import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; import org.eclipse.cdt.ui.newui.ICPropertyProvider; import org.eclipse.core.runtime.CoreException; @@ -528,7 +527,7 @@ public class BuildBehaviourTab extends AbstractCBuildPropertyTab { icfg.getEditableBuilder().setBuildAttribute(name, value); } } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + ManagedBuilderUIPlugin.log(e); } } @@ -564,7 +563,7 @@ public class BuildBehaviourTab extends AbstractCBuildPropertyTab { } } } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + ManagedBuilderUIPlugin.log(e); } } } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java index f71def95e35..ab924a9dc19 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java @@ -17,7 +17,6 @@ import org.eclipse.cdt.managedbuilder.core.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration; import org.eclipse.cdt.managedbuilder.internal.core.Configuration; import org.eclipse.cdt.managedbuilder.internal.core.MultiConfiguration; -import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; import org.eclipse.core.runtime.CoreException; import org.eclipse.swt.SWT; @@ -374,7 +373,7 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab { icfg.getEditableBuilder().setUseDefaultBuildCmd(val); } } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + ManagedBuilderUIPlugin.log(e); } } @@ -439,7 +438,7 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab { icfg.getEditableBuilder().setManagedBuildOn(on); } } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + ManagedBuilderUIPlugin.log(e); } } } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java index 886f34c8dbc..f0dd52d9f68 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java @@ -227,7 +227,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf } if (s == null) s = Messages.getString("DiscoveryTab.3"); //$NON-NLS-1$ } - IScannerConfigBuilderInfo2 bi2 = (IScannerConfigBuilderInfo2)m.get(ic); + IScannerConfigBuilderInfo2 bi2 = m.get(ic); TableItem ti = new TableItem(resTable, SWT.NONE); ti.setText(s); ti.setData("cont", ic); //$NON-NLS-1$ @@ -442,11 +442,11 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf Map m2 = cbi2.getInfoMap(); for (CfgInfoContext ic : m2.keySet()) { if (m1.keySet().contains(ic)) { - IScannerConfigBuilderInfo2 bi1 = (IScannerConfigBuilderInfo2)m1.get(ic); + IScannerConfigBuilderInfo2 bi1 = m1.get(ic); try { cbi2.applyInfo(ic, bi1); } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + ManagedBuilderUIPlugin.log(e); } } else { CUIPlugin.getDefault().logErrorMessage(Messages.getString("DiscoveryTab.7")); //$NON-NLS-1$ @@ -468,7 +468,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf String savedId = buildInfo.getSelectedProfileId(); for (int i=0; i changedContexts = checkChanges(); IProject project = getProject(); for(int i = 0; i < changedContexts.size(); i++){ - CfgInfoContext c = (CfgInfoContext)changedContexts.get(i); + CfgInfoContext c = changedContexts.get(i); CfgDiscoveredPathManager.getInstance().removeDiscoveredInfo(project, c); // MakeCorePlugin.getDefault().getDiscoveryManager().removeDiscoveredInfo(c.getProject(), c); } @@ -498,12 +498,12 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf HashMap baseCopy = new HashMap(baseInfoMap); List list = new ArrayList(); for(Map.Entry entry : cfgInfoMap.entrySet()){ - CfgInfoContext cic = (CfgInfoContext)entry.getKey(); + CfgInfoContext cic = entry.getKey(); InfoContext c = cic.toInfoContext(); if(c == null) continue; - IScannerConfigBuilderInfo2 changed = (IScannerConfigBuilderInfo2)entry.getValue(); + IScannerConfigBuilderInfo2 changed = entry.getValue(); IScannerConfigBuilderInfo2 old = (IScannerConfigBuilderInfo2)baseCopy.remove(c); if(old == null){ diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java index fd8030e7a51..d4c048b0763 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java @@ -37,7 +37,6 @@ import org.eclipse.cdt.managedbuilder.tcmodification.IModificationOperation; import org.eclipse.cdt.managedbuilder.tcmodification.IToolChainModificationManager; import org.eclipse.cdt.managedbuilder.tcmodification.IToolListModification; import org.eclipse.cdt.managedbuilder.tcmodification.IToolModification; -import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.swt.SWT; @@ -244,7 +243,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab { Collections.sort(list, BuildListComparator.getInstance()); int pos = -1; - v_tcs = (IToolChain[]) list.toArray(new IToolChain[list.size()]); + v_tcs = list.toArray(new IToolChain[list.size()]); for (int i=0; i 0) { fConflictingBinding.addAll(Arrays.asList(conflicting)); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/FileContentHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/FileContentHelper.java index 9dc3d6fb923..67aef3d8adb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/FileContentHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/FileContentHelper.java @@ -51,9 +51,9 @@ public class FileContentHelper { return new String(bytes); } catch (IOException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } return ""; //$NON-NLS-1$ } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchQuery.java index 7e1e6b807fa..1fb016a05a1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchQuery.java @@ -82,7 +82,7 @@ public abstract class PDOMSearchQuery implements ISearchQuery { projects = projectMap.values().toArray(new ICProject[projectMap.size()]); } } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchResult.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchResult.java index b282cbe1570..981452cf6c9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchResult.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchResult.java @@ -127,7 +127,7 @@ public class PDOMSearchResult extends AbstractTextSearchResult implements IEdito if (filename != null) return computeContainedMatches(result, filename); } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } return new Match[0]; } @@ -137,7 +137,7 @@ public class PDOMSearchResult extends AbstractTextSearchResult implements IEdito String filename = file.getLocation().toOSString(); return computeContainedMatches(result, filename); } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } return new Match[0]; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchViewPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchViewPage.java index ca53753aa83..ae1c27b8370 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchViewPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchViewPage.java @@ -154,7 +154,7 @@ public class PDOMSearchViewPage extends AbstractTextSearchViewPage { textEditor.selectAndReveal(currentOffset, currentLength); } } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java index 0875e6fccf0..38950814d4f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java @@ -390,7 +390,7 @@ public abstract class AbstractInformationControl extends PopupDialog implements if (part != null && selectedElement instanceof ICElement) EditorUtility.revealInEditor(part, (ICElement) selectedElement); } catch (CoreException ex) { - CUIPlugin.getDefault().log(ex); + CUIPlugin.log(ex); } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CAutoIndentStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CAutoIndentStrategy.java index 9d2e543687c..002cdc22e9f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CAutoIndentStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CAutoIndentStrategy.java @@ -197,7 +197,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy { } } } catch (BadLocationException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } @@ -240,7 +240,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy { } } catch (BadLocationException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } @@ -342,7 +342,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy { c.text = buf.toString(); } catch (BadLocationException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } @@ -639,7 +639,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy { command.length= newLength; command.text= newText; } catch (BadLocationException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } @@ -1028,7 +1028,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy { return; } } catch (BadLocationException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } @@ -1094,7 +1094,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy { return; } catch (BadLocationException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } @@ -1110,7 +1110,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy { } } } catch (BadLocationException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } @@ -1184,7 +1184,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy { char[] buffer = contents.toString().toCharArray(); return new CompilationUnitInfo(buffer, sourceRange.getOffset() - methodOffset); } catch (BadLocationException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } return null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CFormattingStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CFormattingStrategy.java index 77f94724ad0..c0b04441b79 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CFormattingStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CFormattingStrategy.java @@ -68,11 +68,11 @@ public class CFormattingStrategy extends ContextBasedFormattingStrategy { edit.apply(document); } catch (MalformedTreeException exception) { - CUIPlugin.getDefault().log(exception); + CUIPlugin.log(exception); } catch (BadLocationException exception) { // Can only happen on concurrent document modification - log and // bail out - CUIPlugin.getDefault().log(exception); + CUIPlugin.log(exception); } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java index 2398134bbc1..cf1454e1d16 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java @@ -130,7 +130,7 @@ public class CReconcilingStrategy implements IReconcilingStrategy, IReconcilingS // document was modified while parsing } catch (CModelException e) { IStatus status= new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK, "Error in CDT UI during reconcile", e); //$NON-NLS-1$ - CUIPlugin.getDefault().log(status); + CUIPlugin.log(status); } finally { if (computeAST) { IIndex index= null; @@ -150,7 +150,7 @@ public class CReconcilingStrategy implements IReconcilingStrategy, IReconcilingS } } catch(Exception e) { IStatus status= new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK, "Error in CDT UI during reconcile", e); //$NON-NLS-1$ - CUIPlugin.getDefault().log(status); + CUIPlugin.log(status); } finally { if (index != null) { index.releaseReadLock(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTMLTextPresenter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTMLTextPresenter.java index 6479d1f5517..be0164c4af5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTMLTextPresenter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTMLTextPresenter.java @@ -154,7 +154,7 @@ public class HTMLTextPresenter implements DefaultInformationControl.IInformation } catch (IOException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); return null; } finally { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java index 385e4907c4c..a61974b10e1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java @@ -110,7 +110,7 @@ public class CEditorTextHoverDescriptor implements Comparable { try { return (ICEditorTextHover)fElement.createExecutableExtension(CLASS_ATTRIBUTE); } catch (CoreException x) { - CUIPlugin.getDefault().log(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), 0, "CEditorTextHover.createTextHover", null)); //$NON-NLS-1$ + CUIPlugin.log(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), 0, "CEditorTextHover.createTextHover", null)); //$NON-NLS-1$ } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java index 78eac89b8e8..a42caa76d17 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java @@ -258,7 +258,7 @@ public class CMacroExpansionExplorationControl extends AbstractCompareViewerInfo } dispose(); } catch (PartInitException exc) { - CUIPlugin.getDefault().log(exc); + CUIPlugin.log(exc); } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java index 03eb11ee538..b8bd9cd0779 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java @@ -790,7 +790,7 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover if (reader != null) reader.close(); } catch (IOException ex) { - CUIPlugin.getDefault().log(ex); + CUIPlugin.log(ex); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/ProjectMap.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/ProjectMap.java index 03a8f7414b7..8042b044c2e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/ProjectMap.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/ProjectMap.java @@ -59,7 +59,7 @@ class ProjectMap { try { fMap= load(project); } catch(CoreException ce) { - CUIPlugin.getDefault().log(ce); + CUIPlugin.log(ce); fMap= new HashMap(); } fProject= project; @@ -106,7 +106,7 @@ class ProjectMap { try { save(); } catch(CoreException ce) { - CUIPlugin.getDefault().log(ce); + CUIPlugin.log(ce); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/CFoldingStructureProviderRegistry.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/CFoldingStructureProviderRegistry.java index c3e39bba9d5..0676dbb77ee 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/CFoldingStructureProviderRegistry.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/CFoldingStructureProviderRegistry.java @@ -78,7 +78,7 @@ public class CFoldingStructureProviderRegistry { try { return desc.createProvider(); } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } return null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingEngine.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingEngine.java index fd6d75508e1..6e81b20cebe 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingEngine.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingEngine.java @@ -145,7 +145,7 @@ public class CSpellingEngine extends SpellingEngine { } } } catch (BadLocationException x) { - CUIPlugin.getDefault().log(x); + CUIPlugin.log(x); } } finally { if(toRemove!=null) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckEngine.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckEngine.java index 4a8252fbe98..4b6aca30064 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckEngine.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckEngine.java @@ -72,7 +72,7 @@ public class SpellCheckEngine implements ISpellCheckEngine, IPropertyChangeListe if (location == null) return fgLocalesWithInstalledDictionaries= Collections.EMPTY_SET; } catch (MalformedURLException ex) { - CUIPlugin.getDefault().log(ex); + CUIPlugin.log(ex); return fgLocalesWithInstalledDictionaries= Collections.EMPTY_SET; } @@ -86,7 +86,7 @@ public class SpellCheckEngine implements ISpellCheckEngine, IPropertyChangeListe if (fileNames == null) return fgLocalesWithInstalledDictionaries= Collections.EMPTY_SET; } catch (IOException ex) { - CUIPlugin.getDefault().log(ex); + CUIPlugin.log(ex); return fgLocalesWithInstalledDictionaries= Collections.EMPTY_SET; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCompletionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCompletionProposalComputer.java index aaf10588424..29d70b9b134 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCompletionProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCompletionProposalComputer.java @@ -91,7 +91,7 @@ public final class WordCompletionProposalComputer implements ICompletionProposal } } catch (BadLocationException exception) { // log & ignore - CUIPlugin.getDefault().log(exception); + CUIPlugin.log(exception); } } return Collections.EMPTY_LIST; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java index fb179db494a..2e17a745d49 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java @@ -495,7 +495,7 @@ public abstract class AbstractSpellDictionary implements ISpellDictionary { String message= Messages.bind(Messages.AbstractSpellingDictionary_encodingError, new String[] { word, decoder.replacement(), url.toString() }); IStatus status= new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK, message, ex); - CUIPlugin.getDefault().log(status); + CUIPlugin.log(status); doRead= word != null; continue; @@ -510,12 +510,12 @@ public abstract class AbstractSpellDictionary implements ISpellDictionary { String urlString= url.toString(); String lowercaseUrlString= urlString.toLowerCase(); if (urlString.equals(lowercaseUrlString)) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } else { try { return load(new URL(lowercaseUrlString)); } catch (MalformedURLException ex) { - CUIPlugin.getDefault().log(ex); + CUIPlugin.log(ex); } } } catch (IOException exception) { @@ -523,9 +523,9 @@ public abstract class AbstractSpellDictionary implements ISpellDictionary { String message= Messages.bind(Messages.AbstractSpellingDictionary_encodingError, String.valueOf(line), url.toString()); IStatus status= new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK, message, exception); - CUIPlugin.getDefault().log(status); + CUIPlugin.log(status); } else { - CUIPlugin.getDefault().log(exception); + CUIPlugin.log(exception); } } finally { fMustLoad= false; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/PersistentSpellDictionary.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/PersistentSpellDictionary.java index 142ac9e8f7f..f64821834a2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/PersistentSpellDictionary.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/PersistentSpellDictionary.java @@ -73,7 +73,7 @@ public class PersistentSpellDictionary extends AbstractSpellDictionary { fileStream.write(byteArray, bomCutSize, size - bomCutSize); } catch (IOException exception) { - CUIPlugin.getDefault().log(exception); + CUIPlugin.log(exception); return; } finally { try { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProposal.java index 9d1df507c39..0d93fee03ea 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProposal.java @@ -72,7 +72,7 @@ public class TemplateVariableProposal implements ICompletionProposal { fSelection= new Point(fOffset + variable.length(), 0); } catch (BadLocationException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); Shell shell= fViewer.getTextWidget().getShell(); MessageDialog.openError(shell, TemplateMessages.TemplateVariableProposal_error_title, e.getMessage()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraph.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraph.java index 74100d41061..d9398e023ba 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraph.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraph.java @@ -137,7 +137,7 @@ class THGraph { fInputNode= addNode(input); } } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } } @@ -202,9 +202,9 @@ class THGraph { } } catch (DOMException e) { // index bindings should not throw this kind of exception, might as well log it. - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } } @@ -252,7 +252,7 @@ class THGraph { } } } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHierarchyModel.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHierarchyModel.java index a8e6083a2c1..d80bb0843f4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHierarchyModel.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHierarchyModel.java @@ -165,7 +165,7 @@ class THHierarchyModel { index.releaseReadLock(); } } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } catch (InterruptedException e) { return Status.CANCEL_STATUS; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java index 12a60d226ac..17260cd2e56 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java @@ -71,7 +71,7 @@ public class THInformationControl extends AbstractInformationControl implements try { EditorOpener.open(CUIPlugin.getActivePage(), elem); } catch (CModelException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/TypeHierarchyUI.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/TypeHierarchyUI.java index 865c67c3668..9aba5bf59ea 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/TypeHierarchyUI.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/TypeHierarchyUI.java @@ -94,7 +94,7 @@ public class TypeHierarchyUI { try { return findInput(project, editorInput, region); } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } } @@ -171,7 +171,7 @@ public class TypeHierarchyUI { } } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } catch (InterruptedException e) { } @@ -204,7 +204,7 @@ public class TypeHierarchyUI { } } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } catch (InterruptedException e) { } @@ -330,7 +330,7 @@ public class TypeHierarchyUI { return element.getElementName(); } } catch (CModelException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } return null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CUIHelp.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CUIHelp.java index 980498797e5..407acaa812c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CUIHelp.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CUIHelp.java @@ -58,7 +58,7 @@ public class CUIHelp { try { CHelpDisplayContext.displayHelp(fContextId, fEditor); } catch (CoreException x) { - CUIPlugin.getDefault().log(x); + CUIPlugin.log(x); } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java index ece03a2333b..d9d4c527d25 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java @@ -146,7 +146,7 @@ public class EditorUtility { ISourceRange range= reference.getSourceRange(); ((ITextEditor)part).selectAndReveal(range.getIdStartPos(), range.getIdLength()); } catch (CModelException exc) { - CUIPlugin.getDefault().log(exc.getStatus()); + CUIPlugin.log(exc.getStatus()); } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExceptionHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExceptionHandler.java index 55e26c442b5..8a741dbb2dd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExceptionHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExceptionHandler.java @@ -42,7 +42,7 @@ public class ExceptionHandler { * logged as an error with the error code JavaStatusConstants.INTERNAL_ERROR. */ public static void log(Throwable t, String message) { - CUIPlugin.getDefault().log(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), + CUIPlugin.log(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), CStatusConstants.INTERNAL_ERROR, message, t)); } @@ -97,7 +97,7 @@ public class ExceptionHandler { //---- Hooks for subclasses to control exception handling ------------------------------------ protected void perform(CoreException e, Shell shell, String title, String message) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); IStatus status= e.getStatus(); if (status != null) { ErrorDialog.openError(shell, title, message, status); @@ -111,7 +111,7 @@ public class ExceptionHandler { if (target instanceof CoreException) { perform((CoreException)target, shell, title, message); } else { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); if (e.getMessage() != null && e.getMessage().length() > 0) { displayMessageDialog(e, e.getMessage(), shell, title, message); } else { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/OpenExternalProblemAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/OpenExternalProblemAction.java index 40d3235309a..ac9beea6a37 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/OpenExternalProblemAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/OpenExternalProblemAction.java @@ -60,7 +60,7 @@ public class OpenExternalProblemAction extends ActionDelegate implements IObject } } } catch (CoreException e) { - CUIPlugin.getDefault().log(e.getStatus()); + CUIPlugin.log(e.getStatus()); } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java index 6caf6b46ca4..39eed853c6b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java @@ -111,7 +111,7 @@ public class ProblemMarkerManager implements IResourceChangeListener, IAnnotatio if (delta != null) delta.accept(new ProjectErrorVisitor(changedElements)); } catch (CoreException e) { - CUIPlugin.getDefault().log(e.getStatus()); + CUIPlugin.log(e.getStatus()); } if (!changedElements.isEmpty()) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/EditorOpener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/EditorOpener.java index 2b97360f761..a1f108bc289 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/EditorOpener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/EditorOpener.java @@ -53,7 +53,7 @@ public class EditorOpener { try { editor= IDE.openEditor(page, file, false); } catch (PartInitException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } selectRegion(file.getFullPath(), region, timestamp, editor); } @@ -81,7 +81,7 @@ public class EditorOpener { } selectRegion(location, region, timestamp, editor); } catch (PartInitException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java index 2cc1cc8e80c..22acf2669ee 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java @@ -319,7 +319,7 @@ public class IndexUI { try { return CoreModelUtil.findTranslationUnitForLocation(path, cproject); } catch (CModelException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } return null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java index eac225e83d9..2e2e827e276 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java @@ -189,7 +189,7 @@ public class ProblemsLabelDecorator implements ILabelDecorator, ILightweightLabe return 0; } - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } return 0; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizard.java index 8647ca06549..f52f1bb7061 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizard.java @@ -53,7 +53,7 @@ public abstract class NewElementWizard extends Wizard implements INewWizard { try { IDE.openEditor(activePage, resource, true); } catch (PartInitException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } }); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java index f5b5e0a35bd..d13db083145 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java @@ -254,9 +254,9 @@ public class NewClassCodeGenerator { edit.apply(doc); content= doc.get(); } catch (MalformedTreeException exc) { - CUIPlugin.getDefault().log(exc); + CUIPlugin.log(exc); } catch (BadLocationException exc) { - CUIPlugin.getDefault().log(exc); + CUIPlugin.log(exc); } } return content; @@ -383,7 +383,7 @@ public class NewClassCodeGenerator { return comment; } } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } return null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java index 7995b62511f..10d601e27d6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java @@ -167,7 +167,7 @@ public class NewClassWizardUtil { folder = roots[0]; } } catch (CModelException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } if (folder == null) { folder = cproject.findSourceRoot(cproject.getResource()); @@ -394,7 +394,7 @@ public class NewClassWizardUtil { index.acquireReadLock(); } } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); return SEARCH_MATCH_ERROR; } catch (InterruptedException e) { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java index ceee11d4cd4..6bb8d9d9910 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java @@ -342,7 +342,7 @@ public abstract class AbstractFileCreationWizardPage extends NewElementWizardPag celem = projects[0]; } } catch (CModelException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } return celem; @@ -379,7 +379,7 @@ public abstract class AbstractFileCreationWizardPage extends NewElementWizardPag folder = roots[0]; } } catch (CModelException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } if (folder == null) { folder = cproject.findSourceRoot(cproject.getResource()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java index 6e4752d054b..5ee2ac833c5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java @@ -303,7 +303,7 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage { return; } } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); fCurrCProject= null; } fProjectStatus.setError(NewFolderWizardMessages.getString("NewSourceFolderWizardPage.error.NotACProject")); //$NON-NLS-1$ @@ -506,7 +506,7 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage { try { projects= CoreModel.create(fWorkspaceRoot).getCProjects(); } catch (CModelException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); projects= new ICProject[0]; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizardPage.java index 9d814863df6..59d2918a602 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizardPage.java @@ -204,7 +204,7 @@ public class TeamProjectIndexExportWizardPage extends WizardDataTransferPage im } } } catch (CModelException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } fProjectViewer.setInput(input); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTUIImages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTUIImages.java index b4436270969..3da1d693ce3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTUIImages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTUIImages.java @@ -70,7 +70,7 @@ public class CDTUIImages { try { return new URL(iconBaseURL, buffer.toString()); } catch (MalformedURLException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); return null; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java index 77736921c88..ccfc5ade328 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java @@ -134,7 +134,7 @@ public class CElementContentProvider extends BaseCElementContentProvider impleme try { processDelta(event.getDelta()); } catch(CModelException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); e.printStackTrace(); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/CustomFiltersActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/CustomFiltersActionGroup.java index 522f9847463..cd1ef267c15 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/CustomFiltersActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/CustomFiltersActionGroup.java @@ -416,7 +416,7 @@ public class CustomFiltersActionGroup extends ActionGroup { String id= filterDescs[i].getId(); Boolean isEnabled= new Boolean(filterDescs[i].isEnabled()); //if (fEnabledFilterIds.containsKey(id)) - // CUIPlugin.getDefault().log(new Status("WARNING: Duplicate id for extension-point \"org.eclipse.jdt.ui.CElementFilters\"")); //$NON-NLS-1$ + // CUIPlugin.log(new Status("WARNING: Duplicate id for extension-point \"org.eclipse.jdt.ui.CElementFilters\"")); //$NON-NLS-1$ fEnabledFilterIds.put(id, isEnabled); fFilterDescriptorMap.put(id, filterDescs[i]); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java index 16363bcd641..b10b2549878 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java @@ -161,7 +161,7 @@ public class OpenAction extends SelectionDispatchAction { boolean activateOnOpen= fEditor != null ? true : OpenStrategy.activateOnOpen(); OpenActionUtil.open(element, activateOnOpen); } catch (CModelException e) { - CUIPlugin.getDefault().log(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), + CUIPlugin.log(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), ICStatusConstants.INTERNAL_ERROR, ActionMessages.getString("OpenAction.error.message"), e)); //$NON-NLS-1$ ErrorDialog.openError(getShell(), diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java index da870073156..0e153badf07 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java @@ -109,7 +109,7 @@ public class IndexerBlock extends AbstractCOptionPage { fPage= (AbstractIndexerPage) fElement.createExecutableExtension(ATTRIB_CLASS); } catch (Exception e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } if (fPage == null) { fPage= new NullIndexerBlock(); @@ -450,7 +450,7 @@ public class IndexerBlock extends AbstractCOptionPage { try { return configElement.getPage(); } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } return null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java index 4959ba2f7df..3655e4e9f7d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java @@ -57,7 +57,7 @@ public class IndexerOptionPropertyPage extends PropertyPage implements ICOptionC try { optionPage.performApply(new NullProgressMonitor()); } catch (CoreException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } return true; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineConfiguration.java index 13a3c4c84ec..e8b5f5f8e69 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineConfiguration.java @@ -61,7 +61,7 @@ public class DoxygenMultilineConfiguration extends AbstractGenericTagDocCommentV return c == '*' || c == '!'; } } catch(BadLocationException ble) { - CUIPlugin.getDefault().log(ble); + CUIPlugin.log(ble); } return false; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenSingleConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenSingleConfiguration.java index 189829d5150..65c9c8936b5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenSingleConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenSingleConfiguration.java @@ -61,7 +61,7 @@ public class DoxygenSingleConfiguration extends AbstractGenericTagDocCommentView return c == '/' || c == '!'; } } catch(BadLocationException ble) { - CUIPlugin.getDefault().log(ble); + CUIPlugin.log(ble); } return false; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java index 81495d48f55..63c6d291ef3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java @@ -139,7 +139,7 @@ implements IExecutableExtension, IWizardWithMemory existingPath = true; } } catch (CoreException e) { - CUIPlugin.getDefault().log(e.getStatus()); + CUIPlugin.log(e.getStatus()); } savedHandler = fMainPage.h_selected; savedHandler.saveState(); @@ -229,7 +229,7 @@ implements IExecutableExtension, IWizardWithMemory newProject = createIProject(lastProjectName, lastProjectLocation); if (newProject != null) fMainPage.h_selected.createProject(newProject, defaults, onFinish); - } catch (CoreException e) { CUIPlugin.getDefault().log(e); } + } catch (CoreException e) { CUIPlugin.log(e); } } }); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java index a7130890bf8..79b87faf80f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java @@ -206,7 +206,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages; } } } catch (CoreException e) { - CUIPlugin.getDefault().log(e.getStatus()); + CUIPlugin.log(e.getStatus()); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java index d2dafa1553c..b7afc91fc7c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java @@ -489,7 +489,7 @@ public class NewClassCreationWizardPage extends NewElementWizardPage { celem = projects[0]; } } catch (CModelException e) { - CUIPlugin.getDefault().log(e); + CUIPlugin.log(e); } } return celem;