Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

True Delta-Based Itereation 1 #585

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

True Delta-Based Itereation 1 #585

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f08e00e
Save ModelInstances delta-based
h4uges Apr 19, 2023
8f5a754
move ResourceCopier to SDQ-Commons
h4uges Apr 20, 2023
c22e02e
Merge branch 'main' into main
TomWerm Apr 24, 2023
13c9d39
move changederivation into Vitruv-Change project
h4uges Apr 25, 2023
154076c
Merge branch 'main' of https://github.com/h4uges/Vitruv
h4uges Apr 25, 2023
e430ed0
add DeltaBasedResource
h4uges Apr 25, 2023
4e687d0
Merge branch 'main' into main
TomWerm Apr 25, 2023
1b83863
Merge branch 'main' into main
larsk21 Apr 28, 2023
69405eb
Merge branch 'main' into main
h4uges May 5, 2023
53202ce
add TestDeltaMigrator + continue work
h4uges Jun 16, 2023
eabbad5
Merge branch 'main' of https://github.com/vitruv-tools/Vitruv
h4uges Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bundles/tools.vitruv.framework.views/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ Require-Bundle: org.apache.log4j,
Export-Package: tools.vitruv.framework.views,
tools.vitruv.framework.views.changederivation
Bundle-Vendor: vitruv.tools
Import-Package: tools.vitruv.change.changederivation
4 changes: 2 additions & 2 deletions bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/View.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import com.google.common.annotations.Beta;
import com.google.common.collect.FluentIterable;

import tools.vitruv.framework.views.changederivation.DefaultStateBasedChangeResolutionStrategy;
import tools.vitruv.framework.views.changederivation.StateBasedChangeResolutionStrategy;
import tools.vitruv.change.changederivation.DefaultStateBasedChangeResolutionStrategy;
import tools.vitruv.change.changederivation.StateBasedChangeResolutionStrategy;

/**
* A Vitruv view on an underlying {@link ChangeableViewSource}.
Expand Down
134 changes: 0 additions & 134 deletions ...s/vitruv/framework/views/changederivation/DefaultStateBasedChangeResolutionStrategy.xtend
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions ...src/tools/vitruv/framework/views/changederivation/StateBasedChangeResolutionStrategy.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/impl/BasicView.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import tools.vitruv.change.composite.propagation.ChangePropagationListener
import tools.vitruv.framework.views.ChangeableViewSource
import tools.vitruv.framework.views.ViewSelection
import tools.vitruv.framework.views.ViewSelector
import tools.vitruv.framework.views.changederivation.StateBasedChangeResolutionStrategy
import tools.vitruv.change.changederivation.StateBasedChangeResolutionStrategy

import static com.google.common.base.Preconditions.checkArgument
import static com.google.common.base.Preconditions.checkState
Expand Down
4 changes: 2 additions & 2 deletions ...ols.vitruv.framework.views/src/tools/vitruv/framework/views/impl/ChangeDerivingView.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import tools.vitruv.change.composite.description.VitruviusChange
import tools.vitruv.change.composite.description.VitruviusChangeFactory
import tools.vitruv.framework.views.CommittableView
import tools.vitruv.framework.views.View
import tools.vitruv.framework.views.changederivation.StateBasedChangeResolutionStrategy
import tools.vitruv.framework.views.util.ResourceCopier
import tools.vitruv.change.changederivation.StateBasedChangeResolutionStrategy

import static com.google.common.base.Preconditions.checkArgument
import static com.google.common.base.Preconditions.checkState

import static extension edu.kit.ipd.sdq.commons.util.org.eclipse.emf.common.util.URIUtil.isPathmap
import edu.kit.ipd.sdq.commons.util.org.eclipse.emf.ecore.resource.ResourceCopier

/**
* A {@link View} that derives changes based on the changed state of its resources and allows to propagate them
Expand Down
2 changes: 1 addition & 1 deletion ...ls.vitruv.framework.views/src/tools/vitruv/framework/views/impl/ChangeRecordingView.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import tools.vitruv.change.atomic.id.IdResolver
import tools.vitruv.change.composite.recording.ChangeRecorder
import tools.vitruv.framework.views.CommittableView
import tools.vitruv.framework.views.View
import tools.vitruv.framework.views.changederivation.StateBasedChangeResolutionStrategy
import tools.vitruv.change.changederivation.StateBasedChangeResolutionStrategy

import static com.google.common.base.Preconditions.checkArgument
import static com.google.common.base.Preconditions.checkState
Expand Down
2 changes: 1 addition & 1 deletion ...vitruv.framework.views/src/tools/vitruv/framework/views/impl/IdentityMappingViewType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

import edu.kit.ipd.sdq.commons.util.org.eclipse.emf.ecore.resource.ResourceCopier;
import tools.vitruv.change.atomic.EChangeUuidManager;
import tools.vitruv.change.atomic.id.IdResolver;
import tools.vitruv.change.atomic.uuid.UuidResolver;
Expand All @@ -22,7 +23,6 @@
import tools.vitruv.framework.views.ViewSelection;
import tools.vitruv.framework.views.ViewSource;
import tools.vitruv.framework.views.selectors.DirectViewElementSelector;
import tools.vitruv.framework.views.util.ResourceCopier;

/**
* A view type that allows creating views based on a basic element-wise
Expand Down
Loading