Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Fedorov2020-06-14 17:17:03 +0000
committerAlexander Fedorov2020-06-14 17:17:03 +0000
commit72bf8216d81973ff39eba647a07cdca730d1054f (patch)
treee7b4b2ae2915f61ffc5b7fc1d7cc566d6d5fd7d5
parentdb577a85ca6da8f3206770e4f22cf08057ea7de4 (diff)
downloadorg.eclipse.cdt-72bf8216d81973ff39eba647a07cdca730d1054f.tar.gz
org.eclipse.cdt-72bf8216d81973ff39eba647a07cdca730d1054f.tar.xz
org.eclipse.cdt-72bf8216d81973ff39eba647a07cdca730d1054f.zip
Bug 564276 - Extract CDT Core templateengine to a separate bundle
Remove dependency to org.eclipse.cdt.core.CCorePlugin during template schema URL resolution. The TemplateDescriptorSchema.xsd URI should be in one bundle with TemplateEngine. Change-Id: Ice2fbc4f33da6616184728d3a41cc803328526a6 Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
-rw-r--r--core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java
index 90b3c7de34c..6fe7c34449f 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 Symbian Software Limited and others.
+ * Copyright (c) 2007, 2020 Symbian Software Limited and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -11,6 +11,7 @@
* Contributors:
* Bala Torati (Symbian) - Initial API and implementation
* Mark Espiritu (VaST Systems) - bug 215960
+ * Alexander Fedorov (ArSysOp) - Bug 564276
*******************************************************************************/
package org.eclipse.cdt.core.templateengine;
@@ -31,6 +32,7 @@ import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.Platform;
+import org.osgi.framework.FrameworkUtil;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -377,7 +379,7 @@ public class TemplateEngine {
*/
public URL getTemplateSchemaURL() throws IOException {
return FileLocator
- .toFileURL(Platform.getBundle(CCorePlugin.PLUGIN_ID).getEntry("schema/TemplateDescriptorSchema.xsd")); //$NON-NLS-1$
+ .toFileURL(FrameworkUtil.getBundle(getClass()).getEntry("schema/TemplateDescriptorSchema.xsd")); //$NON-NLS-1$
}
/**

Back to the top