+ * Clients may use or subclass this class. When subclassing, clients need to + * ensure that the subclass is always capable of performing a deep clone + * operation with the {@link #clone()} method, so if they add fields of + * complex type, these need to be dealt with by overriding {@link #clone()}. */ public class HostProcessFilterImpl implements IHostProcessFilter, Cloneable { @@ -445,6 +449,7 @@ public class HostProcessFilterImpl implements IHostProcessFilter, Cloneable public boolean getSpecificState(String stateCode) { + if (anystatus) return true; Boolean state = (Boolean) states.get(stateCode); if (state == null) return false; return state.booleanValue(); @@ -453,6 +458,7 @@ public class HostProcessFilterImpl implements IHostProcessFilter, Cloneable public void setSpecificState(String stateCode) { anystatus = false; + initStates(); states.put(stateCode, new Boolean(true)); } @@ -474,4 +480,26 @@ public class HostProcessFilterImpl implements IHostProcessFilter, Cloneable } return true; } + + /** + * Return an identical (deep) copy of this filter. + * + * Subclasses must ensure that such a deep copy operation is always + * possible, so their state must always be cloneable. Which should + * always be possible to achieve, since this Object also needs to be + * serializable. + */ + public Object clone() { + HostProcessFilterImpl clone = null; + try { + clone = (HostProcessFilterImpl)super.clone(); + } catch (CloneNotSupportedException e) { + //assert false; //can never happen + throw new RuntimeException(e); + } + if (states!=null) { + clone.states = (HashMap)states.clone(); + } + return clone; + } } diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/model/SystemFileTransferModeMapping.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/model/SystemFileTransferModeMapping.java index c460bf289d1..242372db605 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/model/SystemFileTransferModeMapping.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/model/SystemFileTransferModeMapping.java @@ -14,6 +14,7 @@ * Contributors: * David McKnight (IBM) - [208951] new priority field * Martin Oberhuber (Wind River) - [220020][api][breaking] SystemFileTransferModeRegistry should be internal + * Martin Oberhuber (Wind River) - [219975] Fix implementations of clone() *******************************************************************************/ package org.eclipse.rse.internal.subsystems.files.core.model; @@ -159,7 +160,8 @@ public class SystemFileTransferModeMapping implements ISystemFileTransferModeMap return super.clone(); } catch (CloneNotSupportedException e) { - return null; + //assert false; //can never happen + throw new RuntimeException(e); } } } diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileFilterString.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileFilterString.java index ff2c687b313..1e297d36331 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileFilterString.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileFilterString.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2007 IBM Corporation and others. + * Copyright (c) 2002, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [219975] Fix implementations of clone() *******************************************************************************/ package org.eclipse.rse.subsystems.files.core.model; @@ -405,7 +405,9 @@ public class RemoteFileFilterString implements Cloneable * Clone this into another filter string object with the same attributes. * * Subclasses must ensure that such a deep copy operation is always - * possible, so their state must always be cloneable. + * possible, so their state must always be cloneable. Which should + * always be possible to achieve, since this Object also needs to be + * serializable. */ public Object clone() { diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java index 2f2bb4cf59d..b91cdf79220 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java @@ -18,6 +18,7 @@ * David McKnight (IBM) - [209660] use parent encoding as default, rather than system encoding * David McKnight (IBM) - [209593] [api] add support for "file permissions" and "owner" properties for unix files * Martin Oberhuber (Wind River) - [220020][api][breaking] SystemFileTransferModeRegistry should be internal + * Martin Oberhuber (Wind River) - [219975] Fix implementations of clone() *******************************************************************************/ package org.eclipse.rse.subsystems.files.core.subsystems; diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandFilterString.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandFilterString.java index b2876cdb3ae..82e6aa26a2a 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandFilterString.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandFilterString.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved. * This program and the accompanying materials are made available under the terms * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -11,7 +11,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [219975] Fix implementations of clone() ********************************************************************************/ package org.eclipse.rse.subsystems.shells.core.model; @@ -42,6 +42,11 @@ import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystemConf *
* It is invalid to have both a comma and an asterisk in the same filter string. * It is also invalid to have both a comma and a period in the same filter string. + *
+ * Clients may use or subclass this class. When subclassing, clients need to + * ensure that the subclass is always capable of performing a deep clone + * operation with the {@link #clone()} method, so if they add fields of + * complex type, these need to be dealt with by overriding {@link #clone()}. */ public class RemoteCommandFilterString implements Cloneable { @@ -140,7 +145,7 @@ public class RemoteCommandFilterString implements Cloneable } /** - * De-hydrate into a string capturing all the attributes + * Serialize into a string capturing all the attributes */ public String toString() { @@ -149,17 +154,25 @@ public class RemoteCommandFilterString implements Cloneable /** * Clone this into another filter string object with the same attributes. + * + * Subclasses must ensure that such a deep copy operation is always + * possible, so their state must always be cloneable. Which should + * always be possible to achieve, since this Object also needs to be + * serializable. */ public Object clone() { - RemoteCommandFilterString copy = new RemoteCommandFilterString(); - copy.shellStr = shellStr; - copy.filterByTypes = filterByTypes; + RemoteCommandFilterString copy = null; + try { + copy = (RemoteCommandFilterString)super.clone(); + } catch(CloneNotSupportedException e) { + //assert false; //can never happen + throw new RuntimeException(e); + } if (types!=null) { - copy.types = new String[types.length]; - for (int idx=0; idx