Skip to content

Commit a96704e

Browse files
kevinrushforthkevinrushforth
committed
Merge
2 parents 71fa9af + 4d3c723 commit a96704e

File tree

79 files changed

+828
-682
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+828
-682
lines changed

‎build.gradle

+16-4
Original file line numberDiff line numberDiff line change
@@ -1833,7 +1833,10 @@ allprojects {
18331833
repositories {
18341834
ivy {
18351835
url JFX_DEPS_URL
1836-
layout "pattern", {
1836+
metadataSources {
1837+
artifact()
1838+
}
1839+
patternLayout {
18371840
artifact "[artifact]-[revision](-[classifier]).[ext]"
18381841
artifact "[artifact].[ext]"
18391842
}
@@ -1846,7 +1849,10 @@ allprojects {
18461849
mavenCentral()
18471850
ivy {
18481851
url "https://download.eclipse.org/eclipse/updates/4.6/R-4.6.3-201703010400/plugins/"
1849-
layout "pattern", {
1852+
metadataSources {
1853+
artifact()
1854+
}
1855+
patternLayout {
18501856
artifact "[artifact].[ext]"
18511857
}
18521858
}
@@ -1857,13 +1863,19 @@ allprojects {
18571863
repositories {
18581864
ivy {
18591865
url libAVRepositoryURL
1860-
layout "pattern", {
1866+
metadataSources {
1867+
artifact()
1868+
}
1869+
patternLayout {
18611870
artifact "[artifact].[ext]"
18621871
}
18631872
}
18641873
ivy {
18651874
url FFmpegRepositoryURL
1866-
layout "pattern", {
1875+
metadataSources {
1876+
artifact()
1877+
}
1878+
patternLayout {
18671879
artifact "[artifact].[ext]"
18681880
}
18691881
}

‎build.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ jfx.build.jdk.buildnum.min=28
8484
# gradle/legal/gradle.md.
8585
# The jfx.gradle.version.min property defines the minimum version of gradle
8686
# that is supported. It must be <= jfx.gradle.version.
87-
jfx.gradle.version=5.3
87+
jfx.gradle.version=6.0
8888
jfx.gradle.version.min=5.3
8989

9090
# Toolchains
91-
jfx.build.linux.gcc.version=gcc8.2.0-OL6.4+1.0
92-
jfx.build.windows.msvc.version=VS2017-15.9.6+1.0
91+
jfx.build.linux.gcc.version=gcc8.3.0-OL6.4+1.0
92+
jfx.build.windows.msvc.version=VS2017-15.9.16+1.0
9393
jfx.build.macosx.xcode.version=Xcode10.1-MacOSX10.14+1.0
9494

9595
# Build tools

‎buildSrc/build.gradle

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,10 @@ repositories {
6060
if (buildClosed) {
6161
ivy {
6262
url jfxRepositoryURL
63-
layout "pattern", {
63+
metadataSources {
64+
artifact()
65+
}
66+
patternLayout {
6467
artifact "[artifact]-[revision].[ext]"
6568
artifact "[artifact].[ext]"
6669
}

‎gradle/legal/gradle.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Gradle v5.3
1+
## Gradle v6.0
22

33
### Apache 2.0 License
44
```

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanBooleanPropertyBuilder.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ public final class JavaBeanBooleanPropertyBuilder {
6262
private final JavaBeanPropertyBuilderHelper helper = new JavaBeanPropertyBuilderHelper();
6363

6464
/**
65-
* <b>Do not use this constructor.</b> It will be deprecated in the next version. Use {@link #create()} instead.
65+
* @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
6666
*/
67+
@Deprecated(since="14", forRemoval=true)
6768
public JavaBeanBooleanPropertyBuilder() {}
6869

6970
/**

‎modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanDoublePropertyBuilder.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ public final class JavaBeanDoublePropertyBuilder {
6262
private final JavaBeanPropertyBuilderHelper helper = new JavaBeanPropertyBuilderHelper();
6363

6464
/**
65-
* <b>Do not use this constructor.</b> It will be deprecated in the next version. Use {@link #create()} instead.
65+
* @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
6666
*/
67+
@Deprecated(since="14", forRemoval=true)
6768
public JavaBeanDoublePropertyBuilder() {}
6869

6970
/**

‎modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanFloatPropertyBuilder.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ public final class JavaBeanFloatPropertyBuilder {
6262
private JavaBeanPropertyBuilderHelper helper = new JavaBeanPropertyBuilderHelper();
6363

6464
/**
65-
* <b>Do not use this constructor.</b> It will be deprecated in the next version. Use {@link #create()} instead.
65+
* @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
6666
*/
67+
@Deprecated(since="14", forRemoval=true)
6768
public JavaBeanFloatPropertyBuilder() {}
6869

6970
/**

‎modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanIntegerPropertyBuilder.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ public final class JavaBeanIntegerPropertyBuilder {
6262
private JavaBeanPropertyBuilderHelper helper = new JavaBeanPropertyBuilderHelper();
6363

6464
/**
65-
* <b>Do not use this constructor.</b> It will be deprecated in the next version. Use {@link #create()} instead.
65+
* @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
6666
*/
67+
@Deprecated(since="14", forRemoval=true)
6768
public JavaBeanIntegerPropertyBuilder() {}
6869

6970
/**

‎modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanLongPropertyBuilder.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ public final class JavaBeanLongPropertyBuilder {
6262
private JavaBeanPropertyBuilderHelper helper = new JavaBeanPropertyBuilderHelper();
6363

6464
/**
65-
* <b>Do not use this constructor.</b> It will be deprecated in the next version. Use {@link #create()} instead.
65+
* @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
6666
*/
67+
@Deprecated(since="14", forRemoval=true)
6768
public JavaBeanLongPropertyBuilder() {}
6869

6970
/**

‎modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanObjectPropertyBuilder.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ public final class JavaBeanObjectPropertyBuilder<T> {
6464
private JavaBeanPropertyBuilderHelper helper = new JavaBeanPropertyBuilderHelper();
6565

6666
/**
67-
* <b>Do not use this constructor.</b> It will be deprecated in the next version. Use {@link #create()} instead.
67+
* @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
6868
*/
69+
@Deprecated(since="14", forRemoval=true)
6970
public JavaBeanObjectPropertyBuilder() {}
7071

7172
/**

‎modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanStringPropertyBuilder.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ public final class JavaBeanStringPropertyBuilder {
6262
private JavaBeanPropertyBuilderHelper helper = new JavaBeanPropertyBuilderHelper();
6363

6464
/**
65-
* <b>Do not use this constructor.</b> It will be deprecated in the next version. Use {@link #create()} instead.
65+
* @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
6666
*/
67+
@Deprecated(since="14", forRemoval=true)
6768
public JavaBeanStringPropertyBuilder() {}
6869

6970
/**

‎modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanPropertyBuilder.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,12 @@ public final class ReadOnlyJavaBeanBooleanPropertyBuilder {
6060

6161
private final ReadOnlyJavaBeanPropertyBuilderHelper helper = new ReadOnlyJavaBeanPropertyBuilderHelper();
6262

63+
/**
64+
* @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
65+
*/
66+
@Deprecated(since="14", forRemoval=true)
67+
public ReadOnlyJavaBeanBooleanPropertyBuilder() {}
68+
6369
/**
6470
* Create a new instance of {@code ReadOnlyJavaBeanBooleanPropertyBuilder}
6571
*

‎modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanDoublePropertyBuilder.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,12 @@ public final class ReadOnlyJavaBeanDoublePropertyBuilder {
6060

6161
private final ReadOnlyJavaBeanPropertyBuilderHelper helper = new ReadOnlyJavaBeanPropertyBuilderHelper();
6262

63+
/**
64+
* @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
65+
*/
66+
@Deprecated(since="14", forRemoval=true)
67+
public ReadOnlyJavaBeanDoublePropertyBuilder() {}
68+
6369
/**
6470
* Create a new instance of {@code ReadOnlyJavaBeanDoublePropertyBuilder}
6571
*

‎modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatPropertyBuilder.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,12 @@ public final class ReadOnlyJavaBeanFloatPropertyBuilder {
6060

6161
private final ReadOnlyJavaBeanPropertyBuilderHelper helper = new ReadOnlyJavaBeanPropertyBuilderHelper();
6262

63+
/**
64+
* @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
65+
*/
66+
@Deprecated(since="14", forRemoval=true)
67+
public ReadOnlyJavaBeanFloatPropertyBuilder() {}
68+
6369
/**
6470
* Create a new instance of {@code ReadOnlyJavaBeanFloatPropertyBuilder}
6571
*

‎modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerPropertyBuilder.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,12 @@ public final class ReadOnlyJavaBeanIntegerPropertyBuilder {
6060

6161
private final ReadOnlyJavaBeanPropertyBuilderHelper helper = new ReadOnlyJavaBeanPropertyBuilderHelper();
6262

63+
/**
64+
* @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
65+
*/
66+
@Deprecated(since="14", forRemoval=true)
67+
public ReadOnlyJavaBeanIntegerPropertyBuilder() {}
68+
6369
/**
6470
* Create a new instance of {@code ReadOnlyJavaBeanIntegerPropertyBuilder}
6571
*

‎modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanLongPropertyBuilder.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,12 @@ public final class ReadOnlyJavaBeanLongPropertyBuilder {
6060

6161
private final ReadOnlyJavaBeanPropertyBuilderHelper helper = new ReadOnlyJavaBeanPropertyBuilderHelper();
6262

63+
/**
64+
* @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
65+
*/
66+
@Deprecated(since="14", forRemoval=true)
67+
public ReadOnlyJavaBeanLongPropertyBuilder() {}
68+
6369
/**
6470
* Create a new instance of {@code ReadOnlyJavaBeanLongPropertyBuilder}
6571
*

‎modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanObjectPropertyBuilder.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -62,6 +62,12 @@ public final class ReadOnlyJavaBeanObjectPropertyBuilder<T> {
6262

6363
private final ReadOnlyJavaBeanPropertyBuilderHelper helper = new ReadOnlyJavaBeanPropertyBuilderHelper();
6464

65+
/**
66+
* @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
67+
*/
68+
@Deprecated(since="14", forRemoval=true)
69+
public ReadOnlyJavaBeanObjectPropertyBuilder() {}
70+
6571
/**
6672
* Create a new instance of {@code ReadOnlyJavaBeanObjectPropertyBuilder}
6773
*

‎modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanStringPropertyBuilder.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,12 @@ public final class ReadOnlyJavaBeanStringPropertyBuilder {
6060

6161
private final ReadOnlyJavaBeanPropertyBuilderHelper helper = new ReadOnlyJavaBeanPropertyBuilderHelper();
6262

63+
/**
64+
* @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
65+
*/
66+
@Deprecated(since="14", forRemoval=true)
67+
public ReadOnlyJavaBeanStringPropertyBuilder() {}
68+
6369
/**
6470
* Create a new instance of {@code ReadOnlyJavaBeanStringPropertyBuilder}
6571
*

‎modules/javafx.controls/src/test/java/test/javafx/scene/control/ComboBoxTest.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -859,7 +859,7 @@ public void defaultConverterCanHandleIncorrectType_2() {
859859
assertTrue(sm.isSelected(2));
860860
}
861861

862-
@Ignore("Test not working as the heights being returned are not accurate")
862+
@Ignore("JDK-8091127 Test not working as the heights being returned are not accurate")
863863
@Test public void test_rt20106() {
864864
comboBox.getItems().addAll("0","1","2","3","4","5","6","7","8","9");
865865

@@ -948,7 +948,6 @@ public void defaultConverterCanHandleIncorrectType_2() {
948948
assertEquals("TO_STRING", cell.getText());
949949
}
950950

951-
@Ignore
952951
@Test public void test_rt20189() {
953952
comboBox.getItems().addAll("0","1","2","3","4","5","6","7","8","9");
954953

@@ -958,8 +957,6 @@ public void defaultConverterCanHandleIncorrectType_2() {
958957
comboBox.applyCss();
959958
comboBox.show();
960959

961-
SelectionModel sm = getListView().getSelectionModel();
962-
963960
comboBox.getSelectionModel().select(2);
964961
Object item = sm.getSelectedItem();
965962
assertEquals("2", item);
@@ -1200,7 +1197,6 @@ public void defaultConverterCanHandleIncorrectType_2() {
12001197
}
12011198

12021199
private int test_rt34603_count = 0;
1203-
@Ignore("Bug has not yet been resolved")
12041200
@Test public void test_rt34603() {
12051201
assertEquals(0, test_rt34603_count);
12061202

‎modules/javafx.controls/src/test/java/test/javafx/scene/control/HyperlinkTest.java

+1-25
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,6 @@
4747
import javafx.scene.shape.Rectangle;
4848

4949
import org.junit.Before;
50-
import org.junit.Ignore;
5150
import org.junit.Test;
5251

5352
public class HyperlinkTest {
@@ -176,29 +175,6 @@ public class HyperlinkTest {
176175
}
177176
}
178177

179-
@Ignore ("replaced by visitedPropertyIsNotStyleable")
180-
@Test public void whenVisitedIsBound_impl_cssSettable_ReturnsFalse() {
181-
// will return null!
182-
CssMetaData styleable = ((StyleableProperty)link.visitedProperty()).getCssMetaData();
183-
assertFalse(styleable.isSettable(link));
184-
BooleanProperty other = new SimpleBooleanProperty(true);
185-
link.visitedProperty().bind(other);
186-
}
187-
188-
@Ignore ("replaced by visitedPropertyIsNotStyleable")
189-
@Test public void whenVisitedIsSpecifiedViaCSSAndIsNotBound_impl_cssSettable_ReturnsFalse() {
190-
// will return null!
191-
CssMetaData styleable = ((StyleableProperty)link.visitedProperty()).getCssMetaData();
192-
assertFalse(styleable.isSettable(link));
193-
}
194-
195-
@Ignore ("replaced by visitedPropertyIsNotStyleable")
196-
@Test public void cannotSpecifyVisitedViaCSS() {
197-
// will return null!
198-
((StyleableProperty)link.visitedProperty()).applyStyle(null, Boolean.TRUE);
199-
assertFalse(link.isVisited());
200-
}
201-
202178
@Test public void settingVisitedSetsPseudoClass() {
203179
link.setVisited(true);
204180
assertPseudoClassExists(link, "visited");

0 commit comments

Comments
 (0)