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

5 files changed, 17 insertions, 21 deletions

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java
index 0b27b8d4d2a..9c1aba58ce7 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java
@@ -23,7 +23,6 @@ import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration;
 import org.eclipse.cdt.managedbuilder.core.ITool;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.wizards.CWizardHandler;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.swt.SWT;
@@ -226,7 +225,7 @@ public class ArtifactTab extends AbstractCBuildPropertyTab {
 				}
 			}
 		} catch (CoreException e) {
-			CUIPlugin.getDefault().log(e);
+			ManagedBuilderUIPlugin.log(e);
 		}
 	}
 	
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java
index 820fa783e61..9445c736ff7 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java
@@ -23,7 +23,6 @@ import org.eclipse.cdt.managedbuilder.internal.core.Builder;
 import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
 import org.eclipse.cdt.managedbuilder.internal.core.MultiConfiguration;
 import org.eclipse.cdt.newmake.core.IMakeBuilderInfo;
-import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
 import org.eclipse.cdt.ui.newui.ICPropertyProvider;
 import org.eclipse.core.runtime.CoreException;
@@ -528,7 +527,7 @@ public class BuildBehaviourTab extends AbstractCBuildPropertyTab {
 				icfg.getEditableBuilder().setBuildAttribute(name, value);
 			}
 		} catch (CoreException e) {
-			CUIPlugin.getDefault().log(e);
+			ManagedBuilderUIPlugin.log(e);
 		}		
 	}
 	
@@ -564,7 +563,7 @@ public class BuildBehaviourTab extends AbstractCBuildPropertyTab {
 				}
 			}
 		} catch (CoreException e) {
-			CUIPlugin.getDefault().log(e);
+			ManagedBuilderUIPlugin.log(e);
 		}
 	}
 }
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java
index f71def95e35..ab924a9dc19 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java
@@ -17,7 +17,6 @@ import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration;
 import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
 import org.eclipse.cdt.managedbuilder.internal.core.MultiConfiguration;
-import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.swt.SWT;
@@ -374,7 +373,7 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab {
 				icfg.getEditableBuilder().setUseDefaultBuildCmd(val);
 			}
 		} catch (CoreException e) {
-			CUIPlugin.getDefault().log(e);
+			ManagedBuilderUIPlugin.log(e);
 		}
 	}
 
@@ -439,7 +438,7 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab {
 				icfg.getEditableBuilder().setManagedBuildOn(on);
 			}
 		} catch (CoreException e) {
-			CUIPlugin.getDefault().log(e);
+			ManagedBuilderUIPlugin.log(e);
 		}
 	}
 }
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
index 886f34c8dbc..f0dd52d9f68 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
@@ -227,7 +227,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
  				}
  				if (s == null) s = Messages.getString("DiscoveryTab.3"); //$NON-NLS-1$
  			}
- 			IScannerConfigBuilderInfo2 bi2 = (IScannerConfigBuilderInfo2)m.get(ic);
+ 			IScannerConfigBuilderInfo2 bi2 = m.get(ic);
  			TableItem ti = new TableItem(resTable, SWT.NONE);
  			ti.setText(s);
  			ti.setData("cont", ic); //$NON-NLS-1$
