From d37ef234157246c1d40c73e0973c4a1d67c06170 Mon Sep 17 00:00:00 2001 From: SAPONE Alann Date: Fri, 5 May 2017 10:55:27 +0200 Subject: [PATCH] send mail corrected --- .../org/cnrs/lam/dis/etc/ui/swing/EtcFrame.java | 6 ++++-- .../lam/dis/etc/ui/swing/help/AboutDialog.java | 8 +++----- .../lam/dis/etc/ui/swing/help/UtilsLoader.java | 14 ++++++++++---- keystore | Bin 0 -> 1351 bytes 4 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 keystore diff --git a/ETC-UI/src/main/java/org/cnrs/lam/dis/etc/ui/swing/EtcFrame.java b/ETC-UI/src/main/java/org/cnrs/lam/dis/etc/ui/swing/EtcFrame.java index a9db644..6f61836 100644 --- a/ETC-UI/src/main/java/org/cnrs/lam/dis/etc/ui/swing/EtcFrame.java +++ b/ETC-UI/src/main/java/org/cnrs/lam/dis/etc/ui/swing/EtcFrame.java @@ -62,6 +62,9 @@ import javax.swing.JOptionPane; import javax.swing.JScrollPane; import javax.swing.JSeparator; import javax.swing.JTextField; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; + import org.apache.log4j.Logger; import org.cnrs.lam.cesam.vo.dnd.VoTable1DHelper; import org.cnrs.lam.dis.etc.configuration.ConfigFactory; @@ -80,7 +83,6 @@ import org.cnrs.lam.dis.etc.ui.SampListener; import org.cnrs.lam.dis.etc.ui.SessionListener; import org.cnrs.lam.dis.etc.ui.SiteListener; import org.cnrs.lam.dis.etc.ui.SourceListener; -import org.cnrs.lam.dis.etc.ui.UIManager; import org.cnrs.lam.dis.etc.ui.generic.BuisnessListenerHolder; import org.cnrs.lam.dis.etc.ui.generic.DatasetListenerHolder; import org.cnrs.lam.dis.etc.ui.generic.InfoProviderHolder; @@ -109,7 +111,7 @@ import org.json.JSONObject; * * @author Nikolaos Apostolakos */ -public class EtcFrame extends javax.swing.JFrame implements UIManager { +public class EtcFrame extends javax.swing.JFrame implements org.cnrs.lam.dis.etc.ui.UIManager { /** * diff --git a/ETC-UI/src/main/java/org/cnrs/lam/dis/etc/ui/swing/help/AboutDialog.java b/ETC-UI/src/main/java/org/cnrs/lam/dis/etc/ui/swing/help/AboutDialog.java index 3d6ef8d..6b2eed5 100644 --- a/ETC-UI/src/main/java/org/cnrs/lam/dis/etc/ui/swing/help/AboutDialog.java +++ b/ETC-UI/src/main/java/org/cnrs/lam/dis/etc/ui/swing/help/AboutDialog.java @@ -147,17 +147,15 @@ public class AboutDialog extends HelpDialog { Font fontContact = contactLabel.getFont(); Font boldFontContact = new Font(fontContact.getFontName(), Font.BOLD, fontContact.getSize()); contactLabel.setFont(boldFontContact); - String contactURL = ""+ CONTACT_URL +""; + String contactURL = ""+ CONTACT_URL +""; JLabel contactUrlLabel = new JLabel(contactURL); contactUrlLabel.setAlignmentX(LEFT_ALIGNMENT); contactUrlLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); contactUrlLabel.addMouseListener(new MouseAdapter() { - public void mouseClicked(MouseEvent e) + public void mouseClicked(MouseEvent evt) { - try { - UtilsLoader.openMail(new URL(CONTACT_URL)); - } catch (MalformedURLException e1) {} + UtilsLoader.openMail(CONTACT_URL); } }); diff --git a/ETC-UI/src/main/java/org/cnrs/lam/dis/etc/ui/swing/help/UtilsLoader.java b/ETC-UI/src/main/java/org/cnrs/lam/dis/etc/ui/swing/help/UtilsLoader.java index 0bcac03..090575d 100644 --- a/ETC-UI/src/main/java/org/cnrs/lam/dis/etc/ui/swing/help/UtilsLoader.java +++ b/ETC-UI/src/main/java/org/cnrs/lam/dis/etc/ui/swing/help/UtilsLoader.java @@ -16,10 +16,16 @@ public class UtilsLoader { } } - public static void openMail(URL url) { - try { - Desktop.getDesktop().mail(new URI("mailto:" + url + "?subject=ETC-42")); - } catch (IOException | URISyntaxException e) {} + public static void openMail(String urlString) { + System.out.println(urlString); + Desktop desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null; + if (desktop != null && desktop.isSupported(Desktop.Action.MAIL)) { + try { + Desktop.getDesktop().mail(new URI("mailto:" + urlString + "?subject=ETC-42")); + } catch (IOException | URISyntaxException e) { + System.out.println(e.getMessage()); + } + } } public static void openWebpage(URL url) { diff --git a/keystore b/keystore new file mode 100644 index 0000000000000000000000000000000000000000..974e9700cc247adbed3b0cc6c9b36e9e583eeb07 GIT binary patch literal 1351 zcmezO_TO6u1_mY|W&~r7?9|HQlKi4npg{EX0}nWWbiY9pW48ex8<#d4BMYMzlOQ7_ zD+5atWBI2;)%UEfXDU77x_Rwfcdx?oXi>Ymx4)czzu*?y{8hm-bWTv^g1-lreTiH6 zO;_!+ZZ2!!uN}N5dBT6$8pJLw5BdCTSM_(*sw-<}+`g1)cv}3_#N*i;<=Jfvo4FbH zuwIT)dAn)ChWlv;x&m$dj$Eu>mmP4s`QMJ~pWoQagbMLJIl1$3aJ3^3W9H8#=T^I% zDt^NlZLD;#eWR3w#^Ie$JI{jGn={RHMqHVpR5|&Q_?r|Il{I|kvs{Db&Y{yv^$9F3IIXERI-RRrZ376`4 zZtVFXdM93WQ(^S7y0ETov8{)EuZmpB4LIl<|M})M=}WUjm+!g5*^>E{>Ga}n^>2^u ziQG5;wOjoo_MMuS=WChpu+C2?73i5Gy_hfVN9=-Fzpm0K9cz32h%kqJ>Rz1sva93& z7|T38yl%RS{+s$mKEbCNH75V*s&;8+bKsw%aPd-N)WQr-hiGs_u}0{b8dx$gFy|XI zF=qp@<^pCWMkXc}?hl&Z47l0Ywc0$+S+Fp(G8iGEzIGPTBcBvnwV?IW55LxVisohar8Bi6X!KFH!uZ4 z3u7~5<0vrK!oV2H9Xt+gV%z~t^E$9VWCU{LnHn1z{?-RK%9aXg2Hp3Xqxa^?^KXLN zgKXZrFdUY%Z`c;7mgySnpcME!(zZ9^*Z!klcNu&;Jv%h#dZTrNtV#Z-w1n;1GXs_` znLqypOSOQ~A^+Vgum9VAO!|j)`14~cmWlGS{BHhs`Ka7sCesk%D6xq~-%3BP(@wmu z_5PC*v*g^19*oDCL>ZQ_-Kd;Z$Hmz)N^9l zLmRQG?vR>ZjR%X@$!Tw1Ryr|naXt4hMbo5@zmuvMRjkh}`M7UI;DpW<&G#QhJ)O@s zsXHyMp*mDGh0(|Q-+50h=EhbAkUQ>VX`I~_|L*v|NLQ9gEnZQ3ir&0?x2+)O>&A&p z+)eYfg!VgR`nR5{{PmmBQxP7C6$aj)}JFExBKUF6KigL5VC&HN`7)wJJS8+U$KvCc4>U+mdvoPYS#|rhgLM~lwKOWG?UlV5 N%UJYi<^OV