krysalis-version/src/java/org/krysalis/version/eclipse/plugin/actions PackageCollectorAction.java,1.2,1.3 CollectAllAction.java,1.2,1.3 ShowVersionViewAction.java,1.1,1.2 ClassCollectorAction.java,1.2,1.3

[email protected]
Newsgroups gmane.comp.krysalis.sandbox
Message-ID <[email protected]>
Update of /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/eclipse/plugin/actions
In directory sc8-pr-cvs1:/tmp/cvs-serv18457/src/java/org/krysalis/version/eclipse/plugin/actions

Modified Files:
	PackageCollectorAction.java CollectAllAction.java 
	ShowVersionViewAction.java ClassCollectorAction.java 
Log Message:


Index: PackageCollectorAction.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/eclipse/plugin/actions/PackageCollectorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PackageCollectorAction.java	18 Feb 2003 18:24:39 -0000	1.2
--- PackageCollectorAction.java	24 Feb 2003 22:48:31 -0000	1.3
***************
*** 12,15 ****
--- 12,16 ----
  import org.krysalis.version.collecting.Collector;
  import org.krysalis.version.collecting.collectors.PackageCollector;
+ import org.krysalis.version.eclipse.plugin.views.VersionGridView;
  import org.krysalis.version.eclipse.plugin.views.VersionView;
  
