diff --git a/designer-base/src/main/java/com/fr/design/gui/ilable/LocaleOrientationLabel.java b/designer-base/src/main/java/com/fr/design/gui/ilable/LocaleOrientationLabel.java deleted file mode 100644 index 2165f05dc5..0000000000 --- a/designer-base/src/main/java/com/fr/design/gui/ilable/LocaleOrientationLabel.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.fr.design.gui.ilable; - -import com.fr.base.i18n.BidiUtils; - -import javax.swing.Icon; -import javax.swing.JLabel; - -/** - * description - * - * @author obo - * @since 11.0 - * Created on 2024/07/16 - */ -public class LocaleOrientationLabel extends JLabel { - - public LocaleOrientationLabel(String text, Icon image, int horizontalAlignment) { - super(text, image, horizontalAlignment); - if (image != null && text != null) { - setIconTextGap(4); - } - this.setComponentOrientation(BidiUtils.getOrientationByLocale()); - } - - public LocaleOrientationLabel(String text, int horizontalAlignment) { - super(text, horizontalAlignment); - this.setComponentOrientation(BidiUtils.getOrientationByLocale()); - } - - public LocaleOrientationLabel(String text) { - super(text); - this.setComponentOrientation(BidiUtils.getOrientationByLocale()); - } - - public LocaleOrientationLabel(Icon image, int horizontalAlignment) { - super(image, horizontalAlignment); - this.setComponentOrientation(BidiUtils.getOrientationByLocale()); - } - - public LocaleOrientationLabel(Icon image) { - super(image); - this.setComponentOrientation(BidiUtils.getOrientationByLocale()); - } - - public LocaleOrientationLabel() { - super(); - this.setComponentOrientation(BidiUtils.getOrientationByLocale()); - } - - -} diff --git a/designer-base/src/main/java/com/fr/design/gui/ilable/UILabel.java b/designer-base/src/main/java/com/fr/design/gui/ilable/UILabel.java index b8ed7701f7..d6a7952757 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilable/UILabel.java +++ b/designer-base/src/main/java/com/fr/design/gui/ilable/UILabel.java @@ -6,6 +6,7 @@ import com.fr.stable.StringUtils; import javax.swing.Icon; import javax.swing.JFrame; +import javax.swing.JLabel; import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Color; @@ -18,7 +19,7 @@ import java.awt.Dimension; * Date: 13-1-23 * Time: 下午3:15 */ -public class UILabel extends LocaleOrientationLabel implements UITextComponent { +public class UILabel extends JLabel implements UITextComponent { private static final int HTML_SHIFT_HEIGHT = 3; public UILabel(String text, Icon image, int horizontalAlignment) {