Skip to content

Commit

Permalink
amended Robot on counterstring to be cancellable and tidy up the thre…
Browse files Browse the repository at this point in the history 
…ading, removed an unused dependency and added an "are you sure" quit dialog that also quits the counterstring thread
  • Loading branch information
eviltester authored and eviltester committed Oct 15, 2017
1 parent 28bc710 commit 00aae81
Show file tree
Hide file tree
Showing 14 changed files with 227 additions and 135 deletions.
9 changes: 9 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,15 @@ Compendium_Developments = https://www.compendiumdev.co.uk

## Release Notes
### 20171015 15th October 2017

- Amended Robot counterstring generator to not have a hanging thread that keeps going
- used service for JavaFx
- click on 'Robot' button during counterstring generation while typing cancels the generation and typing
- added handlers to prompt for application exit
- added handlers to stop counterstring service when window hidden or application closes
- Added - Y/N Exit App dialog

### 20161112
- started using this in videos for youtube, so other people saw it
Expand Down
5 changes: 4 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,22 @@
<groupId>uk.co.compendiumdev</groupId>
<artifactId>testtoolhub</artifactId>
<!-- -SNAPSHOT -->
<version>1.1-SNAPSHOT</version>
<!--<version>1.1-SNAPSHOT</version>-->
<version>1.1</version>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
</dependency>
<!--
<dependency>
<groupId>org.controlsfx</groupId>
<artifactId>controlsfx</artifactId>
<version>8.20.8</version>
</dependency>
-->
<!-- http://hc.apache.org/httpcomponents-client-ga/httpclient/dependency-info.html -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/uk/co/compendiumdev/javafortesters/cannedtext/CannedTextItemTreeFinder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

import uk.co.compendiumdev.javafortesters.tree.TreeBranch;

/**
* Created by Alan on 27/02/2015.
*/

