xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #1298 Chnages for non-blocking FindReplaceDlg.

Browse source 
Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7

Former-commit-id: 76f60240c5 [formerly 8b38c0ce8e1d5a4d6d7b345ec5e1ba975dde5900]
Former-commit-id: 199475f671
This commit is contained in:
Roger Ferrel 2012-11-07 16:49:02 -06:00
parent 4f36912786
commit e072532a77
2 changed files with 26 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/FindReplaceDlg.java
View file

@ -36,8 +36,6 @@ import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Dialog;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
@ -46,6 +44,7 @@ import org.eclipse.swt.widgets.Text;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
/**
* Display the Find and/or Replace dialog.
@ -66,25 +65,10 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
* @version 1.0
*
*/
public class FindReplaceDlg extends Dialog {
private static final transient IUFStatusHandler statusHandler = UFStatus
public class FindReplaceDlg extends CaveSWTDialog {
private final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(FindReplaceDlg.class);
/**
* Dialog shell.
*/
private Shell shell;
/**
* The display control.
*/
private Display display;
/**
* Return object when the shell is disposed.
*/
private String returnObj = null;
/**
* Flag indicating if the dialog should display the replace controls.
*/
@ -194,7 +178,8 @@ public class FindReplaceDlg extends Dialog {
*/
public FindReplaceDlg(Shell parent, boolean findAndReplace,
StyledTextComp editorComp) {
super(parent, 0);
super(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL,
CAVE.DO_NOT_BLOCK);
this.findAndReplace = findAndReplace;
this.editorComp = editorComp;
@ -202,15 +187,8 @@ public class FindReplaceDlg extends Dialog {
this.searchOptions = EnumSet.noneOf(FindReplaceOptions.class);
}
/**
* Setup and open the dialog.
*
* @return Return object.
*/
public Object open() {
Shell parent = getParent();
display = parent.getDisplay();
shell = new Shell(parent, SWT.DIALOG_TRIM);
@Override
protected void initializeComponents(Shell shell) {
if (findAndReplace == true) {
shell.setText("Find & Replace");
@ -227,17 +205,6 @@ public class FindReplaceDlg extends Dialog {
// Initialize all of the controls and layouts
initializeComponents();
shell.pack();
shell.open();
while (!shell.isDisposed()) {
if (!display.readAndDispatch()) {
display.sleep();
}
}
return returnObj;
}
/**
@ -253,8 +220,7 @@ public class FindReplaceDlg extends Dialog {
*/
private void createMainControls() {
Composite mainComp = new Composite(shell, SWT.NONE);
mainComp
.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false));
mainComp.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false));
mainComp.setLayout(new GridLayout(1, false));
createFindTextControl(mainComp);
@ -277,8 +243,7 @@ public class FindReplaceDlg extends Dialog {
*/
private void createFindTextControl(Composite mainComp) {
Composite findComp = new Composite(mainComp, SWT.NONE);
findComp
.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false));
findComp.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false));
findComp.setLayout(new GridLayout(2, false));
Label findLbl = new Label(findComp, SWT.NONE);
@ -304,8 +269,7 @@ public class FindReplaceDlg extends Dialog {
*/
private void createDirectionControls(Composite mainComp) {
Group dirGroup = new Group(mainComp, SWT.NONE);
dirGroup
.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false));
dirGroup.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false));
dirGroup.setLayout(new GridLayout(2, false));
dirGroup.setText(" Search Direction: ");
@ -550,8 +514,8 @@ public class FindReplaceDlg extends Dialog {
cancelBtn.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
returnObj = null;
shell.dispose();
setReturnValue(null);
close();
}
});
}
@ -638,8 +602,8 @@ public class FindReplaceDlg extends Dialog {
.getSelectionRange())) {
String replaceString = replaceTF.getText();
editorST.replaceTextRange(selectionToBeReplaced.x, searchString
.length(), replaceString);
editorST.replaceTextRange(selectionToBeReplaced.x,
searchString.length(), replaceString);
int[] replaceMatch = findString(replaceString,
selectionToBeReplaced.x);
@ -689,7 +653,7 @@ public class FindReplaceDlg extends Dialog {
readyToReplace = findAndSelectString(findTF.getText());
selectionToBeReplaced = editorST.getSelectionRange();
}
/**

14
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
View file

@ -140,6 +140,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* 31 AUG 2012 15178 mli Add autoWrite and autoStore capability
* 31 AUG 2012 15037 mli Handle bad characters in text formatter definition
* 07 Nov 2012 1298 rferrel Changes for non-blocking CallToActionsDlg.
* Changes for non-blocking FindReplaceDlg.
*
* </pre>
*
@ -152,6 +153,8 @@ public class ProductEditorComp extends Composite implements
private final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(ProductEditorComp.class);
private FindReplaceDlg findAndReplaceDlg;
private final String EMPTY = "";
/**
@ -2461,9 +2464,14 @@ public class ProductEditorComp extends Composite implements
* dialog.
*/
private void displayFindReplaceDialog(boolean findAndReplace) {
FindReplaceDlg findAndReplaceDlg = new FindReplaceDlg(
parent.getShell(), findAndReplace, textComp);
findAndReplaceDlg.open();
if (findAndReplaceDlg == null || findAndReplaceDlg.getShell() == null
|| findAndReplaceDlg.isDisposed()) {
findAndReplaceDlg = new FindReplaceDlg(parent.getShell(),
findAndReplace, textComp);
findAndReplaceDlg.open();
} else {
findAndReplaceDlg.bringToTop();
}
}
private void CTAHazCB(int callToActionType) {