[Pydev-cvs] org.python.pydev.debug/src/org/python/pydev/debug/ui/propertypages PythonBreakpointPage.java, 1.1, 1.2 BreakpointConditionEditor.java, 1.4, 1.5

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

Update of /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/ui/propertypages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20604/src/org/python/pydev/debug/ui/propertypages

Modified Files:
	PythonBreakpointPage.java BreakpointConditionEditor.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: PythonBreakpointPage.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/ui/propertypages/PythonBreakpointPage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PythonBreakpointPage.java	17 Dec 2005 12:58:45 -0000	1.1
--- PythonBreakpointPage.java	27 Sep 2008 19:59:09 -0000	1.2
***************
*** 36,87 ****
  
  public class PythonBreakpointPage extends PropertyPage {
! 	
! 	private Button fEnableConditionButton;
! 	private BreakpointConditionEditor fConditionEditor;
! 	private Label fConditionIsTrue;
! 	private Button fConditionHasChanged;
! 	private Label fSuspendWhenLabel;
! 	// Watchpoint editors
! 	private Button fFieldAccess;
! 	private Button fFieldModification;
! 	// Method breakpoint editors
! 	private Button fMethodEntry;
! 	private Button fMethodExit;
! 	
! 	private static final String fgMethodBreakpointError= "Must suspend on method entry or exit";//$NON-NLS-1$
  
! 	protected Button fEnabledButton;
! 	protected Button fHitCountButton;
! 	protected Button fSuspendThreadButton;
! 	protected Button fSuspendVMButton;
! 	protected Text fHitCountText;
  
! 	protected List fErrorMessages= new ArrayList();
! 	
! 	/**
! 	 * Attribute used to indicate that a breakpoint should be deleted
! 	 * when cancel is pressed.
! 	 */
! 	public static final String ATTR_DELETE_ON_CANCEL = PyDebugModelPresentation.PY_DEBUG_MODEL_ID + ".ATTR_DELETE_ON_CANCEL";  //$NON-NLS-1$
  
! 	
! 	@Override
! 	protected Control createContents(Composite parent) {
! 		noDefaultAndApplyButton();
! 		Composite mainComposite = createComposite(parent, 1);
! 		createLabels(mainComposite);
! 		try {
! 			createEnabledButton(mainComposite);
! 			//createHitCountEditor(mainComposite);
! 			createTypeSpecificEditors(mainComposite);
! 			//createSuspendPolicyEditor(mainComposite); // Suspend policy is considered uncommon. Add it last.
! 		} catch (CoreException e) {
! 			PydevDebugPlugin.log(IStatus.ERROR,e.getLocalizedMessage(),e);
! 		}
! 		setValid(true);
! 		// if this breakpoint is being created, change the shell title to indicate 'creation'
! 		try {
              if (getBreakpoint().getMarker().getAttribute(ATTR_DELETE_ON_CANCEL) != null) {
!             	getShell().addShellListener(new ShellListener() {
                      public void shellActivated(ShellEvent e) {
                          Shell shell = (Shell)e.getSource();
--- 36,87 ----
  
  public class PythonBreakpointPage extends PropertyPage {
!     
!     private Button fEnableConditionButton;
!     private BreakpointConditionEditor fConditionEditor;
!     private Label fConditionIsTrue;
!     private Button fConditionHasChanged;
!     private Label fSuspendWhenLabel;
!     // Watchpoint editors
!     private Button fFieldAccess;
!     private Button fFieldModification;
!     // Method breakpoint editors
!     private Button fMethodEntry;
!     private Button fMethodExit;
!     
!     private static final String fgMethodBreakpointError= "Must suspend on method entry or exit";//$NON-NLS-1$
  
!     protected Button fEnabledButton;
!     protected Button fHitCountButton;
!     protected Button fSuspendThreadButton;
!     protected Button fSuspendVMButton;
!     protected Text fHitCountText;
  
!     protected List fErrorMessages= new ArrayList();
!     
!     /**
!      * Attribute used to indicate that a breakpoint should be deleted
!      * when cancel is pressed.
!      */
!     public static final String ATTR_DELETE_ON_CANCEL = PyDebugModelPresentation.PY_DEBUG_MODEL_ID + ".ATTR_DELETE_ON_CANCEL";  //$NON-NLS-1$
  
!     
!     @Override
!     protected Control createContents(Composite parent) {
!         noDefaultAndApplyButton();
!         Composite mainComposite = createComposite(parent, 1);
!         createLabels(mainComposite);
!         try {
!             createEnabledButton(mainComposite);
!             //createHitCountEditor(mainComposite);
!             createTypeSpecificEditors(mainComposite);
!             //createSuspendPolicyEditor(mainComposite); // Suspend policy is considered uncommon. Add it last.
!         } catch (CoreException e) {
!             PydevDebugPlugin.log(IStatus.ERROR,e.getLocalizedMessage(),e);
!         }
!         setValid(true);
!         // if this breakpoint is being created, change the shell title to indicate 'creation'
!         try {
              if (getBreakpoint().getMarker().getAttribute(ATTR_DELETE_ON_CANCEL) != null) {
!                 getShell().addShellListener(new ShellListener() {
                      public void shellActivated(ShellEvent e) {
                          Shell shell = (Shell)e.getSource();
***************
*** 101,247 ****
          } catch (CoreException e) {
          }
! 		return mainComposite;
! 	}
  
! 	/**
! 	 * Creates a fully configured composite with the given number of columns
! 	 * @param parent
! 	 * @param numColumns
! 	 * @return the configured composite
! 	 */
! 	protected Composite createComposite(Composite parent, int numColumns) {
! 		Composite composit= new Composite(parent, SWT.NONE);
! 		composit.setFont(parent.getFont());
! 		GridLayout layout= new GridLayout();
! 		layout.numColumns= numColumns;
! 		layout.marginWidth= 0;
! 		layout.marginHeight= 0;
! 		composit.setLayout(layout);
! 		composit.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
! 		return composit;
! 	}
! 	
! 	/**
! 	 * Creates a fully configured label with the given text.
! 	 * @param parent the parent composite
! 	 * @param text the test of the returned label
! 	 * @return a fully configured label
! 	 */
! 	protected Label createLabel(Composite parent, String text) {
! 		Label label= new Label(parent, SWT.NONE);
! 		label.setText(text);
! 		label.setFont(parent.getFont());
! 		label.setLayoutData(new GridData());
! 		return label;
! 	}
! 	
! 	/**
! 	 * Creates the labels displayed for the breakpoint.
! 	 * @param parent
! 	 */
! 	protected void createLabels(Composite parent) {
! 		PyBreakpoint breakpoint= (PyBreakpoint) getElement();
! 		Composite labelComposite= createComposite(parent, 2);
! 		String typeName = breakpoint.getFile();
! 		if (typeName != null) {
! 			createLabel(labelComposite, "File"); //$NON-NLS-1$
! 			createLabel(labelComposite, typeName);
! 		}
! 		createTypeSpecificLabels(labelComposite);
! 	}
! 	
! 	/**
! 	 * Creates the button to toggle enablement of the breakpoint
! 	 * @param parent
! 	 * @throws CoreException
! 	 */
! 	protected void createEnabledButton(Composite parent) throws CoreException {
! 		fEnabledButton= createCheckButton(parent, "&Enabled"); //$NON-NLS-1$
! 		fEnabledButton.setSelection(getBreakpoint().isEnabled());
! 	}
! 	
! 	/**
! 	 * Allows subclasses to add type specific labels to the common Java
! 	 * breakpoint page.
! 	 * @param parent
! 	 */
! 	protected void createTypeSpecificLabels(Composite parent) {
! //		 Line number
! 		PyBreakpoint breakpoint = (PyBreakpoint) getBreakpoint();
! 		StringBuffer lineNumber = new StringBuffer(4);
! 		try {
! 			int lNumber = breakpoint.getLineNumber();
! 			if (lNumber > 0) {
! 				lineNumber.append(lNumber);
! 			}
! 		} catch (CoreException ce) {
! 			PydevDebugPlugin.log(IStatus.ERROR,ce.getLocalizedMessage(),ce);
! 		}
! 		if (lineNumber.length() > 0) {
! 			createLabel(parent, "&Line Number:"); 
! 			createLabel(parent, lineNumber.toString());
! 		}
! 		// Member
! 		/*
! 		try {
! 			IMember member = BreakpointUtils.getMember(breakpoint);
! 			if (member == null) {
! 				return;
! 			}
! 			String label = PropertyPageMessages.JavaLineBreakpointPage_3; //$NON-NLS-1$
! 			String memberName = fJavaLabelProvider.getText(member);
! 			if (breakpoint instanceof IJavaMethodBreakpoint) {
! 				label = PropertyPageMessages.JavaLineBreakpointPage_4; //$NON-NLS-1$
! 			} else if (breakpoint instanceof IJavaWatchpoint) {
! 				label = PropertyPageMessages.JavaLineBreakpointPage_5; //$NON-NLS-1$
! 			}
! 			createLabel(parent, label);
! 			createLabel(parent, memberName);
! 		} catch (CoreException exception) {
! 			PydevDebugPlugin.log(IStatus.ERROR,e.getLocalizedMessage(),exception);
! 		}*/
! 	}
! 	/**
! 	* Allows subclasses to add type specific editors to the common Java
! 	* breakpoint page.
! 	* @param parent
! 	*/
     protected void createTypeSpecificEditors(Composite parent) throws CoreException {
! 	    PyBreakpoint breakpoint= (PyBreakpoint) getBreakpoint();
! 		if (breakpoint.supportsCondition()) {
! 			createConditionEditor(parent);
! 		}
     }
     
     
! 	private void validateMethodBreakpoint() {
! 		if (fEnabledButton.getSelection() && !(fMethodEntry.getSelection() || fMethodExit.getSelection())) {
! 			addErrorMessage(fgMethodBreakpointError);
! 		} else {
! 			removeErrorMessage(fgMethodBreakpointError);
! 		}
! 	}
     
! 	/**
! 	 * Creates a fully configured check button with the given text.
! 	 * @param parent the parent composite
! 	 * @param text the label of the returned check button
! 	 * @return a fully configured check button
! 	 */
! 	protected Button createCheckButton(Composite parent, String text) {
! 		Button button= new Button(parent, SWT.CHECK | SWT.LEFT);
! 		button.setText(text);
! 		button.setFont(parent.getFont());
! 		button.setLayoutData(new GridData());
! 		return button;
! 	}
! 	
! 	/**
! 	 * Returns the breakpoint that this preference page configures
! 	 * @return the breakpoint this page configures
! 	 */
! 	protected PyBreakpoint getBreakpoint() {
! 		return (PyBreakpoint) getElement();
! 	}
     
      /**
--- 101,247 ----
          } catch (CoreException e) {
          }
!         return mainComposite;
!     }
  
!     /**
!      * Creates a fully configured composite with the given number of columns
!      * @param parent
!      * @param numColumns
!      * @return the configured composite
!      */
!     protected Composite createComposite(Composite parent, int numColumns) {
!         Composite composit= new Composite(parent, SWT.NONE);
!         composit.setFont(parent.getFont());
!         GridLayout layout= new GridLayout();
!         layout.numColumns= numColumns;
!         layout.marginWidth= 0;
!         layout.marginHeight= 0;
!         composit.setLayout(layout);
!         composit.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
!         return composit;
!     }
!     
!     /**
!      * Creates a fully configured label with the given text.
!      * @param parent the parent composite
!      * @param text the test of the returned label
!      * @return a fully configured label
!      */
!     protected Label createLabel(Composite parent, String text) {
!         Label label= new Label(parent, SWT.NONE);
!         label.setText(text);
!         label.setFont(parent.getFont());
!         label.setLayoutData(new GridData());
!         return label;
!     }
!     
!     /**
!      * Creates the labels displayed for the breakpoint.
!      * @param parent
!      */
!     protected void createLabels(Composite parent) {
!         PyBreakpoint breakpoint= (PyBreakpoint) getElement();
!         Composite labelComposite= createComposite(parent, 2);
!         String typeName = breakpoint.getFile();
!         if (typeName != null) {
!             createLabel(labelComposite, "File"); //$NON-NLS-1$
!             createLabel(labelComposite, typeName);
!         }
!         createTypeSpecificLabels(labelComposite);
!     }
!     
!     /**
!      * Creates the button to toggle enablement of the breakpoint
!      * @param parent
!      * @throws CoreException
!      */
!     protected void createEnabledButton(Composite parent) throws CoreException {
!         fEnabledButton= createCheckButton(parent, "&Enabled"); //$NON-NLS-1$
!         fEnabledButton.setSelection(getBreakpoint().isEnabled());
!     }
!     
!     /**
!      * Allows subclasses to add type specific labels to the common Java
!      * breakpoint page.
!      * @param parent
!      */
!     protected void createTypeSpecificLabels(Composite parent) {
! //         Line number
!         PyBreakpoint breakpoint = (PyBreakpoint) getBreakpoint();
!         StringBuffer lineNumber = new StringBuffer(4);
!         try {
!             int lNumber = breakpoint.getLineNumber();
!             if (lNumber > 0) {
!                 lineNumber.append(lNumber);
!             }
!         } catch (CoreException ce) {
!             PydevDebugPlugin.log(IStatus.ERROR,ce.getLocalizedMessage(),ce);
!         }
!         if (lineNumber.length() > 0) {
!             createLabel(parent, "&Line Number:"); 
!             createLabel(parent, lineNumber.toString());
!         }
!         // Member
!         /*
!         try {
!             IMember member = BreakpointUtils.getMember(breakpoint);
!             if (member == null) {
!                 return;
!             }
!             String label = PropertyPageMessages.JavaLineBreakpointPage_3; //$NON-NLS-1$
!             String memberName = fJavaLabelProvider.getText(member);
!             if (breakpoint instanceof IJavaMethodBreakpoint) {
!                 label = PropertyPageMessages.JavaLineBreakpointPage_4; //$NON-NLS-1$
!             } else if (breakpoint instanceof IJavaWatchpoint) {
!                 label = PropertyPageMessages.JavaLineBreakpointPage_5; //$NON-NLS-1$
!             }
!             createLabel(parent, label);
!             createLabel(parent, memberName);
!         } catch (CoreException exception) {
!             PydevDebugPlugin.log(IStatus.ERROR,e.getLocalizedMessage(),exception);
!         }*/
!     }
!     /**
!     * Allows subclasses to add type specific editors to the common Java
!     * breakpoint page.
!     * @param parent
!     */
     protected void createTypeSpecificEditors(Composite parent) throws CoreException {
!         PyBreakpoint breakpoint= (PyBreakpoint) getBreakpoint();
!         if (breakpoint.supportsCondition()) {
!             createConditionEditor(parent);
!         }
     }
     
     
!     private void validateMethodBreakpoint() {
!         if (fEnabledButton.getSelection() && !(fMethodEntry.getSelection() || fMethodExit.getSelection())) {
!             addErrorMessage(fgMethodBreakpointError);
!         } else {
!             removeErrorMessage(fgMethodBreakpointError);
!         }
!     }
     
!     /**
!      * Creates a fully configured check button with the given text.
!      * @param parent the parent composite
!      * @param text the label of the returned check button
!      * @return a fully configured check button
!      */
!     protected Button createCheckButton(Composite parent, String text) {
!         Button button= new Button(parent, SWT.CHECK | SWT.LEFT);
!         button.setText(text);
!         button.setFont(parent.getFont());
!         button.setLayoutData(new GridData());
!         return button;
!     }
!     
!     /**
!      * Returns the breakpoint that this preference page configures
!      * @return the breakpoint this page configures
!      */
!     protected PyBreakpoint getBreakpoint() {
!         return (PyBreakpoint) getElement();
!     }
     
      /**
***************
*** 259,465 ****
          } 
          return "";//$NON-NLS-1$
!     }	
! 	
! 	
! 	/**
! 	 * Store the breakpoint properties.
! 	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
! 	 */
! 	public boolean performOk() {
! 		IWorkspaceRunnable wr = new IWorkspaceRunnable() {
! 			public void run(IProgressMonitor monitor) throws CoreException {
! 				PyBreakpoint breakpoint = getBreakpoint();
! 				boolean delOnCancel = breakpoint.getMarker().getAttribute(ATTR_DELETE_ON_CANCEL) != null;
! 				if (delOnCancel) {
! 				    // if this breakpoint is being created, remove the "delete on cancel" attribute
! 				    // and register with the breakpoint manager
! 					breakpoint.getMarker().setAttribute(ATTR_DELETE_ON_CANCEL, (String)null);
! 					breakpoint.setRegistered(true);
! 				}
! 				doStore();
! 			}
! 		};
! 		try {
! 			ResourcesPlugin.getWorkspace().run(wr, null, 0, null);
! 		} catch (CoreException e) {
! 			PydevDebugPlugin.errorDialog("An exception occurred while saving breakpoint properties.", e); //$NON-NLS-1$
! 			PydevDebugPlugin.log(IStatus.ERROR,e.getLocalizedMessage(),e);
! 		}
! 		return super.performOk();
! 	}
! 	
! 	/**
! 	 * Check to see if the breakpoint should be deleted.
! 	 */
! 	public boolean performCancel() {
! 		try {
! 			if (getBreakpoint().getMarker().getAttribute(ATTR_DELETE_ON_CANCEL) != null) {
! 			    // if this breakpoint is being created, delete on cancel
! 				getBreakpoint().delete();
! 			}
! 		} catch (CoreException e) {
! 			PydevDebugPlugin.errorDialog("Unable to cancel breakpoint creation", e); //$NON-NLS-1$
! 		}
! 		return super.performCancel();
! 	}
! 	
! 	/**
! 	 * Stores the values configured in this page. This method
! 	 * should be called from within a workspace runnable to
! 	 * reduce the number of resource deltas.
! 	 */
! 	protected void doStore() throws CoreException {
! 		PyBreakpoint breakpoint= getBreakpoint();
! 		storeEnabled(breakpoint);
! 		
! 		
! 		if (fConditionEditor != null) {
! 			boolean enableCondition= fEnableConditionButton.getSelection();
! 			String condition = fConditionEditor.getCondition();
! 			//boolean suspendOnTrue= fConditionIsTrue.getSelection();
! 			boolean suspendOnTrue= true;
! 			if (breakpoint.isConditionEnabled() != enableCondition) {
! 				breakpoint.setConditionEnabled(enableCondition);
! 			}
! 			if (!condition.equals(breakpoint.getCondition())) {
! 				breakpoint.setCondition(condition);
! 			}
! 		}
! 	}
! 	
! 	/**
! 	 * Stores the value of the enabled state in the breakpoint.
! 	 * @param breakpoint the breakpoint to update
! 	 * @throws CoreException if an exception occurs while setting
! 	 *  the enabled state
! 	 */
! 	private void storeEnabled(PyBreakpoint breakpoint) throws CoreException {
! 		boolean enabled= fEnabledButton.getSelection();
! 		breakpoint.setEnabled(enabled);
! 	}
! 	
! 	/**
! 	 * Creates the controls that allow the user to specify the breakpoint's
! 	 * condition
! 	 * @param parent the composite in which the condition editor should be created
! 	 * @throws CoreException if an exception occurs accessing the breakpoint
! 	 */
! 	private void createConditionEditor(Composite parent) throws CoreException {
! 		PyBreakpoint breakpoint = (PyBreakpoint) getBreakpoint();
  
! 		String label = null;
! 		ICommandManager commandManager= PlatformUI.getWorkbench().getCommandSupport().getCommandManager();
! 		ICommand command = commandManager.getCommand("org.eclipse.ui.edit.text.contentAssist.proposals"); //$NON-NLS-1$
! 		if (command != null) {
! 			List keyBindings = command.getKeySequenceBindings();
! 			if (keyBindings != null && keyBindings.size() > 0) {
! 				IKeySequenceBinding binding = (IKeySequenceBinding)keyBindings.get(0);
! 				label = MessageFormat.format("E&nable Condition", new String[] {binding.getKeySequence().format()}); //$NON-NLS-1$
! 			} 
! 		}
  
! 		if (label == null) {
! 			label = "E&nable Condition (code assist not available)"; //$NON-NLS-1$
! 		}
! 		Composite conditionComposite= new Group(parent, SWT.NONE);
! 		conditionComposite.setFont(parent.getFont());
! 		conditionComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
! 		conditionComposite.setLayout(new GridLayout());
! 		fEnableConditionButton= createCheckButton(conditionComposite, label);
! 		fEnableConditionButton.setSelection(breakpoint.isConditionEnabled());
! 		fEnableConditionButton.addSelectionListener(new SelectionAdapter() {
! 			public void widgetSelected(SelectionEvent e) {
! 				setConditionEnabled(fEnableConditionButton.getSelection());
! 			}
! 		});
! 		
! 		fConditionEditor = new BreakpointConditionEditor(conditionComposite, this); //$NON-NLS-1$
! 		
! 		//fSuspendWhenLabel= createLabel(conditionComposite, "Suspend when:");
! 		//fConditionIsTrue= createRadioButton(conditionComposite, "condition is \'tr&ue\'"); 
! 		//fConditionIsTrue= createLabel(conditionComposite, "condition is \'tr&ue\'");
! 		//fConditionHasChanged= createRadioButton(conditionComposite, "value of condition ch&anges");
! //		if (breakpoint.isConditionSuspendOnTrue()) {
! //			fConditionIsTrue.setSelection(true);
! //		} else {
! //			fConditionHasChanged.setSelection(true);
! //		}
! 		setConditionEnabled(fEnableConditionButton.getSelection());
! 	}
! 	
! 	/**
! 	 * Sets the enabled state of the condition editing controls.
! 	 * @param enabled
! 	 */
! 	private void setConditionEnabled(boolean enabled) {
! 		fConditionEditor.setEnabled(enabled);
! //		fSuspendWhenLabel.setEnabled(enabled);
! //		fConditionIsTrue.setEnabled(enabled);
! 		//fConditionHasChanged.setEnabled(enabled);
! 	}
! 	
! 	/**
! 	 * Overridden here to increase visibility
! 	 * @see org.eclipse.jface.dialogs.DialogPage#convertHeightInCharsToPixels(int)
! 	 */
! 	public int convertHeightInCharsToPixels(int chars) {
! 		return super.convertHeightInCharsToPixels(chars);
! 	}
! 	
! 	/**
! 	 * Overridden here to increase visibility
! 	 * @see org.eclipse.jface.dialogs.DialogPage#convertWidthInCharsToPixels(int)
! 	 */
! 	public int convertWidthInCharsToPixels(int chars) {
! 		return super.convertWidthInCharsToPixels(chars);
! 	}
! 	
! 	/**
! 	 * Adds the given error message to the errors currently displayed on this page.
! 	 * The page displays the most recently added error message.
! 	 * Clients should retain messages that are passed into this method as the
! 	 * message should later be passed into removeErrorMessage(String) to clear the error.
! 	 * This method should be used instead of setErrorMessage(String).
! 	 * @param message the error message to display on this page.
! 	 */
! 	public void addErrorMessage(String message) {
! 		if (message == null) {
! 			return;
! 		}
! 		fErrorMessages.remove(message);
! 		fErrorMessages.add(message);
! 		setErrorMessage(message);
! 		setValid(false);
! 	}
! 	
! 	/**
! 	 * Removes the given error message from the errors currently displayed on this page.
! 	 * When an error message is removed, the page displays the error that was added
! 	 * before the given message. This is akin to popping the message from a stack.
! 	 * Clients should call this method instead of setErrorMessage(null).
! 	 * @param message the error message to clear
! 	 */
! 	public void removeErrorMessage(String message) {
! 		fErrorMessages.remove(message);
! 		if (fErrorMessages.isEmpty()) {
! 			setErrorMessage(null);
! 			setValid(true);
! 		} else {
! 			setErrorMessage((String) fErrorMessages.get(fErrorMessages.size() - 1));
! 		}
! 	}
! 	
! 	/**
! 	 * Creates a fully configured radio button with the given text.
! 	 * @param parent the parent composite
! 	 * @param text the label of the returned radio button
! 	 * @return a fully configured radio button
! 	 */
! 	protected Button createRadioButton(Composite parent, String text) {
! 		Button button= new Button(parent, SWT.RADIO | SWT.LEFT);
! 		button.setText(text);
! 		button.setFont(parent.getFont());
! 		button.setLayoutData(new GridData());
! 		return button;
! 	}
  }
--- 259,465 ----
          } 
          return "";//$NON-NLS-1$
!     }    
!     
!     
!     /**
!      * Store the breakpoint properties.
!      * @see org.eclipse.jface.preference.IPreferencePage#performOk()
!      */
!     public boolean performOk() {
!         IWorkspaceRunnable wr = new IWorkspaceRunnable() {
!             public void run(IProgressMonitor monitor) throws CoreException {
!                 PyBreakpoint breakpoint = getBreakpoint();
!                 boolean delOnCancel = breakpoint.getMarker().getAttribute(ATTR_DELETE_ON_CANCEL) != null;
!                 if (delOnCancel) {
!                     // if this breakpoint is being created, remove the "delete on cancel" attribute
!                     // and register with the breakpoint manager
!                     breakpoint.getMarker().setAttribute(ATTR_DELETE_ON_CANCEL, (String)null);
!                     breakpoint.setRegistered(true);
!                 }
!                 doStore();
!             }
!         };
!         try {
!             ResourcesPlugin.getWorkspace().run(wr, null, 0, null);
!         } catch (CoreException e) {
!             PydevDebugPlugin.errorDialog("An exception occurred while saving breakpoint properties.", e); //$NON-NLS-1$
!             PydevDebugPlugin.log(IStatus.ERROR,e.getLocalizedMessage(),e);
!         }
!         return super.performOk();
!     }
!     
!     /**
!      * Check to see if the breakpoint should be deleted.
!      */
!     public boolean performCancel() {
!         try {
!             if (getBreakpoint().getMarker().getAttribute(ATTR_DELETE_ON_CANCEL) != null) {
!                 // if this breakpoint is being created, delete on cancel
!                 getBreakpoint().delete();
!             }
!         } catch (CoreException e) {
!             PydevDebugPlugin.errorDialog("Unable to cancel breakpoint creation", e); //$NON-NLS-1$
!         }
!         return super.performCancel();
!     }
!     
!     /**
!      * Stores the values configured in this page. This method
!      * should be called from within a workspace runnable to
!      * reduce the number of resource deltas.
!      */
!     protected void doStore() throws CoreException {
!         PyBreakpoint breakpoint= getBreakpoint();
!         storeEnabled(breakpoint);
!         
!         
!         if (fConditionEditor != null) {
!             boolean enableCondition= fEnableConditionButton.getSelection();
!             String condition = fConditionEditor.getCondition();
!             //boolean suspendOnTrue= fConditionIsTrue.getSelection();
!             boolean suspendOnTrue= true;
!             if (breakpoint.isConditionEnabled() != enableCondition) {
!                 breakpoint.setConditionEnabled(enableCondition);
!             }
!             if (!condition.equals(breakpoint.getCondition())) {
!                 breakpoint.setCondition(condition);
!             }
!         }
!     }
!     
!     /**
!      * Stores the value of the enabled state in the breakpoint.
!      * @param breakpoint the breakpoint to update
!      * @throws CoreException if an exception occurs while setting
!      *  the enabled state
!      */
!     private void storeEnabled(PyBreakpoint breakpoint) throws CoreException {
!         boolean enabled= fEnabledButton.getSelection();
!         breakpoint.setEnabled(enabled);
!     }
!     
!     /**
!      * Creates the controls that allow the user to specify the breakpoint's
!      * condition
!      * @param parent the composite in which the condition editor should be created
!      * @throws CoreException if an exception occurs accessing the breakpoint
!      */
!     private void createConditionEditor(Composite parent) throws CoreException {
!         PyBreakpoint breakpoint = (PyBreakpoint) getBreakpoint();
  
!         String label = null;
!         ICommandManager commandManager= PlatformUI.getWorkbench().getCommandSupport().getCommandManager();
!         ICommand command = commandManager.getCommand("org.eclipse.ui.edit.text.contentAssist.proposals"); //$NON-NLS-1$
!         if (command != null) {
!             List keyBindings = command.getKeySequenceBindings();
!             if (keyBindings != null && keyBindings.size() > 0) {
!                 IKeySequenceBinding binding = (IKeySequenceBinding)keyBindings.get(0);
!                 label = MessageFormat.format("E&nable Condition", new String[] {binding.getKeySequence().format()}); //$NON-NLS-1$
!             } 
!         }
  
!         if (label == null) {
!             label = "E&nable Condition (code assist not available)"; //$NON-NLS-1$
!         }
!         Composite conditionComposite= new Group(parent, SWT.NONE);
!         conditionComposite.setFont(parent.getFont());
!         conditionComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
!         conditionComposite.setLayout(new GridLayout());
!         fEnableConditionButton= createCheckButton(conditionComposite, label);
!         fEnableConditionButton.setSelection(breakpoint.isConditionEnabled());
!         fEnableConditionButton.addSelectionListener(new SelectionAdapter() {
!             public void widgetSelected(SelectionEvent e) {
!                 setConditionEnabled(fEnableConditionButton.getSelection());
!             }
!         });
!         
!         fConditionEditor = new BreakpointConditionEditor(conditionComposite, this); //$NON-NLS-1$
!         
!         //fSuspendWhenLabel= createLabel(conditionComposite, "Suspend when:");
!         //fConditionIsTrue= createRadioButton(conditionComposite, "condition is \'tr&ue\'"); 
!         //fConditionIsTrue= createLabel(conditionComposite, "condition is \'tr&ue\'");
!         //fConditionHasChanged= createRadioButton(conditionComposite, "value of condition ch&anges");
! //        if (breakpoint.isConditionSuspendOnTrue()) {
! //            fConditionIsTrue.setSelection(true);
! //        } else {
! //            fConditionHasChanged.setSelection(true);
! //        }
!         setConditionEnabled(fEnableConditionButton.getSelection());
!     }
!     
!     /**
!      * Sets the enabled state of the condition editing controls.
!      * @param enabled
!      */
!     private void setConditionEnabled(boolean enabled) {
!         fConditionEditor.setEnabled(enabled);
! //        fSuspendWhenLabel.setEnabled(enabled);
! //        fConditionIsTrue.setEnabled(enabled);
!         //fConditionHasChanged.setEnabled(enabled);
!     }
!     
!     /**
!      * Overridden here to increase visibility
!      * @see org.eclipse.jface.dialogs.DialogPage#convertHeightInCharsToPixels(int)
!      */
!     public int convertHeightInCharsToPixels(int chars) {
!         return super.convertHeightInCharsToPixels(chars);
!     }
!     
!     /**
!      * Overridden here to increase visibility
!      * @see org.eclipse.jface.dialogs.DialogPage#convertWidthInCharsToPixels(int)
!      */
!     public int convertWidthInCharsToPixels(int chars) {
!         return super.convertWidthInCharsToPixels(chars);
!     }
!     
!     /**
!      * Adds the given error message to the errors currently displayed on this page.
!      * The page displays the most recently added error message.
!      * Clients should retain messages that are passed into this method as the
!      * message should later be passed into removeErrorMessage(String) to clear the error.
!      * This method should be used instead of setErrorMessage(String).
!      * @param message the error message to display on this page.
!      */
!     public void addErrorMessage(String message) {
!         if (message == null) {
!             return;
!         }
!         fErrorMessages.remove(message);
!         fErrorMessages.add(message);
!         setErrorMessage(message);
!         setValid(false);
!     }
!     
!     /**
!      * Removes the given error message from the errors currently displayed on this page.
!      * When an error message is removed, the page displays the error that was added
!      * before the given message. This is akin to popping the message from a stack.
!      * Clients should call this method instead of setErrorMessage(null).
!      * @param message the error message to clear
!      */
!     public void removeErrorMessage(String message) {
!         fErrorMessages.remove(message);
!         if (fErrorMessages.isEmpty()) {
!             setErrorMessage(null);
!             setValid(true);
!         } else {
!             setErrorMessage((String) fErrorMessages.get(fErrorMessages.size() - 1));
!         }
!     }
!     
!     /**
!      * Creates a fully configured radio button with the given text.
!      * @param parent the parent composite
!      * @param text the label of the returned radio button
!      * @return a fully configured radio button
!      */
!     protected Button createRadioButton(Composite parent, String text) {
!         Button button= new Button(parent, SWT.RADIO | SWT.LEFT);
!         button.setText(text);
!         button.setFont(parent.getFont());
!         button.setLayoutData(new GridData());
!         return button;
!     }
  }

Index: BreakpointConditionEditor.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/ui/propertypages/BreakpointConditionEditor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BreakpointConditionEditor.java	7 Dec 2007 00:49:24 -0000	1.4
--- BreakpointConditionEditor.java	27 Sep 2008 19:59:09 -0000	1.5
***************
*** 37,96 ****
  public class BreakpointConditionEditor {
  
! 	private boolean fIsValid;
! 		
! 	private String fOldValue;
! 	private String fErrorMessage;
! 	
! 	private HandlerSubmission submission;
      private IDocumentListener fDocumentListener;
  
! 	private PythonBreakpointPage fPage;
  
! 	private PyBreakpoint fBreakpoint;
  
! 	private PythonSourceViewer fViewer;
  
! 	public BreakpointConditionEditor(Composite parent, PythonBreakpointPage page) {
! 		fPage = page;
! 		fBreakpoint= (PyBreakpoint) fPage.getBreakpoint();
! 		String condition;
! 		try {
! 			condition= fBreakpoint.getCondition();
! 		} catch (DebugException e) {
! 			PydevDebugPlugin.log(IStatus.ERROR, "Can't read conditions", e);
! 			return;
! 		}
! 		fErrorMessage= "Enter a condition"; //$NON-NLS-1$
! 		fOldValue= ""; //$NON-NLS-1$
! 			
! 		// the source viewer
! 		fViewer= new PythonSourceViewer(parent, null, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
! 		fViewer.setInput(parent);
! 		
  
! 		IDocument document= new Document();
! 		IDocumentPartitioner partitioner= new PyPartitioner(new PyPartitionScanner(), IPythonPartitions.types);
! 		document.setDocumentPartitioner(partitioner);
! 		partitioner.connect(document);
! 		/*
! 		fViewer.configure(new DisplayViewerConfiguration() {
! 			public IContentAssistProcessor getContentAssistantProcessor() {
! 					return getCompletionProcessor();
! 			}
! 		});*/
! 		fViewer.setEditable(true);
! 		fViewer.setDocument(document);
! 		final IUndoManager undoManager= new TextViewerUndoManager(100);
! 		fViewer.setUndoManager(undoManager);
! 		undoManager.connect(fViewer);
! 		
! 		fViewer.getTextWidget().setFont(JFaceResources.getTextFont());
! 			
! 		Control control= fViewer.getControl();
! 		GridData gd = new GridData(GridData.FILL_BOTH);
! 		control.setLayoutData(gd);
! 		
! 		// listener for check the value
! 		fDocumentListener= new IDocumentListener() {
              public void documentAboutToBeChanged(DocumentEvent event) {
              }
--- 37,96 ----
  public class BreakpointConditionEditor {
  
!     private boolean fIsValid;
!         
!     private String fOldValue;
!     private String fErrorMessage;
!     
!     private HandlerSubmission submission;
      private IDocumentListener fDocumentListener;
  
!     private PythonBreakpointPage fPage;
  
!     private PyBreakpoint fBreakpoint;
  
!     private PythonSourceViewer fViewer;
  
!     public BreakpointConditionEditor(Composite parent, PythonBreakpointPage page) {
!         fPage = page;
!         fBreakpoint= (PyBreakpoint) fPage.getBreakpoint();
!         String condition;
!         try {
!             condition= fBreakpoint.getCondition();
!         } catch (DebugException e) {
!             PydevDebugPlugin.log(IStatus.ERROR, "Can't read conditions", e);
!             return;
!         }
!         fErrorMessage= "Enter a condition"; //$NON-NLS-1$
!         fOldValue= ""; //$NON-NLS-1$
!             
!         // the source viewer
!         fViewer= new PythonSourceViewer(parent, null, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
!         fViewer.setInput(parent);
!         
  
!         IDocument document= new Document();
!         IDocumentPartitioner partitioner= new PyPartitioner(new PyPartitionScanner(), IPythonPartitions.types);
!         document.setDocumentPartitioner(partitioner);
!         partitioner.connect(document);
!         /*
!         fViewer.configure(new DisplayViewerConfiguration() {
!             public IContentAssistProcessor getContentAssistantProcessor() {
!                     return getCompletionProcessor();
!             }
!         });*/
!         fViewer.setEditable(true);
!         fViewer.setDocument(document);
!         final IUndoManager undoManager= new TextViewerUndoManager(100);
!         fViewer.setUndoManager(undoManager);
!         undoManager.connect(fViewer);
!         
!         fViewer.getTextWidget().setFont(JFaceResources.getTextFont());
!             
!         Control control= fViewer.getControl();
!         GridData gd = new GridData(GridData.FILL_BOTH);
!         control.setLayoutData(gd);
!         
!         // listener for check the value
!         fDocumentListener= new IDocumentListener() {
              public void documentAboutToBeChanged(DocumentEvent event) {
              }
***************
*** 99,224 ****
              }
          };
! 		fViewer.getDocument().addDocumentListener(fDocumentListener);
! 		
! 		// we can only do code assist if there is an associated type
! 		/*
! 		try {
! 			//getCompletionProcessor().setType(type);			
! 			String source= null;
! 			ICompilationUnit compilationUnit= type.getCompilationUnit();
! 			if (compilationUnit != null) {
! 				source= compilationUnit.getSource();
! 			} else {
! 				IClassFile classFile= type.getClassFile();
! 				if (classFile != null) {
! 					source= classFile.getSource();
! 				}
! 			}
! 			int lineNumber= fBreakpoint.getMarker().getAttribute(IMarker.LINE_NUMBER, -1);
! 			int position= -1;
! 			if (source != null && lineNumber != -1) {
! 				try {
! 					position= new Document(source).getLineOffset(lineNumber - 1);
! 				} catch (BadLocationException e) {
! 				}
! 			}
! 			//getCompletionProcessor().setPosition(position);
! 		} catch (CoreException e) {
! 		}*/
! 			
! 		gd= (GridData)fViewer.getControl().getLayoutData();
! 		gd.heightHint= fPage.convertHeightInCharsToPixels(10);
! 		gd.widthHint= fPage.convertWidthInCharsToPixels(40);	
! 		document.set(condition);
! 		valueChanged();
! 		
! 		IHandler handler = new AbstractHandler() {
! 		    public Object execute(Map parameter) throws ExecutionException {
! 		        fViewer.doOperation(ISourceViewer.CONTENTASSIST_PROPOSALS);
! 		        return null;
! 			}
! 		};
! 		submission = new HandlerSubmission(null, parent.getShell(), null, ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS, handler, Priority.MEDIUM); //$NON-NLS-1$	
! 	}
  
! 	/**
! 	 * Returns the condition defined in the source viewer.
! 	 * @return the contents of this condition editor
! 	 */
! 	public String getCondition() {
! 		return fViewer.getDocument().get();
! 	}
  
! 	/**
! 	 * @see org.eclipse.jface.preference.FieldEditor#refreshValidState()
! 	 */
! 	protected void refreshValidState() {
! 		// the value is valid if the field is not editable, or if the value is not empty
! 		if (!fViewer.isEditable()) {
! 			fPage.removeErrorMessage(fErrorMessage);
! 			fIsValid= true;
! 		} else {
! 			String text= fViewer.getDocument().get();
! 			fIsValid= text != null && text.trim().length() > 0;
! 			if (!fIsValid) {
! 				fPage.addErrorMessage(fErrorMessage);
! 			} else {
! 				fPage.removeErrorMessage(fErrorMessage);
! 			}
! 		}
! 	}
! 		
! 	/**
! 	 * Return the completion processor associated with this viewer.
! 	 * @return BreakPointConditionCompletionProcessor
! 	 *//*
! 	protected BreakpointConditionCompletionProcessor getCompletionProcessor() {
! 		if (fCompletionProcessor == null) {
! 			fCompletionProcessor= new BreakpointConditionCompletionProcessor(null);
! 		}
! 		return fCompletionProcessor;
! 	}*/
  
! 	/**
! 	 * @see org.eclipse.jface.preference.FieldEditor#setEnabled(boolean, org.eclipse.swt.widgets.Composite)
! 	 */
! 	public void setEnabled(boolean enabled) {
! 	    fViewer.setEditable(enabled);
! 	    fViewer.getTextWidget().setEnabled(enabled);
! 		if (enabled) {
! 			fViewer.updateViewerColors();
! 			fViewer.getTextWidget().setFocus();
! 			
! 			IWorkbench workbench = PlatformUI.getWorkbench();
! 			IWorkbenchCommandSupport commandSupport = workbench.getCommandSupport();
! 			commandSupport.addHandlerSubmission(submission);
! 		} else {
! 			Color color= fViewer.getControl().getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
! 			fViewer.getTextWidget().setBackground(color);
! 			IWorkbench workbench = PlatformUI.getWorkbench();
! 			IWorkbenchCommandSupport commandSupport = workbench.getCommandSupport();
! 			commandSupport.removeHandlerSubmission(submission);
! 		}
! 		valueChanged();
! 	}
! 	
! 	protected void valueChanged() {
! 		refreshValidState();
! 				
! 		String newValue = fViewer.getDocument().get();
! 		if (!newValue.equals(fOldValue)) {
! 			fOldValue = newValue;
! 		}
! 	}
! 	
! 	public void dispose() {
! 	    if (fViewer.isEditable()) {
! 			IWorkbench workbench = PlatformUI.getWorkbench();
! 			IWorkbenchCommandSupport commandSupport = workbench.getCommandSupport();
! 			commandSupport.removeHandlerSubmission(submission);
! 	    }
! 	    fViewer.getDocument().removeDocumentListener(fDocumentListener);
! 		fViewer.dispose();
! 	}
! 	
  }
--- 99,224 ----
              }
          };
!         fViewer.getDocument().addDocumentListener(fDocumentListener);
!         
!         // we can only do code assist if there is an associated type
!         /*
!         try {
!             //getCompletionProcessor().setType(type);            
!             String source= null;
!             ICompilationUnit compilationUnit= type.getCompilationUnit();
!             if (compilationUnit != null) {
!                 source= compilationUnit.getSource();
!             } else {
!                 IClassFile classFile= type.getClassFile();
!                 if (classFile != null) {
!                     source= classFile.getSource();
!                 }
!             }
!             int lineNumber= fBreakpoint.getMarker().getAttribute(IMarker.LINE_NUMBER, -1);
!             int position= -1;
!             if (source != null && lineNumber != -1) {
!                 try {
!                     position= new Document(source).getLineOffset(lineNumber - 1);
!                 } catch (BadLocationException e) {
!                 }
!             }
!             //getCompletionProcessor().setPosition(position);
!         } catch (CoreException e) {
!         }*/
!             
!         gd= (GridData)fViewer.getControl().getLayoutData();
!         gd.heightHint= fPage.convertHeightInCharsToPixels(10);
!         gd.widthHint= fPage.convertWidthInCharsToPixels(40);    
!         document.set(condition);
!         valueChanged();
!         
!         IHandler handler = new AbstractHandler() {
!             public Object execute(Map parameter) throws ExecutionException {
!                 fViewer.doOperation(ISourceViewer.CONTENTASSIST_PROPOSALS);
!                 return null;
!             }
!         };
!         submission = new HandlerSubmission(null, parent.getShell(), null, ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS, handler, Priority.MEDIUM); //$NON-NLS-1$    
!     }
  
!     /**
!      * Returns the condition defined in the source viewer.
!      * @return the contents of this condition editor
!      */
!     public String getCondition() {
!         return fViewer.getDocument().get();
!     }
  
!     /**
!      * @see org.eclipse.jface.preference.FieldEditor#refreshValidState()
!      */
!     protected void refreshValidState() {
!         // the value is valid if the field is not editable, or if the value is not empty
!         if (!fViewer.isEditable()) {
!             fPage.removeErrorMessage(fErrorMessage);
!             fIsValid= true;
!         } else {
!             String text= fViewer.getDocument().get();
!             fIsValid= text != null && text.trim().length() > 0;
!             if (!fIsValid) {
!                 fPage.addErrorMessage(fErrorMessage);
!             } else {
!                 fPage.removeErrorMessage(fErrorMessage);
!             }
!         }
!     }
!         
!     /**
!      * Return the completion processor associated with this viewer.
!      * @return BreakPointConditionCompletionProcessor
!      *//*
!     protected BreakpointConditionCompletionProcessor getCompletionProcessor() {
!         if (fCompletionProcessor == null) {
!             fCompletionProcessor= new BreakpointConditionCompletionProcessor(null);
!         }
!         return fCompletionProcessor;
!     }*/
  
!     /**
!      * @see org.eclipse.jface.preference.FieldEditor#setEnabled(boolean, org.eclipse.swt.widgets.Composite)
!      */
!     public void setEnabled(boolean enabled) {
!         fViewer.setEditable(enabled);
!         fViewer.getTextWidget().setEnabled(enabled);
!         if (enabled) {
!             fViewer.updateViewerColors();
!             fViewer.getTextWidget().setFocus();
!             
!             IWorkbench workbench = PlatformUI.getWorkbench();
!             IWorkbenchCommandSupport commandSupport = workbench.getCommandSupport();
!             commandSupport.addHandlerSubmission(submission);
!         } else {
!             Color color= fViewer.getControl().getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
!             fViewer.getTextWidget().setBackground(color);
!             IWorkbench workbench = PlatformUI.getWorkbench();
!             IWorkbenchCommandSupport commandSupport = workbench.getCommandSupport();
!             commandSupport.removeHandlerSubmission(submission);
!         }
!         valueChanged();
!     }
!     
!     protected void valueChanged() {
!         refreshValidState();
!                 
!         String newValue = fViewer.getDocument().get();
!         if (!newValue.equals(fOldValue)) {
!             fOldValue = newValue;
!         }
!     }
!     
!     public void dispose() {
!         if (fViewer.isEditable()) {
!             IWorkbench workbench = PlatformUI.getWorkbench();
!             IWorkbenchCommandSupport commandSupport = workbench.getCommandSupport();
!             commandSupport.removeHandlerSubmission(submission);
!         }
!         fViewer.getDocument().removeDocumentListener(fDocumentListener);
!         fViewer.dispose();
!     }
!     
  }