diff --git a/build.xml b/build.xml deleted file mode 100644 index 2e3bdc5..0000000 --- a/build.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - Builds, tests, and runs the project Library. - - - diff --git a/build/built-jar.properties b/build/built-jar.properties deleted file mode 100644 index ce2e78c..0000000 --- a/build/built-jar.properties +++ /dev/null @@ -1,4 +0,0 @@ -#Mon, 06 Jun 2016 11:21:26 +0200 - - -D\:\\PROJEKT\\Library= diff --git a/build/classes/.netbeans_automatic_build b/build/classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/build/classes/.netbeans_update_resources b/build/classes/.netbeans_update_resources deleted file mode 100644 index e69de29..0000000 diff --git a/build/classes/library/Album.class b/build/classes/library/Album.class deleted file mode 100644 index 7228219..0000000 Binary files a/build/classes/library/Album.class and /dev/null differ diff --git a/build/classes/library/AlbumFieldPattern$1.class b/build/classes/library/AlbumFieldPattern$1.class deleted file mode 100644 index 5da79c8..0000000 Binary files a/build/classes/library/AlbumFieldPattern$1.class and /dev/null differ diff --git a/build/classes/library/AlbumFieldPattern$2.class b/build/classes/library/AlbumFieldPattern$2.class deleted file mode 100644 index 1dec74f..0000000 Binary files a/build/classes/library/AlbumFieldPattern$2.class and /dev/null differ diff --git a/build/classes/library/AlbumFieldPattern$3.class b/build/classes/library/AlbumFieldPattern$3.class deleted file mode 100644 index 554ef81..0000000 Binary files a/build/classes/library/AlbumFieldPattern$3.class and /dev/null differ diff --git a/build/classes/library/AlbumFieldPattern$4.class b/build/classes/library/AlbumFieldPattern$4.class deleted file mode 100644 index 2bfe998..0000000 Binary files a/build/classes/library/AlbumFieldPattern$4.class and /dev/null differ diff --git a/build/classes/library/AlbumFieldPattern.class b/build/classes/library/AlbumFieldPattern.class deleted file mode 100644 index c0708a2..0000000 Binary files a/build/classes/library/AlbumFieldPattern.class and /dev/null differ diff --git a/build/classes/library/AlbumFieldPattern.form b/build/classes/library/AlbumFieldPattern.form deleted file mode 100644 index fa48ce0..0000000 --- a/build/classes/library/AlbumFieldPattern.form +++ /dev/null @@ -1,205 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/classes/library/Book.class b/build/classes/library/Book.class deleted file mode 100644 index 5348abd..0000000 Binary files a/build/classes/library/Book.class and /dev/null differ diff --git a/build/classes/library/BookFieldPattern$1.class b/build/classes/library/BookFieldPattern$1.class deleted file mode 100644 index d3887be..0000000 Binary files a/build/classes/library/BookFieldPattern$1.class and /dev/null differ diff --git a/build/classes/library/BookFieldPattern$2.class b/build/classes/library/BookFieldPattern$2.class deleted file mode 100644 index 9c2cde6..0000000 Binary files a/build/classes/library/BookFieldPattern$2.class and /dev/null differ diff --git a/build/classes/library/BookFieldPattern$3.class b/build/classes/library/BookFieldPattern$3.class deleted file mode 100644 index 5a16dbe..0000000 Binary files a/build/classes/library/BookFieldPattern$3.class and /dev/null differ diff --git a/build/classes/library/BookFieldPattern$4.class b/build/classes/library/BookFieldPattern$4.class deleted file mode 100644 index ec8cf7b..0000000 Binary files a/build/classes/library/BookFieldPattern$4.class and /dev/null differ diff --git a/build/classes/library/BookFieldPattern$5.class b/build/classes/library/BookFieldPattern$5.class deleted file mode 100644 index 8c54cae..0000000 Binary files a/build/classes/library/BookFieldPattern$5.class and /dev/null differ diff --git a/build/classes/library/BookFieldPattern.class b/build/classes/library/BookFieldPattern.class deleted file mode 100644 index b831827..0000000 Binary files a/build/classes/library/BookFieldPattern.class and /dev/null differ diff --git a/build/classes/library/BookFieldPattern.form b/build/classes/library/BookFieldPattern.form deleted file mode 100644 index ad9bb3d..0000000 --- a/build/classes/library/BookFieldPattern.form +++ /dev/null @@ -1,304 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/classes/library/Item.class b/build/classes/library/Item.class deleted file mode 100644 index 8d1d869..0000000 Binary files a/build/classes/library/Item.class and /dev/null differ diff --git a/build/classes/library/MainMenu$1.class b/build/classes/library/MainMenu$1.class deleted file mode 100644 index cfb4742..0000000 Binary files a/build/classes/library/MainMenu$1.class and /dev/null differ diff --git a/build/classes/library/MainMenu$2.class b/build/classes/library/MainMenu$2.class deleted file mode 100644 index 57b267c..0000000 Binary files a/build/classes/library/MainMenu$2.class and /dev/null differ diff --git a/build/classes/library/MainMenu$3.class b/build/classes/library/MainMenu$3.class deleted file mode 100644 index b15bf8a..0000000 Binary files a/build/classes/library/MainMenu$3.class and /dev/null differ diff --git a/build/classes/library/MainMenu$4.class b/build/classes/library/MainMenu$4.class deleted file mode 100644 index 25b2003..0000000 Binary files a/build/classes/library/MainMenu$4.class and /dev/null differ diff --git a/build/classes/library/MainMenu$5.class b/build/classes/library/MainMenu$5.class deleted file mode 100644 index 234ad67..0000000 Binary files a/build/classes/library/MainMenu$5.class and /dev/null differ diff --git a/build/classes/library/MainMenu$6.class b/build/classes/library/MainMenu$6.class deleted file mode 100644 index 40d1b7e..0000000 Binary files a/build/classes/library/MainMenu$6.class and /dev/null differ diff --git a/build/classes/library/MainMenu$7.class b/build/classes/library/MainMenu$7.class deleted file mode 100644 index fd37a97..0000000 Binary files a/build/classes/library/MainMenu$7.class and /dev/null differ diff --git a/build/classes/library/MainMenu$8.class b/build/classes/library/MainMenu$8.class deleted file mode 100644 index 357fcf0..0000000 Binary files a/build/classes/library/MainMenu$8.class and /dev/null differ diff --git a/build/classes/library/MainMenu.class b/build/classes/library/MainMenu.class deleted file mode 100644 index 4dd4839..0000000 Binary files a/build/classes/library/MainMenu.class and /dev/null differ diff --git a/build/classes/library/MainMenu.form b/build/classes/library/MainMenu.form deleted file mode 100644 index 5138dfa..0000000 --- a/build/classes/library/MainMenu.form +++ /dev/null @@ -1,476 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/classes/library/Movie.class b/build/classes/library/Movie.class deleted file mode 100644 index 44627d7..0000000 Binary files a/build/classes/library/Movie.class and /dev/null differ diff --git a/build/classes/library/MovieFieldPattern$1.class b/build/classes/library/MovieFieldPattern$1.class deleted file mode 100644 index a6e2d7b..0000000 Binary files a/build/classes/library/MovieFieldPattern$1.class and /dev/null differ diff --git a/build/classes/library/MovieFieldPattern$2.class b/build/classes/library/MovieFieldPattern$2.class deleted file mode 100644 index a030694..0000000 Binary files a/build/classes/library/MovieFieldPattern$2.class and /dev/null differ diff --git a/build/classes/library/MovieFieldPattern$3.class b/build/classes/library/MovieFieldPattern$3.class deleted file mode 100644 index f258b3e..0000000 Binary files a/build/classes/library/MovieFieldPattern$3.class and /dev/null differ diff --git a/build/classes/library/MovieFieldPattern$4.class b/build/classes/library/MovieFieldPattern$4.class deleted file mode 100644 index 03f7714..0000000 Binary files a/build/classes/library/MovieFieldPattern$4.class and /dev/null differ diff --git a/build/classes/library/MovieFieldPattern.class b/build/classes/library/MovieFieldPattern.class deleted file mode 100644 index 696b63e..0000000 Binary files a/build/classes/library/MovieFieldPattern.class and /dev/null differ diff --git a/build/classes/library/MovieFieldPattern.form b/build/classes/library/MovieFieldPattern.form deleted file mode 100644 index 6573f6e..0000000 --- a/build/classes/library/MovieFieldPattern.form +++ /dev/null @@ -1,205 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/classes/library/Validation.class b/build/classes/library/Validation.class deleted file mode 100644 index 460328c..0000000 Binary files a/build/classes/library/Validation.class and /dev/null differ diff --git a/dist/Library.jar b/dist/Library.jar deleted file mode 100644 index b04852e..0000000 Binary files a/dist/Library.jar and /dev/null differ diff --git a/dist/README.TXT b/dist/README.TXT deleted file mode 100644 index 96e2228..0000000 --- a/dist/README.TXT +++ /dev/null @@ -1,32 +0,0 @@ -======================== -BUILD OUTPUT DESCRIPTION -======================== - -When you build an Java application project that has a main class, the IDE -automatically copies all of the JAR -files on the projects classpath to your projects dist/lib folder. The IDE -also adds each of the JAR files to the Class-Path element in the application -JAR files manifest file (MANIFEST.MF). - -To run the project from the command line, go to the dist folder and -type the following: - -java -jar "Library.jar" - -To distribute this project, zip up the dist folder (including the lib folder) -and distribute the ZIP file. - -Notes: - -* If two JAR files on the project classpath have the same name, only the first -JAR file is copied to the lib folder. -* Only JAR files are copied to the lib folder. -If the classpath contains other types of files or folders, these files (folders) -are not copied. -* If a library on the projects classpath also has a Class-Path element -specified in the manifest,the content of the Class-Path element has to be on -the projects runtime path. -* To set a main class in a standard Java project, right-click the project node -in the Projects window and choose Properties. Then click Run and enter the -class name in the Main Class field. Alternatively, you can manually type the -class name in the manifest Main-Class element. diff --git a/manifest.mf b/manifest.mf deleted file mode 100644 index 328e8e5..0000000 --- a/manifest.mf +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -X-COMMENT: Main-Class will be added automatically by build - diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml deleted file mode 100644 index e93721a..0000000 --- a/nbproject/build-impl.xml +++ /dev/null @@ -1,1419 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No tests executed. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set JVM to use for profiling in profiler.info.jvm - Must set profiler agent JVM arguments in profiler.info.jvmargs.agent - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - Must select one file in the IDE or set profile.class - This target only works when run from inside the NetBeans IDE. - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - - - Must select some files in the IDE or set test.includes - - - - - Must select one file in the IDE or set run.class - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - Must select some files in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - Must select one file in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - - - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties deleted file mode 100644 index 89bd372..0000000 --- a/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=0fe82c4e -build.xml.script.CRC32=6ee560e2 -build.xml.stylesheet.CRC32=8064a381@1.79.1.48 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=0fe82c4e -nbproject/build-impl.xml.script.CRC32=3785f28a -nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48 diff --git a/nbproject/private/config.properties b/nbproject/private/config.properties deleted file mode 100644 index e69de29..0000000 diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties deleted file mode 100644 index 53fbddb..0000000 --- a/nbproject/private/private.properties +++ /dev/null @@ -1,6 +0,0 @@ -compile.on.save=true -do.depend=false -do.jar=true -javac.debug=true -javadoc.preview=true -user.properties.file=C:\\Users\\Agnieszka\\AppData\\Roaming\\NetBeans\\8.1\\build.properties diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml deleted file mode 100644 index 67a401a..0000000 --- a/nbproject/private/private.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - file:/D:/PROJEKT/Library/src/library/MovieFieldPattern.java - file:/D:/PROJEKT/Library/src/library/BookFieldPattern.java - file:/D:/PROJEKT/Library/src/library/MainMenu.java - file:/D:/PROJEKT/Library/src/library/Item.java - file:/D:/PROJEKT/Library/src/library/Validation.java - file:/D:/PROJEKT/Library/src/library/Album.java - file:/D:/PROJEKT/Library/src/library/AlbumFieldPattern.java - file:/D:/PROJEKT/Library/src/library/Book.java - file:/D:/PROJEKT/Library/src/library/Database.java - file:/D:/PROJEKT/Library/src/library/ListResult.java - file:/D:/PROJEKT/Library/src/library/Movie.java - - - diff --git a/nbproject/project.properties b/nbproject/project.properties deleted file mode 100644 index 36e423a..0000000 --- a/nbproject/project.properties +++ /dev/null @@ -1,98 +0,0 @@ -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=false -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -application.title=Library -application.vendor=Agnieszka -auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -# Uncomment to specify the preferred debugger connection transport: -#debug.transport=dt_socket -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# Files in build.classes.dir which should be excluded from distribution jar -dist.archive.excludes= -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/Library.jar -dist.javadoc.dir=${dist.dir}/javadoc -endorsed.classpath= -excludes= -file.reference.sqlite-jdbc-3.8.11.2.jar=sqlite-jdbc-3.8.11.2.jar -includes=** -jar.archive.disabled=${jnlp.enabled} -jar.compress=false -jar.index=${jnlp.enabled} -javac.classpath=\ - ${file.reference.sqlite-jdbc-3.8.11.2.jar} -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=false -javac.external.vm=true -javac.processorpath=\ - ${javac.classpath} -javac.source=1.8 -javac.target=1.8 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -jnlp.codebase.type=no.codebase -jnlp.descriptor=application -jnlp.enabled=false -jnlp.mixed.code=default -jnlp.offline-allowed=false -jnlp.signed=false -jnlp.signing= -jnlp.signing.alias= -jnlp.signing.keystore= -main.class=library.MainMenu -# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found. -manifest.custom.application.library.allowable.codebase= -# Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts. -manifest.custom.caller.allowable.codebase= -# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed -manifest.custom.codebase= -# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions) -manifest.custom.permissions= -manifest.file=manifest.mf -meta.inf.dir=${src.dir}/META-INF -mkdist.disabled=false -platform.active=default_platform -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project. -# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value. -# To set system properties for unit tests define test-sys-prop.name=value: -run.jvmargs= -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=UTF-8 -src.dir=src -test.src.dir=test diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index 09271a9..0000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - org.netbeans.modules.java.j2seproject - - - Library - - - - - - - - -