Skip to content

Commit 3116c7f

Browse files
Add alias resign bug fixed
1 parent f9227fa commit 3116c7f

File tree

3 files changed

+67
-11
lines changed

3 files changed

+67
-11
lines changed

runit-view/src/main/java/szczepanski/gerard/runnit/view/controller/SettingsDirectoriesPaneTabController.java

+21-6
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,29 @@ private void updateDirAliases(Settings settings) {
5151
@FXML
5252
public void handleAddDirAlias() {
5353
LOG.debug("handleAddDirAlias");
54-
Alias newDirAlias = getNewAliasFromUserInput();
55-
addDirAlias(newDirAlias);
54+
Optional<Alias> optionalNewDirAlias = getNewAliasFromUserInput();
55+
56+
if (optionalNewDirAlias.isPresent()) {
57+
addDirAlias(optionalNewDirAlias.get());
58+
}
5659
}
5760

58-
private Alias getNewAliasFromUserInput() {
59-
Optional<String> optAliasName = DialogDisplayer.showInputDialog(getStage(dirAliasTableView), "Web Alias Name");
60-
Optional<String> optAliasValue = DialogDisplayer.showInputDialog(getStage(dirAliasTableView), "Directory path");
61-
return new Alias(optAliasName.get(), optAliasValue.get());
61+
/**
62+
* TODO Gerard Szczepanski 22.01.2017 -> Ugly method, to future refactor
63+
*/
64+
private Optional<Alias> getNewAliasFromUserInput() {
65+
Optional<String> optAliasName = DialogDisplayer.showInputDialog(getStage(dirAliasTableView), "Directory Alias Name");
66+
Optional<String> optAliasValue = Optional.empty();
67+
68+
if (optAliasName.isPresent()) {
69+
optAliasValue = DialogDisplayer.showInputDialog(getStage(dirAliasTableView), "Directory path");
70+
}
71+
72+
if (optAliasName.isPresent() && optAliasValue.isPresent()) {
73+
return Optional.of(new Alias(optAliasName.get(), optAliasValue.get()));
74+
}
75+
76+
return Optional.empty();
6277
}
6378

6479
private void addDirAlias(Alias newDirAlias) {

runit-view/src/main/java/szczepanski/gerard/runnit/view/controller/SettingsWebPaneTabController.java

+19-5
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,28 @@ private void updateWebAliases(Settings settings) {
5151
@FXML
5252
public void handleAddWebAlias() {
5353
LOG.debug("handleAddWebAlias");
54-
Alias newWebAlias = getNewAliasFromUserInput();
55-
addWebAlias(newWebAlias);
54+
Optional<Alias> optionalNewWebAlias = getNewAliasFromUserInput();
55+
if(optionalNewWebAlias.isPresent()) {
56+
addWebAlias(optionalNewWebAlias.get());
57+
}
5658
}
5759

58-
private Alias getNewAliasFromUserInput() {
60+
/**
61+
* TODO Gerard Szczepanski 22.01.2017 -> Ugly method, to future refactor
62+
*/
63+
private Optional<Alias> getNewAliasFromUserInput() {
5964
Optional<String> optAliasName = DialogDisplayer.showInputDialog(getStage(webAliasTableView), "Web Alias Name");
60-
Optional<String> optAliasValue = DialogDisplayer.showInputDialog(getStage(webAliasTableView), "Web Alias Address");
61-
return new Alias(optAliasName.get(), optAliasValue.get());
65+
Optional<String> optAliasValue = Optional.empty();
66+
67+
if (optAliasName.isPresent()) {
68+
optAliasValue = DialogDisplayer.showInputDialog(getStage(webAliasTableView), "Web Alias Address");
69+
}
70+
71+
if (optAliasName.isPresent() && optAliasValue.isPresent()) {
72+
return Optional.of(new Alias(optAliasName.get(), optAliasValue.get()));
73+
}
74+
75+
return Optional.empty();
6276
}
6377

6478
private void addWebAlias(Alias newWebAlias) {

runit.xml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<launch4jConfig>
3+
<dontWrapJar>false</dontWrapJar>
4+
<headerType>gui</headerType>
5+
<jar>C:\Users\Ziemniak\Documents\runit\runit-program\target\runit-program-0.9.jar</jar>
6+
<outfile>C:\Users\Ziemniak\Desktop\runit-exe\runit-0.9.exe</outfile>
7+
<errTitle></errTitle>
8+
<cmdLine></cmdLine>
9+
<chdir>.</chdir>
10+
<priority>normal</priority>
11+
<downloadUrl>http://java.com/download</downloadUrl>
12+
<supportUrl></supportUrl>
13+
<stayAlive>false</stayAlive>
14+
<restartOnCrash>false</restartOnCrash>
15+
<manifest></manifest>
16+
<icon>C:\Users\Ziemniak\Documents\runit\runit-view\src\main\resources\images\icon\icon.ico</icon>
17+
<jre>
18+
<path></path>
19+
<bundledJre64Bit>false</bundledJre64Bit>
20+
<bundledJreAsFallback>false</bundledJreAsFallback>
21+
<minVersion>1.8.0_92</minVersion>
22+
<maxVersion></maxVersion>
23+
<jdkPreference>preferJre</jdkPreference>
24+
<runtimeBits>64/32</runtimeBits>
25+
<maxHeapSize>64</maxHeapSize>
26+
</jre>
27+
</launch4jConfig>

0 commit comments

Comments
 (0)