diff options
author | Andre Weinand | 2002-05-31 17:07:23 +0000 |
---|---|---|
committer | Andre Weinand | 2002-05-31 17:07:23 +0000 |
commit | fce716cf5564308d65df4dab3ee3c5f4add38e35 (patch) | |
tree | 7f50a64d4b1d83c9bce09cbd39dc2ae899e45079 /bundles/org.eclipse.compare/compare/org/eclipse/compare/internal | |
parent | c59d2db8ea95eee3debebea5fe1d1630fbaca342 (diff) | |
download | eclipse.platform.team-fce716cf5564308d65df4dab3ee3c5f4add38e35.tar.gz eclipse.platform.team-fce716cf5564308d65df4dab3ee3c5f4add38e35.tar.xz eclipse.platform.team-fce716cf5564308d65df4dab3ee3c5f4add38e35.zip |
#16285: Add from Local History needs a description label
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/internal')
4 files changed, 32 insertions, 40 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties index 6d8557aea..aac558c9c 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties @@ -7,7 +7,7 @@ # # Resources for AddFromHistoryAction.java -title= Add from Local History +title= Restore from Local History memberPaneTitle= {0} - Available Files in Local History: @@ -15,6 +15,9 @@ treeTitleFormat= Local History of ''{0}'' dateIcon= obj16/day_obj.gif timeIcon= obj16/resource_obj.gif +memberDescription= Check files to restore from the local history +editionDescription= Select an edition for a file + treeFormat= {0} workspaceTreeFormat= {0} (Workspace File) parseErrorFormat= {0} (Parse Error) @@ -28,9 +31,9 @@ todayFormat= Today ({0}) yesterdayFormat= Yesterday ({0}) dayFormat= {0} -buttonLabel= Add +buttonLabel= Restore noLocalHistoryError= No deleted resources in local history for selected container. replaceError=Can''t replace resource (reason: {0}). -taskName=Adding
\ No newline at end of file +taskName=Restoring
\ No newline at end of file diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java index dab0aa956..b27427690 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java @@ -7,7 +7,7 @@ import java.util.*; import org.eclipse.swt.SWT; import org.eclipse.swt.events.*; import org.eclipse.swt.graphics.*; -import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.*; import org.eclipse.swt.widgets.*; import org.eclipse.jface.dialogs.*; @@ -191,7 +191,19 @@ public class AddFromHistoryDialog extends ResizableDialog { // we need two panes: the left for the elements, the right one for the editions Splitter hsplitter= new Splitter(vsplitter, SWT.HORIZONTAL); - fMemberPane= new CompareViewerPane(hsplitter, SWT.BORDER | SWT.FLAT); + Composite c= new Composite(hsplitter, SWT.NONE); + GridLayout layout= new GridLayout(); + layout.marginWidth= 0; + layout.marginHeight= 2; + layout.verticalSpacing= 2; + layout.numColumns= 1; + c.setLayout(layout); + Label l1= new Label(c, SWT.NONE); + l1.setText(Utilities.getString(fBundle, "memberDescription")); //$NON-NLS-1$ + fMemberPane= new CompareViewerPane(c, SWT.BORDER | SWT.FLAT); + GridData gd= new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL); + fMemberPane.setLayoutData(gd); + fMemberTable= new Table(fMemberPane, SWT.CHECK | SWT.H_SCROLL | SWT.V_SCROLL); fMemberTable.addSelectionListener( new SelectionAdapter() { @@ -216,7 +228,18 @@ public class AddFromHistoryDialog extends ResizableDialog { fMemberPane.setContent(fMemberTable); - fEditionPane= new CompareViewerPane(hsplitter, SWT.BORDER | SWT.FLAT); + c= new Composite(hsplitter, SWT.NONE); + layout= new GridLayout(); + layout.marginWidth= 0; + layout.marginHeight= 2; + layout.verticalSpacing= 2; + layout.numColumns= 1; + c.setLayout(layout); + Label l2= new Label(c, SWT.NONE); + l2.setText(Utilities.getString(fBundle, "editionDescription")); //$NON-NLS-1$ + fEditionPane= new CompareViewerPane(c, SWT.BORDER | SWT.FLAT); + gd= new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL); + fEditionPane.setLayoutData(gd); fEditionTree= new Tree(fEditionPane, SWT.H_SCROLL | SWT.V_SCROLL); fEditionTree.addSelectionListener( diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/NavigationAction.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/NavigationAction.java deleted file mode 100644 index 1a1ea26a0..000000000 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/NavigationAction.java +++ /dev/null @@ -1,33 +0,0 @@ -/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-package org.eclipse.compare.internal;
-
-import java.util.ResourceBundle;
-import org.eclipse.jface.action.Action;
-import org.eclipse.compare.CompareEditorInput;
-
-
-public class NavigationAction extends Action {
-
- private boolean fNext;
- private CompareEditorInput fCompareEditorInput;
-
- public NavigationAction(ResourceBundle bundle, boolean next) {
- Utilities.initAction(this, bundle, next ? "action.Next." : "action.Previous."); //$NON-NLS-2$ //$NON-NLS-1$
- fNext= next;
- }
-
- public void run() {
- if (fCompareEditorInput != null) {
- Object adapter= fCompareEditorInput.getAdapter(CompareNavigator.class);
- if (adapter instanceof CompareNavigator)
- ((CompareNavigator)adapter).selectChange(fNext);
- }
- }
-
- public void setCompareEditorInput(CompareEditorInput input) {
- fCompareEditorInput= input;
- }
-}
\ No newline at end of file diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java index 14eabc943..90c1737cf 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java @@ -190,7 +190,6 @@ import org.eclipse.compare.structuremergeviewer.*; Object data= e.item.getData();
if (e.detail == SWT.CHECK) {
boolean checked= ti.getChecked();
- String s= ti.getText();
if (data instanceof Hunk) {
Hunk hunk= (Hunk) data;
checked= checked && hunk.fMatches;
|