[midPoint-git] [Evolveum/midpoint-studio] 8bf4f2: 3-way merge for initial objects ui prototype
Viliam Repan
noreply at github.com
Tue Apr 16 13:04:03 CEST 2024
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint-studio
Commit: 8bf4f210e1c93af2b19217eae8cab389429dd662
https://github.com/Evolveum/midpoint-studio/commit/8bf4f210e1c93af2b19217eae8cab389429dd662
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-19 (Tue, 19 Mar 2024)
Changed paths:
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/TestAction.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/diff/DefaultTreeTableModel.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/diff/DeltaTreeTable.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/diff/DeltaTreeTableModel.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/diff/InitialObjectDiffProcessor.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/diff/InitialObjectDiffRequest.java
Log Message:
-----------
3-way merge for initial objects ui prototype
Commit: 28193624041d5ed0cf1b3d5df1fd059bb543b6be
https://github.com/Evolveum/midpoint-studio/commit/28193624041d5ed0cf1b3d5df1fd059bb543b6be
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-19 (Tue, 19 Mar 2024)
Changed paths:
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/lang/annotation/DeprecatedElementAnnotator.java
R studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/lang/annotation/ShadowRefAnnotation.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/lang/annotation/ShadowRefAnnotator.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/browse/ObjectsTreeTable.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/util/PsiUtils.java
M studio-idea-plugin/src/main/resources/META-INF/plugin.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/merge
Commit: 645caf3852a15ecefdb2d45549add4c5ee1df486
https://github.com/Evolveum/midpoint-studio/commit/645caf3852a15ecefdb2d45549add4c5ee1df486
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-08 (Mon, 08 Apr 2024)
Changed paths:
M studio-idea-plugin/build.gradle.kts
M studio-idea-plugin/gradle.properties
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/MidPointConstants.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/MidPointFacetActionGroup.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/TestAction.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/environment/ComboEnvironments.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/task/CleanupFileTask.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/task/CleanupReloadNamesTask.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/task/ObjectsBackgroundableTask.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/DownloadMissingNotificationAction.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/MissingReferencesNotificationAction.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/configuration/CleanupConfiguration.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/configuration/CleanupService.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/configuration/MissingRef.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/configuration/MissingRefAction.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/configuration/MissingRefObject.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/configuration/MissingRefObjects.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/configuration/Referencable.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/lang/axiomquery/AxiomQueryValidationExternalAnnotator.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/BrowseToolPanel.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/NamedItem.java
R studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/browse/ObjectColumnInfo.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/browse/ObjectsTreeColumn.java
R studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/browse/ObjectsTreeColumnNameInfo.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/browse/ObjectsTreeTable.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/browse/ObjectsTreeTableModel.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/browse/OidColumn.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/cleanup/MissingObjectRefsDialog.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/cleanup/MissingRefActionColumn.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/cleanup/MissingRefColumn.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/cleanup/MissingRefKey.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/cleanup/MissingRefNode.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/cleanup/MissingRefObjectsPanel.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/cleanup/MissingRefObjectsTable.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/cleanup/MissingRefObjectsTableModel.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/cleanup/MissingRefUtils.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/treetable/DefaultColumnInfo.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/treetable/DefaultTreeTable.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/treetable/DefaultTreeTableModel.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/util/MidPointUtils.java
A studio-idea-plugin/src/main/kotlin/com/evolveum/midpoint/studio/ui/MissingRefObjectsEditor.kt
M studio-idea-plugin/src/main/kotlin/com/evolveum/midpoint/studio/ui/configuration/CleanupConfigurable.kt
M studio-idea-plugin/src/main/kotlin/com/evolveum/midpoint/studio/ui/configuration/MidPointConfigurable.kt
A studio-idea-plugin/src/main/kotlin/com/evolveum/midpoint/studio/ui/configuration/MissingRefObjectsConfigurable.kt
M studio-idea-plugin/src/main/resources/META-INF/plugin.xml
M studio-idea-plugin/src/main/resources/messages/MidPointStudio.properties
Log Message:
-----------
Merge branch 'master' into feature/merge
Commit: f28aea6fccd25821c0ef8c6f6e12c44567f00b31
https://github.com/Evolveum/midpoint-studio/commit/f28aea6fccd25821c0ef8c6f6e12c44567f00b31
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-08 (Mon, 08 Apr 2024)
Changed paths:
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/TestAction.java
R studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/diff/DefaultTreeTableModel.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/diff/DeltaTreeTableModel.java
Log Message:
-----------
compilation fix
Commit: 2dec85938970108d6c647b3c09de2e78e62ee7f5
https://github.com/Evolveum/midpoint-studio/commit/2dec85938970108d6c647b3c09de2e78e62ee7f5
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-08 (Mon, 08 Apr 2024)
Changed paths:
M README.adoc
M studio-idea-plugin/CHANGELOG.md
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/task/GeneratorTask.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/task/ObjectsBackgroundableTask.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/task/UploadTestValidateResourceTask.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/browse/ActionGenerator.java
R studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/browse/BulkActionGenerator.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/browse/TaskGenerator.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/ProcessResultsDialog.java
M studio-idea-plugin/src/test/java/com/evolveum/midpoint/studio/TaskUpgradeActionTest.java
M studio-idea-plugin/src/test/java/com/evolveum/midpoint/studio/TaskUpgradeTest.java
A studio-idea-plugin/src/test/testData/task-upgrade/action-iterative-1-input.xml
A studio-idea-plugin/src/test/testData/task-upgrade/action-iterative-1-output.xml
A studio-idea-plugin/src/test/testData/task-upgrade/action-iterative-2-input.xml
A studio-idea-plugin/src/test/testData/task-upgrade/action-iterative-2-output.xml
R studio-idea-plugin/src/test/testData/task-upgrade/bulk-iterative-1-input.xml
R studio-idea-plugin/src/test/testData/task-upgrade/bulk-iterative-1-output.xml
R studio-idea-plugin/src/test/testData/task-upgrade/bulk-iterative-2-input.xml
R studio-idea-plugin/src/test/testData/task-upgrade/bulk-iterative-2-output.xml
M studio-idea-plugin/src/test/testData/task-upgrade/scripting-1-input.xml
M studio-idea-plugin/src/test/testData/task-upgrade/scripting-1-output.xml
Log Message:
-----------
Merge branch 'master' into feature/merge
Commit: 5248fa9d01d139a44a34a6384c7a11808151ba3c
https://github.com/Evolveum/midpoint-studio/commit/5248fa9d01d139a44a34a6384c7a11808151ba3c
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-12 (Fri, 12 Apr 2024)
Changed paths:
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/browse/ComboObjectTypes.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/browse/ComboQueryType.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/task/CleanupFileTask.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/task/GeneratorTask.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/task/UploadExecuteTask.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/task/UploadFullProcessingTask.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/task/UploadRecomputeTask.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/task/UploadTaskMixin.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/task/UploadTestResourceTask.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/transfer/UploadFullProcessingAction.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/MidPointClient.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/lang/annotation/MappingAnnotator.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/UiAction.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/browse/ObjectsTreeTable.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/cleanup/MissingRefObjectsTable.java
M studio-idea-plugin/src/main/resources/META-INF/plugin.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/merge
Commit: b3f47040b9d858dccf7fc103e5e94e3d95a8d57b
https://github.com/Evolveum/midpoint-studio/commit/b3f47040b9d858dccf7fc103e5e94e3d95a8d57b
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-12 (Fri, 12 Apr 2024)
Changed paths:
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/TestAction.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/diff/InitialObjectDiffProcessor.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/UiAction.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/delta/ThreeWayMergeEditor.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/delta/ThreeWayMergeEditorProvider.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/delta/ThreeWayMergeVirtualFile.java
M studio-idea-plugin/src/main/resources/META-INF/plugin.xml
Log Message:
-----------
three way merge ui started
Commit: 20f7633d230d19a6a097b9cd278c949624927200
https://github.com/Evolveum/midpoint-studio/commit/20f7633d230d19a6a097b9cd278c949624927200
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-15 (Mon, 15 Apr 2024)
Changed paths:
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/VerifyAction.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/task/CleanupFileTask.java
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/configuration/CleanupService.java
R studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/lang/annotation/MappingAnnotator.java
A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/lang/annotation/MissingNaturalKeyAnnotator.java
M studio-idea-plugin/src/main/resources/META-INF/plugin.xml
Log Message:
-----------
Merge branch 'master' into feature/merge
Commit: 8e28f1400622748ae32851ed0a4b16323a4a58e6
https://github.com/Evolveum/midpoint-studio/commit/8e28f1400622748ae32851ed0a4b16323a4a58e6
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-15 (Mon, 15 Apr 2024)
Changed paths:
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/lang/annotation/MissingNaturalKeyAnnotator.java
Log Message:
-----------
Merge branch 'master' into feature/merge
Commit: a4f69806673c50935d4b81e671008ff95da503fa
https://github.com/Evolveum/midpoint-studio/commit/a4f69806673c50935d4b81e671008ff95da503fa
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-16 (Tue, 16 Apr 2024)
Changed paths:
M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/delta/ThreeWayMergeEditor.java
Log Message:
-----------
npe fix
Compare: https://github.com/Evolveum/midpoint-studio/compare/eb9932bfc120...a4f69806673c
To unsubscribe from these emails, change your notification settings at https://github.com/Evolveum/midpoint-studio/settings/notifications
More information about the midPoint-svn
mailing list