Просмотр исходного кода

Microsoft YaHei UI字体名称改用常量

sunyj 8 лет назад
Родитель
Сommit
59e72bc2d6

+ 1 - 1
src/main/java/com/uas/report/service/impl/PrintServiceImpl.java

@@ -455,7 +455,7 @@ public class PrintServiceImpl implements PrintService {
 			// 将字体MSYahei改为Microsoft YaHei UI
 			Attribute fontName = fontElement.attribute("fontName");
 			if (Objects.equals(fontName.getText(), "MSYahei")) {
-				fontName.setText("Microsoft YaHei UI");
+				fontName.setText(ReportConstants.MICROSOFT_YAHEI_UI_FONT_NAME);
 			}
 
 			// 更改可换行的textField的行距

+ 5 - 0
src/main/java/com/uas/report/util/ReportConstants.java

@@ -78,4 +78,9 @@ public class ReportConstants {
 	 */
 	public static final String GENERATED_FILES_ABSOLUTE_PATH = GENERATED_FILES_DIR + GENERATED_FILES_PATH;
 
+	/**
+	 * 微软雅黑字体名称
+	 */
+	public static final String MICROSOFT_YAHEI_UI_FONT_NAME = "Microsoft YaHei UI";
+
 }

+ 3 - 1
src/main/java/net/sourceforge/barbecue/Barcode.java

@@ -42,6 +42,8 @@ import java.text.StringCharacterIterator;
 
 import javax.swing.JComponent;
 
+import com.uas.report.util.ReportConstants;
+
 import net.sourceforge.barbecue.env.EnvironmentFactory;
 import net.sourceforge.barbecue.env.HeadlessEnvironment;
 import net.sourceforge.barbecue.output.GraphicsOutput;
@@ -85,7 +87,7 @@ public abstract class Barcode extends JComponent implements Printable {
 		} else {
 			this.barHeight = Barcode.DEFAULT_BAR_HEIGHT;
 		}
-		this.font = new Font("Microsoft YaHei UI", Font.PLAIN, 28);
+		this.font = new Font(ReportConstants.MICROSOFT_YAHEI_UI_FONT_NAME, Font.PLAIN, 28);
 		this.drawingText = true;
 		setBackground(Color.white);
 		setForeground(Color.black);