@@ -52,46 +52,47 @@ public interface OntologyFactory extends OWLOntologyFactory, HasAdapter {
5252
5353 /**
5454 * Adds the specified ontology into the manager and performs some final tuning actions.
55+ *
5556 * @param manager {@link OntologyManager} the ontology manager, which will hold the {@code model}, not {@code null}
56- * @param model {@link OntologyModel } that has been created by the {@link #getBuilder() Builder}, not {@code null}
57+ * @param model {@link Ontology } that has been created by the {@link #getBuilder() Builder}, not {@code null}
5758 * @since 1.4.2
5859 */
59- void includeOntology (OntologyManager manager , OntologyModel model );
60+ void includeOntology (OntologyManager manager , Ontology model );
6061
6162 /**
62- * Creates a fresh {@link OntologyModel Ontology Model} inside the manager
63+ * Creates a fresh {@link Ontology Ontology Model} inside the manager
6364 * with the given ID and default configuration.
6465 *
6566 * @param manager {@link OntologyManager} the ontology manager to set, not {@code null}
6667 * @param id {@link ID} the ID of the ontology to create, not {@code null}
67- * @return {@link OntologyModel }
68+ * @return {@link Ontology }
6869 * @throws OntApiException if something goes wrong
6970 * @since 1.3.0
7071 */
71- default OntologyModel createOntology (OntologyManager manager , ID id ) throws OntApiException {
72- OntologyModel res = getBuilder ().createOntology (id , manager , manager .getOntologyLoaderConfiguration ());
72+ default Ontology createOntology (OntologyManager manager , ID id ) throws OntApiException {
73+ Ontology res = getBuilder ().createOntology (id , manager , manager .getOntologyLoaderConfiguration ());
7374 includeOntology (manager , res );
7475 return res ;
7576 }
7677
7778 /**
7879 * Reads a graph from the given document source and stores
79- * it as a ready to use {@link OntologyModel Ontology Model} in the specified manager.
80+ * it as a ready to use {@link Ontology Ontology Model} in the specified manager.
8081 * {@inheritDoc}
8182 *
8283 * @param manager {@link OntologyManager} manager the ontology manager to set, not {@code null}
8384 * @param source {@link OWLOntologyDocumentSource} the document source that provides the means
8485 * of getting a representation of a document, not {@code null}
8586 * @param config {@link OntLoaderConfiguration} settings to manage loading process, not {@code null}
86- * @return {@link OntologyModel }
87+ * @return {@link Ontology }
8788 * @throws OWLOntologyCreationException if the ontology could not be created due to some I/O problem,
8889 * broken source or incompatible state of manager
8990 * @throws OntApiException if something else goes wrong
9091 * @since 1.3.0
9192 */
92- default OntologyModel loadOntology (OntologyManager manager ,
93- OWLOntologyDocumentSource source ,
94- OntLoaderConfiguration config ) throws OWLOntologyCreationException , OntApiException {
93+ default Ontology loadOntology (OntologyManager manager ,
94+ OWLOntologyDocumentSource source ,
95+ OntLoaderConfiguration config ) throws OWLOntologyCreationException , OntApiException {
9596 return getLoader ().loadOntology (getBuilder (), manager , source , config );
9697 }
9798
@@ -131,14 +132,14 @@ default boolean canAttemptLoading(OWLOntologyDocumentSource source) {
131132 * @param id {@link OWLOntologyID} the ID of the ontology to create, not {@code null}
132133 * @param documentIRI unused parameter
133134 * @param handler unused parameter
134- * @return {@link OntologyModel } the newly created ontology
135+ * @return {@link Ontology } the newly created ontology
135136 * @throws OntApiException if something goes wrong
136137 */
137138 @ Override
138- default OntologyModel createOWLOntology (OWLOntologyManager manager ,
139- OWLOntologyID id ,
140- IRI documentIRI ,
141- OWLOntologyCreationHandler handler ) {
139+ default Ontology createOWLOntology (OWLOntologyManager manager ,
140+ OWLOntologyID id ,
141+ IRI documentIRI ,
142+ OWLOntologyCreationHandler handler ) {
142143 Adapter adapter = getAdapter ();
143144 return createOntology (adapter .asONT (manager ), adapter .asONT (id ));
144145 }
@@ -152,16 +153,16 @@ default OntologyModel createOWLOntology(OWLOntologyManager manager,
152153 * @param handler unused parameter
153154 * @param config {@link OWLOntologyLoaderConfiguration} a configuration object which can be used
154155 * to pass various options to th loader, not {@code null}
155- * @return {@link OntologyModel } the newly created and loaded ontology
156+ * @return {@link Ontology } the newly created and loaded ontology
156157 * @throws OWLOntologyCreationException if the ontology could not be created due to some I/O problem,
157158 * broken source or incompatible state of manager
158159 * @throws OntApiException if something else goes wrong
159160 */
160161 @ Override
161- default OntologyModel loadOWLOntology (OWLOntologyManager manager ,
162- OWLOntologyDocumentSource source ,
163- OWLOntologyCreationHandler handler ,
164- OWLOntologyLoaderConfiguration config ) throws OWLOntologyCreationException {
162+ default Ontology loadOWLOntology (OWLOntologyManager manager ,
163+ OWLOntologyDocumentSource source ,
164+ OWLOntologyCreationHandler handler ,
165+ OWLOntologyLoaderConfiguration config ) throws OWLOntologyCreationException {
165166 Adapter adapter = getAdapter ();
166167 return loadOntology (adapter .asONT (manager ), source , adapter .asONT (config ));
167168 }
@@ -174,7 +175,7 @@ default OntologyModel loadOWLOntology(OWLOntologyManager manager,
174175 interface Builder extends OntologyCreator , HasAdapter , OWLOntologyBuilder {
175176
176177 @ Override
177- default OntologyModel createOWLOntology (OWLOntologyManager manager , OWLOntologyID id ) {
178+ default Ontology createOWLOntology (OWLOntologyManager manager , OWLOntologyID id ) {
178179 Adapter adapter = getAdapter ();
179180 return createOntology (adapter .asONT (id ), adapter .asONT (manager ),
180181 adapter .asONT (manager .getOntologyLoaderConfiguration ()));
0 commit comments