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

merging fix for [397995] into master branch

Browse source
This commit is contained in:
David Dykstal 2013-01-14 15:22:19 -06:00
commit 67cfca76a7
8 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.core;singleton:=true
Bundle-Version: 3.3.0.qualifier
Bundle-Version: 3.3.1.qualifier
Bundle-Activator: org.eclipse.rse.core.RSECorePlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,

2
rse/plugins/org.eclipse.rse.core/pom.xml
View file

@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.tm</groupId>
<artifactId>org.eclipse.rse.core</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.3.1.qualifier</version>
<packaging>eclipse-plugin</packaging>
</project>

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

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

@ -1,5 +1,5 @@
/********************************************************************************
* Copyright (c) 2006, 2011 IBM Corporation and others. All rights reserved.
* Copyright (c) 2006, 2013 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
@ -25,6 +25,7 @@
* Martin Oberhuber (Wind River) - [190231] Prepare API for UI/Non-UI Splitting
* David Dykstal (IBM) = [226958] add status values to waitForInitCompletion(phase)
* David McKnight (IBM) - [354874] persistence manager hits a NPE during shutdown
* David Dykstal (IBM) - [397995] RSEInitJob runs too early
********************************************************************************/
package org.eclipse.rse.core;
@ -307,8 +308,6 @@ public class RSECorePlugin extends Plugin {
public void start(BundleContext context) throws Exception {
super.start(context);
registerKeystoreProviders();
RSEInitJob job = RSEInitJob.getInstance();
job.schedule();
}
/*

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

@ -1,5 +1,5 @@
/********************************************************************************
* Copyright (c) 2008, 2010 IBM Corporation and others. All rights reserved.
* Copyright (c) 2008, 2013 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
@ -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) - [397995] 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 {

2
rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.ui;singleton:=true
Bundle-Version: 3.3.1.qualifier
Bundle-Version: 3.3.2.qualifier
Bundle-Activator: org.eclipse.rse.ui.RSEUIPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,

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

@ -1,5 +1,5 @@
/********************************************************************************
* Copyright (c) 2006, 2009 IBM Corporation and others. All rights reserved.
* Copyright (c) 2006, 2013 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
@ -34,6 +34,7 @@
* David McKnight (IBM) - [225506] [api][breaking] RSE UI leaks non-API types
* David McKnight (IBM) - [236505] Remote systems dialog not working
* David McKnight (IBM) - [238288] use ImageRegistry to store/retrieve images for RSE label providers
* David Dykstal (IBM) - [397995] RSEInitJob runs too early
********************************************************************************/
package org.eclipse.rse.ui;
@ -53,6 +54,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 +387,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$

2
rse/plugins/org.eclipse.rse.ui/pom.xml
View file

@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.tm</groupId>
<artifactId>org.eclipse.rse.ui</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.3.2.qualifier</version>
<packaging>eclipse-plugin</packaging>
</project>