wbrawner/Everest
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-wrote tab text reflection logic

Browse source
This commit is contained in:
Rohit Awate 2018-07-21 16:04:12 +05:30
parent 32dcc0bce2
commit 772ac377bd
3 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/main/java/com/rohitawate/everest/controllers/HomeWindowController.java
View file

@ -24,7 +24,6 @@ import com.rohitawate.everest.misc.KeyMap;
import com.rohitawate.everest.misc.Services; import com.rohitawate.everest.misc.Services;
import com.rohitawate.everest.misc.ThemeManager; import com.rohitawate.everest.misc.ThemeManager;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.beans.binding.Bindings;
import javafx.beans.property.StringProperty; import javafx.beans.property.StringProperty;
import javafx.beans.value.ObservableValue; import javafx.beans.value.ObservableValue;
import javafx.fxml.FXML; import javafx.fxml.FXML;
@ -94,6 +93,29 @@ public class HomeWindowController implements Initializable {
}); });
tabPane.getSelectionModel().selectedItemProperty().addListener(this::onTabSwitched); tabPane.getSelectionModel().selectedItemProperty().addListener(this::onTabSwitched);
initAddressReflection();
}
private void initAddressReflection() {
addressProperty.addListener(((observable, oldValue, newValue) -> {
Tab activeTab = tabPane.getSelectionModel().getSelectedItem();
if (activeTab != null) {
if (newValue.equals(""))
activeTab.setText("New Tab");
else
activeTab.setText(newValue);
}
}));
// Initialize the text of tabs loaded by the state recovery logic
tabPane.getTabs().forEach(tab -> {
String target = tabStateMap.get(tab).composer.target;
if (target.equals(""))
tab.setText("New Tab");
else
tab.setText(target);
});
} }
/** /**
@ -131,7 +153,7 @@ public class HomeWindowController implements Initializable {
} }
private void addTab() { private void addTab() {
addTab(null); addTab(new ComposerState());
} }
/** /**
@ -140,6 +162,7 @@ public class HomeWindowController implements Initializable {
*/ */
private void addTab(ComposerState composerState) { private void addTab(ComposerState composerState) {
Tab newTab = new Tab(); Tab newTab = new Tab();
newTab.setText("New Tab");
DashboardState newState = new DashboardState(composerState); DashboardState newState = new DashboardState(composerState);
tabStateMap.put(newTab, newState); tabStateMap.put(newTab, newState);
@ -158,13 +181,6 @@ public class HomeWindowController implements Initializable {
tabPane.getSelectionModel().select(newTab); tabPane.getSelectionModel().select(newTab);
onTabSwitched(prevState, prevTab, newTab); onTabSwitched(prevState, prevTab, newTab);
// Makes the Tab's text change with the URL
newTab.textProperty().bind(
Bindings.when(Bindings.and(addressProperty.isNotEmpty(), newTab.selectedProperty()))
.then(addressProperty)
.otherwise(getTabText(newTab))
);
newTab.setOnCloseRequest(e -> { newTab.setOnCloseRequest(e -> {
tabStateMap.remove(newTab); tabStateMap.remove(newTab);
tabPane.getTabs().remove(newTab); tabPane.getTabs().remove(newTab);
@ -178,15 +194,6 @@ public class HomeWindowController implements Initializable {
}); });
} }
private String getTabText(Tab newTab) {
DashboardState state = tabStateMap.get(newTab);
if (state == null || state.composer == null || state.composer.target.equals(""))
return "New Tab";
else
return state.composer.target;
}
private void saveState() { private void saveState() {
/* /*
Updating the state of the selected tab before saving it. Updating the state of the selected tab before saving it.

5
src/main/java/com/rohitawate/everest/controllers/state/ComposerState.java
View file

@ -23,6 +23,7 @@ import java.util.ArrayList;
*/ */
public class ComposerState { public class ComposerState {
public String target; public String target;
public String httpMethod; public String httpMethod;
public ArrayList<FieldState> params; public ArrayList<FieldState> params;
public ArrayList<FieldState> headers; public ArrayList<FieldState> headers;
@ -43,4 +44,8 @@ public class ComposerState {
// File path of application/octet-stream requests // File path of application/octet-stream requests
public String binaryFilePath; public String binaryFilePath;
public ComposerState() {
this.httpMethod = "GET";
}
} }

2
src/main/resources/templates/LogsFile.html
View file

@ -54,4 +54,4 @@
</style> </style>
</head> </head>
<body> <body>
<h1>Everest Log: %% Date %%</h1> <h1>Everest Logs: %% Date %%</h1>