Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest #1

Merged
merged 127 commits into from
Aug 26, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
c86018d
Merge pull request #25 from Hi-Fi/master
MarkusBernhardt Jul 2, 2013
40f4072
#24 - Fixed a NullPointerException in Capture Page Screenshot when Log
MarkusBernhardt Jul 2, 2013
28302ac
Update to aspectj 1.7.3, robot 2.8.1, robotframework-maven-plugin 1.2
MarkusBernhardt Jul 2, 2013
7cee11d
#22 - Fixed that library can't be instrumented with JaCoCo
MarkusBernhardt Jul 9, 2013
8779e44
Add possibility to set logging directory to one different than the Ro…
Aug 8, 2013
b25eb3a
Working proof-of-concept implementation for documentation generation …
Aug 13, 2013
e28131d
Done this in order to pass the JavaLibDoc modifications to new branch
Aug 19, 2013
91aeac6
Add some more documentation to some of the classes
Aug 19, 2013
db2ae6c
Push partial documentation of classes using JavaLib (W.I.P)
Andrei-Straut Aug 19, 2013
c46bf34
BUGFIX: Remove @RobotKeywords annotation from main class, and exclude…
Andrei-Straut Aug 19, 2013
745ea4a
Add Clear Element Text keyword (see HTML/XML doc); also fixed some wr…
Andrei-Straut Aug 20, 2013
d6742d9
Also commit changes to pom
Andrei-Straut Aug 20, 2013
4bf1f28
Set javalib-core version to 1.1, as 1.0.1. doesn't support overloaded…
Andrei-Straut Aug 20, 2013
2e62c6e
FormElement class documented; fixed small documentation errors in pre…
Andrei-Straut Aug 20, 2013
dca4473
Fix this one as well
Andrei-Straut Aug 20, 2013
6bbdb36
A bit of formatting and parameter name fixing
Andrei-Straut Aug 21, 2013
3a62fe4
More keyword documentation added. This should be it
Andrei-Straut Aug 21, 2013
bd122b7
Corrections submitted, passing integration tests
Andrei-Straut Aug 21, 2013
db57482
Reformatting and some enhancements to use in-doc links to keywords.
Andrei-Straut Aug 21, 2013
bac49db
Road map
MarkusBernhardt Sep 4, 2013
cf40841
[maven-release-plugin] prepare release robotframework-selenium2librar…
MarkusBernhardt Sep 4, 2013
bae8751
[maven-release-plugin] prepare for next development iteration
MarkusBernhardt Sep 4, 2013
49ff4e2
Release 1.2.0.13
MarkusBernhardt Sep 4, 2013
f52cd14
Readme
MarkusBernhardt Sep 9, 2013
2e98cf8
Readme
MarkusBernhardt Sep 9, 2013
9fd31cc
#27 - Fixed: Select Window keyword returns
MarkusBernhardt Sep 16, 2013
1233683
Changes
MarkusBernhardt Sep 16, 2013
d129d59
Prepare merge
MarkusBernhardt Sep 16, 2013
9fde384
Switching the library to use JavaLibDoc.
MarkusBernhardt Sep 16, 2013
b9e546c
Merging changes from Andrei. Fixing CI jobs. Formatting.
MarkusBernhardt Sep 16, 2013
0366744
Changes
MarkusBernhardt Sep 16, 2013
9acf78e
Cleanup stuff from migration to AnnotationLibrary
MarkusBernhardt Sep 17, 2013
3cb04c8
Refactoring AnnotationLibrary
MarkusBernhardt Sep 18, 2013
923ea11
Refactoring class hierarchy
MarkusBernhardt Sep 20, 2013
d6788d2
Refactoring
MarkusBernhardt Oct 9, 2013
6d82eed
Refactoring
MarkusBernhardt Oct 11, 2013
cca70f3
Preparing release. Switching to xml-doclet for libdoc generation.
MarkusBernhardt Oct 20, 2013
3adea9a
Refactor libdoc to javadoc
MarkusBernhardt Oct 21, 2013
0551150
Preparing release. Switching to xml-doclet for libdoc generation.
MarkusBernhardt Oct 21, 2013
cc7db4c
Preparing release. Switching to xml-doclet for libdoc generation.
Oct 22, 2013
a6599cc
Preparing release. Switching to xml-doclet for libdoc generation.
MarkusBernhardt Oct 22, 2013
6da178b
Preparing release. Switching to xml-doclet for libdoc generation
MarkusBernhardt Oct 22, 2013
46c3ed0
Preparing release. Switching to xml-doclet for libdoc generation
MarkusBernhardt Oct 22, 2013
eafc1f3
Preparing release. Switching to xml-doclet for libdoc generation
MarkusBernhardt Oct 22, 2013
a9cbbb1
Preparing release. Switching to xml-doclet for libdoc generation
MarkusBernhardt Oct 22, 2013
c442d09
Preparing release. Switching to xml-doclet for libdoc generation
MarkusBernhardt Oct 22, 2013
3a3f5df
Preparing release. Switching to xml-doclet for libdoc generation.
MarkusBernhardt Oct 22, 2013
3b1de05
Preparing release. Switching to xml-doclet for libdoc generation.
MarkusBernhardt Oct 22, 2013
f946780
Preparing release. Switching to xml-doclet for libdoc generation.
MarkusBernhardt Oct 23, 2013
fbd259a
Preparing release. Switching to xml-doclet for libdoc generation.
MarkusBernhardt Oct 23, 2013
371c23a
Preparing release. Switching to xml-doclet for libdoc generation.
MarkusBernhardt Oct 23, 2013
10eedee
Preparing release. Switching to xml-doclet for libdoc generation.
MarkusBernhardt Oct 23, 2013
65a288c
Preparing release. Switching to xml-doclet for libdoc generation.
MarkusBernhardt Oct 24, 2013
147a6c7
Preparing release. Switching to xml-doclet for libdoc generation.
MarkusBernhardt Oct 24, 2013
0d87162
Attach libdoc at release.
MarkusBernhardt Oct 24, 2013
3c40404
Preparing release. Switching to xml-doclet for libdoc generation.
MarkusBernhardt Oct 24, 2013
e9d6a3f
[maven-release-plugin] prepare release robotframework-selenium2librar…
MarkusBernhardt Oct 24, 2013
b579eb5
[maven-release-plugin] prepare for next development iteration
MarkusBernhardt Oct 24, 2013
d363705
Release 1.2.0.14
MarkusBernhardt Oct 24, 2013
d227dd1
Release
MarkusBernhardt Oct 24, 2013
2b9e17a
Readme
MarkusBernhardt Oct 24, 2013
047852e
Fixed typo
MarkusBernhardt Oct 29, 2013
9bef789
Added small test
MarkusBernhardt Nov 1, 2013
e49631f
Porting recent changes of the Python Selenium2Library
MarkusBernhardt Nov 1, 2013
bef926b
Porting recent changes of the Python Selenium2Library
MarkusBernhardt Nov 1, 2013
140f415
Prepare release 1.4.0.0
MarkusBernhardt Nov 6, 2013
f7bff0f
[maven-release-plugin] prepare release robotframework-selenium2librar…
MarkusBernhardt Nov 6, 2013
67d15e0
[maven-release-plugin] prepare for next development iteration
MarkusBernhardt Nov 6, 2013
23799d0
Release 1.4.0.0
MarkusBernhardt Nov 7, 2013
9ff32d5
#40 - Wrong separator in Javadoc2Libdoc
MarkusBernhardt Dec 2, 2013
7a6b223
#40 - Wrong separator in Javadoc2Libdoc
MarkusBernhardt Dec 2, 2013
d2b9e38
#43 - Page Should Contain Button fails to find buttons with the button
MarkusBernhardt Dec 24, 2013
c896401
#43 - Page Should Contain Button fails to find buttons with the button
MarkusBernhardt Dec 24, 2013
d2b4bdd
Test fixed for new google output.
MarkusBernhardt Dec 24, 2013
127d7ad
Test fixed for new google output.
MarkusBernhardt Dec 24, 2013
76b7272
Test fixed for new google output.
MarkusBernhardt Dec 24, 2013
37a3628
Test
MarkusBernhardt Jan 3, 2014
beb5491
Test
MarkusBernhardt Jan 4, 2014
782a454
[maven-release-plugin] prepare release robotframework-selenium2librar…
MarkusBernhardt Jan 4, 2014
0067bb0
[maven-release-plugin] prepare for next development iteration
MarkusBernhardt Jan 4, 2014
3ec001d
Release 1.4.0.1
MarkusBernhardt Jan 4, 2014
30d92fe
DesiredCapabilities can be specified as complex JSON strings now
MarkusBernhardt Jan 5, 2014
857775e
Removed the ffProfileDir argument from Open Browser
MarkusBernhardt Jan 5, 2014
3ff698f
Removed the ffProfileDir argument from Open Browser
MarkusBernhardt Jan 5, 2014
b8508ca
Added browserOptions argument to Open Browser
MarkusBernhardt Jan 5, 2014
bdb063b
Added browserOptions argument to Open Browser
MarkusBernhardt Jan 5, 2014
c9473c9
Added browserOptions argument to Open Browser
MarkusBernhardt Jan 5, 2014
36333cf
Added browserOptions argument to Open Browser
MarkusBernhardt Jan 5, 2014
85237d6
[maven-release-plugin] prepare release robotframework-selenium2librar…
MarkusBernhardt Jan 5, 2014
74d01bc
[maven-release-plugin] prepare for next development iteration
MarkusBernhardt Jan 5, 2014
cde1b44
Release 1.4.0.2
MarkusBernhardt Jan 5, 2014
444e7f6
Removed some redundant logging messages
MarkusBernhardt Jan 5, 2014
304cefe
Fixed a UnicodeDecodeError at logging strings containing backslashes.
MarkusBernhardt Jan 22, 2014
0572e57
[maven-release-plugin] prepare release robotframework-selenium2librar…
MarkusBernhardt Jan 22, 2014
5d4e0e8
[maven-release-plugin] prepare for next development iteration
MarkusBernhardt Jan 22, 2014
0ab9ebb
Release 1.4.0.3
MarkusBernhardt Jan 22, 2014
83545b2
Convert code to be 1.6 compliant and change the target to be 1.6 java
jussimalinen Jan 22, 2014
1ae13f0
Merge pull request #44 from jussimalinen/master
MarkusBernhardt Jan 22, 2014
01b20c8
Make selenium2library-java 1.6 compliant. See #44
MarkusBernhardt Jan 22, 2014
195d8df
[maven-release-plugin] prepare release robotframework-selenium2librar…
MarkusBernhardt Jan 22, 2014
ab00eb1
[maven-release-plugin] prepare for next development iteration
MarkusBernhardt Jan 22, 2014
25cc928
Release 1.4.0.4
MarkusBernhardt Jan 22, 2014
c0c83cd
Fixed the use of == to compare Strings in FormElement. See #49
MarkusBernhardt Feb 27, 2014
f91292d
Fixed 'Get Alert Message'. See #50
MarkusBernhardt Feb 27, 2014
f18e314
Fixed 'Select Window' failing, when the current window is already
MarkusBernhardt Feb 27, 2014
9e94520
[maven-release-plugin] prepare release robotframework-selenium2librar…
MarkusBernhardt Mar 3, 2014
f7272c7
[maven-release-plugin] prepare for next development iteration
MarkusBernhardt Mar 3, 2014
f4bcb98
Release 1.4.0.5
MarkusBernhardt Mar 3, 2014
cb16280
Fixed 'Select Window' always selecting the last window and not the
MarkusBernhardt Mar 4, 2014
cd20160
[maven-release-plugin] prepare release robotframework-selenium2librar…
MarkusBernhardt Mar 4, 2014
5c4b4f7
[maven-release-plugin] prepare for next development iteration
MarkusBernhardt Mar 4, 2014
a90b612
Release 1.4.0.6
MarkusBernhardt Mar 4, 2014
8ea0317
Update Selenium2Library.java
eramitmittal Mar 6, 2014
81bd2dd
Merge pull request #52 from eramitmittal/patch-1
MarkusBernhardt Apr 25, 2014
7a18068
Added null validation of readonly variable in protected boolean
atmcarmo Jun 22, 2014
7c3c8f1
Merge pull request #56 from atcarmo/master
MarkusBernhardt Jul 21, 2014
5d1c774
Changes
MarkusBernhardt Jul 22, 2014
9e9475c
updated selenium-server dependency to 2.43.1
WojtekKowaluk Oct 10, 2014
d3a97f5
Corrected Google Search word
jakubkorepta Oct 13, 2014
0a0c974
fixed JSEvents test
WojtekKowaluk Oct 13, 2014
84e895a
added selendroid
WojtekKowaluk Oct 13, 2014
ed811f5
added appium
WojtekKowaluk Oct 14, 2014
c1634e6
Merge branch 'feature/browser-compatibility-update' into 'master'
WojtekKowaluk Oct 17, 2014
42074c9
Merge pull request #58 from WojtekKowaluk/master
MarkusBernhardt Oct 17, 2014
75dbd98
Allow subclassing of Selenium2Library by moving it to a package.
MarkusBernhardt Oct 24, 2014
e22f692
[maven-release-plugin] prepare release robotframework-selenium2librar…
MarkusBernhardt Oct 24, 2014
2f7ad9e
[maven-release-plugin] prepare for next development iteration
MarkusBernhardt Oct 24, 2014
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
88 changes: 88 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,94 @@
CHANGES
=======

