[#592] add Group libraries - fix Activator.log

ilg-ul · ilg-ul · commit 137159f6f038 · 2024-03-19T23:00:33.000+02:00
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.core/src/org/eclipse/embedcdt/managedbuild/cross/core/LibrariesCommandGenerator.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.core/src/org/eclipse/embedcdt/managedbuild/cross/core/LibrariesCommandGenerator.java
@@ -23,8 +23,7 @@
 import org.eclipse.cdt.managedbuilder.core.IOptionCommandGenerator;
 import org.eclipse.cdt.utils.cdtvariables.CdtVariableResolver;
 import org.eclipse.cdt.utils.cdtvariables.IVariableSubstitutor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
+import org.eclipse.embedcdt.internal.managedbuild.cross.core.Activator;
 
 /**
  * An option command generator to group libraries on the GNU linker command line
@@ -58,7 +57,7 @@ public String generateCommand(IOption option, IVariableSubstitutor macroSubstitu
 				}
 			}
 		} catch (BuildException | CdtVariableException e) {
-			Platform.getLog(getClass()).log(Status.error("Error generating libraries command", e)); //$NON-NLS-1$
+			Activator.log("Error generating libraries command" + e); //$NON-NLS-1$
 		}
 		return null; // fallback to default command generator
 	}

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,7 @@`
`23`	`23`	`import org.eclipse.cdt.managedbuilder.core.IOptionCommandGenerator;`
`24`	`24`	`import org.eclipse.cdt.utils.cdtvariables.CdtVariableResolver;`
`25`	`25`	`import org.eclipse.cdt.utils.cdtvariables.IVariableSubstitutor;`
`26`		`-import org.eclipse.core.runtime.Platform;`
`27`		`-import org.eclipse.core.runtime.Status;`
	`26`	`+import org.eclipse.embedcdt.internal.managedbuild.cross.core.Activator;`
`28`	`27`
`29`	`28`	`/**`
`30`	`29`	`* An option command generator to group libraries on the GNU linker command line`
`@@ -58,7 +57,7 @@ public String generateCommand(IOption option, IVariableSubstitutor macroSubstitu`
`58`	`57`	`}`
`59`	`58`	`}`
`60`	`59`	`} catch (BuildException \| CdtVariableException e) {`
`61`		`- Platform.getLog(getClass()).log(Status.error("Error generating libraries command", e)); //$NON-NLS-1$`
	`60`	`+ Activator.log("Error generating libraries command" + e); //$NON-NLS-1$`
`62`	`61`	`}`
`63`	`62`	`return null; // fallback to default command generator`
`64`	`63`	`}`