mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-01 06:05:24 +02:00
Code Issues Wiki Activity

Fix warnings about CUIPlugin.getDefault().log()

Browse source
This commit is contained in:
Anton Leherbauer 2008-03-19 13:25:18 +00:00
parent 7c22f386b8
commit df5acf9f9c
107 changed files with 195 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java
View file

@ -23,7 +23,6 @@ import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration; import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration;
import org.eclipse.cdt.managedbuilder.core.ITool; import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.wizards.CWizardHandler; import org.eclipse.cdt.ui.wizards.CWizardHandler;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
@ -226,7 +225,7 @@ public class ArtifactTab extends AbstractCBuildPropertyTab {
} }
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); ManagedBuilderUIPlugin.log(e);
} }
} }

5
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java
View file

@ -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.Configuration;
import org.eclipse.cdt.managedbuilder.internal.core.MultiConfiguration; import org.eclipse.cdt.managedbuilder.internal.core.MultiConfiguration;
import org.eclipse.cdt.newmake.core.IMakeBuilderInfo; 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.AbstractCPropertyTab;
import org.eclipse.cdt.ui.newui.ICPropertyProvider; import org.eclipse.cdt.ui.newui.ICPropertyProvider;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
@ -528,7 +527,7 @@ public class BuildBehaviourTab extends AbstractCBuildPropertyTab {
icfg.getEditableBuilder().setBuildAttribute(name, value); icfg.getEditableBuilder().setBuildAttribute(name, value);
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); ManagedBuilderUIPlugin.log(e);
} }
} }
@ -564,7 +563,7 @@ public class BuildBehaviourTab extends AbstractCBuildPropertyTab {
} }
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); ManagedBuilderUIPlugin.log(e);
} }
} }
} }

5
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java
View file

@ -17,7 +17,6 @@ import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration; import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration;
import org.eclipse.cdt.managedbuilder.internal.core.Configuration; import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
import org.eclipse.cdt.managedbuilder.internal.core.MultiConfiguration; import org.eclipse.cdt.managedbuilder.internal.core.MultiConfiguration;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
@ -374,7 +373,7 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab {
icfg.getEditableBuilder().setUseDefaultBuildCmd(val); icfg.getEditableBuilder().setUseDefaultBuildCmd(val);
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); ManagedBuilderUIPlugin.log(e);
} }
} }
@ -439,7 +438,7 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab {
icfg.getEditableBuilder().setManagedBuildOn(on); icfg.getEditableBuilder().setManagedBuildOn(on);
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); ManagedBuilderUIPlugin.log(e);
} }
} }
} }

14
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
View file

@ -227,7 +227,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
} }
if (s == null) s = Messages.getString("DiscoveryTab.3"); //$NON-NLS-1$ 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); TableItem ti = new TableItem(resTable, SWT.NONE);
ti.setText(s); ti.setText(s);
ti.setData("cont", ic); //$NON-NLS-1$ ti.setData("cont", ic); //$NON-NLS-1$
@ -442,11 +442,11 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
Map<CfgInfoContext, IScannerConfigBuilderInfo2> m2 = cbi2.getInfoMap(); Map<CfgInfoContext, IScannerConfigBuilderInfo2> m2 = cbi2.getInfoMap();
for (CfgInfoContext ic : m2.keySet()) { for (CfgInfoContext ic : m2.keySet()) {
if (m1.keySet().contains(ic)) { if (m1.keySet().contains(ic)) {
IScannerConfigBuilderInfo2 bi1 = (IScannerConfigBuilderInfo2)m1.get(ic); IScannerConfigBuilderInfo2 bi1 = m1.get(ic);
try { try {
cbi2.applyInfo(ic, bi1); cbi2.applyInfo(ic, bi1);
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); ManagedBuilderUIPlugin.log(e);
} }
} else { } else {
CUIPlugin.getDefault().logErrorMessage(Messages.getString("DiscoveryTab.7")); //$NON-NLS-1$ 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(); String savedId = buildInfo.getSelectedProfileId();
for (int i=0; i<realPages.length; i++) { for (int i=0; i<realPages.length; i++) {
if (realPages != null && realPages[i] != null) { if (realPages != null && realPages[i] != null) {
String s = (String)visibleProfilesList.get(i); String s = visibleProfilesList.get(i);
buildInfo.setSelectedProfileId(s); buildInfo.setSelectedProfileId(s);
realPages[i].performApply(); realPages[i].performApply();
realPages[i].setVisible(false); realPages[i].setVisible(false);
@ -484,7 +484,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
List<CfgInfoContext> changedContexts = checkChanges(); List<CfgInfoContext> changedContexts = checkChanges();
IProject project = getProject(); IProject project = getProject();
for(int i = 0; i < changedContexts.size(); i++){ for(int i = 0; i < changedContexts.size(); i++){
CfgInfoContext c = (CfgInfoContext)changedContexts.get(i); CfgInfoContext c = changedContexts.get(i);
CfgDiscoveredPathManager.getInstance().removeDiscoveredInfo(project, c); CfgDiscoveredPathManager.getInstance().removeDiscoveredInfo(project, c);
// MakeCorePlugin.getDefault().getDiscoveryManager().removeDiscoveredInfo(c.getProject(), c); // MakeCorePlugin.getDefault().getDiscoveryManager().removeDiscoveredInfo(c.getProject(), c);
} }
@ -498,12 +498,12 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
HashMap<InfoContext, Object> baseCopy = new HashMap<InfoContext, Object>(baseInfoMap); HashMap<InfoContext, Object> baseCopy = new HashMap<InfoContext, Object>(baseInfoMap);
List<CfgInfoContext> list = new ArrayList<CfgInfoContext>(); List<CfgInfoContext> list = new ArrayList<CfgInfoContext>();
for(Map.Entry<CfgInfoContext, IScannerConfigBuilderInfo2> entry : cfgInfoMap.entrySet()){ for(Map.Entry<CfgInfoContext, IScannerConfigBuilderInfo2> entry : cfgInfoMap.entrySet()){
CfgInfoContext cic = (CfgInfoContext)entry.getKey(); CfgInfoContext cic = entry.getKey();
InfoContext c = cic.toInfoContext(); InfoContext c = cic.toInfoContext();
if(c == null) if(c == null)
continue; continue;
IScannerConfigBuilderInfo2 changed = (IScannerConfigBuilderInfo2)entry.getValue(); IScannerConfigBuilderInfo2 changed = entry.getValue();
IScannerConfigBuilderInfo2 old = (IScannerConfigBuilderInfo2)baseCopy.remove(c); IScannerConfigBuilderInfo2 old = (IScannerConfigBuilderInfo2)baseCopy.remove(c);
if(old == null){ if(old == null){

11
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
View file

@ -37,7 +37,6 @@ import org.eclipse.cdt.managedbuilder.tcmodification.IModificationOperation;
import org.eclipse.cdt.managedbuilder.tcmodification.IToolChainModificationManager; import org.eclipse.cdt.managedbuilder.tcmodification.IToolChainModificationManager;
import org.eclipse.cdt.managedbuilder.tcmodification.IToolListModification; import org.eclipse.cdt.managedbuilder.tcmodification.IToolListModification;
import org.eclipse.cdt.managedbuilder.tcmodification.IToolModification; import org.eclipse.cdt.managedbuilder.tcmodification.IToolModification;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
@ -244,7 +243,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
Collections.sort(list, BuildListComparator.getInstance()); Collections.sort(list, BuildListComparator.getInstance());
int pos = -1; 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<v_tcs.length; i++) { for (int i=0; i<v_tcs.length; i++) {
c_toolchain.add(v_tcs[i].getUniqueRealName()); c_toolchain.add(v_tcs[i].getUniqueRealName());
if (v_tcs[i].matches(tc)) pos = i; if (v_tcs[i].matches(tc)) pos = i;
@ -284,7 +283,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
} }
bs = null; bs = null;
Collections.sort(list, BuildListComparator.getInstance()); Collections.sort(list, BuildListComparator.getInstance());
v_bs = (IBuilder[])list.toArray(new IBuilder[list.size()]); v_bs = list.toArray(new IBuilder[list.size()]);
for (int i=0; i<v_bs.length; i++) { for (int i=0; i<v_bs.length; i++) {
c_builder.add(v_bs[i].getUniqueRealName()); c_builder.add(v_bs[i].getUniqueRealName());
if (v_bs[i].matches(b)) pos = i; if (v_bs[i].matches(b)) pos = i;
@ -417,7 +416,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
} }
} }
Collections.sort(list, BuildListComparator.getInstance()); Collections.sort(list, BuildListComparator.getInstance());
v_tools = (ITool[]) list.toArray(new ITool[list.size()]); v_tools = list.toArray(new ITool[list.size()]);
return result; return result;
} }
@ -435,7 +434,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
(IToolListModification)tcmmgr.createModification(cfg, (IFileInfoModification)mod); (IToolListModification)tcmmgr.createModification(cfg, (IFileInfoModification)mod);
tlm.apply(); tlm.apply();
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); ManagedBuilderUIPlugin.log(e);
} }
} }
@ -510,7 +509,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
try { try {
mod.apply(); mod.apply();
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); ManagedBuilderUIPlugin.log(e);
} }
} }

