Attachment #129878 for bug #190805

View | Details | Raw Unified | Return to bug 190805
Collapse All | Expand All

Lines 1-5 Link Here

(-)src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileAdapter.java (-1 / +5 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006, 2008 IBM Corporation and others.	2	* Copyright (c) 2006, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 16-21 Link Here
16	* Martin Oberhuber (Wind River) - [235363][api][breaking] IHostFileToRemoteFileAdapter methods should return AbstractRemoteFile	16	* Martin Oberhuber (Wind River) - [235363][api][breaking] IHostFileToRemoteFileAdapter methods should return AbstractRemoteFile
17	* David McKnight (IBM) - [244765] Invalid thread access during workbench termination	17	* David McKnight (IBM) - [244765] Invalid thread access during workbench termination
18	* David McKnight (IBM) - [255699] NPE when filter string doesn't return result in FileServiceSubSystem.list	18	* David McKnight (IBM) - [255699] NPE when filter string doesn't return result in FileServiceSubSystem.list
		19	* David McKnight (IBM) - [190805] [performance][dstore] Right-click > Disconnect on a dstore connection is slow and spawns many Jobs
19	*******************************************************************************/	20	*******************************************************************************/
20		21
21	package org.eclipse.rse.internal.subsystems.files.dstore;	22	package org.eclipse.rse.internal.subsystems.files.dstore;
Lines 43-48 Link Here
43		44
44	private void registerFilePropertyChangeListener(FileServiceSubSystem ss)	45	private void registerFilePropertyChangeListener(FileServiceSubSystem ss)
45	{	46	{
		47	if (_listener != null && _listener.isFinished()){
		48	_listener = null;
		49	}
46	if (_listener == null)	50	if (_listener == null)
47	{	51	{
48	DStoreConnectorService connectorService = (DStoreConnectorService)ss.getConnectorService();	52	DStoreConnectorService connectorService = (DStoreConnectorService)ss.getConnectorService();




/*******************************************************************************
 * Copyright (c) 2002, 2009 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 * Contributors:
 * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
 * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
 * David McKnight   (IBM)        - [190805] [performance][dstore] Right-click > Disconnect on a dstore connection is slow and spawns many Jobs
 *******************************************************************************/

package org.eclipse.rse.internal.subsystems.files.dstore;

import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.ui.SystemBasePlugin;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.progress.UIJob;


    protected boolean _networkDown = false;
    
    protected HashMap _decorateJobs;
    
    protected boolean _finished = false;
    {

        private Shell shell;

        /**
         * @see Runnable#run()
         */
        public void run()
        {
            try
            {
                Shell[] shells = Display.getCurrent().getShells();
                for (int loop = 0; loop < shells.length && shell == null; loop++)
                {
                    if (shells[loop].isEnabled())
                    {
                        shell = shells[loop];
                    }
                }
            }
            catch (Exception e)
            {
                SystemBasePlugin.logError(
                        "StatusChangeListener.FindShell exception: ", e); //$NON-NLS-1$
            }
        }
    }
    
    public class DecorateJob extends UIJob
    {
    	private DataElement[] _files;
    	private DStoreFile   _parentFile;
    	private boolean      _isDone = false;
    	public DecorateJob(DataElement[] files, DStoreFile parentFile)
    	{
    		super(SystemFileResources.RESID_JOB_DECORATEFILES_NAME);
    		_files= files;

		public IStatus runInUIThread(IProgressMonitor monitor)
		{
			_isDone = false;
			IRemoteFile[] children = new IRemoteFile[_files.length];
			try {
				for (int i = 0; i < _files.length; i++)
				{			
					DataElement file = _files[i];
			        StringBuffer path = new StringBuffer(file.getAttribute(DE.A_VALUE));
			        path.append(_fileSubSystem.getSeparatorChar());
			    	path.append(file.getName());
			    
			    	children[i] = _fileSubSystem.getRemoteFileObject(path.toString(), monitor);
	            }
	              
				_registry.fireEvent(new
	    				org.eclipse.rse.core.events.SystemResourceChangeEvent(children,
	    						ISystemResourceChangeEvents.EVENT_ICON_CHANGE,
	    						_parentFile));				
			}
			catch (Exception e){}
			
			_isDone = true;
			_decorateJobs.remove(_parentFile);
			 return Status.OK_STATUS;
		}
    	
    }

    {
        this.shell = shell;
        this._fileSubSystem = fileSS;
        
        this.dataStore = dataStore;
        this.system = system;
        this._registry = RSECorePlugin.getTheSystemRegistry();

    public void finish()
    {
        dataStore.getDomainNotifier().removeDomainListener(this);
        _finished = true;
    }

    public boolean isFinished()
    {
    	return _finished;
    }
    
    /**
     * @see IDomainListener#domainChanged(DomainEvent)
     */

	    	parentPath.append(parent.getName());
	    	DStoreFile parentFile = (DStoreFile) _fileSubSystem.getCachedRemoteFile(parentPath.toString());
	    	
	        boolean refreshParent = false;
	        List toUpdate = new ArrayList();
	        for (int i = 0; i < children.size(); i++)
	        {

	                    type.equals(IUniversalDataStoreConstants.UNIVERSAL_FOLDER_DESCRIPTOR)))
	                
	            {
	            	toUpdate.add(subject);
	            	path.append(_fileSubSystem.getSeparatorChar());
	            	path.append(subject.getName());
	
	    
	                // find cached copy
	                try
	                {
	                    DStoreFile updated = (DStoreFile) _fileSubSystem.getCachedRemoteFile(path.toString());
	               
	                    if (updated != null)
	                    {
	                         String classification = updated.getClassification();
	                        if (!classification.equals("file") && !classification.equals("directory")) //$NON-NLS-1$ //$NON-NLS-2$
	                        {
	                            refreshParent = true;
	                            toUpdate.add(updated);
	                        }
	                      
	                    }
	                }
	                catch (Exception e)
	                {
	                    e.printStackTrace();
	                }
	            }
	        }
	        
	        if (!toUpdate.isEmpty())
	        {
	        	DecorateJob job = getDecorateJob(parentFile);
	        	if (job == null)
	        	{
	        		job = new DecorateJob((DataElement[])toUpdate.toArray(new DataElement[toUpdate.size()]), parentFile);
	        		job.setRule(parentFile);
	        		putDecorateJob(parentFile, job);
	        		job.schedule(1000);
	        	}
        		        	
	        }

    	_decorateJobs.put(file, job);
    }
    

    public Shell getShell()
    {
        // dy: DomainNotifier (which calls this method) requires the shell not
        // be disposed
        //if (shell == null) {
        if (shell == null || shell.isDisposed())
        {
            FindShell findShell = new FindShell();
            Display.getDefault().syncExec(findShell);
            shell = findShell.shell;
        }
        return shell;
    }

    /**
     * @see ICommunicationsListener#communicationsStateChange(CommunicationsEvent)




/********************************************************************************
 * Copyright (c) 2002, 2009 IBM Corporation and others. All rights reserved.
 * This program and the accompanying materials are made available under the terms
 * of the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html

 * David McKnight   (IBM)        - [249245] not showing inappropriate popup actions for: Refresh, Show In Table, Go Into, etc. 
 * David McKnight   (IBM)        - [251625] Widget disposed exception when renaming/pasting a folder
 * David McKnight   (IBM)        - [257721] Doubleclick doing special handling and expanding
 * David McKnight   (IBM)        - [190805] [performance][dstore] Right-click > Disconnect on a dstore connection is slow and spawns many Jobs
 ********************************************************************************/

package org.eclipse.rse.internal.ui.view;

			case ISystemResourceChangeEvents.EVENT_ICON_CHANGE:
				if (debug) logDebugMsg("SV event: EVENT_ICON_CHANGE "); //$NON-NLS-1$

				if (src instanceof Object[]){
					Object[] srcs = (Object[])src;
					for (int s = 0; s < srcs.length; s++){
						if (initViewerFilters != null && initViewerFilters.length > 0) {
							Widget w = findItem(srcs[s]);
							if (w == null) {
								refresh(parent);
							} else {
								properties[0] = IBasicPropertyConstants.P_IMAGE;
								update(srcs[s], properties); // for refreshing non-structural properties in viewer when model changes
		
							}
						} else {
							properties[0] = IBasicPropertyConstants.P_IMAGE;
							update(srcs[s], properties); // for refreshing non-structural properties in viewer when model changes
						}						
					}
				}
				else {
					if (initViewerFilters != null && initViewerFilters.length > 0) {
						Widget w = findItem(src);
						if (w == null) {
							refresh(parent);
						} else {
							properties[0] = IBasicPropertyConstants.P_IMAGE;
							update(src, properties); // for refreshing non-structural properties in viewer when model changes
	
						}
					} else {
						properties[0] = IBasicPropertyConstants.P_IMAGE;
						update(src, properties); // for refreshing non-structural properties in viewer when model changes

					}
				} else {
					properties[0] = IBasicPropertyConstants.P_IMAGE;
					update(src, properties); // for refreshing non-structural properties in viewer when model changes
				}

				//updatePropertySheet();

Return to bug 190805

Lines 1-5 Link Here

(-)UI/org/eclipse/rse/internal/ui/view/SystemView.java (-9 / +30 lines)
1	/********************************************************************************	1	/********************************************************************************
2	* Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.	2	* Copyright (c) 2002, 2009 IBM Corporation and others. All rights reserved.
3	* This program and the accompanying materials are made available under the terms	3	* This program and the accompanying materials are made available under the terms
4	* of the Eclipse Public License v1.0 which accompanies this distribution, and is	4	* of the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html	5	* available at http://www.eclipse.org/legal/epl-v10.html
Lines 67-72 Link Here
67	* David McKnight (IBM) - [249245] not showing inappropriate popup actions for: Refresh, Show In Table, Go Into, etc.	67	* David McKnight (IBM) - [249245] not showing inappropriate popup actions for: Refresh, Show In Table, Go Into, etc.
68	* David McKnight (IBM) - [251625] Widget disposed exception when renaming/pasting a folder	68	* David McKnight (IBM) - [251625] Widget disposed exception when renaming/pasting a folder
69	* David McKnight (IBM) - [257721] Doubleclick doing special handling and expanding	69	* David McKnight (IBM) - [257721] Doubleclick doing special handling and expanding
		70	* David McKnight (IBM) - [190805] [performance][dstore] Right-click > Disconnect on a dstore connection is slow and spawns many Jobs
70	********************************************************************************/	71	********************************************************************************/
71		72
72	package org.eclipse.rse.internal.ui.view;	73	package org.eclipse.rse.internal.ui.view;
Lines 2176-2193 Link Here
2176	case ISystemResourceChangeEvents.EVENT_ICON_CHANGE:	2177	case ISystemResourceChangeEvents.EVENT_ICON_CHANGE:
2177	if (debug) logDebugMsg("SV event: EVENT_ICON_CHANGE "); //$NON-NLS-1$	2178	if (debug) logDebugMsg("SV event: EVENT_ICON_CHANGE "); //$NON-NLS-1$
2178		2179
2179	if (initViewerFilters != null && initViewerFilters.length > 0) {	2180	if (src instanceof Object[]){
2180	Widget w = findItem(src);	2181	Object[] srcs = (Object[])src;
2181	if (w == null) {	2182	for (int s = 0; s < srcs.length; s++){
2182	refresh(parent);	2183	if (initViewerFilters != null && initViewerFilters.length > 0) {
		2184	Widget w = findItem(srcs[s]);
		2185	if (w == null) {
		2186	refresh(parent);
		2187	} else {
		2188	properties[0] = IBasicPropertyConstants.P_IMAGE;
		2189	update(srcs[s], properties); // for refreshing non-structural properties in viewer when model changes
		2190
		2191	}
		2192	} else {
		2193	properties[0] = IBasicPropertyConstants.P_IMAGE;
		2194	update(srcs[s], properties); // for refreshing non-structural properties in viewer when model changes
		2195	}
		2196	}
		2197	}
		2198	else {
		2199	if (initViewerFilters != null && initViewerFilters.length > 0) {
		2200	Widget w = findItem(src);
		2201	if (w == null) {
		2202	refresh(parent);
		2203	} else {
		2204	properties[0] = IBasicPropertyConstants.P_IMAGE;
		2205	update(src, properties); // for refreshing non-structural properties in viewer when model changes
		2206
		2207	}
2183	} else {	2208	} else {
2184	properties[0] = IBasicPropertyConstants.P_IMAGE;	2209	properties[0] = IBasicPropertyConstants.P_IMAGE;
2185	update(src, properties); // for refreshing non-structural properties in viewer when model changes	2210	update(src, properties); // for refreshing non-structural properties in viewer when model changes
2186
2187	}	2211	}
2188	} else {
2189	properties[0] = IBasicPropertyConstants.P_IMAGE;
2190	update(src, properties); // for refreshing non-structural properties in viewer when model changes
2191	}	2212	}
2192		2213
2193	//updatePropertySheet();	2214	//updatePropertySheet();