unreleased
----------
* Avoid NullPointerException in isEnabled method. See #53, #56. Great thanks to atcarmo for this patch.
* Updated selenium-server dependency to 2.43.1. See #58. Great thanks to WojtekKowaluk for this patch.
* Corrected Google Search word
* Fixed JSEvents test
* Added Selendroid
* Added Appium
* Allow subclassing of Selenium2Library by moving it to a package.

1.4.0.6
-------
* Fixed 'Select Window' always selecting the last window and not the desired window.

1.4.0.5
-------
* Fixed the use of == to compare Strings in FormElement. See #49
* Fixed 'Get Alert Message'. See #50
* 'Get Alert Message' does not confirm the Alert any more. 'Get Alert Message' + Confirm = 'Confirm Action'.
* Added keyword 'Choose Cancel On Confirmation'
* Added keyword 'Choose Ok On Confirmation'
* Fixed 'Select Window' failing, when the current window is already closed. See #48

1.4.0.4
-------
* Update xml-doclet to 1.0.4
* Make selenium2library-java 1.6 compliant. See #44

1.4.0.3
-------
* Update robotframework to 2.8.3
* Fixed a UnicodeDecodeError at logging strings containing backslashes.

1.4.0.2
-------

* Update selenium to 2.39.0
* Update phantomjsdriver to 1.1.0
* DesiredCapabilities can be specified as complex JSON strings now
* Removed the ffProfileDir argument from Open Browser
* Added browserOptions argument to Open Browser

