8000 [R] SeleniumQueryObject's static function calls moved to SeleniumQuer… · seleniumQuery/seleniumQuery@fdeca0b · GitHub
[go: up one dir, main page]
Skip to content

Commit fdeca0b

Browse files
acdcjunioracdcjunior
committed
[R] SeleniumQueryObject's static function calls moved to SeleniumQueryFunctions
1 parent 66dbd5a commit fdeca0b

File tree

3 files changed

+142
-59
lines changed

3 files changed

+142
-59
lines changed

‎src/main/java/io/github/seleniumquery/SeleniumQueryObject.java

Lines changed: 28 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,6 @@
2020
import io.github.seleniumquery.functions.SeleniumQueryFunctions;
2121
import io.github.seleniumquery.functions.as.SeleniumQueryPlugin;
2222
import io.github.seleniumquery.functions.as.StandardPlugins;
23-
import io.github.seleniumquery.functions.jquery.attributes.AttrFunction;
24-
import io.github.seleniumquery.functions.jquery.attributes.HasClassFunction;
25-
import io.github.seleniumquery.functions.jquery.attributes.RemoveAttrFunction;
26-
import io.github.seleniumquery.functions.jquery.events.ClickFunction;
27-
import io.github.seleniumquery.functions.jquery.forms.FocusFunction;
28-
import io.github.seleniumquery.functions.jquery.forms.SubmitFunction;
29-
import io.github.seleniumquery.functions.jquery.manipulation.HtmlFunction;
30-
import io.github.seleniumquery.functions.jquery.manipulation.TextFunction;
31-
import io.github.seleniumquery.functions.jquery.miscellaneous.GetFunction;
32-
import io.github.seleniumquery.functions.jquery.miscellaneous.ToArrayFunction;
33-
import io.github.seleniumquery.functions.jquery.traversing.filtering.*;
34-
import io.github.seleniumquery.functions.jquery.traversing.treetraversal.ChildrenFunction;
35-
import io.github.seleniumquery.functions.jquery.traversing.treetraversal.ClosestFunction;
36-
import io.github.seleniumquery.functions.jquery.traversing.treetraversal.FindFunction;
37-
import io.github.seleniumquery.functions.jquery.traversing.treetraversal.ParentFunction;
3823
import io.github.seleniumquery.utils.ListUtils;
3924
import io.github.seleniumquery.wait.SeleniumQueryWaitUntil;
4025
import org.apache.commons.logging.Log;
@@ -255,7 +240,7 @@ public int size() {
255240
* @since 0.9.0
256241
*/
257242
public SeleniumQueryObject not(String selector) {
258-
return NotFunction.not(this, selector);
243+
return seleniumQueryFunctions.notSelector(this, selector);
259244
}
260245

261246
/**
@@ -269,7 +254,7 @@ public SeleniumQueryObject not(String selector) {
269254
* @since 0.9.0
270255
*/
271256
public SeleniumQueryObject first() {
272-
return FirstFunction.first(this);
257+
return seleniumQueryFunctions.first(this);
273258
}
274259

275260
/**
@@ -283,7 +268,7 @@ public SeleniumQueryObject first() {
283268
* @since 0.9.0
284269
*/
285270
public SeleniumQueryObject last() {
286-
return LastFunction.last(this);
271+
return seleniumQueryFunctions.last(this);
287272
}
288273

289274
/**
@@ -297,7 +282,7 @@ public SeleniumQueryObject last() {
297282
* @since 0.9.0
298283
*/
299284
public SeleniumQueryObject eq(int index) {
300-
return EqFunction.eq(this, index);
285+
return seleniumQueryFunctions.eqIndex(this, index);
301286
}
302287

303288
/**
@@ -317,7 +302,7 @@ public String text() {
317302
// It is impossible to read text from hidden elements in Selenium:
318303
// Since a user cannot read text in a hidden element, WebDriver will not allow access to it as well.
319304
// More in WebDriver FAQs: https://code.google.com/p/selenium/wiki/FrequentlyAskedQuestions#Q:_Why_is_it_not_possible_to_interact_with_hidden_elements?
320-
return TextFunction.text(this);
305+
return seleniumQueryFunctions.text(this);
321306
}
322307

323308
/**
@@ -329,7 +314,7 @@ public String text() {
329314
* @since 0.9.0
330315
*/
331316
public SeleniumQueryObject click() {
332-
return ClickFunction.click(this);
317+
return seleniumQueryFunctions.click(this);
333318
}
334319

335320
/**
@@ -341,7 +326,7 @@ public SeleniumQueryObject click() {
341326
* @since 0.9.0
342327
*/
343328
public SeleniumQueryObject val(String value) {
344-
return seleniumQueryFunctions.valWrite(this, value);
329+
return seleniumQueryFunctions.valueWrite(this, value);
345330
}
346331

347332
/**
@@ -353,7 +338,7 @@ public SeleniumQueryObject val(String value) {
353338
* @since 0.9.0
354339
*/
355340
public SeleniumQueryObject val(Number value) {
356-
return seleniumQueryFunctions.valWrite(this, value);
341+
return seleniumQueryFunctions.valueWrite(this, value);
357342
}
358343

359344
/**
@@ -364,7 +349,7 @@ public SeleniumQueryObject val(Number value) {
364349
* @since 0.9.0
365350
*/
366351
public String val() {
367-
return seleniumQueryFunctions.valRead(this);
352+
return seleniumQueryFunctions.valueRead(this);
368353
}
369354

370355
/**
@@ -388,7 +373,7 @@ public SeleniumQueryObject end() {
388373
* @since 0.9.0
389374
*/
390375
public SeleniumQueryObject find(String selector) {
391-
return FindFunction.find(this, selector);
376+
return seleniumQueryFunctions.findSelector(this, selector);
392377
}
393378

394379
/**
@@ -400,7 +385,7 @@ public SeleniumQueryObject find(String selector) {
400385
* @since 0.9.0
401386
*/
402387
public String attr(String attributeName) {
403-
return AttrFunction.attr(this, attributeName);
388+
return seleniumQueryFunctions.attributeRead(this, attributeName);
404389
}
405390

406391
/**
@@ -418,7 +403,7 @@ public String attr(String attributeName) {
418403
* @since 0.9.0
419404
*/
420405
public SeleniumQueryObject attr(String attributeName, Object value) {
421-
return AttrFunction.attr(this, attributeName, value);
406+
return seleniumQueryFunctions.attributeWrite(this, attributeName, value);
422407
}
423408

424409
/**
@@ -431,7 +416,7 @@ public SeleniumQueryObject attr(String attributeName, Object value) {
431416
* @since 0.9.0
432417
*/
433418
public <T> T prop(String propertyName) {
434-
return seleniumQueryFunctions.propRead(this, propertyName);
419+
return seleniumQueryFunctions.propertyRead(this, propertyName);
435420
}
436421

437422
/**
@@ -449,7 +434,7 @@ public <T> T prop(String propertyName) {
449434
* @since 0.9.0
450435
*/
451436
public SeleniumQueryObject prop(String propertyName, Object value) {
452-
return seleniumQueryFunctions.propWrite(this, propertyName, value);
437+
return seleniumQueryFunctions.propertyWrite(this, propertyName, value);
453438
}
454439

455440
/**
@@ -461,7 +446,7 @@ public SeleniumQueryObject prop(String propertyName, Object value) {
461446
* @since 0.9.0
462447
*/
463448
public WebElement get(int index) {
464-
return GetFunction.get(this, index);
449+
return seleniumQueryFunctions.getIndex(this, index);
465450
}
466451

467452
/**
@@ -485,7 +470,7 @@ public List<WebElement> get() {
485470
* @since 0.9.0]
486471
*/
487472
public SeleniumQueryObject removeAttr(String attributeNames) {
488-
return RemoveAttrFunction.removeAttr(this, attributeNames);
473+
return seleniumQueryFunctions.removeAttribute(this, attributeNames);
489474
}
490475

491476
/**
@@ -496,7 +481,7 @@ public SeleniumQueryObject removeAttr(String attributeNames) {
496481
* @since 0.9.0
497482
*/
498483
public String html() {
499-
return HtmlFunction.html(this);
484+
return seleniumQueryFunctions.html(this);
500485
}
501486

502487
/**
@@ -509,7 +494,7 @@ public String html() {
509494
* @since 0.9.0
510495
*/
511496
public boolean is(String selector) {
512-
return seleniumQueryFunctions.isFunction(this, selector);
497+
return seleniumQueryFunctions.isSelector(this, selector);
513498
}
514499

515500
/**
@@ -521,7 +506,7 @@ public boolean is(String selector) {
521506
* @since 0.9.0
522507
*/
523508
public boolean hasClass(String className) {
524-
return HasClassFunction.hasClass(this, className);
509+
return seleniumQueryFunctions.hasClass(this, className);
525510
}
526511

527512
/**
@@ -532,7 +517,7 @@ public boolean hasClass(String className) {
532517
* @since 0.9.0
533518
*/
534519
public WebElement[] toArray() {
535-
return ToArrayFunction.toArray(this);
520+
return seleniumQueryFunctions.toArray(this);
536521
}
537522

538523
/**
@@ -546,7 +531,7 @@ public WebElement[] toArray() {
546531
* @since 0.9.0
547532
*/
548533
public SeleniumQueryObject closest(String selector) {
549-
return ClosestFunction.closest(this, selector);
534+
return seleniumQueryFunctions.closestSelector(this, selector);
550535
}
551536

552537
/**
@@ -561,7 +546,7 @@ public SeleniumQueryObject closest(String selector) {
561546
* @since 0.9.0
562547
*/
563548
public SeleniumQueryObject focus() {
564-
return FocusFunction.focus(this);
549+
return seleniumQueryFunctions.focus(this);
565550
}
566551

567552
/**
@@ -572,7 +557,7 @@ public SeleniumQueryObject focus() {
572557
* @since 0.9.0
573558
*/
574559
public SeleniumQueryObject children() {
575-
return ChildrenFunction.children(this);
560+
return seleniumQueryFunctions.children(this);
576561
}
577562

578563
/**
@@ -584,7 +569,7 @@ public SeleniumQueryObject children() {
584569
* @since 0.9.0
585570
*/
586571
public SeleniumQueryObject children(String selector) {
587-
return ChildrenFunction.children(this, selector);
572+
return seleniumQueryFunctions.childrenSelector(this, selector);
588573
}
589574

590575
/**
@@ -597,7 +582,7 @@ public SeleniumQueryObject children(String selector) {
597582
* @since 0.9.0
598583
*/
599584
public SeleniumQueryObject parent() {
600-
return ParentFunction.parent(this);
585+
return seleniumQueryFunctions.parent(this);
601586
}
602587

603588
/**
@@ -613,7 +598,7 @@ public SeleniumQueryObject parent() {
613598
* @since 0.9.0
614599
*/
615600
public SeleniumQueryObject parent(String selector) {
616-
return ParentFunction.parent(this, selector);
601+
return seleniumQueryFunctions.parentSelector(this, selector);
617602
}
618603

619604
/**
@@ -629,8 +614,7 @@ public SeleniumQueryObject parent(String selector) {
629614
* @since 0.9.0
630615
*/
631616
public SeleniumQueryObject submit() {
632-
SubmitFunction.submit(this);
633-
return this;
617+
return seleniumQueryFunctions.submit(this);
634618
}
635619

636620
/**
@@ -670,7 +654,7 @@ public String toString() {
670654
* @since 0.11.0
671655
*/
672656
public SeleniumQueryObject filter(Predicate<WebElement> filterFunction) {
673-
return seleniumQueryFunctions.filterFunction(this, filterFunction);
657+
return seleniumQueryFunctions.filterPredicate(this, filterFunction);
674658
}
675659

676660
}

0 commit comments

Comments
 (0)
0