[Pydev-cvs] org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/model/generateproperties TreeAttributeNode.java, 1.3, 1.4 TreeClassNode.java, 1.3, 1.4 PropertyTreeProvider.java, 1.3, 1.4

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

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

Modified Files:
	TreeAttributeNode.java TreeClassNode.java 
	PropertyTreeProvider.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: TreeClassNode.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/model/generateproperties/TreeClassNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TreeClassNode.java	20 Oct 2007 19:31:00 -0000	1.3
--- TreeClassNode.java	27 Sep 2008 20:00:50 -0000	1.4
***************
*** 18,47 ****
  public class TreeClassNode extends TreeNodeSimple<IClassDefAdapter> {
  
! 	public TreeClassNode(IClassDefAdapter adapter) {
! 		super(null, adapter);
! 	}
  
! 	@Override
! 	public Object[] getChildren() {
! 		List<ITreeNode> children = new ArrayList<ITreeNode>();
! 		for (SimpleAdapter attribute : this.adapter.getAttributes()) {
! 			children.add(new TreeAttributeNode(this, attribute));
! 		}
! 		return children.toArray();
! 	}
  
! 	@Override
! 	public String getImageName() {
! 		return ITreeNode.NODE_CLASS;
! 	}
  
! 	@Override
! 	public String getLabel() {
! 		if (adapter.isNewStyleClass()) {
! 			return super.getLabel();
! 		} else {
! 			return super.getLabel() + "(*)";
! 		}
! 	}
  
  }
--- 18,47 ----
  public class TreeClassNode extends TreeNodeSimple<IClassDefAdapter> {
  
!     public TreeClassNode(IClassDefAdapter adapter) {
!         super(null, adapter);
!     }
  
!     @Override
!     public Object[] getChildren() {
!         List<ITreeNode> children = new ArrayList<ITreeNode>();
!         for (SimpleAdapter attribute : this.adapter.getAttributes()) {
!             children.add(new TreeAttributeNode(this, attribute));
!         }
!         return children.toArray();
!     }
  
!     @Override
!     public String getImageName() {
!         return ITreeNode.NODE_CLASS;
!     }
  
!     @Override
!     public String getLabel() {
!         if (adapter.isNewStyleClass()) {
!             return super.getLabel();
!         } else {
!             return super.getLabel() + "(*)";
!         }
!     }
  
  }

Index: TreeAttributeNode.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/model/generateproperties/TreeAttributeNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TreeAttributeNode.java	20 Oct 2007 19:31:00 -0000	1.3
--- TreeAttributeNode.java	27 Sep 2008 20:00:50 -0000	1.4
***************
*** 20,45 ****
  public class TreeAttributeNode extends TreeNodeSimple<INodeAdapter> {
  
! 	public TreeAttributeNode(ITreeNode parent, INodeAdapter adapter) {
! 		super(parent, adapter);
! 	}
  
! 	@Override
! 	public Object[] getChildren() {
! 		List<ITreeNode> children = new ArrayList<ITreeNode>();
! 		children.add(new TreeNodeSimple<PropertyTextAdapter>(this, new PropertyTextAdapter(PropertyTextAdapter.GETTER,
! 				Messages.generatePropertiesGetter)));
! 		children.add(new TreeNodeSimple<PropertyTextAdapter>(this, new PropertyTextAdapter(PropertyTextAdapter.SETTER,
! 				Messages.generatePropertiesSetter)));
! 		children.add(new TreeNodeSimple<PropertyTextAdapter>(this, new PropertyTextAdapter(PropertyTextAdapter.DELETE,
! 				Messages.generatePropertiesDelete)));
! 		children.add(new TreeNodeSimple<PropertyTextAdapter>(this, new PropertyTextAdapter(PropertyTextAdapter.DOCSTRING,
! 				Messages.generatePropertiesDocString)));
! 		return children.toArray();
! 	}
  
! 	@Override
! 	public String getImageName() {
! 		return ITreeNode.NODE_ATTRIBUTE;
! 	}
  
  }