public class CannedTextItemTreeFinder {
private final TreeBranch<CannedTextItem> root;

Expand Down
4 changes: 1 addition & 3 deletions src/main/java/uk/co/compendiumdev/javafortesters/html/comments/HTMLCommentReporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@

import java.io.IOException;

/**
* Created by Alan on 24/03/2015.
*/

public class HTMLCommentReporter {

HTMLCommentFinder comments;
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/uk/co/compendiumdev/javafortesters/javafx/Config.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package uk.co.compendiumdev.javafortesters.javafx;

/**
* Created by Alan on 21/01/2015.
*/

public class Config {

public static int getDefaultWindowWidth(){
Expand Down
232 changes: 129 additions & 103 deletions src/main/java/uk/co/compendiumdev/javafortesters/javafx/CounterStringStage.java
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,32 @@
package uk.co.compendiumdev.javafortesters.javafx;

import uk.co.compendiumdev.javafortesters.counterstrings.CounterString;
import uk.co.compendiumdev.javafortesters.counterstrings.CounterStringCreationError;
import uk.co.compendiumdev.javafortesters.counterstrings.CounterStringRangeListIterator;
import uk.co.compendiumdev.javafortesters.counterstrings.CounterStringRangeStruct;
import javafx.application.Platform;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.concurrent.Service;
import javafx.concurrent.Task;
import javafx.event.ActionEvent;
import javafx.event.Event;
import javafx.event.EventHandler;
import javafx.scene.Scene;
import javafx.scene.control.*;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.TextArea;
import javafx.scene.control.TextField;
import javafx.scene.input.Clipboard;
import javafx.scene.input.ClipboardContent;
import javafx.scene.layout.*;
import javafx.stage.Stage;
import javafx.stage.WindowEvent;
import uk.co.compendiumdev.javafortesters.counterstrings.CounterString;
import uk.co.compendiumdev.javafortesters.counterstrings.CounterStringCreationError;

import java.awt.*;
import java.awt.event.KeyEvent;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.List;


public class CounterStringStage extends Stage {

private static CounterStringStage counterStringSingletonStage=null;
private static Service task;

public static void singletonActivate(){

Expand All @@ -41,38 +37,7 @@ public static void singletonActivate(){
counterStringSingletonStage.requestFocus();
}

private class County{

private List<CounterStringRangeStruct> range;
private CounterStringRangeListIterator ranger;
private CounterString counterstring;
private String spacer;
private Robot robot;

public void createCounterStringRangesFor(int counterStringLength, String spacer) {
this.counterstring = new CounterString();
this.spacer = counterstring.getSingleCharSpacer(spacer);
this.range = counterstring.createCounterStringRangesFor(counterStringLength, spacer);
this.ranger = new CounterStringRangeListIterator(range);
try {
this.robot = new Robot();
} catch (AWTException e) {
e.printStackTrace();
}
}

public boolean hasAnotherValueInRangeList() {
return this.ranger.hasAnotherValueInRangeList();
}

public String getNextCounterStringEntry() {
return counterstring.getCounterStringRepresentationOfNumber(ranger.getNextCounterStringValue(), this.spacer);
}

public Robot getRobot(){
return this.robot;
}
}

public CounterStringStage(boolean hidden) {

Expand Down Expand Up @@ -141,103 +106,154 @@ public CounterStringStage(boolean hidden) {
if(!hidden)
this.show();



// when close stage, stop the counterstring generation
this.addEventHandler(WindowEvent.WINDOW_CLOSE_REQUEST, new EventHandler<Event>() {
@Override
public void handle(Event event) {
if(task!=null) {
if (task.isRunning()) {
task.cancel();
robotType.setText("Robot");
robotType.setTooltip(new Tooltip("Have robot type counterstring into field"));
}
}
}
});

// when focus changes stop the counterstring generation
// this.focusedProperty().addListener(new ChangeListener<Boolean>() {
// @Override
// public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
// if(task!=null) {
// if (task.isRunning()) {
// task.cancel();
// robotType.setText("Robot");
// robotType.setTooltip(new Tooltip("Have robot type counterstring into field"));
// }
// }
// }
// });


County county = new County();


//robot typing into field- never stop thread - once robot is used a thread ticks over in the background
// ready to be re-used
Task task = new Task<Void>() {
task = new Service<Void>() {
@Override
public Void call() throws Exception {
int x=5;
while(true) {
if(robotType.getText().startsWith("Robot")){
x=5;
}
final int finalX = x--;
protected Task<Void> createTask() {
return new Task<Void>(){
@Override
public Void call() throws Exception {
int x=5;

Platform.runLater(new Runnable() {
@Override
public void run() {
while(!isCancelled()) {
if(robotType.getText().startsWith("Robot")){
x=5;
}
final int finalX = x--;

Platform.runLater(new Runnable() {
@Override
public void run() {


// This needs to be a state machine
// Robot means stop don't do anything
// Start means start counting down
// In [ means continue counting
// GO means calculate the counterstring
// ... means iterate through and send the keys
if (robotType.getText().startsWith("Start") || robotType.getText().startsWith("In [")) {
robotType.setText("In [" + finalX + "] secs");
}
if (finalX <= 0) {
robotType.setText("GO");
// calculate counterstring and iterator here

robotType.setText("...");
}
if(robotType.getText().startsWith("...")){
if(county.hasAnotherValueInRangeList()){
String outputString = county.getNextCounterStringEntry();
robotType.setText("..."+outputString);
//System.out.println(outputString);
for(char c : outputString.toCharArray()) {
//System.out.println(""+c);
// this hack means that with robot we should really default to *
if(c=='*'){
county.getRobot().keyPress(KeyEvent.VK_SHIFT);
county.getRobot().keyPress(KeyEvent.VK_8);
county.getRobot().keyRelease(KeyEvent.VK_8);
county.getRobot().keyRelease(KeyEvent.VK_SHIFT);
}else {
county.getRobot().keyPress(KeyEvent.getExtendedKeyCodeForChar(c));
county.getRobot().keyRelease(KeyEvent.getExtendedKeyCodeForChar(c));
// This needs to be a state machine
// Robot means stop don't do anything
// Start means start counting down
// In [ means continue counting
// GO means calculate the counterstring
// ... means iterate through and send the keys
if (robotType.getText().startsWith("Start") || robotType.getText().startsWith("In [")) {
robotType.setText("In [" + finalX + "] secs");
}
if (finalX <= 0) {
robotType.setText("GO");
// calculate counterstring and iterator here

robotType.setText("...");
}
if(robotType.getText().startsWith("...")){
if(county.hasAnotherValueInRangeList()){
String outputString = county.getNextCounterStringEntry();
robotType.setText("..."+outputString);
//System.out.println(outputString);
for(char c : outputString.toCharArray()) {
//System.out.println(""+c);
// this hack means that with robot we should really default to *
if(c=='*'){
county.getRobot().keyPress(KeyEvent.VK_SHIFT);
county.getRobot().keyPress(KeyEvent.VK_8);
county.getRobot().keyRelease(KeyEvent.VK_8);
county.getRobot().keyRelease(KeyEvent.VK_SHIFT);
}else {
county.getRobot().keyPress(KeyEvent.getExtendedKeyCodeForChar(c));
county.getRobot().keyRelease(KeyEvent.getExtendedKeyCodeForChar(c));
}
if(isCancelled()){
break;
}
}
}else{
// we are finished
robotType.setText("Robot");
robotType.setTooltip(new Tooltip("Have robot type counterstring into field"));
cancel();
return;
}
}
}else{
// we are finished
robotType.setText("Robot");
}
});

if(robotType.getText().startsWith("Robot")||robotType.getText().startsWith("In [")) {
Thread.sleep(1000);
}else{
Thread.sleep(10);
x=5;
}
System.out.println("Thread " + x);
}
});

if(robotType.getText().startsWith("Robot")||robotType.getText().startsWith("In [")) {
Thread.sleep(1000);
}else{
Thread.sleep(10);
x=5;
return null;
}
System.out.println("Thread " + x);
}
};
}
};

Thread th = new Thread(task);
th.setDaemon(true);





robotType.setOnAction(
new EventHandler<ActionEvent>() {

@Override
public void handle(ActionEvent e) {


System.out.println("clicked robot");

try {

if(!th.isAlive()) {
th.start();
if(task.isRunning()){
robotType.setText("Cancelling");
task.cancel();
robotType.setText("Robot");
robotType.setTooltip(new Tooltip("Have robot type counterstring into field"));
return;
}


if(robotType.getText().startsWith("Robot")){

county.createCounterStringRangesFor(Integer.parseInt(counterLength.getText()), counterstringSpacer.getText());
robotType.setText("Start");
if(!task.isRunning()){
task.reset();
county.createCounterStringRangesFor(Integer.parseInt(counterLength.getText()), counterstringSpacer.getText());
robotType.setText("Start");
robotType.setTooltip(new Tooltip("Click Button again to cancel Robot Typing"));
task.start();
}

}else{
robotType.setText("Robot");
Expand Down Expand Up @@ -335,6 +351,7 @@ public void handle(ActionEvent e) {
});



}


Expand Down Expand Up @@ -406,4 +423,13 @@ private void sendToClipboard(String contents, Button copyCounter) {
}


public static void stopServices() {
if(task!=null){
if(task.isRunning()){
task.cancel();
task=null;
}
}

}
}
Loading

0 comments on commit 00aae81

Please sign in to comment.