[Pydev-cvs] org.python.pydev/src/org/python/pydev/plugin DebugSettings.java, NONE, 1.1 PydevPlugin.java, 1.90, 1.91 AbstractPydevPrefs.java, 1.4, 1.5 StatusInfo.java, 1.2, 1.3 PydevPrefs.java, 1.49, 1.50 ColorEditor.java, 1.2, 1.3 PydevPrefsInitializer.java, 1.21, 1.22 PyunitPrefsPage.java, 1.4, 1.5 OverlayPreferenceStore.java, 1.3, 1.4

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

Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4313/src/org/python/pydev/plugin

Modified Files:
	PydevPlugin.java AbstractPydevPrefs.java StatusInfo.java 
	PydevPrefs.java ColorEditor.java PydevPrefsInitializer.java 
	PyunitPrefsPage.java OverlayPreferenceStore.java 
Added Files:
	DebugSettings.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: OverlayPreferenceStore.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/OverlayPreferenceStore.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OverlayPreferenceStore.java	20 Oct 2007 19:30:36 -0000	1.3
--- OverlayPreferenceStore.java	28 Sep 2008 12:45:44 -0000	1.4
***************
*** 25,488 ****
   */
  public class OverlayPreferenceStore  implements IPreferenceStore {
! 	
! 	
! 	public static final class TypeDescriptor {
! 		private TypeDescriptor() {
! 		}
! 	}
! 	
! 	public static final TypeDescriptor BOOLEAN= new TypeDescriptor();
! 	public static final TypeDescriptor DOUBLE= new TypeDescriptor();
! 	public static final TypeDescriptor FLOAT= new TypeDescriptor();
! 	public static final TypeDescriptor INT= new TypeDescriptor();
! 	public static final TypeDescriptor LONG= new TypeDescriptor();
! 	public static final TypeDescriptor STRING= new TypeDescriptor();
! 	
! 	public static class OverlayKey {
! 		
! 		TypeDescriptor fDescriptor;
! 		String fKey;
! 		
! 		public OverlayKey(TypeDescriptor descriptor, String key) {
! 			fDescriptor= descriptor;
! 			fKey= key;
! 		}
! 	}
! 	
! 	private class PropertyListener implements IPropertyChangeListener {
! 				
! 		/*
! 		 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
! 		 */
! 		public void propertyChange(PropertyChangeEvent event) {
! 			OverlayKey key= findOverlayKey(event.getProperty());
! 			if (key != null)
! 				propagateProperty(fParent, key, fStore); 
! 		}
! 	}
! 	
! 	
! 	private IPreferenceStore fParent;
! 	private IPreferenceStore fStore;
! 	private OverlayKey[] fOverlayKeys;
! 	
! 	private PropertyListener fPropertyListener;
! 	private boolean fLoaded;
! 	
! 	
! 	public OverlayPreferenceStore(IPreferenceStore parent, OverlayKey[] overlayKeys) {
! 		fParent= parent;
! 		fOverlayKeys= overlayKeys;
! 		fStore= new PreferenceStore();
! 	}
! 	
! 	private OverlayKey findOverlayKey(String key) {
! 		for (int i= 0; i < fOverlayKeys.length; i++) {
! 			if (fOverlayKeys[i].fKey.equals(key))
! 				return fOverlayKeys[i];
! 		}
! 		return null;
! 	}
! 	
! 	private boolean covers(String key) {
! 		return (findOverlayKey(key) != null);
! 	}
! 	
! 	private void propagateProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target) {
! 		
! 		if (orgin.isDefault(key.fKey)) {
! 			if (!target.isDefault(key.fKey))
! 				target.setToDefault(key.fKey);
! 			return;
! 		}
! 		
! 		TypeDescriptor d= key.fDescriptor;
! 		if (BOOLEAN == d) {
! 			
! 			boolean originValue= orgin.getBoolean(key.fKey);
! 			boolean targetValue= target.getBoolean(key.fKey);
! 			if (targetValue != originValue)
! 				target.setValue(key.fKey, originValue);
! 				
! 		} else if (DOUBLE == d) {
! 			
! 			double originValue= orgin.getDouble(key.fKey);
! 			double targetValue= target.getDouble(key.fKey);
! 			if (targetValue != originValue)
! 				target.setValue(key.fKey, originValue);
! 		
! 		} else if (FLOAT == d) {
! 			
! 			float originValue= orgin.getFloat(key.fKey);
! 			float targetValue= target.getFloat(key.fKey);
! 			if (targetValue != originValue)
! 				target.setValue(key.fKey, originValue);
! 				
! 		} else if (INT == d) {
  
! 			int originValue= orgin.getInt(key.fKey);
! 			int targetValue= target.getInt(key.fKey);
! 			if (targetValue != originValue)
! 				target.setValue(key.fKey, originValue);
  
! 		} else if (LONG == d) {
  
! 			long originValue= orgin.getLong(key.fKey);
! 			long targetValue= target.getLong(key.fKey);
! 			if (targetValue != originValue)
! 				target.setValue(key.fKey, originValue);
  
! 		} else if (STRING == d) {
  
! 			String originValue= orgin.getString(key.fKey);
! 			String targetValue= target.getString(key.fKey);
! 			if (targetValue != null && originValue != null && !targetValue.equals(originValue))
! 				target.setValue(key.fKey, originValue);
  
! 		}
! 	}
! 	
! 	public void propagate() {
! 		for (int i= 0; i < fOverlayKeys.length; i++)
! 			propagateProperty(fStore, fOverlayKeys[i], fParent);
! 	}
! 	
! 	private void loadProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target, boolean forceInitialization) {
! 		TypeDescriptor d= key.fDescriptor;
! 		if (BOOLEAN == d) {
! 			
! 			if (forceInitialization)
! 				target.setValue(key.fKey, true);
! 			target.setValue(key.fKey, orgin.getBoolean(key.fKey));
! 			target.setDefault(key.fKey, orgin.getDefaultBoolean(key.fKey));
! 			
! 		} else if (DOUBLE == d) {
! 			
! 			if (forceInitialization)
! 				target.setValue(key.fKey, 1.0D);
! 			target.setValue(key.fKey, orgin.getDouble(key.fKey));
! 			target.setDefault(key.fKey, orgin.getDefaultDouble(key.fKey));
! 			
! 		} else if (FLOAT == d) {
! 			
! 			if (forceInitialization)
! 				target.setValue(key.fKey, 1.0F);
! 			target.setValue(key.fKey, orgin.getFloat(key.fKey));
! 			target.setDefault(key.fKey, orgin.getDefaultFloat(key.fKey));
! 			
! 		} else if (INT == d) {
! 			
! 			if (forceInitialization)
! 				target.setValue(key.fKey, 1);
! 			target.setValue(key.fKey, orgin.getInt(key.fKey));
! 			target.setDefault(key.fKey, orgin.getDefaultInt(key.fKey));
! 			
! 		} else if (LONG == d) {
! 			
! 			if (forceInitialization)
! 				target.setValue(key.fKey, 1L);
! 			target.setValue(key.fKey, orgin.getLong(key.fKey));
! 			target.setDefault(key.fKey, orgin.getDefaultLong(key.fKey));
! 			
! 		} else if (STRING == d) {
! 			
! 			if (forceInitialization)
! 				target.setValue(key.fKey, "1"); //$NON-NLS-1$
! 			target.setValue(key.fKey, orgin.getString(key.fKey));
! 			target.setDefault(key.fKey, orgin.getDefaultString(key.fKey));
! 			
! 		}
! 	}
! 	
! 	public void load() {
! 		for (int i= 0; i < fOverlayKeys.length; i++)
! 			loadProperty(fParent, fOverlayKeys[i], fStore, true);
! 		
! 		fLoaded= true;
! 		
! 	}
! 	
! 	public void loadDefaults() {
! 		for (int i= 0; i < fOverlayKeys.length; i++)
! 			setToDefault(fOverlayKeys[i].fKey);
! 	}
! 	
! 	public void start() {
! 		if (fPropertyListener == null) {
! 			fPropertyListener= new PropertyListener();
! 			fParent.addPropertyChangeListener(fPropertyListener);
! 		}
! 	}
! 	
! 	public void stop() {
! 		if (fPropertyListener != null)  {
! 			fParent.removePropertyChangeListener(fPropertyListener);
! 			fPropertyListener= null;
! 		}
! 	}
! 	
! 	/*
! 	 * @see IPreferenceStore#addPropertyChangeListener(IPropertyChangeListener)
! 	 */
! 	public void addPropertyChangeListener(IPropertyChangeListener listener) {
! 		fStore.addPropertyChangeListener(listener);
! 	}
! 	
! 	/*
! 	 * @see IPreferenceStore#removePropertyChangeListener(IPropertyChangeListener)
! 	 */
! 	public void removePropertyChangeListener(IPropertyChangeListener listener) {
! 		fStore.removePropertyChangeListener(listener);
! 	}
! 	
! 	/*
! 	 * @see IPreferenceStore#firePropertyChangeEvent(String, Object, Object)
! 	 */
! 	public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
! 		fStore.firePropertyChangeEvent(name, oldValue, newValue);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#contains(String)
! 	 */
! 	public boolean contains(String name) {
! 		return fStore.contains(name);
! 	}
! 	
! 	/*
! 	 * @see IPreferenceStore#getBoolean(String)
! 	 */
! 	public boolean getBoolean(String name) {
! 		return fStore.getBoolean(name);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#getDefaultBoolean(String)
! 	 */
! 	public boolean getDefaultBoolean(String name) {
! 		return fStore.getDefaultBoolean(name);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#getDefaultDouble(String)
! 	 */
! 	public double getDefaultDouble(String name) {
! 		return fStore.getDefaultDouble(name);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#getDefaultFloat(String)
! 	 */
! 	public float getDefaultFloat(String name) {
! 		return fStore.getDefaultFloat(name);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#getDefaultInt(String)
! 	 */
! 	public int getDefaultInt(String name) {
! 		return fStore.getDefaultInt(name);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#getDefaultLong(String)
! 	 */
! 	public long getDefaultLong(String name) {
! 		return fStore.getDefaultLong(name);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#getDefaultString(String)
! 	 */
! 	public String getDefaultString(String name) {
! 		return fStore.getDefaultString(name);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#getDouble(String)
! 	 */
! 	public double getDouble(String name) {
! 		return fStore.getDouble(name);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#getFloat(String)
! 	 */
! 	public float getFloat(String name) {
! 		return fStore.getFloat(name);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#getInt(String)
! 	 */
! 	public int getInt(String name) {
! 		return fStore.getInt(name);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#getLong(String)
! 	 */
! 	public long getLong(String name) {
! 		return fStore.getLong(name);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#getString(String)
! 	 */
! 	public String getString(String name) {
! 		return fStore.getString(name);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#isDefault(String)
! 	 */
! 	public boolean isDefault(String name) {
! 		return fStore.isDefault(name);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#needsSaving()
! 	 */
! 	public boolean needsSaving() {
! 		return fStore.needsSaving();
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#putValue(String, String)
! 	 */
! 	public void putValue(String name, String value) {
! 		if (covers(name))
! 			fStore.putValue(name, value);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#setDefault(String, double)
! 	 */
! 	public void setDefault(String name, double value) {
! 		if (covers(name))
! 			fStore.setDefault(name, value);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#setDefault(String, float)
! 	 */
! 	public void setDefault(String name, float value) {
! 		if (covers(name))
! 			fStore.setDefault(name, value);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#setDefault(String, int)
! 	 */
! 	public void setDefault(String name, int value) {
! 		if (covers(name))
! 			fStore.setDefault(name, value);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#setDefault(String, long)
! 	 */
! 	public void setDefault(String name, long value) {
! 		if (covers(name))
! 			fStore.setDefault(name, value);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#setDefault(String, String)
! 	 */
! 	public void setDefault(String name, String value) {
! 		if (covers(name))
! 			fStore.setDefault(name, value);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#setDefault(String, boolean)
! 	 */
! 	public void setDefault(String name, boolean value) {
! 		if (covers(name))
! 			fStore.setDefault(name, value);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#setToDefault(String)
! 	 */
! 	public void setToDefault(String name) {
! 		fStore.setToDefault(name);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#setValue(String, double)
! 	 */
! 	public void setValue(String name, double value) {
! 		if (covers(name))
! 			fStore.setValue(name, value);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#setValue(String, float)
! 	 */
! 	public void setValue(String name, float value) {
! 		if (covers(name))
! 			fStore.setValue(name, value);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#setValue(String, int)
! 	 */
! 	public void setValue(String name, int value) {
! 		if (covers(name))
! 			fStore.setValue(name, value);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#setValue(String, long)
! 	 */
! 	public void setValue(String name, long value) {
! 		if (covers(name))
! 			fStore.setValue(name, value);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#setValue(String, String)
! 	 */
! 	public void setValue(String name, String value) {
! 		if (covers(name))
! 			fStore.setValue(name, value);
! 	}
  
! 	/*
! 	 * @see IPreferenceStore#setValue(String, boolean)
! 	 */
! 	public void setValue(String name, boolean value) {
! 		if (covers(name))
! 			fStore.setValue(name, value);
! 	}
  
! 	/**
! 	 * The keys to add to the list of overlay keys.
! 	 * <p>
! 	 * Note: This method must be called before {@link #load()} is called. 
! 	 * </p>
! 	 * 
! 	 * @param keys
! 	 * @since 3.0
! 	 */
! 	public void addKeys(OverlayKey[] keys) {
! 		Assert.isTrue(!fLoaded);
! 		Assert.isNotNull(keys);
! 		
! 		int overlayKeysLength= fOverlayKeys.length;
! 		OverlayKey[] result= new OverlayKey[keys.length + overlayKeysLength];
  
! 		for (int i= 0, length= overlayKeysLength; i < length; i++)
! 			result[i]= fOverlayKeys[i];
! 		
! 		for (int i= 0, length= keys.length; i < length; i++)
! 			result[overlayKeysLength + i]= keys[i];
! 		
! 		fOverlayKeys= result;
! 		
! 		if (fLoaded)
! 			load();
! 	}
  }
--- 25,488 ----
   */
  public class OverlayPreferenceStore  implements IPreferenceStore {
!     
!     
!     public static final class TypeDescriptor {
!         private TypeDescriptor() {
!         }
!     }
!     
!     public static final TypeDescriptor BOOLEAN= new TypeDescriptor();
!     public static final TypeDescriptor DOUBLE= new TypeDescriptor();
!     public static final TypeDescriptor FLOAT= new TypeDescriptor();
!     public static final TypeDescriptor INT= new TypeDescriptor();
!     public static final TypeDescriptor LONG= new TypeDescriptor();
!     public static final TypeDescriptor STRING= new TypeDescriptor();
!     
!     public static class OverlayKey {
!         
!         TypeDescriptor fDescriptor;
!         String fKey;
!         
!         public OverlayKey(TypeDescriptor descriptor, String key) {
!             fDescriptor= descriptor;
!             fKey= key;
!         }
!     }
!     
!     private class PropertyListener implements IPropertyChangeListener {
!                 
!         /*
!          * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
!          */
!         public void propertyChange(PropertyChangeEvent event) {
!             OverlayKey key= findOverlayKey(event.getProperty());
!             if (key != null)
!                 propagateProperty(fParent, key, fStore); 
!         }
!     }
!     
!     
!     private IPreferenceStore fParent;
!     private IPreferenceStore fStore;
!     private OverlayKey[] fOverlayKeys;
!     
!     private PropertyListener fPropertyListener;
!     private boolean fLoaded;
!     
!     
!     public OverlayPreferenceStore(IPreferenceStore parent, OverlayKey[] overlayKeys) {
!         fParent= parent;
!         fOverlayKeys= overlayKeys;
!         fStore= new PreferenceStore();
!     }
!     
!     private OverlayKey findOverlayKey(String key) {
!         for (int i= 0; i < fOverlayKeys.length; i++) {
!             if (fOverlayKeys[i].fKey.equals(key))
!                 return fOverlayKeys[i];
!         }
!         return null;
!     }
!     
!     private boolean covers(String key) {
!         return (findOverlayKey(key) != null);
!     }
!     
!     private void propagateProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target) {
!         
!         if (orgin.isDefault(key.fKey)) {
!             if (!target.isDefault(key.fKey))
!                 target.setToDefault(key.fKey);
!             return;
!         }
!         
!         TypeDescriptor d= key.fDescriptor;
!         if (BOOLEAN == d) {
!             
!             boolean originValue= orgin.getBoolean(key.fKey);
!             boolean targetValue= target.getBoolean(key.fKey);
!             if (targetValue != originValue)
!                 target.setValue(key.fKey, originValue);
!                 
!         } else if (DOUBLE == d) {
!             
!             double originValue= orgin.getDouble(key.fKey);
!             double targetValue= target.getDouble(key.fKey);
!             if (targetValue != originValue)
!                 target.setValue(key.fKey, originValue);
!         
!         } else if (FLOAT == d) {
!             
!             float originValue= orgin.getFloat(key.fKey);
!             float targetValue= target.getFloat(key.fKey);
!             if (targetValue != originValue)
!                 target.setValue(key.fKey, originValue);
!                 
!         } else if (INT == d) {
  
!             int originValue= orgin.getInt(key.fKey);
!             int targetValue= target.getInt(key.fKey);
!             if (targetValue != originValue)
!                 target.setValue(key.fKey, originValue);
  
!         } else if (LONG == d) {
  
!             long originValue= orgin.getLong(key.fKey);
!             long targetValue= target.getLong(key.fKey);
!             if (targetValue != originValue)
!                 target.setValue(key.fKey, originValue);
  
!         } else if (STRING == d) {
  
!             String originValue= orgin.getString(key.fKey);
!             String targetValue= target.getString(key.fKey);
!             if (targetValue != null && originValue != null && !targetValue.equals(originValue))
!                 target.setValue(key.fKey, originValue);
  
!         }
!     }
!     
!     public void propagate() {
!         for (int i= 0; i < fOverlayKeys.length; i++)
!             propagateProperty(fStore, fOverlayKeys[i], fParent);
!     }
!     
!     private void loadProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target, boolean forceInitialization) {
!         TypeDescriptor d= key.fDescriptor;
!         if (BOOLEAN == d) {
!             
!             if (forceInitialization)
!                 target.setValue(key.fKey, true);
!             target.setValue(key.fKey, orgin.getBoolean(key.fKey));
!             target.setDefault(key.fKey, orgin.getDefaultBoolean(key.fKey));
!             
!         } else if (DOUBLE == d) {
!             
!             if (forceInitialization)
!                 target.setValue(key.fKey, 1.0D);
!             target.setValue(key.fKey, orgin.getDouble(key.fKey));
!             target.setDefault(key.fKey, orgin.getDefaultDouble(key.fKey));
!             
!         } else if (FLOAT == d) {
!             
!             if (forceInitialization)
!                 target.setValue(key.fKey, 1.0F);
!             target.setValue(key.fKey, orgin.getFloat(key.fKey));
!             target.setDefault(key.fKey, orgin.getDefaultFloat(key.fKey));
!             
!         } else if (INT == d) {
!             
!             if (forceInitialization)
!                 target.setValue(key.fKey, 1);
!             target.setValue(key.fKey, orgin.getInt(key.fKey));
!             target.setDefault(key.fKey, orgin.getDefaultInt(key.fKey));
!             
!         } else if (LONG == d) {
!             
!             if (forceInitialization)
!                 target.setValue(key.fKey, 1L);
!             target.setValue(key.fKey, orgin.getLong(key.fKey));
!             target.setDefault(key.fKey, orgin.getDefaultLong(key.fKey));
!             
!         } else if (STRING == d) {
!             
!             if (forceInitialization)
!                 target.setValue(key.fKey, "1"); //$NON-NLS-1$
!             target.setValue(key.fKey, orgin.getString(key.fKey));
!             target.setDefault(key.fKey, orgin.getDefaultString(key.fKey));
!             
!         }
!     }
!     
!     public void load() {
!         for (int i= 0; i < fOverlayKeys.length; i++)
!             loadProperty(fParent, fOverlayKeys[i], fStore, true);
!         
!         fLoaded= true;
!         
!     }
!     
!     public void loadDefaults() {
!         for (int i= 0; i < fOverlayKeys.length; i++)
!             setToDefault(fOverlayKeys[i].fKey);
!     }
!     
!     public void start() {
!         if (fPropertyListener == null) {
!             fPropertyListener= new PropertyListener();
!             fParent.addPropertyChangeListener(fPropertyListener);
!         }
!     }
!     
!     public void stop() {
!         if (fPropertyListener != null)  {
!             fParent.removePropertyChangeListener(fPropertyListener);
!             fPropertyListener= null;
!         }
!     }
!     
!     /*
!      * @see IPreferenceStore#addPropertyChangeListener(IPropertyChangeListener)
!      */
!     public void addPropertyChangeListener(IPropertyChangeListener listener) {
!         fStore.addPropertyChangeListener(listener);
!     }
!     
!     /*
!      * @see IPreferenceStore#removePropertyChangeListener(IPropertyChangeListener)
!      */
!     public void removePropertyChangeListener(IPropertyChangeListener listener) {
!         fStore.removePropertyChangeListener(listener);
!     }
!     
!     /*
!      * @see IPreferenceStore#firePropertyChangeEvent(String, Object, Object)
!      */
!     public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
!         fStore.firePropertyChangeEvent(name, oldValue, newValue);
!     }
  
!     /*
!      * @see IPreferenceStore#contains(String)
!      */
!     public boolean contains(String name) {
!         return fStore.contains(name);
!     }
!     
!     /*
!      * @see IPreferenceStore#getBoolean(String)
!      */
!     public boolean getBoolean(String name) {
!         return fStore.getBoolean(name);
!     }
  
!     /*
!      * @see IPreferenceStore#getDefaultBoolean(String)
!      */
!     public boolean getDefaultBoolean(String name) {
!         return fStore.getDefaultBoolean(name);
!     }
  
!     /*
!      * @see IPreferenceStore#getDefaultDouble(String)
!      */
!     public double getDefaultDouble(String name) {
!         return fStore.getDefaultDouble(name);
!     }
  
!     /*
!      * @see IPreferenceStore#getDefaultFloat(String)
!      */
!     public float getDefaultFloat(String name) {
!         return fStore.getDefaultFloat(name);
!     }
  
!     /*
!      * @see IPreferenceStore#getDefaultInt(String)
!      */
!     public int getDefaultInt(String name) {
!         return fStore.getDefaultInt(name);
!     }
  
!     /*
!      * @see IPreferenceStore#getDefaultLong(String)
!      */
!     public long getDefaultLong(String name) {
!         return fStore.getDefaultLong(name);
!     }
  
!     /*
!      * @see IPreferenceStore#getDefaultString(String)
!      */
!     public String getDefaultString(String name) {
!         return fStore.getDefaultString(name);
!     }
  
!     /*
!      * @see IPreferenceStore#getDouble(String)
!      */
!     public double getDouble(String name) {
!         return fStore.getDouble(name);
!     }
  
!     /*
!      * @see IPreferenceStore#getFloat(String)
!      */
!     public float getFloat(String name) {
!         return fStore.getFloat(name);
!     }
  
!     /*
!      * @see IPreferenceStore#getInt(String)
!      */
!     public int getInt(String name) {
!         return fStore.getInt(name);
!     }
  
!     /*
!      * @see IPreferenceStore#getLong(String)
!      */
!     public long getLong(String name) {
!         return fStore.getLong(name);
!     }
  
!     /*
!      * @see IPreferenceStore#getString(String)
!      */
!     public String getString(String name) {
!         return fStore.getString(name);
!     }
  
!     /*
!      * @see IPreferenceStore#isDefault(String)
!      */
!     public boolean isDefault(String name) {
!         return fStore.isDefault(name);
!     }
  
!     /*
!      * @see IPreferenceStore#needsSaving()
!      */
!     public boolean needsSaving() {
!         return fStore.needsSaving();
!     }
  
!     /*
!      * @see IPreferenceStore#putValue(String, String)
!      */
!     public void putValue(String name, String value) {
!         if (covers(name))
!             fStore.putValue(name, value);
!     }
  
!     /*
!      * @see IPreferenceStore#setDefault(String, double)
!      */
!     public void setDefault(String name, double value) {
!         if (covers(name))
!             fStore.setDefault(name, value);
!     }
  
!     /*
!      * @see IPreferenceStore#setDefault(String, float)
!      */
!     public void setDefault(String name, float value) {
!         if (covers(name))
!             fStore.setDefault(name, value);
!     }
  
!     /*
!      * @see IPreferenceStore#setDefault(String, int)
!      */
!     public void setDefault(String name, int value) {
!         if (covers(name))
!             fStore.setDefault(name, value);
!     }
  
!     /*
!      * @see IPreferenceStore#setDefault(String, long)
!      */
!     public void setDefault(String name, long value) {
!         if (covers(name))
!             fStore.setDefault(name, value);
!     }
  
!     /*
!      * @see IPreferenceStore#setDefault(String, String)
!      */
!     public void setDefault(String name, String value) {
!         if (covers(name))
!             fStore.setDefault(name, value);
!     }
  
!     /*
!      * @see IPreferenceStore#setDefault(String, boolean)
!      */
!     public void setDefault(String name, boolean value) {
!         if (covers(name))
!             fStore.setDefault(name, value);
!     }
  
!     /*
!      * @see IPreferenceStore#setToDefault(String)
!      */
!     public void setToDefault(String name) {
!         fStore.setToDefault(name);
!     }
  
!     /*
!      * @see IPreferenceStore#setValue(String, double)
!      */
!     public void setValue(String name, double value) {
!         if (covers(name))
!             fStore.setValue(name, value);
!     }
  
!     /*
!      * @see IPreferenceStore#setValue(String, float)
!      */
!     public void setValue(String name, float value) {
!         if (covers(name))
!             fStore.setValue(name, value);
!     }
  
!     /*
!      * @see IPreferenceStore#setValue(String, int)
!      */
!     public void setValue(String name, int value) {
!         if (covers(name))
!             fStore.setValue(name, value);
!     }
  
!     /*
!      * @see IPreferenceStore#setValue(String, long)
!      */
!     public void setValue(String name, long value) {
!         if (covers(name))
!             fStore.setValue(name, value);
!     }
  
!     /*
!      * @see IPreferenceStore#setValue(String, String)
!      */
!     public void setValue(String name, String value) {
!         if (covers(name))
!             fStore.setValue(name, value);
!     }
  
!     /*
!      * @see IPreferenceStore#setValue(String, boolean)
!      */
!     public void setValue(String name, boolean value) {
!         if (covers(name))
!             fStore.setValue(name, value);
!     }
  
!     /**
!      * The keys to add to the list of overlay keys.
!      * <p>
!      * Note: This method must be called before {@link #load()} is called. 
!      * </p>
!      * 
!      * @param keys
!      * @since 3.0
!      */
!     public void addKeys(OverlayKey[] keys) {
!         Assert.isTrue(!fLoaded);
!         Assert.isNotNull(keys);
!         
!         int overlayKeysLength= fOverlayKeys.length;
!         OverlayKey[] result= new OverlayKey[keys.length + overlayKeysLength];
  
!         for (int i= 0, length= overlayKeysLength; i < length; i++)
!             result[i]= fOverlayKeys[i];
!         
!         for (int i= 0, length= keys.length; i < length; i++)
!             result[overlayKeysLength + i]= keys[i];
!         
!         fOverlayKeys= result;
!         
!         if (fLoaded)
!             load();
!     }
  }

Index: StatusInfo.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/StatusInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StatusInfo.java	20 Oct 2007 19:30:36 -0000	1.2
--- StatusInfo.java	28 Sep 2008 12:45:44 -0000	1.3
***************
*** 24,176 ****
   */
  public class StatusInfo implements IStatus {
! 	
! 	public static final IStatus OK_STATUS= new StatusInfo();
! 	
! 	private String fStatusMessage;
! 	private int fSeverity;
! 	
! 	/**
! 	 * Creates a status set to OK (no message)
! 	 */
! 	public StatusInfo() {
! 		this(OK, null);
! 	}
  
! 	/**
! 	 * Creates a status .
! 	 * @param severity The status severity: ERROR, WARNING, INFO and OK.
! 	 * @param message The message of the status. Applies only for ERROR,
! 	 * WARNING and INFO.
! 	 */	
! 	public StatusInfo(int severity, String message) {
! 		fStatusMessage= message;
! 		fSeverity= severity;
! 	}		
! 	
! 	/**
! 	 *  Returns if the status' severity is OK.
! 	 */
! 	public boolean isOK() {
! 		return fSeverity == IStatus.OK;
! 	}
  
! 	/**
! 	 *  Returns if the status' severity is WARNING.
! 	 */	
! 	public boolean isWarning() {
! 		return fSeverity == IStatus.WARNING;
! 	}
  
! 	/**
! 	 *  Returns if the status' severity is INFO.
! 	 */	
! 	public boolean isInfo() {
! 		return fSeverity == IStatus.INFO;
! 	}	
  
! 	/**
! 	 *  Returns if the status' severity is ERROR.
! 	 */	
! 	public boolean isError() {
! 		return fSeverity == IStatus.ERROR;
! 	}
! 	
! 	/**
! 	 * @see IStatus#getMessage
! 	 */
! 	public String getMessage() {
! 		return fStatusMessage;
! 	}
! 	
! 	/**
! 	 * Sets the status to ERROR.
! 	 * @param errorMessage The error message (can be empty, but not null)
! 	 */	
! 	public void setError(String errorMessage) {
! 		Assert.isNotNull(errorMessage);
! 		fStatusMessage= errorMessage;
! 		fSeverity= IStatus.ERROR;
! 	}
  
! 	/**
! 	 * Sets the status to WARNING.
! 	 * @param warningMessage The warning message (can be empty, but not null)
! 	 */		
! 	public void setWarning(String warningMessage) {
! 		Assert.isNotNull(warningMessage);
! 		fStatusMessage= warningMessage;
! 		fSeverity= IStatus.WARNING;
! 	}
  
! 	/**
! 	 * Sets the status to INFO.
! 	 * @param infoMessage The info message (can be empty, but not null)
! 	 */		
! 	public void setInfo(String infoMessage) {
! 		Assert.isNotNull(infoMessage);
! 		fStatusMessage= infoMessage;
! 		fSeverity= IStatus.INFO;
! 	}	
  
! 	/**
! 	 * Sets the status to OK.
! 	 */		
! 	public void setOK() {
! 		fStatusMessage= null;
! 		fSeverity= IStatus.OK;
! 	}
! 	
! 	/*
! 	 * @see IStatus#matches(int)
! 	 */
! 	public boolean matches(int severityMask) {
! 		return (fSeverity & severityMask) != 0;
! 	}
  
! 	/**
! 	 * Returns always <code>false</code>.
! 	 * @see IStatus#isMultiStatus()
! 	 */
! 	public boolean isMultiStatus() {
! 		return false;
! 	}
  
! 	/*
! 	 * @see IStatus#getSeverity()
! 	 */
! 	public int getSeverity() {
! 		return fSeverity;
! 	}
  
! 	/*
! 	 * @see IStatus#getPlugin()
! 	 */
! 	public String getPlugin() {
! 		return PydevPlugin.getDefault().getBundle().getSymbolicName();
! 	}
  
! 	/**
! 	 * Returns always <code>null</code>.
! 	 * @see IStatus#getException()
! 	 */
! 	public Throwable getException() {
! 		return null;
! 	}
  
! 	/**
! 	 * Returns always the error severity.
! 	 * @see IStatus#getCode()
! 	 */
! 	public int getCode() {
! 		return fSeverity;
! 	}
  
! 	/**
! 	 * Returns always <code>null</code>.
! 	 * @see IStatus#getChildren()
! 	 */
! 	public IStatus[] getChildren() {
! 		return new IStatus[0];
! 	}	
  
  }
--- 24,176 ----
   */
  public class StatusInfo implements IStatus {
!     
!     public static final IStatus OK_STATUS= new StatusInfo();
!     
!     private String fStatusMessage;
!     private int fSeverity;
!     
!     /**
!      * Creates a status set to OK (no message)
!      */
!     public StatusInfo() {
!         this(OK, null);
!     }
  
!     /**
!      * Creates a status .
!      * @param severity The status severity: ERROR, WARNING, INFO and OK.
!      * @param message The message of the status. Applies only for ERROR,
!      * WARNING and INFO.
!      */    
!     public StatusInfo(int severity, String message) {
!         fStatusMessage= message;
!         fSeverity= severity;
!     }        
!     
!     /**
!      *  Returns if the status' severity is OK.
!      */
!     public boolean isOK() {
!         return fSeverity == IStatus.OK;
!     }
  
!     /**
!      *  Returns if the status' severity is WARNING.
!      */    
!     public boolean isWarning() {
!         return fSeverity == IStatus.WARNING;
!     }
  
!     /**
!      *  Returns if the status' severity is INFO.
!      */    
!     public boolean isInfo() {
!         return fSeverity == IStatus.INFO;
!     }    
  
!     /**
!      *  Returns if the status' severity is ERROR.
!      */    
!     public boolean isError() {
!         return fSeverity == IStatus.ERROR;
!     }
!     
!     /**
!      * @see IStatus#getMessage
!      */
!     public String getMessage() {
!         return fStatusMessage;
!     }
!     
!     /**
!      * Sets the status to ERROR.
!      * @param errorMessage The error message (can be empty, but not null)
!      */    
!     public void setError(String errorMessage) {
!         Assert.isNotNull(errorMessage);
!         fStatusMessage= errorMessage;
!         fSeverity= IStatus.ERROR;
!     }
  
!     /**
!      * Sets the status to WARNING.
!      * @param warningMessage The warning message (can be empty, but not null)
!      */        
!     public void setWarning(String warningMessage) {
!         Assert.isNotNull(warningMessage);
!         fStatusMessage= warningMessage;
!         fSeverity= IStatus.WARNING;
!     }
  
!     /**
!      * Sets the status to INFO.
!      * @param infoMessage The info message (can be empty, but not null)
!      */        
!     public void setInfo(String infoMessage) {
!         Assert.isNotNull(infoMessage);
!         fStatusMessage= infoMessage;
!         fSeverity= IStatus.INFO;
!     }    
  
!     /**
!      * Sets the status to OK.
!      */        
!     public void setOK() {
!         fStatusMessage= null;
!         fSeverity= IStatus.OK;
!     }
!     
!     /*
!      * @see IStatus#matches(int)
!      */
!     public boolean matches(int severityMask) {
!         return (fSeverity & severityMask) != 0;
!     }
  
!     /**
!      * Returns always <code>false</code>.
!      * @see IStatus#isMultiStatus()
!      */
!     public boolean isMultiStatus() {
!         return false;
!     }
  
!     /*
!      * @see IStatus#getSeverity()
!      */
!     public int getSeverity() {
!         return fSeverity;
!     }
  
!     /*
!      * @see IStatus#getPlugin()
!      */
!     public String getPlugin() {
!         return PydevPlugin.getDefault().getBundle().getSymbolicName();
!     }
  
!     /**
!      * Returns always <code>null</code>.
!      * @see IStatus#getException()
!      */
!     public Throwable getException() {
!         return null;
!     }
  
!     /**
!      * Returns always the error severity.
!      * @see IStatus#getCode()
!      */
!     public int getCode() {
!         return fSeverity;
!     }
  
!     /**
!      * Returns always <code>null</code>.
!      * @see IStatus#getChildren()
!      */
!     public IStatus[] getChildren() {
!         return new IStatus[0];
!     }    
  
  }

Index: ColorEditor.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/ColorEditor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ColorEditor.java	21 Mar 2005 16:42:36 -0000	1.2
--- ColorEditor.java	28 Sep 2008 12:45:44 -0000	1.3
***************
*** 34,122 ****
   */
  public class ColorEditor {
! 	
! 	private Point fExtent;
! 	private Image fImage;
! 	private RGB fColorValue;
! 	private Color fColor;
! 	private Button fButton;
! 	
! 	public ColorEditor(Composite parent) {
! 		
! 		fButton= new Button(parent, SWT.PUSH);
! 		fExtent= computeImageSize(parent);
! 		fImage= new Image(parent.getDisplay(), fExtent.x, fExtent.y);
! 		
! 		GC gc= new GC(fImage);
! 		gc.setBackground(fButton.getBackground());
! 		gc.fillRectangle(0, 0, fExtent.x, fExtent.y);
! 		gc.dispose();
! 		
! 		fButton.setImage(fImage);
! 		fButton.addSelectionListener(new SelectionAdapter() {
! 			public void widgetSelected(SelectionEvent event) {
! 				ColorDialog colorDialog= new ColorDialog(fButton.getShell());
! 				colorDialog.setRGB(fColorValue);
! 				RGB newColor = colorDialog.open();
! 				if (newColor != null) {
! 					fColorValue= newColor;
! 					updateColorImage();
! 				}
! 			}
! 		});
! 		
! 		fButton.addDisposeListener(new DisposeListener() {
! 			public void widgetDisposed(DisposeEvent event) {
! 				if (fImage != null)  {
! 					fImage.dispose();
! 					fImage= null;
! 				}
! 				if (fColor != null) {
! 					fColor.dispose();
! 					fColor= null;
! 				}
! 			}
! 		});
! 	}
! 	
! 	public RGB getColorValue() {
! 		return fColorValue;
! 	}
! 	
! 	public void setColorValue(RGB rgb) {
! 		fColorValue= rgb;
! 		updateColorImage();
! 	}
! 	
! 	public Button getButton() {
! 		return fButton;
! 	}
! 	
! 	protected void updateColorImage() {
! 		
! 		Display display= fButton.getDisplay();
! 		
! 		GC gc= new GC(fImage);
! 		gc.setForeground(display.getSystemColor(SWT.COLOR_BLACK));
! 		gc.drawRectangle(0, 2, fExtent.x - 1, fExtent.y - 4);
! 		
! 		if (fColor != null)
! 			fColor.dispose();
! 			
! 		fColor= new Color(display, fColorValue);
! 		gc.setBackground(fColor);
! 		gc.fillRectangle(1, 3, fExtent.x - 2, fExtent.y - 5);
! 		gc.dispose();
! 		
! 		fButton.setImage(fImage);
! 	}
! 	
! 	protected Point computeImageSize(Control window) {
! 		GC gc= new GC(window);
! 		Font f= JFaceResources.getFontRegistry().get(JFaceResources.DEFAULT_FONT);
! 		gc.setFont(f);
! 		int height= gc.getFontMetrics().getHeight();
! 		gc.dispose();
! 		Point p= new Point(height * 3 - 6, height);
! 		return p;
! 	}
  }
--- 34,122 ----
   */
  public class ColorEditor {
!     
!     private Point fExtent;
!     private Image fImage;
!     private RGB fColorValue;
!     private Color fColor;
!     private Button fButton;
!     
!     public ColorEditor(Composite parent) {
!         
!         fButton= new Button(parent, SWT.PUSH);
!         fExtent= computeImageSize(parent);
!         fImage= new Image(parent.getDisplay(), fExtent.x, fExtent.y);
!         
!         GC gc= new GC(fImage);
!         gc.setBackground(fButton.getBackground());
!         gc.fillRectangle(0, 0, fExtent.x, fExtent.y);
!         gc.dispose();
!         
!         fButton.setImage(fImage);
!         fButton.addSelectionListener(new SelectionAdapter() {
!             public void widgetSelected(SelectionEvent event) {
!                 ColorDialog colorDialog= new ColorDialog(fButton.getShell());
!                 colorDialog.setRGB(fColorValue);
!                 RGB newColor = colorDialog.open();
!                 if (newColor != null) {
!                     fColorValue= newColor;
!                     updateColorImage();
!                 }
!             }
!         });
!         
!         fButton.addDisposeListener(new DisposeListener() {
!             public void widgetDisposed(DisposeEvent event) {
!                 if (fImage != null)  {
!                     fImage.dispose();
!                     fImage= null;
!                 }
!                 if (fColor != null) {
!                     fColor.dispose();
!                     fColor= null;
!                 }
!             }
!         });
!     }
!     
!     public RGB getColorValue() {
!         return fColorValue;
!     }
!     
!     public void setColorValue(RGB rgb) {
!         fColorValue= rgb;
!         updateColorImage();
!     }
!     
!     public Button getButton() {
!         return fButton;
!     }
!     
!     protected void updateColorImage() {
!         
!         Display display= fButton.getDisplay();
!         
!         GC gc= new GC(fImage);
!         gc.setForeground(display.getSystemColor(SWT.COLOR_BLACK));
!         gc.drawRectangle(0, 2, fExtent.x - 1, fExtent.y - 4);
!         
!         if (fColor != null)
!             fColor.dispose();
!             
!         fColor= new Color(display, fColorValue);
!         gc.setBackground(fColor);
!         gc.fillRectangle(1, 3, fExtent.x - 2, fExtent.y - 5);
!         gc.dispose();
!         
!         fButton.setImage(fImage);
!     }
!     
!     protected Point computeImageSize(Control window) {
!         GC gc= new GC(window);
!         Font f= JFaceResources.getFontRegistry().get(JFaceResources.DEFAULT_FONT);
!         gc.setFont(f);
!         int height= gc.getFontMetrics().getHeight();
!         gc.dispose();
!         Point p= new Point(height * 3 - 6, height);
!         return p;
!     }
  }

Index: PydevPlugin.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** PydevPlugin.java	6 Aug 2008 16:23:19 -0000	1.90
--- PydevPlugin.java	28 Sep 2008 12:45:44 -0000	1.91
***************
*** 60,64 ****
   */
  public class PydevPlugin extends AbstractUIPlugin implements Preferences.IPropertyChangeListener {
! 	
      public static final String version = "REPLACE_VERSION";
      
--- 60,64 ----
   */
  public class PydevPlugin extends AbstractUIPlugin implements Preferences.IPropertyChangeListener {
!     
      public static final String version = "REPLACE_VERSION";
      
***************
*** 75,79 ****
      }
      // ----------------- END BUNDLE INFO THINGS --------------------------
! 	
      private static IInterpreterManager pythonInterpreterManager;
      public static void setPythonInterpreterManager(IInterpreterManager interpreterManager) {
--- 75,79 ----
      }
      // ----------------- END BUNDLE INFO THINGS --------------------------
!     
      private static IInterpreterManager pythonInterpreterManager;
      public static void setPythonInterpreterManager(IInterpreterManager interpreterManager) {
***************
*** 84,88 ****
      }
      public static IInterpreterManager getPythonInterpreterManager(boolean haltOnStub) {
!     	return pythonInterpreterManager;
      }
  
--- 84,88 ----
      }
      public static IInterpreterManager getPythonInterpreterManager(boolean haltOnStub) {
!         return pythonInterpreterManager;
      }
  
***************
*** 95,99 ****
      }
      public static IInterpreterManager getJythonInterpreterManager() {
!     	return getJythonInterpreterManager(false);
      }
      public static IInterpreterManager getJythonInterpreterManager(boolean haltOnStub) {
--- 95,99 ----
      }
      public static IInterpreterManager getJythonInterpreterManager() {
!         return getJythonInterpreterManager(false);
      }
      public static IInterpreterManager getJythonInterpreterManager(boolean haltOnStub) {
***************
*** 169,188 ****
  //
  //            protected IStatus run(IProgressMonitor monitor) {
! //            	try{
! //	            	
! //	                IProject[] projects = getWorkspace().getRoot().getProjects();
! //	                for (int i = 0; i < projects.length; i++) {
! //	                    IProject project = projects[i];
! //	                    try {
! //	                        if (project.isOpen() && project.hasNature(PythonNature.PYTHON_NATURE_ID)) {
! //	                            PythonNature.addNature(project, monitor, null, null);
! //	                        }
! //	                    } catch (Exception e) {
! //	                        PydevPlugin.log(e);
! //	                    }
! //	                }
! //            	}catch(Throwable t){
! //            		t.printStackTrace();
! //            	}
  //                return Status.OK_STATUS;
  //            }
--- 169,188 ----
  //
  //            protected IStatus run(IProgressMonitor monitor) {
! //                try{
! //                    
! //                    IProject[] projects = getWorkspace().getRoot().getProjects();
! //                    for (int i = 0; i < projects.length; i++) {
! //                        IProject project = projects[i];
! //                        try {
! //                            if (project.isOpen() && project.hasNature(PythonNature.PYTHON_NATURE_ID)) {
! //                                PythonNature.addNature(project, monitor, null, null);
! //                            }
! //                        } catch (Exception e) {
! //                            PydevPlugin.log(e);
! //                        }
! //                    }
! //                }catch(Throwable t){
! //                    t.printStackTrace();
! //                }
  //                return Status.OK_STATUS;
  //            }
***************
*** 193,201 ****
      
      public static boolean isPythonInterpreterInitialized() {
!     	return true;
! 	}
      
      public static boolean isJythonInterpreterInitialized() {
!     	return true;
      }
      
--- 193,201 ----
      
      public static boolean isPythonInterpreterInitialized() {
!         return true;
!     }
      
      public static boolean isJythonInterpreterInitialized() {
!         return true;
      }
      
***************
*** 221,229 ****
                      IProject project = projects[i];
                      if (project.isOpen()){
! 	                    IProjectNature n = project.getNature(PythonNature.PYTHON_NATURE_ID);
! 	                    if(n instanceof PythonNature){
! 	                        PythonNature nature = (PythonNature) n;
! 	                        nature.saveAstManager();
! 	                    }
                      }
                  } catch (CoreException e) {
--- 221,229 ----
                      IProject project = projects[i];
                      if (project.isOpen()){
!                         IProjectNature n = project.getNature(PythonNature.PYTHON_NATURE_ID);
!                         if(n instanceof PythonNature){
!                             PythonNature nature = (PythonNature) n;
!                             nature.saveAstManager();
!                         }
                      }
                  } catch (CoreException e) {
***************
*** 233,237 ****
  
          } finally{
! 	        super.stop(context);
          }
      }
--- 233,237 ----
  
          } finally{
!             super.stop(context);
          }
      }
***************
*** 274,282 ****
      
      public void propertyChange(Preferences.PropertyChangeEvent event) {
!         //		System.out.println( event.getProperty()
!         //		 + "\n\told setting: "
!         //		 + event.getOldValue()
!         //		 + "\n\tnew setting: "
!         //		 + event.getNewValue());
      }
  
--- 274,282 ----
      
      public void propertyChange(Preferences.PropertyChangeEvent event) {
!         //        System.out.println( event.getProperty()
!         //         + "\n\told setting: "
!         //         + event.getOldValue()
!         //         + "\n\tnew setting: "
!         //         + event.getNewValue());
      }
  
***************
*** 294,298 ****
      public static void logInfo(Exception e) {
          log(IStatus.INFO, e.getMessage(), e, true);
! 	}
  
      /**
--- 294,298 ----
      public static void logInfo(Exception e) {
          log(IStatus.INFO, e.getMessage(), e, true);
!     }
  
      /**
***************
*** 301,319 ****
      public static void log(int errorLevel, String message, Throwable e, boolean printToConsole) {
          if(printToConsole){
!         	if(errorLevel == IStatus.ERROR){
!         		System.out.println("Error received...");
!         	}else{
!         		System.out.println("Log received...");
!         	}
              System.out.println(message);
              System.err.println(message);
              if(e != null){
!             	e.printStackTrace();
              }
          }
          
          try {
! 	        Status s = new Status(errorLevel, getPluginID(), errorLevel, message, e);
! 	        getDefault().getLog().log(s);
          } catch (Throwable e1) {
              //logging should never fail!
--- 301,319 ----
      public static void log(int errorLevel, String message, Throwable e, boolean printToConsole) {
          if(printToConsole){
!             if(errorLevel == IStatus.ERROR){
!                 System.out.println("Error received...");
!             }else{
!                 System.out.println("Log received...");
!             }
              System.out.println(message);
              System.err.println(message);
              if(e != null){
!                 e.printStackTrace();
              }
          }
          
          try {
!             Status s = new Status(errorLevel, getPluginID(), errorLevel, message, e);
!             getDefault().getLog().log(s);
          } catch (Throwable e1) {
              //logging should never fail!
***************
*** 351,358 ****
  
      /**
! 	 * Returns this plug-in's template store.
! 	 * 
! 	 * @return the template store of this plug-in instance
! 	 */
      public TemplateStore getTemplateStore() {
          if (fStore == null) {
--- 351,358 ----
  
      /**
!      * Returns this plug-in's template store.
!      * 
!      * @return the template store of this plug-in instance
!      */
      public TemplateStore getTemplateStore() {
          if (fStore == null) {
***************
*** 426,475 ****
  
  
! 	@SuppressWarnings("unchecked")
      public void addTestListener(ITestRunListener listener) {
! 		testListeners.add(listener);
! 	}
! 	
! 	public void removeTestListener(ITestRunListener listener) {
! 		testListeners.remove(listener);
! 	}
  
! 	public List getListeners() {
! 		return testListeners;
! 	}
! 	
! 	public void runTests(String moduleDir, String moduleName, IProject project) throws IOException, CoreException {
! 		new PyUnitTestRunner().runTests(moduleDir, moduleName, project);
! 	}
! 	
! 	public void fireTestsStarted(int count) {
! 		for (Iterator all=getListeners().iterator(); all.hasNext();) {
! 			ITestRunListener each = (ITestRunListener) all.next();
! 			each.testsStarted(count);
! 		}
! 	}
  
! 	public void fireTestsFinished() {
! 		for (Iterator all=getListeners().iterator(); all.hasNext();) {
! 			ITestRunListener each = (ITestRunListener) all.next();
! 			each.testsFinished();
! 		}
! 	}
  
! 	public void fireTestStarted(String klass, String methodName) {
! 		for (Iterator all=getListeners().iterator(); all.hasNext();) {
! 			ITestRunListener each = (ITestRunListener) all.next();
! 			each.testStarted(klass, methodName);
! 		}
! 	}
  
! 	public void fireTestFailed(String klass, String methodName, String trace) {
! 		for (Iterator all=getListeners().iterator(); all.hasNext();) {
! 			ITestRunListener each = (ITestRunListener) all.next();
! 			each.testFailed(klass, methodName, trace);
! 		}
! 	}
! 	
! 	
      /**
       * @param file the file we want to get info on.
--- 426,475 ----
  
  
!     @SuppressWarnings("unchecked")
      public void addTestListener(ITestRunListener listener) {
!         testListeners.add(listener);
!     }
!     
!     public void removeTestListener(ITestRunListener listener) {
!         testListeners.remove(listener);
!     }
  
!     public List getListeners() {
!         return testListeners;
!     }
!     
!     public void runTests(String moduleDir, String moduleName, IProject project) throws IOException, CoreException {
!         new PyUnitTestRunner().runTests(moduleDir, moduleName, project);
!     }
!     
!     public void fireTestsStarted(int count) {
!         for (Iterator all=getListeners().iterator(); all.hasNext();) {
!             ITestRunListener each = (ITestRunListener) all.next();
!             each.testsStarted(count);
!         }
!     }
  
!     public void fireTestsFinished() {
!         for (Iterator all=getListeners().iterator(); all.hasNext();) {
!             ITestRunListener each = (ITestRunListener) all.next();
!             each.testsFinished();
!         }
!     }
  
!     public void fireTestStarted(String klass, String methodName) {
!         for (Iterator all=getListeners().iterator(); all.hasNext();) {
!             ITestRunListener each = (ITestRunListener) all.next();
!             each.testStarted(klass, methodName);
!         }
!     }
  
!     public void fireTestFailed(String klass, String methodName, String trace) {
!         for (Iterator all=getListeners().iterator(); all.hasNext();) {
!             ITestRunListener each = (ITestRunListener) all.next();
!             each.testFailed(klass, methodName, trace);
!         }
!     }
!     
!     
      /**
       * @param file the file we want to get info on.

Index: PyunitPrefsPage.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/PyunitPrefsPage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PyunitPrefsPage.java	18 Sep 2006 23:43:25 -0000	1.4
--- PyunitPrefsPage.java	28 Sep 2008 12:45:44 -0000	1.5
***************
*** 22,26 ****
   */
  public class PyunitPrefsPage extends FieldEditorPreferencePage 
! 	implements IWorkbenchPreferencePage{
  
      public static final String PYUNIT_VERBOSITY = "PYUNIT_VERBOSITY";
--- 22,26 ----
   */
  public class PyunitPrefsPage extends FieldEditorPreferencePage 
!     implements IWorkbenchPreferencePage{
  
      public static final String PYUNIT_VERBOSITY = "PYUNIT_VERBOSITY";
***************
*** 28,85 ****
      public static final String PYUNIT_TEST_FILTER = "PYUNIT_TEST_FILTER";
      public static final String DEFAULT_PYUNIT_TEST_FILTER = "";
! 	/**
! 	 * Initializer sets the preference store
! 	 */
! 	public PyunitPrefsPage() {
! 		super(FLAT);
! 		setPreferenceStore(PydevPlugin.getDefault().getPreferenceStore());
! 	}
  
! 	public void init(IWorkbench workbench) {
! 	}
! 	
! 	/**
! 	 * Creates the editors
! 	 */
! 	protected void createFieldEditors() {
! 		Composite p = getFieldEditorParent();
  
!  		RadioGroupFieldEditor verbosity_editor= new RadioGroupFieldEditor(
!  				PYUNIT_VERBOSITY, 
!  				"Verbosity", 
!  				1,
! 	 			new String[][] {
! 	 				{"Verbose - prints name of test as it runs", "2"},
! 	 				{"Quiet - prints '.' as each test runs", "1"},
! 	 				{"Silent - prints nothing", "0"},
! 	 			},
! 	 			p
!  		);	
  
!  		StringFieldEditor filter_editor = new StringFieldEditor( 
!  				PYUNIT_TEST_FILTER, 
!  				"Filter (regex)", 
!  				p);
  
          String s = "filter examples:\n" +
! 		".* or blank - all tests\n" +
! 		"_abc.* - any test with method name starting with 'test_abc'. \n" +
! 		"         matches test_abc, test_abc123, test_abcXXXXXX, etc. \n" +
! 		"_abc,_123 - comma seperate (no spaces) filter for more values \n" + 
! 		"\n" +
! 		"Note: this filters on the method names of all <TestCase>s found\n" + 
! 		"      the string 'test' is automatically prepended to the regex\n";
!  		
! 		addField(verbosity_editor);
! 		addField(filter_editor);
          addField(new LabelFieldEditor("LabelFieldEditor", s, p));
! 	}
  
! 	
  
! 	/**
! 	 * Sets default preference values
! 	 */
! 	protected void initializeDefaultPreferences(Preferences prefs) {
! 	}
  }
--- 28,85 ----
      public static final String PYUNIT_TEST_FILTER = "PYUNIT_TEST_FILTER";
      public static final String DEFAULT_PYUNIT_TEST_FILTER = "";
!     /**
!      * Initializer sets the preference store
!      */
!     public PyunitPrefsPage() {
!         super(FLAT);
!         setPreferenceStore(PydevPlugin.getDefault().getPreferenceStore());
!     }
  
!     public void init(IWorkbench workbench) {
!     }
!     
!     /**
!      * Creates the editors
!      */
!     protected void createFieldEditors() {
!         Composite p = getFieldEditorParent();
  
!          RadioGroupFieldEditor verbosity_editor= new RadioGroupFieldEditor(
!                  PYUNIT_VERBOSITY, 
!                  "Verbosity", 
!                  1,
!                  new String[][] {
!                      {"Verbose - prints name of test as it runs", "2"},
!                      {"Quiet - prints '.' as each test runs", "1"},
!                      {"Silent - prints nothing", "0"},
!                  },
!                  p
!          );    
  
!          StringFieldEditor filter_editor = new StringFieldEditor( 
!                  PYUNIT_TEST_FILTER, 
!                  "Filter (regex)", 
!                  p);
  
          String s = "filter examples:\n" +
!         ".* or blank - all tests\n" +
!         "_abc.* - any test with method name starting with 'test_abc'. \n" +
!         "         matches test_abc, test_abc123, test_abcXXXXXX, etc. \n" +
!         "_abc,_123 - comma seperate (no spaces) filter for more values \n" + 
!         "\n" +
!         "Note: this filters on the method names of all <TestCase>s found\n" + 
!         "      the string 'test' is automatically prepended to the regex\n";
!          
!         addField(verbosity_editor);
!         addField(filter_editor);
          addField(new LabelFieldEditor("LabelFieldEditor", s, p));
!     }
  
!     
  
!     /**
!      * Sets default preference values
!      */
!     protected void initializeDefaultPreferences(Preferences prefs) {
!     }
  }

Index: AbstractPydevPrefs.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/AbstractPydevPrefs.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AbstractPydevPrefs.java	16 Dec 2007 01:06:27 -0000	1.4
--- AbstractPydevPrefs.java	28 Sep 2008 12:45:44 -0000	1.5
***************
*** 69,72 ****
--- 69,78 ----
      
      /**
+      * Edition of translation paths.
+      */
+     public static final String SOURCE_LOCATION_PATHS = "SOURCE_LOCATION_PATHS";
+ 
+     
+     /**
       * fields for automatically replacing a colon
       * @see  
***************
*** 302,307 ****
          overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AUTO_ADD_SELF));
          overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, GUESS_TAB_SUBSTITUTION));
-         overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_USE_CUSTOM_CARETS));
-         overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_WIDE_CARET));
          
          //colors
--- 308,311 ----

Index: PydevPrefsInitializer.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/PydevPrefsInitializer.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** PydevPrefsInitializer.java	19 Jul 2008 19:53:31 -0000	1.21
--- PydevPrefsInitializer.java	28 Sep 2008 12:45:44 -0000	1.22
***************
*** 5,8 ****
--- 5,13 ----
  
  import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+ import org.eclipse.core.runtime.preferences.DefaultScope;
+ import org.eclipse.jface.resource.StringConverter;
+ import org.osgi.service.prefs.Preferences;
+ import org.python.pydev.builder.PyDevBuilderPrefPage;
+ import org.python.pydev.builder.todo.PyTodoPrefPage;
  import org.python.pydev.editor.codefolding.PyDevCodeFoldingPrefPage;
  import org.python.pydev.editor.commentblocks.CommentBlocksPreferences;
***************
*** 11,20 ****
  import org.python.pydev.ui.filetypes.FileTypesPreferencesPage;
  import org.python.pydev.ui.importsconf.ImportsPreferencesPage;
- import org.eclipse.core.runtime.preferences.DefaultScope;
- import org.eclipse.jface.resource.StringConverter;
- import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
- import org.osgi.service.prefs.Preferences;
- import org.python.pydev.builder.PyDevBuilderPrefPage;
- import org.python.pydev.builder.todo.PyTodoPrefPage;
  
  public class PydevPrefsInitializer  extends AbstractPreferenceInitializer{
--- 16,19 ----
***************
*** 47,52 ****
          node.putBoolean(PydevPrefs.AUTO_ADD_SELF, PydevPrefs.DEFAULT_AUTO_ADD_SELF);
          node.putBoolean(PydevPrefs.GUESS_TAB_SUBSTITUTION, PydevPrefs.DEFAULT_GUESS_TAB_SUBSTITUTION);
-         node.pu...
 
[truncated message content]