Attachment #177290 for bug #318557

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

View | Details | Raw Unified | Return to bug 318557
Collapse All | Expand All

Lines 2-8 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.team.cvs.ui; singleton:=true	4	Bundle-SymbolicName: org.eclipse.team.cvs.ui; singleton:=true
5	Bundle-Version: 3.3.300.qualifier	5	Bundle-Version: 3.3.301.qualifier
6	Bundle-Activator: org.eclipse.team.internal.ccvs.ui.CVSUIPlugin	6	Bundle-Activator: org.eclipse.team.internal.ccvs.ui.CVSUIPlugin
7	Bundle-Vendor: %providerName	7	Bundle-Vendor: %providerName
8	Bundle-Localization: plugin	8	Bundle-Localization: plugin




/*******************************************************************************
 * 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


	private boolean fIsEmpty;
    
	private SashForm horizontalSash;
	private SashForm verticalSash;
	private Splitter placeholder;
	private boolean showCompare;
	
    public CommitWizardCommitPage(IResource [] resources, CommitWizard wizard) {

        PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.COMMIT_COMMENT_PAGE);
        
        
        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);

            });
            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));

        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();
    }


		protected CompareViewerSwitchingPane createContentViewerSwitchingPane(
				Splitter parent, int style, CompareEditorInput cei) {
			return super.createContentViewerSwitchingPane(placeholder, style, cei);
		}

		protected void setPageDescription(String title) {

Return to bug 318557

Lines 1-5 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java (-5 / +15 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 72-79 Link Here
72		72
73	private boolean fIsEmpty;	73	private boolean fIsEmpty;
74		74
75	private Splitter horizontalSash;	75	private SashForm horizontalSash;
76	private SashForm verticalSash;	76	private SashForm verticalSash;
		77	private Splitter placeholder;
77	private boolean showCompare;	78	private boolean showCompare;
78		79
79	public CommitWizardCommitPage(IResource [] resources, CommitWizard wizard) {	80	public CommitWizardCommitPage(IResource [] resources, CommitWizard wizard) {
Lines 115-128 Link Here
115	PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.COMMIT_COMMENT_PAGE);	116	PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.COMMIT_COMMENT_PAGE);
116		117
117		118
118	horizontalSash = new Splitter(composite, SWT.HORIZONTAL);	119	horizontalSash = new SashForm(composite, SWT.HORIZONTAL);
119	horizontalSash.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));	120	horizontalSash.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
120		121
121	verticalSash = new SashForm(horizontalSash, SWT.VERTICAL);	122	verticalSash = new SashForm(horizontalSash, SWT.VERTICAL);
122	verticalSash.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));	123	verticalSash.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
123		124
124	createCommentArea(verticalSash, converter);	125	createCommentArea(verticalSash, converter);
125		126
		127	placeholder = new Splitter(horizontalSash, SWT.VERTICAL /any/);
		128	placeholder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
		129
126	createChangesArea(verticalSash, converter);	130	createChangesArea(verticalSash, converter);
127		131
128	IDialogSettings section = getDialogSettings().getSection(CommitWizard.COMMIT_WIZARD_DIALOG_SETTINGS);	132	IDialogSettings section = getDialogSettings().getSection(CommitWizard.COMMIT_WIZARD_DIALOG_SETTINGS);
Lines 196-201 Link Here
196	});	200	});
197	showChanges.setLayoutData(new GridData());	201	showChanges.setLayoutData(new GridData());
198	bottomChild.showPage(changeDesc);	202	bottomChild.showPage(changeDesc);
		203	// Hide compare pane
		204	horizontalSash.setMaximizedControl(verticalSash);
199	} else {	205	} else {
200	final Composite composite= new Composite(parent, SWT.NONE);	206	final Composite composite= new Composite(parent, SWT.NONE);
201	composite.setLayout(SWTUtils.createGridLayout(1, converter, SWTUtils.MARGINS_NONE));	207	composite.setLayout(SWTUtils.createGridLayout(1, converter, SWTUtils.MARGINS_NONE));
Lines 210-215 Link Here
210	Control c = createChangesPage(bottomChild, fWizard.getParticipant());	216	Control c = createChangesPage(bottomChild, fWizard.getParticipant());
211	bottomChild.setLayoutData(SWTUtils.createGridData(SWT.DEFAULT, SWT.DEFAULT, SWT.FILL, SWT.FILL, true, true));	217	bottomChild.setLayoutData(SWTUtils.createGridData(SWT.DEFAULT, SWT.DEFAULT, SWT.FILL, SWT.FILL, true, true));
212	bottomChild.showPage(c);	218	bottomChild.showPage(c);
		219	// Restore compare pane. It has been hidden when file display threshold was reached.
		220	if (showCompare) {
		221	horizontalSash.setMaximizedControl(null);
		222	}
213	Dialog.applyDialogFont(getControl());	223	Dialog.applyDialogFont(getControl());
214	((Composite)getControl()).layout();	224	((Composite)getControl()).layout();
215	}	225	}
Lines 240-246 Link Here
240		250
241	protected CompareViewerSwitchingPane createContentViewerSwitchingPane(	251	protected CompareViewerSwitchingPane createContentViewerSwitchingPane(
242	Splitter parent, int style, CompareEditorInput cei) {	252	Splitter parent, int style, CompareEditorInput cei) {
243	return super.createContentViewerSwitchingPane(horizontalSash, style, cei);	253	return super.createContentViewerSwitchingPane(placeholder, style, cei);
244	}	254	}
245		255
246	protected void setPageDescription(String title) {	256	protected void setPageDescription(String title) {