[eclipse-anyedit] 06/06: Refreshed d/patches/remove-pre-eclipse-3.7.0-compatibility.patch
Jakub Adam
xhaakon-guest at alioth.debian.org
Thu Aug 1 19:43:52 UTC 2013
This is an automated email from the git hooks/post-receive script.
xhaakon-guest pushed a commit to branch master
in repository eclipse-anyedit.
commit e25f8cab06dc7a6496d36785c0a1be496d0ed5ca
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Thu Aug 1 21:28:32 2013 +0200
Refreshed d/patches/remove-pre-eclipse-3.7.0-compatibility.patch
---
debian/changelog | 1 +
.../remove-pre-eclipse-3.7.0-compatibility.patch | 83 ++++++++------------
2 files changed, 33 insertions(+), 51 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a69eecf..232df1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ eclipse-anyedit (2.4.4-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.9.4.
* Use xz for upstream tarball compression.
+ * Refreshed d/patches/remove-pre-eclipse-3.7.0-compatibility.patch.
-- Jakub Adam <jakub.adam at ktknet.cz> Thu, 01 Aug 2013 21:18:42 +0200
diff --git a/debian/patches/remove-pre-eclipse-3.7.0-compatibility.patch b/debian/patches/remove-pre-eclipse-3.7.0-compatibility.patch
index cf2683a..53480f4 100644
--- a/debian/patches/remove-pre-eclipse-3.7.0-compatibility.patch
+++ b/debian/patches/remove-pre-eclipse-3.7.0-compatibility.patch
@@ -5,16 +5,16 @@ Subject: remove-pre-eclipse-3.7.0-compatibility
These classes are both useless and uncompilable with current Eclipse
---
.../de/loskutov/anyedit/AnyEditToolsPlugin.java | 7 +-
- .../actions/internal/SpecialSaveAction.java | 152 ---------
- .../actions/internal/SpecialSaveAllAction.java | 191 -----------
- .../anyedit/actions/internal/StartupHelper.java | 337 --------------------
- 4 files changed, 1 insertions(+), 686 deletions(-)
+ .../actions/internal/SpecialSaveAction.java | 155 ----------
+ .../actions/internal/SpecialSaveAllAction.java | 194 ------------
+ .../anyedit/actions/internal/StartupHelper.java | 314 --------------------
+ 4 files changed, 1 insertion(+), 669 deletions(-)
delete mode 100644 AnyEditTools/src/de/loskutov/anyedit/actions/internal/SpecialSaveAction.java
delete mode 100644 AnyEditTools/src/de/loskutov/anyedit/actions/internal/SpecialSaveAllAction.java
delete mode 100644 AnyEditTools/src/de/loskutov/anyedit/actions/internal/StartupHelper.java
diff --git a/AnyEditTools/src/de/loskutov/anyedit/AnyEditToolsPlugin.java b/AnyEditTools/src/de/loskutov/anyedit/AnyEditToolsPlugin.java
-index b7906ab..52473f1 100644
+index 3793a98..0b5d7ef 100644
--- a/AnyEditTools/src/de/loskutov/anyedit/AnyEditToolsPlugin.java
+++ b/AnyEditTools/src/de/loskutov/anyedit/AnyEditToolsPlugin.java
@@ -17,7 +17,6 @@ import org.eclipse.ui.IStartup;
@@ -25,7 +25,7 @@ index b7906ab..52473f1 100644
import de.loskutov.anyedit.actions.internal.StartupHelper2;
import de.loskutov.anyedit.util.EclipseUtils;
-@@ -115,11 +114,7 @@ public class AnyEditToolsPlugin extends AbstractUIPlugin implements IStartup {
+@@ -114,11 +113,7 @@ public class AnyEditToolsPlugin extends AbstractUIPlugin implements IStartup {
public void earlyStartup() {
// hooks into the global toolbar/menu
@@ -40,17 +40,17 @@ index b7906ab..52473f1 100644
}
diff --git a/AnyEditTools/src/de/loskutov/anyedit/actions/internal/SpecialSaveAction.java b/AnyEditTools/src/de/loskutov/anyedit/actions/internal/SpecialSaveAction.java
deleted file mode 100644
-index bd0be63..0000000
+index 0406ae1..0000000
--- a/AnyEditTools/src/de/loskutov/anyedit/actions/internal/SpecialSaveAction.java
+++ /dev/null
-@@ -1,152 +0,0 @@
+@@ -1,155 +0,0 @@
-/*******************************************************************************
-- * Copyright (c) 2009 Andrei Loskutov.
+- * Copyright (c) 2009 Andrey Loskutov.
- * 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
-- * Contributor: Andrei Loskutov - initial API and implementation
+- * Contributor: Andrey Loskutov - initial API and implementation
- *******************************************************************************/
-package de.loskutov.anyedit.actions.internal;
-
@@ -75,7 +75,7 @@ index bd0be63..0000000
-
-
-/**
-- * @author Andrei
+- * @author Andrey
- */
-public class SpecialSaveAction extends SaveAction implements IDirtyWorkaround {
-
@@ -89,10 +89,12 @@ index bd0be63..0000000
- public SpecialSaveAction(IWorkbenchWindow window) {
- super(window);
- spacesAction = new Spaces(){
+- @Override
- protected AbstractEditor createActiveEditorDelegate() {
- // this just returns the editor instance we already know, see runSpecial()
- return getEditor();
- }
+- @Override
- public void setEditor(AbstractEditor editor) {
- if(editor == null && getEditor() != null){
- getEditor().dispose();
@@ -118,6 +120,7 @@ index bd0be63..0000000
- }
- }
-
+- @Override
- public void run() {
- runBeforeSave();
- super.run();
@@ -198,17 +201,17 @@ index bd0be63..0000000
-}
diff --git a/AnyEditTools/src/de/loskutov/anyedit/actions/internal/SpecialSaveAllAction.java b/AnyEditTools/src/de/loskutov/anyedit/actions/internal/SpecialSaveAllAction.java
deleted file mode 100644
-index 3f51c80..0000000
+index 2c14672..0000000
--- a/AnyEditTools/src/de/loskutov/anyedit/actions/internal/SpecialSaveAllAction.java
+++ /dev/null
-@@ -1,191 +0,0 @@
+@@ -1,194 +0,0 @@
-/*******************************************************************************
-- * Copyright (c) 2009 Andrei Loskutov.
+- * Copyright (c) 2009 Andrey Loskutov.
- * 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
-- * Contributor: Andrei Loskutov - initial API and implementation
+- * Contributor: Andrey Loskutov - initial API and implementation
- *******************************************************************************/
-package de.loskutov.anyedit.actions.internal;
-
@@ -237,7 +240,7 @@ index 3f51c80..0000000
-import de.loskutov.anyedit.util.EclipseUtils;
-
-/**
-- * @author Andrei
+- * @author Andrey
- */
-public class SpecialSaveAllAction extends SaveAllAction implements IDirtyWorkaround {
-
@@ -250,11 +253,13 @@ index 3f51c80..0000000
- public SpecialSaveAllAction(IWorkbenchWindow window) {
- super(window);
- spacesAction = new Spaces() {
+- @Override
- protected AbstractEditor createActiveEditorDelegate() {
- // this just returns the editor instance we already know, see runSpecial()
- return getEditor();
- }
-
+- @Override
- public void setEditor(AbstractEditor editor) {
- if (editor == null && getEditor() != null) {
- getEditor().dispose();
@@ -298,6 +303,7 @@ index 3f51c80..0000000
- }
- }
-
+- @Override
- public void run() {
- runBeforeSave();
- super.run();
@@ -395,17 +401,17 @@ index 3f51c80..0000000
-}
diff --git a/AnyEditTools/src/de/loskutov/anyedit/actions/internal/StartupHelper.java b/AnyEditTools/src/de/loskutov/anyedit/actions/internal/StartupHelper.java
deleted file mode 100644
-index fc3756f..0000000
+index e43db86..0000000
--- a/AnyEditTools/src/de/loskutov/anyedit/actions/internal/StartupHelper.java
+++ /dev/null
-@@ -1,337 +0,0 @@
+@@ -1,314 +0,0 @@
-/*******************************************************************************
-- * Copyright (c) 2009 Andrei Loskutov.
+- * Copyright (c) 2009 Andrey Loskutov.
- * 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
-- * Contributor: Andrei Loskutov - initial API and implementation
+- * Contributor: Andrey Loskutov - initial API and implementation
- *******************************************************************************/
-package de.loskutov.anyedit.actions.internal;
-
@@ -441,18 +447,18 @@ index fc3756f..0000000
-import de.loskutov.anyedit.IAnyEditConstants;
-
-/**
-- * @author Andrei
+- * @author Andrey
- */
-public class StartupHelper implements IWindowListener {
-
-- private List/*<PreExecutionHandler>*/ commandListeners;
+- private final List<PreExecutionHandler> commandListeners;
-
- /**
- * Will be run after workbench is started and w.window is opened
- */
- public StartupHelper() {
- super();
-- commandListeners = new ArrayList();
+- commandListeners = new ArrayList<PreExecutionHandler>();
- }
-
- public void init() {
@@ -484,45 +490,30 @@ index fc3756f..0000000
- return null;
- }
-
-- /* (non-Javadoc)
-- * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow)
-- */
- public void windowOpened(IWorkbenchWindow window) {
- DirtyHookRunnable dh = new DirtyHookRunnable();
- dh.run(window);
- }
-
-- /* (non-Javadoc)
-- * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow)
-- */
- public void windowActivated(IWorkbenchWindow window) {
- // ignored
- }
-
-- /* (non-Javadoc)
-- * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow)
-- */
- public void windowDeactivated(IWorkbenchWindow window) {
- // ignored
- }
-
-- /* (non-Javadoc)
-- * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow)
-- */
- public void windowClosed(IWorkbenchWindow window) {
- // ignored
-- List list = commandListeners;
+- List<PreExecutionHandler> list = commandListeners;
- for (int i = 0; i < list.size(); i++) {
-- PreExecutionHandler listener = (PreExecutionHandler) list.get(i);
+- PreExecutionHandler listener = list.get(i);
- if(listener.myAction.getWindow() == window) {
- unHookFromCommand(listener);
- }
- }
- }
-
-- /**
-- * @param listener
-- */
- private void unHookFromCommand(PreExecutionHandler listener) {
- ICommandService service = (ICommandService) PlatformUI.getWorkbench().getService(
- ICommandService.class);
@@ -673,10 +664,6 @@ index fc3756f..0000000
- return store.getBoolean(prefkey);
- }
-
-- /**
-- * @param myAction
-- * @param manager
-- */
- private static int insert(IDirtyWorkaround myAction, ToolBarManager manager,
- int controlIdx) {
- IContributionItem item;
@@ -713,10 +700,6 @@ index fc3756f..0000000
- return controlIdx;
- }
-
-- /**
-- * @param myAction
-- * @param menu
-- */
- private static void insert(IDirtyWorkaround myAction, MenuManager menu) {
- IContributionItem item;
- String id = myAction.getId();
@@ -735,6 +718,4 @@ index fc3756f..0000000
- menu.update(true);
- }
- }
--}
-\ No newline at end of file
---
+-}
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-java/eclipse-anyedit.git
More information about the pkg-java-commits
mailing list