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

Jump to bottom

archi-modelrepository-plugin object-history #221

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

archi-modelrepository-plugin object-history #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...bs.modelrepository/src/org/archicontribs/modelrepository/actions/RestoreCommitAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class RestoreCommitAction extends AbstractModelAction {

public RestoreCommitAction(IWorkbenchWindow window) {
super(window);
setImageDescriptor(IModelRepositoryImages.ImageFactory.getImageDescriptor(IModelRepositoryImages.ICON_SYNCED));
setImageDescriptor(IModelRepositoryImages.ImageFactory.getImageDescriptor(IModelRepositoryImages.ICON_RESET));
setText(Messages.RestoreCommitAction_0);
setToolTipText(Messages.RestoreCommitAction_0);
}
Expand Down
40 changes: 40 additions & 0 deletions ...modelrepository/src/org/archicontribs/modelrepository/grafico/GraficoFileConventions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package org.archicontribs.modelrepository.grafico;

import java.io.File;

import org.eclipse.emf.ecore.EObject;

import com.archimatetool.model.FolderType;
import com.archimatetool.model.IFolder;
import com.archimatetool.model.IIdentifier;

public final class GraficoFileConventions {

private GraficoFileConventions() {
// utility class
}

public static File forFolder(File parentFolder, IFolder iFolder) {
return new File(parentFolder, GraficoFileConventions.getNameFor(iFolder));
}

public static File forElement(File modelFolder, IFolder iFolder, EObject elem) {
File elemFolder = new File(modelFolder, GraficoFileConventions.getNameFor(iFolder));
return GraficoFileConventions.forElement(elemFolder, elem);
}

public static File forElement(File elemFolder, EObject elem) {
return new File(elemFolder, elem.getClass().getSimpleName() + "_" + ((IIdentifier) elem).getId() + ".xml"); //$NON-NLS-1$ //$NON-NLS-2$
}

/**
* Generate a proper name for directory creation
*
* @param folder
* @return
*/
public static String getNameFor(IFolder folder) {
return folder.getType() == FolderType.USER ? folder.getId().toString() : folder.getType().toString();
}

}
18 changes: 3 additions & 15 deletions ...s.modelrepository/src/org/archicontribs/modelrepository/grafico/GraficoModelExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,10 @@

import com.archimatetool.editor.model.IArchiveManager;
import com.archimatetool.editor.utils.FileUtils;
import com.archimatetool.model.FolderType;
import com.archimatetool.model.IArchimateModel;
import com.archimatetool.model.IDiagramModelImageProvider;
import com.archimatetool.model.IFolder;
import com.archimatetool.model.IFolderContainer;
import com.archimatetool.model.IIdentifier;


/**
Expand Down Expand Up @@ -177,7 +175,7 @@ private void createAndSaveResourceForFolder(IFolderContainer folderContainer, Fi
allFolders.addAll(folderContainer.getFolders());

for(IFolder tmpFolder : allFolders) {
File tmpFolderFile = new File(folder, getNameFor(tmpFolder));
File tmpFolderFile = GraficoFileConventions.forFolder(folder, tmpFolder);
tmpFolderFile.mkdirs();
createAndSaveResource(new File(tmpFolderFile, IGraficoConstants.FOLDER_XML), tmpFolder);
createAndSaveResourceForFolder(tmpFolder, tmpFolderFile);
Expand All @@ -190,25 +188,15 @@ private void createAndSaveResourceForFolder(IFolderContainer folderContainer, Fi
allElements.addAll(((IFolder)folderContainer).getElements());
for(EObject tmpElement : allElements) {
createAndSaveResource(
new File(folder, tmpElement.getClass().getSimpleName() + "_" + ((IIdentifier)tmpElement).getId() + ".xml"), //$NON-NLS-1$ //$NON-NLS-2$
GraficoFileConventions.forElement(folder, tmpElement),
tmpElement);
}
}
if(folderContainer instanceof IArchimateModel) {
createAndSaveResource(new File(folder, IGraficoConstants.FOLDER_XML), folderContainer);
}
}

/**
* Generate a proper name for directory creation
*
* @param folder
* @return
*/
private String getNameFor(IFolder folder) {
return folder.getType() == FolderType.USER ? folder.getId().toString() : folder.getType().toString();
}


