mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-04 15:45:25 +02:00
Code Issues Wiki Activity

Test moving the scheduling of the RSEInitJob to the RSEUIPlugin

Browse source 
The RSEInitJob loads profiles which instantiates subsystem configurations.
If these subsystem configurations are located in plugins that depend on
UI plugins then we run the risk of activating these plugins before
the platform is ready resulting in load errors of various kinds.

There appears to be a change in job scheduling timing that makes this
error more apparent.
This commit is contained in:
David Dykstal 2012-12-20 18:04:01 -06:00
parent 76c411895e
commit 5108908aa6
4 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
rse/plugins/org.eclipse.rse.core/schema/modelInitializers.exsd
View file

@ -2,19 +2,19 @@
<!-- Schema file written by PDE -->
<schema targetNamespace="org.eclipse.rse.core" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
<appInfo>
<meta.schema plugin="org.eclipse.rse.core" id="modelInitializers" name="Model Initializers"/>
</appinfo>
</appInfo>
<documentation>
A model initializer is used to create supplemental connections and filter pools after the RSE model has been restored from its persistent form. The base RSE uses this extension point to supply the &quot;Local&quot; connection if one has not already been created for this workspace. Other extenders of RSE may use this to augment the mode in other ways. An initializer is run at the end of the initialization job begun by RSE when it is activated.
A model initializer is used to create supplemental connections and filter pools after the RSE model has been restored from its persistent form. The base RSE uses this extension point to supply the &quot;Local&quot; connection if one has not already been created for this workspace. Other extenders of RSE may use this to augment the model in other ways. An initializer is run at the end of the initialization job begun by RSE when it is activated.
</documentation>
</annotation>
<element name="extension">
<annotation>
<appinfo>
<appInfo>
<meta.element />
</appinfo>
</appInfo>
</annotation>
<complexType>
<sequence>
@ -39,9 +39,9 @@
<documentation>
</documentation>
<appinfo>
<appInfo>
<meta.attribute translatable="true"/>
</appinfo>
</appInfo>
</annotation>
</attribute>
</complexType>
@ -54,9 +54,9 @@
<documentation>
A class that extends &lt;b&gt;org.eclipse.rse.core.IRSEModelInitializer&lt;/b&gt;.
</documentation>
<appinfo>
<appInfo>
<meta.attribute kind="java" basedOn=":org.eclipse.rse.core.IRSEModelInitializer"/>
</appinfo>
</appInfo>
</annotation>
</attribute>
<attribute name="type">
@ -78,18 +78,18 @@
</element>
<annotation>
<appinfo>
<appInfo>
<meta.section type="since"/>
</appinfo>
</appInfo>
<documentation>
RSE 3.0
</documentation>
</annotation>
<annotation>
<appinfo>
<appInfo>
<meta.section type="examples"/>
</appinfo>
</appInfo>
<documentation>
An example taken from the plug-in org.eclipse.rse.ui:
&lt;pre&gt;
@ -103,9 +103,9 @@
<annotation>
<appinfo>
<appInfo>
<meta.section type="copyright"/>
</appinfo>
</appInfo>
<documentation>
Copyright (c) 2008 IBM Corporation and others. All rights reserved.
This program and the accompanying materials are made available under the terms

2
rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java
View file

@ -307,8 +307,10 @@ public class RSECorePlugin extends Plugin {
public void start(BundleContext context) throws Exception {
super.start(context);
registerKeystoreProviders();
/*
RSEInitJob job = RSEInitJob.getInstance();
job.schedule();
*/
}
/*

5
rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/RSEInitJob.java
View file

@ -11,6 +11,7 @@
* David Dykstal (IBM) = [226958] add status values to waitForInitCompletion(phase)
* David Dykstal (IBM) - [235581] Initialize RSE should be a daemon job
* David McKnight (IBM) - [283033] remoteFileTypes extension point should include "xml" type
* David Dykstal (IBM) - [] RSEInitJob runs too early
********************************************************************************/
package org.eclipse.rse.internal.core;
@ -230,10 +231,10 @@ public final class RSEInitJob extends Job {
return ResourcesPlugin.getEncoding();
}
});
*/
*/
initializerPhase.done(result);
// finish up - propogate cancel if necessary
// finish up - propagate cancel if necessary
if (monitor.isCanceled()) {
result = Status.CANCEL_STATUS;
} else {

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java
View file

@ -53,6 +53,7 @@ import org.eclipse.rse.core.model.ISystemProfileManager;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy;
import org.eclipse.rse.internal.core.RSEInitJob;
import org.eclipse.rse.internal.core.model.SystemProfileManager;
import org.eclipse.rse.internal.core.model.SystemRegistry;
import org.eclipse.rse.internal.ui.RSESystemTypeAdapterFactory;
@ -385,6 +386,8 @@ public class RSEUIPlugin extends SystemBasePlugin
public void start(BundleContext context) throws Exception
{
super.start(context);
RSEInitJob.getInstance().schedule();
messageFile = getMessageFile("systemmessages.xml"); //$NON-NLS-1$
defaultMessageFile = getDefaultMessageFile("systemmessages.xml"); //$NON-NLS-1$