2
core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTPluginImages.java
View file

@ -122,7 +122,7 @@ public class DOMASTPluginImages {
try { try {
return new URL(fgIconBaseURL, buffer.toString()); return new URL(fgIconBaseURL, buffer.toString());
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
return null; return null;
} }
} }

2
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/TestGenericTagConfiguration.java
View file

@ -56,7 +56,7 @@ public class TestGenericTagConfiguration extends AbstractGenericTagDocCommentVie
return false; return false;
} }
} catch(BadLocationException ble) { } catch(BadLocationException ble) {
CUIPlugin.getDefault().log(ble); CUIPlugin.log(ble);
} }
return false; return false;
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StubUtility.java
View file

@ -509,7 +509,7 @@ public class StubUtility {
try { try {
projectStore.load(); projectStore.load();
} catch (IOException e) { } catch (IOException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
return projectStore.findTemplateById(id); return projectStore.findTemplateById(id);
} }
@ -557,7 +557,7 @@ public class StubUtility {
try { try {
projectStore.load(); projectStore.load();
} catch (IOException e) { } catch (IOException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
templateDatas= projectStore.getTemplateData(); templateDatas= projectStore.getTemplateData();
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
View file

@ -213,7 +213,7 @@ public class BaseCElementContentProvider implements ITreeContentProvider {
return ((CElementGrouping)element).getChildren(element); return ((CElementGrouping)element).getChildren(element);
} }
} catch (CModelException e) { } catch (CModelException e) {
//CUIPlugin.getDefault().log(e); //CUIPlugin.log(e);
return NO_CHILDREN; return NO_CHILDREN;
} }
return NO_CHILDREN; return NO_CHILDREN;

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
View file

@ -38,7 +38,7 @@ public class CPluginImages {
try { try {
fgIconBaseURL= new URL(CUIPlugin.getDefault().getBundle().getEntry("/"), "icons/" ); //$NON-NLS-1$ //$NON-NLS-2$ fgIconBaseURL= new URL(CUIPlugin.getDefault().getBundle().getEntry("/"), "icons/" ); //$NON-NLS-1$ //$NON-NLS-2$
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
private static final String NAME_PREFIX= CUIPlugin.PLUGIN_ID + '.'; private static final String NAME_PREFIX= CUIPlugin.PLUGIN_ID + '.';
@ -367,7 +367,7 @@ public class CPluginImages {
try { try {
return new URL(fgIconBaseURL, buffer.toString()); return new URL(fgIconBaseURL, buffer.toString());
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
return null; return null;
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CWorkbenchAdapter.java
View file

@ -47,7 +47,7 @@ public class CWorkbenchAdapter implements IWorkbenchAdapter, IActionFilter {
return members; return members;
} }
} catch (CModelException e) { } catch (CModelException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
return fgEmptyArray; return fgEmptyArray;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractUpdateIndexAction.java
View file

@ -57,7 +57,7 @@ public abstract class AbstractUpdateIndexAction implements IObjectActionDelegate
CCorePlugin.getIndexManager().update(tuArray, getUpdateOptions()); CCorePlugin.getIndexManager().update(tuArray, getUpdateOptions());
} }
catch (CoreException e) { catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GoToNextPreviousMemberAction.java
View file

@ -97,7 +97,7 @@ public class GoToNextPreviousMemberAction extends TextEditorAction {
editor.selectAndReveal(next.getSourceRange().getIdStartPos(), 0); editor.selectAndReveal(next.getSourceRange().getIdStartPos(), 0);
} }
} catch (CModelException e) { } catch (CModelException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/IndentAction.java
View file

@ -111,7 +111,7 @@ public class IndentAction extends TextEditorAction {
document.addPosition(end); document.addPosition(end);
} catch (BadLocationException e) { } catch (BadLocationException e) {
// will only happen on concurrent modification // will only happen on concurrent modification
CUIPlugin.getDefault().log(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), IStatus.OK, "", e)); //$NON-NLS-1$ CUIPlugin.log(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), IStatus.OK, "", e)); //$NON-NLS-1$
return; return;
} }
@ -148,7 +148,7 @@ public class IndentAction extends TextEditorAction {
} catch (BadLocationException e) { } catch (BadLocationException e) {
// will only happen on concurrent modification // will only happen on concurrent modification
CUIPlugin.getDefault().log(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), IStatus.OK, "ConcurrentModification in IndentAction", e)); //$NON-NLS-1$ CUIPlugin.log(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), IStatus.OK, "ConcurrentModification in IndentAction", e)); //$NON-NLS-1$
} finally { } finally {
document.removePosition(end); document.removePosition(end);
if (target != null) if (target != null)

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java
View file

@ -100,7 +100,7 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang
try { try {
consoleView = page.showView(IConsoleConstants.ID_CONSOLE_VIEW); consoleView = page.showView(IConsoleConstants.ID_CONSOLE_VIEW);
} catch (PartInitException pie) { } catch (PartInitException pie) {
CUIPlugin.getDefault().log(pie); CUIPlugin.log(pie);
} }
//restore focus stolen by the creation of the //restore focus stolen by the creation of the
// console // console

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java
View file

@ -100,7 +100,7 @@ public class CHContentProvider extends AsyncTreeContentProvider {
} }
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} catch (InterruptedException e) { } catch (InterruptedException e) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CallHierarchyUI.java
View file

@ -189,7 +189,7 @@ public class CallHierarchyUI {
} }
} }
catch (CoreException e) { catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
catch (InterruptedException e) { catch (InterruptedException e) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
@ -229,7 +229,7 @@ public class CallHierarchyUI {
} }
} }
catch (CoreException e) { catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
catch (InterruptedException e) { catch (InterruptedException e) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java
View file

@ -116,7 +116,7 @@ public class CStructureCreator extends StructureCreator {
// build structure // build structure
ast.accept(structureCreator); ast.accept(structureCreator);
} catch (CoreException exc) { } catch (CoreException exc) {
CUIPlugin.getDefault().log(exc); CUIPlugin.log(exc);
} }
return root; return root;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ArchiveFileFilter.java
View file

@ -75,7 +75,7 @@ public class ArchiveFileFilter extends ViewerFilter {
} }
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e.getStatus()); CUIPlugin.log(e.getStatus());
} }
} }
return false; return false;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java
View file

