X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fviews%2FDistributionsView.java;h=218e613faa40808e7eddbaa20261ff96c9e5286e;hb=dc95cc0fdc36c88e778cdfd52d443d0a0b8d926c;hp=26e38f1bbbebfdbefd0cc38a4fd945bc809e294f;hpb=bd06b3358f8c754765fcb222ac3b2273d0d56c37;p=gpl%2Fargeo-slc.git diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java index 26e38f1bb..218e613fa 100644 --- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java +++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java @@ -15,21 +15,14 @@ */ package org.argeo.slc.client.ui.dist.views; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import javax.jcr.Credentials; -import javax.jcr.NoSuchWorkspaceException; import javax.jcr.Node; -import javax.jcr.NodeIterator; -import javax.jcr.Property; import javax.jcr.Repository; import javax.jcr.RepositoryException; -import javax.jcr.RepositoryFactory; import javax.jcr.Session; -import javax.jcr.nodetype.NodeType; import javax.jcr.query.Query; import javax.jcr.query.QueryResult; @@ -39,30 +32,29 @@ import org.argeo.ArgeoMonitor; import org.argeo.eclipse.ui.EclipseArgeoMonitor; import org.argeo.eclipse.ui.ErrorFeedback; import org.argeo.eclipse.ui.TreeParent; -import org.argeo.jcr.ArgeoJcrUtils; import org.argeo.jcr.ArgeoNames; -import org.argeo.jcr.ArgeoTypes; import org.argeo.jcr.JcrUtils; -import org.argeo.jcr.UserJcrUtils; -import org.argeo.slc.SlcException; -import org.argeo.slc.client.ui.dist.DistImages; import org.argeo.slc.client.ui.dist.DistPlugin; import org.argeo.slc.client.ui.dist.commands.CopyWorkspace; import org.argeo.slc.client.ui.dist.commands.CreateWorkspace; import org.argeo.slc.client.ui.dist.commands.DeleteWorkspace; +import org.argeo.slc.client.ui.dist.commands.DisplayRepoInformation; import org.argeo.slc.client.ui.dist.commands.Fetch; -import org.argeo.slc.client.ui.dist.commands.ManageWorkspaceAuth; import org.argeo.slc.client.ui.dist.commands.NormalizeDistribution; +import org.argeo.slc.client.ui.dist.commands.PublishWorkspace; import org.argeo.slc.client.ui.dist.commands.RegisterRepository; import org.argeo.slc.client.ui.dist.commands.UnregisterRemoteRepo; import org.argeo.slc.client.ui.dist.editors.DistributionEditor; import org.argeo.slc.client.ui.dist.editors.DistributionEditorInput; +import org.argeo.slc.client.ui.dist.model.DistParentElem; +import org.argeo.slc.client.ui.dist.model.GroupElem; +import org.argeo.slc.client.ui.dist.model.RepoElem; +import org.argeo.slc.client.ui.dist.model.WorkspaceElem; +import org.argeo.slc.client.ui.dist.providers.DistTreeContentProvider; +import org.argeo.slc.client.ui.dist.providers.DistTreeLabelProvider; import org.argeo.slc.client.ui.dist.utils.ArtifactNamesComparator; import org.argeo.slc.client.ui.dist.utils.CommandHelpers; import org.argeo.slc.jcr.SlcNames; -import org.argeo.slc.repo.RepoConstants; -import org.argeo.slc.repo.RepoUtils; -import org.argeo.util.security.Keyring; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -71,11 +63,9 @@ import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.TreeViewerColumn; import org.eclipse.jface.viewers.Viewer; @@ -87,7 +77,6 @@ import org.eclipse.swt.dnd.DragSourceEvent; import org.eclipse.swt.dnd.TextTransfer; import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.dnd.TransferData; -import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Tree; @@ -96,16 +85,16 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.ViewPart; /** - * Browse and manipulate distributions (like merge, rename, etc.). Only support - * one single repository currently. + * Browse, manipulate and manage distributions accross multiple repositories + * (like fetch, merge, publish, etc.). */ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames { private final static Log log = LogFactory.getLog(DistributionsView.class); public final static String ID = DistPlugin.ID + ".distributionsView"; + /* DEPENDENCY INJECTION */ private Repository nodeRepository; - private RepositoryFactory repositoryFactory; - private Keyring keyring; + private DistTreeContentProvider treeContentProvider; private TreeViewer viewer; @@ -116,33 +105,17 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames | SWT.FULL_SELECTION | SWT.BORDER); TreeViewerColumn col = new TreeViewerColumn(viewer, SWT.NONE); - col.getColumn().setWidth(200); - col.setLabelProvider(new ColumnLabelProvider() { - @Override - public String getText(Object element) { - if (element instanceof RepoElem) - return ((RepoElem) element).getLabel(); - return element.toString(); - } - - @Override - public Image getImage(Object element) { - if (element instanceof RepoElem) - return DistImages.IMG_REPO; - else if (element instanceof DistributionElem) { - return DistImages.IMG_WKSP; - } - return null; - } - }); + col.getColumn().setWidth(400); + col.setLabelProvider(new DistTreeLabelProvider()); final Tree tree = viewer.getTree(); tree.setHeaderVisible(false); tree.setLinesVisible(false); - viewer.setContentProvider(new DistributionsContentProvider()); + // viewer.setContentProvider(new DistTreeContentProvider()); + viewer.setContentProvider(treeContentProvider); viewer.addDoubleClickListener(new DistributionsDCL()); - viewer.setComparator(new ArtifactNamesComparator()); + viewer.setComparator(new BrowserElementComparator()); // Enable selection retrieving from outside the view getSite().setSelectionProvider(viewer); @@ -163,140 +136,189 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames viewer.getTree().setMenu(menu); getSite().registerContextMenu(menuManager, viewer); - Session nodeSession = null; - try { - nodeSession = nodeRepository.login(); - - // make sure base directory is available - Node repos = JcrUtils.mkdirs(nodeSession, - UserJcrUtils.getUserHome(nodeSession).getPath() - + RepoConstants.REPOSITORIES_BASE_PATH); - nodeSession.save(); - - // register default local java repository - String alias = RepoConstants.DEFAULT_JAVA_REPOSITORY_ALIAS; - Repository javaRepository = ArgeoJcrUtils.getRepositoryByAlias( - repositoryFactory, alias); - if (javaRepository != null) { - if (!repos.hasNode(alias)) { - Node repoNode = repos.addNode(alias, - ArgeoTypes.ARGEO_REMOTE_REPOSITORY); - repoNode.setProperty(ARGEO_URI, "vm:///" + alias); - repoNode.addMixin(NodeType.MIX_TITLE); - repoNode.setProperty(Property.JCR_TITLE, "Internal " - + alias + " repository"); - nodeSession.save(); - } - } - } catch (RepositoryException e) { - throw new SlcException("Cannot register repository", e); - } finally { - JcrUtils.logoutQuietly(nodeSession); - } - - viewer.setInput(nodeRepository); + // Initialize + refresh(); } /** Programatically configure the context menu */ protected void contextMenuAboutToShow(IMenuManager menuManager) { IWorkbenchWindow window = DistPlugin.getDefault().getWorkbench() .getActiveWorkbenchWindow(); - try { - // Most of the implemented commands support only one selected - // element - boolean singleElement = ((IStructuredSelection) viewer - .getSelection()).size() == 1; - // Get Current selected item : - Object firstElement = ((IStructuredSelection) viewer.getSelection()) - .getFirstElement(); + // Most of the implemented commands support only one selected + // element + boolean singleElement = ((IStructuredSelection) viewer.getSelection()) + .size() == 1; + // Get Current selected item : + Object firstElement = ((IStructuredSelection) viewer.getSelection()) + .getFirstElement(); + + if (firstElement instanceof TreeParent + || firstElement instanceof DistParentElem) { + String targetRepoPath = null; + + // Build conditions depending on element type + boolean isDistribElem = false, isRepoElem = false, isDistribGroupElem = false; + boolean isHomeRepo = false, isReadOnly = true; + + if (firstElement instanceof WorkspaceElem) { + WorkspaceElem de = (WorkspaceElem) firstElement; + isDistribElem = true; + isReadOnly = de.isReadOnly(); + } else if (firstElement instanceof RepoElem) { + RepoElem re = (RepoElem) firstElement; + isRepoElem = true; + targetRepoPath = re.getRepoPath(); + isHomeRepo = re.inHome(); + isReadOnly = re.isReadOnly(); + } else if (firstElement instanceof GroupElem) { + GroupElem dge = (GroupElem) firstElement; + isReadOnly = dge.isReadOnly(); + isDistribGroupElem = true; + } - if (firstElement instanceof TreeParent - || firstElement instanceof RepoElem) { - String wsName = null; - String targetRepoPath = null; + // Display repo info + CommandHelpers.refreshCommand(menuManager, window, + DisplayRepoInformation.ID, + DisplayRepoInformation.DEFAULT_LABEL, + DisplayRepoInformation.DEFAULT_ICON_PATH, isRepoElem + && singleElement); + + // create workspace + CommandHelpers.refreshCommand(menuManager, window, + CreateWorkspace.ID, CreateWorkspace.DEFAULT_LABEL, + CreateWorkspace.DEFAULT_ICON_PATH, + (isRepoElem || isDistribGroupElem) && singleElement + && !isReadOnly); + // publish workspace + CommandHelpers.refreshCommand(menuManager, window, + PublishWorkspace.ID, PublishWorkspace.DEFAULT_LABEL, + PublishWorkspace.DEFAULT_ICON_PATH, isDistribElem + && singleElement && !isReadOnly); + + // Register a remote repository + CommandHelpers.refreshCommand(menuManager, window, + RegisterRepository.ID, RegisterRepository.DEFAULT_LABEL, + RegisterRepository.DEFAULT_ICON_PATH, isRepoElem + && singleElement); + + // Unregister a remote repository + Map params = new HashMap(); + params.put(UnregisterRemoteRepo.PARAM_REPO_PATH, targetRepoPath); + CommandHelpers.refreshParameterizedCommand(menuManager, window, + UnregisterRemoteRepo.ID, + UnregisterRemoteRepo.DEFAULT_LABEL, + UnregisterRemoteRepo.DEFAULT_ICON_PATH, isRepoElem + && !isHomeRepo && singleElement, params); + + // Fetch repository + params = new HashMap(); + params.put(Fetch.PARAM_TARGET_REPO, targetRepoPath); + CommandHelpers.refreshParameterizedCommand(menuManager, window, + Fetch.ID, Fetch.DEFAULT_LABEL, Fetch.DEFAULT_ICON_PATH, + isRepoElem && singleElement && !isReadOnly, params); + + // Normalize workspace + CommandHelpers.refreshCommand(menuManager, window, + NormalizeDistribution.ID, + NormalizeDistribution.DEFAULT_LABEL, + NormalizeDistribution.DEFAULT_ICON_PATH, isDistribElem + && singleElement && !isReadOnly); + + // Copy workspace + CommandHelpers.refreshCommand(menuManager, window, + CopyWorkspace.ID, CopyWorkspace.DEFAULT_LABEL, + CopyWorkspace.DEFAULT_ICON_PATH, isDistribElem + && singleElement); + + // Clear Workspace + CommandHelpers.refreshCommand(menuManager, window, + DeleteWorkspace.ID, DeleteWorkspace.DEFAULT_LABEL, + DeleteWorkspace.DEFAULT_ICON_PATH, isDistribElem + && singleElement && !isReadOnly); + + // // Manage workspace authorizations + // params = new HashMap(); + // params.put(ManageWorkspaceAuth.PARAM_WORKSPACE_NAME, wsName); + // CommandHelpers.refreshParameterizedCommand(menuManager, window, + // ManageWorkspaceAuth.ID, ManageWorkspaceAuth.DEFAULT_LABEL, + // ManageWorkspaceAuth.DEFAULT_ICON_PATH, isDistribElem + // && singleElement && !isReadOnly, params); + } + // } catch (RepositoryException e) { + // throw new SlcException("unexpected errror while " + // + "building context menu", e); + // } + } - // Build conditions depending on element type (repo or - // distribution - // for the time being) - boolean isDistribElem = false; // , isRepoElem = false; + /** + * Exposes some Repository and workspace information about the selected + * element without exposing the UI model + */ + public class DistributionViewSelectedElement { + public boolean isRepository = false; + public boolean isWorkspaceGroup = false; + public boolean isWorkspace = false; + public boolean isReadOnly = false; + public String repositoryDescription; + public Node repoNode; + public String wkspName; + public String wkspPrefix; + public Repository repository; + public Credentials credentials; + } - if (firstElement instanceof DistributionElem) { - isDistribElem = true; - wsName = ((DistributionElem) firstElement).getName(); - } + /** + * Returns a {@see DistributionViewSelectedElement} if one and only one + * valid element is currently selected. + * + */ + public DistributionViewSelectedElement getSelectedElement() { - if (firstElement instanceof RepoElem) { - Node node = ((RepoElem) firstElement).getRepoNode(); - targetRepoPath = node.getPath(); - } + IStructuredSelection iss = (IStructuredSelection) viewer.getSelection(); + if (iss.isEmpty() || iss.size() > 1) + return null; - // create workspace - CommandHelpers.refreshCommand(menuManager, window, - CreateWorkspace.ID, CreateWorkspace.DEFAULT_LABEL, - CreateWorkspace.DEFAULT_ICON_PATH, !isDistribElem - && singleElement); - - // Register a remote repository - CommandHelpers.refreshCommand(menuManager, window, - RegisterRepository.ID, - RegisterRepository.DEFAULT_LABEL, - RegisterRepository.DEFAULT_ICON_PATH, !isDistribElem - && singleElement); - - // Unregister a remote repository - Map params = new HashMap(); - params.put(UnregisterRemoteRepo.PARAM_REPO_PATH, targetRepoPath); - CommandHelpers.refreshParameterizedCommand(menuManager, window, - UnregisterRemoteRepo.ID, - UnregisterRemoteRepo.DEFAULT_LABEL, - UnregisterRemoteRepo.DEFAULT_ICON_PATH, !isDistribElem - && singleElement, params); - - // Fetch repository - params = new HashMap(); - params.put(Fetch.PARAM_TARGET_REPO, targetRepoPath); - CommandHelpers.refreshParameterizedCommand(menuManager, window, - Fetch.ID, Fetch.DEFAULT_LABEL, Fetch.DEFAULT_ICON_PATH, - !isDistribElem && singleElement, params); - - // Normalize workspace - params = new HashMap(); - params.put(NormalizeDistribution.PARAM_WORKSPACE, wsName); - CommandHelpers.refreshParameterizedCommand(menuManager, window, - NormalizeDistribution.ID, - NormalizeDistribution.DEFAULT_LABEL, - NormalizeDistribution.DEFAULT_ICON_PATH, isDistribElem - && singleElement, params); - - // Copy workspace - params = new HashMap(); - params.put(CopyWorkspace.PARAM_WORKSPACE_NAME, wsName); - CommandHelpers.refreshParameterizedCommand(menuManager, window, - CopyWorkspace.ID, CopyWorkspace.DEFAULT_LABEL, - CopyWorkspace.DEFAULT_ICON_PATH, isDistribElem - && singleElement, params); - - // Delete Workspace - params = new HashMap(); - params.put(DeleteWorkspace.PARAM_WORKSPACE_NAME, wsName); - CommandHelpers.refreshParameterizedCommand(menuManager, window, - DeleteWorkspace.ID, DeleteWorkspace.DEFAULT_LABEL, - DeleteWorkspace.DEFAULT_ICON_PATH, isDistribElem - && singleElement, params); - - // Manage workspace authorizations - params = new HashMap(); - params.put(ManageWorkspaceAuth.PARAM_WORKSPACE_NAME, wsName); - CommandHelpers.refreshParameterizedCommand(menuManager, window, - ManageWorkspaceAuth.ID, - ManageWorkspaceAuth.DEFAULT_LABEL, - ManageWorkspaceAuth.DEFAULT_ICON_PATH, isDistribElem - && singleElement, params); - } - } catch (RepositoryException e) { - throw new SlcException("unexpected errror while " - + "building context menu", e); - } + DistributionViewSelectedElement dvse = new DistributionViewSelectedElement(); + Object obj = iss.getFirstElement(); + if (obj instanceof RepoElem) { + RepoElem re = (RepoElem) obj; + dvse.isRepository = true; + dvse.isReadOnly = re.isReadOnly(); + dvse.repository = re.getRepository(); + dvse.repoNode = re.getRepoNode(); + dvse.credentials = re.getCredentials(); + dvse.repositoryDescription = getRepositoryDescription(re); + } else if (obj instanceof GroupElem) { + GroupElem dge = (GroupElem) obj; + dvse.isWorkspaceGroup = true; + dvse.isReadOnly = dge.isReadOnly(); + dvse.repository = dge.getRepoElem().getRepository(); + dvse.repoNode = dge.getRepoElem().getRepoNode(); + dvse.credentials = dge.getRepoElem().getCredentials(); + dvse.wkspPrefix = dge.getLabel(); + dvse.repositoryDescription = getRepositoryDescription(dge + .getRepoElem()); + } else if (obj instanceof WorkspaceElem) { + WorkspaceElem de = (WorkspaceElem) obj; + dvse.isWorkspace = true; + dvse.isReadOnly = de.isReadOnly(); + dvse.repository = de.getRepoElem().getRepository(); + dvse.repoNode = de.getRepoElem().getRepoNode(); + dvse.credentials = de.getRepoElem().getCredentials(); + dvse.wkspName = de.getWorkspaceName(); + dvse.repositoryDescription = getRepositoryDescription(de + .getRepoElem()); + } + return dvse; + } + + private String getRepositoryDescription(RepoElem repo) { + StringBuffer repoDesc = new StringBuffer(); + repoDesc.append(repo.getLabel()); + repoDesc.append(" ("); + repoDesc.append(JcrUtils.get(repo.getRepoNode(), ARGEO_URI)); + repoDesc.append(")"); + return repoDesc.toString(); } @Override @@ -308,221 +330,42 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames * Force refresh of the whole view */ public void refresh() { - viewer.setContentProvider(new DistributionsContentProvider()); - } - - /* - * INTERNAL CLASSES - */ - /** Content provider */ - private class DistributionsContentProvider implements ITreeContentProvider { - Session nodeSession; - List repositories = new ArrayList(); - - public Object[] getElements(Object input) { - Repository nodeRepository = (Repository) input; - try { - if (nodeSession != null) - dispose(); - nodeSession = nodeRepository.login(); - - String reposPath = UserJcrUtils.getUserHome(nodeSession) - .getPath() + RepoConstants.REPOSITORIES_BASE_PATH; - NodeIterator repos = nodeSession.getNode(reposPath).getNodes(); - while (repos.hasNext()) { - Node repoNode = repos.nextNode(); - if (repoNode.isNodeType(ArgeoTypes.ARGEO_REMOTE_REPOSITORY)) { - repositories.add(new RepoElem(repoNode)); - } - } - } catch (RepositoryException e) { - throw new SlcException("Cannot get base elements", e); - } - return repositories.toArray(); - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - - } - - public Object[] getChildren(Object parentElement) { - if (parentElement instanceof RepoElem) { - return ((RepoElem) parentElement).getChildren(); - } else if (parentElement instanceof DistributionElem) { - return ((DistributionElem) parentElement).getChildren(); - } - return null; - } - - public Object getParent(Object element) { - // TODO register repo elem in distribution elem? - return null; - } - - public boolean hasChildren(Object element) { - if (element instanceof RepoElem) { - return true; - } else if (element instanceof DistributionElem) { - return false; - } - return false; - } - - public void dispose() { - for (RepoElem repoElem : repositories) - repoElem.dispose(); - repositories = new ArrayList(); - JcrUtils.logoutQuietly(nodeSession); - } - + viewer.setInput(nodeRepository); + viewer.expandToLevel(2); } - /** A software repository */ - private class RepoElem { - private Node repoNode; - - private Repository repository; - private Credentials credentials; - - public RepoElem(Node repoNode) { - this.repoNode = repoNode; - } - - /** Lazily connects to repository */ - protected void connect() { - if (repository != null) - return; - repository = RepoUtils.getRepository(repositoryFactory, keyring, - repoNode); - credentials = RepoUtils.getRepositoryCredentials(keyring, repoNode); - } - - public String getLabel() { - try { - if (repoNode.isNodeType(NodeType.MIX_TITLE)) { - return repoNode.getProperty(Property.JCR_TITLE).getString(); - } else { - return repoNode.getName(); - } - } catch (RepositoryException e) { - throw new SlcException("Cannot read label of " + repoNode, e); - } - } - - public String toString() { - return repoNode.toString(); - } - - public Object[] getChildren() { - connect(); - Session session = null; - try { - session = repository.login(credentials); - String[] workspaceNames = session.getWorkspace() - .getAccessibleWorkspaceNames(); - List distributionElems = new ArrayList(); - for (String workspaceName : workspaceNames) { - // filter technical workspaces - // FIXME: rely on a more robust rule than just wksp name - if (workspaceName.lastIndexOf('-') > 0) { - Node workspaceNode = repoNode.hasNode(workspaceName) ? repoNode - .getNode(workspaceName) : repoNode - .addNode(workspaceName); - repoNode.getSession().save(); - distributionElems.add(new DistributionElem(this, - workspaceNode)); - // FIXME remove deleted workspaces - } - } - return distributionElems.toArray(); - } catch (RepositoryException e) { - throw new SlcException( - "Cannot list workspaces for " + repoNode, e); - } finally { - JcrUtils.logoutQuietly(session); - } - } - - public void dispose() { - } - - public Node getRepoNode() { - return repoNode; - } - - public String getRepoPath() { - try { - return repoNode.getPath(); - } catch (RepositoryException e) { - throw new SlcException("Cannot get path for " + repoNode, e); - } - } - - public Repository getRepository() { - connect(); - return repository; + /** Add some view specific behaviours to the comparator */ + private class BrowserElementComparator extends ArtifactNamesComparator { + @Override + public int category(Object element) { + // Home repository always first + if (element instanceof RepoElem && ((RepoElem) element).inHome()) + return 2; + else + return super.category(element); } - public Credentials getCredentials() { - return credentials; + @Override + public int compare(Viewer viewer, Object e1, Object e2) { + // reverse order for versions + if (e1 instanceof WorkspaceElem) + return -super.compare(viewer, e1, e2); + else + return super.compare(viewer, e1, e2); } - } - /** Abstracts a distribution, that is a workspace */ - private static class DistributionElem extends TreeParent { - private final RepoElem repoElem; - private final Node workspaceNode; + /** Abstract class to simplify UI conditions build */ - public DistributionElem(RepoElem repoElem, Node workspaceNode) { - super(JcrUtils.getNameQuietly(workspaceNode)); - this.repoElem = repoElem; - this.workspaceNode = workspaceNode; - } - - public Node getWorkspaceNode() { - return workspaceNode; - } - - public String getWorkspaceName() { - return JcrUtils.getNameQuietly(workspaceNode); - } - - public String getWorkspacePath() { - try { - return workspaceNode.getPath(); - } catch (RepositoryException e) { - throw new SlcException("Cannot get or add workspace path " - + getWorkspaceName(), e); - } - } - - public String getRepoPath() { - try { - return workspaceNode.getParent().getPath(); - } catch (RepositoryException e) { - throw new SlcException("Cannot get or add workspace path " - + getWorkspaceName(), e); - } - } - - public RepoElem getRepoElem() { - return repoElem; - } - - public Credentials getCredentials() { - return repoElem.getCredentials(); - } - } + /** A software repository */ /** Listens to drag */ class ViewDragListener extends DragSourceAdapter { public void dragSetData(DragSourceEvent event) { IStructuredSelection selection = (IStructuredSelection) viewer .getSelection(); - if (selection.getFirstElement() instanceof DistributionElem) { - DistributionElem de = (DistributionElem) selection - .getFirstElement(); + if (selection.getFirstElement() instanceof WorkspaceElem) { + WorkspaceElem de = (WorkspaceElem) selection.getFirstElement(); if (TextTransfer.getInstance().isSupportedType(event.dataType)) { event.data = de.getWorkspacePath(); } @@ -539,76 +382,79 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames @Override public boolean performDrop(Object data) { - DistributionElem sourceDist = (DistributionElem) getSelectedObject(); + WorkspaceElem sourceDist = (WorkspaceElem) getSelectedObject(); RepoElem targetRepo = (RepoElem) getCurrentTarget(); Boolean ok = MessageDialog.openConfirm(getSite().getShell(), - "Confirm distribution merge", "Do you want to merge " - + sourceDist.getWorkspaceName() + " (from repo " + "FIXME: BROKEN BY REFACTORING--Confirm distribution merge", + "Do you want to merge " + sourceDist.getWorkspaceName() + + " (from repo " + sourceDist.getRepoElem().getLabel() + ") to repo " + targetRepo.getLabel() + "?"); if (!ok) return false; - try { - String sourceWorkspace = sourceDist.getWorkspaceName(); - Repository sourceRepository = RepoUtils.getRepository( - repositoryFactory, keyring, sourceDist - .getWorkspaceNode().getParent()); - Credentials sourceCredentials = RepoUtils - .getRepositoryCredentials(keyring, sourceDist - .getWorkspaceNode().getParent()); - - String targetWorkspace = sourceWorkspace; - Repository targetRepository = RepoUtils.getRepository( - repositoryFactory, keyring, targetRepo.getRepoNode()); - Credentials targetCredentials = RepoUtils - .getRepositoryCredentials(keyring, - targetRepo.getRepoNode()); - - // Open sessions here since the background thread - // won't necessarily be authenticated. - // Job should close the sessions. - Session sourceSession = sourceRepository.login( - sourceCredentials, sourceWorkspace); - Session targetSession; - try { - targetSession = targetRepository.login(targetCredentials, - targetWorkspace); - } catch (NoSuchWorkspaceException e) { - Session defaultSession = targetRepository - .login(targetCredentials); - try { - defaultSession.getWorkspace().createWorkspace( - targetWorkspace); - } catch (Exception e1) { - throw new SlcException("Cannot create new workspace " - + targetWorkspace, e); - } finally { - JcrUtils.logoutQuietly(defaultSession); - } - targetSession = targetRepository.login(targetCredentials, - targetWorkspace); - } - - Job workspaceMergeJob = new WorkspaceMergeJob(sourceSession, - targetSession); - workspaceMergeJob.setUser(true); - workspaceMergeJob.schedule(); - return true; - } catch (RepositoryException e) { - throw new SlcException("Cannot process drop from " + sourceDist - + " to " + targetRepo, e); - } + // TODO uncomment that + return true; + // try { + // String sourceWorkspace = sourceDist.getWorkspaceName(); + // Repository sourceRepository = RepoUtils.getRepository( + // repositoryFactory, keyring, sourceDist + // .getWorkspaceNode().getParent()); + // Credentials sourceCredentials = RepoUtils + // .getRepositoryCredentials(keyring, sourceDist + // .getWorkspaceNode().getParent()); + // + // String targetWorkspace = sourceWorkspace; + // Repository targetRepository = RepoUtils.getRepository( + // repositoryFactory, keyring, targetRepo.getRepoNode()); + // Credentials targetCredentials = RepoUtils + // .getRepositoryCredentials(keyring, + // targetRepo.getRepoNode()); + // + // // Open sessions here since the background thread + // // won't necessarily be authenticated. + // // Job should close the sessions. + // Session sourceSession = sourceRepository.login( + // sourceCredentials, sourceWorkspace); + // Session targetSession; + // try { + // targetSession = targetRepository.login(targetCredentials, + // targetWorkspace); + // } catch (NoSuchWorkspaceException e) { + // Session defaultSession = targetRepository + // .login(targetCredentials); + // try { + // defaultSession.getWorkspace().createWorkspace( + // targetWorkspace); + // } catch (Exception e1) { + // throw new SlcException("Cannot create new workspace " + // + targetWorkspace, e); + // } finally { + // JcrUtils.logoutQuietly(defaultSession); + // } + // targetSession = targetRepository.login(targetCredentials, + // targetWorkspace); + // } + // + // Job workspaceMergeJob = new WorkspaceMergeJob(sourceSession, + // targetSession); + // workspaceMergeJob.setUser(true); + // workspaceMergeJob.schedule(); + // return true; + // } catch (RepositoryException e) { + // throw new SlcException("Cannot process drop from " + sourceDist + // + " to " + targetRepo, e); + // } } @Override public boolean validateDrop(Object target, int operation, TransferData transferType) { if (target instanceof RepoElem) { - if (getSelectedObject() instanceof DistributionElem) { + if (getSelectedObject() instanceof WorkspaceElem) { // check if not same repository - String srcRepoPath = ((DistributionElem) getSelectedObject()) + String srcRepoPath = ((WorkspaceElem) getSelectedObject()) .getRepoPath(); String targetRepoPath = ((RepoElem) target).getRepoPath(); return !targetRepoPath.equals(srcRepoPath); @@ -675,13 +521,14 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames return; Object obj = ((IStructuredSelection) event.getSelection()) .getFirstElement(); - if (obj instanceof DistributionElem) { - DistributionElem distributionElem = (DistributionElem) obj; + if (obj instanceof WorkspaceElem) { + WorkspaceElem distributionElem = (WorkspaceElem) obj; DistributionEditorInput dei = new DistributionEditorInput( - distributionElem.getName(), distributionElem - .getRepoElem().getRepository(), - distributionElem.getWorkspaceName(), - distributionElem.getCredentials()); + distributionElem.getName(), + getRepositoryDescription(distributionElem.getRepoElem()), + distributionElem.getRepoElem().getRepository(), + distributionElem.getWorkspaceName(), distributionElem + .getCredentials()); try { DistPlugin.getDefault().getWorkbench() .getActiveWorkbenchWindow().getActivePage() @@ -697,15 +544,12 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames /* * DEPENDENCY INJECTION */ - public void setRepositoryFactory(RepositoryFactory repositoryFactory) { - this.repositoryFactory = repositoryFactory; - } - - public void setKeyring(Keyring keyring) { - this.keyring = keyring; - } - public void setNodeRepository(Repository repository) { this.nodeRepository = repository; } + + public void setTreeContentProvider( + DistTreeContentProvider treeContentProvider) { + this.treeContentProvider = treeContentProvider; + } } \ No newline at end of file