[eclipse-ptp] 09/13: Fix build with CDT 8.2.1

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository eclipse-ptp.

commit 38a64a7c7c82ac82eecb1b502ff6a6416f6c9775
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Feb 11 17:16:13 2014 +0100

    Fix build with CDT 8.2.1
---
 debian/patches/fix-build-with-cdt-8.2.1.patch | 42 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 43 insertions(+)

diff --git a/debian/patches/fix-build-with-cdt-8.2.1.patch b/debian/patches/fix-build-with-cdt-8.2.1.patch
new file mode 100644
index 0000000..80e91d0
--- /dev/null
+++ b/debian/patches/fix-build-with-cdt-8.2.1.patch
@@ -0,0 +1,42 @@
+From: Greg Watson <g.watson at computer.org>
+Date: Wed, 21 Aug 2013 13:38:04 -0400
+Subject: fix-build-with-cdt-8.2.1
+
+---
+ .../eclipse/ptp/internal/rdt/ui/actions/GenerateActionGroup.java  | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/GenerateActionGroup.java b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/GenerateActionGroup.java
+index 4be3a3d..42c3cd6 100755
+--- a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/GenerateActionGroup.java
++++ b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/GenerateActionGroup.java
+@@ -25,7 +25,7 @@ import java.util.List;
+ import org.eclipse.cdt.internal.ui.IContextMenuConstants;
+ import org.eclipse.cdt.internal.ui.actions.ActionMessages;
+ import org.eclipse.cdt.internal.ui.actions.CDTQuickMenuCreator;
+-import org.eclipse.cdt.internal.ui.editor.AddIncludeOnSelectionAction;
++import org.eclipse.cdt.internal.ui.editor.AddIncludeAction;
+ import org.eclipse.cdt.internal.ui.editor.CEditor;
+ import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds;
+ import org.eclipse.cdt.internal.ui.editor.SortLinesAction;
+@@ -116,7 +116,7 @@ public class GenerateActionGroup extends ActionGroup implements ISelectionChange
+ 	private List<ISelectionChangedListener> fRegisteredSelectionListeners;
+ //	private List<RefactoringAction> fRefactorActions= new ArrayList<RefactoringAction>();
+ 	
+-	private AddIncludeOnSelectionAction fAddInclude;
++	private AddIncludeAction fAddInclude;
+ //	private OverrideMethodsAction fOverrideMethods;
+ //	private GenerateHashCodeEqualsAction fHashCodeEquals;
+ //	private AddGetterSetterAction fAddGetterSetter;
+@@ -152,9 +152,9 @@ public class GenerateActionGroup extends ActionGroup implements ISelectionChange
+ 		fEditor= editor;
+ 		fGroupName= groupName;
+ 				
+-		fAddInclude= new AddIncludeOnSelectionAction(editor);
++		fAddInclude= new AddIncludeAction(editor);
+ 		fAddInclude.setActionDefinitionId(ICEditorActionDefinitionIds.ADD_INCLUDE);
+-		editor.setAction("AddIncludeOnSelection", fAddInclude); //$NON-NLS-1$
++		editor.setAction("AddInclude", fAddInclude); //$NON-NLS-1$
+ 		
+ //		fOrganizeIncludes= new OrganizeIncludesAction(editor);
+ //		fOrganizeIncludes.setActionDefinitionId(ICEditorActionDefinitionIds.ORGANIZE_INCLUDES);
diff --git a/debian/patches/series b/debian/patches/series
index 57c7ffb..8826e4e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ remove-cdt-xlc-dependency.patch
 disable-rdt-ui.patch
 remove-cdt-upc-dependency.patch
 disable-unneeded-core-bundles.patch
+fix-build-with-cdt-8.2.1.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-ptp.git