Skip to content

Commit 1045449

Browse files
committed
Simplify code
1 parent ab84c83 commit 1045449

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

dependency-reduced-pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.kernicpanel</groupId>
55
<artifactId>randomizer</artifactId>
66
<name>Randomizer</name>
7-
<version>1.0</version>
7+
<version>1.1</version>
88
<build>
99
<plugins>
1010
<plugin>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>randomizer</artifactId>
77
<packaging>jar</packaging>
88
<name>Randomizer</name>
9-
<version>1.0</version>
9+
<version>1.1</version>
1010

1111
<repositories>
1212
<repository>

src/main/java/com/kernicpanel/RandomizerExtension.java

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,56 +12,59 @@
1212
import java.util.Random;
1313

1414
public class RandomizerExtension extends ControllerExtension {
15+
Random rand = new Random();
16+
Faker faker = new Faker();
17+
18+
private SettableBooleanValue useDate;
19+
20+
private ControllerHost host;
21+
private DocumentState documentState;
22+
private PopupBrowser popupBrowser;
23+
private CursorTrack cursorTrack;
24+
private BrowserResultsItemBank resultsItemBank;
25+
26+
private SettableStringValue filenameOutput;
27+
private SettableStringValue nameOutput;
28+
1529
protected RandomizerExtension(
1630
final RandomizerExtensionDefinition definition, final ControllerHost host) {
1731
super(definition, host);
1832
}
1933

20-
private void printer(ControllerHost host, String s) {
34+
private void printer(String s) {
2135
host.println(s);
2236
java.lang.System.out.println(s);
2337
}
2438

25-
Random rand = new Random();
26-
Faker faker = new Faker();
2739

2840
@Override
2941
public void init() {
30-
final ControllerHost host = getHost();
42+
host = getHost();
3143

32-
final DocumentState documentState = host.getDocumentState();
33-
final PopupBrowser popupBrowser = host.createPopupBrowser();
44+
documentState = host.getDocumentState();
45+
popupBrowser = host.createPopupBrowser();
3446
popupBrowser.exists().markInterested();
3547
popupBrowser.resultsColumn().entryCount().markInterested();
36-
final CursorTrack cursorTrack = host.createCursorTrack(0, 0);
48+
cursorTrack = host.createCursorTrack(0, 0);
3749

38-
BrowserResultsItemBank resultsItemBank = popupBrowser.resultsColumn().createItemBank(100000);
50+
resultsItemBank = popupBrowser.resultsColumn().createItemBank(100000);
3951

40-
SettableBooleanValue useDate =
52+
useDate =
4153
host.getPreferences().getBooleanSetting("Prepend date for filename", "Random name", true);
4254

4355
documentState
4456
.getSignalSetting("Select", "Randomize browser selection", "Select random item")
45-
.addSignalObserver(
46-
selectRandomItem(host, popupBrowser, cursorTrack, resultsItemBank, rand));
57+
.addSignalObserver(selectRandomItem());
4758
documentState
4859
.getSignalSetting("Add", "Randomize browser selection", "Add current item")
4960
.addSignalObserver(popupBrowser::commit);
5061

51-
SettableStringValue filenameOutput =
52-
documentState.getStringSetting("Filename", "Random name", 50, "");
53-
SettableStringValue nameOutput = documentState.getStringSetting("Name", "Random name", 50, "");
54-
documentState
55-
.getSignalSetting(" ", "Random name", "Generate")
56-
.addSignalObserver(randomName(useDate, filenameOutput, nameOutput));
62+
filenameOutput = documentState.getStringSetting("Filename", "Random name", 50, "");
63+
nameOutput = documentState.getStringSetting("Name", "Random name", 50, "");
64+
documentState.getSignalSetting(" ", "Random name", "Generate").addSignalObserver(randomName());
5765
}
5866

59-
private NoArgsCallback selectRandomItem(
60-
ControllerHost host,
61-
PopupBrowser popupBrowser,
62-
CursorTrack cursorTrack,
63-
BrowserResultsItemBank resultsItemBank,
64-
Random rand) {
67+
private NoArgsCallback selectRandomItem() {
6568
return () -> {
6669
if (!popupBrowser.exists().getAsBoolean()) {
6770
cursorTrack.endOfDeviceChainInsertionPoint().browse();
@@ -76,10 +79,7 @@ private NoArgsCallback selectRandomItem(
7679
};
7780
}
7881

79-
private NoArgsCallback randomName(
80-
SettableBooleanValue useDate,
81-
SettableStringValue filenameOutput,
82-
SettableStringValue nameOutput) {
82+
private NoArgsCallback randomName() {
8383
return () -> {
8484
String[] moods = {faker.mood().emotion(), faker.mood().tone(), faker.mood().feeling()};
8585
String mood = moods[rand.nextInt(moods.length)];

src/main/java/com/kernicpanel/RandomizerExtensionDefinition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public String getAuthor() {
2424

2525
@Override
2626
public String getVersion() {
27-
return "1.0";
27+
return "1.1";
2828
}
2929

3030
@Override

0 commit comments

Comments
 (0)