Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2002-05-31 17:07:23 +0000
committerAndre Weinand2002-05-31 17:07:23 +0000
commitfce716cf5564308d65df4dab3ee3c5f4add38e35 (patch)
tree7f50a64d4b1d83c9bce09cbd39dc2ae899e45079
parentc59d2db8ea95eee3debebea5fe1d1630fbaca342 (diff)
downloadeclipse.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
-rw-r--r--bundles/org.eclipse.compare/buildnotes_compare.html4
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties9
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java29
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/NavigationAction.java33
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java1
-rw-r--r--bundles/org.eclipse.compare/plugin.properties4
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html4
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties9
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java29
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/NavigationAction.java33
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java1
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties4
12 files changed, 74 insertions, 86 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index 9784047df..eb7a4cb22 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -11,7 +11,7 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
-Eclipse Build Input B May 31st 2002
+Eclipse Build Input June 1st 2002
<h2>
What's new in this drop</h2>
@@ -21,6 +21,7 @@ API changes</h3>
<h3>
API Additions</h3>
+Made class NavigationAction public.
<h3>
Other highlights</h3>
@@ -34,6 +35,7 @@ Problem reports fixed</h2>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=14800">#14800</a>: Compare View eats tabs<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=18200">#18200</a>: Both sets of arrows say "Select Next Change"<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=18206">#18206</a>: Casing, wording issue on "Last Resource reached" prompt<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=16285">#16285</a>: Add from Local History needs a description label<br>
<h2>
Problem reports closed</h2>
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;
diff --git a/bundles/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugin.properties
index 5d8ee5536..3a2d4eb00 100644
--- a/bundles/org.eclipse.compare/plugin.properties
+++ b/bundles/org.eclipse.compare/plugin.properties
@@ -55,8 +55,8 @@ ReplaceFromHistoryAction.tooltip= Replace the Selected Resource with Local Histo
ReplaceWithPreviousFromHistoryAction.label= &Previous From Local History
ReplaceWithPreviousFromHistoryAction.tooltip= Replace the Selected Resource with the Previous from Local History
-addFromHistoryAction.label= Add From Local Histor&y...
-addFromHistoryAction.tooltip= Add Deleted Files From Local History
+addFromHistoryAction.label= Restore From Local Histor&y...
+addFromHistoryAction.tooltip= Restore Deleted Files From Local History
#
# Preference Page
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 9784047df..eb7a4cb22 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
@@ -11,7 +11,7 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
-Eclipse Build Input B May 31st 2002
+Eclipse Build Input June 1st 2002
<h2>
What's new in this drop</h2>
@@ -21,6 +21,7 @@ API changes</h3>
<h3>
API Additions</h3>
+Made class NavigationAction public.
<h3>
Other highlights</h3>
@@ -34,6 +35,7 @@ Problem reports fixed</h2>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=14800">#14800</a>: Compare View eats tabs<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=18200">#18200</a>: Both sets of arrows say "Select Next Change"<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=18206">#18206</a>: Casing, wording issue on "Last Resource reached" prompt<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=16285">#16285</a>: Add from Local History needs a description label<br>
<h2>
Problem reports closed</h2>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties
index 6d8557aea..aac558c9c 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties
+++ b/bundles/org.eclipse.compare/plugins/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/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
index dab0aa956..b27427690 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
+++ b/bundles/org.eclipse.compare/plugins/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/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/NavigationAction.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/NavigationAction.java
deleted file mode 100644
index 1a1ea26a0..000000000
--- a/bundles/org.eclipse.compare/plugins/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/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java
index 14eabc943..90c1737cf 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java
+++ b/bundles/org.eclipse.compare/plugins/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;
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
index 5d8ee5536..3a2d4eb00 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
@@ -55,8 +55,8 @@ ReplaceFromHistoryAction.tooltip= Replace the Selected Resource with Local Histo
ReplaceWithPreviousFromHistoryAction.label= &Previous From Local History
ReplaceWithPreviousFromHistoryAction.tooltip= Replace the Selected Resource with the Previous from Local History
-addFromHistoryAction.label= Add From Local Histor&y...
-addFromHistoryAction.tooltip= Add Deleted Files From Local History
+addFromHistoryAction.label= Restore From Local Histor&y...
+addFromHistoryAction.tooltip= Restore Deleted Files From Local History
#
# Preference Page

Back to the top