Replace CCorePlugin.log() with CUIPlugin.log()

core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/ElementSelectionDialog.java

@@ -48,6 +48,7 @@ import org.eclipse.cdt.core.index.IIndexMacro;
 import org.eclipse.cdt.core.index.IndexFilter;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.browser.typeinfo.TypeSelectionDialog;
 
 import org.eclipse.cdt.internal.core.browser.IndexModelUtil;
@@ -326,9 +327,9 @@ public class ElementSelectionDialog extends TypeSelectionDialog {
 					index.releaseReadLock();
 				}
 			} catch(CoreException ce) {
-				CCorePlugin.log(ce);
+				CUIPlugin.log(ce);
 			} catch(InterruptedException ie) {
-				CCorePlugin.log(ie);
+				CUIPlugin.log(ie);
 			}
 		}
 		return types.toArray(new ITypeInfo[types.size()]);

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

@@ -41,7 +41,6 @@ import org.eclipse.ui.texteditor.IUpdate;
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.browser.IQualifiedTypeName;
-import org.eclipse.cdt.core.browser.PathUtil;
 import org.eclipse.cdt.core.browser.QualifiedTypeName;
 import org.eclipse.cdt.core.dom.ast.ICompositeType;
 import org.eclipse.cdt.core.dom.ast.IEnumeration;
@@ -61,6 +60,7 @@ import org.eclipse.cdt.ui.IFunctionSummary;
 import org.eclipse.cdt.ui.IRequiredInclude;
 import org.eclipse.cdt.ui.browser.typeinfo.TypeInfoLabelProvider;
 import org.eclipse.cdt.ui.text.ICHelpInvocationContext;
+import org.eclipse.cdt.utils.PathUtil;
 
 import org.eclipse.cdt.internal.corext.codemanipulation.AddIncludesOperation;
 
@@ -192,7 +192,7 @@ public class AddIncludeOnSelectionAction extends Action implements IUpdate {
 				}
 				return null;
 			} catch (CoreException e) {
-				CCorePlugin.log(e);
+				CUIPlugin.log(e);
 				return null;
 			}
 		}

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

@@ -39,7 +39,6 @@ import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.part.ViewPart;
 
-import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.dom.IPDOMNode;
 import org.eclipse.cdt.core.dom.IPDOMVisitor;
 import org.eclipse.cdt.core.index.IIndex;
@@ -140,7 +139,7 @@ public class IndexView extends ViewPart implements PDOM.IListener, IElementChang
 						}
 					}
 				} catch (CoreException e) {
-					CCorePlugin.log(e);
+					CUIPlugin.log(e);
 				}
 			}
 			else if (element instanceof PDOMLinkage) {

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

@@ -39,7 +39,6 @@ import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.ui.dialogs.PropertyPage;
 
-import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.language.ProjectLanguageConfiguration;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.ILanguage;
@@ -251,7 +250,7 @@ public class FileLanguageMappingPropertyPage extends PropertyPage {
 			findSelection(configuration, selectedLanguage, combo);
 			fContents.layout();
 		} catch (CoreException e) {
-			CCorePlugin.log(e);
+			CUIPlugin.log(e);
 		}
 	}
 	
@@ -343,7 +342,7 @@ public class FileLanguageMappingPropertyPage extends PropertyPage {
 			fHasChanges = false;
 			return true;
 		} catch (CoreException e) {
-			CCorePlugin.log(e);
+			CUIPlugin.log(e);
 			return false;
 		}
 	}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java

@@ -28,7 +28,6 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.ui.dialogs.PropertyPage;
 
-import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.language.ProjectLanguageConfiguration;
 import org.eclipse.cdt.core.language.WorkspaceLanguageConfiguration;
 import org.eclipse.cdt.core.model.CoreModel;
@@ -37,6 +36,7 @@ import org.eclipse.cdt.core.model.ILanguageMappingChangeEvent;
 import org.eclipse.cdt.core.model.ILanguageMappingChangeListener;
 import org.eclipse.cdt.core.model.LanguageManager;
 import org.eclipse.cdt.core.settings.model.ICProjectDescription;
+import org.eclipse.cdt.ui.CUIPlugin;
 
 import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages;
 import org.eclipse.cdt.internal.ui.util.Messages;
@@ -130,7 +130,7 @@ public class ProjectLanguageMappingPropertyPage extends PropertyPage {
 
 			fMappingWidget.setMappings(fMappings.getContentTypeMappings());
 		} catch (CoreException e) {
-			CCorePlugin.log(e);
+			CUIPlugin.log(e);
 		}
 	}
 	
