diff options
author | ddunne | 2008-01-25 20:53:36 +0000 |
---|---|---|
committer | ddunne | 2008-01-25 20:53:36 +0000 |
commit | 299b91d47d95090be600b94a0d8d45a6c3da31b0 (patch) | |
tree | 16bdca9005ba2dbaddd7c6f27baeec73cdf2a24a | |
parent | 07f4d2e8cfd9324306165f5aac8e8e3d16a491de (diff) | |
download | org.eclipse.osee-299b91d47d95090be600b94a0d8d45a6c3da31b0.tar.gz org.eclipse.osee-299b91d47d95090be600b94a0d8d45a6c3da31b0.tar.xz org.eclipse.osee-299b91d47d95090be600b94a0d8d45a6c3da31b0.zip |
Cleanup deprecated setAttribute calls
13 files changed, 32 insertions, 29 deletions
diff --git a/MS_0.1.4_20080103/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/AtsConfigDemoDatabaseConfig.java b/MS_0.1.4_20080103/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/AtsConfigDemoDatabaseConfig.java index 1eaa63d2b62..6d4652fb4f0 100644 --- a/MS_0.1.4_20080103/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/AtsConfigDemoDatabaseConfig.java +++ b/MS_0.1.4_20080103/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/AtsConfigDemoDatabaseConfig.java @@ -156,7 +156,8 @@ public class AtsConfigDemoDatabaseConfig extends DbInitializationTask { VersionArtifact.ARTIFACT_NAME, BranchPersistenceManager.getInstance().getAtsBranch()).makeNewArtifact(); ver.setDescriptiveName(verName); if (verName.contains("1")) ver.setReleased(true); - if (verName.contains("2")) ver.setAttribute(ATSAttributes.NEXT_VERSION_ATTRIBUTE.getStoreName(), "yes"); + if (verName.contains("2")) ver.setSoleBooleanAttributeValue( + ATSAttributes.NEXT_VERSION_ATTRIBUTE.getStoreName(), true); DemoTeams.getInstance().getTeamDef(Team.SAW_SW).relate(RelationSide.TeamDefinitionToVersion_Version, ver); ver.persist(true); } @@ -169,7 +170,8 @@ public class AtsConfigDemoDatabaseConfig extends DbInitializationTask { VersionArtifact.ARTIFACT_NAME, BranchPersistenceManager.getInstance().getAtsBranch()).makeNewArtifact(); ver.setDescriptiveName(verName); if (verName.contains("1")) ver.setReleased(true); - if (verName.contains("2")) ver.setAttribute(ATSAttributes.NEXT_VERSION_ATTRIBUTE.getStoreName(), "yes"); + if (verName.contains("2")) ver.setSoleBooleanAttributeValue( + ATSAttributes.NEXT_VERSION_ATTRIBUTE.getStoreName(), true); DemoTeams.getInstance().getTeamDef(Team.CIS_SW).relate(RelationSide.TeamDefinitionToVersion_Version, ver); ver.persist(true); } diff --git a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java index 46a7c7d9b1d..557c8fffb88 100644 --- a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java +++ b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java @@ -923,16 +923,17 @@ public class ActionArtifact extends ATSArtifact implements IWorldViewArtifact { */ public static void setArtifactIdentifyData(Artifact art, String title, String desc, ChangeType changeType, PriorityType priority, Collection<String> userComms, boolean validationRequired, Date needByDate) throws SQLException { art.setDescriptiveName(title); - if (!desc.equals("")) art.setAttribute(ATSAttributes.DESCRIPTION_ATTRIBUTE.getStoreName(), desc); - art.setAttribute(ATSAttributes.CHANGE_TYPE_ATTRIBUTE.getStoreName(), changeType.name()); + if (!desc.equals("")) art.setSoleAttributeValue(ATSAttributes.DESCRIPTION_ATTRIBUTE.getStoreName(), desc); + art.setSoleAttributeValue(ATSAttributes.CHANGE_TYPE_ATTRIBUTE.getStoreName(), changeType.name()); DynamicAttributeManager dam = art.getAttributeManager(ATSAttributes.USER_COMMUNITY_ATTRIBUTE.getStoreName()); for (String comm : userComms) dam.getNewAttribute().setStringData(comm); - if (priority != null) art.setAttribute(ATSAttributes.PRIORITY_TYPE_ATTRIBUTE.getStoreName(), + if (priority != null) art.setSoleAttributeValue(ATSAttributes.PRIORITY_TYPE_ATTRIBUTE.getStoreName(), priority.getShortName()); - if (needByDate != null) art.setAttribute(ATSAttributes.DEADLINE_ATTRIBUTE.getStoreName(), - needByDate.getTime() + ""); - if (validationRequired) art.setAttribute(ATSAttributes.VALIDATION_REQUIRED_ATTRIBUTE.getStoreName(), "yes"); + if (needByDate != null) art.setSoleDateAttributeValue(ATSAttributes.DEADLINE_ATTRIBUTE.getStoreName(), + needByDate); + if (validationRequired) art.setSoleBooleanAttributeValue( + ATSAttributes.VALIDATION_REQUIRED_ATTRIBUTE.getStoreName(), true); } /* diff --git a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java index 2bf6ad25656..2384c567d9a 100644 --- a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java +++ b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java @@ -472,7 +472,7 @@ public class SMAManager { for (StateMachineArtifact sma : smas) { sma.getCurrentStateDam().setHoursSpent(hours + sma.getCurrentStateDam().getState().getHoursSpent()); sma.getCurrentStateDam().setPercentComplete(tsd.getPercent().getInt()); - sma.setAttribute(ATSAttributes.RESOLUTION_ATTRIBUTE.getStoreName(), + sma.setSoleAttributeValue(ATSAttributes.RESOLUTION_ATTRIBUTE.getStoreName(), tsd.getSelectedOptionDef().getName()); sma.statusChanged(); } @@ -583,8 +583,8 @@ public class SMAManager { verArt.getReleaseDate()); if (verArt.getReleaseDate() != null) diag.setSelectedDate(verArt.getReleaseDate()); if (diag.open() == 0) { - verArt.setAttribute(ATSAttributes.RELEASE_DATE_ATTRIBUTE.getStoreName(), - diag.getSelectedDate().getTime() + ""); + verArt.setSoleDateAttributeValue(ATSAttributes.RELEASE_DATE_ATTRIBUTE.getStoreName(), + diag.getSelectedDate()); verArt.persistAttributes(); return true; } @@ -619,8 +619,8 @@ public class SMAManager { verArt.getEstimatedReleaseDate()); if (verArt.getEstimatedReleaseDate() != null) diag.setSelectedDate(verArt.getEstimatedReleaseDate()); if (diag.open() == 0) { - verArt.setAttribute(ATSAttributes.ESTIMATED_RELEASE_DATE_ATTRIBUTE.getStoreName(), - diag.getSelectedDate().getTime() + ""); + verArt.setSoleDateAttributeValue(ATSAttributes.ESTIMATED_RELEASE_DATE_ATTRIBUTE.getStoreName(), + diag.getSelectedDate()); verArt.persistAttributes(); return true; } @@ -632,8 +632,8 @@ public class SMAManager { sma.getWorldViewEstimatedReleaseDate()); if (getSma().getWorldViewEstimatedReleaseDate() != null) diag.setSelectedDate(sma.getWorldViewEstimatedReleaseDate()); if (diag.open() == 0) { - sma.setSoleAttributeValue(ATSAttributes.ESTIMATED_RELEASE_DATE_ATTRIBUTE.getStoreName(), - diag.getSelectedDate().getTime() + ""); + sma.setSoleDateAttributeValue(ATSAttributes.ESTIMATED_RELEASE_DATE_ATTRIBUTE.getStoreName(), + diag.getSelectedDate()); sma.persistAttributes(); return true; } diff --git a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/TaskManager.java b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/TaskManager.java index cf123b26d2d..cecd1a37ad6 100644 --- a/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/TaskManager.java +++ b/MS_0.1.4_20080103/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/TaskManager.java @@ -82,7 +82,7 @@ public class TaskManager { taskArt.getLog().addLog(LogType.StateEntered, "InWork", ""); // Set parent state task is related to - taskArt.setAttribute(ATSAttributes.RELATED_TO_STATE_ATTRIBUTE.getStoreName(), + taskArt.setSoleAttributeValue(ATSAttributes.RELATED_TO_STATE_ATTRIBUTE.getStoreName(), smaMgr.getSma().getCurrentStateName()); if (persist) taskArt.persistAttributes(); diff --git a/MS_0.1.4_20080103/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java b/MS_0.1.4_20080103/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java index b1e7882983f..ac7da1973d4 100644 --- a/MS_0.1.4_20080103/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java +++ b/MS_0.1.4_20080103/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java @@ -124,8 +124,8 @@ public class ExtractTestRelations { if (testArtifact == null) { testArtifact = configurationPersistenceManager.getArtifactSubtypeDescriptor("Test Script", branch).makeNewArtifact(); - testArtifact.setAttribute("Name", testArtifactFile.getName()); - testArtifact.setAttribute("Content URL", testArtifactFile.getFullPath().toString()); + testArtifact.setSoleAttributeValue("Name", testArtifactFile.getName()); + testArtifact.setSoleAttributeValue("Content URL", testArtifactFile.getFullPath().toString()); testArtifact.persistAttributes(); } return testArtifact; diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/NativeArtifact.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/NativeArtifact.java index 12b777ecd24..9d94180ca1b 100644 --- a/MS_0.1.4_20080103/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/NativeArtifact.java +++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/NativeArtifact.java @@ -106,7 +106,7 @@ public class NativeArtifact extends Artifact { artifact.setNativeContent(contentAttribute.getUncompressedStream()); } else { - artifact.setAttribute(attribute.getName(), attribute.getStringData()); + artifact.setSoleAttributeValue(attribute.getName(), attribute.getStringData()); } } } diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/WorkspaceFileArtifact.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/WorkspaceFileArtifact.java index 35f54893a75..63487be3cb9 100644 --- a/MS_0.1.4_20080103/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/WorkspaceFileArtifact.java +++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/WorkspaceFileArtifact.java @@ -75,8 +75,8 @@ public class WorkspaceFileArtifact extends Artifact { descriptor = dialog.getEntry(); try { artifact = descriptor.makeNewArtifact(); - artifact.setAttribute("Content URL", location); - artifact.setAttribute("Name", new File(location).getName()); + artifact.setSoleAttributeValue("Content URL", location); + artifact.setSoleAttributeValue("Name", new File(location).getName()); artifact.persistAttributes(); } catch (SQLException ex) { ex.printStackTrace(); diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/GenerateParagraphNumbersAction.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/GenerateParagraphNumbersAction.java index 73ad8487530..4fc1546085c 100644 --- a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/GenerateParagraphNumbersAction.java +++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/GenerateParagraphNumbersAction.java @@ -98,7 +98,7 @@ public class GenerateParagraphNumbersAction extends Action { String paragraphNumber = producer.startOutlineSubSection("", "", null).toString(); monitor.subTask(paragraphNumber + " " + artifact.getDescriptiveName()); - artifact.setAttribute("Imported Paragraph Number", paragraphNumber); + artifact.setSoleAttributeValue("Imported Paragraph Number", paragraphNumber); artifact.persistAttributes(); monitor.worked(1); diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/RoughArtifact.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/RoughArtifact.java index fa80d469e24..35d1f271041 100644 --- a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/RoughArtifact.java +++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/RoughArtifact.java @@ -233,7 +233,7 @@ public class RoughArtifact { public void updateValues(Artifact artifact) throws SQLException, FileNotFoundException { for (NameAndVal value : attributes) { - artifact.setAttribute(value.getName(), value.getValue()); + artifact.setSoleAttributeValue(value.getName(), value.getValue()); } setFileAttributes(artifact); diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java index a312ae91e9f..80c0c22a594 100644 --- a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java +++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java @@ -299,8 +299,8 @@ public class RelationExplorerWindow { if (descriptor != null) { try { artifact = descriptor.makeNewArtifact(); - artifact.setAttribute("Name", model.getName()); - artifact.setAttribute("Content URL", urls.get(names.indexOf(model.getName()))); + artifact.setSoleAttributeValue("Name", model.getName()); + artifact.setSoleAttributeValue("Content URL", urls.get(names.indexOf(model.getName()))); artifact.persistAttributes(); } catch (SQLException ex) { AWorkbench.popup("ERROR", ex.getLocalizedMessage()); diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactJob.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactJob.java index d6d01776cdf..b2a596462ff 100644 --- a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactJob.java +++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactJob.java @@ -175,7 +175,7 @@ public class UpdateArtifactJob extends UpdateJob { containsOleData = !artifact.getSoleAttributeValue(WordAttribute.OLE_DATA_NAME).equals(""); if (oleDataElement == null && containsOleData) { - artifact.setAttribute(WordAttribute.OLE_DATA_NAME, ""); + artifact.setSoleAttributeValue(WordAttribute.OLE_DATA_NAME, ""); } else if (oleDataElement != null && singleArtifact) { artifact.setAttribute(WordAttribute.OLE_DATA_NAME, new ByteArrayInputStream( WordRenderer.getFormattedContent(oleDataElement))); @@ -218,7 +218,7 @@ public class UpdateArtifactJob extends UpdateJob { content = stringBuffer.toString(); } - artifact.setAttribute(WordAttribute.CONTENT_NAME, content); + artifact.setSoleAttributeValue(WordAttribute.CONTENT_NAME, content); if (artifact.isDirty()) { artifact.persistAttributes(); changedArtifacts.add(artifact); diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java index 600b0446c98..675c7f96c5d 100644 --- a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java +++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java @@ -537,7 +537,7 @@ public class WordTemplateProcessor { if (paragraphNumber != null && saveParagraphNumOnArtifact && !artifact.getSoleAttributeValue(
"Imported Paragraph Number").equals("")) {
- artifact.setAttribute("Imported Paragraph Number", paragraphNumber.toString());
+ artifact.setSoleAttributeValue("Imported Paragraph Number", paragraphNumber.toString());
try {
artifact.persistAttributes();
diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactListDialog.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactListDialog.java index 352963e1477..3d8e0e9d2bf 100644 --- a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactListDialog.java +++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactListDialog.java @@ -31,7 +31,7 @@ public class ArtifactListDialog extends ListDialog { this(parent, null); } - public ArtifactListDialog(Shell parent, Collection<Artifact> artifacts) { + public ArtifactListDialog(Shell parent, Collection<? extends Artifact> artifacts) { super(parent); setContentProvider(new ArrayContentProvider()); setLabelProvider(new ArtifactDescriptiveLabelProvider()); |