Attachment #74087 for bug #163883

View | Details | Raw Unified | Return to bug 163883
Collapse All | Expand All




 * Contributors:
 * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType 
 * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
 * Kevin Doyle (IBM) - [163883] Multiple filter strings are disabled
 ********************************************************************************/

package org.eclipse.rse.internal.persistence.dom;

import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
import org.eclipse.rse.core.filters.ISystemFilterString;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.IProperty;
import org.eclipse.rse.core.model.IPropertySet;
import org.eclipse.rse.core.model.IPropertyType;
import org.eclipse.rse.core.model.IRSEModelObject;

			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_STRING_CASE_SENSITIVE, getBooleanString(filterPool.isSetStringsCaseSensitive()));
			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SUPPORTS_DUPLICATE_FILTER_STRINGS, getBooleanString(filterPool.supportsDuplicateFilterStrings()));
			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_RELEASE, Integer.toString(filterPool.getRelease()));
			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SINGLE_FILTER_STRING_ONLY, getBooleanString(filterPool.isSetSingleFilterStringOnly()));
			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_OWNING_PARENT_NAME, filterPool.getOwningParentName());
			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_NON_RENAMABLE, getBooleanString(filterPool.isNonRenamable()));
			
			boolean isSingleFilterStringOnly = false;
			boolean isSingleFilterStringOnlyESet = filterPool.isSetSingleFilterStringOnly();
			
			// if ESet is true then calling isSingleFilterStringOnly() will return
			// the value stored in the filter pool and not in the fp manager
			// in the false case isSingleFilterStringOnly should be false as that what it is by default
			if (isSingleFilterStringOnlyESet)
				isSingleFilterStringOnly = filterPool.isSingleFilterStringOnly();
			else
				isSingleFilterStringOnly = false;
			
			node.addAttribute("singleFilterStringOnlyESet", getBooleanString(isSingleFilterStringOnlyESet)); //$NON-NLS-1$
			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SINGLE_FILTER_STRING_ONLY, getBooleanString(isSingleFilterStringOnly));
			
		}
		ISystemFilter[] filters = filterPool.getSystemFilters();
		for (int i = 0; i < filters.length; i++) {




 * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
 * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
 * Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods
 * Kevin Doyle (IBM) - [163883] Multiple filter strings are disabled
 ********************************************************************************/

package org.eclipse.rse.internal.persistence.dom;

		boolean isSetStringsCaseSensitive = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_STRING_CASE_SENSITIVE).getValue());
		boolean isSetSupportsDuplicateFilterStrings = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_SUPPORTS_DUPLICATE_FILTER_STRINGS).getValue());
		int release = getIntegerValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_RELEASE).getValue());
		
		// Since old profiles won't have an "singleFilterStringOnlyESet" attribute
		// we must give it a default value.
		// False has been chosen because if the persistence is not correct then we
		// don't know what the proper value should be, so
		// we want it to check with the filter pool manager to decide
		// if multi filter strings are allowed
		boolean isSingleFilterStringOnlyESet = false;
		boolean isSetSingleFilterStringOnly = false;
		RSEDOMNodeAttribute attribute = node.getAttribute("singleFilterStringOnlyESet"); //$NON-NLS-1$
		if (attribute != null)
		{
			isSingleFilterStringOnlyESet = getBooleanValue(attribute.getValue());
			isSetSingleFilterStringOnly = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_SINGLE_FILTER_STRING_ONLY).getValue());
		}
		
		String owningParentName = node.getAttribute(IRSEDOMConstants.ATTRIBUTE_OWNING_PARENT_NAME).getValue();
		boolean isNonRenamable = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_NON_RENAMABLE).getValue());


				filterPool.setStringsCaseSensitive(isSetStringsCaseSensitive);
				filterPool.setSupportsDuplicateFilterStrings(isSetSupportsDuplicateFilterStrings);
				filterPool.setRelease(release);
				
				// if single filter string only has been set in the past then set
				// the value to the persisted one which will set ESet to true
				// In the false case we don't do anything because the persistence
				// could be messed up or ESet has never been set before
				// in which case single filter string only should be false
				if (isSingleFilterStringOnlyESet)
					filterPool.setSingleFilterStringOnly(isSetSingleFilterStringOnly);
				
				filterPool.setOwningParentName(owningParentName);
				filterPool.setNonRenamable(isNonRenamable);