@ -349,7 +349,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor {
containers.add(curr); containers.add(curr);
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
if (defaultPageName != null && containers.isEmpty()) { if (defaultPageName != null && containers.isEmpty()) {

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java
View file

@ -146,7 +146,7 @@ public class CPathProjectsEntryPage extends CPathBasePage {
} }
} }
} catch (CModelException e) { } catch (CModelException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
fProjectsList.setElements(projects); fProjectsList.setElements(projects);
fProjectsList.setCheckedElements(checkedProjects); fProjectsList.setCheckedElements(checkedProjects);

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathPropertyPage.java
View file

@ -153,7 +153,7 @@ public class CPathPropertyPage extends PropertyPage implements IStatusChangeList
try { try {
return proj.hasNature(CProjectNature.C_NATURE_ID); return proj.hasNature(CProjectNature.C_NATURE_ID);
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
return false; return false;
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java
View file

@ -174,7 +174,7 @@ public class IncludesSymbolsPropertyPage extends PropertyPage implements IStatus
try { try {
return proj.hasNature(CProjectNature.C_NATURE_ID); return proj.hasNature(CProjectNature.C_NATURE_ID);
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
return false; return false;
} }
@ -252,7 +252,7 @@ public class IncludesSymbolsPropertyPage extends PropertyPage implements IStatus
try { try {
fIncludesSymbolsBlock.init(getCElement(), fIncludesSymbolsBlock.getRawCPath()); fIncludesSymbolsBlock.init(getCElement(), fIncludesSymbolsBlock.getRawCPath());
} catch (CModelException e) { } catch (CModelException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
View file

@ -154,7 +154,7 @@ public class AddIncludeOnSelectionAction extends Action implements IUpdate {
index = CCorePlugin.getIndexManager().getIndex(tu.getCProject(), IIndexManager.ADD_DEPENDENCIES); index = CCorePlugin.getIndexManager().getIndex(tu.getCProject(), IIndexManager.ADD_DEPENDENCIES);
index.acquireReadLock(); index.acquireReadLock();
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
return; return;
} catch (InterruptedException e) { } catch (InterruptedException e) {
return; return;

10
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
View file

@ -700,9 +700,9 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
event.doit = false; event.doit = false;
} catch (BadLocationException e) { } catch (BadLocationException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} catch (BadPositionCategoryException e) { } catch (BadPositionCategoryException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
@ -733,7 +733,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
level.fSecondPosition.length, level.fSecondPosition.length,
null); null);
} catch (BadLocationException e) { } catch (BadLocationException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
@ -742,7 +742,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
try { try {
document.removePositionCategory(CATEGORY); document.removePositionCategory(CATEGORY);
} catch (BadPositionCategoryException e) { } catch (BadPositionCategoryException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
} }
@ -1677,7 +1677,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
return unit.getElementAtOffset(offset); return unit.getElementAtOffset(offset);
} }
} catch (CModelException x) { } catch (CModelException x) {
CUIPlugin.getDefault().log(x.getStatus()); CUIPlugin.log(x.getStatus());
// nothing found, be tolerant and go on // nothing found, be tolerant and go on
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java
View file

@ -118,7 +118,7 @@ public class DefaultBinaryFileEditor extends AbstractTextEditor {
try { try {
fStorage= new FileStorage(new ByteArrayInputStream(objdump.getOutput()), object.getPath()); fStorage= new FileStorage(new ByteArrayInputStream(objdump.getOutput()), object.getPath());
} catch (IOException exc) { } catch (IOException exc) {
CUIPlugin.getDefault().log(exc); CUIPlugin.log(exc);
} }
} }
} }

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java
View file

@ -460,7 +460,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener {
existingDelimiters.add(curr); existingDelimiters.add(curr);
} }
} catch (BadLocationException e) { } catch (BadLocationException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
if (existingDelimiters.isEmpty()) { if (existingDelimiters.isEmpty()) {
@ -485,10 +485,10 @@ public class DocumentAdapter implements IBuffer, IDocumentListener {
for (int k= 0; k < curr.length(); k++) { for (int k= 0; k < curr.length(); k++) {
buf.append(String.valueOf((int) curr.charAt(k))); buf.append(String.valueOf((int) curr.charAt(k)));
} }
CUIPlugin.getDefault().log(new Exception(buf.toString())); CUIPlugin.log(new Exception(buf.toString()));
} }
} catch (BadLocationException e) { } catch (BadLocationException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java
View file

@ -152,9 +152,9 @@ public class OpenIncludeAction extends Action {
EditorUtility.openInEditor(fileToOpen, include); EditorUtility.openInEditor(fileToOpen, include);
} }
} catch (CModelException e) { } catch (CModelException e) {
CUIPlugin.getDefault().log(e.getStatus()); CUIPlugin.log(e.getStatus());
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e.getStatus()); CUIPlugin.log(e.getStatus());
} }
} }

10
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingPresenter.java
View file

@ -439,10 +439,10 @@ public class SemanticHighlightingPresenter implements ITextPresentationListener,
} }
} catch (BadPositionCategoryException e) { } catch (BadPositionCategoryException e) {
// Should not happen // Should not happen
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} catch (BadLocationException e) { } catch (BadLocationException e) {
// Should not happen // Should not happen
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
// checkOrdering("new positions: ", fPositions); //$NON-NLS-1$ // checkOrdering("new positions: ", fPositions); //$NON-NLS-1$
@ -724,10 +724,10 @@ public class SemanticHighlightingPresenter implements ITextPresentationListener,
document.addPosition(positionCategory, position); document.addPosition(positionCategory, position);
} catch (BadLocationException e) { } catch (BadLocationException e) {
// Should not happen // Should not happen
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} catch (BadPositionCategoryException e) { } catch (BadPositionCategoryException e) {
// Should not happen // Should not happen
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
@ -766,7 +766,7 @@ public class SemanticHighlightingPresenter implements ITextPresentationListener,
document.removePositionCategory(getPositionCategory()); document.removePositionCategory(getPositionCategory());
} catch (BadPositionCategoryException e) { } catch (BadPositionCategoryException e) {
// Should not happen // Should not happen
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingReconciler.java
View file

@ -512,7 +512,7 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
try { try {
oldJob.join(); oldJob.join();
} catch (InterruptedException e) { } catch (InterruptedException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
return Status.CANCEL_STATUS; return Status.CANCEL_STATUS;
} }
} }

12
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java
View file

@ -247,7 +247,7 @@ public class SemanticHighlightings {
try { try {
return ((IField)binding).isStatic(); return ((IField)binding).isStatic();
} catch (DOMException exc) { } catch (DOMException exc) {
CUIPlugin.getDefault().log(exc); CUIPlugin.log(exc);
} catch (Error e) /* PDOMNotImplementedError */ { } catch (Error e) /* PDOMNotImplementedError */ {
// ignore // ignore
} }
@ -477,7 +477,7 @@ public class SemanticHighlightings {
try { try {
return ((ICPPMethod)binding).isStatic(); return ((ICPPMethod)binding).isStatic();
} catch (DOMException exc) { } catch (DOMException exc) {
CUIPlugin.getDefault().log(exc); CUIPlugin.log(exc);
} catch (Error e) /* PDOMNotImplementedError */ { } catch (Error e) /* PDOMNotImplementedError */ {
// ignore // ignore
} }
@ -771,7 +771,7 @@ public class SemanticHighlightings {
return true; return true;
} }
} catch (DOMException exc) { } catch (DOMException exc) {
CUIPlugin.getDefault().log(exc); CUIPlugin.log(exc);
} catch (Error e) /* PDOMNotImplementedError */ { } catch (Error e) /* PDOMNotImplementedError */ {
// ignore // ignore
} }
@ -849,7 +849,7 @@ public class SemanticHighlightings {
return true; return true;
} }
} catch (DOMException exc) { } catch (DOMException exc) {
CUIPlugin.getDefault().log(exc); CUIPlugin.log(exc);
} catch (Error e) /* PDOMNotImplementedError */ { } catch (Error e) /* PDOMNotImplementedError */ {
// ignore // ignore
} }
@ -945,7 +945,7 @@ public class SemanticHighlightings {
return true; return true;
} }
} catch (DOMException exc) { } catch (DOMException exc) {
CUIPlugin.getDefault().log(exc); CUIPlugin.log(exc);
} catch (Error e) /* PDOMNotImplementedError */ { } catch (Error e) /* PDOMNotImplementedError */ {
// ignore // ignore
} }
@ -1746,7 +1746,7 @@ public class SemanticHighlightings {
return true; return true;
} }
} catch (CoreException exc) { } catch (CoreException exc) {
CUIPlugin.getDefault().log(exc.getStatus()); CUIPlugin.log(exc.getStatus());
return false; return false;
} }
} }

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java
View file

@ -163,7 +163,7 @@ public final class ToggleCommentAction extends TextEditorAction {
} catch (BadLocationException x) { } catch (BadLocationException x) {
// should not happen // should not happen
CUIPlugin.getDefault().log(x); CUIPlugin.log(x);
} }
return false; return false;
@ -186,7 +186,7 @@ public final class ToggleCommentAction extends TextEditorAction {
} catch (BadLocationException x) { } catch (BadLocationException x) {
// should not happen // should not happen
CUIPlugin.getDefault().log(x); CUIPlugin.log(x);
} }
return null; return null;
@ -214,7 +214,7 @@ public final class ToggleCommentAction extends TextEditorAction {
} catch (BadLocationException x) { } catch (BadLocationException x) {
// should not happen // should not happen
CUIPlugin.getDefault().log(x); CUIPlugin.log(x);
} }
return -1; return -1;
@ -260,7 +260,7 @@ public final class ToggleCommentAction extends TextEditorAction {
} catch (BadLocationException x) { } catch (BadLocationException x) {
// should not happen // should not happen
CUIPlugin.getDefault().log(x); CUIPlugin.log(x);
} }
return false; return false;

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleSourceAndHeaderAction.java
View file

