Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
@Morph21
Morph21 committed Dec 14, 2024
1 parent b962c22 commit 47c968e
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 23 deletions.
1 change: 0 additions & 1 deletion app-shared/src/main/java/com/mercury/platform/TranslationKey.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ public enum TranslationKey {
selected_profile("Selected profile"),
export_manager("Export manager"),
view("View"),
select_icon("Select icon"),
filter("Filter"),
add_icon("Add icon"),
choose_icon("Choose icon"),
Expand Down
1 change: 0 additions & 1 deletion app-shared/src/main/resources/lang/en.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ create_new = Create new
selected_profile = Selected profile
export_manager = Export manager
view = View
select_icon = Select icon
filter = Filter
add_icon = Add icon
choose_icon = Choose icon
Expand Down
2 changes: 0 additions & 2 deletions app-shared/src/main/resources/lang/pl.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,6 @@ selected_profile = Wybrany profil
export_manager = Menedżer eksportu
// View
view = Widok
// Select icon
select_icon = Zaznacz ikonę
// Filter
filter = Filtruj
// Add icon
Expand Down
2 changes: 0 additions & 2 deletions app-shared/src/main/resources/lang/ru.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,6 @@ selected_profile = Выбранный профиль
export_manager = Менеджер экспорта
// View
view = Просмотр
// Select icon
select_icon = Выбрать иконку
// Filter
filter = Фильтр
// Add icon
Expand Down
6 changes: 3 additions & 3 deletions app-shared/src/test/java/LanguagesDuplicatesTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ private boolean containsDuplicates(File file) {
}
Assert.fail("Duplicate key found: " + key + "(" + file.getName() + ":" + lineNumber + ")");
}
if (values.contains(value)) {
Assert.fail("Duplicate value found: " + value + "(" + file.getName() + ":" + lineNumber + ")");
}
// if (values.contains(value)) {
// Assert.fail("Duplicate value found: " + value + "(" + file.getName() + ":" + lineNumber + ")");
// }
keys.add(key);
values.add(value);
}
Expand Down
2 changes: 1 addition & 1 deletion app-ui/src/main/java/com/mercury/platform/ui/adr/dialog/AdrIconSelectDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class AdrIconSelectDialog extends BaseDialog<String, String[]> {

public AdrIconSelectDialog() {
super(null, null, null);
this.setTitle(TranslationKey.select_icon.value());
this.setTitle(TranslationKey.choose_icon.value());
}

@Override
Expand Down
26 changes: 13 additions & 13 deletions app-ui/src/main/java/com/mercury/platform/ui/components/ComponentsFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ public ComponentsFactory() {
private void loadFonts() {
try {
Font base = Font.createFont(Font.TRUETYPE_FONT,
getClass().getClassLoader()
.getResourceAsStream("font/NotoSans-VariableFont.ttf"));
getClass().getClassLoader()
.getResourceAsStream("font/NotoSans-VariableFont.ttf"));
CJK_FONT = Font.createFont(Font.TRUETYPE_FONT,
getClass().getClassLoader().getResourceAsStream("font/GoNotoCJKCore.ttf"));
getClass().getClassLoader().getResourceAsStream("font/GoNotoCJKCore.ttf"));
KR_FONT = Font.createFont(Font.TRUETYPE_FONT,
getClass().getClassLoader().getResourceAsStream("font/HayashiSerif.ttf"));
getClass().getClassLoader().getResourceAsStream("font/HayashiSerif.ttf"));

DEFAULT_FONT = base.deriveFont(regularAttr);
BOLD_FONT = base.deriveFont(boldAttr);
Expand Down Expand Up @@ -132,7 +132,7 @@ public void mouseEntered(MouseEvent e) {
CompoundBorder compoundBorder = BorderFactory.createCompoundBorder(
BorderFactory.createLineBorder(AppThemeColor.ADR_SELECTED_BORDER, 1),
BorderFactory.createLineBorder(button.getBackground(), 3)
);
);
button.setBorder(compoundBorder);
button.setCursor(new Cursor(Cursor.HAND_CURSOR));
}
Expand Down Expand Up @@ -166,7 +166,7 @@ public JButton getButton(String text) {
CompoundBorder compoundBorder = BorderFactory.createCompoundBorder(
BorderFactory.createLineBorder(AppThemeColor.TRANSPARENT, 1),
BorderFactory.createLineBorder(AppThemeColor.BUTTON, 3)
);
);