/**
* Save the model to Resource
*
Expand Down
45 changes: 40 additions & 5 deletions ...delrepository/src/org/archicontribs/modelrepository/views/history/HistoryTableViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
*/
package org.archicontribs.modelrepository.views.history;

import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Date;
Expand All @@ -14,6 +16,7 @@
import org.archicontribs.modelrepository.IModelRepositoryImages;
import org.archicontribs.modelrepository.grafico.BranchInfo;
import org.archicontribs.modelrepository.grafico.BranchStatus;
import org.archicontribs.modelrepository.grafico.GraficoFileConventions;
import org.archicontribs.modelrepository.grafico.IArchiRepository;
import org.eclipse.jface.layout.TableColumnLayout;
import org.eclipse.jface.viewers.CellLabelProvider;
Expand All @@ -30,12 +33,15 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.filter.PathFilter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;

import com.archimatetool.editor.ui.UIUtils;
import com.archimatetool.model.IArchimateModelObject;
import com.archimatetool.model.IFolder;


/**
Expand Down Expand Up @@ -119,6 +125,15 @@ public void doSetInput(IArchiRepository archiRepo) {
// setSelection(new StructuredSelection(element), true);
//}
}

private static record HistoryInput(IArchiRepository repo, IArchimateModelObject obj) {}

public void doSetInput(IArchiRepository selectedRepository, Object selected) {
if (selected instanceof IArchimateModelObject)
setInput(new HistoryInput(selectedRepository, (IArchimateModelObject)selected));
else
doSetInput(selectedRepository);
}

public void setSelectedBranch(BranchInfo branchInfo) {
if(branchInfo != null && branchInfo.equals(fSelectedBranch)) {
Expand Down Expand Up @@ -155,27 +170,47 @@ List<RevCommit> getCommits(Object parent) {
fLocalCommit = null;
fOriginCommit = null;

if(!(parent instanceof IArchiRepository) || fSelectedBranch == null) {
IArchiRepository repo = null;
File elemFile = null;

if (parent instanceof HistoryInput && ((HistoryInput) parent).obj().eContainer() instanceof IFolder) {
HistoryInput input = (HistoryInput) parent;
repo = input.repo();
IFolder folder = (IFolder) input.obj().eContainer();
elemFile = GraficoFileConventions.forElement(
new File(repo.getLocalRepositoryFolder(), "model"),
folder,
input.obj());
} else if (parent instanceof IArchiRepository)
repo = (IArchiRepository) parent;

if(fSelectedBranch == null) {
return commits;
}

IArchiRepository repo = (IArchiRepository)parent;

// Local Repo was deleted
if(!repo.getLocalRepositoryFolder().exists()) {
if(repo == null || !repo.getLocalRepositoryFolder().exists()) {
return commits;
}

try(Repository repository = Git.open(repo.getLocalRepositoryFolder()).getRepository()) {
// a RevWalk allows to walk over commits based on some filtering that is defined
try(RevWalk revWalk = new RevWalk(repository)) {
if (elemFile != null) {
String elemPath = Path.of(repo.getLocalRepositoryFolder().getAbsolutePath())
.relativize(
Path.of(elemFile.getAbsolutePath())
).toString();
revWalk.setTreeFilter(PathFilter.create(elemPath));
}

// Find the local branch
ObjectId objectID = repository.resolve(fSelectedBranch.getLocalBranchNameFor());
if(objectID != null) {
fLocalCommit = revWalk.parseCommit(objectID);
revWalk.markStart(fLocalCommit);
}

// Find the remote branch
objectID = repository.resolve(fSelectedBranch.getRemoteBranchNameFor());
if(objectID != null) {
Expand Down
Loading