krysalis-version/src/java/org/krysalis/version/eclipse/plugin/actions PackageCollectorAction.java,1.4,1.5 CollectAllAction.java,1.3,1.4 ClassCollectorAction.java,1.3,1.4

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

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

Index: PackageCollectorAction.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/eclipse/plugin/actions/PackageCollectorAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PackageCollectorAction.java	28 Feb 2003 16:26:55 -0000	1.4
--- PackageCollectorAction.java	5 Mar 2003 19:57:36 -0000	1.5
***************
*** 10,14 ****
  import org.eclipse.jface.action.Action;
  import org.eclipse.jface.resource.ImageDescriptor;
! import org.krysalis.version.collecting.Collector;
  import org.krysalis.version.collecting.collectors.PackageCollector;
  import org.krysalis.version.eclipse.plugin.views.VersionGridView;
--- 10,14 ----
  import org.eclipse.jface.action.Action;
  import org.eclipse.jface.resource.ImageDescriptor;
! import org.krysalis.version.collecting.VersionCollector;
  import org.krysalis.version.collecting.collectors.PackageCollector;
  import org.krysalis.version.eclipse.plugin.views.VersionGridView;
***************
*** 61,69 ****
  	{
  		System.out.println("PackageCollectorAction::collect");
! 		Collector oldInput = (Collector) m_viewer.getInput();
  		
  		if(!(oldInput instanceof PackageCollector ) )
  		{
! 			Collector input = new PackageCollector();
  			m_viewer.setResource(null,input);
  			
--- 61,69 ----
  	{
  		System.out.println("PackageCollectorAction::collect");
! 		VersionCollector oldInput = (VersionCollector) m_viewer.getInput();
  		
  		if(!(oldInput instanceof PackageCollector ) )
  		{
! 			VersionCollector input = new PackageCollector();
  			m_viewer.setResource(null,input);
  			

Index: CollectAllAction.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/eclipse/plugin/actions/CollectAllAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CollectAllAction.java	24 Feb 2003 22:48:32 -0000	1.3
--- CollectAllAction.java	5 Mar 2003 19:57:36 -0000	1.4
***************
*** 10,14 ****
  import org.eclipse.jface.action.Action;
  import org.eclipse.jface.resource.ImageDescriptor;
! import org.krysalis.version.collecting.Collector;
  import org.krysalis.version.collecting.collectors.JarManifestCollector;
  import org.krysalis.version.eclipse.plugin.views.VersionGridView;
--- 10,14 ----
  import org.eclipse.jface.action.Action;
  import org.eclipse.jface.resource.ImageDescriptor;
! import org.krysalis.version.collecting.VersionCollector;
  import org.krysalis.version.collecting.collectors.JarManifestCollector;
  import org.krysalis.version.eclipse.plugin.views.VersionGridView;
***************
*** 60,68 ****
  	{
  		System.out.println("CollectAllAction::collect");
! 		Collector oldInput = (Collector) m_viewer.getInput();
  		
  		if(!(oldInput instanceof JarManifestCollector ) )
  		{
! 			Collector input = new JarManifestCollector();
  			m_viewer.setResource(null,input);
  			
--- 60,68 ----
  	{
  		System.out.println("CollectAllAction::collect");
! 		VersionCollector oldInput = (VersionCollector) m_viewer.getInput();
  		
  		if(!(oldInput instanceof JarManifestCollector ) )
  		{
! 			VersionCollector input = new JarManifestCollector();
  			m_viewer.setResource(null,input);
  			

Index: ClassCollectorAction.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/eclipse/plugin/actions/ClassCollectorAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ClassCollectorAction.java	24 Feb 2003 22:48:33 -0000	1.3
--- ClassCollectorAction.java	5 Mar 2003 19:57:37 -0000	1.4
***************
*** 12,16 ****
  import org.eclipse.jface.action.Action;
  import org.eclipse.jface.resource.ImageDescriptor;
! import org.krysalis.version.collecting.Collector;
  import org.krysalis.version.collecting.collectors.VersionBrandCollector;
  import org.krysalis.version.eclipse.plugin.views.VersionGridView;
--- 12,16 ----
  import org.eclipse.jface.action.Action;
  import org.eclipse.jface.resource.ImageDescriptor;
! import org.krysalis.version.collecting.VersionCollector;
  import org.krysalis.version.collecting.collectors.VersionBrandCollector;
  import org.krysalis.version.eclipse.plugin.views.VersionGridView;
***************
*** 62,70 ****
  	{
  		System.out.println("ClassCollectorAction::collect");
! 		Collector oldInput = (Collector) m_viewer.getInput();
  		
  		if(!(oldInput instanceof VersionBrandCollector ) )
  		{
! 			Collector input = null;
  			ArrayList list = m_viewer.getClasspathEntries();
  			if(list != null)
--- 62,70 ----
  	{
  		System.out.println("ClassCollectorAction::collect");
! 		VersionCollector oldInput = (VersionCollector) m_viewer.getInput();
  		
  		if(!(oldInput instanceof VersionBrandCollector ) )
  		{
! 			VersionCollector input = null;
  			ArrayList list = m_viewer.getClasspathEntries();
  			if(list != null)




-------------------------------------------------------
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