return getButton(FontStyle.BOLD, AppThemeColor.BUTTON, compoundBorder, text, scale * 14f);
}
Expand All @@ -181,15 +181,15 @@ public JButton getBorderedButton(String text) {
CompoundBorder compoundBorder = BorderFactory.createCompoundBorder(
BorderFactory.createLineBorder(AppThemeColor.BORDER, 1),
BorderFactory.createLineBorder(AppThemeColor.BUTTON, 3)
);
);
return getButton(FontStyle.BOLD, AppThemeColor.BUTTON, compoundBorder, text, scale * 14f);
}

public JButton getBorderedButton(String text, float fontSize) {
CompoundBorder compoundBorder = BorderFactory.createCompoundBorder(
BorderFactory.createLineBorder(AppThemeColor.BORDER, 1),
BorderFactory.createLineBorder(AppThemeColor.BUTTON, 3)
);
);
return getButton(FontStyle.BOLD, AppThemeColor.BUTTON, compoundBorder, text, scale * fontSize);
}

Expand All @@ -201,7 +201,7 @@ public JButton getBorderedButton(String text,
CompoundBorder compoundBorder = BorderFactory.createCompoundBorder(
BorderFactory.createLineBorder(outerBorderColor, 1),
BorderFactory.createLineBorder(innerBorderColor, 3)
);
);
return getButton(FontStyle.BOLD, background, compoundBorder, text, scale * fontSize);
}

Expand Down Expand Up @@ -351,7 +351,7 @@ public JButton getBorderedIconButton(String iconPath, int iconSize, String toolt
CompoundBorder compoundBorder = BorderFactory.createCompoundBorder(
BorderFactory.createLineBorder(AppThemeColor.BORDER, 1),
BorderFactory.createLineBorder(AppThemeColor.BUTTON, 2)
);
);
JButton iconButton = getIconButton(iconPath, iconSize, AppThemeColor.FRAME_ALPHA, tooltip);
iconButton.setBorder(BorderFactory.createLineBorder(AppThemeColor.BUTTON, 2));
return iconButton;
Expand Down Expand Up @@ -544,7 +544,7 @@ public JFormattedTextField getIntegerTextField(Integer min, Integer max, Integer
field.setBorder(BorderFactory.createCompoundBorder(
BorderFactory.createLineBorder(AppThemeColor.BORDER, 1),
BorderFactory.createLineBorder(AppThemeColor.TRANSPARENT, 3)
));
));
field.setBackground(AppThemeColor.HEADER);
return field;
}
Expand All @@ -557,7 +557,7 @@ public JTextField getTextField(String text, FontStyle style, float fontSize) {
textField.setBorder(BorderFactory.createCompoundBorder(
BorderFactory.createLineBorder(AppThemeColor.BORDER, 1),
BorderFactory.createLineBorder(AppThemeColor.TRANSPARENT, 3)
));
));
textField.setBackground(AppThemeColor.HEADER);
return textField;
}
Expand All @@ -570,7 +570,7 @@ public JPasswordField getPasswordField(String text, FontStyle style, float fontS
passwordField.setBorder(BorderFactory.createCompoundBorder(
BorderFactory.createLineBorder(AppThemeColor.BORDER, 1),
BorderFactory.createLineBorder(AppThemeColor.TRANSPARENT, 3)
));
));
passwordField.setBackground(AppThemeColor.HEADER);
return passwordField;
}
Expand Down
1 change: 1 addition & 0 deletions release_files/release_config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<runtimeBits>64/32</runtimeBits>
<maxHeapSize>256</maxHeapSize>
<opt>-XX:+UseG1GC</opt>
<opt>-Dfile.encoding=UTF-8</opt>
</jre>
<versionInfo>
<fileVersion>1.3.5.0</fileVersion>
Expand Down

0 comments on commit 47c968e

Please sign in to comment.