[eclipse-ccase-cvs] net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/views ClearcaseViewPart.java,1.7,1.7.2.1

[Gunnar W. <gwa...@us...>]

Update of /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/views
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18847/src/net/sourceforge/eclipseccase/views

Modified Files:
      Tag: api_rework
	ClearcaseViewPart.java 
Log Message:
merged latest improvements from HEAD

Index: ClearcaseViewPart.java
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/views/ClearcaseViewPart.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** ClearcaseViewPart.java	8 Jun 2004 06:30:29 -0000	1.7
--- ClearcaseViewPart.java	12 Nov 2004 12:51:32 -0000	1.7.2.1
***************
*** 80,84 ****
          viewer.setContentProvider(getContentProvider());
          StateCacheFactory.getInstance().addStateChangeListerer(this);
!         ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
      }
  
--- 80,85 ----
          viewer.setContentProvider(getContentProvider());
          StateCacheFactory.getInstance().addStateChangeListerer(this);
!         ResourcesPlugin.getWorkspace().addResourceChangeListener(this,
!                 IResourceChangeEvent.POST_CHANGE);
      }
  
***************
*** 109,116 ****
               */
              public int compare(Viewer viewer, Object o1, Object o2) {
!                 //have to deal with non-resources in navigator
!                 //if one or both objects are not resources, returned a
                  // comparison
!                 //based on class.
                  if (!(o1 instanceof IResource && o2 instanceof IResource)) { return compareClass(
                          o1, o2); }
--- 110,117 ----
               */
              public int compare(Viewer viewer, Object o1, Object o2) {
!                 // have to deal with non-resources in navigator
!                 // if one or both objects are not resources, returned a
                  // comparison
!                 // based on class.
                  if (!(o1 instanceof IResource && o2 instanceof IResource)) { return compareClass(
                          o1, o2); }
***************
*** 188,192 ****
  
                  if (monitor.isCanceled())
!                         throw new OperationCanceledException();
              }
          } finally {
--- 189,193 ----
  
                  if (monitor.isCanceled())
!                     throw new OperationCanceledException();
              }
          } finally {
***************
*** 216,221 ****
              // determine state
              if (shouldAdd(resource))
!                     collector.add(resource, new SubProgressMonitor(monitor,
!                             1000, SubProgressMonitor.SUPPRESS_SUBTASK_LABEL));
  
              // process state
--- 217,222 ----
              // determine state
              if (shouldAdd(resource))
!                 collector.add(resource, new SubProgressMonitor(monitor, 1000,
!                         SubProgressMonitor.SUPPRESS_SUBTASK_LABEL));
  
              // process state
***************
*** 353,380 ****
       * @see net.sourceforge.eclipseccase.IResourceStateListener#stateChanged(net.sourceforge.eclipseccase.StateCache)
       */
!     public void resourceStateChanged(final IResource resource) {
!         // filter out ignored resources
!         ClearcaseProvider provider = ClearcaseProvider
!                 .getClearcaseProvider(resource);
!         if (null == provider || provider.isIgnored(resource)) return;
  
!         // do not add non existent resources
!         final boolean shouldAdd = resource.exists() && shouldAdd(resource);
!         
!         if (null != getViewer() && null != getViewer().getControl()
!                 && !getViewer().getControl().isDisposed()) {
!             getViewer().getControl().getDisplay().syncExec(new Runnable() {
  
!                 public void run() {
!                     if (null != getViewer() && null != getViewer().getControl()
!                             && !getViewer().getControl().isDisposed()) {
!                         // we remove in every case
!                         getViewer().remove(resource);
  
!                         // only add if desired
!                         if (shouldAdd) getViewer().add(getRoot(), resource);
                      }
!                 }
!             });
          }
      }
--- 354,387 ----
       * @see net.sourceforge.eclipseccase.IResourceStateListener#stateChanged(net.sourceforge.eclipseccase.StateCache)
       */
!     public void resourceStateChanged(final IResource[] resources) {
!         for (int i = 0; i < resources.length; i++) {
!             final IResource resource = resources[i];
!             
!             // filter out ignored resources
!             ClearcaseProvider provider = ClearcaseProvider
!                     .getClearcaseProvider(resource);
!             if (null == provider || provider.isIgnored(resource)) return;
  
!             // do not add non existent resources
!             final boolean shouldAdd = resource.exists() && shouldAdd(resource);
  
!             if (null != getViewer() && null != getViewer().getControl()
!                     && !getViewer().getControl().isDisposed()) {
!                 getViewer().getControl().getDisplay().syncExec(new Runnable() {
  
!                     public void run() {
!                         if (null != getViewer()
!                                 && null != getViewer().getControl()
!                                 && !getViewer().getControl().isDisposed()) {
!                             // we remove in every case
!                             getViewer().remove(resource);
! 
!                             // only add if desired
!                             if (shouldAdd)
!                                 getViewer().add(getRoot(), resource);
!                         }
                      }
!                 });
!             }
          }
      }
***************
*** 403,409 ****
          IResourceDelta rootDelta = event.getDelta();
          if (null != rootDelta) {
!             
              final Set toRemove = new HashSet();
!             
              try {
                  rootDelta.accept(new IResourceDeltaVisitor() {
--- 410,416 ----
          IResourceDelta rootDelta = event.getDelta();
          if (null != rootDelta) {
! 
              final Set toRemove = new HashSet();
! 
              try {
                  rootDelta.accept(new IResourceDeltaVisitor() {
***************
*** 411,421 ****
                      public boolean visit(IResourceDelta delta)
                              throws CoreException {
!                         
                          switch (delta.getKind()) {
!                         
                          case IResourceDelta.ADDED:
                              // do nothing
                              return false;
!                         
                          case IResourceDelta.REMOVED:
                              toRemove.add(delta.getResource());
--- 418,428 ----
                      public boolean visit(IResourceDelta delta)
                              throws CoreException {
! 
                          switch (delta.getKind()) {
! 
                          case IResourceDelta.ADDED:
                              // do nothing
                              return false;
! 
                          case IResourceDelta.REMOVED:
                              toRemove.add(delta.getResource());
***************
*** 427,433 ****
                                  // filter out non clear case projects
                                  if (resource.getType() == IResource.PROJECT)
!                                         return null != ClearcaseProvider
!                                                 .getClearcaseProvider(delta
!                                                         .getResource());
                                  return true;
                              }
--- 434,440 ----
                                  // filter out non clear case projects
                                  if (resource.getType() == IResource.PROJECT)
!                                     return null != ClearcaseProvider
!                                             .getClearcaseProvider(delta
!                                                     .getResource());
                                  return true;
                              }
***************
*** 446,450 ****
  
                      public void run() {
!                         if (null != getViewer() && null != getViewer().getControl()
                                  && !getViewer().getControl().isDisposed()) {
                              // remove resources
--- 453,458 ----
  
                      public void run() {
!                         if (null != getViewer()
!                                 && null != getViewer().getControl()
                                  && !getViewer().getControl().isDisposed()) {
                              // remove resources
***************
*** 466,471 ****
          super.init(site, memento);
          IWorkbenchSiteProgressService progressService = getProgressService();
!         if(null != progressService) {
!             progressService.showBusyForFamily(ClearcasePlugin.FAMILY_CLEARCASE_OPERATION);
          }
      }
--- 474,480 ----
          super.init(site, memento);
          IWorkbenchSiteProgressService progressService = getProgressService();
!         if (null != progressService) {
!             progressService
!                     .showBusyForFamily(ClearcasePlugin.FAMILY_CLEARCASE_OPERATION);
          }
      }