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

(-)UI/org/eclipse/rse/ui/propertypages/ISystemConnectionWizardPropertyPage.java (-1 / +11 lines)
Lines 12-28 Link Here
12
 * 
12
 * 
13
 * Contributors:
13
 * Contributors:
14
 * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
14
 * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
15
 * Martin Oberhuber (Wind River) - [174789] [performance] Don't contribute Property Pages to Wizard automatically
15
 ********************************************************************************/
16
 ********************************************************************************/
16
17
17
package org.eclipse.rse.ui.propertypages;
18
package org.eclipse.rse.ui.propertypages;
18
19
19
20
21
import org.eclipse.jface.wizard.IWizard;
20
import org.eclipse.rse.core.IRSESystemType;
22
import org.eclipse.rse.core.IRSESystemType;
21
import org.eclipse.rse.core.subsystems.IConnectorService;
23
import org.eclipse.rse.core.subsystems.IConnectorService;
22
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
24
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
25
import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter;
23
26
24
/**
27
/**
25
 * interface for a property page that can be shown in the new connection wizard
28
 * interface for a property page that can be shown in the new connection wizard.
29
 * 
30
 * @deprecated this class will likely be removed in the future, because the 
31
 *     underlying mechanism of contributing property pages to a wizard 
32
 *     does not scale since it activates unrelated plug-ins. Custom wizard
33
 *     pages should be contributed through 
34
 *     {@link SubSystemConfigurationAdapter#getNewConnectionWizardPages(ISubSystemConfiguration, IWizard)}
35
 *     instead. See also Eclipse Bugzilla bug 197129.  
26
 */
36
 */
27
public interface ISystemConnectionWizardPropertyPage 
37
public interface ISystemConnectionWizardPropertyPage 
28
{
38
{
(-)UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java (-15 / +21 lines)
Lines 15-20 Link Here
15
 * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
15
 * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
16
 * Martin Oberhuber (Wind River) - [189123] Move renameSubSystemProfile() from UI to Core
16
 * Martin Oberhuber (Wind River) - [189123] Move renameSubSystemProfile() from UI to Core
17
 * Martin Oberhuber (Wind River) - [190231] Remove UI-only code from SubSystemConfiguration
17
 * Martin Oberhuber (Wind River) - [190231] Remove UI-only code from SubSystemConfiguration
18
 * Martin Oberhuber (Wind River) - [174789] [performance] Don't contribute Property Pages to Wizard automatically
18
 ********************************************************************************/
19
 ********************************************************************************/
19
20
20
package org.eclipse.rse.ui.view;
21
package org.eclipse.rse.ui.view;
Lines 91-97 Link Here
91
import org.eclipse.rse.ui.widgets.IServerLauncherForm;
92
import org.eclipse.rse.ui.widgets.IServerLauncherForm;
92
import org.eclipse.rse.ui.widgets.RemoteServerLauncherForm;
93
import org.eclipse.rse.ui.widgets.RemoteServerLauncherForm;
93
import org.eclipse.rse.ui.wizards.SubSystemServiceWizardPage;
94
import org.eclipse.rse.ui.wizards.SubSystemServiceWizardPage;
94
import org.eclipse.rse.ui.wizards.SystemSubSystemsPropertiesWizardPage;
95
import org.eclipse.swt.graphics.Image;
95
import org.eclipse.swt.graphics.Image;
96
import org.eclipse.swt.widgets.Composite;
96
import org.eclipse.swt.widgets.Composite;
97
import org.eclipse.swt.widgets.Shell;
97
import org.eclipse.swt.widgets.Shell;
Lines 200-222 Link Here
200
				SubSystemServiceWizardPage page = new SubSystemServiceWizardPage(wizard, config);
200
				SubSystemServiceWizardPage page = new SubSystemServiceWizardPage(wizard, config);
201
				return new ISystemNewConnectionWizardPage[] {page};
201
				return new ISystemNewConnectionWizardPage[] {page};
202
			}
202
			}
203
			else
203
			//MOB Removed due to performance issue -- see Eclipse Bugzilla bug 174789
204
			{
204
//			else
205
				List pages = getSubSystemPropertyPages(config);
205
//			{
206
				if (pages != null && pages.size() > 0)
206
//				List pages = getSubSystemPropertyPages(config);
207
				{								
207
//				if (pages != null && pages.size() > 0)
208
					SystemSubSystemsPropertiesWizardPage page = new SystemSubSystemsPropertiesWizardPage(wizard, config, pages);
208
//				{								
209
					return new ISystemNewConnectionWizardPage[] {page};				
209
//					SystemSubSystemsPropertiesWizardPage page = new SystemSubSystemsPropertiesWizardPage(wizard, config, pages);
210
				}
210
//					return new ISystemNewConnectionWizardPage[] {page};				
211
			}
211
//				}
212
//			}
212
			return new ISystemNewConnectionWizardPage[0];
213
			return new ISystemNewConnectionWizardPage[0];
213
		}
214
		}
214
		
215
		
215
	
216
	
217
		
218
		/*
216
		/*
219
		 * Return the form used in the subsyste property page.  This default implementation returns Syste
217
		 * Return the form used in the subsystem property page.  This default implementation returns Syste
220
		 */