--- 20,45 ----
  public class TreeAttributeNode extends TreeNodeSimple<INodeAdapter> {
  
!     public TreeAttributeNode(ITreeNode parent, INodeAdapter adapter) {
!         super(parent, adapter);
!     }
  
!     @Override
!     public Object[] getChildren() {
!         List<ITreeNode> children = new ArrayList<ITreeNode>();
!         children.add(new TreeNodeSimple<PropertyTextAdapter>(this, new PropertyTextAdapter(PropertyTextAdapter.GETTER,
!                 Messages.generatePropertiesGetter)));
!         children.add(new TreeNodeSimple<PropertyTextAdapter>(this, new PropertyTextAdapter(PropertyTextAdapter.SETTER,
!                 Messages.generatePropertiesSetter)));
!         children.add(new TreeNodeSimple<PropertyTextAdapter>(this, new PropertyTextAdapter(PropertyTextAdapter.DELETE,
!                 Messages.generatePropertiesDelete)));
!         children.add(new TreeNodeSimple<PropertyTextAdapter>(this, new PropertyTextAdapter(PropertyTextAdapter.DOCSTRING,
!                 Messages.generatePropertiesDocString)));
!         return children.toArray();
!     }
  
!     @Override
!     public String getImageName() {
!         return ITreeNode.NODE_ATTRIBUTE;
!     }
  
  }

Index: PropertyTreeProvider.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/model/generateproperties/PropertyTreeProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PropertyTreeProvider.java	20 Oct 2007 19:31:00 -0000	1.3
--- PropertyTreeProvider.java	27 Sep 2008 20:00:50 -0000	1.4
***************
*** 19,62 ****
  public class PropertyTreeProvider implements ITreeContentProvider {
  
! 	private List<IClassDefAdapter> adapters;
  
! 	public PropertyTreeProvider(List<IClassDefAdapter> adapters) {
! 		this.adapters = adapters;
! 	}
  
! 	public Object[] getChildren(Object parentElement) {
! 		if (parentElement instanceof ITreeNode) {
! 			return ((ITreeNode) parentElement).getChildren();
! 		}
! 		return null;
! 	}
  
! 	public Object getParent(Object element) {
! 		return null;
! 	}
  
! 	public boolean hasChildren(Object element) {
! 		if (element instanceof ITreeNode) {
! 			ITreeNode node = (ITreeNode) element;
! 			return node.hasChildren();
! 		}
! 		return false;
! 	}
  
! 	public Object[] getElements(Object inputElement) {
! 		Collection<TreeClassNode> elements = new ArrayList<TreeClassNode>();
! 		for (IClassDefAdapter elem : adapters) {
! 			if (elem.hasAttributes()) {
! 				elements.add(new TreeClassNode(elem));
! 			}
! 		}
! 		return elements.toArray();
! 	}
  
! 	public void dispose() {
! 	}
  
! 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
! 	}
  
  }
--- 19,62 ----
  public class PropertyTreeProvider implements ITreeContentProvider {
  
!     private List<IClassDefAdapter> adapters;
  
!     public PropertyTreeProvider(List<IClassDefAdapter> adapters) {
!         this.adapters = adapters;
!     }
  
!     public Object[] getChildren(Object parentElement) {
!         if (parentElement instanceof ITreeNode) {
!             return ((ITreeNode) parentElement).getChildren();
!         }
!         return null;
!     }
  
!     public Object getParent(Object element) {
!         return null;
!     }
  
!     public boolean hasChildren(Object element) {
!         if (element instanceof ITreeNode) {
!             ITreeNode node = (ITreeNode) element;
!             return node.hasChildren();
!         }
!         return false;
!     }
  
!     public Object[] getElements(Object inputElement) {
!         Collection<TreeClassNode> elements = new ArrayList<TreeClassNode>();
!         for (IClassDefAdapter elem : adapters) {
!             if (elem.hasAttributes()) {
!                 elements.add(new TreeClassNode(elem));
!             }
!         }
!         return elements.toArray();
!     }
  
!     public void dispose() {
!     }
  
!     public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
!     }
  
  }