Attachment 27641 Details for Bug 66576 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

66576.txt (text/plain), 14.87 KB, created by Michael Rennie

on 2005-09-28 15:27:38 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Rennie

Created: 2005-09-28 15:27:38 EDT

Size: 14.87 KB

patch

obsolete

>Index: ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java,v
>retrieving revision 1.29
>diff -u -r1.29 LaunchConfigurationPresentationManager.java
>--- ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java	5 Aug 2005 15:54:58 -0000	1.29
>+++ ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java	28 Sep 2005 19:24:03 -0000
>@@ -190,7 +190,7 @@
> 	public String getDescription(ILaunchConfigurationType configType, String mode) {
> 		LaunchConfigurationPresentationManager manager = LaunchConfigurationPresentationManager.getDefault();
> 		LaunchConfigurationTabGroupExtension extension = manager.getExtension(configType.getAttribute("id"), mode); //$NON-NLS-1$
>-		return extension.getDescription(mode);
>+		return (extension != null ? extension.getDescription(mode) : null);
> 	}	
> 	
> }
>Index: ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java,v
>retrieving revision 1.37
>diff -u -r1.37 LaunchConfigurationTabGroupViewer.java
>--- ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java	25 Aug 2005 18:30:20 -0000	1.37
>+++ ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java	28 Sep 2005 19:24:03 -0000
>@@ -36,6 +36,7 @@
> import org.eclipse.jface.viewers.Viewer;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.custom.BusyIndicator;
>+import org.eclipse.swt.custom.StackLayout;
> import org.eclipse.swt.events.ModifyEvent;
> import org.eclipse.swt.events.ModifyListener;
> import org.eclipse.swt.events.SelectionAdapter;
>@@ -148,6 +149,18 @@
> 	 * launch configuration type or <code>null</code> if none.
> 	 */
> 	private String fDescription = null;
>+	
>+	/**
>+	 * A placeholder for switching between the tabs for a config and the getting started tab
>+	 * @since 3.2
>+	 */
>+	private Composite fTabPlaceHolder = null;
>+	
>+	/**
>+	 * A new composite replacing the perspectives tab
>+	 * @since 3.2
>+	 */
>+	private Composite fGettingStarted = null;
> 
> 	/**
> 	 * Constructs a viewer in the given composite, contained by the given
>@@ -232,18 +245,33 @@
> 		gd = new GridData();
> 		gd.horizontalSpan = 2;
> 		spacer.setLayoutData(gd);
>-
>-		fTabComposite = new Composite(container, SWT.NONE);
>+		
>+		/*
>+		 * fix for bug 66576 and 79709
>+		 */
>+		fTabPlaceHolder = new Composite(container, SWT.NONE);
>+		fTabPlaceHolder.setLayout(new StackLayout());
>+		gd = new GridData(GridData.FILL_BOTH);
>+		gd.horizontalSpan = 2;
>+		fTabPlaceHolder.setLayoutData(gd);
>+		
>+		fGettingStarted = new Composite(fTabPlaceHolder, SWT.NONE);
>+		fGettingStarted.setLayout(new GridLayout());
>+		gd = new GridData(GridData.FILL_BOTH);
>+		fGettingStarted.setLayoutData(gd);
>+		
>+		createGettingStarted(fGettingStarted);
>+		
>+		fTabComposite = new Composite(fTabPlaceHolder, SWT.NONE);
> 		GridLayout outerTabCompositeLayout = new GridLayout();
> 		outerTabCompositeLayout.marginHeight = 0;
> 		outerTabCompositeLayout.marginWidth = 0;
> 		fTabComposite.setLayout(outerTabCompositeLayout);
> 		gd = new GridData(GridData.FILL_BOTH);
>-		gd.horizontalSpan = 2;
> 		fTabComposite.setLayoutData(gd);
> 
> 		createTabFolder(fTabComposite);
>-
>+		
> 		Composite buttonComp = new Composite(container, SWT.NONE);
> 		GridLayout buttonCompLayout = new GridLayout();
> 		buttonCompLayout.numColumns = 2;
>@@ -278,6 +306,48 @@
> 
> 	}
> 	
>+	/**
>+	 * Simple method to create a spacer in the page
>+	 * 
>+	 * @param composite the composite to add the spacer to
>+	 * @param columnSpan the amount of space for the spacer
>+	 * @since 3.2
>+	 */
>+	protected void createSpacer(Composite composite, int columnSpan) {
>+		Label label = new Label(composite, SWT.NONE);
>+		GridData gd = new GridData();
>+		gd.horizontalSpan = columnSpan;
>+		label.setLayoutData(gd);
>+	}// end createSpacer
>+	
>+	/**
>+	 * Creates some help text for the tab group launch types
>+	 * @param parent thep arent composite
>+	 * @since 3.2
>+	 */
>+	private void createGettingStarted(Composite parent) {
>+		Font font = parent.getFont();
>+		GridData gd = null;
>+		createSpacer(parent, 1);
>+		Label label = new Label(parent, SWT.LEFT | SWT.WRAP);
>+		label.setFont(font);
>+		label.setText(MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_2, null));
>+		gd = new GridData(GridData.FILL_HORIZONTAL);
>+		gd.widthHint = parent.getBounds().width - 30;
>+		label.setLayoutData(gd);
>+		createSpacer(parent, 1);
>+		label = new Label(parent, SWT.LEFT | SWT.WRAP);
>+		label.setFont(font);
>+		label.setText(MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_1, null));
>+		gd = new GridData(GridData.FILL_HORIZONTAL);
>+		gd.widthHint = parent.getBounds().width - 30;
>+		label.setLayoutData(gd);
>+	}
>+	
>+	/**
>+	 * Creates the tab folder for displaying config instances
>+	 * @param parent
>+	 */
> 	private void createTabFolder(Composite parent) {
> 		Point size = null;
> 		if (fTabFolder != null) {
>@@ -465,18 +535,27 @@
> 			public void run() {
> 				try {
> 					if (fInput instanceof ILaunchConfiguration) {
>+						/*
>+						 * fix for bug 66576 and 79709
>+						 */
>+						((StackLayout)fTabPlaceHolder.getLayout()).topControl = fTabComposite;
>+						fTabPlaceHolder.layout(true);
> 						ILaunchConfiguration configuration = (ILaunchConfiguration)fInput;
> 						setOriginal(configuration);
> 						setWorkingCopy(configuration.getWorkingCopy());
> 						displayInstanceTabs();
> 					} else if (fInput instanceof ILaunchConfigurationType) {
>-						ILaunchConfiguration configuration = LaunchConfigurationManager.getSharedTypeConfig((ILaunchConfigurationType)fInput);
>-						setOriginal(configuration);
>-						setWorkingCopy(configuration.getWorkingCopy());
>-						displaySharedTabs();
>+						/*
>+						 * fix for bug 66576 and 79709
>+						 */
>+						fDescription = getDescription((ILaunchConfigurationType)fInput);
>+						fNameLabel.setVisible(false);
>+						fNameWidget.setVisible(false);
>+						setNoInput();
>+						refreshStatus();
> 					} else {
> 						setNoInput();
>-					}
>+					}//end else
> 					setRedraw(true);
> 				} catch (CoreException ce) {
> 					errorDialog(ce);
>@@ -491,7 +570,8 @@
> 	private void setNoInput() {
> 		setOriginal(null);
> 		setWorkingCopy(null);
>-		getVisibleArea().setVisible(false);
>+		((StackLayout)fTabPlaceHolder.getLayout()).topControl = fGettingStarted;
>+		fTabPlaceHolder.layout(true);
> 		disposeExistingTabs();				
> 	}
> 	
>@@ -558,66 +638,13 @@
> 	}
> 	
> 	/**
>-	 * Displays tabs for the current config type
>-	 */
>-	protected void displaySharedTabs() {
>-		// Turn on initializing flag to ignore message updates
>-		setInitializingTabs(true);
>-
>-		ILaunchConfigurationType type = null;
>-		try {
>-			type = getWorkingCopy().getType();
>-			showSharedTabsFor(type);
>-		} catch (CoreException e) {
>-			errorDialog(e);
>-			setInitializingTabs(false);
>-			return;
>-		}
>-
>-		// hide the name area
>-		fNameLabel.setVisible(false);
>-		fNameWidget.setVisible(false);
>-		// Update the name field before to avoid verify error
>-		getNameWidget().setText(getWorkingCopy().getName());
>-
>-		// Retrieve the current tab group.  If there is none, clean up and leave
>-		ILaunchConfigurationTabGroup tabGroup = getTabGroup();
>-		if (tabGroup == null) {
>-			IStatus status = new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_No_tabs_defined_for_launch_configuration_type__0__1, new String[]{type.getName()}), null); 
>-			CoreException e = new CoreException(status);
>-			errorDialog(e);
>-			setInitializingTabs(false);
>-			return;
>-		}
>-
>-		// Update the tabs with the new working copy
>-		tabGroup.initializeFrom(getWorkingCopy());
>-
>-		// Update the name field after in case client changed it
>-		getNameWidget().setText(getWorkingCopy().getName());
>-		
>-		fCurrentTabIndex = getTabFolder().getSelectionIndex();
>-
>-		// Turn off initializing flag to update message
>-		setInitializingTabs(false);
>-		
>-		if (!getVisibleArea().isVisible()) {
>-			getVisibleArea().setVisible(true);
>-		}
>-		
>-		fDescription = getDescription(null);
>-		
>-		refreshStatus();		
>-	}	
>-	
>-	/**
> 	 * Populate the tabs in the configuration edit area to be appropriate to the current
> 	 * launch configuration type.
> 	 */
> 	private void showInstanceTabsFor(ILaunchConfigurationType configType) {
> 
> 		// Don't do any work if the current tabs are for the current config type
>-		if (getTabType() != null && getTabType().equals(configType) && !(getTabGroup() instanceof PerspectiveTabGroup)) {
>+		if (getTabType() != null && getTabType().equals(configType)) { 
> 			return;
> 		}
> 		
>@@ -672,30 +699,6 @@
> 	}
> 	
> 	/**
>-	 * Populate the tabs in the configuration edit area for the shared info
>-	 * for the given launch config type.
>-	 */
>-	private void showSharedTabsFor(ILaunchConfigurationType configType) {
>-
>-		// Don't do any work if the current tabs are for the current config type
>-		if (getTabType() != null && getTabType().equals(configType) && (getTabGroup() instanceof PerspectiveTabGroup)) {
>-			return;
>-		}		
>-		
>-		// Build the new tabs
>-		ILaunchConfigurationTabGroup group = new PerspectiveTabGroup(configType);
>-		group.createTabs(getLaunchConfigurationDialog(), getLaunchConfigurationDialog().getMode());
>-		ILaunchConfigurationTab[] tabs = group.getTabs();
>-		for (int i = 0; i < tabs.length; i++) {
>-			tabs[i].setLaunchConfigurationDialog(getLaunchConfigurationDialog());
>-		}
>-				
>-		showTabsFor(group);
>-		setTabType(configType);
>-		setTabGroup(group);		
>-	}		
>-
>-	/**
> 	 * Create the tabs in the configuration edit area for the given tab group.
> 	 */
> 	private void showTabsFor(ILaunchConfigurationTabGroup tabGroup) {
>@@ -934,11 +937,6 @@
> 		if(isInitializingTabs()) {
> 			return false;
> 		}
>-		
>-		if (getActiveTab() instanceof PerspectivesTab) {
>-			return false;
>-		}
>-		
> 		if (getWorkingCopy() == null) {
> 			return false;
> 		}
>@@ -1224,11 +1222,7 @@
> 	 * Notification that the 'Revert' button has been pressed
> 	 */
> 	protected void handleRevertPressed() {
>-		if (getActiveTab() instanceof PerspectivesTab) {
>-			inputChanged(getTabType());	
>-		} else {
>-			inputChanged(getOriginal());
>-		}
>+		inputChanged(getOriginal());
> 	}	
> 	
> 	/**
>Index: ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java,v
>retrieving revision 1.85
>diff -u -r1.85 LaunchConfigurationsDialog.java
>--- ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java	28 Sep 2005 16:06:25 -0000	1.85
>+++ ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java	28 Sep 2005 19:24:03 -0000
>@@ -1296,7 +1296,7 @@
> 		setErrorMessage(getTabViewer().getErrorMesssage());
> 		setMessage(getTabViewer().getMessage());				
> 	}
>-	
>+
> 	/**
> 	 * Returns the launch configuration selection area control.
> 	 * 
>Index: ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java,v
>retrieving revision 1.9
>diff -u -r1.9 LaunchConfigurationsMessages.java
>--- ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java	28 Sep 2005 16:06:25 -0000	1.9
>+++ ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java	28 Sep 2005 19:24:03 -0000
>@@ -149,11 +149,7 @@
> 		NLS.initializeMessages(BUNDLE_NAME, LaunchConfigurationsMessages.class);
> 	}
> 
>-	public static String SharedLaunchTab_0;
>+	public static String LaunchConfigurationTabGroupViewer_1;
> 
>-	public static String SharedLaunchTab_1;
>-
>-	public static String SharedLaunchTab_2;
>-
>-	public static String SharedLaunchTab_3;
>+	public static String LaunchConfigurationTabGroupViewer_2;
> }
>\ No newline at end of file
>Index: ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
>===================================================================
>RCS file: /home/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties,v
>retrieving revision 1.112
>diff -u -r1.112 LaunchConfigurationsMessages.properties
>--- ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties	19 May 2005 01:58:49 -0000	1.112
>+++ ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties	28 Sep 2005 19:24:03 -0000
>@@ -45,6 +45,8 @@
> LaunchConfigurationDialog_An_exception_occurred_while_retrieving_launch_configurations_20=An exception occurred while retrieving launch configurations
> LaunchConfigurationDialog_Cancel_34=Cancel
> LaunchConfigurationTabGroupViewer_0={0} is an invalid character in launch configuration name {1}
>+LaunchConfigurationTabGroupViewer_1=Once you have created a new configuration you can then configure its settings.
>+LaunchConfigurationTabGroupViewer_2=All possible configuration types are shown in the list to the left. To create a new configuration simply select the configuration type you want and click the New button, located directly below the list. You can create as many configurations as you wish for any of the types, with each configuration independent from any others.
> LaunchConfigurationDialog_Create__manage__and_run_launch_configurations_8=Create, manage, and run configurations
> LaunchConfigurationDialog_Dele_te_14=Dele&te
> LaunchConfigurationDialog_Discard_changes__38=Discard changes?
>@@ -121,12 +123,6 @@
> EnvironmentTab_19=Select &environment variables to add:
> EnvironmentTab_20=Select Environment Variables
> 
>-PerspectivesTab_0=These settings associate a perspective with {0} launch configurations. A different perspective may be associated with each supported launch mode, and can optionally be opened when a configuration is launched or when an application suspends via the Debug preferences. To indicate that a perspective should not be opened, select "None".
>-PerspectivesTab_1=None
>-PerspectivesTab_2={0}:
>-PerspectivesTab_3=R&estore Defaults
>-PerspectivesTab_7=Perspectives
>-
> FavoritesDialog_1=Organize {0} Favorites
> FavoritesDialog_2=Fa&vorites:
> FavoritesDialog_3=Ad&d...

Actions: View | Diff

Attachments on bug 66576: 27641 | 27646 | 27650 | 27670 | 27723