@ -158,7 +158,7 @@ public class ToggleSourceAndHeaderAction extends TextEditorAction {
} }
} }
} catch (CoreException exc) { } catch (CoreException exc) {
CUIPlugin.getDefault().log(exc.getStatus()); CUIPlugin.log(exc.getStatus());
} }
} }
} }
@ -210,9 +210,9 @@ public class ToggleSourceAndHeaderAction extends TextEditorAction {
try { try {
EditorUtility.openInEditor(partnerUnit); EditorUtility.openInEditor(partnerUnit);
} catch (PartInitException exc) { } catch (PartInitException exc) {
CUIPlugin.getDefault().log(exc.getStatus()); CUIPlugin.log(exc.getStatus());
} catch (CModelException exc) { } catch (CModelException exc) {
CUIPlugin.getDefault().log(exc.getStatus()); CUIPlugin.log(exc.getStatus());
} }
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TranslationUnitAnnotationModelEvent.java
View file

@ -59,7 +59,7 @@ public class TranslationUnitAnnotationModelEvent extends AnnotationModelEvent {
fIncludesProblemMarkerAnnotations= true; fIncludesProblemMarkerAnnotations= true;
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmReconcilingStrategy.java
View file

@ -91,7 +91,7 @@ public class AsmReconcilingStrategy implements IReconcilingStrategy, IReconcilin
// document was modified while parsing // document was modified while parsing
} catch (CModelException e) { } catch (CModelException e) {
IStatus status= new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK, "Error in CDT UI during reconcile", e); //$NON-NLS-1$ 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);
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmSourceViewerConfiguration.java
View file

@ -341,7 +341,7 @@ public class AsmSourceViewerConfiguration extends TextSourceViewerConfiguration
try { try {
return ((ITranslationUnit)element).getLanguage(); return ((ITranslationUnit)element).getLanguage();
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} else { } else {
// compute the language from the plain editor input // compute the language from the plain editor input

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java
View file

@ -343,7 +343,7 @@ public class AsmTextEditor extends TextEditor implements ISelectionChangedListen
return unit.getElementAtOffset(offset); return unit.getElementAtOffset(offset);
} }
} catch (CModelException x) { } catch (CModelException x) {
CUIPlugin.getDefault().log(x.getStatus()); CUIPlugin.log(x.getStatus());
// nothing found, be tolerant and go on // nothing found, be tolerant and go on
} }
} }

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBContentProvider.java
View file

@ -84,7 +84,7 @@ public class IBContentProvider extends AsyncTreeContentProvider {
index= CCorePlugin.getIndexManager().getIndex(scope); index= CCorePlugin.getIndexManager().getIndex(scope);
index.acquireReadLock(); index.acquireReadLock();
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
return NO_CHILDREN; return NO_CHILDREN;
} catch (InterruptedException e) { } catch (InterruptedException e) {
return NO_CHILDREN; return NO_CHILDREN;
@ -127,7 +127,7 @@ public class IBContentProvider extends AsyncTreeContentProvider {
result.add(newnode); result.add(newnode);
} }
catch (CoreException e) { catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
@ -176,7 +176,7 @@ public class IBContentProvider extends AsyncTreeContentProvider {
} }
} }
catch (CoreException e) { catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
return new IIndexInclude[0]; return new IIndexInclude[0];
} }
@ -205,7 +205,7 @@ public class IBContentProvider extends AsyncTreeContentProvider {
} }
} }
catch (CoreException e) { catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
return new IIndexInclude[0]; return new IIndexInclude[0];
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBConversions.java
View file

@ -99,7 +99,7 @@ public class IBConversions {
try { try {
return CoreModelUtil.findTranslationUnitForLocation(path, null); return CoreModelUtil.findTranslationUnitForLocation(path, null);
} catch (CModelException e) { } catch (CModelException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/CountNodeAction.java
View file

@ -130,7 +130,7 @@ public class CountNodeAction extends IndexAction {
} }
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} catch (InterruptedException e) { } catch (InterruptedException e) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
return; return;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexLabelProvider.java
View file

@ -192,7 +192,7 @@ public class IndexLabelProvider extends LabelProvider {
break; break;
} }
} catch (DOMException e) { } catch (DOMException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
else if (element instanceof ICompositeType) else if (element instanceof ICompositeType)

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexView.java
View file

@ -190,7 +190,7 @@ public class IndexView extends ViewPart implements PDOM.IListener, IElementChang
try { try {
return element.getCProjects(); return element.getCProjects();
} catch (CModelException e) { } catch (CModelException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
return new Object[0]; return new Object[0];
} }
} }
@ -236,7 +236,7 @@ public class IndexView extends ViewPart implements PDOM.IListener, IElementChang
} }
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} catch (InterruptedException e) { } catch (InterruptedException e) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} }
@ -305,7 +305,7 @@ public class IndexView extends ViewPart implements PDOM.IListener, IElementChang
pdom.addListener(this); pdom.addListener(this);
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
CoreModel.getDefault().addElementChangedListener(this); CoreModel.getDefault().addElementChangedListener(this);
@ -349,7 +349,7 @@ public class IndexView extends ViewPart implements PDOM.IListener, IElementChang
pdom.removeListener(this); pdom.removeListener(this);
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
CoreModel.getDefault().removeElementChangedListener(this); CoreModel.getDefault().removeElementChangedListener(this);
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/OpenDefinitionAction.java
View file

@ -77,7 +77,7 @@ public class OpenDefinitionAction extends IndexAction {
} }
} }
catch (CoreException e) { catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
catch (InterruptedException e) { catch (InterruptedException e) {
} }
@ -123,7 +123,7 @@ public class OpenDefinitionAction extends IndexAction {
} }
textEditor.selectAndReveal(nodeOffset, nodeLength); textEditor.selectAndReveal(nodeOffset, nodeLength);
} catch (BadLocationException e) { } catch (BadLocationException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
} }

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java
View file

