diff options
author | Dani Megert | 2001-12-12 13:01:38 +0000 |
---|---|---|
committer | Dani Megert | 2001-12-12 13:01:38 +0000 |
commit | b841bb15f56f5a78ad9fc5fd034df38322bcfcb6 (patch) | |
tree | 87a23b0cbba685001718952b020f8bfbc662ce47 | |
parent | a02471a040843eac215c4769b03be1e0af77dffd (diff) | |
download | eclipse.platform.text-b841bb15f56f5a78ad9fc5fd034df38322bcfcb6.tar.gz eclipse.platform.text-b841bb15f56f5a78ad9fc5fd034df38322bcfcb6.tar.xz eclipse.platform.text-b841bb15f56f5a78ad9fc5fd034df38322bcfcb6.zip |
Fixed bug 6836: Working Sets Dialog: Mnemonics, issues
4 files changed, 51 insertions, 18 deletions
diff --git a/org.eclipse.search/buildnotes_search.html b/org.eclipse.search/buildnotes_search.html index 7ea64836e8b..67050a10d3a 100644 --- a/org.eclipse.search/buildnotes_search.html +++ b/org.eclipse.search/buildnotes_search.html @@ -11,6 +11,31 @@ <h1>
Eclipse Platform Build Notes<br>
Search</h1>
+Eclipse Integration Build ???
+<h2>
+What's new in this drop</h2>
+
+<h3>
+API changes</h3>
+
+<h3>
+API additions</h3>
+
+<h3>
+Other highlights</h3>
+
+<h2>
+Known deficiencies</h2>
+
+<h2>
+Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=6836">6836</a> Working
+Sets Dialog: Mnemonics, issues
+<p>
+<hr SIZE=0 WIDTH="100%">
+<h1>
+Eclipse Platform Build Notes<br>
+Search</h1>
Eclipse Integration Build 20011211
<h2>
What's new in this drop</h2>
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/workingsets/WorkingSetDialog.java b/org.eclipse.search/search/org/eclipse/search/internal/workingsets/WorkingSetDialog.java index f0f9a37bc82..748d18ba44f 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/workingsets/WorkingSetDialog.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/workingsets/WorkingSetDialog.java @@ -42,6 +42,7 @@ class WorkingSetDialog extends InputDialog { private static class WorkingSetNameInputValidator implements IInputValidator {
String fInitalName;
+ boolean fFirstCheck= true;
public WorkingSetNameInputValidator(String initialName) {
Assert.isNotNull(initialName, "initial name must not be null"); //$NON-NLS-1$
@@ -49,14 +50,19 @@ class WorkingSetDialog extends InputDialog { }
public String isValid(String newText) {
- if (newText == null ||newText.equals("")) //$NON-NLS-1$
+ if (newText == null || newText.equals("")) { //$NON-NLS-1$
+ if (fInitalName.equals("") && fFirstCheck) { //$NON-NLS-1$
+ fFirstCheck= false;
+ return null;
+ }
return WorkingSetMessages.getString("WorkingSetDialog.warning.nameMustNotBeEmpty"); //$NON-NLS-1$
+ }
IWorkingSet[] workingSets= WorkingSet.getWorkingSets();
if (newText.equals(fInitalName))
return null;
for (int i= 0; i < workingSets.length; i++) {
if (newText.equals(workingSets[i].getName()))
- return WorkingSetMessages.getString("WorkingSetDialog.warning.workspaceExists"); //$NON-NLS-1$
+ return WorkingSetMessages.getString("WorkingSetDialog.warning.workingSetExists"); //$NON-NLS-1$
}
return null;
}
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/workingsets/WorkingSetMessages.properties b/org.eclipse.search/search/org/eclipse/search/internal/workingsets/WorkingSetMessages.properties index e73ed514596..58c928cb2b2 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/workingsets/WorkingSetMessages.properties +++ b/org.eclipse.search/search/org/eclipse/search/internal/workingsets/WorkingSetMessages.properties @@ -14,15 +14,17 @@ WorkingSetReader.error.tagPathNotFound= Bad format: Tag 'path' not found WorkingSetWriter.error.couldNotGetXmlBuilder = Could not get XML builder
-WorkingSetDialog.message=Define the working set name:
-WorkingSetDialog.title=Working Set
-WorkingSetDialog.warning.nameMustNotBeEmpty=The name must not be empty.
-WorkingSetDialog.warning.workspaceExists=A workspace with that name already exists.
-WorkingSetDialog.error=Error
-WorkingSetDialog.error.updateCheckedState=Error during update of checked state
-WorkingSetDialog.projectClosedDialog.message=A closed project can not be modified
-WorkingSetDialog.projectClosedDialog.title=Working Set Change
+WorkingSetDialog.title= Working Set
+WorkingSetDialog.message= Define the working set name:
+WorkingSetDialog.warning.nameMustNotBeEmpty= The name must not be empty.
+WorkingSetDialog.warning.workingSetExists= A working set with that name already exists.
+WorkingSetDialog.error= Error
+WorkingSetDialog.error.updateCheckedState= Error during update of checked state
+WorkingSetDialog.projectClosedDialog.message= A closed project can not be modified
+WorkingSetDialog.projectClosedDialog.title= Working Set Change
-WorkingSetSelectionDialogdetailsButton.label=Details...
-WorkingSetSelectionDialognewButton.label=New...
-WorkingSetSelectionDialogremoveButton.label=Remove
+WorkingSetSelectionDialog.title= Working Sets
+WorkingSetSelectionDialog.message= Select a working set:
+WorkingSetSelectionDialog.detailsButton.label= &Details...
+WorkingSetSelectionDialog.newButton.label= &New...
+WorkingSetSelectionDialog.removeButton.label= &Remove
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/workingsets/WorkingSetSelectionDialog.java b/org.eclipse.search/search/org/eclipse/search/internal/workingsets/WorkingSetSelectionDialog.java index 21ddfd1c990..5ae4432729c 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/workingsets/WorkingSetSelectionDialog.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/workingsets/WorkingSetSelectionDialog.java @@ -78,10 +78,10 @@ public class WorkingSetSelectionDialog extends SelectionDialog { */
public WorkingSetSelectionDialog(Shell parentShell) {
super(parentShell);
- setTitle("Working Sets"); //$NON-NLS-1$
+ setTitle(WorkingSetMessages.getString("WorkingSetSelectionDialog.title")); //$NON-NLS-1$;
fContentProvider= new ListContentProvider();
fLabelProvider= new WorkingSetLabelProvider();
- setMessage("Select a working set."); //$NON-NLS-1$
+ setMessage(WorkingSetMessages.getString("WorkingSetSelectionDialog.message")); //$NON-NLS-1$
}
@@ -100,7 +100,7 @@ public class WorkingSetSelectionDialog extends SelectionDialog { composite.setData(data);
int id= IDialogConstants.CLIENT_ID + 1;
- fNewButton= createButton(buttonComposite, id++, WorkingSetMessages.getString("WorkingSetSelectionDialognewButton.label"), false); //$NON-NLS-1$
+ fNewButton= createButton(buttonComposite, id++, WorkingSetMessages.getString("WorkingSetSelectionDialog.newButton.label"), false); //$NON-NLS-1$
fNewButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
WorkingSetDialog dlg= new WorkingSetDialog(getShell());
@@ -112,7 +112,7 @@ public class WorkingSetSelectionDialog extends SelectionDialog { }
});
- fDetailsButton= createButton(buttonComposite, id++, WorkingSetMessages.getString("WorkingSetSelectionDialogdetailsButton.label"), false); //$NON-NLS-1$
+ fDetailsButton= createButton(buttonComposite, id++, WorkingSetMessages.getString("WorkingSetSelectionDialog.detailsButton.label"), false); //$NON-NLS-1$
fDetailsButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
WorkingSetDialog dlg= new WorkingSetDialog(getShell(), getWorkingSet());
@@ -121,7 +121,7 @@ public class WorkingSetSelectionDialog extends SelectionDialog { }
});
- fRemoveButton= createButton(buttonComposite, id++, WorkingSetMessages.getString("WorkingSetSelectionDialogremoveButton.label"), false); //$NON-NLS-1$
+ fRemoveButton= createButton(buttonComposite, id++, WorkingSetMessages.getString("WorkingSetSelectionDialog.removeButton.label"), false); //$NON-NLS-1$
fRemoveButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
removeSelectedWorkingSets();
|