From 7a58a4df05a8cef484ebe7e34455aea1bf165937 Mon Sep 17 00:00:00 2001 From: skylarmt Date: Tue, 28 Apr 2015 16:11:53 -0600 Subject: [PATCH] Better update download handling --- nbproject/project.properties | 18 +++++++++++++++++- src/net/apocalypselabs/symat/Update.form | 2 +- src/net/apocalypselabs/symat/Update.java | 10 +++------- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index 8a69514..0a320f8 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -3,8 +3,9 @@ annotation.processing.enabled.in.editor=false annotation.processing.processors.list= annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output +application.desc=Teach, learn, and use math and programming skills with SyMAT. application.homepage=https://symatapp.com/ -application.splash=C:\\Users\\Skylar\\Documents\\Apocalypse Labs\\appmedia\\SyMAT\\SyMAT-splash-2-preload.png +application.splash=C:\\Users\\Skylar\\Documents\\Apocalypse Labs\\appmedia\\SyMAT\\splashscreen.png application.title=SyMAT application.vendor=Apocalypse Laboratories auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml @@ -50,7 +51,9 @@ file.reference.SyMAT-src=src file.reference.symja-2014-11-01.jar=lib/symja-2014-11-01.jar file.reference.trident-6.3.jar=lib/trident-6.3.jar includes=** +jar.archive.disabled=${jnlp.enabled} jar.compress=false +jar.index=${jnlp.enabled} javac.classpath=\ ${file.reference.autocomplete-2.5.4.jar}:\ ${file.reference.beautyeye_lnf.jar}:\ @@ -92,7 +95,20 @@ javadoc.splitindex=true javadoc.use=true javadoc.version=false javadoc.windowtitle= +jnlp.codebase.type=no.codebase +jnlp.descriptor=application +jnlp.enabled=false +jnlp.mixed.code=default +jnlp.offline-allowed=false +jnlp.signed=false +jnlp.signing= +jnlp.signing.alias= +jnlp.signing.keystore= main.class=net.apocalypselabs.symat.Main +# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed +manifest.custom.codebase= +# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions) +manifest.custom.permissions= manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF mkdist.disabled=false diff --git a/src/net/apocalypselabs/symat/Update.form b/src/net/apocalypselabs/symat/Update.form index 2a49dbe..4f26582 100644 --- a/src/net/apocalypselabs/symat/Update.form +++ b/src/net/apocalypselabs/symat/Update.form @@ -133,4 +133,4 @@ - \ No newline at end of file + diff --git a/src/net/apocalypselabs/symat/Update.java b/src/net/apocalypselabs/symat/Update.java index df06d1c..9db3265 100644 --- a/src/net/apocalypselabs/symat/Update.java +++ b/src/net/apocalypselabs/symat/Update.java @@ -162,13 +162,9 @@ public class Update extends javax.swing.JInternalFrame { }// //GEN-END:initComponents private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed - if (Desktop.isDesktopSupported()) { - try { - Desktop.getDesktop().browse(new URI("http://symatapp.com/")); - } catch (IOException | URISyntaxException ex) { - JOptionPane.showInternalMessageDialog(this, "Cannot open browser. Please go to symatapp.com."); - } - } else { + try { + Desktop.getDesktop().browse(new URI(Main.API_URL + "dllink.php")); + } catch (Exception ex) { JOptionPane.showInternalMessageDialog(this, "Cannot open browser. Please go to symatapp.com."); } }//GEN-LAST:event_jButton1ActionPerformed