krysalis-version/src/java/org/krysalis/version/eclipse/plugin/model VersionContentProvider.java,1.3,1.4 VersionGridContentProvider.java,1.1,1.2

Update of /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/eclipse/plugin/model
In directory sc8-pr-cvs1:/tmp/cvs-serv18085/src/java/org/krysalis/version/eclipse/plugin/model

Modified Files:
	VersionContentProvider.java VersionGridContentProvider.java 
Log Message:
1) Refactored some shared behaviours
2) Worked on constraints colelcting/evaluating/result sets...

Index: VersionContentProvider.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/eclipse/plugin/model/VersionContentProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VersionContentProvider.java	24 Feb 2003 22:48:33 -0000	1.3
--- VersionContentProvider.java	5 Mar 2003 19:57:02 -0000	1.4
***************
*** 12,22 ****
  import org.eclipse.jface.viewers.IStructuredContentProvider;
  import org.eclipse.jface.viewers.Viewer;
! import org.krysalis.version.collecting.Collector;
! import org.krysalis.version.collecting.EntryCollection;
  import org.krysalis.version.loading.VersionLoadContext;
  
  public class VersionContentProvider implements IStructuredContentProvider
  {
! 	Collector m_input = null;
  	
  	ArrayList m_classpathEntries = null;
--- 12,22 ----
  import org.eclipse.jface.viewers.IStructuredContentProvider;
  import org.eclipse.jface.viewers.Viewer;
! import org.krysalis.version.collecting.VersionCollector;
! import org.krysalis.version.collecting.VersionCollection;
  import org.krysalis.version.loading.VersionLoadContext;
  
  public class VersionContentProvider implements IStructuredContentProvider
  {
! 	VersionCollector m_input = null;
  	
  	ArrayList m_classpathEntries = null;
***************
*** 32,36 ****
  		try
  		{
! 			EntryCollection tree = m_input.collect();
  			if (tree == null)
  				return new Object[0];
--- 32,36 ----
  		try
  		{
! 			VersionCollection tree = m_input.collect();
  			if (tree == null)
  				return new Object[0];
***************
*** 86,92 ****
  			this.viewer = (ListViewer) viewer;
  		}*/
! 		if (newInput instanceof Collector)
  		{
! 			m_input = (Collector) newInput;
  		}
  	}
--- 86,92 ----
  			this.viewer = (ListViewer) viewer;
  		}*/
! 		if (newInput instanceof VersionCollector)
  		{
! 			m_input = (VersionCollector) newInput;
  		}
  	}

Index: VersionGridContentProvider.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/eclipse/plugin/model/VersionGridContentProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VersionGridContentProvider.java	24 Feb 2003 22:48:33 -0000	1.1
--- VersionGridContentProvider.java	5 Mar 2003 19:57:02 -0000	1.2
***************
*** 13,18 ****
  import org.eclipse.jface.viewers.Viewer;
  import org.krysalis.version.Version;
! import org.krysalis.version.collecting.Collector;
! import org.krysalis.version.collecting.EntryCollection;
  import org.krysalis.version.eclipse.plugin.views.VersionGridView;
  import org.krysalis.version.impl.CompoundVersion;
--- 13,18 ----
  import org.eclipse.jface.viewers.Viewer;
  import org.krysalis.version.Version;
! import org.krysalis.version.collecting.VersionCollector;
! import org.krysalis.version.collecting.VersionCollection;
  import org.krysalis.version.eclipse.plugin.views.VersionGridView;
  import org.krysalis.version.impl.CompoundVersion;
***************
*** 23,27 ****
  {
  
! 	Collector m_input = null;
  
  	ArrayList m_classpathEntries = null;
--- 23,27 ----
  {
  
! 	VersionCollector m_input = null;
  
  	ArrayList m_classpathEntries = null;
***************
*** 37,41 ****
  		try
  		{
! 			EntryCollection tree = m_input.collect();
  			if (tree == null || tree.isEmpty())
  			{
--- 37,41 ----
  		try
  		{
! 			VersionCollection tree = m_input.collect();
  			if (tree == null || tree.isEmpty())
  			{
***************
*** 149,155 ****
  	{
  		System.out.println("VersionContentProvider::inputChanged");
! 		if (newInput instanceof Collector)
  		{
! 			m_input = (Collector) newInput;
  		}
  	}
--- 149,155 ----
  	{
  		System.out.println("VersionContentProvider::inputChanged");
! 		if (newInput instanceof VersionCollector)
  		{
! 			m_input = (VersionCollector) newInput;
  		}
  	}




-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The debugger 
for complex code. Debugging C/C++ programs can leave you feeling lost and 
disoriented. TotalView can help you find your way. Available on major UNIX 
and Linux platforms. Try it free. www.etnus.com