Update of /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui/wizards
In directory vz-cvs-4.sog:/tmp/cvs-serv24126/src/net/sourceforge/eclipseccase/ui/wizards
Modified Files:
CompareDialog.java CheckinWizardPage.java
Log Message:
Fixed bug 3489552
Index: CheckinWizardPage.java
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui/wizards/CheckinWizardPage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CheckinWizardPage.java 22 Feb 2012 08:47:27 -0000 1.3
--- CheckinWizardPage.java 23 Feb 2012 12:16:54 -0000 1.4
***************
*** 1,4 ****
--- 1,6 ----
package net.sourceforge.eclipseccase.ui.wizards;
+ import org.eclipse.swt.layout.FillLayout;
+
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
***************
*** 146,153 ****
public void createControl(Composite parent) {
Composite mainComposite = new Composite(parent, SWT.NONE);
! setControl(mainComposite);
!
! TabFolder tabFolder = new TabFolder(mainComposite, SWT.NONE);
tabFolder.setBounds(0, 20, 564, 262);
--- 148,160 ----
public void createControl(Composite parent) {
+ GridLayout layout = new GridLayout();
Composite mainComposite = new Composite(parent, SWT.NONE);
! mainComposite.setLayout(layout);
! mainComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
! setControl(mainComposite);
!
! TabFolder tabFolder = new TabFolder(mainComposite, SWT.NONE);
! tabFolder.setLayoutData(new GridData(GridData.FILL_BOTH));
!
tabFolder.setBounds(0, 20, 564, 262);
***************
*** 163,169 ****
final Composite composite = new Composite(tabFolder, SWT.NONE);
! composite.setLayout(new GridLayout());
! composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
! listViewer = new ListViewer(composite, SWT.NONE);
listViewer.setContentProvider(new ArrayContentProvider());
listViewer.setLabelProvider(new ResourceLabelProvider());
--- 170,176 ----
final Composite composite = new Composite(tabFolder, SWT.NONE);
! composite.setLayout(new FillLayout());
!
! listViewer = new ListViewer(composite);
listViewer.setContentProvider(new ArrayContentProvider());
listViewer.setLabelProvider(new ResourceLabelProvider());
***************
*** 361,365 ****
public String getText(Object element) {
IResource resource = (IResource) element;
! return resource.getFullPath().toString();
}
}
--- 368,374 ----
public String getText(Object element) {
IResource resource = (IResource) element;
! //return resource.getFullPath().toString();
! return resource.getLocation()
! .toOSString();
}
}
Index: CompareDialog.java
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui/wizards/CompareDialog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CompareDialog.java 16 Feb 2012 09:48:40 -0000 1.2
--- CompareDialog.java 23 Feb 2012 12:16:54 -0000 1.3
***************
*** 1,7 ****
package net.sourceforge.eclipseccase.ui.wizards;
import java.util.ResourceBundle;
import org.eclipse.compare.*;
! import org.eclipse.compare.internal.ResizableDialog;
import org.eclipse.compare.structuremergeviewer.ICompareInput;
import org.eclipse.jface.viewers.Viewer;
--- 1,13 ----
package net.sourceforge.eclipseccase.ui.wizards;
+ import org.eclipse.jface.dialogs.Dialog;
+
+ import org.eclipse.jface.dialogs.IDialogSettings;
+
+
+
import java.util.ResourceBundle;
import org.eclipse.compare.*;
!
import org.eclipse.compare.structuremergeviewer.ICompareInput;
import org.eclipse.jface.viewers.Viewer;
***************
*** 11,15 ****
import org.eclipse.swt.widgets.*;
! public class CompareDialog extends ResizableDialog {
private static final CompareConfiguration cc = new CompareConfiguration();
--- 17,27 ----
import org.eclipse.swt.widgets.*;
! /**
! * A resizable CompareDialog
! *
! * @author mike
! *
! */
! public class CompareDialog extends Dialog {
private static final CompareConfiguration cc = new CompareConfiguration();
***************
*** 18,26 ****
private ICompareInput myInput;
! @SuppressWarnings("restriction")
protected CompareDialog(Shell shell, ResourceBundle bundle) {
! super(shell, bundle);
! this.setShellStyle(SWT.CLOSE);
cc.setLeftEditable(false);
cc.setRightEditable(false);
--- 30,45 ----
private ICompareInput myInput;
+
+ //Initial size.
+ private static final int WIDTH_HINT = 800;
! private static final int HEIGHT_HINT = 600;
!
!
protected CompareDialog(Shell shell, ResourceBundle bundle) {
! super(shell);
! //make sure dialog is resizable.
! setShellStyle(SWT.CLOSE | SWT.TITLE | SWT.BORDER
! | SWT.APPLICATION_MODAL | SWT.RESIZE | getDefaultOrientation());
cc.setLeftEditable(false);
cc.setRightEditable(false);
***************
*** 52,56 ****
getShell().setText("Compare"); //$NON-NLS-1$
compareViewerPane = new ViewerSwitchingPane(composite, SWT.BORDER | SWT.FLAT);
! compareViewerPane.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL));
if (myInput != null) {
--- 71,84 ----
getShell().setText("Compare"); //$NON-NLS-1$
compareViewerPane = new ViewerSwitchingPane(composite, SWT.BORDER | SWT.FLAT);
! //Set
! GridData gridData = new GridData();
! gridData.heightHint = HEIGHT_HINT;
! gridData.widthHint = WIDTH_HINT;
! gridData.horizontalAlignment = GridData.FILL;
! gridData.verticalAlignment = GridData.FILL;
! gridData.grabExcessHorizontalSpace = true;
! gridData.grabExcessVerticalSpace = true;
! compareViewerPane.setLayoutData(gridData);
!
if (myInput != null) {
***************
*** 81,83 ****
--- 109,115 ----
}
+
+
+
+
}
|
