Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2004-06-06 21:56:29 +0000
committerAndre Weinand2004-06-06 21:56:29 +0000
commit68f0c2882e3f8fdee4ae9067d8ff5af1357cf7cd (patch)
tree5336bf560a227334a649bb5e22880a84f4cf5e96 /bundles/org.eclipse.compare
parent874aec1e99a0d6fab03493b420b5f7add142e2c1 (diff)
downloadeclipse.platform.team-68f0c2882e3f8fdee4ae9067d8ff5af1357cf7cd.tar.gz
eclipse.platform.team-68f0c2882e3f8fdee4ae9067d8ff5af1357cf7cd.tar.xz
eclipse.platform.team-68f0c2882e3f8fdee4ae9067d8ff5af1357cf7cd.zip
fixed #56875
Diffstat (limited to 'bundles/org.eclipse.compare')
-rw-r--r--bundles/org.eclipse.compare/buildnotes_compare.html1
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java7
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html1
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java7
4 files changed, 8 insertions, 8 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index c96f304d5..c22c62dcc 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -23,6 +23,7 @@ Problem reports fixed</h2>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=55876">55876</a>: Viewer: Text not repainted when moving sash and then clicking on scroll bars<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=65205">65205</a>: Compare editor doesn't update correctly while scrolling<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=62545">62545</a>: binary compare text insertion cursor is very large<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=56875">56875</a>: Resizing Apply Patch dialog doesn't resize tree<br>
<h1>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
index db8000fed..d36158d56 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
@@ -82,10 +82,10 @@ import org.eclipse.core.runtime.*;
Composite composite= new Composite(parent, SWT.NULL);
composite.setLayout(new GridLayout());
- composite.setLayoutData(new GridData(/* GridData.VERTICAL_ALIGN_FILL | */ GridData.HORIZONTAL_ALIGN_FILL));
+ composite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
setControl(composite);
- Label l= new Label(composite, SWT.NONE); // a spacer
+ Label l= new Label(composite, SWT.NONE);
l.setText(PatchMessages.getString("InputPatchPage.SelectInput")); //$NON-NLS-1$
buildInputGroup(composite);
@@ -96,7 +96,6 @@ import org.eclipse.core.runtime.*;
restoreWidgetValues();
updateWidgetEnablements();
- //updatePageCompletion();
Dialog.applyDialogFont(composite);
WorkbenchHelp.setHelp(composite, ICompareContextIds.PATCH_INPUT_WIZARD_PAGE);
@@ -274,7 +273,7 @@ import org.eclipse.core.runtime.*;
IWorkspaceRoot root= workspace.getRoot();
Tree tree= new Tree(parent, SWT.BORDER);
- GridData gd= new GridData(GridData.FILL_HORIZONTAL);
+ GridData gd= new GridData(GridData.FILL_BOTH);
gd.heightHint= 200;
tree.setLayoutData(gd);
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
index c96f304d5..c22c62dcc 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
@@ -23,6 +23,7 @@ Problem reports fixed</h2>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=55876">55876</a>: Viewer: Text not repainted when moving sash and then clicking on scroll bars<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=65205">65205</a>: Compare editor doesn't update correctly while scrolling<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=62545">62545</a>: binary compare text insertion cursor is very large<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=56875">56875</a>: Resizing Apply Patch dialog doesn't resize tree<br>
<h1>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
index db8000fed..d36158d56 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
@@ -82,10 +82,10 @@ import org.eclipse.core.runtime.*;
Composite composite= new Composite(parent, SWT.NULL);
composite.setLayout(new GridLayout());
- composite.setLayoutData(new GridData(/* GridData.VERTICAL_ALIGN_FILL | */ GridData.HORIZONTAL_ALIGN_FILL));
+ composite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
setControl(composite);
- Label l= new Label(composite, SWT.NONE); // a spacer
+ Label l= new Label(composite, SWT.NONE);
l.setText(PatchMessages.getString("InputPatchPage.SelectInput")); //$NON-NLS-1$
buildInputGroup(composite);
@@ -96,7 +96,6 @@ import org.eclipse.core.runtime.*;
restoreWidgetValues();
updateWidgetEnablements();
- //updatePageCompletion();
Dialog.applyDialogFont(composite);
WorkbenchHelp.setHelp(composite, ICompareContextIds.PATCH_INPUT_WIZARD_PAGE);
@@ -274,7 +273,7 @@ import org.eclipse.core.runtime.*;
IWorkspaceRoot root= workspace.getRoot();
Tree tree= new Tree(parent, SWT.BORDER);
- GridData gd= new GridData(GridData.FILL_HORIZONTAL);
+ GridData gd= new GridData(GridData.FILL_BOTH);
gd.heightHint= 200;
tree.setLayoutData(gd);

Back to the top