From 114cc635e8262c7cb4838e330d4910a243ba0b8f Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Fri, 22 Feb 2008 16:02:44 +0000 Subject: [PATCH] [219975][api][breaking] Get rid of SystemMessage#clone() --- .../messages/SimpleSystemMessage.java | 8 ++++---- .../clientserver/messages/SystemMessage.java | 16 +--------------- .../eclipse/rse/ui/messages/SystemUIMessage.java | 2 +- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/SimpleSystemMessage.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/SimpleSystemMessage.java index 67b64d3aed0..2a81e748e3d 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/SimpleSystemMessage.java +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/SimpleSystemMessage.java @@ -19,14 +19,14 @@ import java.io.StringWriter; import org.eclipse.core.runtime.IStatus; -public class SimpleSystemMessage extends SystemMessage implements Cloneable { +public class SimpleSystemMessage extends SystemMessage { /** * alternative to message number for ids? */ private String _pluginId; - private int _severity; + //private int _severity; /** * Constructor for messages that use explicit strings and severities rather than @@ -55,7 +55,7 @@ public class SimpleSystemMessage extends SystemMessage implements Cloneable { super("RSE", "G", "-", severityToIndicator(severity), msg, msgDetails); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$ _pluginId = pluginId; - _severity = severity; + //_severity = severity; } /** @@ -71,7 +71,7 @@ public class SimpleSystemMessage extends SystemMessage implements Cloneable { public SimpleSystemMessage(String pluginId, int severity, String msg, Throwable e) { super("RSE", "G", "-", severityToIndicator(severity), msg, throwableToDetails(e)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ _pluginId = pluginId; - _severity = severity; + //_severity = severity; } private static String throwableToDetails(Throwable e){ diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/SystemMessage.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/SystemMessage.java index 2d7a555be99..75c13f1a6a8 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/SystemMessage.java +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/SystemMessage.java @@ -25,7 +25,7 @@ import java.io.StringWriter; * SystemMessage is used to supply detailed status when an error or other significant event occurs that should * be presented to the user or logged. It is structured to capture information from a variety of remote systems. */ -public class SystemMessage implements Cloneable +public class SystemMessage { /** @@ -453,18 +453,4 @@ public class SystemMessage implements Cloneable return sub.toString(); } - /** - * Creates a new message with the same component, subcomponent, number, text message - * and substitutions. - * @see java.lang.Object#clone() - */ - public Object clone() throws CloneNotSupportedException { - ////Old invalid code - did not work properly for subclasses - //return new SystemMessage(component, subComponent, messageNumber, indicator, level1NS, level2NS); - SystemMessage result = (SystemMessage)super.clone(); - //clone the array: this might throw runtime exceptions if the - //objects in the array are not cloneable! - result.subs = (Object[])subs.clone(); - return result; - } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/messages/SystemUIMessage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/messages/SystemUIMessage.java index afef928ca2f..a5b3b3d7b10 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/messages/SystemUIMessage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/messages/SystemUIMessage.java @@ -24,7 +24,7 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage; -public class SystemUIMessage extends SystemMessage implements Cloneable +public class SystemUIMessage extends SystemMessage { protected static final int displayMask = IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR; // for IStatus substitution variables