Skip to content

Commit

Permalink
8213837: FX samples cannot load media from download.java.net over http
Browse files Browse the repository at this point in the history
Reviewed-by: mbilla
  • Loading branch information
kcr committed Nov 14, 2018
1 parent 944beb0 commit 0caef26
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2016, Oracle and/or its affiliates.
* Copyright (c) 2008, 2018, Oracle and/or its affiliates.
* All rights reserved. Use is subject to license terms.
*
* This file is available and licensed under the following license:
Expand Down Expand Up @@ -67,7 +67,7 @@ public class AudioAreaChartApp extends Application {
private XYChart.Data<Number, Number>[] series1Data;
private AudioSpectrumListener audioSpectrumListener;
private static final String AUDIO_URI = System.getProperty("demo.audio.url",
"http://download.oracle.com/otndocs/javafx/JavaRap_Audio.mp4");
"https://download.oracle.com/otndocs/javafx/JavaRap_Audio.mp4");
private MediaPlayer audioMediaPlayer;
private static final boolean PLAY_AUDIO = Boolean.parseBoolean(
System.getProperty("demo.play.audio", "true"));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2016, Oracle and/or its affiliates.
* Copyright (c) 2008, 2018, Oracle and/or its affiliates.
* All rights reserved. Use is subject to license terms.
*
* This file is available and licensed under the following license:
Expand Down Expand Up @@ -72,7 +72,7 @@ public class AudioBarChartApp extends Application {
private AudioSpectrumListener audioSpectrumListener;
private static final String AUDIO_URI =
System.getProperty("demo.audio.url",
"http://download.oracle.com/otndocs/products/javafx/oow2010-2.mp4");
"https://download.oracle.com/otndocs/products/javafx/oow2010-2.mp4");
private MediaPlayer audioMediaPlayer;
private static final boolean PLAY_AUDIO = Boolean.parseBoolean(
System.getProperty("demo.play.audio", "true"));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2016, Oracle and/or its affiliates.
* Copyright (c) 2008, 2018, Oracle and/or its affiliates.
* All rights reserved. Use is subject to license terms.
*
* This file is available and licensed under the following license:
Expand Down Expand Up @@ -55,7 +55,7 @@
public class AdvancedMediaApp extends Application {

private static final String MEDIA_URL =
"http://download.oracle.com/otndocs/products/javafx/oow2010-2.mp4";
"https://download.oracle.com/otndocs/products/javafx/oow2010-2.mp4";

private MediaPlayer mediaPlayer;
private MediaControl mediaControl;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2016, Oracle and/or its affiliates.
* Copyright (c) 2008, 2018, Oracle and/or its affiliates.
* All rights reserved. Use is subject to license terms.
*
* This file is available and licensed under the following license:
Expand Down Expand Up @@ -60,7 +60,7 @@ public class OverlayMediaPlayerApp extends Application {

public Parent createContent() {
final String MEDIA_URL =
"http://download.oracle.com/otndocs/javafx/" +
"https://download.oracle.com/otndocs/javafx/" +
"JavaRap_ProRes_H264_768kbit_Widescreen.mp4";
final String overlayMediaPlayerCss =
getClass().getResource("OverlayMediaPlayer.css").toExternalForm();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2016, Oracle and/or its affiliates.
* Copyright (c) 2008, 2018, Oracle and/or its affiliates.
* All rights reserved. Use is subject to license terms.
*
* This file is available and licensed under the following license:
Expand Down Expand Up @@ -59,7 +59,7 @@ public class StreamingMediaPlayerApp extends Application {

public Parent createContent() {
final String MEDIA_URL =
"http://download.oracle.com/otndocs/javafx/" +
"https://download.oracle.com/otndocs/javafx/" +
"JavaRap_ProRes_H264_768kbit_Widescreen.mp4";
final String streamingMediaPlayerCss =
getClass().getResource("StreamingMediaPlayer.css").toExternalForm();
Expand Down
4 changes: 2 additions & 2 deletions apps/toys/Hello/src/main/java/hello/HelloMedia.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -45,7 +45,7 @@

public class HelloMedia extends Application {
private static final String DEFAULT_SOURCE =
"http://download.oracle.com/otndocs/products/javafx/oow2010-2.mp4";
"https://download.oracle.com/otndocs/products/javafx/oow2010-2.mp4";
private static String argSource = null;

@Override
Expand Down

0 comments on commit 0caef26

Please sign in to comment.