Skip to content

Commit dfa3455

Browse files
committed
Make all convenience keywords non-static
1 parent f3a4d96 commit dfa3455

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/main/java/javafxlibrary/keywords/AdditionalKeywords/ConvenienceKeywords.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ public Double getScrollBarValue(Object locator){
893893
+ "``locator`` is either a _query_ or _Object:Node_ for identifying the CheckBox element, see "
894894
+ "`3. Locating or specifying UI elements`. \n\n")
895895
@ArgumentNames({ "locator" })
896-
public static Boolean getCheckBoxSelection(Object locator) {
896+
public Boolean getCheckBoxSelection(Object locator) {
897897

898898
try {
899899
CheckBox box = (CheckBox) objectToNode(locator);
@@ -908,7 +908,7 @@ public static Boolean getCheckBoxSelection(Object locator) {
908908
+ "``locator`` is either a _query_ or _Object:Node_ for identifying the RadioButton element, see "
909909
+ "`3. Locating or specifying UI elements`. \n\n")
910910
@ArgumentNames({ "locator" })
911-
public static Object getSelectedRadioButton(Object locator) {
911+
public Object getSelectedRadioButton(Object locator) {
912912

913913
try{
914914
RadioButton rb = (RadioButton)objectToNode(locator);
@@ -1130,7 +1130,7 @@ public void selectContextMenuItem(String item){
11301130
+ "``locator`` is either a _query_ or _Object:Node_ for identifying the ToggleButton element, see "
11311131
+ " `3. Locating or specifying UI elements`. \n\n")
11321132
@ArgumentNames({ "locator" })
1133-
public static Object getProgressBarValue(Object locator) {
1133+
public Object getProgressBarValue(Object locator) {
11341134
try{
11351135
ProgressBar pb = (ProgressBar) objectToNode(locator);
11361136
return mapObject(pb.getProgress());
@@ -1144,7 +1144,7 @@ public static Object getProgressBarValue(Object locator) {
11441144
+ "``timeout`` is the maximum time in seconds that the events will be waited for. If the timeout is "
11451145
+ "exceeded the keyword will fail. Default timeout is 5 seconds.\n\n")
11461146
@ArgumentNames({ "timeout=" })
1147-
public static void waitForEventsInFxApplicationThread(int timeout) throws Throwable {
1147+
public void waitForEventsInFxApplicationThread(int timeout) {
11481148

11491149
final Throwable[] threadException = new JavaFXLibraryNonFatalException[1];
11501150
try {
@@ -1171,7 +1171,7 @@ public static void waitForEventsInFxApplicationThread(int timeout) throws Throwa
11711171
semaphore.acquire();
11721172

11731173
if (threadException[0] != null)
1174-
throw threadException[0];
1174+
throw new JavaFXLibraryNonFatalException(threadException[0].getMessage());
11751175

11761176
} catch (InterruptedException e) {
11771177
throw new JavaFXLibraryNonFatalException("Wait For Events in Fx Application Thread was interrupted: "
@@ -1180,7 +1180,7 @@ public static void waitForEventsInFxApplicationThread(int timeout) throws Throwa
11801180
}
11811181

11821182
@RobotKeywordOverload
1183-
public static void waitForEventsInFxApplicationThread() throws Throwable {
1183+
public void waitForEventsInFxApplicationThread() {
11841184
waitForEventsInFxApplicationThread(HelperFunctions.getWaitUntilTimeout());
11851185
}
11861186
}

0 commit comments

Comments
 (0)