[med-svn] [libjloda-java] 01/02: Exclude apple specific code

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libjloda-java.

commit 158919ceb02106b164677ea62898da12aac00135
Author: Andreas Tille <tille at debian.org>
Date:   Thu Nov 3 13:34:53 2016 +0100

    Exclude apple specific code
---
 debian/patches/remove_applestuff.patch | 153 +++++++++++++++++++++++++++++++++
 debian/patches/series                  |   1 +
 2 files changed, 154 insertions(+)

diff --git a/debian/patches/remove_applestuff.patch b/debian/patches/remove_applestuff.patch
new file mode 100644
index 0000000..5af7745
--- /dev/null
+++ b/debian/patches/remove_applestuff.patch
@@ -0,0 +1,153 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 11 Oct 2016 20:08:16 +0200
+Description: We are not building for Apple
+
+--- a/src/jloda/gui/AppleStuff.java
++++ /dev/null
+@@ -1,109 +0,0 @@
+-/**
+- * AppleStuff.java 
+- * Copyright (C) 2016 Daniel H. Huson
+- *
+- * (Some files contain contributions from other authors, who are then mentioned separately.)
+- *
+- * This program is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation, either version 3 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-*/
+-package jloda.gui;
+-
+-
+-import com.apple.eawt.*;
+-
+-import javax.swing.*;
+-
+-/**
+- * Apple specific stuff
+- * Daniel Huson, 3.2014
+- */
+-public class AppleStuff {
+-    static private AppleStuff instance;
+-    private final Application application;
+-    private boolean isQuitDefined;
+-    private boolean isAboutDefined;
+-    private boolean isPreferencesDefined;
+-
+-    /**
+-     * constructor
+-     */
+-    private AppleStuff() {
+-        application = Application.getApplication();
+-    }
+-
+-    /**
+-     * get instance
+-     *
+-     * @return instance
+-     */
+-    public static AppleStuff getInstance() {
+-        if (instance == null)
+-            instance = new AppleStuff();
+-        return instance;
+-    }
+-
+-    /**
+-     * sets the quit action
+-     *
+-     * @param action
+-     */
+-    public void setQuitAction(final Action action) {
+-        isQuitDefined = true;
+-        application.setQuitHandler(new QuitHandler() {
+-            @Override
+-            public void handleQuitRequestWith(AppEvent.QuitEvent quitEvent, QuitResponse quitResponse) {
+-                action.actionPerformed(null);
+-                quitResponse.cancelQuit();
+-            }
+-        });
+-    }
+-
+-    /**
+-     * set the about action
+-     *
+-     * @param action
+-     */
+-    public void setAboutAction(final Action action) {
+-        isAboutDefined = true;
+-        application.setAboutHandler(new AboutHandler() {
+-            @Override
+-            public void handleAbout(AppEvent.AboutEvent aboutEvent) {
+-                action.actionPerformed(null);
+-            }
+-        });
+-    }
+-
+-    public void setPreferencesAction(final Action action) {
+-        isPreferencesDefined = true;
+-        application.setPreferencesHandler(new PreferencesHandler() {
+-            @Override
+-            public void handlePreferences(AppEvent.PreferencesEvent preferencesEvent) {
+-                action.actionPerformed(null);
+-            }
+-        });
+-    }
+-
+-    public boolean isQuitDefined() {
+-        return isQuitDefined;
+-    }
+-
+-    public boolean isAboutDefined() {
+-        return isAboutDefined;
+-    }
+-
+-    public boolean isPreferencesDefined() {
+-        return isPreferencesDefined;
+-    }
+-
+-}
+--- a/src/jloda/gui/commands/MenuCreator.java
++++ b/src/jloda/gui/commands/MenuCreator.java
+@@ -19,7 +19,6 @@
+ */
+ package jloda.gui.commands;
+ 
+-import jloda.gui.AppleStuff;
+ import jloda.gui.IMenuModifier;
+ import jloda.util.MenuMnemonics;
+ import jloda.util.ProgramProperties;
+@@ -146,7 +145,7 @@ public class MenuCreator {
+                         switch (label) {
+                             case "Quit": {
+                                 final Action action = createAction(command);
+-                                AppleStuff.getInstance().setQuitAction(action);
++                                /* AppleStuff.getInstance().setQuitAction(action); */
+                                 if (menu.getItemCount() > 0 && menu.getItem(menu.getItemCount() - 1) == null) {
+                                     skipNextSeparator = true;
+                                 }
+@@ -156,7 +155,7 @@ public class MenuCreator {
+                             case "About":
+                             case "About...": {
+                                 final Action action = createAction(command);
+-                                AppleStuff.getInstance().setAboutAction(action);
++                                /* AppleStuff.getInstance().setAboutAction(action); */
+                                 if (menu.getItemCount() > 0 && menu.getItem(menu.getItemCount() - 1) == null) {
+                                     skipNextSeparator = true;
+                                 }
+@@ -166,7 +165,7 @@ public class MenuCreator {
+                             case "Preferences":
+                             case "Preferences...": {
+                                 final Action action = createAction(command);
+-                                AppleStuff.getInstance().setPreferencesAction(action);
++                                /* AppleStuff.getInstance().setPreferencesAction(action); */
+                                 if (menu.getItemCount() > 0 && menu.getItem(menu.getItemCount() - 1) == null) {
+                                     skipNextSeparator = true;
+                                 }
diff --git a/debian/patches/series b/debian/patches/series
index e5ac080..47d3b6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_build_xml.patch
+remove_applestuff.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libjloda-java.git