You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2022/10/27 06:58:51 UTC
[cayenne] branch master updated (688c19788 -> 62b84421d)
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
from 688c19788 Merge pull request #527 from aperaverzeu/4.3-FEATURE-CAY-2765-add-system-catalogs-for-sqlserver
new 0bba76134 CAY-2765 dbimport: check excluded catalogs and schemas for the SQLServer
new 62b84421d add missing generics
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
RELEASE-NOTES.txt | 2 +-
.../java/org/apache/cayenne/modeler/graph/EntityCellMetadata.java | 4 ++--
.../java/org/apache/cayenne/modeler/graph/ObjEntityCellMetadata.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
[cayenne] 01/02: CAY-2765 dbimport: check excluded catalogs and schemas for the SQLServer
Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 0bba76134ccb3ebafa578c876524c2d7f7257ad2
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Oct 27 09:58:11 2022 +0300
CAY-2765 dbimport: check excluded catalogs and schemas for the SQLServer
---
RELEASE-NOTES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 94bac9286..5ed8a63e1 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -32,4 +32,4 @@ Bug Fixes:
CAY-2755 Modeler: Entities are not sorted by name in the class generation view
CAY-2762 Modeler: Difference in toolbars colors on OSX
-
+CAY-2765 dbimport: check excluded catalogs and schemas for the SQLServer
[cayenne] 02/02: add missing generics
Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 62b84421d773075bbb3348992754c32a2efa857f
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Oct 27 09:58:44 2022 +0300
add missing generics
---
.../java/org/apache/cayenne/modeler/graph/EntityCellMetadata.java | 4 ++--
.../java/org/apache/cayenne/modeler/graph/ObjEntityCellMetadata.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/EntityCellMetadata.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/EntityCellMetadata.java
index 55749744d..c834f15c0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/EntityCellMetadata.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/EntityCellMetadata.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.map.Relationship;
*/
abstract class EntityCellMetadata<E extends Entity<E, A, R>, A extends Attribute<E, A, R>, R extends Relationship<E, A, R>>
implements Serializable {
- GraphBuilder builder;
+ GraphBuilder<E,A,R> builder;
String entityName;
String label;
@@ -37,7 +37,7 @@ abstract class EntityCellMetadata<E extends Entity<E, A, R>, A extends Attribute
EntityCellMetadata() {
}
- EntityCellMetadata(GraphBuilder builder, String entityName) {
+ EntityCellMetadata(GraphBuilder<E,A,R> builder, String entityName) {
this.builder = builder;
this.entityName = entityName;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/ObjEntityCellMetadata.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/ObjEntityCellMetadata.java
index 2c265532a..9926ab7d0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/ObjEntityCellMetadata.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/ObjEntityCellMetadata.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.map.ObjRelationship;
* Descriptor of ObjEntity Cell
*/
class ObjEntityCellMetadata extends EntityCellMetadata<ObjEntity, ObjAttribute, ObjRelationship> {
- ObjEntityCellMetadata(GraphBuilder builder, String entityName) {
+ ObjEntityCellMetadata(GraphBuilder<ObjEntity, ObjAttribute, ObjRelationship> builder, String entityName) {
super(builder, entityName);
}