[med-svn] [megan-ce] 02/02: Since we are using packaging system checking for new upstream versions is suppressed - so we can avoid packaging com.install4j.api

[Andreas Tille]

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

tille pushed a commit to branch master
in repository megan-ce.

commit b1fff02b66b52cc8912390cb90b2cab41abf7ec6
Author: Andreas Tille <tille at debian.org>
Date:   Mon May 22 10:15:42 2017 +0200

    Since we are using packaging system checking for new upstream versions is suppressed - so we can avoid packaging com.install4j.api
---
 debian/patches/do_not_check_for_update.patch | 61 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 2 files changed, 62 insertions(+)

diff --git a/debian/patches/do_not_check_for_update.patch b/debian/patches/do_not_check_for_update.patch
new file mode 100644
index 0000000..be64d98
--- /dev/null
+++ b/debian/patches/do_not_check_for_update.patch
@@ -0,0 +1,61 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sat, 20 May 2017 19:36:42 +0200
+Description: Since we are using packaging system checking for new
+ upstream versions is suppressed - so we can avoid packaging com.install4j.api
+
+--- a/src/megan/commands/show/ShowCheckForUpdateCommand.java
++++ b/src/megan/commands/show/ShowCheckForUpdateCommand.java
+@@ -19,11 +19,6 @@
+ package megan.commands.show;
+ 
+ 
+-import com.install4j.api.launcher.ApplicationLauncher;
+-import com.install4j.api.update.ApplicationDisplayMode;
+-import com.install4j.api.update.UpdateChecker;
+-import com.install4j.api.update.UpdateDescriptor;
+-import com.install4j.api.update.UpdateDescriptorEntry;
+ import jloda.gui.commands.CommandBase;
+ import jloda.gui.commands.ICommand;
+ import jloda.gui.director.IDirector;
+@@ -89,41 +84,6 @@ public class ShowCheckForUpdateCommand e
+      */
+     @Override
+     public void apply(NexusStreamParser np) throws Exception {
+-        np.matchIgnoreCase(getSyntax());
+-
+-        ApplicationDisplayMode applicationDisplayMode = ProgramProperties.isUseGUI() ? ApplicationDisplayMode.GUI : ApplicationDisplayMode.CONSOLE;
+-        UpdateDescriptor updateDescriptor;
+-        try {
+-            updateDescriptor = UpdateChecker.getUpdateDescriptor("http://www-ab.informatik.uni-tuebingen.de/data/software/megan6/download/updates.xml", applicationDisplayMode);
+-        } catch (Exception e) {
+-            Basic.caught(e);
+-            NotificationsInSwing.showInformation(MainViewer.getLastActiveFrame(), "Installed version is up-to-date");
+-            return;
+-        }
+-        if (updateDescriptor.getEntries().length > 0) {
+-            if (!ProgramProperties.isUseGUI()) {
+-                UpdateDescriptorEntry entry = updateDescriptor.getEntries()[0];
+-                NotificationsInSwing.showInformation(MainViewer.getLastActiveFrame(), "New version available: " + entry.getNewVersion()
+-                        + "\nPlease download from: http://www-ab.informatik.uni-tuebingen.de/data/software/megan6/download/");
+-                return;
+-            }
+-        } else {
+-            NotificationsInSwing.showInformation(MainViewer.getLastActiveFrame(), "Installed version is up-to-date");
+-            return;
+-        }
+-
+-
+-        // This will return immediately if you call it from the EDT,
+-// otherwise it will block until the installer application exits
+-        ApplicationLauncher.launchApplicationInProcess("1691242905", null, new ApplicationLauncher.Callback() {
+-            public void exited(int exitValue) {
+-                //TODO add your code here (not invoked on event dispatch thread)
+-            }
+-
+-            public void prepareShutdown() {
+-                ProgramProperties.store();
+-            }
+-        }, ApplicationLauncher.WindowMode.FRAME, null);
+     }
+ 
+     /**
diff --git a/debian/patches/series b/debian/patches/series
index d470938..fa75cab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ use_debian_packaged_jloda.patch
 ignore_malt_source_for_the_moment.patch
 skip_server_jars.patch
 fix_class_path.patch
+do_not_check_for_update.patch

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