1.4.0.1
-------

* Fixed wrong separator in Javadoc2Libdoc. See #40
* Fixed Page Should Contain Button fails to find buttons with the button tag. See #43

1.4.0.0
-------

* Porting recent changes in the master branch of the Python Selenium2Library
from id b4a3e500 until cf971d91 to this Java port. This contains roughly:
* Added 'Get Window Size' and 'Set Window Size' keywords matching the Selenium functionality.
* Added new keyword 'Click Element At Coordinates'.
* Added keywords for verifying text entered into textarea elements.
* 'Textarea Should Contain'
* 'Textarea Should Not Contain'
* 'Textarea Value Should Be'
* 'Textarea Value Should Not Be'
* 'Mouse Up' doesn't click any more on the element.
* Raise exception in selecting non-existing item in list. Error handling varies
between single-select and multi-select lists. See keyword documentation for
more information.
* Back-port recent changes from version 1.3 and 1.4 of Python library. See #35
* Jump Version number to 1.4.0.0 to reflect the new version of the Python library.

1.2.0.14
--------

* Fixed an ArrayIndexOutOfBoundsException in the Select Window keyword. See #27
* Added the possibility to set logging directory. See #28.
* Refactoring of the library to a JavaLibCore AnnotationLibrary. See #28.
* Added keyword documentation from library for e.g. Ride. See #16, #28.
* Added keyword missing documentation for new keywords. See #32.
* Added access to the current WebDriver instance from custom libraries. #30
* Generating libdoc from javadoc.

