Index: java/installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.java =================================================================== --- java/installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.java (revision 840) +++ java/installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.java (revision 849) @@ -1,8 +1,6 @@ package net.oni2.aeinstaller.gui.packageinfobox; -import java.awt.Insets; import java.util.ResourceBundle; -import javax.swing.JLabel; import javax.swing.JPanel; @@ -10,6 +8,6 @@ import net.oni2.aeinstaller.backend.packages.Package; import net.oni2.aeinstaller.backend.packages.Type; -import net.oni2.aeinstaller.gui.HTMLLinkLabel; import net.oni2.resourcebundle.UTF8ResourceBundleLoader; +import net.oni2.swingcomponents.HTMLLinkLabel; import org.javabuilders.BuildResult; @@ -28,12 +26,12 @@ private BuildResult result = SwingJavaBuilder.build(this, bundle); - private JLabel lblTitleVal; - private JLabel lblCreatorVal; - private JLabel lblTypesVal; - private JLabel lblPlatformVal; - private JLabel lblPackageNumberVal; - private JLabel lblVersionNumberVal; + private HTMLLinkLabel lblTitleVal; + private HTMLLinkLabel lblCreatorVal; + private HTMLLinkLabel lblTypesVal; + private HTMLLinkLabel lblPlatformVal; + private HTMLLinkLabel lblPackageNumberVal; + private HTMLLinkLabel lblVersionNumberVal; private HTMLLinkLabel lblDescriptionVal; - private JLabel lblDownloadSizeVal; + private HTMLLinkLabel lblDownloadSizeVal; /** @@ -42,5 +40,11 @@ public PackageInfoBox() { super(); - lblDescriptionVal.setMargin(new Insets(-15, 0, 0, 0)); + lblTitleVal.enableBorder(false); + lblCreatorVal.enableBorder(false); + lblTypesVal.enableBorder(false); + lblPlatformVal.enableBorder(false); + lblPackageNumberVal.enableBorder(false); + lblVersionNumberVal.enableBorder(false); + lblDownloadSizeVal.enableBorder(false); } @@ -60,6 +64,6 @@ if (mod != null) { - lblTitleVal.setText("" + mod.getName() + ""); - lblCreatorVal.setText("" + mod.getCreator() + ""); + lblTitleVal.setText(mod.getName()); + lblCreatorVal.setText(mod.getCreator()); lblDescriptionVal.setText(mod.getDescription()); @@ -70,5 +74,5 @@ types += t.getName(); } - lblTypesVal.setText("" + types + ""); + lblTypesVal.setText(types); lblPlatformVal.setText(mod.getPlatform().toString()); lblPackageNumberVal.setText(mod.getPackageNumberString()); Index: java/installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.yml =================================================================== --- java/installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.yml (revision 840) +++ java/installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.yml (revision 849) @@ -3,19 +3,19 @@ content: - JLabel(name=lblTitle, text=lblTitle.text) - - JLabel(name=lblTitleVal) + - HTMLLinkLabel(name=lblTitleVal) - JLabel(name=lblCreator, text=lblCreator.text) - - JLabel(name=lblCreatorVal) + - HTMLLinkLabel(name=lblCreatorVal) - JLabel(name=lblTypes, text=lblTypes.text) - - JLabel(name=lblTypesVal) + - HTMLLinkLabel(name=lblTypesVal) - JLabel(name=lblPlatform, text=lblPlatform.text) - - JLabel(name=lblPlatformVal) + - HTMLLinkLabel(name=lblPlatformVal) - JLabel(name=lblPackageNumber, text=lblPackageNumber.text) - - JLabel(name=lblPackageNumberVal) + - HTMLLinkLabel(name=lblPackageNumberVal) - JLabel(name=lblVersionNumber, text=lblVersionNumber.text) - - JLabel(name=lblVersionNumberVal) + - HTMLLinkLabel(name=lblVersionNumberVal) - JScrollPane(name=scrollDescription, vScrollBar=always, hScrollBar=asNeeded): HTMLLinkLabel(name=lblDescriptionVal) - JLabel(name=lblDownloadSize, text=lblDownloadSize.text) - - JLabel(name=lblDownloadSizeVal) + - HTMLLinkLabel(name=lblDownloadSizeVal) - MigLayout: | [min] [grow]