@ -99,7 +99,7 @@ public class FileLanguageMappingPropertyPage extends PropertyPage {
try { try {
createMappingTable(fContents, file); createMappingTable(fContents, file);
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
Link link = new Link(fContents, SWT.NONE); Link link = new Link(fContents, SWT.NONE);
@ -109,7 +109,7 @@ public class FileLanguageMappingPropertyPage extends PropertyPage {
try { try {
refreshMappings(); refreshMappings();
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
}); });
@ -184,7 +184,7 @@ public class FileLanguageMappingPropertyPage extends PropertyPage {
try { try {
refreshMappings(); refreshMappings();
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java
View file

@ -53,7 +53,7 @@ public class OpenCElementAction extends OpenFileAction {
EditorUtility.revealInEditor(part, fOpenElement); EditorUtility.revealInEditor(part, fOpenElement);
} }
} catch (CoreException exc) { } catch (CoreException exc) {
CUIPlugin.getDefault().log(exc.getStatus()); CUIPlugin.log(exc.getStatus());
} }
} else { } else {
super.run(); super.run();

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java
View file

@ -821,7 +821,7 @@ class CEditorColoringConfigurationBlock extends AbstractConfigurationBlock {
buffer.append(separator); buffer.append(separator);
} }
} catch (IOException io) { } catch (IOException io) {
CUIPlugin.getDefault().log(io); CUIPlugin.log(io);
} finally { } finally {
if (reader != null) { if (reader != null) {
try { reader.close(); } catch (IOException e) {} try { reader.close(); } catch (IOException e) {}
@ -906,7 +906,7 @@ class CEditorColoringConfigurationBlock extends AbstractConfigurationBlock {
int offset= document.getLineOffset(line) + column; int offset= document.getLineOffset(line) + column;
return new HighlightedRange(offset, length, key); return new HighlightedRange(offset, length, key);
} catch (BadLocationException x) { } catch (BadLocationException x) {
CUIPlugin.getDefault().log(x); CUIPlugin.log(x);
} }
return null; return null;
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateBlock.java
View file

@ -316,7 +316,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock {
try { try {
fTemplateStore.load(); fTemplateStore.load();
} catch (IOException e) { } catch (IOException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
fTemplateProcessor= new TemplateVariableProcessor(); fTemplateProcessor= new TemplateVariableProcessor();
@ -793,7 +793,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock {
try { try {
fTemplateStore.save(); fTemplateStore.save();
} catch (IOException e) { } catch (IOException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
openWriteErrorDialog(); openWriteErrorDialog();
} }
return true; return true;

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingConfigurationBlock.java
View file

@ -273,7 +273,7 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock {
if (desc == null) { if (desc == null) {
// safety in case there is no such descriptor // safety in case there is no such descriptor
String message= PreferencesMessages.FoldingConfigurationBlock_error_not_exist; String message= PreferencesMessages.FoldingConfigurationBlock_error_not_exist;
CUIPlugin.getDefault().log(new Status(IStatus.WARNING, CUIPlugin.getPluginId(), IStatus.OK, message, null)); CUIPlugin.log(new Status(IStatus.WARNING, CUIPlugin.getPluginId(), IStatus.OK, message, null));
prefs= new ErrorPreferences(message); prefs= new ErrorPreferences(message);
} else { } else {
prefs= (ICFoldingPreferenceBlock) fProviderPreferences.get(id); prefs= (ICFoldingPreferenceBlock) fProviderPreferences.get(id);
@ -282,7 +282,7 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock {
prefs= desc.createPreferences(); prefs= desc.createPreferences();
fProviderPreferences.put(id, prefs); fProviderPreferences.put(id, prefs);
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
prefs= new ErrorPreferences(e.getLocalizedMessage()); prefs= new ErrorPreferences(e.getLocalizedMessage());
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java
View file

@ -743,7 +743,7 @@ public abstract class OptionsConfigurationBlock {
try { try {
fManager.applyChanges(); fManager.applyChanges();
} catch (BackingStoreException e) { } catch (BackingStoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
return false; return false;
} }
if (doBuild) { if (doBuild) {

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProposalFilterPreferencesUtil.java
View file

@ -63,7 +63,7 @@ public class ProposalFilterPreferencesUtil {
} }
} catch (InvalidRegistryObjectException e) { } catch (InvalidRegistryObjectException e) {
// No action required since we will at least be using the fail-safe default filter // No action required since we will at least be using the fail-safe default filter
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
String[] filterNames = (String[]) names String[] filterNames = (String[]) names
.toArray(new String[names.size()]); .toArray(new String[names.size()]);

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/LineWrappingTabPage.java
View file

@ -749,7 +749,7 @@ public class LineWrappingTabPage extends FormatterTabPage {
changeForceSplit(currentKey, forceSplit); changeForceSplit(currentKey, forceSplit);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
fWorkingValues.put(currentKey, DefaultCodeFormatterConstants.createAlignmentValue(forceSplit, DefaultCodeFormatterConstants.WRAP_NO_SPLIT, DefaultCodeFormatterConstants.INDENT_DEFAULT)); fWorkingValues.put(currentKey, DefaultCodeFormatterConstants.createAlignmentValue(forceSplit, DefaultCodeFormatterConstants.WRAP_NO_SPLIT, DefaultCodeFormatterConstants.INDENT_DEFAULT));
CUIPlugin.getDefault().log(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), IStatus.OK, CUIPlugin.log(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), IStatus.OK,
Messages.format(FormatterMessages.LineWrappingTabPage_error_invalid_value, currentKey), e)); Messages.format(FormatterMessages.LineWrappingTabPage_error_invalid_value, currentKey), e));
} }
} }
@ -773,7 +773,7 @@ public class LineWrappingTabPage extends FormatterTabPage {
changeWrappingStyle(currentKey, wrappingStyle); changeWrappingStyle(currentKey, wrappingStyle);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
fWorkingValues.put(currentKey, DefaultCodeFormatterConstants.createAlignmentValue(false, wrappingStyle, DefaultCodeFormatterConstants.INDENT_DEFAULT)); fWorkingValues.put(currentKey, DefaultCodeFormatterConstants.createAlignmentValue(false, wrappingStyle, DefaultCodeFormatterConstants.INDENT_DEFAULT));
CUIPlugin.getDefault().log(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), IStatus.OK, CUIPlugin.log(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), IStatus.OK,
Messages.format(FormatterMessages.LineWrappingTabPage_error_invalid_value, currentKey), e)); Messages.format(FormatterMessages.LineWrappingTabPage_error_invalid_value, currentKey), e));
} }
} }
@ -797,7 +797,7 @@ public class LineWrappingTabPage extends FormatterTabPage {
changeIndentStyle(currentKey, indentStyle); changeIndentStyle(currentKey, indentStyle);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
fWorkingValues.put(currentKey, DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NO_SPLIT, indentStyle)); fWorkingValues.put(currentKey, DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NO_SPLIT, indentStyle));
CUIPlugin.getDefault().log(new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK, CUIPlugin.log(new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK,
Messages.format(FormatterMessages.LineWrappingTabPage_error_invalid_value, currentKey), e)); Messages.format(FormatterMessages.LineWrappingTabPage_error_invalid_value, currentKey), e));
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java
View file

@ -431,7 +431,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage {
fSelected= Integer.parseInt(s); fSelected= Integer.parseInt(s);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
final String message= Messages.format(FormatterMessages.ModifyDialogTabPage_NumberPreference_error_invalid_key, getKey()); final String message= Messages.format(FormatterMessages.ModifyDialogTabPage_NumberPreference_error_invalid_key, getKey());
CUIPlugin.getDefault().log(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), IStatus.OK, message, e)); CUIPlugin.log(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), IStatus.OK, message, e));
s= ""; //$NON-NLS-1$ s= ""; //$NON-NLS-1$
} }
fNumberText.setText(s); fNumberText.setText(s);

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileConfigurationBlock.java
View file

