[Pydev-cvs] org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/pages/extractlocal ExtractLocalPage.java, 1.1, 1.2 ExtractLocalComposite.java, 1.1, 1.2

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/pages/extractlocal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21605/src/org/python/pydev/refactoring/ui/pages/extractlocal

Modified Files:
	ExtractLocalPage.java ExtractLocalComposite.java 
Log Message:
Synching to latest changes:

Pydev
<ul>
<li><strong>Editor</strong>: Cursor settings no longer overridden</li>
<li><strong>Code-completion</strong>: If __all__ is defined with runtime elements (and not only in a single assign statement), it's ignored for code-completion purposes</li>
<li><strong>Debugger</strong>: Pythonpath the same in debug and regular modes (sys.path[0] is the same directory as the file run)</li>
<li><strong>Debugger</strong>: Persist choices done in the debugger when files from the debugger are not found</li>
<li><strong>Interpreter config</strong>: "email" automatically added to the "forced builtins"</li>
<li><strong>Parser</strong>: Correctly recognizing absolute import with 3 or more levels</li>
<li><strong>Syntax check</strong>: Option to do only on active editor</li>
</ul>

Also: tabs changed for spaces

Index: ExtractLocalComposite.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/pages/extractlocal/ExtractLocalComposite.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExtractLocalComposite.java	20 Oct 2007 19:31:00 -0000	1.1
--- ExtractLocalComposite.java	27 Sep 2008 20:00:48 -0000	1.2
***************
*** 22,75 ****
  public class ExtractLocalComposite extends Composite {
  
! 	private LabeledEdit variableNameEdit;
  
! 	private AbstractScopeNode<?> scopeAdapter;
  
! 	private IValidationPage page;
  
! 	public ExtractLocalComposite(IValidationPage page, Composite parent, AbstractScopeNode<?> scope) {
! 		super(parent, SWT.NONE);
! 		this.page = page;
! 		this.scopeAdapter = scope;
  
! 		createComposite();
! 	}
  
! 	public void createComposite() {
! 		setLayout(new GridLayout());
  
! 		createVariableName(this);
  
! 		pack();
! 	}
  
! 	private void createVariableName(Composite control) {
! 		Composite variableNameComposite = new Composite(control, SWT.NONE);
! 		FillLayout compositeLayout = new FillLayout(SWT.HORIZONTAL);
! 		GridData gridData = new GridData();
! 		gridData.horizontalAlignment = GridData.FILL;
! 		variableNameComposite.setLayoutData(gridData);
! 		variableNameComposite.setLayout(compositeLayout);
! 		variableNameEdit = new LabeledEdit(variableNameComposite, Messages.extractLocalVariableTitle);
! 	}
  
! 	public void registerListeners(final IValidationPage page) {
! 		variableNameEdit.getEdit().addListener(SWT.Modify, page);
! 	}
  
! 	public String getVariableName() {
! 		return variableNameEdit.getEdit().getText();
! 	}
  
! 	public boolean validate() {
! 		NameValidator nameValidator = new NameValidator(scopeAdapter);
! 		try {
! 			nameValidator.validateVariableName(getVariableName());
! 			nameValidator.validateUniqueVariable(getVariableName());
! 		} catch (Throwable e) {
! 			page.setErrorMessage(e.getMessage());
! 		}
  
! 		return page.getErrorMessage() == null;
! 	}
  }
--- 22,75 ----
  public class ExtractLocalComposite extends Composite {
  
!     private LabeledEdit variableNameEdit;
  
!     private AbstractScopeNode<?> scopeAdapter;
  
!     private IValidationPage page;
  
!     public ExtractLocalComposite(IValidationPage page, Composite parent, AbstractScopeNode<?> scope) {
!         super(parent, SWT.NONE);
!         this.page = page;
!         this.scopeAdapter = scope;
  
!         createComposite();
!     }
  
!     public void createComposite() {
!         setLayout(new GridLayout());
  
!         createVariableName(this);
  
!         pack();
!     }
  
!     private void createVariableName(Composite control) {
!         Composite variableNameComposite = new Composite(control, SWT.NONE);
!         FillLayout compositeLayout = new FillLayout(SWT.HORIZONTAL);
!         GridData gridData = new GridData();
!         gridData.horizontalAlignment = GridData.FILL;
!         variableNameComposite.setLayoutData(gridData);
!         variableNameComposite.setLayout(compositeLayout);
!         variableNameEdit = new LabeledEdit(variableNameComposite, Messages.extractLocalVariableTitle);
!     }
  
!     public void registerListeners(final IValidationPage page) {
!         variableNameEdit.getEdit().addListener(SWT.Modify, page);
!     }
  
!     public String getVariableName() {
!         return variableNameEdit.getEdit().getText();
!     }
  
!     public boolean validate() {
!         NameValidator nameValidator = new NameValidator(scopeAdapter);
!         try {
!             nameValidator.validateVariableName(getVariableName());
!             nameValidator.validateUniqueVariable(getVariableName());
!         } catch (Throwable e) {
!             page.setErrorMessage(e.getMessage());
!         }
  
!         return page.getErrorMessage() == null;
!     }
  }

