Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrescobar2010-12-13 18:53:57 +0000
committerRyan D. Brooks2010-12-13 18:53:57 +0000
commit36b4e1e4979a58a70b0ae70995acd123e87a15a3 (patch)
tree601d3fd06bd8237be82ea24a8eea005cd2b8cc6f /plugins
parent060cec859a3a45094677a45c220b5fc8b415c7e3 (diff)
downloadorg.eclipse.osee-36b4e1e4979a58a70b0ae70995acd123e87a15a3.tar.gz
org.eclipse.osee-36b4e1e4979a58a70b0ae70995acd123e87a15a3.tar.xz
org.eclipse.osee-36b4e1e4979a58a70b0ae70995acd123e87a15a3.zip
feature[ats_YGHW1]: Unfinished artifact and relation composite changes
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/artifact/ArtifactPromptChangeTest.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java39
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java75
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java15
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/accessProviders/ArtifactTypeAccessProvder.java44
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/IAccessPolicyHandlerService.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/BaseArtifactEditorInput.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/AccessPolicyHandlerServiceImpl.java5
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTypeFilteredTreeEntryDialog.java27
9 files changed, 103 insertions, 114 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/artifact/ArtifactPromptChangeTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/artifact/ArtifactPromptChangeTest.java
index 9eec63889dd..65848ea9905 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/artifact/ArtifactPromptChangeTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/artifact/ArtifactPromptChangeTest.java
@@ -24,6 +24,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.IBasicArtifact;
import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.access.PermissionStatus;
+import org.eclipse.osee.framework.core.services.IAccessControlService;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactPromptChange;
import org.eclipse.osee.framework.ui.skynet.artifact.IAccessPolicyHandlerService;
@@ -79,6 +80,11 @@ public class ArtifactPromptChangeTest {
public PermissionStatus hasArtifactPermission(Collection<? extends IBasicArtifact<?>> artifacts, PermissionEnum permission, Level level) throws OseeCoreException {
return new PermissionStatus();
}
+
+ @Override
+ public IAccessControlService getAccessService() {
+ return null;
+ }
}
private static class MockPromptFactory implements IPromptFactory {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
index 87d5b58dd19..e72fb1dee57 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
@@ -46,9 +46,11 @@ import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
+import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.access.PermissionStatus;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
@@ -86,10 +88,10 @@ import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
import org.eclipse.osee.framework.ui.plugin.util.SelectionCountChangeListener;
import org.eclipse.osee.framework.ui.skynet.access.PolicyDialog;
import org.eclipse.osee.framework.ui.skynet.accessProviders.ArtifactAccessProvider;
-import org.eclipse.osee.framework.ui.skynet.accessProviders.ArtifactTypeAccessProvder;
import org.eclipse.osee.framework.ui.skynet.action.OpenAssociatedArtifactFromBranchProvider;
import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactNameConflictHandler;
import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactPasteOperation;
+import org.eclipse.osee.framework.ui.skynet.artifact.IAccessPolicyHandlerService;
import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectionDialog;
import org.eclipse.osee.framework.ui.skynet.change.ChangeUiUtil;
import org.eclipse.osee.framework.ui.skynet.dialogs.ArtifactPasteSpecialDialog;
@@ -610,24 +612,30 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent
createMenuItem.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- super.widgetSelected(e);
try {
ArtifactTypeFilteredTreeEntryDialog dialog = getDialog();
Artifact parent = getParent();
- if (dialog.open() == Window.OK) {
- IArtifactType type = dialog.getSelection();
- String name = dialog.getEntryValue();
+ IAccessPolicyHandlerService policy = SkynetGuiPlugin.getInstance().getPolicyHandlerService();
- SkynetTransaction transaction =
- new SkynetTransaction(branch, String.format("Created new %s \"%s\" in artifact explorer",
- type.getName(), name));
- parent.addNewChild(null, type, name);
- parent.persist(transaction);
- transaction.execute();
+ PermissionStatus status =
+ policy.hasArtifactPermission(java.util.Collections.singleton(parent), PermissionEnum.WRITE, Level.FINE);
- treeViewer.refresh();
- treeViewer.refresh(false);
+ if (status.matched()) {
+ if (dialog.open() == Window.OK) {
+ IArtifactType type = dialog.getSelection();
+ String name = dialog.getEntryValue();
+
+ SkynetTransaction transaction =
+ new SkynetTransaction(branch, String.format("Created new %s \"%s\" in artifact explorer",
+ type.getName(), name));
+ parent.addNewChild(null, type, name);
+ parent.persist(transaction);
+ transaction.execute();
+
+ treeViewer.refresh();
+ treeViewer.refresh(false);
+ }
}
} catch (Exception ex) {
OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
@@ -641,9 +649,8 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent
artifactTypes.remove(CoreArtifactTypes.RootArtifact);
ArtifactTypeFilteredTreeEntryDialog dialog =
- new ArtifactTypeFilteredTreeEntryDialog(new ArtifactTypeAccessProvder(),
- SkynetGuiPlugin.getInstance().getPolicyHandlerService(), branch, "New Child",
- "Enter name and select Artifact type to create", "Artifact Name");
+ new ArtifactTypeFilteredTreeEntryDialog("New Child", "Enter name and select Artifact type to create",
+ "Artifact Name");
dialog.setInput(artifactTypes);
return dialog;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java
index 9af62fe314c..243de1581d6 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java
@@ -10,20 +10,24 @@
*******************************************************************************/
package org.eclipse.osee.framework.ui.skynet;
+import java.util.Collections;
import java.util.logging.Level;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.RelationTypeSide;
+import org.eclipse.osee.framework.core.model.access.PermissionStatus;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
+import org.eclipse.osee.framework.ui.skynet.artifact.IAccessPolicyHandlerService;
import org.eclipse.osee.framework.ui.swt.ImageManager;
import org.eclipse.swt.graphics.Image;
@@ -31,6 +35,8 @@ import org.eclipse.swt.graphics.Image;
* @author Ryan D. Brooks
*/
public class RelationLabelProvider implements ITableLabelProvider, ILabelProvider {
+ private static final Image LOCK_IMAGE = ImageManager.getImage(FrameworkImage.LOCK_OVERLAY);
+
private Artifact artifact;
public RelationLabelProvider(Artifact artifact) {
@@ -39,39 +45,64 @@ public class RelationLabelProvider implements ITableLabelProvider, ILabelProvide
@Override
public Image getColumnImage(Object element, int columnIndex) {
+ Image toReturn = null;
if (element instanceof RelationType && columnIndex == 0) {
- return ImageManager.getImage(FrameworkImage.RELATION);
+ toReturn = ImageManager.getImage(FrameworkImage.RELATION);
} else if (element instanceof WrapperForRelationLink && columnIndex == 0) {
- WrapperForRelationLink artifact = (WrapperForRelationLink) element;
+ WrapperForRelationLink relationLinkWrapper = (WrapperForRelationLink) element;
try {
- return ArtifactImageManager.getImage(artifact.getOther());
+ toReturn = ArtifactImageManager.getImage(relationLinkWrapper.getOther());
} catch (Exception ex) {
OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
}
} else if (element instanceof RelationTypeSide && columnIndex == 0) {
- try {
- RelationTypeSide relationTypeSide = (RelationTypeSide) element;
- RelationSide side = relationTypeSide.getSide();
- RelationTypeMultiplicity multiplicity = RelationTypeManager.getType(relationTypeSide).getMultiplicity();
-
- if (side == RelationSide.SIDE_A) {
- if (multiplicity.getSideALimit() == 1) {
- return ImageManager.getImage(FrameworkImage.LEFT_ARROW_1);
- } else {
- return ImageManager.getImage(FrameworkImage.LEFT_ARROW_N);
- }
+ toReturn = getImage((RelationTypeSide) element);
+ }
+ return toReturn;
+ }
+
+ private boolean isLocked(RelationTypeSide relationTypeSide) {
+ boolean isLocked = true;
+ IAccessPolicyHandlerService policyHandlerService;
+ try {
+ policyHandlerService = SkynetGuiPlugin.getInstance().getPolicyHandlerService();
+ PermissionStatus permissionStatus =
+ policyHandlerService.hasRelationSidePermission(Collections.singleton(relationTypeSide),
+ PermissionEnum.WRITE, Level.FINE);
+ isLocked = !permissionStatus.matched();
+ } catch (OseeCoreException ex) {
+ OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
+ }
+ return isLocked;
+ }
+
+ private Image getImage(RelationTypeSide relationTypeSide) {
+ boolean isLocked = isLocked(relationTypeSide);
+ if (isLocked) {
+ return LOCK_IMAGE;
+ }
+
+ RelationSide side = relationTypeSide.getSide();
+ try {
+ RelationType type = RelationTypeManager.getType(relationTypeSide);
+ RelationTypeMultiplicity multiplicity = type.getMultiplicity();
+
+ if (side == RelationSide.SIDE_A) {
+ if (multiplicity.getSideALimit() == 1) {
+ return ImageManager.getImage(FrameworkImage.LEFT_ARROW_1);
} else {
- if (multiplicity.getSideBLimit() == 1) {
- return ImageManager.getImage(FrameworkImage.RIGHT_ARROW_1);
- } else {
- return ImageManager.getImage(FrameworkImage.RIGHT_ARROW_N);
- }
+ return ImageManager.getImage(FrameworkImage.LEFT_ARROW_N);
+ }
+ } else {
+ if (multiplicity.getSideBLimit() == 1) {
+ return ImageManager.getImage(FrameworkImage.RIGHT_ARROW_1);
+ } else {
+ return ImageManager.getImage(FrameworkImage.RIGHT_ARROW_N);
}
- } catch (OseeCoreException ex) {
- return null;
}
+ } catch (OseeCoreException ex) {
+ return null;
}
- return null;
}
@Override
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java
index 0b4c2256302..df80a1c3c32 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java
@@ -95,6 +95,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact {
private MenuItem openMenuItem, wordPreviewItem, editMenuItem, viewRelationTreeItem, deleteRelationMenuItem,
massEditMenuItem, deleteArtifactMenuItem, revealInArtifactExporerMenuItem;
+
private final Artifact artifact;
private final RelationLabelProvider relationLabelProvider;
private final ToolBar toolBar;
@@ -113,9 +114,9 @@ public class RelationsComposite extends Composite implements ISelectedArtifact {
this.artifact = artifact;
this.editor = editor;
this.relationLabelProvider = new RelationLabelProvider(artifact);
+ this.toolBar = toolBar;
createPartControl();
- this.toolBar = toolBar;
}
public TreeViewer getTreeViewer() {
@@ -479,7 +480,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact {
boolean valid = selection.getFirstElement() instanceof WrapperForRelationLink;
for (MenuItem item : accessControlitems) {
- item.setEnabled(valid && !artifact.isReadOnly());
+ item.setEnabled(valid && !checkLinksReadOnly());
}
for (MenuItem item : artEnabledOnlyitems) {
@@ -542,7 +543,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact {
* Performs the deletion functionality
*/
private void performDeleteRelation(IStructuredSelection selection) {
- if (artifact.isReadOnly()) {
+ if (checkLinksReadOnly()) {
MessageDialog.openError(
Displays.getActiveShell(),
"Delete Relation Error",
@@ -619,6 +620,10 @@ public class RelationsComposite extends Composite implements ISelectedArtifact {
refresh();
}
+ private boolean checkLinksReadOnly() {
+ return artifact.isReadOnly();
+ }
+
private class RelationSkynetDragAndDrop extends SkynetDragAndDrop {
boolean isFeedbackAfter = false;
@@ -652,7 +657,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact {
event.detail = DND.DROP_NONE;
if (selected != null && selected.getData() instanceof RelationTypeSideSorter) {
- if (artifact.isReadOnly()) {
+ if (checkLinksReadOnly()) {
event.detail = DND.DROP_NONE;
MessageDialog.openError(
@@ -671,7 +676,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact {
if (obj instanceof WrapperForRelationLink) {
WrapperForRelationLink dropTarget = (WrapperForRelationLink) obj;
- if (artifact.isReadOnly()) {
+ if (checkLinksReadOnly()) {
event.detail = DND.DROP_NONE;
MessageDialog.openError(
Displays.getActiveShell(),
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/accessProviders/ArtifactTypeAccessProvder.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/accessProviders/ArtifactTypeAccessProvder.java
deleted file mode 100644
index 591b1bf3f74..00000000000
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/accessProviders/ArtifactTypeAccessProvder.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.ui.skynet.accessProviders;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.enums.PermissionEnum;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.ui.skynet.artifact.IAccessPolicyHandlerService;
-
-/**
- * @author Jeff C. Phillips
- */
-public class ArtifactTypeAccessProvder {
-
- /**
- * @return Returns artifact types that a user has write permissions for on a specific branch
- */
- public Collection<? extends IArtifactType> getWritableTypes(IAccessPolicyHandlerService accessService, Branch branch, Collection<? extends IArtifactType> artifactTypes) throws OseeCoreException {
- Iterator<? extends IArtifactType> artTypeIterator = artifactTypes.iterator();
-
- // Remove ArtifactTypes that do not have write permission.
- while (artTypeIterator.hasNext()) {
- artTypeIterator.next();
- if (!accessService.hasArtifactTypePermission(branch, Collections.singleton(artTypeIterator.next()),
- PermissionEnum.WRITE, Level.WARNING).matched()) {
- artTypeIterator.remove();
- }
- }
- return artifactTypes;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/IAccessPolicyHandlerService.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/IAccessPolicyHandlerService.java
index 41af6d14ed8..5316f200fb2 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/IAccessPolicyHandlerService.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/IAccessPolicyHandlerService.java
@@ -20,6 +20,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.IBasicArtifact;
import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.access.PermissionStatus;
+import org.eclipse.osee.framework.core.services.IAccessControlService;
public interface IAccessPolicyHandlerService {
PermissionStatus hasAttributeTypePermission(Collection<? extends IBasicArtifact<?>> artifacts, IAttributeType attributeType, PermissionEnum permission, Level level) throws OseeCoreException;
@@ -29,4 +30,6 @@ public interface IAccessPolicyHandlerService {
PermissionStatus hasArtifactTypePermission(IOseeBranch branch, Collection<? extends IArtifactType> artifactTypes, PermissionEnum permission, Level level) throws OseeCoreException;
PermissionStatus hasArtifactPermission(Collection<? extends IBasicArtifact<?>> artifacts, PermissionEnum permission, Level level) throws OseeCoreException;
+
+ IAccessControlService getAccessService();
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/BaseArtifactEditorInput.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/BaseArtifactEditorInput.java
index 5b187a71426..7dfb427a09d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/BaseArtifactEditorInput.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/BaseArtifactEditorInput.java
@@ -57,7 +57,8 @@ public abstract class BaseArtifactEditorInput implements IEditorInput {
if (artifact == null) {
return "No Artifact Input Provided";
}
- return String.format("%s%s", artifact.getVersionedName(), artifact.isReadOnly() ? " (Read-Only)" : "");
+ // return String.format("%s%s", artifact.getVersionedName(), artifact.isReadOnly() ? " (Read-Only)" : "");
+ return artifact.getVersionedName();
}
@Override
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/AccessPolicyHandlerServiceImpl.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/AccessPolicyHandlerServiceImpl.java
index 3ecde7aa7e5..931628fa27e 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/AccessPolicyHandlerServiceImpl.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/AccessPolicyHandlerServiceImpl.java
@@ -123,4 +123,9 @@ public class AccessPolicyHandlerServiceImpl implements IAccessPolicyHandlerServi
}
return permissionStatus;
}
+
+ @Override
+ public IAccessControlService getAccessService() {
+ return accessControlService;
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTypeFilteredTreeEntryDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTypeFilteredTreeEntryDialog.java
index 9ea18188075..679c1cf5ed9 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTypeFilteredTreeEntryDialog.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTypeFilteredTreeEntryDialog.java
@@ -10,17 +10,8 @@
*******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.widgets.dialog;
-import java.util.Collection;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.accessProviders.ArtifactTypeAccessProvder;
-import org.eclipse.osee.framework.ui.skynet.artifact.IAccessPolicyHandlerService;
import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener;
import org.eclipse.osee.framework.ui.skynet.widgets.XText;
import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;
@@ -34,26 +25,10 @@ public class ArtifactTypeFilteredTreeEntryDialog extends ArtifactTypeFilteredTre
private String entryValue = null;
private final String entryName;
private XText xText = null;
- private final Branch branch;
- private final IAccessPolicyHandlerService accessService;
- private final ArtifactTypeAccessProvder artifactTypeAccessProvder;
- public ArtifactTypeFilteredTreeEntryDialog(ArtifactTypeAccessProvder artifactTypeAccessProvder, IAccessPolicyHandlerService accessService, Branch branch, String title, String message, String entryName) {
+ public ArtifactTypeFilteredTreeEntryDialog(String title, String message, String entryName) {
super(title, message);
this.entryName = entryName;
- this.branch = branch;
- this.accessService = accessService;
- this.artifactTypeAccessProvder = artifactTypeAccessProvder;
- }
-
- @Override
- public void setInput(Collection<? extends IArtifactType> input) {
- try {
- input = artifactTypeAccessProvder.getWritableTypes(accessService, branch, input);
- } catch (OseeCoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
- }
- super.setInput(input);
}
@Override

Back to the top