Skip to content

Commit b80ac59

Browse files
committed
Removed logic of Scapy connection
- Now only warning that user has to connect to TRex is shown
1 parent a0a95dc commit b80ac59

File tree

1 file changed

+8
-32
lines changed

1 file changed

+8
-32
lines changed

src/main/java/com/exalttech/trex/ui/controllers/PacketBuilderHomeController.java

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -192,38 +192,14 @@ private boolean prepareToAdvancedIfNecessary(int profileIndex) {
192192
"Please, refer to documentation about\n" +
193193
"Scapy server and advanced mode.";
194194

195-
ButtonType tryConnect = new ButtonType("Connect", ButtonBar.ButtonData.YES);
196-
ButtonType continueSimple = new ButtonType("Simple Mode", ButtonBar.ButtonData.NO);
197-
198-
while (true) {
199-
Optional<ButtonType> userSelection = TrexAlertBuilder.build()
200-
.setType(Alert.AlertType.WARNING)
201-
.setHeader("Scapy server connection required")
202-
.setContent(warningText)
203-
.setButtons(tryConnect, continueSimple, ButtonType.CANCEL)
204-
.getAlert()
205-
.showAndWait();
206-
207-
if (!userSelection.isPresent() || userSelection.get().equals(ButtonType.CANCEL)) {
208-
return false;
209-
} else if (userSelection.get().equals(continueSimple)) {
210-
stream.setAdvancedMode(false);
211-
return true;
212-
}
213-
214-
eventBus.post(new ScapyClientNeedConnectEvent()); // trying to connect
215-
216-
if (ConnectionManager.getInstance().isScapyConnected()) {
217-
stream.setAdvancedMode(true);
218-
return true;
219-
}
220-
221-
TrexAlertBuilder.build()
222-
.setType(Alert.AlertType.ERROR)
223-
.setContent("Connection to Scapy server failed.")
224-
.getAlert()
225-
.showAndWait();
226-
}
195+
TrexAlertBuilder.build()
196+
.setType(Alert.AlertType.WARNING)
197+
.setHeader("Scapy server connection required")
198+
.setContent(warningText)
199+
.setButtons(ButtonType.OK)
200+
.getAlert()
201+
.showAndWait();
202+
return false;
227203
}
228204

229205
private void initEditStream() throws IOException {

0 commit comments

Comments
 (0)