diff options
author | afinkbein | 2008-03-14 18:41:44 +0000 |
---|---|---|
committer | afinkbein | 2008-03-14 18:41:44 +0000 |
commit | 49bf501e0b369578752862b46408e83d75c9db37 (patch) | |
tree | c921ff4bcedfe9d26f77c2876195cefc5a2d8220 | |
parent | 3c8a6c2d57cc3f6cab3432d7def76843811c7705 (diff) | |
download | org.eclipse.osee-49bf501e0b369578752862b46408e83d75c9db37.tar.gz org.eclipse.osee-49bf501e0b369578752862b46408e83d75c9db37.tar.xz org.eclipse.osee-49bf501e0b369578752862b46408e83d75c9db37.zip |
5 files changed, 6 insertions, 6 deletions
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportWizard.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportWizard.java index edb817bc3b5..9fbb65c2b17 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportWizard.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportWizard.java @@ -146,7 +146,7 @@ public class ArtifactImportWizard extends Wizard implements IImportWizard { if (page == mainPage && mainPage.getReuseArtifactRoot() != null) { try { ConfigurationPersistenceManager manager = ConfigurationPersistenceManager.getInstance(); - ArtifactSubtypeDescriptor rootDescriptor = mainPage.getReuseArtifactRoot().getDescriptor(); + ArtifactSubtypeDescriptor rootDescriptor = mainPage.getReuseArtifactRoot().getArtifactType(); ArtifactSubtypeDescriptor importDescriptor = mainPage.getSelectedType(); HashSet<DynamicAttributeDescriptor> rootAttributes = diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java index ee99a60504f..367e2c03342 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java @@ -46,7 +46,7 @@ public class RelationLabelProvider implements ITableLabelProvider, ILabelProvide return RELATION_IMAGE; } else if (element instanceof IRelationLink && columnIndex == 0) { IRelationLink link = (IRelationLink) element; - return (link.getArtifactA() == artifact) ? link.getArtifactB().getDescriptor().getImage() : link.getArtifactA().getDescriptor().getImage(); + return (link.getArtifactA() == artifact) ? link.getArtifactB().getArtifactType().getImage() : link.getArtifactA().getArtifactType().getImage(); } return null; } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java index 4d0d25c4c21..f8f49789d04 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java @@ -381,7 +381,7 @@ public class RelationsComposite extends Composite implements IEventReceiver { boolean isRelatable = false; for (IRelationLinkDescriptor relationDescriptor : RelationPersistenceManager.getInstance().getIRelationLinkDescriptors( - artifact.getDescriptor(), artifact.getBranch())) { + artifact.getArtifactType(), artifact.getBranch())) { MenuItem mItem = new MenuItem(newMenu, SWT.PUSH); mItem.setData(relationDescriptor); mItem.setText(relationDescriptor.getName()); diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorContributor.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorContributor.java index 4488b450b99..a8f53c459ff 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorContributor.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorContributor.java @@ -45,8 +45,8 @@ public class ArtifactEditorContributor extends MultiPageEditorActionBarContribut if (part instanceof ArtifactEditor) { ArtifactEditor artifactEditor = (ArtifactEditor) part; Artifact artifact = artifactEditor.getEditorInput().getArtifact(); - typeStatusItem.setText(artifact.getDescriptor().getName()); - typeStatusItem.setImage(artifact.getDescriptor().getImage()); + typeStatusItem.setText(artifact.getArtifactType().getName()); + typeStatusItem.setImage(artifact.getArtifactType().getImage()); showInExplorerAction.setArtifact(artifact); artifactEditor.getRelationsComposite().getTreeViewer().addSelectionChangedListener( diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/ArtifactModel.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/ArtifactModel.java index 9e8c9fcc5a6..3549666a5ad 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/ArtifactModel.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/ArtifactModel.java @@ -27,7 +27,7 @@ public class ArtifactModel { } public ArtifactModel(Artifact artifact) { - this(true, artifact, artifact.getDescriptiveName(), artifact.getDescriptor(), ""); + this(true, artifact, artifact.getDescriptiveName(), artifact.getArtifactType(), ""); } private ArtifactModel(boolean artifactFound, Artifact artifact, String name, ArtifactSubtypeDescriptor descriptor, String rationale) { |