218
		 */
221
		public ISystemSubSystemPropertyPageCoreForm getSubSystemPropertyPageCoreFrom(ISubSystemConfiguration config, ISystemMessageLine msgLine, Object caller)
219
		public ISystemSubSystemPropertyPageCoreForm getSubSystemPropertyPageCoreFrom(ISubSystemConfiguration config, ISystemMessageLine msgLine, Object caller)
222
		{
220
		{
Lines 226-231 Link Here
226
		/**
224
		/**
227
		 * Gets the list of property pages applicable for a subsystem associated with this subsystem configuration
225
		 * Gets the list of property pages applicable for a subsystem associated with this subsystem configuration
228
		 * @return the list of subsystem property pages
226
		 * @return the list of subsystem property pages
227
		 * 
228
		 * @deprecated this method will likely be removed in the future, because the 
229
		 *     underlying mechanism of finding the registered property pages for a
230
		 *     SubSystemConfiguration does not scale since it activates unrelated
231
		 *     plug-ins. Existing Platform functionality for getting the list of
232
		 *     property pages registered against a SubSystem should be used, once
233
		 *     the SubSystem class is loaded -- but not by referencing the 
234
		 *     SubSystemConfiguration. See also Eclipse Bugzilla bug 197129.  
229
		 */
235
		 */
230
		protected List getSubSystemPropertyPages(ISubSystemConfiguration config)
236
		protected List getSubSystemPropertyPages(ISubSystemConfiguration config)
231
		{
237
		{
Lines 243-249 Link Here
243
				
249
				
244
				String objectClass = configurationElement.getAttribute("objectClass"); //$NON-NLS-1$
250
				String objectClass = configurationElement.getAttribute("objectClass"); //$NON-NLS-1$
245
				// The objectClass attribute is a) deprecated and b) optional. If null, do not
251
				// The objectClass attribute is a) deprecated and b) optional. If null, do not
246
				// try to instanciate a class from it as it will lead to a NPE. It is very bad
252
				// try to instantiate a class from it as it will lead to a NPE. It is very bad
247
				// style to let throw the exception and catch it with an empty catch block. If
253
				// style to let throw the exception and catch it with an empty catch block. If
248
				// the debugger is configured to intercept NPE's, we end up always here.
254
				// the debugger is configured to intercept NPE's, we end up always here.
249
				if (objectClass == null) continue;
255
				if (objectClass == null) continue;
(-)UI/org/eclipse/rse/ui/wizards/SystemSubSystemsPropertiesWizardPage.java (-1 / +9 lines)
Lines 12-17 Link Here
12
 * 
12
 * 
13
 * Contributors:
13
 * Contributors:
14
 * Martin Oberhuber (Wind River) - [190231] Move ISubSystemPropertiesWizardPage from UI to Core
14
 * Martin Oberhuber (Wind River) - [190231] Move ISubSystemPropertiesWizardPage from UI to Core
15
 * Martin Oberhuber (Wind River) - [174789] [performance] Don't contribute Property Pages to Wizard automatically
15
 ********************************************************************************/
16
 ********************************************************************************/
16
17
17
package org.eclipse.rse.ui.wizards;
18
package org.eclipse.rse.ui.wizards;
Lines 28-33 Link Here
28
import org.eclipse.rse.ui.SystemWidgetHelpers;
29
import org.eclipse.rse.ui.SystemWidgetHelpers;
29
import org.eclipse.rse.ui.propertypages.ISystemConnectionWizardErrorUpdater;
30
import org.eclipse.rse.ui.propertypages.ISystemConnectionWizardErrorUpdater;
30
import org.eclipse.rse.ui.propertypages.ISystemConnectionWizardPropertyPage;
31
import org.eclipse.rse.ui.propertypages.ISystemConnectionWizardPropertyPage;
32
import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter;
31
import org.eclipse.swt.SWT;
33
import org.eclipse.swt.SWT;
32
import org.eclipse.swt.custom.CTabFolder;
34
import org.eclipse.swt.custom.CTabFolder;
33
import org.eclipse.swt.custom.CTabItem;
35
import org.eclipse.swt.custom.CTabItem;
Lines 39-45 Link Here
39
/**
41
/**
40
 * Wizard page that display the property pages for a given subsystem in the
42
 * Wizard page that display the property pages for a given subsystem in the
41
 * connection
43
 * connection
42
 *  
44
 * 
45
 * @deprecated this class will likely be removed in the future, because the 
46
 *     underlying mechanism of contributing property pages to a wizard 
47
 *     does not scale since it activates unrelated plug-ins. Custom wizard
48
 *     pages should be contributed through 
49
 *     {@link SubSystemConfigurationAdapter#getNewConnectionWizardPages(ISubSystemConfiguration, IWizard)}
50
 *     instead. See also Eclipse Bugzilla bug 197129.  
43
 */
51
 */
44
public class SystemSubSystemsPropertiesWizardPage
52
public class SystemSubSystemsPropertiesWizardPage
45
	extends AbstractSystemNewConnectionWizardPage
53
	extends AbstractSystemNewConnectionWizardPage

Return to bug 174789