//				filterPool.wasRestored();

Return to bug 163883

Lines 13-18 Link Here

(-)src/org/eclipse/rse/internal/persistence/dom/RSEDOMExporter.java (-2 / +16 lines)
13	* Contributors:	13	* Contributors:
14	* Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType	14	* Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType
15	* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType	15	* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
		16	* Kevin Doyle (IBM) - [163883] Multiple filter strings are disabled
16	********************************************************************************/	17	********************************************************************************/
17		18
18	package org.eclipse.rse.internal.persistence.dom;	19	package org.eclipse.rse.internal.persistence.dom;
Lines 28-34 Link Here
28	import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;	29	import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
29	import org.eclipse.rse.core.filters.ISystemFilterString;	30	import org.eclipse.rse.core.filters.ISystemFilterString;
30	import org.eclipse.rse.core.model.IHost;	31	import org.eclipse.rse.core.model.IHost;
31	import org.eclipse.rse.core.model.IProperty;
32	import org.eclipse.rse.core.model.IPropertySet;	32	import org.eclipse.rse.core.model.IPropertySet;
33	import org.eclipse.rse.core.model.IPropertyType;	33	import org.eclipse.rse.core.model.IPropertyType;
34	import org.eclipse.rse.core.model.IRSEModelObject;	34	import org.eclipse.rse.core.model.IRSEModelObject;
Lines 201-209 Link Here
201	node.addAttribute(IRSEDOMConstants.ATTRIBUTE_STRING_CASE_SENSITIVE, getBooleanString(filterPool.isSetStringsCaseSensitive()));	201	node.addAttribute(IRSEDOMConstants.ATTRIBUTE_STRING_CASE_SENSITIVE, getBooleanString(filterPool.isSetStringsCaseSensitive()));
202	node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SUPPORTS_DUPLICATE_FILTER_STRINGS, getBooleanString(filterPool.supportsDuplicateFilterStrings()));	202	node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SUPPORTS_DUPLICATE_FILTER_STRINGS, getBooleanString(filterPool.supportsDuplicateFilterStrings()));
203	node.addAttribute(IRSEDOMConstants.ATTRIBUTE_RELEASE, Integer.toString(filterPool.getRelease()));	203	node.addAttribute(IRSEDOMConstants.ATTRIBUTE_RELEASE, Integer.toString(filterPool.getRelease()));
204	node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SINGLE_FILTER_STRING_ONLY, getBooleanString(filterPool.isSetSingleFilterStringOnly()));
205	node.addAttribute(IRSEDOMConstants.ATTRIBUTE_OWNING_PARENT_NAME, filterPool.getOwningParentName());	204	node.addAttribute(IRSEDOMConstants.ATTRIBUTE_OWNING_PARENT_NAME, filterPool.getOwningParentName());
206	node.addAttribute(IRSEDOMConstants.ATTRIBUTE_NON_RENAMABLE, getBooleanString(filterPool.isNonRenamable()));	205	node.addAttribute(IRSEDOMConstants.ATTRIBUTE_NON_RENAMABLE, getBooleanString(filterPool.isNonRenamable()));
		206
		207	boolean isSingleFilterStringOnly = false;
		208	boolean isSingleFilterStringOnlyESet = filterPool.isSetSingleFilterStringOnly();
		209
		210	// if ESet is true then calling isSingleFilterStringOnly() will return
		211	// the value stored in the filter pool and not in the fp manager
		212	// in the false case isSingleFilterStringOnly should be false as that what it is by default
		213	if (isSingleFilterStringOnlyESet)
		214	isSingleFilterStringOnly = filterPool.isSingleFilterStringOnly();
		215	else
		216	isSingleFilterStringOnly = false;
		217
		218	node.addAttribute("singleFilterStringOnlyESet", getBooleanString(isSingleFilterStringOnlyESet)); //$NON-NLS-1$
		219	node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SINGLE_FILTER_STRING_ONLY, getBooleanString(isSingleFilterStringOnly));
		220
207	}	221	}
208	ISystemFilter[] filters = filterPool.getSystemFilters();	222	ISystemFilter[] filters = filterPool.getSystemFilters();
209	for (int i = 0; i < filters.length; i++) {	223	for (int i = 0; i < filters.length; i++) {