Use new ILog.of(...) method instead of Platform.getLog(...)

eclipse-equinox · Jun 27, 2023 · 4e1237e · 4e1237e
1 parent f885ca8
commit 4e1237e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.importexport/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.equinox.p2.ui.importexport;singleton:=true
 Bundle-Version: 1.4.100.qualifier
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.28.0,4.0.0)",
  org.eclipse.equinox.p2.ui,
  org.eclipse.equinox.p2.extensionlocation,
  org.eclipse.equinox.p2.metadata;bundle-version="2.1.0",

diff --git a/...port/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/AbstractWizard.java b/...port/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/AbstractWizard.java
@@ -35,7 +35,7 @@ public boolean performFinish() {
 			// cancelled by user
 			return false;
 		} catch (Exception e) {
-			Platform.getLog(Platform.getBundle(Constants.Bundle_ID)).log(new Status(IStatus.ERROR, Constants.Bundle_ID, e.getMessage(), e));
+			ILog.of(Platform.getBundle(Constants.Bundle_ID)).log(new Status(IStatus.ERROR, Constants.Bundle_ID, e.getMessage(), e));
 			MessageBox messageBox = new MessageBox(this.getShell(), SWT.ICON_ERROR);
 			messageBox.setMessage(e.getMessage() == null ? "Unknown error" : e.getMessage()); //$NON-NLS-1$
 			messageBox.open();

diff --git a/...t/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/StyledErrorDialog.java b/...t/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/StyledErrorDialog.java
@@ -127,13 +127,13 @@ public void linkActivated(HyperlinkEvent event) {
 							prefCommand.executeWithChecks(new ExecutionEvent(prefCommand, para, null, null));
 						}
 					} catch (ExecutionException e) {
-						Platform.getLog(Platform.getBundle(Constants.Bundle_ID)).log(new Status(IStatus.ERROR, Constants.Bundle_ID, e.getMessage(), e));
+						ILog.of(Platform.getBundle(Constants.Bundle_ID)).log(new Status(IStatus.ERROR, Constants.Bundle_ID, e.getMessage(), e));
 					} catch (NotDefinedException e) {
-						Platform.getLog(Platform.getBundle(Constants.Bundle_ID)).log(new Status(IStatus.ERROR, Constants.Bundle_ID, e.getMessage(), e));
+						ILog.of(Platform.getBundle(Constants.Bundle_ID)).log(new Status(IStatus.ERROR, Constants.Bundle_ID, e.getMessage(), e));
 					} catch (NotEnabledException e) {
-						Platform.getLog(Platform.getBundle(Constants.Bundle_ID)).log(new Status(IStatus.ERROR, Constants.Bundle_ID, e.getMessage(), e));
+						ILog.of(Platform.getBundle(Constants.Bundle_ID)).log(new Status(IStatus.ERROR, Constants.Bundle_ID, e.getMessage(), e));
 					} catch (NotHandledException e) {
-						Platform.getLog(Platform.getBundle(Constants.Bundle_ID)).log(new Status(IStatus.ERROR, Constants.Bundle_ID, e.getMessage(), e));
+						ILog.of(Platform.getBundle(Constants.Bundle_ID)).log(new Status(IStatus.ERROR, Constants.Bundle_ID, e.getMessage(), e));
 					}
 				}
 			});

diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.equinox.p2.ui.sdk;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.100.qualifier
 Bundle-Activator: org.eclipse.equinox.internal.p2.ui.sdk.ProvSDKUIActivator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.equinox.internal.p2.ui.sdk;x-internal:=true,
  org.eclipse.equinox.internal.p2.ui.sdk.prefs;x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
- org.eclipse.core.runtime,
+ org.eclipse.core.runtime;bundle-version="[3.28.0,4.0.0)",
  org.eclipse.equinox.p2.ui;bundle-version="2.6.0"
 Import-Package: javax.xml.parsers,
  org.bouncycastle.bcpg;version="1.69.0",

diff --git a/...se.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/SimpleLicenseManager.java b/...se.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/SimpleLicenseManager.java
@@ -18,7 +18,7 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.regex.Pattern;
-import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.ILog;
 import org.eclipse.equinox.internal.p2.ui.sdk.prefs.PreferenceConstants;
 import org.eclipse.equinox.p2.core.IAgentLocation;
 import org.eclipse.equinox.p2.engine.IProfileRegistry;
@@ -97,7 +97,7 @@ private void updatePreferences() {
 		try {
 			pref.flush();
 		} catch (BackingStoreException e) {
-			Platform.getLog(SimpleLicenseManager.class).error("Persisting remembered licenses failed", e); //$NON-NLS-1$
+			ILog.of(SimpleLicenseManager.class).error("Persisting remembered licenses failed", e); //$NON-NLS-1$
 		}
 	}
 }