@@ -442,11 +442,11 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
  		Map<CfgInfoContext, IScannerConfigBuilderInfo2> m2 = cbi2.getInfoMap();
  		for (CfgInfoContext ic : m2.keySet()) {
  			if (m1.keySet().contains(ic))  {
- 				IScannerConfigBuilderInfo2 bi1 = (IScannerConfigBuilderInfo2)m1.get(ic);
+ 				IScannerConfigBuilderInfo2 bi1 = m1.get(ic);
  				try { 
  					cbi2.applyInfo(ic, bi1);
  				} catch (CoreException e) {
- 					CUIPlugin.getDefault().log(e);
+					ManagedBuilderUIPlugin.log(e);
  				}
  			} else {
  				CUIPlugin.getDefault().logErrorMessage(Messages.getString("DiscoveryTab.7")); //$NON-NLS-1$
@@ -468,7 +468,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
         String savedId = buildInfo.getSelectedProfileId();
 		for (int i=0; i<realPages.length; i++) {
 			if (realPages != null && realPages[i] != null) {
-				String s = (String)visibleProfilesList.get(i);
+				String s = visibleProfilesList.get(i);
 				buildInfo.setSelectedProfileId(s);
 				realPages[i].performApply();
 				realPages[i].setVisible(false);
@@ -484,7 +484,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
  		List<CfgInfoContext> changedContexts = checkChanges();
  		IProject project = getProject();
  		for(int i = 0; i < changedContexts.size(); i++){
- 			CfgInfoContext c = (CfgInfoContext)changedContexts.get(i);
+ 			CfgInfoContext c = changedContexts.get(i);
  			CfgDiscoveredPathManager.getInstance().removeDiscoveredInfo(project, c);
 // 			MakeCorePlugin.getDefault().getDiscoveryManager().removeDiscoveredInfo(c.getProject(), c);
  		}
@@ -498,12 +498,12 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
 		HashMap<InfoContext, Object> baseCopy = new HashMap<InfoContext, Object>(baseInfoMap);
 		List<CfgInfoContext> list = new ArrayList<CfgInfoContext>();
 		for(Map.Entry<CfgInfoContext, IScannerConfigBuilderInfo2> entry : cfgInfoMap.entrySet()){
-			CfgInfoContext cic = (CfgInfoContext)entry.getKey();
+			CfgInfoContext cic = entry.getKey();
 			InfoContext c = cic.toInfoContext();
 			if(c == null)
 				continue;
 			
-			IScannerConfigBuilderInfo2 changed = (IScannerConfigBuilderInfo2)entry.getValue();
+			IScannerConfigBuilderInfo2 changed = entry.getValue();
 			IScannerConfigBuilderInfo2 old = (IScannerConfigBuilderInfo2)baseCopy.remove(c);
 			
 			if(old == null){
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
index fd8030e7a51..d4c048b0763 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
@@ -37,7 +37,6 @@ import org.eclipse.cdt.managedbuilder.tcmodification.IModificationOperation;
 import org.eclipse.cdt.managedbuilder.tcmodification.IToolChainModificationManager;
 import org.eclipse.cdt.managedbuilder.tcmodification.IToolListModification;
 import org.eclipse.cdt.managedbuilder.tcmodification.IToolModification;
-import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.swt.SWT;
@@ -244,7 +243,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 		Collections.sort(list, BuildListComparator.getInstance());
 
 		int pos = -1;
-		v_tcs = (IToolChain[]) list.toArray(new IToolChain[list.size()]); 
+		v_tcs = list.toArray(new IToolChain[list.size()]); 
 		for (int i=0; i<v_tcs.length; i++) {
 			c_toolchain.add(v_tcs[i].getUniqueRealName());
 			if (v_tcs[i].matches(tc)) pos = i;
@@ -284,7 +283,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 		}
 		bs = null;
 		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++) {
 			c_builder.add(v_bs[i].getUniqueRealName());
 			if (v_bs[i].matches(b)) pos = i;
@@ -417,7 +416,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 			}
 		}
 		Collections.sort(list, BuildListComparator.getInstance());
-		v_tools = (ITool[]) list.toArray(new ITool[list.size()]);
+		v_tools = list.toArray(new ITool[list.size()]);
 		return result;
 	}
 		
@@ -435,7 +434,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 				(IToolListModification)tcmmgr.createModification(cfg, (IFileInfoModification)mod);
 			tlm.apply();
 		} catch (CoreException e) {
-			CUIPlugin.getDefault().log(e);
+			ManagedBuilderUIPlugin.log(e);
 		}
 	}
 	
@@ -510,7 +509,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 		try {
 			mod.apply();
 		} catch (CoreException e) {
-			CUIPlugin.getDefault().log(e);
+			ManagedBuilderUIPlugin.log(e);
 		}
 	}