Skip to content

Commit

Permalink
Merge pull request #73 from mkacct/m4-last-fixes
Browse files Browse the repository at this point in the history
M4 last fixes
  • Loading branch information
rhit-shirakrk authored May 10, 2024
2 parents 8b6898f + 4e19b34 commit 524c5cc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>rhit.csse.csse375</groupId>
<artifactId>LinterProject</artifactId>
<name>Linter</name>
<version>UNRELEASED</version>
<version>0.1</version>
<repositories>
<repository>
<id>central</id>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gui/MainWindow.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

class MainWindow extends JFrame implements Reloadable {
private static final Dimension MIN_SIZE = new Dimension(640, 360);
private static final int INIT_HEIGHT = 480;
private static final int INIT_HEIGHT = 640;

private final App app;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gui/SettingsWindow.java
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ private SettingControl(ConfigSpec.Setting setting, Configuration initialConfig)
String initStr = initialConfig.getString(setting.name, null);
if (setting.hasStringOptions()) {
if (!setting.getStringOptions().contains(initStr)) {initStr = null;}
this.valueSupplier = this.initEnumStringControl(inputPanel, initStr);
this.valueSupplier = this.initSelectStringControl(inputPanel, initStr);
} else {
this.valueSupplier = this.initStringControl(inputPanel, initStr);
}
Expand Down Expand Up @@ -347,7 +347,7 @@ private Supplier<Object> initStringControl(JPanel inputPanel, String initVal) {
};
}

private Supplier<Object> initEnumStringControl(JPanel inputPanel, String initVal) {
private Supplier<Object> initSelectStringControl(JPanel inputPanel, String initVal) {
List<String> options = new ArrayList<String>(List.of(NO_SELECTION_STRING));
options.addAll(setting.getStringOptions());
JComboBox<String> optionComboBox = new JComboBox<String>(options.toArray(new String[0]));
Expand Down

0 comments on commit 524c5cc

Please sign in to comment.