diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.skynet.core')
3 files changed, 14 insertions, 14 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java index 3202b872d3d..1ca7dfbc7a1 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.skynet.core; -import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.core.enums.DeletionFlag.*; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -294,7 +294,7 @@ public final class UserManager { private static void addUserToUserGroups(Artifact user) throws OseeCoreException { Collection<Artifact> userGroups = ArtifactQuery.getArtifactListFromTypeAndAttribute(CoreArtifactTypes.UserGroup, - CoreAttributeTypes.DefaultGroup, "yes", CoreBranches.COMMON); + CoreAttributeTypes.DefaultGroup, "true", CoreBranches.COMMON); for (Artifact userGroup : userGroups) { userGroup.addRelation(CoreRelationTypes.Users_User, user); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BooleanAttribute.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BooleanAttribute.java index 4af04cd3637..2ec3d1be202 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BooleanAttribute.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BooleanAttribute.java @@ -16,20 +16,20 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; * @author Ryan D. Brooks */ public class BooleanAttribute extends CharacterBackedAttribute<Boolean> { - public static final String[] booleanChoices = new String[] {"yes", "no"}; + public static final String[] booleanChoices = {"true", "false"}; @Override public Boolean getValue() throws OseeCoreException { - return getAttributeDataProvider().getValueAsString().equals(booleanChoices[0]); + return Boolean.valueOf(getAttributeDataProvider().getValueAsString()); } @Override public boolean subClassSetValue(Boolean value) throws OseeCoreException { - return getAttributeDataProvider().setValue(value ? booleanChoices[0] : booleanChoices[1]); + return getAttributeDataProvider().setValue(String.valueOf(value)); } @Override protected Boolean convertStringToValue(String value) { - return value != null && value.equalsIgnoreCase(booleanChoices[0]); + return Boolean.parseBoolean(value); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee b/plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee index e8b06778805..8b4ede6b248 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee +++ b/plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee @@ -93,7 +93,7 @@ attributeType "Active" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 1 max 1 - defaultValue "yes" + defaultValue "true" } attributeType "Company" extends StringAttribute { @@ -301,7 +301,7 @@ attributeType "Default Group" extends BooleanAttribute { max 1 taggerId DefaultAttributeTaggerProvider description "Specifies whether to automatically add new users into this group" - defaultValue "no" + defaultValue "false" } artifactType "User Group" extends "Abstract Access Controlled" , "Group Artifact" { @@ -816,7 +816,7 @@ attributeType "Common NAL Requirement" extends BooleanAttribute { max 1 description "Requirement that is common to all NCORE (Networked Common Operating Real-time Environment) Application Layers" - defaultValue "no" + defaultValue "false" } attributeType "Crew Interface Requirement" extends BooleanAttribute { @@ -825,7 +825,7 @@ attributeType "Crew Interface Requirement" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 0 max 1 - defaultValue "no" + defaultValue "false" } attributeType "Legacy Id" extends StringAttribute { @@ -852,7 +852,7 @@ attributeType "System Security Requirement" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 0 max 1 - defaultValue "no" + defaultValue "false" } attributeType "Training Effectivity" extends BooleanAttribute { @@ -861,7 +861,7 @@ attributeType "Training Effectivity" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 0 max 1 - defaultValue "no" + defaultValue "false" } oseeEnumType "enum.req.partition" { @@ -1129,7 +1129,7 @@ attributeType "Technical Performance Parameter" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 1 max 1 - defaultValue "no" + defaultValue "false" } oseeEnumType "enum.req.verification.event" { @@ -1527,7 +1527,7 @@ attributeType "Developmental" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 1 max 1 - defaultValue "yes" + defaultValue "true" } attributeType "Hazard" extends StringAttribute { |