mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-29 19:23:38 +02:00
[226324] Default user ID from preferences not inherited
This commit is contained in:
parent
e0f2f98a47
commit
7c686d8149
2 changed files with 4 additions and 2 deletions
|
@ -22,6 +22,7 @@
|
||||||
* Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
|
* Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
|
||||||
* Kevin Doyle (IBM) - [203365] Profile should not be saved as a result of file transfer
|
* Kevin Doyle (IBM) - [203365] Profile should not be saved as a result of file transfer
|
||||||
* David Dykstal (IBM) - [225911] Exception received after deleting a profile containing a connection
|
* David Dykstal (IBM) - [225911] Exception received after deleting a profile containing a connection
|
||||||
|
* David McKnight (IBM) - [226324] Default user ID from preferences not inherited
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.core.model;
|
package org.eclipse.rse.core.model;
|
||||||
|
@ -275,7 +276,7 @@ public class Host extends RSEModelObject implements IHost {
|
||||||
public String getDefaultUserId() {
|
public String getDefaultUserId() {
|
||||||
String uid = getLocalDefaultUserId();
|
String uid = getLocalDefaultUserId();
|
||||||
if ((uid == null) || (uid.length() == 0)) {
|
if ((uid == null) || (uid.length() == 0)) {
|
||||||
uid = RSEPreferencesManager.getUserId(getSystemType().getId()); // resolve from preferences
|
uid = RSEPreferencesManager.getDefaultUserId(getSystemType()); // resolve from preferences
|
||||||
if ((uid != null) && ucId) uid = uid.toUpperCase();
|
if ((uid != null) && ucId) uid = uid.toUpperCase();
|
||||||
}
|
}
|
||||||
return uid;
|
return uid;
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
* David Dykstal (IBM) - [197036] minor refactoring caused by SystemRegistry fix for this bug
|
* David Dykstal (IBM) - [197036] minor refactoring caused by SystemRegistry fix for this bug
|
||||||
* Martin Oberhuber (Wind River) - [215820] Move SystemRegistry implementation to Core
|
* Martin Oberhuber (Wind River) - [215820] Move SystemRegistry implementation to Core
|
||||||
* David Dykstal (IBM) - [216858] Need the ability to Import/Export RSE connections for sharing
|
* David Dykstal (IBM) - [216858] Need the ability to Import/Export RSE connections for sharing
|
||||||
|
* David McKnight (IBM) - [226324] Default user ID from preferences not inherited
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.internal.ui.view;
|
package org.eclipse.rse.internal.ui.view;
|
||||||
|
@ -467,7 +468,7 @@ public class SystemViewConnectionAdapter
|
||||||
{
|
{
|
||||||
String localUserId = conn.getLocalDefaultUserId();
|
String localUserId = conn.getLocalDefaultUserId();
|
||||||
data.setLocalValue(localUserId);
|
data.setLocalValue(localUserId);
|
||||||
String parentUserId = RSEPreferencesManager.getUserId(conn.getSystemType().getId());
|
String parentUserId = RSEPreferencesManager.getDefaultUserId(conn.getSystemType());
|
||||||
data.setInheritedValue(parentUserId);
|
data.setInheritedValue(parentUserId);
|
||||||
data.setIsLocal((localUserId!=null)&&(localUserId.length()>0));
|
data.setIsLocal((localUserId!=null)&&(localUserId.length()>0));
|
||||||
//data.printDetails();
|
//data.printDetails();
|
||||||
|
|
Loading…
Add table
Reference in a new issue