@@ -151,7 +151,7 @@ public class ProjectLanguageMappingPropertyPage extends PropertyPage {
 
 			fInheritedMappingWidget.setMappings(workspaceMappings.getWorkspaceMappings());
 		} catch (CoreException e) {
-			CCorePlugin.log(e);
+			CUIPlugin.log(e);
 		}
 	}
 
@@ -175,7 +175,7 @@ public class ProjectLanguageMappingPropertyPage extends PropertyPage {
 			fMappingWidget.setChanged(false);
 			return true;
 		} catch (CoreException e) {
-			CCorePlugin.log(e);
+			CUIPlugin.log(e);
 			return false;
 		}
 	}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java

@@ -48,6 +48,7 @@ import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.core.model.ISourceRange;
 import org.eclipse.cdt.core.model.ISourceReference;
 import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.cdt.ui.CUIPlugin;
 
 import org.eclipse.cdt.internal.ui.refactoring.utils.SelectionHelper;
 
@@ -79,7 +80,7 @@ public abstract class CRefactoring extends Refactoring {
 				final ISourceRange sourceRange = sourceRef.getSourceRange();
 				this.region = new Region(sourceRange.getIdStartPos(), sourceRange.getIdLength());
 			} catch (CModelException e) {
-				CCorePlugin.log(e);
+				CUIPlugin.log(e);
 			}
 		}
 		else {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/DocumentAdapter.java

@@ -39,7 +39,6 @@ import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentListener;
 import org.eclipse.swt.widgets.Display;
 
-import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.model.BufferChangedEvent;
 import org.eclipse.cdt.core.model.CModelException;
 import org.eclipse.cdt.core.model.IBuffer;
@@ -47,6 +46,7 @@ import org.eclipse.cdt.core.model.IBufferChangedListener;
 import org.eclipse.cdt.core.model.IOpenable;
 import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.core.model.IWorkingCopy;
+import org.eclipse.cdt.ui.CUIPlugin;
 
 import org.eclipse.cdt.internal.core.model.IBufferFactory;
 
@@ -424,7 +424,7 @@ public class DocumentAdapter implements IBuffer, IAdaptable, IDocumentListener {
 						existingDelimiters.add(curr);
 					}
 				} catch (BadLocationException e) {
-					CCorePlugin.log(e);
+					CUIPlugin.log(e);
 				}
 			}
 			if (existingDelimiters.isEmpty()) {
@@ -449,10 +449,10 @@ public class DocumentAdapter implements IBuffer, IAdaptable, IDocumentListener {
 					for (int k= 0; k < curr.length(); k++) {
 						buf.append(String.valueOf((int) curr.charAt(k)));
 					}
-					CCorePlugin.log(new Exception(buf.toString()));
+					CUIPlugin.log(new Exception(buf.toString()));
 				}
 			} catch (BadLocationException e) {
-                CCorePlugin.log(e);
+                CUIPlugin.log(e);
 			}
 		}
 	}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/UndoCTextFileChange.java

@@ -24,12 +24,12 @@ import org.eclipse.text.edits.MalformedTreeException;
 import org.eclipse.text.edits.TextEdit;
 import org.eclipse.text.edits.UndoEdit;
 
