Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[dsdp-tm-dev] What is defect 44544 ?
Hi Dave,
 
In order to refactor SystemRegistry implementation from UI to Core,
I'd like to get rid of deprecated ISystemViewInputProvider#getShell()
 
Doing so, I came across this line #364 in SystemView.java:

inputProvider.setShell(getShell()); // DY: Defect 44544, shell was not being set for Test dialogs, when they
// tried to connect there was not shell for the password prompt
// and an error message (expand failed) occurred.

I'd like to get rid of these lines since I'm very sure we don't need
them in OpenRSE; because, when deprecated
ISystemViewInputProvider#getShell() no longer exists,
setting the shell is useless.
 
Can you check why these lines were there originally,
and whether it's OK applying attached patch?
 
Thanks,
--
Martin Oberhuber, Senior Member of Technical Staff, Wind River
Target Management Project Lead, DSDP PMC Member
http://www.eclipse.org/dsdp/tm
 
 
### Eclipse Workspace Patch 1.0
#P org.eclipse.rse.core
Index: src/org/eclipse/rse/core/model/ISystemViewInputProvider.java
===================================================================
RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemViewInputProvider.java,v
retrieving revision 1.1
diff -u -r1.1 ISystemViewInputProvider.java
--- src/org/eclipse/rse/core/model/ISystemViewInputProvider.java	5 Jun 2007 20:59:51 -0000	1.1
+++ src/org/eclipse/rse/core/model/ISystemViewInputProvider.java	11 Feb 2008 13:23:01 -0000
@@ -63,22 +63,6 @@
 	public Object getAdapter(Class adapterType);
 
 	/**
-	 * Set the shell in case it is needed for anything.
-	 * The label and content provider will call this.
-	 * @param shell an {@link org.eclipse.swt.widgets.Shell shell} object,
-	 *    being used by the viewer using this provider
-	 */
-	public void setShell(Object shell);
-
-	/**
-	 * @return the {@link org.eclipse.swt.widgets.Shell shell} of the viewer 
-	 *     we are currently associated with.
-	 * @deprecated use other methods for getting the active workbench shell,
-	 *     e.g. {@link org.eclipse.rse.ui.RSEUIPlugin#getActiveWorkbenchShell()}
-	 */
-	public Object getShell();
-
-	/**
 	 * Set the viewer in case it is needed for anything.
 	 * The label and content provider will call this.
 	 * @param viewer the {@link org.eclipse.jface.viewers.Viewer viewer}
#P org.eclipse.rse.ui
Index: UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java
===================================================================
RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java,v
retrieving revision 1.9
diff -u -r1.9 SystemViewAPIProviderForFilters.java
--- UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java	5 Jun 2007 20:59:59 -0000	1.9
+++ UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java	11 Feb 2008 13:23:04 -0000
@@ -142,7 +142,7 @@
 		   children = new SystemMessageObject[1];
     	   try {
     		   ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssf.getAdapter(ISubSystemConfigurationAdapter.class);
-             ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, (Shell)getShell());
+             ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, RSEUIPlugin.getTheSystemRegistryUI().getShell());
              if (newFilter == null)
              {
 		        children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED),
Index: UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java
===================================================================
RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java,v
retrieving revision 1.7
diff -u -r1.7 SystemAbstractAPIProvider.java
--- UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java	5 Jun 2007 20:59:59 -0000	1.7
+++ UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java	11 Feb 2008 13:23:03 -0000
@@ -42,9 +42,6 @@
 public abstract class SystemAbstractAPIProvider 
        implements ISystemViewInputProvider
 {
-
-
-	protected Shell shell;
 	protected Viewer viewer;
 	protected ISystemRegistry sr;
 	
@@ -80,24 +77,6 @@
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#setShell(java.lang.Object)
-     */
-    public void setShell(Object shell)
-    {
-    	this.shell = (Shell)shell;
-    }
-    
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getShell()
-     */
-    public Object getShell()
-    {
-    	return shell;
-    }
-
-    /*
-     * (non-Javadoc)
      * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#setViewer(java.lang.Object)
      */
     public void setViewer(Object viewer)
Index: UI/org/eclipse/rse/internal/ui/view/SystemView.java
===================================================================
RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java,v
retrieving revision 1.160
diff -u -r1.160 SystemView.java
--- UI/org/eclipse/rse/internal/ui/view/SystemView.java	3 Jan 2008 19:36:18 -0000	1.160
+++ UI/org/eclipse/rse/internal/ui/view/SystemView.java	11 Feb 2008 13:23:04 -0000
@@ -298,7 +298,6 @@
 		assert shell == parent.getShell();
 		this.shell = shell;
 		this.inputProvider = inputProvider;
-		this.inputProvider.setShell(shell); // DY:  defect 44544
 		this.messageLine = msgLine;
 		init();
 	}
@@ -317,7 +316,6 @@
 		assert shell == parent.getShell();
 		this.shell = shell;
 		this.inputProvider = inputProvider;
-		this.inputProvider.setShell(shell); // DY:  defect 44544
 		this.messageLine = msgLine;
 		init();
 	}
@@ -337,7 +335,6 @@
 		assert shell == parent.getShell();
 		this.shell = shell;
 		this.inputProvider = inputProvider;
-		this.inputProvider.setShell(shell); // DY:  defect 44544
 		this.messageLine = msgLine;
 		this.initViewerFilters = initViewerFilters;
 		init();
@@ -356,7 +353,6 @@
 		assert shell == tree.getShell();
 		this.shell = shell;
 		this.inputProvider = inputProvider;
-		this.inputProvider.setShell(shell); // DY:  defect 44544
 		this.messageLine = msgLine;
 		init();
 	}
@@ -368,9 +364,6 @@
 	public void setInputProvider(ISystemViewInputProvider inputProvider) {
 		this.inputProvider = inputProvider;
 		inputProvider.setViewer(this);
-		inputProvider.setShell(getShell()); // DY:  Defect 44544, shell was not being set for Test dialogs, when they
-		// tried to connect there was not shell for the password prompt
-		// and an error message (expand failed) occurred.
 		setInput(inputProvider);
 	}
 
@@ -642,7 +635,6 @@
 	 */
 	public ISystemViewInputProvider getInputProvider() {
 		inputProvider.setViewer(this); // just in case. Added by Phil in V5.0
-		inputProvider.setShell(getShell()); // just in case. Added by Phil
 		return inputProvider;
 	}

Back to the top