Attachment 177290 Details for Bug 318557 – Fix v01

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

[patch] Fix v01

clipboard.txt (text/plain), 4.24 KB, created by Tomasz Zarna

on 2010-08-24 05:20:05 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2010-08-24 05:20:05 EDT

Size: 4.24 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.cvs.ui
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.23
>diff -u -r1.23 MANIFEST.MF
>--- META-INF/MANIFEST.MF	20 Apr 2010 14:26:24 -0000	1.23
>+++ META-INF/MANIFEST.MF	24 Aug 2010 09:19:17 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.team.cvs.ui; singleton:=true
>-Bundle-Version: 3.3.300.qualifier
>+Bundle-Version: 3.3.301.qualifier
> Bundle-Activator: org.eclipse.team.internal.ccvs.ui.CVSUIPlugin
> Bundle-Vendor: %providerName
> Bundle-Localization: plugin
>Index: src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java,v
>retrieving revision 1.30
>diff -u -r1.30 CommitWizardCommitPage.java
>--- src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java	7 Oct 2009 14:11:24 -0000	1.30
>+++ src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java	24 Aug 2010 09:19:17 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2010 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
>  * which accompanies this distribution, and is available at
>@@ -72,8 +72,9 @@
> 
> 	private boolean fIsEmpty;
>     
>-	private Splitter horizontalSash;
>+	private SashForm horizontalSash;
> 	private SashForm verticalSash;
>+	private Splitter placeholder;
> 	private boolean showCompare;
> 	
>     public CommitWizardCommitPage(IResource [] resources, CommitWizard wizard) {
>@@ -115,14 +116,17 @@
>         PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.COMMIT_COMMENT_PAGE);
>         
>         
>-        horizontalSash = new Splitter(composite, SWT.HORIZONTAL);
>+        horizontalSash = new SashForm(composite, SWT.HORIZONTAL);
>         horizontalSash.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
>         
>         verticalSash = new SashForm(horizontalSash, SWT.VERTICAL);
>         verticalSash.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
> 
>         createCommentArea(verticalSash, converter);
>-        
>+
>+        placeholder = new Splitter(horizontalSash, SWT.VERTICAL /*any*/);
>+        placeholder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
>+
>         createChangesArea(verticalSash, converter);
> 
>         IDialogSettings section = getDialogSettings().getSection(CommitWizard.COMMIT_WIZARD_DIALOG_SETTINGS);
>@@ -196,6 +200,8 @@
>             });
>             showChanges.setLayoutData(new GridData());
>             bottomChild.showPage(changeDesc);
>+            // Hide compare pane
>+            horizontalSash.setMaximizedControl(verticalSash);
>         } else {
>             final Composite composite= new Composite(parent, SWT.NONE);
>             composite.setLayout(SWTUtils.createGridLayout(1, converter, SWTUtils.MARGINS_NONE));
>@@ -210,6 +216,10 @@
>         Control c = createChangesPage(bottomChild, fWizard.getParticipant());
>         bottomChild.setLayoutData(SWTUtils.createGridData(SWT.DEFAULT, SWT.DEFAULT, SWT.FILL, SWT.FILL, true, true));
>         bottomChild.showPage(c);
>+        // Restore compare pane. It has been hidden when file display threshold was reached.
>+        if (showCompare) {
>+        	horizontalSash.setMaximizedControl(null);
>+        }
>         Dialog.applyDialogFont(getControl());
>         ((Composite)getControl()).layout();
>     }
>@@ -240,7 +250,7 @@
> 
> 		protected CompareViewerSwitchingPane createContentViewerSwitchingPane(
> 				Splitter parent, int style, CompareEditorInput cei) {
>-			return super.createContentViewerSwitchingPane(horizontalSash, style, cei);
>+			return super.createContentViewerSwitchingPane(placeholder, style, cei);
> 		}
> 
> 		protected void setPageDescription(String title) {

Actions: View | Diff

Attachments on bug 318557: 177290