Skip to content

Commit af9dfb1

Browse files
TheKorposTheKorpos
committed
ST6RI-178 Cleaned up imports and simplified class name
1 parent 09a120d commit af9dfb1

12 files changed

Lines changed: 52 additions & 58 deletions

File tree

‎org.omg.sysml.interactive/src/org/omg/sysml/interactive/SysMLInteractive.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,17 @@
7474
import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil;
7575
import org.omg.sysml.plantuml.SysML2PlantUMLLinkProvider;
7676
import org.omg.sysml.plantuml.SysML2PlantUMLSvc;
77-
import org.omg.sysml.util.ElementUtil;
7877
import org.omg.sysml.util.NamespaceUtil;
7978
import org.omg.sysml.util.SysMLUtil;
8079
import org.omg.sysml.util.TypeUtil;
8180
import org.omg.sysml.util.repository.EObjectUUIDTracker;
8281
import org.omg.sysml.util.repository.APIModel;
83-
import org.omg.sysml.util.repository.EMFModelRefresh;
82+
import org.omg.sysml.util.repository.EMFModelDelta;
8483
import org.omg.sysml.util.repository.ProjectRepository;
85-
import org.omg.sysml.util.repository.ProjectRevision;
84+
import org.omg.sysml.util.repository.Revision;
8685
import org.omg.sysml.util.repository.RemoteProject;
8786
import org.omg.sysml.util.repository.RemoteProject.RemoteBranch;
88-
import org.omg.sysml.util.repository.EMFModelRefreshCreator;
87+
import org.omg.sysml.util.repository.EMFModelRefresher;
8988
import org.omg.sysml.util.traversal.Traversal;
9089
import org.omg.sysml.util.traversal.facade.impl.ApiElementProcessingFacade;
9190
import org.omg.sysml.util.traversal.facade.impl.JsonElementProcessingFacade;
@@ -478,7 +477,7 @@ public String loadById(String projectId, List<String> help) {
478477
private String load(RemoteProject repositoryProject) {
479478
try {
480479
RemoteBranch defaultBranch = repositoryProject.getDefaultBranch();
481-
ProjectRevision headRevision = defaultBranch.getHeadRevision();
480+
Revision headRevision = defaultBranch.getHeadRevision();
482481
APIModel model = headRevision.fetchRemote();
483482

484483
System.out.println("Collecting UUIDs...");
@@ -491,10 +490,10 @@ private String load(RemoteProject repositoryProject) {
491490
//UUIDS coming from resources that were added later in time will shadow previous ones
492491
tracker.trackLocalUUIDs(inputResources);
493492

494-
EMFModelRefreshCreator fetcher = new EMFModelRefreshCreator(model, tracker);
493+
EMFModelRefresher fetcher = new EMFModelRefresher(model, tracker);
495494

496495
System.out.println("Downloading model...");
497-
EMFModelRefresh delta = fetcher.create();
496+
EMFModelDelta delta = fetcher.create();
498497

499498
System.out.println("Adding model to index");
500499
delta.getProjectRoots().forEach((eObject, dto) -> {

‎org.omg.sysml.xtext.ui/src/org/omg/sysml/xtext/ui/handlers/PullRepositoryProject.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@
5151
import org.omg.sysml.util.repository.EObjectUUIDTracker;
5252
import org.omg.sysml.ApiException;
5353
import org.omg.sysml.util.repository.APIModel;
54-
import org.omg.sysml.util.repository.EMFModelRefresh;
54+
import org.omg.sysml.util.repository.EMFModelDelta;
5555
import org.omg.sysml.util.repository.ProjectRepository;
56-
import org.omg.sysml.util.repository.ProjectRevision;
56+
import org.omg.sysml.util.repository.Revision;
5757
import org.omg.sysml.util.repository.RemoteProject;
5858
import org.omg.sysml.util.repository.RemoteProject.RemoteBranch;
59-
import org.omg.sysml.util.repository.EMFModelRefreshCreator;
59+
import org.omg.sysml.util.repository.EMFModelRefresher;
6060

6161
import com.google.inject.Inject;
6262

@@ -131,11 +131,11 @@ private void tryPullRemoteFor(IProject project, IProgressMonitor monitor) {
131131
RemoteProject repositoryProject = projectRepository.getProjectById(projectName);
132132

133133
RemoteBranch defaultBranch = repositoryProject.getDefaultBranch();
134-
ProjectRevision headRevision = defaultBranch.getHeadRevision();
134+
Revision headRevision = defaultBranch.getHeadRevision();
135135
APIModel model = headRevision.fetchRemote();
136-
EMFModelRefreshCreator repositoryFetcher = new EMFModelRefreshCreator(model, tracker);
137-
EMFModelRefresh delta = repositoryFetcher.create();
138-
delta.save(resourceSet, URI.createPlatformResourceURI(targetPath, false));
136+
EMFModelRefresher repositoryFetcher = new EMFModelRefresher(model, tracker);
137+
EMFModelDelta delta = repositoryFetcher.create();
138+
delta.apply(resourceSet, URI.createPlatformResourceURI(targetPath, false));
139139
}
140140
} catch (IOException | CoreException e) {
141141
e.printStackTrace();

‎org.omg.sysml.xtext/src/org/omg/sysml/xtext/util/SysMLRepositoryLoadUtil.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
import org.omg.sysml.util.SysMLUtil;
4040
import org.omg.sysml.util.repository.EObjectUUIDTracker;
4141
import org.omg.sysml.util.repository.APIModel;
42-
import org.omg.sysml.util.repository.EMFModelRefresh;
42+
import org.omg.sysml.util.repository.EMFModelDelta;
4343
import org.omg.sysml.util.repository.ProjectRepository;
44-
import org.omg.sysml.util.repository.ProjectRevision;
44+
import org.omg.sysml.util.repository.Revision;
4545
import org.omg.sysml.util.repository.RemoteProject;
4646
import org.omg.sysml.util.repository.RemoteProject.RemoteBranch;
47-
import org.omg.sysml.util.repository.EMFModelRefreshCreator;
47+
import org.omg.sysml.util.repository.EMFModelRefresher;
4848
import org.omg.sysml.xmi.SysMLxStandaloneSetup;
4949
import org.omg.sysml.xtext.SysMLStandaloneSetup;
5050

@@ -121,7 +121,7 @@ public void load() throws UnsupportedOperationException, ApiException {
121121
}
122122

123123
RemoteBranch defaultBranch = repositoryProject.getDefaultBranch();
124-
ProjectRevision headRevision = defaultBranch.getHeadRevision();
124+
Revision headRevision = defaultBranch.getHeadRevision();
125125
APIModel remote = headRevision.fetchRemote();
126126

127127
System.out.println("Reading library...");
@@ -134,14 +134,14 @@ public void load() throws UnsupportedOperationException, ApiException {
134134
tracker.trackLibraryUUIDs(getLibraryResources());
135135

136136

137-
EMFModelRefreshCreator repositoryFetcher = new EMFModelRefreshCreator(remote, tracker);
137+
EMFModelRefresher repositoryFetcher = new EMFModelRefresher(remote, tracker);
138138
System.out.println("Fetching project...");
139-
EMFModelRefresh delta = repositoryFetcher.create();
139+
EMFModelDelta delta = repositoryFetcher.create();
140140
ResourceSet resourceSet = getResourceSet();
141141

142142
try {
143143
System.out.println("Saving resources...");
144-
delta.save(resourceSet, URI.createFileURI(targetLocation));
144+
delta.apply(resourceSet, URI.createFileURI(targetLocation));
145145
System.out.println("Done.");
146146
} catch (IOException e) {
147147
e.printStackTrace();

‎org.omg.sysml/src/org/omg/sysml/util/repository/APIModel.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.util.HashMap;
2828
import java.util.HashSet;
2929
import java.util.Map;
30-
import java.util.Optional;
3130
import java.util.Set;
3231
import java.util.UUID;
3332
import java.util.stream.Collectors;

‎org.omg.sysml/src/org/omg/sysml/util/repository/APIModelDelta.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,10 @@ public class APIModelDelta {
4949
private final Map<UUID, Data> changes;
5050
private final Collection<UUID> deletions;
5151

52-
private APIModel thisModel;
53-
54-
private APIModelDelta(APIModel thisModel, Set<Element> additions, Map<UUID, Data> changes, Set<UUID> deletions) {
52+
private APIModelDelta(Set<Element> additions, Map<UUID, Data> changes, Set<UUID> deletions) {
5553
this.additions = Collections.unmodifiableCollection(additions);
5654
this.changes = Collections.unmodifiableMap(changes);
5755
this.deletions = Collections.unmodifiableCollection(deletions);
58-
this.thisModel = thisModel;
5956
}
6057

6158
/**
@@ -157,7 +154,7 @@ public static APIModelDelta create(APIModel thisModel, APIModel baseline) {
157154
}
158155
}
159156

160-
return new APIModelDelta(thisModel, additions, changes, deletions);
157+
return new APIModelDelta(additions, changes, deletions);
161158
}
162159

163160
/**

org.omg.sysml/src/org/omg/sysml/util/repository/EMFModelRefresh.java renamed to org.omg.sysml/src/org/omg/sysml/util/repository/EMFModelDelta.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@
3333
import org.omg.sysml.model.Element;
3434
import org.omg.sysml.util.ElementUtil;
3535

36-
public class EMFModelRefresh {
36+
public class EMFModelDelta {
3737
private static final String EXTENSION = "sysmlx";
3838

3939
private final Map<EObject, Element> projectRoots;
4040

41-
public EMFModelRefresh(Map<EObject, Element> projectRoots) {
41+
public EMFModelDelta(Map<EObject, Element> projectRoots) {
4242
this.projectRoots = projectRoots;
4343
}
4444

4545
public Map<EObject, Element> getProjectRoots() {
4646
return projectRoots;
4747
}
4848

49-
public void save(ResourceSet resourceSet, URI baseUri) throws IOException {
49+
public void apply(ResourceSet resourceSet, URI baseUri) throws IOException {
5050
for (var root : projectRoots.keySet()) {
5151
var dto = projectRoots.get(root);
5252
Object object = dto.get("@id");

org.omg.sysml/src/org/omg/sysml/util/repository/EMFModelRefreshCreator.java renamed to org.omg.sysml/src/org/omg/sysml/util/repository/EMFModelRefresher.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
* This class is responsible for the propagation of {@link APIModel}s into EMF
5151
*
5252
*/
53-
public class EMFModelRefreshCreator {
53+
public class EMFModelRefresher {
5454

5555
private final EObjectUUIDTracker tracker;
5656
private final APIModel model;
@@ -61,18 +61,18 @@ public class EMFModelRefreshCreator {
6161
* @param model to propagate into EMF
6262
* @param tracker index based on element UUIDs
6363
*/
64-
public EMFModelRefreshCreator(APIModel model, EObjectUUIDTracker tracker) {
64+
public EMFModelRefresher(APIModel model, EObjectUUIDTracker tracker) {
6565
this.model = model;
6666
this.tracker = tracker;
6767
}
6868

6969
/**
7070
* Creates an EMF model based on the {@link APIModel} and returns it as a
71-
* {@link EMFModelRefresh}
71+
* {@link EMFModelDelta}
7272
*
7373
* @return unpropagated EMF model
7474
*/
75-
public EMFModelRefresh create() {
75+
public EMFModelDelta create() {
7676
Map<EObject, Element> rootNamespaces = new HashMap<>();
7777

7878
//traverse containment
@@ -94,7 +94,7 @@ public EMFModelRefresh create() {
9494
}
9595
});
9696

97-
return new EMFModelRefresh(rootNamespaces);
97+
return new EMFModelDelta(rootNamespaces);
9898
}
9999

100100
private EObject transform(Element dto) {

‎org.omg.sysml/src/org/omg/sysml/util/repository/ProjectRepository.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public RemoteProject createProject(String projectName) throws ApiException {
191191
return new RemoteProject(this, createdProject.getAtId(), createdProject.getName());
192192
}
193193

194-
Map<UUID, Element> getModelRoots(ProjectRevision revision) throws ApiException {
194+
Map<UUID, Element> getModelRoots(Revision revision) throws ApiException {
195195
pager.reset();
196196
Map<UUID, Element> projectRoots = new HashMap<>();
197197
do {
@@ -201,7 +201,7 @@ Map<UUID, Element> getModelRoots(ProjectRevision revision) throws ApiException {
201201
return projectRoots;
202202
}
203203

204-
Map<UUID, Element> getModelElements(ProjectRevision revision) throws ApiException {
204+
Map<UUID, Element> getModelElements(Revision revision) throws ApiException {
205205
Map<UUID, Element> projectElements = new HashMap<>();
206206
pager.reset();
207207
do {

‎org.omg.sysml/src/org/omg/sysml/util/repository/RemoteProject.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public RemoteBranch getDefaultBranch() throws ApiException, NoSuchElementExcepti
8383
* @return new branch
8484
* @throws ApiException
8585
*/
86-
public RemoteBranch createBranch(ProjectRevision revision, String name) throws ApiException {
86+
public RemoteBranch createBranch(Revision revision, String name) throws ApiException {
8787
ProjectRepository projectRepository = getProjectRepository();
8888
BranchHead branchHead = new BranchHead().atId(getRemoteId());
8989
Branch branch = new Branch().head(branchHead).referencedCommit(branchHead);
@@ -158,17 +158,17 @@ public String getName() throws ApiException {
158158
* @throws ApiException
159159
* @throws NoSuchElementException if branch has no head revision (commit)
160160
*/
161-
public ProjectRevision getHeadRevision() throws ApiException, NoSuchElementException {
161+
public Revision getHeadRevision() throws ApiException, NoSuchElementException {
162162
Branch branch = loadBranch();
163163
BranchHead branchHead = branch.getHead();
164164

165165
if (branchHead == null) {
166-
return new ProjectRevision(RemoteProject.this, this);
166+
return new Revision(RemoteProject.this, this);
167167
}
168168

169169
UUID branchHeadId = branchHead.getAtId();
170170

171-
return new ProjectRevision(RemoteProject.this, this, branchHeadId);
171+
return new Revision(RemoteProject.this, this, branchHeadId);
172172
}
173173

174174
private Branch loadBranch() throws ApiException {

org.omg.sysml/src/org/omg/sysml/util/repository/ProjectRevision.java renamed to org.omg.sysml/src/org/omg/sysml/util/repository/Revision.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,22 @@
3636
* Revision of a {@link RemoteProject}. Can be used to store changes locally or
3737
* to commit changes to the project repository
3838
*/
39-
public class ProjectRevision {
39+
public class Revision {
4040

4141
private final RemoteProject project;
4242
private UUID remoteId;
43-
private ProjectRevision previousRevision;
43+
private Revision previousRevision;
4444

4545
private APIModel remoteState;
4646
private APIModel localState;
4747
private RemoteBranch remoteBranch;
4848

49-
public ProjectRevision(RemoteProject project, RemoteBranch remoteBranch) {
49+
public Revision(RemoteProject project, RemoteBranch remoteBranch) {
5050
this.project = project;
5151
this.remoteBranch = remoteBranch;
5252
}
5353

54-
public ProjectRevision(RemoteProject project, RemoteBranch remoteBranch, UUID remoteId) {
54+
public Revision(RemoteProject project, RemoteBranch remoteBranch, UUID remoteId) {
5555
this(project, remoteBranch);
5656
this.remoteId = remoteId;
5757
}
@@ -61,8 +61,8 @@ public ProjectRevision(RemoteProject project, RemoteBranch remoteBranch, UUID re
6161
*
6262
* @return empty revision
6363
*/
64-
public ProjectRevision createNewRevision() {
65-
ProjectRevision newRevision = new ProjectRevision(project, remoteBranch);
64+
public Revision createNewRevision() {
65+
Revision newRevision = new Revision(project, remoteBranch);
6666
newRevision.setPreviousRevision(this);
6767
return newRevision;
6868
}
@@ -100,23 +100,23 @@ public APIModelDelta getLocalChanges() {
100100
return APIModelDelta.create(getLocalState(), getRemoteState());
101101
}
102102

103-
public ProjectRevision pushLocalChanges() throws ApiException {
103+
public Revision pushLocalChanges() throws ApiException {
104104
APIModelDelta localChanges = getLocalChanges();
105105
return pushChanges(localChanges);
106106
}
107107

108-
public ProjectRevision pushChanges(APIModelDelta changes) throws ApiException {
108+
public Revision pushChanges(APIModelDelta changes) throws ApiException {
109109
APIModelDelta localChanges = getLocalChanges();
110110
return pushChanges(localChanges.toTrasferableDelta());
111111
}
112112

113-
public ProjectRevision pushChanges(List<DataVersion> transferableChanges) throws ApiException {
113+
public Revision pushChanges(List<DataVersion> transferableChanges) throws ApiException {
114114
CommitApi commitApi = getRemoteProject().getProjectRepository().getCommitApi();
115115
Commit commit = new Commit();
116116
commit.setChange(transferableChanges);
117117
commit.setPreviousCommit(new BranchHead().atId(getRemoteId()));
118118
Commit newCommit = commitApi.postCommitByProject(getRemoteProject().getRemoteId(), commit, getBranch().getRemoteId());
119-
ProjectRevision projectRevision = new ProjectRevision(getRemoteProject(), getBranch(), newCommit.getAtId());
119+
Revision projectRevision = new Revision(getRemoteProject(), getBranch(), newCommit.getAtId());
120120
projectRevision.setPreviousRevision(this);
121121
return projectRevision;
122122
}
@@ -167,14 +167,14 @@ public UUID getRemoteId() {
167167
* @return previous revision
168168
* @throws ApiException
169169
*/
170-
public ProjectRevision getPreviousRevision() throws ApiException {
170+
public Revision getPreviousRevision() throws ApiException {
171171
if (previousRevision == null) {
172172
RemoteProject remoteProject = getRemoteProject();
173173
ProjectRepository projectRepository = remoteProject.getProjectRepository();
174174
Commit commit = projectRepository.getCommitApi().getCommitByProjectAndId(remoteProject.getRemoteId(), getRemoteId());
175175
BranchHead previousCommit = commit.getPreviousCommit();
176176
if (previousCommit != null) {
177-
setPreviousRevision(new ProjectRevision(getRemoteProject(), getBranch(), previousCommit.getAtId()));
177+
setPreviousRevision(new Revision(getRemoteProject(), getBranch(), previousCommit.getAtId()));
178178
}
179179
}
180180

@@ -185,7 +185,7 @@ public RemoteBranch createBranch(String name) throws ApiException {
185185
return getRemoteProject().createBranch(this, name);
186186
}
187187

188-
private void setPreviousRevision(ProjectRevision previousRevision) {
188+
private void setPreviousRevision(Revision previousRevision) {
189189
this.previousRevision = previousRevision;
190190
}
191191
}

0 commit comments

Comments
 (0)