Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@kevinrushforth
kevinrushforth committed Dec 13, 2024
2 parents a3df49f + c5a9839 commit f2e40f0
Show file tree
Hide file tree
Showing 476 changed files with 2,289 additions and 2,365 deletions.
2 changes: 1 addition & 1 deletion apps/samples/3DViewer/src/main/java/com/javafx/experiments/importers/maya/Loader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ protected void processMeshType(MNode n, Group parentNode) throws RuntimeExceptio
mv.setId(n.getName());
mv.setMaterial(material);

// // TODO HACK for [JIRA] (RT-30449) FX 8 3D: Need to handle mirror transformation (flip culling);
// // TODO HACK for [JIRA] (JDK-8120494) FX 8 3D: Need to handle mirror transformation (flip culling);
// mv.setCullFace(CullFace.FRONT);

mv.setMesh((TriangleMesh) mesh);
Expand Down
4 changes: 2 additions & 2 deletions apps/samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/ContentModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,8 @@ else if (event.isAltDown()) {

public ContentModel() {
// CAMERA
camera.setNearClip(1.0); // TODO: Workaround as per RT-31255
camera.setFarClip(10000.0); // TODO: Workaround as per RT-31255
camera.setNearClip(1.0); // TODO: Workaround as per JDK-8118078
camera.setFarClip(10000.0); // TODO: Workaround as per JDK-8118078

camera.getTransforms().addAll(
yUpRotate,
Expand Down
2 changes: 1 addition & 1 deletion apps/samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/MainController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public class MainController implements Initializable {
}
}
if (supportedFile!=null) {
// workaround for RT-30195
// workaround for JDK-8119860
if (supportedFile.getAbsolutePath().indexOf('%') != -1) {
supportedFile = new File(URLDecoder.decode(supportedFile.getAbsolutePath()));
}
Expand Down
2 changes: 1 addition & 1 deletion apps/samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SimpleViewerApp.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public class SimpleViewerApp extends Application {
stage.show();

// MEASURE FPS
//TODO: RT-40270 - Public PerformanceTracker support should be added
//TODO: JDK-8091546 - Public PerformanceTracker support should be added
// Timeline fpsTimeline = new Timeline(new KeyFrame(Duration.seconds(2), t ->
// System.out.println("fps = " + PerformanceTracker.getSceneTracker(scene).getInstantFPS())));
// fpsTimeline.setCycleCount(Timeline.INDEFINITE);
Expand Down
4 changes: 2 additions & 2 deletions apps/samples/3DViewer/src/main/java/com/javafx/experiments/shape3d/PolygonMeshView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ private void updateMesh() {
if(isWireframe) {
// The current triangleMesh implementation gives buggy behavior when the size of faces are shrunken
// Create a new TriangleMesh as a work around
// [JIRA] (RT-31178)
// [JIRA] (JDK-8117423)
if (texCoordsDirty || facesDirty || pointsSizeDirty) {
triangleMesh = new TriangleMesh();
pointsDirty = pointsSizeDirty = texCoordsDirty = facesDirty = true; // to fill in the new triangle mesh
Expand Down Expand Up @@ -340,7 +340,7 @@ private void updateMesh() {
} else {
// The current triangleMesh implementation gives buggy behavior when the size of faces are shrunken
// Create a new TriangleMesh as a work around
// [JIRA] (RT-31178)
// [JIRA] (JDK-8117423)
if (texCoordsDirty || facesDirty || pointsSizeDirty) {
triangleMesh = new TriangleMesh();
pointsDirty = pointsSizeDirty = texCoordsDirty = facesDirty = true; // to fill in the new triangle mesh
Expand Down
4 changes: 2 additions & 2 deletions apps/samples/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/BaseBounds.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public static enum BoundsType {

public abstract BaseBounds deriveWithUnion(BaseBounds other);

// TODO: Add variants of deriveWithNewBounds such as pair of Vec* (RT-26886)
// TODO: Add variants of deriveWithNewBounds such as pair of Vec* (JDK-8092361)
public abstract BaseBounds deriveWithNewBounds(Rectangle other);

public abstract BaseBounds deriveWithNewBounds(BaseBounds other);
Expand Down Expand Up @@ -145,7 +145,7 @@ public abstract void setBoundsAndSort(float minX, float minY, float minZ,
float maxX, float maxY, float maxZ);

// TODO: obsolete add and replace with deriveWithUnion(Vec2f v) and deriveWithUnion(Vec3f v)
// (RT-26886)
// (JDK-8092361)
public abstract void add(Point2D p);

public abstract void add(float x, float y, float z);
Expand Down
4 changes: 2 additions & 2 deletions ...amples/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/transform/Affine2D.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ public void setTransform(BaseTransform Tx) {
System.out.print(", " + Tx.getMzt());
System.out.println();
// TODO: Should this be thrown before we modify anything?
// (RT-26801)
// (JDK-8091010)
degreeError(Degree.AFFINE_2D);
}
/* No Break */
Expand Down Expand Up @@ -1399,7 +1399,7 @@ public BaseTransform deriveWithPreTranslation(double mxt, double myt) {
public BaseTransform deriveWithConcatenation(double mxx, double myx,
double mxy, double myy,
double mxt, double myt) {
// TODO: Simplify this (RT-26801)
// TODO: Simplify this (JDK-8091010)
BaseTransform tmpTx = getInstance(mxx, myx,
mxy, myy,
mxt, myt);
Expand Down
22 changes: 11 additions & 11 deletions ...amples/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/transform/Affine3D.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ public BaseBounds transform(BaseBounds src, BaseBounds dst) {
switch (state) {
default:
/* NOBREAK */
// TODO: Optimize these cases ... (RT-26800)
// TODO: Optimize these cases ... (JDK-8091788)
case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
/* NOBREAK */
case (APPLY_SHEAR | APPLY_SCALE):
Expand Down Expand Up @@ -433,7 +433,7 @@ public void inverseTransform(float[] srcPts, int srcOff,
if ((state & APPLY_3D) == 0) {
super.inverseTransform(srcPts, srcOff, dstPts, dstOff, numPts);
} else {
// TODO: Optimize... (RT-26800)
// TODO: Optimize... (JDK-8091788)
createInverse().transform(srcPts, srcOff, dstPts, dstOff, numPts);
}
}
Expand All @@ -446,7 +446,7 @@ public void inverseDeltaTransform(float[] srcPts, int srcOff,
if ((state & APPLY_3D) == 0) {
super.inverseDeltaTransform(srcPts, srcOff, dstPts, dstOff, numPts);
} else {
// TODO: Optimize... (RT-26800)
// TODO: Optimize... (JDK-8091788)
createInverse().deltaTransform(srcPts, srcOff, dstPts, dstOff, numPts);
}
}
Expand All @@ -459,7 +459,7 @@ public void inverseTransform(double[] srcPts, int srcOff,
if ((state & APPLY_3D) == 0) {
super.inverseTransform(srcPts, srcOff, dstPts, dstOff, numPts);
} else {
// TODO: Optimize... (RT-26800)
// TODO: Optimize... (JDK-8091788)
createInverse().transform(srcPts, srcOff, dstPts, dstOff, numPts);
}
}
Expand All @@ -470,7 +470,7 @@ public Point2D inverseTransform(Point2D src, Point2D dst)
if ((state & APPLY_3D) == 0) {
return super.inverseTransform(src, dst);
} else {
// TODO: Optimize... (RT-26800)
// TODO: Optimize... (JDK-8091788)
return createInverse().transform(src, dst);
}
}
Expand All @@ -481,7 +481,7 @@ public Vec3d inverseTransform(Vec3d src, Vec3d dst)
if ((state & APPLY_3D) == 0) {
return super.inverseTransform(src, dst);
} else {
// TODO: Optimize... (RT-26800)
// TODO: Optimize... (JDK-8091788)
return createInverse().transform(src, dst);
}
}
Expand All @@ -492,7 +492,7 @@ public Vec3d inverseDeltaTransform(Vec3d src, Vec3d dst)
if ((state & APPLY_3D) == 0) {
return super.inverseDeltaTransform(src, dst);
} else {
// TODO: Optimize... (RT-26800)
// TODO: Optimize... (JDK-8091788)
return createInverse().deltaTransform(src, dst);
}
}
Expand All @@ -503,7 +503,7 @@ public BaseBounds inverseTransform(BaseBounds bounds, BaseBounds result)
if ((state & APPLY_3D) == 0) {
result = super.inverseTransform(bounds, result);
} else {
// TODO: Optimize... (RT-26800)
// TODO: Optimize... (JDK-8091788)
result = createInverse().transform(bounds, result);
}
return result;
Expand All @@ -515,7 +515,7 @@ public void inverseTransform(Rectangle bounds, Rectangle result)
if ((state & APPLY_3D) == 0) {
super.inverseTransform(bounds, result);
} else {
// TODO: Optimize... (RT-26800)
// TODO: Optimize... (JDK-8091788)
createInverse().transform(bounds, result);
}
}
Expand Down Expand Up @@ -543,7 +543,7 @@ public void invert()
// which generates {0, 0, 0, 1} and so can be ignored.

// TODO: Inlining the minor calculations should allow them
// to be simplified... (RT-26800)
// to be simplified... (JDK-8091788)
double cxx = minor(0, 0);
double cyx = -minor(0, 1);
double czx = minor(0, 2);
Expand Down Expand Up @@ -741,7 +741,7 @@ public void scale(double sx, double sy, double sz) {
this.mzy *= sy;
this.mzz *= sz;

// TODO: Optimize the state... (RT-26800)
// TODO: Optimize the state... (JDK-8091788)
updateState();
}

Expand Down
8 changes: 4 additions & 4 deletions ...ples/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/transform/AffineBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ protected void updateState2D() {
@Override
public int getType() {
if (type == TYPE_UNKNOWN) {
updateState(); // TODO: Is this really needed? (RT-26884)
updateState(); // TODO: Is this really needed? (JDK-8092003)
if (type == TYPE_UNKNOWN) {
type = calculateType();
}
Expand Down Expand Up @@ -1007,7 +1007,7 @@ public void transform(Rectangle src, Rectangle dst) {
case (APPLY_SCALE | APPLY_TRANSLATE):
case (APPLY_SCALE):
RectBounds b = new RectBounds(src);
//TODO: Need to verify that this is a safe cast ... (RT-26885)
//TODO: Need to verify that this is a safe cast ... (JDK-8092066)
b = (RectBounds) transform(b, b);
dst.setBounds(b);
return;
Expand Down Expand Up @@ -2003,7 +2003,7 @@ public void inverseTransform(Rectangle src, Rectangle dst)
case (APPLY_SCALE | APPLY_TRANSLATE):
case (APPLY_SCALE):
RectBounds b = new RectBounds(src);
//TODO: Need to verify this casting is safe .... (RT-26885)
//TODO: Need to verify this casting is safe .... (JDK-8092066)
b = (RectBounds) inverseTransform(b, b);
dst.setBounds(b);
return;
Expand Down Expand Up @@ -2748,7 +2748,7 @@ public void concatenate(BaseTransform Tx) {
// For now, there is no other kind of transform that will get
// here so we are already essentially optimal, but if we have
// a different type of transform that reaches here we should
// try to avoid this garbage... (RT-26884)
// try to avoid this garbage... (JDK-8092003)
if (!(Tx instanceof AffineBase)) {
Tx = new Affine2D(Tx);
}
Expand Down
2 changes: 1 addition & 1 deletion ...3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/transform/TransformHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public static BaseBounds general3dBoundsTransform(CanTransformVec3d tx, BaseBoun
double srcMaxY = src.getMaxY();
double srcMaxZ = src.getMaxZ();

// TODO: Optimize... (RT-26884)
// TODO: Optimize... (JDK-8092003)
tempV3d.set(srcMaxX, srcMaxY, srcMaxZ);
tempV3d = tx.transform(tempV3d, tempV3d);
double minX = tempV3d.x;
Expand Down
2 changes: 1 addition & 1 deletion ...Ensemble8/src/samples/java/ensemble/samples/controls/button/pillbutton/PillButtonApp.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public Parent createContent() {

// enforce rule that one of the ToggleButtons must be selected at any
// time (that is, it is not valid to have zero ToggleButtons selected).
// (Fix for RT-34920 that considered this to be a bug)
// (Fix for JDK-8097504 that considered this to be a bug)
final ChangeListener<Toggle> listener =
(ObservableValue<? extends Toggle> observable,
Toggle old, Toggle now) -> {
Expand Down
2 changes: 1 addition & 1 deletion ...amples/Ensemble8/src/samples/java/ensemble/samples/controls/htmleditor/HTMLEditorApp.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public Parent createContent() {

ScrollPane htmlSP = new ScrollPane();
htmlSP.setFitToWidth(true);
htmlSP.setPrefWidth(htmlEditor.prefWidth(-1)); // Workaround of RT-21495
htmlSP.setPrefWidth(htmlEditor.prefWidth(-1)); // Workaround of JDK-8096877
htmlSP.setPrefHeight(245);
htmlSP.setVbarPolicy(ScrollBarPolicy.NEVER);
htmlSP.setContent(htmlEditor);
Expand Down
3 changes: 1 addition & 2 deletions apps/samples/Modena/src/main/java/modena/Modena.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public void restart() {
// scene.getStylesheets().add(testAppCssUrl);
stage.setScene(scene);
stage.setTitle("Modena");
// stage.setIconified(test); // TODO: Blocked by http://javafx-jira.kenai.com/browse/JMY-203
// stage.setIconified(test);
stage.show(); // see SamplePage.java:110 comment on how test fails without having stage shown
instance = this;
}
Expand Down Expand Up @@ -292,7 +292,6 @@ private void rebuildUI(boolean modena, boolean retina, int selectedTab, final Sa
tab5.setContent(new ScrollPane(combinationsTest =
(Node)FXMLLoader.load(Modena.class.getResource("CombinationTest.fxml"))));

// Customer example from bug report http://javafx-jira.kenai.com/browse/DTL-5561
Tab tab6 = new Tab("Customer Example");
tab6.setContent(new ScrollPane(customerTest =
(Node)FXMLLoader.load(Modena.class.getResource("ScottSelvia.fxml"))));
Expand Down
2 changes: 1 addition & 1 deletion apps/samples/Modena/src/main/java/modena/SamplePageTableHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ static TableView createTableView(int width, boolean rowSelection) {
countryCol = new TableColumn<Person, String>();
countryCol.setText("Country");
countryCol.setCellValueFactory(p -> new ReadOnlyObjectWrapper<String>("New Zealand"));
// Test case for RT-28410 MODENA: can't make tree/table cell factories change color based
// Test case for JDK-8117108 MODENA: can't make tree/table cell factories change color based
// on background when setGraphic(...) is used
countryCol.setCellFactory(param -> {
final Label label = new Label();
Expand Down
1 change: 0 additions & 1 deletion apps/samples/Modena/src/main/resources/modena/ScottSelvia.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<?import javafx.scene.paint.*?>
<?import javafx.scene.text.*?>

<!-- Customer test case from bug http://javafx-jira.kenai.com/browse/DTL-5561 -->
<AnchorPane id="AnchorPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="768.0" prefWidth="1024.0" xmlns:fx="http://javafx.com/fxml">
<children>
<TabPane fx:id="tabPane" prefHeight="712.0" prefWidth="996.0" tabClosingPolicy="UNAVAILABLE" AnchorPane.bottomAnchor="42.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
Expand Down
2 changes: 1 addition & 1 deletion apps/toys/Hello/src/main/java/hello/HelloDatePicker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ private void initUI() {

if (item.equals(tomorrow)) {
// The tooltip won't show for disabled cells.
// See RT-28850.
// See JDK-8090379.
setTooltip(new Tooltip("Tomorrow is not a good day"));
setDisable(true);
}
Expand Down
2 changes: 1 addition & 1 deletion apps/toys/Hello/src/main/java/hello/HelloFontSize.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public void changed(ObservableValue<? extends String> ov, String t, String t1) {
}
});

// RT-28635
// JDK-8120561
final SpecialButton specialButton = new SpecialButton("Button");

final VBox rt28635 = new VBox(5);
Expand Down
2 changes: 1 addition & 1 deletion apps/toys/Hello/src/main/java/hello/HelloLaunchOnNewThread.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public static void main(final String[] args) {
+ Thread.currentThread().getName());
new Thread(() -> {
// Sleep for a very short time to ensure main thread exits,
// since that will provoke RT-9824
// since that will provoke JDK-8109685
try {
Thread.sleep(100);
} catch (InterruptedException ex) {}
Expand Down
2 changes: 1 addition & 1 deletion apps/toys/Hello/src/main/java/hello/HelloListView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ public static void main(String[] args) {
tabPane.getTabs().add(cellEditingTab);

// Cell Editing Tab
Tab disappearingNodesTab = new Tab("RT-12822");
Tab disappearingNodesTab = new Tab("JDK-8112018");
buildDisappearingNodesTab(disappearingNodesTab);
tabPane.getTabs().add(disappearingNodesTab);

Expand Down
2 changes: 1 addition & 1 deletion apps/toys/Hello/src/main/java/hello/hello.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
-fx-scale-shape: true;
}

/* for HelloFontSize as regards RT-28635 */
/* for HelloFontSize as regards JDK-8120561 */
.special-button:mouse_pressed {-fx-font-size : 20;}

/* For HelloControls */
Expand Down
Loading

0 comments on commit f2e40f0

Please sign in to comment.