This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 2982cf4498fd3f1561bbd01ee03b66032012a183 Author: Matthias Bläsing <[email protected]> AuthorDate: Mon Nov 11 21:48:25 2019 +0100 Problem Panel shows plain text - ensure, that that is correctly displayed --- .../netbeans/modules/autoupdate/ui/ProblemPanel.form | 19 ++++++++----------- .../netbeans/modules/autoupdate/ui/ProblemPanel.java | 12 +++++------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/ProblemPanel.form b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/ProblemPanel.form index dce5dfb..bc654d7 100644 --- a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/ProblemPanel.form +++ b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/ProblemPanel.form @@ -22,6 +22,11 @@ --> <Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo"> + <Properties> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[700, 400]"/> + </Property> + </Properties> <AccessibilityProperties> <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties" key="NetworkProblemPanel_ACD" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> @@ -42,16 +47,16 @@ <DimensionLayout dim="0"> <Group type="103" groupAlignment="0" attributes="0"> <Component id="cbShowAgain" alignment="1" max="32767" attributes="0"/> - <Component id="jScrollPane1" alignment="0" pref="425" max="32767" attributes="0"/> + <Component id="jScrollPane1" alignment="0" pref="682" max="32767" attributes="0"/> <Component id="jScrollPane2" alignment="0" max="32767" attributes="0"/> </Group> </DimensionLayout> <DimensionLayout dim="1"> <Group type="103" groupAlignment="0" attributes="0"> <Group type="102" alignment="1" attributes="0"> - <Component id="jScrollPane2" pref="106" max="32767" attributes="0"/> + <Component id="jScrollPane2" pref="140" max="32767" attributes="0"/> <EmptySpace min="-2" max="-2" attributes="0"/> - <Component id="jScrollPane1" pref="169" max="32767" attributes="0"/> + <Component id="jScrollPane1" pref="201" max="32767" attributes="0"/> <EmptySpace min="-2" max="-2" attributes="0"/> <Component id="cbShowAgain" min="-2" max="-2" attributes="0"/> </Group> @@ -79,11 +84,7 @@ <Component class="javax.swing.JTextPane" name="tpMessage"> <Properties> <Property name="editable" type="boolean" value="false"/> - <Property name="contentType" type="java.lang.String" value="text/html" noResource="true"/> <Property name="opaque" type="boolean" value="false"/> - <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[400, 100]"/> - </Property> </Properties> </Component> </SubComponents> @@ -98,11 +99,7 @@ <Component class="javax.swing.JTextPane" name="taTitle"> <Properties> <Property name="editable" type="boolean" value="false"/> - <Property name="contentType" type="java.lang.String" value="text/html" noResource="true"/> <Property name="opaque" type="boolean" value="false"/> - <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[200, 100]"/> - </Property> </Properties> </Component> </SubComponents> diff --git a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/ProblemPanel.java b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/ProblemPanel.java index 6876782..cc4ab13 100644 --- a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/ProblemPanel.java +++ b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/ProblemPanel.java @@ -176,6 +176,8 @@ public class ProblemPanel extends javax.swing.JPanel { jScrollPane2 = new javax.swing.JScrollPane(); taTitle = new javax.swing.JTextPane(); + setPreferredSize(new java.awt.Dimension(700, 400)); + org.openide.awt.Mnemonics.setLocalizedText(cbShowAgain, org.openide.util.NbBundle.getMessage(ProblemPanel.class, "ProblemPanel.cbShowAgain.text")); // NOI18N cbShowAgain.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -184,15 +186,11 @@ public class ProblemPanel extends javax.swing.JPanel { }); tpMessage.setEditable(false); - tpMessage.setContentType("text/html"); // NOI18N tpMessage.setOpaque(false); - tpMessage.setPreferredSize(new java.awt.Dimension(400, 100)); jScrollPane1.setViewportView(tpMessage); taTitle.setEditable(false); - taTitle.setContentType("text/html"); // NOI18N taTitle.setOpaque(false); - taTitle.setPreferredSize(new java.awt.Dimension(200, 100)); jScrollPane2.setViewportView(taTitle); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); @@ -200,15 +198,15 @@ public class ProblemPanel extends javax.swing.JPanel { layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(cbShowAgain, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 425, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 682, Short.MAX_VALUE) .addComponent(jScrollPane2) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 106, Short.MAX_VALUE) + .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 140, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 169, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 201, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(cbShowAgain)) ); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
