mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-28 11:25:35 +02:00
fix for bug 243169: Refactor UI: Text dragging does not enable Preview button
https://bugs.eclipse.org/bugs/show_bug.cgi?id=243169
This commit is contained in:
parent
0c1c0e52bd
commit
c9129857f9
3 changed files with 22 additions and 27 deletions
|
@ -14,8 +14,8 @@ package org.eclipse.cdt.internal.ui.refactoring.dialogs;
|
||||||
|
|
||||||
import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
|
import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
|
||||||
import org.eclipse.osgi.util.NLS;
|
import org.eclipse.osgi.util.NLS;
|
||||||
import org.eclipse.swt.events.KeyAdapter;
|
import org.eclipse.swt.events.ModifyEvent;
|
||||||
import org.eclipse.swt.events.KeyEvent;
|
import org.eclipse.swt.events.ModifyListener;
|
||||||
import org.eclipse.swt.events.MouseAdapter;
|
import org.eclipse.swt.events.MouseAdapter;
|
||||||
import org.eclipse.swt.events.MouseEvent;
|
import org.eclipse.swt.events.MouseEvent;
|
||||||
import org.eclipse.swt.widgets.Button;
|
import org.eclipse.swt.widgets.Button;
|
||||||
|
@ -50,10 +50,9 @@ public abstract class ExtractInputPage extends UserInputWizardPage {
|
||||||
control = new NameAndVisibilityComposite(parent, label, info.getName());
|
control = new NameAndVisibilityComposite(parent, label, info.getName());
|
||||||
setTitle(getName());
|
setTitle(getName());
|
||||||
setPageComplete(false);
|
setPageComplete(false);
|
||||||
control.getConstantNameText().addKeyListener(new KeyAdapter(){
|
control.getConstantNameText().addModifyListener(new ModifyListener() {
|
||||||
|
|
||||||
@Override
|
public void modifyText(ModifyEvent e) {
|
||||||
public void keyReleased(KeyEvent e) {
|
|
||||||
info.setName(control.getConstantNameText().getText());
|
info.setName(control.getConstantNameText().getText());
|
||||||
checkName();
|
checkName();
|
||||||
}
|
}
|
||||||
|
@ -82,6 +81,7 @@ public abstract class ExtractInputPage extends UserInputWizardPage {
|
||||||
if(result.isCorrect()){
|
if(result.isCorrect()){
|
||||||
setErrorMessage(null);
|
setErrorMessage(null);
|
||||||
setPageComplete(true);
|
setPageComplete(true);
|
||||||
|
verifyName(methodName);
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
setErrorMessage(NLS.bind(Messages.ExtractInputPage_CheckName, result.getMessage()));
|
setErrorMessage(NLS.bind(Messages.ExtractInputPage_CheckName, result.getMessage()));
|
||||||
|
|
|
@ -13,10 +13,10 @@
|
||||||
package org.eclipse.cdt.internal.ui.refactoring.extractfunction;
|
package org.eclipse.cdt.internal.ui.refactoring.extractfunction;
|
||||||
|
|
||||||
import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
|
import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
|
||||||
import org.eclipse.swt.events.KeyEvent;
|
import org.eclipse.swt.events.ModifyEvent;
|
||||||
import org.eclipse.swt.events.KeyListener;
|
import org.eclipse.swt.events.ModifyListener;
|
||||||
|
import org.eclipse.swt.events.MouseAdapter;
|
||||||
import org.eclipse.swt.events.MouseEvent;
|
import org.eclipse.swt.events.MouseEvent;
|
||||||
import org.eclipse.swt.events.MouseListener;
|
|
||||||
import org.eclipse.swt.widgets.Button;
|
import org.eclipse.swt.widgets.Button;
|
||||||
import org.eclipse.swt.widgets.Composite;
|
import org.eclipse.swt.widgets.Composite;
|
||||||
import org.eclipse.swt.widgets.Control;
|
import org.eclipse.swt.widgets.Control;
|
||||||
|
@ -44,11 +44,9 @@ public class ExtractFunctionInputPage extends UserInputWizardPage {
|
||||||
|
|
||||||
setPageComplete(false);
|
setPageComplete(false);
|
||||||
|
|
||||||
comp.getMethodNameText().addKeyListener(new KeyListener(){
|
comp.getMethodNameText().addModifyListener(new ModifyListener() {
|
||||||
|
|
||||||
public void keyPressed(KeyEvent e) {}
|
public void modifyText(ModifyEvent e) {
|
||||||
|
|
||||||
public void keyReleased(KeyEvent e) {
|
|
||||||
info.setMethodName(comp.getMethodName());
|
info.setMethodName(comp.getMethodName());
|
||||||
checkName();
|
checkName();
|
||||||
}
|
}
|
||||||
|
@ -57,12 +55,9 @@ public class ExtractFunctionInputPage extends UserInputWizardPage {
|
||||||
|
|
||||||
|
|
||||||
for (Control buttons : comp.getVisibiltyGroup().getChildren()) {
|
for (Control buttons : comp.getVisibiltyGroup().getChildren()) {
|
||||||
buttons.addMouseListener(new MouseListener() {
|
buttons.addMouseListener(new MouseAdapter() {
|
||||||
|
|
||||||
public void mouseDoubleClick(MouseEvent e) {}
|
@Override
|
||||||
|
|
||||||
public void mouseDown(MouseEvent e) {}
|
|
||||||
|
|
||||||
public void mouseUp(MouseEvent e) {
|
public void mouseUp(MouseEvent e) {
|
||||||
String text = ((Button)e.getSource()).getText();
|
String text = ((Button)e.getSource()).getText();
|
||||||
visibilityChange(text);
|
visibilityChange(text);
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
*
|
*
|
||||||
* Contributors:
|
* Contributors:
|
||||||
* Markus Schorn - initial API and implementation
|
* Markus Schorn - initial API and implementation
|
||||||
|
* Emanuel Graf (Institute for Software, HSR Hochschule fuer Technik)
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package org.eclipse.cdt.internal.ui.refactoring.rename;
|
package org.eclipse.cdt.internal.ui.refactoring.rename;
|
||||||
|
|
||||||
|
@ -16,8 +17,8 @@ import org.eclipse.jface.window.Window;
|
||||||
import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
|
import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
|
||||||
import org.eclipse.osgi.util.NLS;
|
import org.eclipse.osgi.util.NLS;
|
||||||
import org.eclipse.swt.SWT;
|
import org.eclipse.swt.SWT;
|
||||||
import org.eclipse.swt.events.KeyEvent;
|
import org.eclipse.swt.events.ModifyEvent;
|
||||||
import org.eclipse.swt.events.KeyListener;
|
import org.eclipse.swt.events.ModifyListener;
|
||||||
import org.eclipse.swt.events.SelectionAdapter;
|
import org.eclipse.swt.events.SelectionAdapter;
|
||||||
import org.eclipse.swt.events.SelectionEvent;
|
import org.eclipse.swt.events.SelectionEvent;
|
||||||
import org.eclipse.swt.events.SelectionListener;
|
import org.eclipse.swt.events.SelectionListener;
|
||||||
|
@ -218,13 +219,12 @@ public class CRenameRefactoringInputPage extends UserInputWizardPage {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void hookSelectionListeners() {
|
private void hookSelectionListeners() {
|
||||||
fNewName.addKeyListener(new KeyListener() {
|
fNewName.addModifyListener(new ModifyListener() {
|
||||||
public void keyPressed(KeyEvent e) {
|
|
||||||
}
|
public void modifyText(ModifyEvent e) {
|
||||||
public void keyReleased(KeyEvent e) {
|
onKeyReleaseInNameField();
|
||||||
onKeyReleaseInNameField();
|
}
|
||||||
}
|
});
|
||||||
});
|
|
||||||
|
|
||||||
registerScopeListener(fWorkspace, TextSearchWrapper.SCOPE_WORKSPACE);
|
registerScopeListener(fWorkspace, TextSearchWrapper.SCOPE_WORKSPACE);
|
||||||
registerScopeListener(fDependent, TextSearchWrapper.SCOPE_RELATED_PROJECTS);
|
registerScopeListener(fDependent, TextSearchWrapper.SCOPE_RELATED_PROJECTS);
|
||||||
|
|
Loading…
Add table
Reference in a new issue