@ -74,7 +74,7 @@ public abstract class ProfileConfigurationBlock {
fProfileStore.writeProfiles(fProfileManager.getSortedProfiles(), fInstanceScope); // update profile store fProfileStore.writeProfiles(fProfileManager.getSortedProfiles(), fInstanceScope); // update profile store
fProfileManager.commitChanges(fCurrContext); fProfileManager.commitChanges(fCurrContext);
} catch (CoreException x) { } catch (CoreException x) {
CUIPlugin.getDefault().log(x); CUIPlugin.log(x);
} }
break; break;
case ProfileManager.SELECTION_CHANGED_EVENT: case ProfileManager.SELECTION_CHANGED_EVENT:
@ -279,14 +279,14 @@ public abstract class ProfileConfigurationBlock {
try { try {
profiles= fProfileStore.readProfiles(fInstanceScope); profiles= fProfileStore.readProfiles(fInstanceScope);
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
if (profiles == null) { if (profiles == null) {
try { try {
// bug 129427 // bug 129427
profiles= fProfileStore.readProfiles(new DefaultScope()); profiles= fProfileStore.readProfiles(new DefaultScope());
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
@ -416,7 +416,7 @@ public abstract class ProfileConfigurationBlock {
fInstanceScope.getNode(CCorePlugin.PLUGIN_ID).flush(); fInstanceScope.getNode(CCorePlugin.PLUGIN_ID).flush();
} }
} catch (BackingStoreException e) { } catch (BackingStoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/SnippetPreview.java
View file

@ -76,7 +76,7 @@ public class SnippetPreview extends CPreview {
} catch (Exception e) { } catch (Exception e) {
final IStatus status= new Status(IStatus.ERROR, CUIPlugin.getPluginId(), ICStatusConstants.INTERNAL_ERROR, final IStatus status= new Status(IStatus.ERROR, CUIPlugin.getPluginId(), ICStatusConstants.INTERNAL_ERROR,
FormatterMessages.CPreview_formatter_exception, e); FormatterMessages.CPreview_formatter_exception, e);
CUIPlugin.getDefault().log(status); CUIPlugin.log(status);
continue; continue;
} }
buffer.append(delimiter); buffer.append(delimiter);

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/TranslationUnitPreview.java
View file

@ -71,7 +71,7 @@ public class TranslationUnitPreview extends CPreview {
} catch (Exception e) { } catch (Exception e) {
final IStatus status= new Status(IStatus.ERROR, CUIPlugin.getPluginId(), ICStatusConstants.INTERNAL_ERROR, final IStatus status= new Status(IStatus.ERROR, CUIPlugin.getPluginId(), ICStatusConstants.INTERNAL_ERROR,
FormatterMessages.CPreview_formatter_exception, e); FormatterMessages.CPreview_formatter_exception, e);
CUIPlugin.getDefault().log(status); CUIPlugin.log(status);
} finally { } finally {
context.dispose(); context.dispose();
fSourceViewer.setRedraw(true); fSourceViewer.setRedraw(true);

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/MethodContext.java
View file

@ -73,7 +73,7 @@ public class MethodContext {
try { try {
label.setVisibility(member.getVisibility()); label.setVisibility(member.getVisibility());
} catch (DOMException e) { } catch (DOMException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
return label; return label;
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringRunner.java
View file

@ -51,7 +51,7 @@ public class ExtractConstantRefactoringRunner extends RefactoringRunner {
} catch (InterruptedException e) { } catch (InterruptedException e) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java
View file

@ -1158,7 +1158,7 @@ public class ASTManager {
try { try {
conflicting= findInScope(scope, fRenameTo, true); conflicting= findInScope(scope, fRenameTo, true);
} catch (Exception e) { } catch (Exception e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
if (conflicting != null && conflicting.length > 0) { if (conflicting != null && conflicting.length > 0) {
fConflictingBinding.addAll(Arrays.asList(conflicting)); fConflictingBinding.addAll(Arrays.asList(conflicting));

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/FileContentHelper.java
View file

@ -51,9 +51,9 @@ public class FileContentHelper {
return new String(bytes); return new String(bytes);
} catch (IOException e) { } catch (IOException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
return ""; //$NON-NLS-1$ return ""; //$NON-NLS-1$
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchQuery.java
View file

@ -82,7 +82,7 @@ public abstract class PDOMSearchQuery implements ISearchQuery {
projects = projectMap.values().toArray(new ICProject[projectMap.size()]); projects = projectMap.values().toArray(new ICProject[projectMap.size()]);
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchResult.java
View file

@ -127,7 +127,7 @@ public class PDOMSearchResult extends AbstractTextSearchResult implements IEdito
if (filename != null) if (filename != null)
return computeContainedMatches(result, filename); return computeContainedMatches(result, filename);
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
return new Match[0]; return new Match[0];
} }
@ -137,7 +137,7 @@ public class PDOMSearchResult extends AbstractTextSearchResult implements IEdito
String filename = file.getLocation().toOSString(); String filename = file.getLocation().toOSString();
return computeContainedMatches(result, filename); return computeContainedMatches(result, filename);
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
return new Match[0]; return new Match[0];
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchViewPage.java
View file

@ -154,7 +154,7 @@ public class PDOMSearchViewPage extends AbstractTextSearchViewPage {
textEditor.selectAndReveal(currentOffset, currentLength); textEditor.selectAndReveal(currentOffset, currentLength);
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java
View file

@ -390,7 +390,7 @@ public abstract class AbstractInformationControl extends PopupDialog implements
if (part != null && selectedElement instanceof ICElement) if (part != null && selectedElement instanceof ICElement)
EditorUtility.revealInEditor(part, (ICElement) selectedElement); EditorUtility.revealInEditor(part, (ICElement) selectedElement);
} catch (CoreException ex) { } catch (CoreException ex) {
CUIPlugin.getDefault().log(ex); CUIPlugin.log(ex);
} }
} }
} }

16
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CAutoIndentStrategy.java
View file

@ -197,7 +197,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy {
} }
} }
} catch (BadLocationException e) { } catch (BadLocationException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
@ -240,7 +240,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy {
} }
} catch (BadLocationException e) { } catch (BadLocationException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
@ -342,7 +342,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy {
c.text = buf.toString(); c.text = buf.toString();
} catch (BadLocationException e) { } catch (BadLocationException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
@ -639,7 +639,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy {
command.length= newLength; command.length= newLength;
command.text= newText; command.text= newText;
} catch (BadLocationException e) { } catch (BadLocationException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
@ -1028,7 +1028,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy {
return; return;
} }
} catch (BadLocationException e) { } catch (BadLocationException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
@ -1094,7 +1094,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy {
return; return;
} catch (BadLocationException e) { } catch (BadLocationException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
@ -1110,7 +1110,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy {
} }
} }
} catch (BadLocationException e) { } catch (BadLocationException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
@ -1184,7 +1184,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy {
char[] buffer = contents.toString().toCharArray(); char[] buffer = contents.toString().toCharArray();
return new CompilationUnitInfo(buffer, sourceRange.getOffset() - methodOffset); return new CompilationUnitInfo(buffer, sourceRange.getOffset() - methodOffset);
} catch (BadLocationException e) { } catch (BadLocationException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
return null; return null;

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CFormattingStrategy.java
View file

@ -68,11 +68,11 @@ public class CFormattingStrategy extends ContextBasedFormattingStrategy {
edit.apply(document); edit.apply(document);
} catch (MalformedTreeException exception) { } catch (MalformedTreeException exception) {
CUIPlugin.getDefault().log(exception); CUIPlugin.log(exception);
} catch (BadLocationException exception) { } catch (BadLocationException exception) {
// Can only happen on concurrent document modification - log and // Can only happen on concurrent document modification - log and
// bail out // bail out
CUIPlugin.getDefault().log(exception); CUIPlugin.log(exception);
} }
} }
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java
View file

@ -130,7 +130,7 @@ public class CReconcilingStrategy implements IReconcilingStrategy, IReconcilingS
// document was modified while parsing // document was modified while parsing
} catch (CModelException e) { } catch (CModelException e) {
IStatus status= new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK, "Error in CDT UI during reconcile", e); //$NON-NLS-1$ 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 { } finally {
if (computeAST) { if (computeAST) {
IIndex index= null; IIndex index= null;
@ -150,7 +150,7 @@ public class CReconcilingStrategy implements IReconcilingStrategy, IReconcilingS
} }
} catch(Exception e) { } catch(Exception e) {
IStatus status= new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK, "Error in CDT UI during reconcile", e); //$NON-NLS-1$ 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 { } finally {
if (index != null) { if (index != null) {
index.releaseReadLock(); index.releaseReadLock();

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTMLTextPresenter.java
View file

@ -154,7 +154,7 @@ public class HTMLTextPresenter implements DefaultInformationControl.IInformation
} catch (IOException e) { } catch (IOException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
return null; return null;
} finally { } finally {

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java
View file

@ -110,7 +110,7 @@ public class CEditorTextHoverDescriptor implements Comparable {
try { try {
return (ICEditorTextHover)fElement.createExecutableExtension(CLASS_ATTRIBUTE); return (ICEditorTextHover)fElement.createExecutableExtension(CLASS_ATTRIBUTE);
} catch (CoreException x) { } 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$
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java
View file

@ -258,7 +258,7 @@ public class CMacroExpansionExplorationControl extends AbstractCompareViewerInfo
} }
dispose(); dispose();
} catch (PartInitException exc) { } catch (PartInitException exc) {
CUIPlugin.getDefault().log(exc); CUIPlugin.log(exc);
} }
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java
View file

@ -790,7 +790,7 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
if (reader != null) if (reader != null)
reader.close(); reader.close();
} catch (IOException ex) { } catch (IOException ex) {
CUIPlugin.getDefault().log(ex); CUIPlugin.log(ex);
} }
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/ProjectMap.java
View file

