From c11222b5c7616df86ab5ca48757a44cdc0334f5c Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Sun, 17 May 2020 22:50:40 +0200 Subject: [PATCH] FlatHtmlTest: added more HTML samples --- .../formdev/flatlaf/testing/FlatHtmlTest.java | 29 ++++++++++++++----- .../formdev/flatlaf/testing/FlatHtmlTest.jfd | 18 ++++++------ 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.java index cfd48649..0c9e2144 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.java @@ -18,6 +18,7 @@ package com.formdev.flatlaf.testing; import java.awt.*; import javax.swing.*; +import com.formdev.flatlaf.util.StringUtils; import com.formdev.flatlaf.util.UIScale; import net.miginfocom.swing.*; @@ -36,6 +37,18 @@ public class FlatHtmlTest FlatHtmlTest() { initComponents(); + + String html = label1.getText(); + label2.setText( html ); + toolTip1.setTipText( html ); + toolTip2.setTipText( html ); + + String html2 = StringUtils.removeLeading( StringUtils.removeTrailing( html, "" ), "" ); + editorPane1.setText( html2 ); + editorPane2.setText( html2 ); + textPane1.setText( html2 ); + textPane2.setText( html2 ); + increaseFontSize(); } @@ -88,7 +101,7 @@ public class FlatHtmlTest add(toolTipLabel, "cell 3 0"); //---- label1 ---- - label1.setText("HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

"); + label1.setText("HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

Col 1Col 2
abcdef
"); add(label1, "cell 0 1"); //======== scrollPane15 ======== @@ -96,7 +109,7 @@ public class FlatHtmlTest //---- editorPane1 ---- editorPane1.setContentType("text/html"); - editorPane1.setText("HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

"); + editorPane1.setText("text"); scrollPane15.setViewportView(editorPane1); } add(scrollPane15, "cell 1 1,grow"); @@ -106,17 +119,17 @@ public class FlatHtmlTest //---- textPane1 ---- textPane1.setContentType("text/html"); - textPane1.setText("HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

"); + textPane1.setText("text"); scrollPane16.setViewportView(textPane1); } add(scrollPane16, "cell 2 1"); //---- toolTip1 ---- - toolTip1.setTipText("HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

"); + toolTip1.setTipText("text"); add(toolTip1, "cell 3 1"); //---- label2 ---- - label2.setText("HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

"); + label2.setText("text"); add(label2, "cell 0 2"); //======== scrollPane17 ======== @@ -124,7 +137,7 @@ public class FlatHtmlTest //---- editorPane2 ---- editorPane2.setContentType("text/html"); - editorPane2.setText("HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

"); + editorPane2.setText("text"); scrollPane17.setViewportView(editorPane2); } add(scrollPane17, "cell 1 2,grow"); @@ -134,13 +147,13 @@ public class FlatHtmlTest //---- textPane2 ---- textPane2.setContentType("text/html"); - textPane2.setText("HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

"); + textPane2.setText("text"); scrollPane18.setViewportView(textPane2); } add(scrollPane18, "cell 2 2"); //---- toolTip2 ---- - toolTip2.setTipText("HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

"); + toolTip2.setTipText("text"); add(toolTip2, "cell 3 2"); // JFormDesigner - End of component initialization //GEN-END:initComponents } diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.jfd index df2c31ec..006018f7 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.jfd +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.jfd @@ -1,4 +1,4 @@ -JFDML JFormDesigner: "7.0.0.0.194" Java: "13.0.1" encoding: "UTF-8" +JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.2" encoding: "UTF-8" new FormModel { contentType: "form/swing" @@ -35,7 +35,7 @@ new FormModel { } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label1" - "text": "HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

" + "text": "HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

Col 1Col 2
abcdef
" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 0 1" } ) @@ -44,7 +44,7 @@ new FormModel { add( new FormComponent( "javax.swing.JEditorPane" ) { name: "editorPane1" "contentType": "text/html" - "text": "HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

" + "text": "text" } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 1,grow" @@ -54,20 +54,20 @@ new FormModel { add( new FormComponent( "javax.swing.JTextPane" ) { name: "textPane1" "contentType": "text/html" - "text": "HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

" + "text": "text" } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 2 1" } ) add( new FormComponent( "javax.swing.JToolTip" ) { name: "toolTip1" - "tipText": "HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

" + "tipText": "text" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 3 1" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "label2" - "text": "HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

" + "text": "text" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 0 2" } ) @@ -76,7 +76,7 @@ new FormModel { add( new FormComponent( "javax.swing.JEditorPane" ) { name: "editorPane2" "contentType": "text/html" - "text": "HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

" + "text": "text" } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 2,grow" @@ -86,14 +86,14 @@ new FormModel { add( new FormComponent( "javax.swing.JTextPane" ) { name: "textPane2" "contentType": "text/html" - "text": "HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

" + "text": "text" } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 2 2" } ) add( new FormComponent( "javax.swing.JToolTip" ) { name: "toolTip2" - "tipText": "HTML
Sample content
text with link

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6

Paragraph

" + "tipText": "text" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 3 2" } )