From 2b2e950ffa5327bef0c977325a85252e0ea7c24f Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Wed, 4 Feb 2015 14:43:08 +0200
Subject: [PATCH] Fixes jitsi string and java download location.

---
 .../communicator/launcher/ChangeJVMFrame.java    | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/net/java/sip/communicator/launcher/ChangeJVMFrame.java b/src/net/java/sip/communicator/launcher/ChangeJVMFrame.java
index bd001691e..102e603ed 100644
--- a/src/net/java/sip/communicator/launcher/ChangeJVMFrame.java
+++ b/src/net/java/sip/communicator/launcher/ChangeJVMFrame.java
@@ -45,17 +45,11 @@ public class ChangeJVMFrame
     private JEditorPane javaLinkPane = new JEditorPane();
 
     private String text = "Sorry. Your Java version is too old. The minimum"
-        + " Java version required is 1.5. Please folow the link below to install"
+        + " Java version required is 1.6. Please folow the link below to install"
         + " the newest version for your environment.";
 
-    private String macLink
-        = "<a href=\"http://www.apple.com/downloads/macosx/apple/application_updates/" +
-          "javaformacosx104release9.html\">Download Java 1.5 for MacOSX</a>";
-
-    private String defaultLink
-        = "<a href=\"https://cds.sun.com/is-bin/INTERSHOP.enfinity/" +
-        "WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?" +
-        "ProductRef=jre-6u18-oth-JPR@CDS-CDS_Developer\">Download Java 1.6</a>";
+    private String defaultLink = "<a href=\"https://www.java.com/inc/"
+        + "BrowserRedirect1.jsp?locale=en\">Download Java</a>";
 
     private JPanel mainPanel = new JPanel(new BorderLayout());
 
@@ -69,7 +63,7 @@ public ChangeJVMFrame(String osName)
     {
         this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
-        this.setTitle("SIP Communicator requirements");
+        this.setTitle("Jitsi requirements");
 
         this.mainPanel.setPreferredSize(
             new Dimension(450, 150));
@@ -87,7 +81,7 @@ public ChangeJVMFrame(String osName)
         this.javaLinkPane.setContentType("text/html");
         this.javaLinkPane.setEditable(false);
 
-        this.javaLinkPane.setText(osName.equals(MAC_OSX) ? macLink : defaultLink);
+        this.javaLinkPane.setText(defaultLink);
 
         this.javaLinkPane.addHyperlinkListener(new HyperlinkListener()
         {