Date: Tue, 13 Aug 2013 16:33:46 -0400 From: George Neville-Neil <gnn@neville-neil.com> To: eclipse@freebsd.org Subject: Patch to fix key bindings in eclipse-devel/ Message-ID: <520A982A.8030702@neville-neil.com>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------020606040901010204000907 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Howdy, I would like to commit the following patches to eclipse-devel. This addresses the following bug. https://bugs.eclipse.org/bugs/show_bug.cgi?id=378684 The patch is not pretty but I'd like to apply it before we move eclipse-devel/ to eclipse so that at least the base eclipse in ports works correctly with key bindings. Best, George --------------020606040901010204000907 Content-Type: text/x-patch; name="Makefile.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="Makefile.patch" Index: Makefile =================================================================== --- Makefile (revision 324677) +++ Makefile (working copy) @@ -273,6 +273,11 @@ @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyTestPatches) .endif +pre-build: + @${CP} ${BUILD_WRKSRC}/build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.ui.workbench/Eclipse\ UI/org/eclipse/ui/internal/keys/model/BindingModel.java ${PATCHDIR} + @${PATCH} -d ${PATCHDIR} -E -p0 -i ${PATCHDIR}/BindingModel.java.patch + @${CP} ${PATCHDIR}/BindingModel.java ${BUILD_WRKSRC}/build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.ui.workbench/Eclipse\ UI/org/eclipse/ui/internal/keys/model/BindingModel.java + do-install: @${RM} -rf ${PORTDESTDIR} @${MKDIR} ${PORTDESTDIR} --------------020606040901010204000907 Content-Type: text/x-patch; name="BindingModel.java.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="BindingModel.java.patch" --- BindingModel.java 2013-08-13 13:47:55.000000000 -0400 +++ BindingModel.java 2013-08-13 13:48:48.000000000 -0400 @@ -237,7 +237,10 @@ if (obj instanceof Binding) { Binding b = (Binding) obj; if (!activeManagerBindings.contains(b)) { - be.fill(b.getParameterizedCommand()); + ParameterizedCommand cmd = b.getParameterizedCommand(); + if (cmd != null) { + commandToElement.remove(cmd); + } bindingToElement.remove(b); i.remove(); controller.firePropertyChange(this, PROP_BINDING_REMOVE, --------------020606040901010204000907--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?520A982A.8030702>