This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository eclipse-pydev.
commit 32c87c7977323cc85e43a3c4acb3a65048555cc6 Author: Jakub Adam <[email protected]> Date: Thu Nov 21 14:29:10 2013 +0100 Remove CSS styling specific to Eclipse 4.x --- debian/patches/no-e4.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 49 insertions(+) diff --git a/debian/patches/no-e4.patch b/debian/patches/no-e4.patch new file mode 100644 index 0000000..c2c72c3 --- /dev/null +++ b/debian/patches/no-e4.patch @@ -0,0 +1,48 @@ +From: Jakub Adam <[email protected]> +Date: Sat, 28 Sep 2013 09:23:52 +0200 +Subject: no-e4 + +--- + .../src/org/python/pydev/plugin/PydevPlugin.java | 17 +---------------- + 1 file changed, 1 insertion(+), 16 deletions(-) + +diff --git a/plugins/org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java b/plugins/org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java +index 9521ae4..45bc450 100644 +--- a/plugins/org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java ++++ b/plugins/org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java +@@ -23,8 +23,6 @@ import org.eclipse.core.runtime.IPath; + import org.eclipse.core.runtime.Path; + import org.eclipse.core.runtime.Platform; + import org.eclipse.core.runtime.Status; +-import org.eclipse.e4.ui.css.swt.theme.IThemeEngine; +-import org.eclipse.e4.ui.services.IStylingEngine; + import org.eclipse.jface.preference.IPreferenceStore; + import org.eclipse.jface.resource.ImageDescriptor; + import org.eclipse.swt.graphics.Color; +@@ -539,19 +537,6 @@ public class PydevPlugin extends AbstractUIPlugin { + + @SuppressWarnings("restriction") + public static void setCssId(Object control, String id, boolean applyToChildren) { +- try { +- IStylingEngine engine = (IStylingEngine) UIUtils.getActiveWorkbenchWindow(). +- getService(IStylingEngine.class); +- if (engine != null) { +- engine.setId(control, id); +- IThemeEngine themeEngine = (IThemeEngine) Display.getDefault().getData( +- "org.eclipse.e4.ui.css.swt.theme"); +- themeEngine.applyStyles(control, applyToChildren); +- } +- } catch (Throwable e) { +- //Ignore: older versions of Eclipse won't have it! +- // e.printStackTrace(); +- } + } + + public static void fixSelectionStatusDialogStatusLineColor(Object dialog, Color color) { +@@ -566,4 +551,4 @@ public class PydevPlugin extends AbstractUIPlugin { + Log.log(e); + } + } +-} +\ No newline at end of file ++} diff --git a/debian/patches/series b/debian/patches/series index 18dd459..152c594 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ add-orbit-dependencies.patch pydev-jython-src-path.patch jython-compatibility-fixes.patch remove-windows-specific-code.patch +no-e4.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-pydev.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
