Skip to content

Commit

Permalink
v4.9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@herve91
herve91 committed Apr 26, 2023
1 parent 3f08f3f commit b4448f7
Show file tree
Hide file tree
Showing 14 changed files with 127 additions and 110 deletions.
2 changes: 1 addition & 1 deletion sources/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Database export / import plugin for Archimate Tool
Bundle-SymbolicName: org.archicontribs.database;singleton:=true
Bundle-Version: 4.9.0.beta
Bundle-Version: 4.9.1
Bundle-Vendor: Herve Jouin
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Expand Down
3 changes: 3 additions & 0 deletions sources/src/org/archicontribs/database/DBPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,13 @@
* Fix folder when import individual component
* Fix import and export windows default location
* Fix import relationships in right folder
* Fix database upgrade for Oracle engine
* Improve specializations management during export to database
* Add Options tab in preference page to reduce window size
* Add model metadata in compare to database process
*
* v4.9.1 01/12/2021 Fix parent folder of imported components when merging models
*
* -----------------------------------------------------------------------------------------
*
* TO-DO list:
Expand Down
8 changes: 4 additions & 4 deletions sources/src/org/archicontribs/database/GUI/DBGuiComponentHistory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,13 +210,13 @@ public void widgetSelected(SelectionEvent e) {
IDBImportCommand command = null;

if ( importedComponent instanceof IArchimateElement )
command = new DBImportElementFromIdCommand(importConnection, importedModel, null, parentFolder, id, version, DBImportMode.forceSharedMode, true);
command = new DBImportElementFromIdCommand(importConnection, importedModel, null, null, parentFolder, id, version, DBImportMode.forceSharedMode, true);
else if ( importedComponent instanceof IArchimateRelationship )
command = new DBImportRelationshipFromIdCommand(importConnection, importedModel, null, parentFolder, id, version, DBImportMode.forceSharedMode);
command = new DBImportRelationshipFromIdCommand(importConnection, importedModel, null, null, parentFolder, id, version, DBImportMode.forceSharedMode);
else if ( importedComponent instanceof IFolder )
command = new DBImportFolderFromIdCommand(importConnection, importedModel, parentFolder, id, version, DBImportMode.forceSharedMode);
command = new DBImportFolderFromIdCommand(importConnection, importedModel, null, parentFolder, id, version, DBImportMode.forceSharedMode);
else if ( importedComponent instanceof IArchimateDiagramModel || importedComponent instanceof ICanvasModel || importedComponent instanceof ISketchModel )
command = new DBImportViewFromIdCommand(importConnection, importedModel, parentFolder, id, version, DBImportMode.forceSharedMode, true);
command = new DBImportViewFromIdCommand(importConnection, importedModel, null, parentFolder, id, version, DBImportMode.forceSharedMode, true);
else
throw new Exception("Cannot import components of class "+importedComponent.getClass().getSimpleName());

Expand Down
34 changes: 17 additions & 17 deletions sources/src/org/archicontribs/database/GUI/DBGuiExportModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2201,7 +2201,7 @@ protected void export() {
DBMetadata versionToImport = this.exportConnection.getFoldersNotInModel().get(id);
if ( versionToImport.getInitialVersion().getVersion() == 0 ) {
if ( logger.isDebugEnabled() ) logger.debug("The folder id "+id+" has been created in the database. We import it from the database.");
undoableCommands.checkAndExecute(new DBImportFolderFromIdCommand(importConnection, this.exportedModel, null, id, versionToImport.getLatestDatabaseVersion().getVersion(), DBImportMode.forceSharedMode));
undoableCommands.checkAndExecute(new DBImportFolderFromIdCommand(importConnection, this.exportedModel, null, null, id, versionToImport.getLatestDatabaseVersion().getVersion(), DBImportMode.forceSharedMode));
incrementText(this.txtNewFoldersInDatabase);
incrementText(this.txtTotalFolders);
} else {
Expand All @@ -2217,7 +2217,7 @@ protected void export() {
IFolder folder = foldersIterator.next().getValue();
if ( this.exportedModel.getDBMetadata(folder).getDatabaseStatus() == DATABASE_STATUS.isUpadtedInDatabase ) {
if ( logger.isDebugEnabled() ) logger.debug("The folder id "+folder.getId()+" has been updated in the database. We import the new version from the database.");
undoableCommands.checkAndExecute(new DBImportFolderFromIdCommand(importConnection, this.exportedModel, null, folder.getId(), 0, DBImportMode.forceSharedMode));
undoableCommands.checkAndExecute(new DBImportFolderFromIdCommand(importConnection, this.exportedModel, null, null, folder.getId(), 0, DBImportMode.forceSharedMode));
incrementText(this.txtUpdatedFoldersInDatabase);
}
}
Expand All @@ -2233,7 +2233,7 @@ protected void export() {
DBMetadata versionToImport = this.exportConnection.getElementsNotInModel().get(id);
if ( versionToImport.getInitialVersion().getVersion() == 0 ) {
if ( logger.isDebugEnabled() ) logger.debug("The element id "+id+" has been created in the database. We import it from the database.");
undoableCommands.checkAndExecute(new DBImportElementFromIdCommand(importConnection, this.exportedModel, null, null, id, versionToImport.getLatestDatabaseVersion().getVersion(), DBImportMode.forceSharedMode, false));
undoableCommands.checkAndExecute(new DBImportElementFromIdCommand(importConnection, this.exportedModel, null, null, null, id, versionToImport.getLatestDatabaseVersion().getVersion(), DBImportMode.forceSharedMode, false));
incrementText(this.txtNewElementsInDatabase);
incrementText(this.txtTotalElements);
} else {
Expand All @@ -2249,7 +2249,7 @@ protected void export() {
IArchimateElement element = elementsIterator.next().getValue();
if ( this.exportedModel.getDBMetadata(element).getDatabaseStatus() == DATABASE_STATUS.isUpadtedInDatabase ) {
if ( logger.isDebugEnabled() ) logger.debug("The element id "+element.getId()+" has been updated in the database. We import the new version from the database.");
undoableCommands.checkAndExecute(new DBImportElementFromIdCommand(importConnection, this.exportedModel, null, null, element.getId(), 0, DBImportMode.forceSharedMode, false));
undoableCommands.checkAndExecute(new DBImportElementFromIdCommand(importConnection, this.exportedModel, null, null, null, element.getId(), 0, DBImportMode.forceSharedMode, false));
incrementText(this.txtUpdatedElementsInDatabase);
}
}
Expand All @@ -2264,7 +2264,7 @@ protected void export() {
DBMetadata versionToImport = this.exportConnection.getRelationshipsNotInModel().get(id);
if ( versionToImport.getInitialVersion().getVersion() == 0 ) {
if ( logger.isDebugEnabled() ) logger.debug("The relationship id "+id+" has been created in the database. We import it from the database.");
undoableCommands.checkAndExecute(new DBImportRelationshipFromIdCommand(importConnection, this.exportedModel, null, null, id, versionToImport.getLatestDatabaseVersion().getVersion(), DBImportMode.forceSharedMode));
undoableCommands.checkAndExecute(new DBImportRelationshipFromIdCommand(importConnection, this.exportedModel, null, null, null, id, versionToImport.getLatestDatabaseVersion().getVersion(), DBImportMode.forceSharedMode));
incrementText(this.txtNewRelationshipsInDatabase);
incrementText(this.txtTotalRelationships);
} else {
Expand All @@ -2280,7 +2280,7 @@ protected void export() {
IArchimateRelationship relationship = relationshipsIterator.next().getValue();
if ( this.exportedModel.getDBMetadata(relationship).getDatabaseStatus() == DATABASE_STATUS.isUpadtedInDatabase ) {
if ( logger.isDebugEnabled() ) logger.debug("The relationship id "+relationship.getId()+" has been updated in the database. We import the new version from the database.");
undoableCommands.checkAndExecute(new DBImportRelationshipFromIdCommand(importConnection, this.exportedModel, null, null, relationship.getId(), 0, DBImportMode.forceSharedMode));
undoableCommands.checkAndExecute(new DBImportRelationshipFromIdCommand(importConnection, this.exportedModel, null, null, null, relationship.getId(), 0, DBImportMode.forceSharedMode));
incrementText(this.txtUpdatedRelationshipsInDatabase);
}
}
Expand All @@ -2295,7 +2295,7 @@ protected void export() {
DBMetadata versionToImport = this.exportConnection.getViewsNotInModel().get(id);
if ( versionToImport.getInitialVersion().getVersion() == 0 ) {
if ( logger.isDebugEnabled() ) logger.debug("The view id "+id+" has been created in the database. We import it in the model.");
undoableCommands.checkAndExecute(new DBImportViewFromIdCommand(importConnection, this.exportedModel, null, id, versionToImport.getLatestDatabaseVersion().getVersion(), DBImportMode.forceSharedMode, false));
undoableCommands.checkAndExecute(new DBImportViewFromIdCommand(importConnection, this.exportedModel, null, null, id, versionToImport.getLatestDatabaseVersion().getVersion(), DBImportMode.forceSharedMode, false));
incrementText(this.txtNewViewsInDatabase);
incrementText(this.txtTotalViews);
} else {
Expand All @@ -2311,7 +2311,7 @@ protected void export() {
IDiagramModel view = viewsIterator.next().getValue();
if ( this.exportedModel.getDBMetadata(view).getDatabaseStatus() == DATABASE_STATUS.isUpadtedInDatabase ) {
if ( logger.isDebugEnabled() ) logger.debug("The view id "+view.getId()+" has been updated in the database. We import the new version from the database.");
undoableCommands.checkAndExecute(new DBImportViewFromIdCommand(importConnection, this.exportedModel, null, view.getId(), 0, DBImportMode.forceSharedMode, false));
undoableCommands.checkAndExecute(new DBImportViewFromIdCommand(importConnection, this.exportedModel, null, null, view.getId(), 0, DBImportMode.forceSharedMode, false));
incrementText(this.txtUpdatedViewsInDatabase);
}
}
Expand All @@ -2326,7 +2326,7 @@ protected void export() {
DBMetadata versionToImport = this.exportConnection.getViewObjectsNotInModel().get(id);
if ( versionToImport.getInitialVersion().getVersion() == 0 ) {
if ( logger.isDebugEnabled() ) logger.debug("The view object id "+id+" has been created in the database. We import it in the model.");
undoableCommands.checkAndExecute(new DBImportViewObjectFromIdCommand(importConnection, this.exportedModel, id, versionToImport.getLatestDatabaseVersion().getVersion(), false, DBImportMode.forceSharedMode));
undoableCommands.checkAndExecute(new DBImportViewObjectFromIdCommand(importConnection, this.exportedModel, null, id, versionToImport.getLatestDatabaseVersion().getVersion(), false, DBImportMode.forceSharedMode));
incrementText(this.txtNewViewObjectsInDatabase);
incrementText(this.txtTotalViewObjects);
} else {
Expand All @@ -2342,7 +2342,7 @@ protected void export() {
IDiagramModelObject viewObject = viewObjectsIterator.next().getValue();
if ( this.exportedModel.getDBMetadata(viewObject).getDatabaseStatus() == DATABASE_STATUS.isUpadtedInDatabase ) {
if ( logger.isDebugEnabled() ) logger.debug("The view object id "+viewObject.getId()+" has been updated in the database. We import the new version from the database.");
undoableCommands.checkAndExecute(new DBImportViewObjectFromIdCommand(importConnection, this.exportedModel, viewObject.getId(), 0, false, DBImportMode.forceSharedMode));
undoableCommands.checkAndExecute(new DBImportViewObjectFromIdCommand(importConnection, this.exportedModel, null, viewObject.getId(), 0, false, DBImportMode.forceSharedMode));
incrementText(this.txtUpdatedViewObjectsInDatabase);
}
}
Expand All @@ -2357,7 +2357,7 @@ protected void export() {
DBMetadata versionToImport = this.exportConnection.getViewConnectionsNotInModel().get(id);
if ( versionToImport.getInitialVersion().getVersion() == 0 ) {
if ( logger.isDebugEnabled() ) logger.debug("The view connection id "+id+" has been created in the database. We import it in the model.");
undoableCommands.checkAndExecute(new DBImportViewConnectionFromIdCommand(importConnection, this.exportedModel, id, versionToImport.getLatestDatabaseVersion().getVersion(), false, DBImportMode.forceSharedMode));
undoableCommands.checkAndExecute(new DBImportViewConnectionFromIdCommand(importConnection, this.exportedModel, null, id, versionToImport.getLatestDatabaseVersion().getVersion(), false, DBImportMode.forceSharedMode));
incrementText(this.txtNewViewConnectionsInDatabase);
incrementText(this.txtTotalViewConnections);
} else {
Expand All @@ -2373,7 +2373,7 @@ protected void export() {
IDiagramModelConnection viewConnection = viewConnectionsIterator.next().getValue();
if ( this.exportedModel.getDBMetadata(viewConnection).getDatabaseStatus() == DATABASE_STATUS.isUpadtedInDatabase ) {
if ( logger.isDebugEnabled() ) logger.debug("The view connection id "+viewConnection.getId()+" has been updated in the database. We import the new version from the database.");
undoableCommands.checkAndExecute(new DBImportViewConnectionFromIdCommand(importConnection, this.exportedModel, viewConnection.getId(), 0, false, DBImportMode.forceSharedMode));
undoableCommands.checkAndExecute(new DBImportViewConnectionFromIdCommand(importConnection, this.exportedModel, null, viewConnection.getId(), 0, false, DBImportMode.forceSharedMode));
incrementText(this.txtUpdatedViewConnectionsInDatabase);
}
}
Expand All @@ -2391,19 +2391,19 @@ protected void export() {
int latestDatabaseVersion = metadata.getLatestDatabaseVersion().getVersion();

if ( componentToImport instanceof IArchimateElement ) {
command = new DBImportElementFromIdCommand(importConnection, this.exportedModel, null, null, id, latestDatabaseVersion, DBImportMode.forceSharedMode, false);
command = new DBImportElementFromIdCommand(importConnection, this.exportedModel, null, null, null, id, latestDatabaseVersion, DBImportMode.forceSharedMode, false);
incrementText(this.txtUpdatedElementsInDatabase);
} else if ( componentToImport instanceof IArchimateRelationship ) {
command = new DBImportRelationshipFromIdCommand(importConnection, this.exportedModel, null, null, id, latestDatabaseVersion, DBImportMode.forceSharedMode);
command = new DBImportRelationshipFromIdCommand(importConnection, this.exportedModel, null, null, null, id, latestDatabaseVersion, DBImportMode.forceSharedMode);
incrementText(this.txtUpdatedRelationshipsInDatabase);
} else if ( componentToImport instanceof IDiagramModel) {
command = new DBImportViewFromIdCommand(importConnection, this.exportedModel, null, id, latestDatabaseVersion, DBImportMode.forceSharedMode, false);
command = new DBImportViewFromIdCommand(importConnection, this.exportedModel, null, null, id, latestDatabaseVersion, DBImportMode.forceSharedMode, false);
incrementText(this.txtUpdatedViewsInDatabase);
} else if ( componentToImport instanceof IDiagramModelObject ) {
command = new DBImportViewObjectFromIdCommand(importConnection, this.exportedModel, id, latestDatabaseVersion, false, DBImportMode.forceSharedMode);
command = new DBImportViewObjectFromIdCommand(importConnection, this.exportedModel, null, id, latestDatabaseVersion, false, DBImportMode.forceSharedMode);
incrementText(this.txtUpdatedViewObjectsInDatabase);
} else if ( componentToImport instanceof IDiagramModelConnection ) {
command = new DBImportViewConnectionFromIdCommand(importConnection, this.exportedModel, id, latestDatabaseVersion, false, DBImportMode.forceSharedMode);
command = new DBImportViewConnectionFromIdCommand(importConnection, this.exportedModel, null, id, latestDatabaseVersion, false, DBImportMode.forceSharedMode);
incrementText(this.txtUpdatedViewConnectionsInDatabase);
}

Expand Down
Loading

0 comments on commit b4448f7

Please sign in to comment.