@ -59,7 +59,7 @@ class ProjectMap {
try { try {
fMap= load(project); fMap= load(project);
} catch(CoreException ce) { } catch(CoreException ce) {
CUIPlugin.getDefault().log(ce); CUIPlugin.log(ce);
fMap= new HashMap<IPath, String>(); fMap= new HashMap<IPath, String>();
} }
fProject= project; fProject= project;
@ -106,7 +106,7 @@ class ProjectMap {
try { try {
save(); save();
} catch(CoreException ce) { } catch(CoreException ce) {
CUIPlugin.getDefault().log(ce); CUIPlugin.log(ce);
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/CFoldingStructureProviderRegistry.java
View file

@ -78,7 +78,7 @@ public class CFoldingStructureProviderRegistry {
try { try {
return desc.createProvider(); return desc.createProvider();
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
return null; return null;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingEngine.java
View file

@ -145,7 +145,7 @@ public class CSpellingEngine extends SpellingEngine {
} }
} }
} catch (BadLocationException x) { } catch (BadLocationException x) {
CUIPlugin.getDefault().log(x); CUIPlugin.log(x);
} }
} finally { } finally {
if(toRemove!=null) if(toRemove!=null)

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckEngine.java
View file

@ -72,7 +72,7 @@ public class SpellCheckEngine implements ISpellCheckEngine, IPropertyChangeListe
if (location == null) if (location == null)
return fgLocalesWithInstalledDictionaries= Collections.EMPTY_SET; return fgLocalesWithInstalledDictionaries= Collections.EMPTY_SET;
} catch (MalformedURLException ex) { } catch (MalformedURLException ex) {
CUIPlugin.getDefault().log(ex); CUIPlugin.log(ex);
return fgLocalesWithInstalledDictionaries= Collections.EMPTY_SET; return fgLocalesWithInstalledDictionaries= Collections.EMPTY_SET;
} }
@ -86,7 +86,7 @@ public class SpellCheckEngine implements ISpellCheckEngine, IPropertyChangeListe
if (fileNames == null) if (fileNames == null)
return fgLocalesWithInstalledDictionaries= Collections.EMPTY_SET; return fgLocalesWithInstalledDictionaries= Collections.EMPTY_SET;
} catch (IOException ex) { } catch (IOException ex) {
CUIPlugin.getDefault().log(ex); CUIPlugin.log(ex);
return fgLocalesWithInstalledDictionaries= Collections.EMPTY_SET; return fgLocalesWithInstalledDictionaries= Collections.EMPTY_SET;
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCompletionProposalComputer.java
View file

@ -91,7 +91,7 @@ public final class WordCompletionProposalComputer implements ICompletionProposal
} }
} catch (BadLocationException exception) { } catch (BadLocationException exception) {
// log & ignore // log & ignore
CUIPlugin.getDefault().log(exception); CUIPlugin.log(exception);
} }
} }
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;

10
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java
View file

@ -495,7 +495,7 @@ public abstract class AbstractSpellDictionary implements ISpellDictionary {
String message= Messages.bind(Messages.AbstractSpellingDictionary_encodingError, String message= Messages.bind(Messages.AbstractSpellingDictionary_encodingError,
new String[] { word, decoder.replacement(), url.toString() }); new String[] { word, decoder.replacement(), url.toString() });
IStatus status= new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK, message, ex); IStatus status= new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK, message, ex);
CUIPlugin.getDefault().log(status); CUIPlugin.log(status);
doRead= word != null; doRead= word != null;
continue; continue;
@ -510,12 +510,12 @@ public abstract class AbstractSpellDictionary implements ISpellDictionary {
String urlString= url.toString(); String urlString= url.toString();
String lowercaseUrlString= urlString.toLowerCase(); String lowercaseUrlString= urlString.toLowerCase();
if (urlString.equals(lowercaseUrlString)) { if (urlString.equals(lowercaseUrlString)) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} else { } else {
try { try {
return load(new URL(lowercaseUrlString)); return load(new URL(lowercaseUrlString));
} catch (MalformedURLException ex) { } catch (MalformedURLException ex) {
CUIPlugin.getDefault().log(ex); CUIPlugin.log(ex);
} }
} }
} catch (IOException exception) { } catch (IOException exception) {
@ -523,9 +523,9 @@ public abstract class AbstractSpellDictionary implements ISpellDictionary {
String message= Messages.bind(Messages.AbstractSpellingDictionary_encodingError, String message= Messages.bind(Messages.AbstractSpellingDictionary_encodingError,
String.valueOf(line), url.toString()); String.valueOf(line), url.toString());
IStatus status= new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK, message, exception); IStatus status= new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK, message, exception);
CUIPlugin.getDefault().log(status); CUIPlugin.log(status);
} else { } else {
CUIPlugin.getDefault().log(exception); CUIPlugin.log(exception);
} }
} finally { } finally {
fMustLoad= false; fMustLoad= false;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/PersistentSpellDictionary.java
View file

@ -73,7 +73,7 @@ public class PersistentSpellDictionary extends AbstractSpellDictionary {
fileStream.write(byteArray, bomCutSize, size - bomCutSize); fileStream.write(byteArray, bomCutSize, size - bomCutSize);
} catch (IOException exception) { } catch (IOException exception) {
CUIPlugin.getDefault().log(exception); CUIPlugin.log(exception);
return; return;
} finally { } finally {
try { try {

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProposal.java
View file

@ -72,7 +72,7 @@ public class TemplateVariableProposal implements ICompletionProposal {
fSelection= new Point(fOffset + variable.length(), 0); fSelection= new Point(fOffset + variable.length(), 0);
} catch (BadLocationException e) { } catch (BadLocationException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
Shell shell= fViewer.getTextWidget().getShell(); Shell shell= fViewer.getTextWidget().getShell();
MessageDialog.openError(shell, TemplateMessages.TemplateVariableProposal_error_title, e.getMessage()); MessageDialog.openError(shell, TemplateMessages.TemplateVariableProposal_error_title, e.getMessage());

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraph.java
View file

@ -137,7 +137,7 @@ class THGraph {
fInputNode= addNode(input); fInputNode= addNode(input);
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
} }
@ -202,9 +202,9 @@ class THGraph {
} }
} catch (DOMException e) { } catch (DOMException e) {
// index bindings should not throw this kind of exception, might as well log it. // index bindings should not throw this kind of exception, might as well log it.
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
} }
@ -252,7 +252,7 @@ class THGraph {
} }
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHierarchyModel.java
View file

@ -165,7 +165,7 @@ class THHierarchyModel {
index.releaseReadLock(); index.releaseReadLock();
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} catch (InterruptedException e) { } catch (InterruptedException e) {
return Status.CANCEL_STATUS; return Status.CANCEL_STATUS;
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java
View file

@ -71,7 +71,7 @@ public class THInformationControl extends AbstractInformationControl implements
try { try {
EditorOpener.open(CUIPlugin.getActivePage(), elem); EditorOpener.open(CUIPlugin.getActivePage(), elem);
} catch (CModelException e) { } catch (CModelException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
} }

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/TypeHierarchyUI.java
View file

@ -94,7 +94,7 @@ public class TypeHierarchyUI {
try { try {
return findInput(project, editorInput, region); return findInput(project, editorInput, region);
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
} }
@ -171,7 +171,7 @@ public class TypeHierarchyUI {
} }
} }
catch (CoreException e) { catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
catch (InterruptedException e) { catch (InterruptedException e) {
} }
@ -204,7 +204,7 @@ public class TypeHierarchyUI {
} }
} }
catch (CoreException e) { catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
catch (InterruptedException e) { catch (InterruptedException e) {
} }
@ -330,7 +330,7 @@ public class TypeHierarchyUI {
return element.getElementName(); return element.getElementName();
} }
} catch (CModelException e) { } catch (CModelException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
return null; return null;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CUIHelp.java
View file

@ -58,7 +58,7 @@ public class CUIHelp {
try { try {
CHelpDisplayContext.displayHelp(fContextId, fEditor); CHelpDisplayContext.displayHelp(fContextId, fEditor);
} catch (CoreException x) { } catch (CoreException x) {
CUIPlugin.getDefault().log(x); CUIPlugin.log(x);
} }
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java
View file

@ -146,7 +146,7 @@ public class EditorUtility {
ISourceRange range= reference.getSourceRange(); ISourceRange range= reference.getSourceRange();
((ITextEditor)part).selectAndReveal(range.getIdStartPos(), range.getIdLength()); ((ITextEditor)part).selectAndReveal(range.getIdStartPos(), range.getIdLength());
} catch (CModelException exc) { } catch (CModelException exc) {
CUIPlugin.getDefault().log(exc.getStatus()); CUIPlugin.log(exc.getStatus());
} }
} }
} }

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExceptionHandler.java
View file