-import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.IBuffer;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.core.model.IWorkingCopy;
+import org.eclipse.cdt.ui.CUIPlugin;
 
 /**
  * UndoCTextFileChange that uses a working copy in order to generate CModel events. 
@@ -76,9 +76,9 @@ public class UndoCTextFileChange
         		wc.commit(false, pm);
         		return new UndoCTextFileChange(getName(), file, redo, null, getSaveMode());
         	} catch (MalformedTreeException e) {
-        		CCorePlugin.log(e);
+        		CUIPlugin.log(e);
         	} catch (BadLocationException e) {
-        		CCorePlugin.log(e);
+        		CUIPlugin.log(e);
         	}
         	finally {
         		wc.destroy();

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringArgument.java

@@ -12,7 +12,6 @@ package org.eclipse.cdt.internal.ui.refactoring.rename;
 
 import org.eclipse.core.resources.IFile;
 
-import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.dom.ast.DOMException;
 import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
@@ -33,6 +32,7 @@ import org.eclipse.cdt.core.model.CModelException;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ISourceRange;
 import org.eclipse.cdt.core.model.ISourceReference;
+import org.eclipse.cdt.ui.CUIPlugin;
 
 
 /**
@@ -68,7 +68,7 @@ public class CRefactoringArgument {
 	        	fOffset= sr.getIdStartPos();
 	        	fLength= sr.getIdLength();
 			} catch (CModelException e) {
-				CCorePlugin.log(e);
+				CUIPlugin.log(e);
 			}
         }
     }

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactory.java

@@ -28,6 +28,7 @@ import org.eclipse.ui.ide.IDE;
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.IWorkingCopy;
+import org.eclipse.cdt.ui.CUIPlugin;
 
 
 /**
@@ -91,7 +92,7 @@ public class CRefactory {
 				processor.unlockIndex();
 			}
 		} catch (CoreException e) {
-			CCorePlugin.log(e);
+			CUIPlugin.log(e);
 		} catch (InterruptedException e) {
 			Thread.currentThread().interrupt();
 		}
@@ -122,7 +123,7 @@ public class CRefactory {
         } catch (InterruptedException e) {
 			Thread.currentThread().interrupt();
         } catch (CoreException e) {
-        	CCorePlugin.log(e);
+        	CUIPlugin.log(e);
 		}
 	}
 

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java

@@ -241,7 +241,7 @@ public class OpenDeclarationsAction extends SelectionParseAction implements ASTR
 							}
 						}
 					} catch (RuntimeException e) {
-						CCorePlugin.log(e);
+						CUIPlugin.log(e);
 					}
 				}
 				
@@ -270,7 +270,7 @@ public class OpenDeclarationsAction extends SelectionParseAction implements ASTR
 				}
 				return navigateCElements(elems);
 			} catch (CoreException e) {
-				CCorePlugin.log(e);
+				CUIPlugin.log(e);
 			}
 		}
 		return false;
@@ -492,7 +492,7 @@ public class OpenDeclarationsAction extends SelectionParseAction implements ASTR
 					try {
 						fSelectedText= document.get(reg.getOffset(), reg.getLength());
 					} catch (BadLocationException e) {
-						CCorePlugin.log(e);
+						CUIPlugin.log(e);
 					}
 				}
 			}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentOwnerManager.java

@@ -235,12 +235,12 @@ public class DocCommentOwnerManager {
 						String name= element.getAttribute(ATTRKEY_OWNER_NAME);
 						if(result.put(id, new DocCommentOwner(id, name, multi, single))!=null) {
 							String msg= MessageFormat.format(Messages.DocCommentOwnerManager_DuplicateMapping0, id);
-							CCorePlugin.log(new Status(IStatus.WARNING, CUIPlugin.PLUGIN_ID, msg));
+							CUIPlugin.log(new Status(IStatus.WARNING, CUIPlugin.PLUGIN_ID, msg));
 						}
 					}
 				}
 			} catch(CoreException ce) {
-				CCorePlugin.log(ce);
+				CUIPlugin.log(ce);
 			}
 		}
 

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/EditorReopener.java

@@ -32,7 +32,6 @@ import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.progress.WorkbenchJob;
 
-import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.model.CModelException;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.ICElement;
@@ -63,7 +62,7 @@ public class EditorReopener implements IDocCommentOwnershipListener {
 					reopenEditors(window, parts);
 				}
 			} catch(CoreException ce) {
-				CCorePlugin.log(ce);
+				CUIPlugin.log(ce);
 			}
 		}
 	}
@@ -80,7 +79,7 @@ public class EditorReopener implements IDocCommentOwnershipListener {
 					reopenEditors(window, parts);
 				}
 			} catch(CoreException ce) {
-				CCorePlugin.log(ce);
+				CUIPlugin.log(ce);
 			}
 		}
 	}
@@ -165,9 +164,9 @@ public class EditorReopener implements IDocCommentOwnershipListener {
 						if(oldPart == oldActive)
 							newActive= newPart;
 					} catch(PartInitException pie) {
-						CCorePlugin.log(pie);
+						CUIPlugin.log(pie);
 					} catch(CModelException cme) {
-						CCorePlugin.log(cme);
+						CUIPlugin.log(cme);
 					}
 				}
 

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

@@ -323,14 +323,14 @@ public class TeamProjectIndexExportWizardPage extends  WizardDataTransferPage {
         } catch (InterruptedException e) {
             return false;
         } catch (InvocationTargetException e) {
-            CCorePlugin.log(CCorePlugin.createStatus(Messages.TeamProjectIndexExportWizardPage_errorExporting,
+            CUIPlugin.log(CCorePlugin.createStatus(Messages.TeamProjectIndexExportWizardPage_errorExporting,
             		e.getTargetException()));
             displayErrorDialog(e.getTargetException());
             return false;
         }
 
         if (!status.isOK()) {
-        	CCorePlugin.log(status);
+        	CUIPlugin.log(status);
             ErrorDialog.openError(getContainer().getShell(),
                     getErrorDialogTitle(),
                     null, // no special message

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ExcludeFromBuildAction.java

@@ -33,7 +33,6 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2;
 import org.eclipse.ui.dialogs.ListSelectionDialog;
 
-import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.ICContainer;
 import org.eclipse.cdt.core.model.ICElement;
@@ -128,7 +127,7 @@ implements IWorkbenchWindowPulldownDelegate2, IObjectActionDelegate {
 			ICSourceEntry[] newEntries = CDataUtil.setExcluded(res.getFullPath(), (res instanceof IFolder), exclude, cfg.getSourceEntries());
 			cfg.setSourceEntries(newEntries);
 		} catch (CoreException e) {
-			CCorePlugin.log(e);
+			CUIPlugin.log(e);
 		}					
 	}
 	

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_head_general.java

@@ -20,7 +20,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.dialogs.PropertyPage;
 
-import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.dialogs.DocCommentOwnerBlock;
 import org.eclipse.cdt.ui.dialogs.ICOptionContainer;
 
@@ -57,7 +57,7 @@ public class Page_head_general extends PropertyPage implements ICOptionContainer
 			try {
 				fDocBlock.performApply(new NullProgressMonitor());
 			} catch(CoreException ce) {
-				CCorePlugin.log(ce);
+				CUIPlugin.log(ce);
 			}
 		}
 		return true;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/DefaultMultilineCommentAutoEditStrategy.java

@@ -31,7 +31,6 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 
-import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.dom.ast.ASTVisitor;
 import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
@@ -248,9 +247,9 @@ public class DefaultMultilineCommentAutoEditStrategy implements IAutoEditStrateg
 				return ast;
 			}
 		} catch(CModelException ce) {
-			CCorePlugin.log(ce);
+			CUIPlugin.log(ce);
 		} catch(CoreException ce) {
-			CCorePlugin.log(ce);
+			CUIPlugin.log(ce);
 		}
 		return null;
 	}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenHelper.java

@@ -24,7 +24,6 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.swt.graphics.RGB;
 
-import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.text.doctools.generic.GenericDocTag;
 
@@ -63,7 +62,7 @@ public class DoxygenHelper extends AbstractPreferenceInitializer {
 				fTags= temp.toArray(new GenericDocTag[temp.size()]);
 			} catch(IOException ioe) {
 				fTags= new GenericDocTag[0];
-				CCorePlugin.log(ioe);
+				CUIPlugin.log(ioe);
 			}
 		}
 		return fTags;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java

@@ -11,14 +11,14 @@
 package org.eclipse.cdt.ui.wizards.conversion;
 
  
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.cdt.ui.wizards.NewCProjectWizard;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IWorkbench;
 
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.cdt.ui.wizards.NewCProjectWizard;
+
 /**
  * ConversionWizard  This wizard provides a method by which the user can
  * change the nature of their projects. This class cannot be implemented.  It
@@ -120,7 +120,7 @@ public abstract class ConversionWizard
         try{
             mainPage.doRun(monitor, getProjectID(), getBuildSystemId());
         } catch (CoreException ce){
-            CCorePlugin.log(ce);
+            CUIPlugin.log(ce);
             throw ce;
         } finally{
             doRunEpilogue(monitor);

core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateEngineUI.java

@@ -13,10 +13,10 @@ package org.eclipse.cdt.ui.templateengine;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.templateengine.TemplateEngine;
 import org.eclipse.cdt.core.templateengine.TemplateInfo;
 import org.eclipse.cdt.core.templateengine.TemplateInitializationException;
+import org.eclipse.cdt.ui.CUIPlugin;
 
 /**
  * TemplateEngine is implemented as a Singleton. TemplateEngine is responsible for 
@@ -47,7 +47,7 @@ public class TemplateEngineUI {
 			try {
 				templatesList.add(new Template(info));
 			} catch (TemplateInitializationException tie) {
-				CCorePlugin.log(tie);
+				CUIPlugin.log(tie);
 			}
 		}
 		return templatesList.toArray(new Template[templatesList.size()]);
@@ -71,7 +71,7 @@ public class TemplateEngineUI {
 			try {
 				templatesList.add(new Template(templateInfoArray[i]));
 			} catch (TemplateInitializationException tie) {
-				CCorePlugin.log(tie);
+				CUIPlugin.log(tie);
 			}
 		}
 		return templatesList.toArray(new Template[templatesList.size()]);