mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 18:05:33 +02:00
Code Issues Wiki Activity

[fix] [174883] Can not create new connection after a profile is deleted

Browse source
This commit is contained in:
Uwe Stieber 2007-02-21 15:04:32 +00:00
parent 1746c53b04
commit dd7e7887a3
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java
View file

@ -232,7 +232,14 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
for (int i = 0; i < propertyPageExtensions.length; i++) for (int i = 0; i < propertyPageExtensions.length; i++)
{ {
IConfigurationElement configurationElement = propertyPageExtensions[i]; IConfigurationElement configurationElement = propertyPageExtensions[i];
String objectClass = configurationElement.getAttribute("objectClass"); //$NON-NLS-1$ String objectClass = configurationElement.getAttribute("objectClass"); //$NON-NLS-1$
// The objectClass attribute is a) deprecated and b) optional. If null, do not
// try to instanciate a class from it as it will lead to a NPE. It is very bad
// style to let throw the exception and catch it with an empty catch block. If
// the debugger is configured to intercept NPE's, we end up always here.
if (objectClass == null) continue;
String name = configurationElement.getAttribute("name"); //$NON-NLS-1$ String name = configurationElement.getAttribute("name"); //$NON-NLS-1$
Class objCls = null; Class objCls = null;
try try

16
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEDefaultNewConnectionWizard.java
View file

@ -16,6 +16,7 @@
package org.eclipse.rse.ui.wizards.newconnection; package org.eclipse.rse.ui.wizards.newconnection;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.List; import java.util.List;
@ -26,6 +27,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardPage; import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.RSEPreferencesManager;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemNewConnectionWizardPage; import org.eclipse.rse.core.model.ISystemNewConnectionWizardPage;
@ -119,7 +121,16 @@ public class RSEDefaultNewConnectionWizard extends RSEAbstractNewConnectionWizar
if (mainPage != null && getSystemType() != null) if (mainPage != null && getSystemType() != null)
mainPage.setSystemType(getSystemType()); mainPage.setSystemType(getSystemType());
String defaultProfileName = RSEUIPlugin.getDefault().getSystemRegistry().getSystemProfileManager().getDefaultPrivateSystemProfile().getName(); // If the team profile is available and active, then we default to the team profile.
// If the team profile is not available or inactive, the default private system profile
// is used (if available).
List profileNames = activeProfileNames != null ? Arrays.asList(activeProfileNames) : new ArrayList();
String defaultProfileName = RSEPreferencesManager.getDefaultTeamProfileName();
if (!profileNames.contains(defaultProfileName)) {
ISystemProfile defaultPrivateProfile = RSEUIPlugin.getDefault().getSystemRegistry().getSystemProfileManager().getDefaultPrivateSystemProfile();
if (defaultPrivateProfile != null) defaultProfileName = defaultPrivateProfile.getName();
}
mainPage.setProfileNames(activeProfileNames); mainPage.setProfileNames(activeProfileNames);
// if there is no connection currently selected, default the profile to // if there is no connection currently selected, default the profile to
@ -127,9 +138,8 @@ public class RSEDefaultNewConnectionWizard extends RSEAbstractNewConnectionWizar
// 1. the profile the last connection was created in, in this session // 1. the profile the last connection was created in, in this session
// 3. the default profile. // 3. the default profile.
if (currentlySelectedConnection == null) { if (currentlySelectedConnection == null) {
if (lastProfile != null && "".equals(lastProfile))lastProfile = null; //$NON-NLS-1$ if (lastProfile != null && "".equals(lastProfile)) lastProfile = null; //$NON-NLS-1$
if (lastProfile == null && activeProfileNames != null) { if (lastProfile == null && activeProfileNames != null) {
List profileNames = Arrays.asList(activeProfileNames);
if (defaultProfileName != null && profileNames.contains(defaultProfileName)) if (defaultProfileName != null && profileNames.contains(defaultProfileName))
lastProfile = defaultProfileName; lastProfile = defaultProfileName;