@ -42,7 +42,7 @@ public class ExceptionHandler {
* logged as an error with the error code <code>JavaStatusConstants.INTERNAL_ERROR</code>. * logged as an error with the error code <code>JavaStatusConstants.INTERNAL_ERROR</code>.
*/ */
public static void log(Throwable t, String message) { 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)); CStatusConstants.INTERNAL_ERROR, message, t));
} }
@ -97,7 +97,7 @@ public class ExceptionHandler {
//---- Hooks for subclasses to control exception handling ------------------------------------ //---- Hooks for subclasses to control exception handling ------------------------------------
protected void perform(CoreException e, Shell shell, String title, String message) { protected void perform(CoreException e, Shell shell, String title, String message) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
IStatus status= e.getStatus(); IStatus status= e.getStatus();
if (status != null) { if (status != null) {
ErrorDialog.openError(shell, title, message, status); ErrorDialog.openError(shell, title, message, status);
@ -111,7 +111,7 @@ public class ExceptionHandler {
if (target instanceof CoreException) { if (target instanceof CoreException) {
perform((CoreException)target, shell, title, message); perform((CoreException)target, shell, title, message);
} else { } else {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
if (e.getMessage() != null && e.getMessage().length() > 0) { if (e.getMessage() != null && e.getMessage().length() > 0) {
displayMessageDialog(e, e.getMessage(), shell, title, message); displayMessageDialog(e, e.getMessage(), shell, title, message);
} else { } else {

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/OpenExternalProblemAction.java
View file

@ -60,7 +60,7 @@ public class OpenExternalProblemAction extends ActionDelegate implements IObject
} }
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e.getStatus()); CUIPlugin.log(e.getStatus());
} }
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java
View file

@ -111,7 +111,7 @@ public class ProblemMarkerManager implements IResourceChangeListener, IAnnotatio
if (delta != null) if (delta != null)
delta.accept(new ProjectErrorVisitor(changedElements)); delta.accept(new ProjectErrorVisitor(changedElements));
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e.getStatus()); CUIPlugin.log(e.getStatus());
} }
if (!changedElements.isEmpty()) { if (!changedElements.isEmpty()) {

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/EditorOpener.java
View file

@ -53,7 +53,7 @@ public class EditorOpener {
try { try {
editor= IDE.openEditor(page, file, false); editor= IDE.openEditor(page, file, false);
} catch (PartInitException e) { } catch (PartInitException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
selectRegion(file.getFullPath(), region, timestamp, editor); selectRegion(file.getFullPath(), region, timestamp, editor);
} }
@ -81,7 +81,7 @@ public class EditorOpener {
} }
selectRegion(location, region, timestamp, editor); selectRegion(location, region, timestamp, editor);
} catch (PartInitException e) { } catch (PartInitException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java
View file

@ -319,7 +319,7 @@ public class IndexUI {
try { try {
return CoreModelUtil.findTranslationUnitForLocation(path, cproject); return CoreModelUtil.findTranslationUnitForLocation(path, cproject);
} catch (CModelException e) { } catch (CModelException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
return null; return null;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java
View file

@ -189,7 +189,7 @@ public class ProblemsLabelDecorator implements ILabelDecorator, ILightweightLabe
return 0; return 0;
} }
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
return 0; return 0;
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizard.java
View file

@ -53,7 +53,7 @@ public abstract class NewElementWizard extends Wizard implements INewWizard {
try { try {
IDE.openEditor(activePage, resource, true); IDE.openEditor(activePage, resource, true);
} catch (PartInitException e) { } catch (PartInitException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
}); });

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java
View file

@ -254,9 +254,9 @@ public class NewClassCodeGenerator {
edit.apply(doc); edit.apply(doc);
content= doc.get(); content= doc.get();
} catch (MalformedTreeException exc) { } catch (MalformedTreeException exc) {
CUIPlugin.getDefault().log(exc); CUIPlugin.log(exc);
} catch (BadLocationException exc) { } catch (BadLocationException exc) {
CUIPlugin.getDefault().log(exc); CUIPlugin.log(exc);
} }
} }
return content; return content;
@ -383,7 +383,7 @@ public class NewClassCodeGenerator {
return comment; return comment;
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
return null; return null;

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java
View file

@ -167,7 +167,7 @@ public class NewClassWizardUtil {
folder = roots[0]; folder = roots[0];
} }
} catch (CModelException e) { } catch (CModelException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
if (folder == null) { if (folder == null) {
folder = cproject.findSourceRoot(cproject.getResource()); folder = cproject.findSourceRoot(cproject.getResource());
@ -394,7 +394,7 @@ public class NewClassWizardUtil {
index.acquireReadLock(); index.acquireReadLock();
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
return SEARCH_MATCH_ERROR; return SEARCH_MATCH_ERROR;
} catch (InterruptedException e) { } catch (InterruptedException e) {
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java
View file

@ -342,7 +342,7 @@ public abstract class AbstractFileCreationWizardPage extends NewElementWizardPag
celem = projects[0]; celem = projects[0];
} }
} catch (CModelException e) { } catch (CModelException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
} }
return celem; return celem;
@ -379,7 +379,7 @@ public abstract class AbstractFileCreationWizardPage extends NewElementWizardPag
folder = roots[0]; folder = roots[0];
} }
} catch (CModelException e) { } catch (CModelException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
if (folder == null) { if (folder == null) {
folder = cproject.findSourceRoot(cproject.getResource()); folder = cproject.findSourceRoot(cproject.getResource());

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java
View file

@ -303,7 +303,7 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage {
return; return;
} }
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
fCurrCProject= null; fCurrCProject= null;
} }
fProjectStatus.setError(NewFolderWizardMessages.getString("NewSourceFolderWizardPage.error.NotACProject")); //$NON-NLS-1$ fProjectStatus.setError(NewFolderWizardMessages.getString("NewSourceFolderWizardPage.error.NotACProject")); //$NON-NLS-1$
@ -506,7 +506,7 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage {
try { try {
projects= CoreModel.create(fWorkspaceRoot).getCProjects(); projects= CoreModel.create(fWorkspaceRoot).getCProjects();
} catch (CModelException e) { } catch (CModelException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
projects= new ICProject[0]; projects= new ICProject[0];
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizardPage.java
View file

@ -204,7 +204,7 @@ public class TeamProjectIndexExportWizardPage extends WizardDataTransferPage im
} }
} }
} catch (CModelException e) { } catch (CModelException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
} }
fProjectViewer.setInput(input); fProjectViewer.setInput(input);
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTUIImages.java
View file

@ -70,7 +70,7 @@ public class CDTUIImages {
try { try {
return new URL(iconBaseURL, buffer.toString()); return new URL(iconBaseURL, buffer.toString());
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
return null; return null;
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java
View file

@ -134,7 +134,7 @@ public class CElementContentProvider extends BaseCElementContentProvider impleme
try { try {
processDelta(event.getDelta()); processDelta(event.getDelta());
} catch(CModelException e) { } catch(CModelException e) {
CUIPlugin.getDefault().log(e); CUIPlugin.log(e);
e.printStackTrace(); e.printStackTrace();
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/CustomFiltersActionGroup.java
View file

@ -416,7 +416,7 @@ public class CustomFiltersActionGroup extends ActionGroup {
String id= filterDescs[i].getId(); String id= filterDescs[i].getId();
Boolean isEnabled= new Boolean(filterDescs[i].isEnabled()); Boolean isEnabled= new Boolean(filterDescs[i].isEnabled());
//if (fEnabledFilterIds.containsKey(id)) //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); fEnabledFilterIds.put(id, isEnabled);
fFilterDescriptorMap.put(id, filterDescs[i]); fFilterDescriptorMap.put(id, filterDescs[i]);
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java
View file

@ -161,7 +161,7 @@ public class OpenAction extends SelectionDispatchAction {
boolean activateOnOpen= fEditor != null ? true : OpenStrategy.activateOnOpen(); boolean activateOnOpen= fEditor != null ? true : OpenStrategy.activateOnOpen();
OpenActionUtil.open(element, activateOnOpen); OpenActionUtil.open(element, activateOnOpen);
} catch (CModelException e) { } 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$ ICStatusConstants.INTERNAL_ERROR, ActionMessages.getString("OpenAction.error.message"), e)); //$NON-NLS-1$
ErrorDialog.openError(getShell(), ErrorDialog.openError(getShell(),

Some files were not shown because too many files have changed in this diff Show more