[tm-cvs-commit] dmcknight org.eclipse.tm.rse/plugins/org.eclipse.rse.cor

[Eclipse CVS Genie <genie@xxxxxxxxxxx>]

Update of /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model
In directory dev2:/tmp/cvs-serv8713/src/org/eclipse/rse/core/model

Modified Files:
      Tag: R3_2_maintenance
	PropertySetContainer.java PropertySet.java 
Log Message:
[334837] Ordering of Library list entries incorrect after migration

Index: PropertySet.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySet.java,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -C2 -d -r1.13 -r1.13.4.1
*** PropertySet.java	23 Apr 2008 18:19:57 -0000	1.13
--- PropertySet.java	28 Jan 2011 16:27:05 -0000	1.13.4.1
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2006, 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
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2006, 2011 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
***************
*** 16,25 ****
   * David McKnight   (IBM)        - [217715] [api] RSE property sets should support nested property sets
   * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
   *******************************************************************************/
  
  package org.eclipse.rse.core.model;
  
! import java.util.HashMap;
  import java.util.Iterator;
  import java.util.Map;
  import java.util.Observable;
--- 16,27 ----
   * David McKnight   (IBM)        - [217715] [api] RSE property sets should support nested property sets
   * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
+  * David McKnight   (IBM)        - [334837] Ordering of Library list entries incorrect after migration
   *******************************************************************************/
  
  package org.eclipse.rse.core.model;
  
! 
  import java.util.Iterator;
+ import java.util.LinkedHashMap;
  import java.util.Map;
  import java.util.Observable;
***************
*** 28,32 ****
  
  /**
!  * A Hashmap based implementation of the {@link IPropertySet} interface.
   * 
   * Not thread-safe since the underlying {@link java.util.HashMap} is 
--- 30,34 ----
  
  /**
!  * A LinkedHashmap based implementation of the {@link IPropertySet} interface.
   * 
   * Not thread-safe since the underlying {@link java.util.HashMap} is 
***************
*** 52,56 ****
  		_name = propertySet.getName();
  		_description = propertySet.getDescription();
! 		_properties = new HashMap();
  		if (propertySet instanceof ILabeledObject) {
  			ILabeledObject p = (ILabeledObject) propertySet;
--- 54,58 ----
  		_name = propertySet.getName();
  		_description = propertySet.getDescription();
! 		_properties = new LinkedHashMap();
  		if (propertySet instanceof ILabeledObject) {
  			ILabeledObject p = (ILabeledObject) propertySet;
***************
*** 73,77 ****
  	public PropertySet(String name) {
  		_name = name;
! 		_properties = new HashMap();
  		setDirty(true);
  	}
--- 75,79 ----
  	public PropertySet(String name) {
  		_name = name;
! 		_properties = new LinkedHashMap();
  		setDirty(true);
  	}
***************
*** 111,115 ****
  
  	public void setProperties(Map map) {
! 		_properties = new HashMap(map.size());
  		for (Iterator z = map.keySet().iterator(); z.hasNext();) {
  			String key = (String) z.next();
--- 113,117 ----
  
  	public void setProperties(Map map) {
! 		_properties = new LinkedHashMap(map.size());
  		for (Iterator z = map.keySet().iterator(); z.hasNext();) {
  			String key = (String) z.next();

Index: PropertySetContainer.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySetContainer.java,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -C2 -d -r1.8 -r1.8.4.1
*** PropertySetContainer.java	23 Apr 2008 18:19:56 -0000	1.8
--- PropertySetContainer.java	28 Jan 2011 16:27:05 -0000	1.8.4.1
***************
*** 1,4 ****
  /********************************************************************************
!  * Copyright (c) 2006, 2008 IBM Corporation. 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 
--- 1,4 ----
  /********************************************************************************
!  * Copyright (c) 2006, 2011 IBM Corporation. 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 
***************
*** 14,17 ****
--- 14,18 ----
   * David Dykstal (IBM) - 142806: refactoring persistence framework
   * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
+  * David McKnight   (IBM)        - [334837] Ordering of Library list entries incorrect after migration
   ********************************************************************************/
  
***************
*** 19,24 ****
  
  import java.util.ArrayList;
- import java.util.HashMap;
  import java.util.Iterator;
  import java.util.List;
  import java.util.Map;
--- 20,25 ----
  
  import java.util.ArrayList;
  import java.util.Iterator;
+ import java.util.LinkedHashMap;
  import java.util.List;
  import java.util.Map;
***************
*** 33,37 ****
  
  	public PropertySetContainer() {
! 		_propertySets = new HashMap();
  	}
  
--- 34,38 ----
  
  	public PropertySetContainer() {
! 		_propertySets = new LinkedHashMap();
  	}