diff options
Diffstat (limited to 'plugins')
2 files changed, 4 insertions, 5 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java index b531c7c17d0..b541f3ae007 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java @@ -630,7 +630,7 @@ public class Artifact extends NamedIdBase implements ArtifactToken, Adaptable, F return Collections.oneOrSentinel(getAttributes(attributeType), null); } - private <T> Attribute<T> getOrCreateSoleAttribute(AttributeTypeId attributeType) { + private <T> Attribute<T> getOrCreateSoleAttribute(AttributeTypeGeneric<?> attributeType) { Attribute<T> attribute = getSoleAttribute(attributeType); if (attribute == null) { if (!isAttributeTypeValid(attributeType)) { @@ -646,7 +646,7 @@ public class Artifact extends NamedIdBase implements ArtifactToken, Adaptable, F * Return he existing attribute value or the default value from a newly initialized attribute if none previously * existed */ - public final <T> T getOrInitializeSoleAttributeValue(AttributeTypeId attributeType) { + public final <T> T getOrInitializeSoleAttributeValue(AttributeTypeGeneric<?> attributeType) { Attribute<T> attribute = getOrCreateSoleAttribute(attributeType); return attribute.getValue(); } @@ -821,7 +821,7 @@ public class Artifact extends NamedIdBase implements ArtifactToken, Adaptable, F getOrCreateSoleAttribute(attributeType).setValue(value); } - public final <T> void setSoleAttributeFromString(AttributeTypeId attributeType, String value) { + public final <T> void setSoleAttributeFromString(AttributeTypeGeneric<?> attributeType, String value) { getOrCreateSoleAttribute(attributeType).setFromString(value); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedEnumAttributeEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedEnumAttributeEditor.java index 94946fa2105..3c4824800e5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedEnumAttributeEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedEnumAttributeEditor.java @@ -155,5 +155,4 @@ public class EmbeddedEnumAttributeEditor implements IEmbeddedAttributeEditor { public boolean canFinish() { return true; } - -} +}
\ No newline at end of file |