1.2.0.13
--------

* Fixed a NullPointerException in Capture Page Screenshot when Log File is set to NONE. See #24
* Fixed that library can't be instrumented with JaCoCo. See #22
* Update robotframework to 2.8.1
* Update robotframework-maven-plugin to 1.2
* Update aspectj to 1.7.3
* Update java.version to 1.7

1.2.0.12
--------

Expand Down
48 changes: 25 additions & 23 deletions DEPENDENCIES.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
[INFO] ------------------------------------------------------------------------
[INFO] Building Robot Framework :: Selenium2Library 1.2.0.9-SNAPSHOT
[INFO] Building Robot Framework :: Selenium2Library 1.2.0.14-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- maven-dependency-plugin:2.1:tree (default-cli) @ robotframework-selenium2library-java ---
[INFO] com.github.markusbernhardt:robotframework-selenium2library-java:jar:1.2.0.9-SNAPSHOT
[INFO] +- org.seleniumhq.selenium:selenium-server:jar:2.33.0:compile
[INFO] com.github.markusbernhardt:robotframework-selenium2library-java:jar:1.2.0.14-SNAPSHOT
[INFO] +- org.robotframework:javalib-core:jar:1.2:compile
[INFO] | +- commons-collections:commons-collections:jar:3.2:compile
[INFO] | \- com.thoughtworks.paranamer:paranamer:jar:1.1.2:compile
[INFO] +- org.seleniumhq.selenium:selenium-server:jar:2.34.0:compile
[INFO] | +- org.bouncycastle:bcprov-jdk15on:jar:1.48:compile
[INFO] | +- org.bouncycastle:bcpkix-jdk15on:jar:1.48:compile
[INFO] | +- mx4j:mx4j-tools:jar:3.0.1:compile
[INFO] | +- org.mortbay.jetty:servlet-api-2.5:jar:6.1.9:compile
[INFO] | +- org.seleniumhq.selenium:jetty-repacked:jar:7.6.1:compile
[INFO] | +- net.jcip:jcip-annotations:jar:1.0:compile
[INFO] | +- org.seleniumhq.selenium:selenium-java:jar:2.33.0:compile
[INFO] | | +- org.seleniumhq.selenium:selenium-android-driver:jar:2.33.0:compile
[INFO] | | +- org.seleniumhq.selenium:selenium-chrome-driver:jar:2.33.0:compile
[INFO] | | +- org.seleniumhq.selenium:selenium-htmlunit-driver:jar:2.33.0:compile
[INFO] | +- org.seleniumhq.selenium:selenium-java:jar:2.34.0:compile
[INFO] | | +- org.seleniumhq.selenium:selenium-android-driver:jar:2.34.0:compile
[INFO] | | +- org.seleniumhq.selenium:selenium-chrome-driver:jar:2.34.0:compile
[INFO] | | +- org.seleniumhq.selenium:selenium-htmlunit-driver:jar:2.34.0:compile
[INFO] | | | \- net.sourceforge.htmlunit:htmlunit:jar:2.12:compile
[INFO] | | | +- xalan:xalan:jar:2.7.1:compile
[INFO] | | | | \- xalan:serializer:jar:2.7.1:compile
[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:compile
[INFO] | | | +- org.apache.commons:commons-lang3:jar:3.1:compile
[INFO] | | | +- org.apache.httpcomponents:httpmime:jar:4.2.3:compile
[INFO] | | | +- net.sourceforge.htmlunit:htmlunit-core-js:jar:2.12:compile
Expand All @@ -31,39 +33,39 @@
[INFO] | | | +- org.eclipse.jetty:jetty-util:jar:8.1.9.v20130131:compile
[INFO] | | | +- org.eclipse.jetty:jetty-io:jar:8.1.9.v20130131:compile
[INFO] | | | \- org.eclipse.jetty:jetty-http:jar:8.1.9.v20130131:compile
[INFO] | | +- org.seleniumhq.selenium:selenium-firefox-driver:jar:2.33.0:compile
[INFO] | | +- org.seleniumhq.selenium:selenium-firefox-driver:jar:2.34.0:compile
[INFO] | | | \- commons-io:commons-io:jar:2.2:compile
[INFO] | | +- org.seleniumhq.selenium:selenium-ie-driver:jar:2.33.0:compile
[INFO] | | +- org.seleniumhq.selenium:selenium-iphone-driver:jar:2.33.0:compile
[INFO] | | +- org.seleniumhq.selenium:selenium-safari-driver:jar:2.33.0:compile
[INFO] | | +- org.seleniumhq.selenium:selenium-support:jar:2.33.0:compile
[INFO] | | +- org.seleniumhq.selenium:selenium-ie-driver:jar:2.34.0:compile
[INFO] | | +- org.seleniumhq.selenium:selenium-iphone-driver:jar:2.34.0:compile
[INFO] | | +- org.seleniumhq.selenium:selenium-safari-driver:jar:2.34.0:compile
[INFO] | | +- org.seleniumhq.selenium:selenium-support:jar:2.34.0:compile
[INFO] | | \- org.webbitserver:webbit:jar:0.4.14:compile
[INFO] | | \- io.netty:netty:jar:3.5.2.Final:compile
[INFO] | +- org.yaml:snakeyaml:jar:1.8:compile
[INFO] | \- commons-codec:commons-codec:jar:1.6:compile
[INFO] +- com.opera:operadriver:jar:1.1:compile
[INFO] +- com.opera:operadriver:jar:1.5:compile
[INFO] | +- com.opera:operalaunchers:jar:1.1:compile
[INFO] | +- com.google.protobuf:protobuf-java:jar:2.4.1:compile
[INFO] | +- com.google.guava:guava:jar:13.0.1:compile
[INFO] | +- com.google.guava:guava:jar:14.0:compile
[INFO] | +- commons-jxpath:commons-jxpath:jar:1.3:compile
[INFO] | +- org.apache.commons:commons-exec:jar:1.1:compile
[INFO] | \- org.ini4j:ini4j:jar:0.5.2:compile
[INFO] +- com.github.detro.ghostdriver:phantomjsdriver:jar:1.0.3:compile
[INFO] | \- org.seleniumhq.selenium:selenium-remote-driver:jar:2.31.0:compile
[INFO] +- com.github.detro.ghostdriver:phantomjsdriver:jar:1.0.4:compile
[INFO] | \- org.seleniumhq.selenium:selenium-remote-driver:jar:2.33.0:compile
[INFO] | +- cglib:cglib-nodep:jar:2.1_3:compile
[INFO] | +- org.json:json:jar:20080701:compile
[INFO] | +- org.seleniumhq.selenium:selenium-api:jar:2.31.0:compile
[INFO] | +- org.seleniumhq.selenium:selenium-api:jar:2.33.0:compile
[INFO] | +- org.apache.httpcomponents:httpclient:jar:4.2.1:compile
[INFO] | | +- org.apache.httpcomponents:httpcore:jar:4.2.1:compile
[INFO] | | \- commons-logging:commons-logging:jar:1.1.1:compile
[INFO] | +- net.java.dev.jna:jna:jar:3.4.0:compile
[INFO] | \- net.java.dev.jna:platform:jar:3.4.0:compile
[INFO] +- org.robotframework:robotframework:jar:2.8:compile
[INFO] \- org.aspectj:aspectjrt:jar:1.6.11:compile
[INFO] +- org.robotframework:robotframework:jar:2.8.1:compile
[INFO] \- org.aspectj:aspectjrt:jar:1.7.3:compile
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 4.482s
[INFO] Finished at: Wed Jun 12 08:12:03 CEST 2013
[INFO] Final Memory: 11M/81M
[INFO] Total time: 3.454s
[INFO] Finished at: Sat Oct 12 11:58:25 CEST 2013
[INFO] Final Memory: 14M/213M
[INFO] ------------------------------------------------------------------------