Use static IStatus factories in JFace

HannesWell · HannesWell · commit 037c5d70031a · 2025-04-09T19:20:19.000+02:00
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/ExternalActionManager.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/ExternalActionManager.java
@@ -33,7 +33,6 @@
 import org.eclipse.core.commands.NotEnabledException;
 import org.eclipse.core.commands.ParameterizedCommand;
 import org.eclipse.core.commands.common.NotDefinedException;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.bindings.BindingManager;
@@ -358,14 +357,10 @@ public final boolean isActive(final String commandId) {
 				if (!command.isDefined()
 						&& (!loggedCommandIds.contains(commandId))) {
 					// The command is not yet defined, so we should log this.
-					final String message = MessageFormat.format(Util
-							.translateString(RESOURCE_BUNDLE,
-									"undefinedCommand.WarningMessage", null), //$NON-NLS-1$
+					String message = MessageFormat.format(
+							Util.translateString(RESOURCE_BUNDLE, "undefinedCommand.WarningMessage", null), //$NON-NLS-1$
 							command.getId());
-					IStatus status = new Status(IStatus.ERROR,
-							"org.eclipse.jface", //$NON-NLS-1$
-							0, message, new Exception());
-					Policy.getLog().log(status);
+					Policy.getLog().log(Status.error(message));
 
 					// And remember this item so we don't log it again.
 					loggedCommandIds.add(commandId);
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/bindings/BindingManager.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/bindings/BindingManager.java
@@ -655,9 +655,7 @@ private final void computeBindings(final Map activeContextTree,
 						} catch (IOException e) {
 							// we should not get this
 						}
-						conflicts.add(new Status(IStatus.WARNING,
-								"org.eclipse.jface", //$NON-NLS-1$
-								sw.toString()));
+						conflicts.add(Status.warning(sw.toString()));
 					}
 					if (DEBUG) {
 						Tracing.printTrace("BINDINGS", //$NON-NLS-1$
@@ -861,9 +859,7 @@ private final Map createFilteredContextTreeFor(final Set contextIds) {
 					bindingErrors.add(context.getId());
 
 					// now log like you've never logged before!
-					Status status = new Status(IStatus.ERROR, Policy.JFACE, IStatus.OK,
-							"Undefined context while filtering dialog/window contexts", e); //$NON-NLS-1$
-					Policy.getLog().log(status);
+					Policy.getLog().log(Status.error("Undefined context while filtering dialog/window contexts", e)); //$NON-NLS-1$
 				}
 			}
 		}
@@ -1568,10 +1564,7 @@ private final String[] getSchemeIds(String schemeId) {
 			try {
 				schemeId = getScheme(schemeId).getParentId();
 			} catch (final NotDefinedException e) {
-				Policy.getLog().log(
-						new Status(IStatus.ERROR, Policy.JFACE, IStatus.OK,
-								"Failed ascending scheme parents", //$NON-NLS-1$
-								e));
+				Policy.getLog().log(Status.error("Failed ascending scheme parents", e)); //$NON-NLS-1$
 				return new String[0];
 			}
 		}
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/Dialog.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/Dialog.java
@@ -420,11 +420,7 @@ public void showBlocked(Shell parentShell, IProgressMonitor blocking,
 	protected Dialog(Shell parentShell) {
 		this(new SameShellProvider(parentShell));
 		if (parentShell == null && Policy.DEBUG_DIALOG_NO_PARENT) {
-			Policy.getLog().log(
-					new Status(IStatus.INFO, Policy.JFACE, IStatus.INFO, this
-							.getClass()
-							+ " created with no shell",//$NON-NLS-1$
-							new Exception()));
+			Policy.getLog().log(Status.info(this.getClass() + " created with no shell")); //$NON-NLS-1$
 		}
 	}
 
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/StatusDialog.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/StatusDialog.java
@@ -58,8 +58,7 @@ public abstract class StatusDialog extends TrayDialog {
 	 */
 	public StatusDialog(Shell parent) {
 		super(parent);
-		fLastStatus = new Status(IStatus.OK, Policy.JFACE, IStatus.OK,
-				Util.ZERO_LENGTH_STRING, null);
+		fLastStatus = new Status(IStatus.OK, Policy.JFACE, Util.ZERO_LENGTH_STRING);
 	}
 
 	/**
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/operation/ModalContext.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/operation/ModalContext.java
@@ -18,7 +18,6 @@
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.ProgressMonitorWrapper;
 import org.eclipse.core.runtime.Status;
@@ -194,8 +193,8 @@ public void block() {
 								throw new RuntimeException(t);
 							}
 						}
-						Policy.getLog().log(new Status(IStatus.ERROR, Policy.JFACE,
-								"Unhandled event loop exception during blocked modal context.", t)); //$NON-NLS-1$
+						Policy.getLog()
+								.log(Status.error("Unhandled event loop exception during blocked modal context.", t)); //$NON-NLS-1$
 					}
 				}
 			} else {
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceDialog.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceDialog.java
@@ -25,7 +25,6 @@
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.core.runtime.SafeRunner;
 import org.eclipse.core.runtime.Status;
@@ -816,8 +815,7 @@ protected void handleSave() {
 					} catch (IOException e) {
 						String message = JFaceResources.format("PreferenceDialog.saveErrorMessage", page.getTitle(), //$NON-NLS-1$
 								e.getMessage());
-						Policy.getStatusHandler().show(
-								new Status(IStatus.ERROR, Policy.JFACE, message, e),
+						Policy.getStatusHandler().show(Status.error(message, e),
 								JFaceResources.getString("PreferenceDialog.saveErrorTitle")); //$NON-NLS-1$
 
 					}
@@ -932,15 +930,11 @@ public void run() {
 			public void handleException(Throwable e) {
 				errorOccurred = true;
 
-				Policy.getLog().log(new Status(IStatus.ERROR, Policy.JFACE, 0, e.toString(), e));
+				Policy.getLog().log(Status.error(e.toString(), e));
 
 				clearSelectedNode();
 				String message = JFaceResources.getString("SafeRunnable.errorMessage"); //$NON-NLS-1$
-
-				Policy.getStatusHandler().show(
-						new Status(IStatus.ERROR, Policy.JFACE, message, e),
-						JFaceResources.getString("Error")); //$NON-NLS-1$
-
+				Policy.getStatusHandler().show(Status.error(message, e), JFaceResources.getString("Error")); //$NON-NLS-1$
 			}
 		});
 	}
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FileImageDescriptor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FileImageDescriptor.java
@@ -29,7 +29,6 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.internal.InternalPolicy;
 import org.eclipse.jface.util.Policy;
@@ -303,7 +302,7 @@ String getFilePath(String name, boolean logIOException) {
 			} else if (InternalPolicy.DEBUG_LOG_URL_IMAGE_DESCRIPTOR_MISSING_2x) {
 				if (name.endsWith("@2x.png") || name.endsWith("@1.5x.png")) { //$NON-NLS-1$ //$NON-NLS-2$
 					String message = "High-resolution image missing: " + location + ' ' + name; //$NON-NLS-1$
-					Policy.getLog().log(new Status(IStatus.WARNING, Policy.JFACE, message, e));
+					Policy.getLog().log(Status.warning(message, e));
 				}
 			}
 			return null;
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/URLImageDescriptor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/URLImageDescriptor.java
@@ -28,7 +28,6 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.internal.InternalPolicy;
 import org.eclipse.jface.util.Policy;
@@ -172,7 +171,7 @@ private static ImageData getImageData(URL url) {
 				// fall through otherwise
 			}
 		} catch (IOException e) {
-			Policy.getLog().log(new Status(IStatus.ERROR, Policy.JFACE, e.getLocalizedMessage(), e));
+			Policy.getLog().log(Status.error(e.getLocalizedMessage(), e));
 		}
 		return result;
 	}
@@ -204,8 +203,7 @@ private static InputStream getStream(URL url) {
 			if (InternalPolicy.DEBUG_LOG_URL_IMAGE_DESCRIPTOR_MISSING_2x) {
 				String path = url.getPath();
 				if (path.endsWith("@2x.png") || path.endsWith("@1.5x.png")) { //$NON-NLS-1$ //$NON-NLS-2$
-					String message = "High-resolution image missing: " + url; //$NON-NLS-1$
-					Policy.getLog().log(new Status(IStatus.WARNING, Policy.JFACE, message, e));
+					Policy.getLog().log(Status.warning("High-resolution image missing: " + url, e)); //$NON-NLS-1$
 				}
 			}
 			return null;
@@ -244,7 +242,7 @@ private static URL getxURL(URL url, int zoom) {
 				}
 				return new URL(url.getProtocol(), url.getHost(), url.getPort(), file);
 			} catch (MalformedURLException e) {
-				Policy.getLog().log(new Status(IStatus.ERROR, Policy.JFACE, e.getLocalizedMessage(), e));
+				Policy.getLog().log(Status.error(e.getLocalizedMessage(), e));
 			}
 		}
 		return null;
@@ -282,8 +280,7 @@ private static String getFilePath(URL url, boolean logIOException) {
 			} else if (InternalPolicy.DEBUG_LOG_URL_IMAGE_DESCRIPTOR_MISSING_2x) {
 				String path = url.getPath();
 				if (path.endsWith("@2x.png") || path.endsWith("@1.5x.png")) { //$NON-NLS-1$ //$NON-NLS-2$
-					String message = "High-resolution image missing: " + url; //$NON-NLS-1$
-					Policy.getLog().log(new Status(IStatus.WARNING, Policy.JFACE, message, e));
+					Policy.getLog().log(Status.warning("High-resolution image missing: " + url, e)); //$NON-NLS-1$
 				}
 			}
 			return null;
@@ -363,7 +360,7 @@ private static URL getURL(String urlString) {
 		try {
 			result = new URL(urlString);
 		} catch (MalformedURLException e) {
-			Policy.getLog().log(new Status(IStatus.ERROR, Policy.JFACE, e.getLocalizedMessage(), e));
+			Policy.getLog().log(Status.error(e.getLocalizedMessage(), e));
 		}
 		return result;
 	}
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/util/LocalSelectionTransfer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/util/LocalSelectionTransfer.java
@@ -14,7 +14,6 @@
 package org.eclipse.jface.util;
 
 
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.ISelection;
@@ -129,11 +128,7 @@ public void javaToNative(Object object, TransferData transferData) {
 	public Object nativeToJava(TransferData transferData) {
 		Object result = super.nativeToJava(transferData);
 		if (result != null && isInvalidNativeType(result)) {
-			Policy.getLog().log(new Status(
-							IStatus.ERROR,
-							Policy.JFACE,
-							IStatus.ERROR,
-							JFaceResources.getString("LocalSelectionTransfer.errorMessage"), null)); //$NON-NLS-1$
+			Policy.getLog().log(Status.error(JFaceResources.getString("LocalSelectionTransfer.errorMessage"))); //$NON-NLS-1$
 		}
 		return selection;
 	}
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/util/Policy.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/util/Policy.java
@@ -259,10 +259,7 @@ public static ErrorSupportProvider getErrorSupportProvider() {
 	 * @since 3.4
 	 */
 	public static void logException(Exception exception) {
-		getLog().log(
-				new Status(IStatus.ERROR, JFACE, exception
-						.getLocalizedMessage(), exception));
-
+		getLog().log(Status.error(exception.getLocalizedMessage(), exception));
 	}
 
 }
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/util/SafeRunnable.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/util/SafeRunnable.java
@@ -16,7 +16,6 @@
 package org.eclipse.jface.util;
 
 import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.resource.JFaceResources;
@@ -63,9 +62,7 @@ public void handleException(Throwable e) {
 		if (message == null)
 			message = JFaceResources.getString("SafeRunnable.errorMessage"); //$NON-NLS-1$
 
-		Policy.getStatusHandler().show(
-				new Status(IStatus.ERROR, Policy.JFACE, message, e),
-				JFaceResources.getString("SafeRunnable.errorMessage")); //$NON-NLS-1$
+		Policy.getStatusHandler().show(Status.error(message, e), JFaceResources.getString("SafeRunnable.errorMessage")); //$NON-NLS-1$
 	}
 
 	/**
@@ -135,11 +132,7 @@ public void run(ISafeRunnable code) {
 			private void handleException(ISafeRunnable code, Throwable e) {
 				if (!(e instanceof OperationCanceledException)) {
 					try {
-						Policy.getLog()
-								.log(
-										new Status(IStatus.ERROR, Policy.JFACE,
-												IStatus.ERROR,
-												"Exception occurred", e)); //$NON-NLS-1$
+						Policy.getLog().log(Status.error("Exception occurred", e)); //$NON-NLS-1$
 					} catch (Exception ex) {
 						e.printStackTrace();
 					}
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/util/StructuredTextSegmentListener.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/util/StructuredTextSegmentListener.java
@@ -14,7 +14,6 @@
 
 package org.eclipse.jface.util;
 
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory;
 import org.eclipse.equinox.bidi.advanced.IStructuredTextExpert;
@@ -84,8 +83,8 @@ public void getSegments(SegmentEvent event) {
 			} catch (RuntimeException ex) {
 				// Only log the first exception. Logging every exception would make the system unusable.
 				if (logExceptions) {
-					Policy.getLog().log(new Status(IStatus.ERROR, Policy.JFACE,
-							"An error occurred while processing \"" + event.lineText + "\" with " + expert, ex)); //$NON-NLS-1$//$NON-NLS-2$
+					Policy.getLog().log(Status
+							.error("An error occurred while processing \"" + event.lineText + "\" with " + expert, ex)); //$NON-NLS-1$//$NON-NLS-2$
 					logExceptions = false;
 				}
 			}
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTreeViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTreeViewer.java
@@ -30,7 +30,6 @@
 import java.util.List;
 
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.internal.InternalPolicy;
@@ -1510,9 +1509,7 @@ private void assertElementsNotNull(Object parent, Object[] elements) {
 				if (old != null) {
 					String message = "Sibling elements in viewer must not be equal:\n  " //$NON-NLS-1$
 							+ old + ",\n  " + element + ",\n  parent: " + parent; //$NON-NLS-1$ //$NON-NLS-2$
-					Policy.getLog().log(
-							new Status(IStatus.WARNING, Policy.JFACE, message,
-									new RuntimeException()));
+					Policy.getLog().log(Status.warning(message));
 					return;
 				}
 			}
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnViewer.java
@@ -24,7 +24,6 @@
 import java.util.Set;
 
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.internal.InternalPolicy;
 import org.eclipse.jface.util.Policy;
@@ -757,9 +756,7 @@ protected boolean checkBusy() {
 					message += " This is only logged once per viewer instance," + //$NON-NLS-1$
 							" but similar calls will still be ignored."; //$NON-NLS-1$
 				}
-				Policy.getLog().log(
-						new Status(IStatus.WARNING, Policy.JFACE, message,
-								new RuntimeException()));
+				Policy.getLog().log(Status.warning(message));
 			}
 			return true;
 		}
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ContentViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ContentViewer.java
@@ -16,7 +16,6 @@
 package org.eclipse.jface.viewers;
 
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.internal.InternalPolicy;
 import org.eclipse.jface.util.Policy;
@@ -86,9 +85,7 @@ public void labelProviderChanged(LabelProviderChangedEvent event) {
 						message += " This is only logged once per viewer instance," + //$NON-NLS-1$
 								" but similar calls will still be ignored."; //$NON-NLS-1$
 					}
-					Policy.getLog().log(
-							new Status(IStatus.WARNING, Policy.JFACE, message,
-									new RuntimeException()));
+					Policy.getLog().log(Status.warning(message));
 				}
 				return;
 			}
@@ -173,7 +170,7 @@ protected void handleDispose(DisposeEvent event) {
 				// ignore exception
 				String message = "Exception while calling ContentProvider.inputChanged from ContentViewer.handleDispose"; //$NON-NLS-1$
 				message += " (" + contentProvider.getClass().getName() + ")"; //$NON-NLS-1$//$NON-NLS-2$
-				Policy.getLog().log(new Status(IStatus.WARNING, Policy.JFACE, message, e));
+				Policy.getLog().log(Status.warning(message, e));
 			}
 			contentProvider.dispose();
 			contentProvider = null;
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredViewer.java
@@ -26,7 +26,6 @@
 import java.util.List;
 
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.internal.InternalPolicy;
@@ -548,9 +547,7 @@ protected void assertElementsNotNull(Object... elements) {
 				if (old != null) {
 					String message = "Sibling elements in viewer must not be equal:\n  " //$NON-NLS-1$
 							+ old + ",\n  " + element; //$NON-NLS-1$
-					Policy.getLog().log(
-							new Status(IStatus.WARNING, Policy.JFACE, message,
-									new RuntimeException()));
+					Policy.getLog().log(Status.warning(message));
 					return;
 				}
 			}
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerComparator.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerComparator.java
@@ -19,7 +19,6 @@
 import java.util.Arrays;
 import java.util.Comparator;
 
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.util.Policy;
 
@@ -223,7 +222,7 @@ public void sort(final Viewer viewer, Object[] elements) {
 				labels.append(getLabel(viewer, element));
 			}
 			msg += labels;
-			Policy.getLog().log(new Status(IStatus.ERROR, "org.eclipse.jface", msg)); //$NON-NLS-1$
+			Policy.getLog().log(Status.error(msg));
 			throw e;
 		}
 	}
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/wizard/Wizard.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/wizard/Wizard.java
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/wizard/WizardDialog.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/wizard/WizardDialog.java

Original file line number	Diff line number	Diff line change
`@@ -655,9 +655,7 @@ private final void computeBindings(final Map activeContextTree,`
`655`	`655`	`} catch (IOException e) {`
`656`	`656`	`// we should not get this`
`657`	`657`	`}`
`658`		`- conflicts.add(new Status(IStatus.WARNING,`
`659`		`- "org.eclipse.jface", //$NON-NLS-1$`
`660`		`- sw.toString()));`
	`658`	`+ conflicts.add(Status.warning(sw.toString()));`
`661`	`659`	`}`
`662`	`660`	`if (DEBUG) {`
`663`	`661`	`Tracing.printTrace("BINDINGS", //$NON-NLS-1$`
`@@ -861,9 +859,7 @@ private final Map createFilteredContextTreeFor(final Set contextIds) {`
`861`	`859`	`bindingErrors.add(context.getId());`
`862`	`860`
`863`	`861`	`// now log like you've never logged before!`
`864`		`- Status status = new Status(IStatus.ERROR, Policy.JFACE, IStatus.OK,`
`865`		`- "Undefined context while filtering dialog/window contexts", e); //$NON-NLS-1$`
`866`		`- Policy.getLog().log(status);`
	`862`	`+ Policy.getLog().log(Status.error("Undefined context while filtering dialog/window contexts", e)); //$NON-NLS-1$`
`867`	`863`	`}`
`868`	`864`	`}`
`869`	`865`	`}`
`@@ -1568,10 +1564,7 @@ private final String[] getSchemeIds(String schemeId) {`
`1568`	`1564`	`try {`
`1569`	`1565`	`schemeId = getScheme(schemeId).getParentId();`
`1570`	`1566`	`} catch (final NotDefinedException e) {`
`1571`		`- Policy.getLog().log(`
`1572`		`- new Status(IStatus.ERROR, Policy.JFACE, IStatus.OK,`
`1573`		`- "Failed ascending scheme parents", //$NON-NLS-1$`
`1574`		`- e));`
	`1567`	`+ Policy.getLog().log(Status.error("Failed ascending scheme parents", e)); //$NON-NLS-1$`
`1575`	`1568`	`return new String[0];`
`1576`	`1569`	`}`
`1577`	`1570`	`}`
Original file line number	Diff line number	Diff line change
`@@ -420,11 +420,7 @@ public void showBlocked(Shell parentShell, IProgressMonitor blocking,`
`420`	`420`	`protected Dialog(Shell parentShell) {`
`421`	`421`	`this(new SameShellProvider(parentShell));`
`422`	`422`	`if (parentShell == null && Policy.DEBUG_DIALOG_NO_PARENT) {`
`423`		`- Policy.getLog().log(`
`424`		`- new Status(IStatus.INFO, Policy.JFACE, IStatus.INFO, this`
`425`		`- .getClass()`
`426`		`- + " created with no shell",//$NON-NLS-1$`
`427`		`- new Exception()));`
	`423`	`+ Policy.getLog().log(Status.info(this.getClass() + " created with no shell")); //$NON-NLS-1$`
`428`	`424`	`}`
`429`	`425`	`}`
`430`	`426`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,7 @@ public abstract class StatusDialog extends TrayDialog {`
`58`	`58`	`*/`
`59`	`59`	`public StatusDialog(Shell parent) {`
`60`	`60`	`super(parent);`
`61`		`- fLastStatus = new Status(IStatus.OK, Policy.JFACE, IStatus.OK,`
`62`		`- Util.ZERO_LENGTH_STRING, null);`
	`61`	`+ fLastStatus = new Status(IStatus.OK, Policy.JFACE, Util.ZERO_LENGTH_STRING);`
`63`	`62`	`}`
`64`	`63`
`65`	`64`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`
`19`	`19`	`import org.eclipse.core.runtime.Assert;`
`20`	`20`	`import org.eclipse.core.runtime.IProgressMonitor;`
`21`		`-import org.eclipse.core.runtime.IStatus;`
`22`	`21`	`import org.eclipse.core.runtime.OperationCanceledException;`
`23`	`22`	`import org.eclipse.core.runtime.ProgressMonitorWrapper;`
`24`	`23`	`import org.eclipse.core.runtime.Status;`
`@@ -194,8 +193,8 @@ public void block() {`
`194`	`193`	`throw new RuntimeException(t);`
`195`	`194`	`}`
`196`	`195`	`}`
`197`		`- Policy.getLog().log(new Status(IStatus.ERROR, Policy.JFACE,`
`198`		`- "Unhandled event loop exception during blocked modal context.", t)); //$NON-NLS-1$`
	`196`	`+ Policy.getLog()`
	`197`	`+ .log(Status.error("Unhandled event loop exception during blocked modal context.", t)); //$NON-NLS-1$`
`199`	`198`	`}`
`200`	`199`	`}`
`201`	`200`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@`
`28`	`28`	`import org.eclipse.core.runtime.FileLocator;`
`29`	`29`	`import org.eclipse.core.runtime.IAdaptable;`
`30`	`30`	`import org.eclipse.core.runtime.IPath;`
`31`		`-import org.eclipse.core.runtime.IStatus;`
`32`	`31`	`import org.eclipse.core.runtime.Status;`
`33`	`32`	`import org.eclipse.jface.internal.InternalPolicy;`
`34`	`33`	`import org.eclipse.jface.util.Policy;`
`@@ -172,7 +171,7 @@ private static ImageData getImageData(URL url) {`
`172`	`171`	`// fall through otherwise`
`173`	`172`	`}`
`174`	`173`	`} catch (IOException e) {`
`175`		`- Policy.getLog().log(new Status(IStatus.ERROR, Policy.JFACE, e.getLocalizedMessage(), e));`
	`174`	`+ Policy.getLog().log(Status.error(e.getLocalizedMessage(), e));`
`176`	`175`	`}`
`177`	`176`	`return result;`
`178`	`177`	`}`
`@@ -204,8 +203,7 @@ private static InputStream getStream(URL url) {`
`204`	`203`	`if (InternalPolicy.DEBUG_LOG_URL_IMAGE_DESCRIPTOR_MISSING_2x) {`
`205`	`204`	`String path = url.getPath();`
`206`	`205`	`if (path.endsWith("@2x.png") \|\| path.endsWith("@1.5x.png")) { //$NON-NLS-1$ //$NON-NLS-2$`
`207`		`- String message = "High-resolution image missing: " + url; //$NON-NLS-1$`
`208`		`- Policy.getLog().log(new Status(IStatus.WARNING, Policy.JFACE, message, e));`
	`206`	`+ Policy.getLog().log(Status.warning("High-resolution image missing: " + url, e)); //$NON-NLS-1$`
`209`	`207`	`}`
`210`	`208`	`}`
`211`	`209`	`return null;`
`@@ -244,7 +242,7 @@ private static URL getxURL(URL url, int zoom) {`
`244`	`242`	`}`
`245`	`243`	`return new URL(url.getProtocol(), url.getHost(), url.getPort(), file);`
`246`	`244`	`} catch (MalformedURLException e) {`
`247`		`- Policy.getLog().log(new Status(IStatus.ERROR, Policy.JFACE, e.getLocalizedMessage(), e));`
	`245`	`+ Policy.getLog().log(Status.error(e.getLocalizedMessage(), e));`
`248`	`246`	`}`
`249`	`247`	`}`
`250`	`248`	`return null;`
`@@ -282,8 +280,7 @@ private static String getFilePath(URL url, boolean logIOException) {`
`282`	`280`	`} else if (InternalPolicy.DEBUG_LOG_URL_IMAGE_DESCRIPTOR_MISSING_2x) {`
`283`	`281`	`String path = url.getPath();`
`284`	`282`	`if (path.endsWith("@2x.png") \|\| path.endsWith("@1.5x.png")) { //$NON-NLS-1$ //$NON-NLS-2$`
`285`		`- String message = "High-resolution image missing: " + url; //$NON-NLS-1$`
`286`		`- Policy.getLog().log(new Status(IStatus.WARNING, Policy.JFACE, message, e));`
	`283`	`+ Policy.getLog().log(Status.warning("High-resolution image missing: " + url, e)); //$NON-NLS-1$`
`287`	`284`	`}`
`288`	`285`	`}`
`289`	`286`	`return null;`
`@@ -363,7 +360,7 @@ private static URL getURL(String urlString) {`
`363`	`360`	`try {`
`364`	`361`	`result = new URL(urlString);`
`365`	`362`	`} catch (MalformedURLException e) {`
`366`		`- Policy.getLog().log(new Status(IStatus.ERROR, Policy.JFACE, e.getLocalizedMessage(), e));`
	`363`	`+ Policy.getLog().log(Status.error(e.getLocalizedMessage(), e));`
`367`	`364`	`}`
`368`	`365`	`return result;`
`369`	`366`	`}`
Original file line number	Diff line number	Diff line change
`@@ -259,10 +259,7 @@ public static ErrorSupportProvider getErrorSupportProvider() {`
`259`	`259`	`* @since 3.4`
`260`	`260`	`*/`
`261`	`261`	`public static void logException(Exception exception) {`
`262`		`- getLog().log(`
`263`		`- new Status(IStatus.ERROR, JFACE, exception`
`264`		`- .getLocalizedMessage(), exception));`
`265`		`-`
	`262`	`+ getLog().log(Status.error(exception.getLocalizedMessage(), exception));`
`266`	`263`	`}`
`267`	`264`
`268`	`265`	`}`