Index: ExtractLocalPage.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/pages/extractlocal/ExtractLocalPage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExtractLocalPage.java	20 Oct 2007 19:31:00 -0000	1.1
--- ExtractLocalPage.java	27 Sep 2008 20:00:48 -0000	1.2
***************
*** 17,72 ****
  public class ExtractLocalPage extends PyDevInputWizardPage {
  
! 	public ExtractLocalRequestProcessor requestProcessor;
  
! 	private ExtractLocalComposite extractComposite;
  
! 	private Composite parent;
  
! 	public ExtractLocalPage(String name, ExtractLocalRequestProcessor requestProcessor) {
! 		super(name);
! 		this.setTitle(name);
! 		this.requestProcessor = requestProcessor;
! 	}
  
! 	public void createControl(Composite parent) {
! 		this.parent = parent;
! 		setupComposite();
! 	}
  
! 	public void setupComposite() {
! 		if (extractComposite != null) {
! 			extractComposite.dispose();
! 			extractComposite = null;
! 		}
! 		
! 		extractComposite = new ExtractLocalComposite(this, parent, requestProcessor.getScopeAdapter());
  
! 		extractComposite.registerListeners(this);
! 		setControl(this.extractComposite);
  
! 		voodooResizeToPage();
! 		setPageComplete(false);
! 	}
  
! 	@Override
! 	public boolean canFlipToNextPage() {
! 		return isPageComplete();
! 	}
  
! 	public void validate() {
! 		setErrorMessage(null);
! 		extractComposite.validate();
! 		setPageComplete(getErrorMessage() == null);
! 		if (isPageComplete()) {
! 			applySettings();
! 		}
! 	}
  
! 	private void applySettings() {
! 		this.requestProcessor.setVariableName(extractComposite.getVariableName());
! 	}
  
! 	public void handleEvent(Event event) {
! 		validate();
! 	}
  }
--- 17,72 ----
  public class ExtractLocalPage extends PyDevInputWizardPage {
  
!     public ExtractLocalRequestProcessor requestProcessor;
  
!     private ExtractLocalComposite extractComposite;
  
!     private Composite parent;
  
!     public ExtractLocalPage(String name, ExtractLocalRequestProcessor requestProcessor) {
!         super(name);
!         this.setTitle(name);
!         this.requestProcessor = requestProcessor;
!     }
  
!     public void createControl(Composite parent) {
!         this.parent = parent;
!         setupComposite();
!     }
  
!     public void setupComposite() {
!         if (extractComposite != null) {
!             extractComposite.dispose();
!             extractComposite = null;
!         }
!         
!         extractComposite = new ExtractLocalComposite(this, parent, requestProcessor.getScopeAdapter());
  
!         extractComposite.registerListeners(this);
!         setControl(this.extractComposite);
  
!         voodooResizeToPage();
!         setPageComplete(false);
!     }
  
!     @Override
!     public boolean canFlipToNextPage() {
!         return isPageComplete();
!     }
  
!     public void validate() {
!         setErrorMessage(null);
!         extractComposite.validate();
!         setPageComplete(getErrorMessage() == null);
!         if (isPageComplete()) {
!             applySettings();
!         }
!     }
  
!     private void applySettings() {
!         this.requestProcessor.setVariableName(extractComposite.getVariableName());
!     }
  
!     public void handleEvent(Event event) {
!         validate();
!     }
  }