***************
*** 20,29 ****
  public class PackageCollectorAction extends Action
  {
! 	private VersionView m_viewer;
  	
  	/**
  	 * Constructor for PackageCollectorAction.
  	 */
! 	public PackageCollectorAction( VersionView viewer)
  	{
  		super();
--- 21,30 ----
  public class PackageCollectorAction extends Action
  {
! 	private VersionGridView m_viewer;
  	
  	/**
  	 * Constructor for PackageCollectorAction.
  	 */
! 	public PackageCollectorAction( VersionGridView viewer)
  	{
  		super();
***************
*** 35,39 ****
  	 * @param arg0
  	 */
! 	public PackageCollectorAction(String arg0, VersionView viewer)
  	{
  		super(arg0);
--- 36,40 ----
  	 * @param arg0
  	 */
! 	public PackageCollectorAction(String arg0, VersionGridView viewer)
  	{
  		super(arg0);
***************
*** 47,51 ****
  	 */
  	public PackageCollectorAction(String arg0, ImageDescriptor arg1,  
! 									VersionView viewer)
  	{
  		super(arg0, arg1);
--- 48,52 ----
  	 */
  	public PackageCollectorAction(String arg0, ImageDescriptor arg1,  
! 	VersionGridView viewer)
  	{
  		super(arg0, arg1);
***************
*** 66,70 ****
  		{
  			Collector input = new PackageCollector();
! 			m_viewer.setResource("",input);
  			
  		}
--- 67,71 ----
  		{
  			Collector 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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CollectAllAction.java	18 Feb 2003 18:24:40 -0000	1.2
--- CollectAllAction.java	24 Feb 2003 22:48:32 -0000	1.3
***************
*** 12,16 ****
  import org.krysalis.version.collecting.Collector;
  import org.krysalis.version.collecting.collectors.JarManifestCollector;
! import org.krysalis.version.eclipse.plugin.views.VersionView;
  
  /**
--- 12,16 ----
  import org.krysalis.version.collecting.Collector;
  import org.krysalis.version.collecting.collectors.JarManifestCollector;
! import org.krysalis.version.eclipse.plugin.views.VersionGridView;
  
  /**
***************
*** 20,29 ****
  public class CollectAllAction extends Action
  {
! 	private VersionView m_viewer;
  
  	/**
  	 * Constructor for CollectAllAction.
  	 */
! 	public CollectAllAction(VersionView viewer)
  	{
  		super();
--- 20,29 ----
  public class CollectAllAction extends Action
  {
! 	private VersionGridView m_viewer;
  
  	/**
  	 * Constructor for CollectAllAction.
  	 */
! 	public CollectAllAction(VersionGridView viewer)
  	{
  		super();
***************
*** 35,39 ****
  	 * @param arg0
  	 */
! 	public CollectAllAction(String arg0, VersionView viewer)
  	{
  		super(arg0);
--- 35,39 ----
  	 * @param arg0
  	 */
! 	public CollectAllAction(String arg0, VersionGridView viewer)
  	{
  		super(arg0);
***************
*** 46,50 ****
  	 * @param arg1
  	 */
! 	public CollectAllAction(String arg0, ImageDescriptor arg1,  VersionView viewer)
  	{
  		super(arg0, arg1);
--- 46,50 ----
  	 * @param arg1
  	 */
! 	public CollectAllAction(String arg0, ImageDescriptor arg1,  VersionGridView viewer)
  	{
  		super(arg0, arg1);
***************
*** 65,69 ****
  		{
  			Collector input = new JarManifestCollector();
! 			m_viewer.setResource("",input);
  			
  		}
--- 65,69 ----
  		{
  			Collector input = new JarManifestCollector();
! 			m_viewer.setResource(null,input);
  			
  		}

Index: ShowVersionViewAction.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/eclipse/plugin/actions/ShowVersionViewAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ShowVersionViewAction.java	18 Feb 2003 18:24:40 -0000	1.1
--- ShowVersionViewAction.java	24 Feb 2003 22:48:32 -0000	1.2
***************
*** 22,29 ****
  import org.eclipse.ui.IWorkbench;
  import org.eclipse.ui.IWorkbenchPart;
- import org.eclipse.ui.WorkbenchException;
- import org.krysalis.version.collecting.collectors.PackageCollector;
  import org.krysalis.version.eclipse.plugin.VersionPlugin;
! import org.krysalis.version.eclipse.plugin.views.VersionView;
  
  /**
--- 22,27 ----
  import org.eclipse.ui.IWorkbench;
  import org.eclipse.ui.IWorkbenchPart;
  import org.krysalis.version.eclipse.plugin.VersionPlugin;
! import org.krysalis.version.eclipse.plugin.views.VersionGridView;
  
  /**
***************
*** 42,45 ****
--- 40,46 ----
  	private IStructuredSelection m_selection;
  
+ 	private ArrayList m_classpathEntries = null;
+ 	private VersionGridView m_view;
+ 
  	/**
  	 * Constructor for ShowVersionViewAction.
***************
*** 70,74 ****
  		}
  		IWorkbench workb = VersionPlugin.getDefault().getWorkbench();
! 		try
  		{
  			workb.showPerspective("org.krysalis.version.VersionPerspective", workb.getActiveWorkbenchWindow());
--- 71,75 ----
  		}
  		IWorkbench workb = VersionPlugin.getDefault().getWorkbench();
! 		/*try
  		{
  			workb.showPerspective("org.krysalis.version.VersionPerspective", workb.getActiveWorkbenchWindow());
***************
*** 78,91 ****
  			// @todo : exceptions!!!
  			e.printStackTrace();
! 		}
! 		VersionView versionView = VersionView.openInActivePerspective();
! 		if (versionView != null)
  		{
! 			String classpath = ""; // ::todo:: have to get it from each project
! 			versionView.setResource(classpath, new PackageCollector());
  		}
  
  	}
- 
  	/** Returns the selected resources.
  	  *
--- 79,100 ----
  			// @todo : exceptions!!!
  			e.printStackTrace();
! 		}*/
! 
! 		initView();
! 		
! 		/*if (m_view != null)
  		{
! 			m_view.setResource(m_classpathEntries, new VersionBrandCollector(new PathSet(m_classpathEntries)));
! 		}*/
! 	}
! 
! 	private void initView()
! 	{
! 		if (m_view == null)
! 		{
! 			m_view = VersionGridView.openInActivePerspective();
  		}
  
  	}
  	/** Returns the selected resources.
  	  *
***************
*** 147,166 ****
  	{
  		System.out.println("ShowVersionViewAction::selectionChanged");
  		if (selection instanceof IStructuredSelection)
  		{
! 			this.m_selection = (IStructuredSelection) selection;
! 			if (action != null)
  			{
! 				try
  				{
! 					action.setEnabled(isEnabled());
! 				}
! 				catch (Exception e)
  				{
! 					action.setEnabled(false);
! 					e.printStackTrace();
! 					// ::todo:: exception
  				}
  			}
  		}
  	}
--- 156,212 ----
  	{
  		System.out.println("ShowVersionViewAction::selectionChanged");
+ 		m_selection = (IStructuredSelection) selection;
+ 
  		if (selection instanceof IStructuredSelection)
  		{
! 			/*try
  			{
! 
! 				IJavaElement jElement = JavaCore.create((IResource)(m_selection.getFirstElement()));
! 				IJavaProject jProject = jElement.getJavaProject();
! 
! 				IClasspathEntry cpEntries[];
! 
! 				String pathString;
! 
! 				cpEntries = jProject.getResolvedClasspath(true);
! 				m_classpathEntries = new ArrayList();
! 
! 				for (int i = 0; i < cpEntries.length; i++)
  				{
! 					int cpEntryKind = cpEntries[i].getEntryKind();
! 					
! 					if( cpEntryKind == IClasspathEntry.CPE_PROJECT 
! 						|| cpEntryKind == IClasspathEntry.CPE_LIBRARY )
! 					{
! 						IPath path = cpEntries[i].getPath();
! 						pathString = path.toOSString();
! 						m_classpathEntries.add(pathString);
! 						System.out.println("Classpath string [" + pathString + "]");
! 					}
! 				}*/
! 
! 				if (action != null)
  				{
! 					try
! 					{
! 						action.setEnabled(isEnabled());
! 					}
! 					catch (Exception e)
! 					{
! 						action.setEnabled(false);
! 						e.printStackTrace();
! 						// ::todo:: exception
! 					}
  				}
+ 			/*}
+ 			catch (JavaModelException jexp)
+ 			{
+ 				System.out.println("Java Model Exception - getting resolved classpath" + jexp.getMessage());
  			}
+ 			catch (Exception exp)
+ 			{
+ 				System.out.println("Exception in the selection changed " + exp.getMessage());
+ 			}*/
  		}
  	}
***************
*** 178,182 ****
  		for (int i = 0; i < resources.length; i++)
  		{
! 			if (resources[i] == null || resources[i].getType() != IResource.FOLDER)
  			{
  				return false;
--- 224,228 ----
  		for (int i = 0; i < resources.length; i++)
  		{
! 			if (resources[i] == null )
  			{
  				return false;

Index: ClassCollectorAction.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/eclipse/plugin/actions/ClassCollectorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ClassCollectorAction.java	18 Feb 2003 18:24:40 -0000	1.2
--- ClassCollectorAction.java	24 Feb 2003 22:48:33 -0000	1.3
***************
*** 8,16 ****
  package org.krysalis.version.eclipse.plugin.actions;
  
  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.VersionView;
  
  /**
--- 8,19 ----
  package org.krysalis.version.eclipse.plugin.actions;
  
+ import java.util.ArrayList;
+ 
  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;
! import org.krysalis.version.util.classpath.PathSet;
  
  /**
***************
*** 20,28 ****
  public class ClassCollectorAction extends Action
  {
! 	private VersionView m_viewer;
  	/**
  	 * Constructor for ClassCollectorAction.
  	 */
! 	public ClassCollectorAction(VersionView viewer)
  	{
  		super();
--- 23,31 ----
  public class ClassCollectorAction extends Action
  {
! 	private VersionGridView m_viewer;
  	/**
  	 * Constructor for ClassCollectorAction.
  	 */
! 	public ClassCollectorAction(VersionGridView viewer)
  	{
  		super();
***************
*** 34,38 ****
  	 * @param arg0
  	 */
! 	public ClassCollectorAction(String arg0, VersionView viewer)
  	{
  		super(arg0);
--- 37,41 ----
  	 * @param arg0
  	 */
! 	public ClassCollectorAction(String arg0, VersionGridView viewer)
  	{
  		super(arg0);
***************
*** 46,50 ****
  	 */
  	public ClassCollectorAction(String arg0, ImageDescriptor arg1,  
! 									VersionView viewer)
  	{
  		super(arg0, arg1);
--- 49,53 ----
  	 */
  	public ClassCollectorAction(String arg0, ImageDescriptor arg1,  
! 									VersionGridView viewer)
  	{
  		super(arg0, arg1);
***************
*** 63,68 ****
  		if(!(oldInput instanceof VersionBrandCollector ) )
  		{
! 			Collector input = new VersionBrandCollector();
! 			m_viewer.setResource("",input);
  			
  		}
--- 66,81 ----
  		if(!(oldInput instanceof VersionBrandCollector ) )
  		{
! 			Collector input = null;
! 			ArrayList list = m_viewer.getClasspathEntries();
! 			if(list != null)
! 			{
! 				System.out.println("Size of List retruned from viewer [" 
! 														+ list.size() + "]");
! 														
! 				input = new VersionBrandCollector(new PathSet(list));
! 			}
! 			
! 			input = new VersionBrandCollector();
! 			m_viewer.setResource(list,input);
  			
  		}




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.