Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2011-08-30 18:46:03 +0000
committerRyan D. Brooks2011-08-30 18:46:03 +0000
commitf239db44fd61f0afd57944c26557642ab163abf8 (patch)
tree377e61135ea78a99d9e54152952373ad29439ca1 /plugins
parent869c59acf3418cd8c1e7a68744fa8c766fde0502 (diff)
downloadorg.eclipse.osee-f239db44fd61f0afd57944c26557642ab163abf8.tar.gz
org.eclipse.osee-f239db44fd61f0afd57944c26557642ab163abf8.tar.xz
org.eclipse.osee-f239db44fd61f0afd57944c26557642ab163abf8.zip
feature[ats_M1Y56]: Change to OseeTypeDefinition attribute to UriGeneralString type
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ArtifactTypeDataAccessor.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslTypeSheetRenderer.java5
-rw-r--r--plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/AddCommonBranch.java3
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/RemoteIdManager.java3
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/RemoteIdManagerImpl.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee11
6 files changed, 24 insertions, 6 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ArtifactTypeDataAccessor.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ArtifactTypeDataAccessor.java
index 57b6f2abb4e..dfa77b8f60a 100644
--- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ArtifactTypeDataAccessor.java
+++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ArtifactTypeDataAccessor.java
@@ -94,7 +94,7 @@ public class ArtifactTypeDataAccessor<T extends AbstractOseeType<Long>> implemen
// john: Which attribute type store type def binary data
Integer artifactTypeId = manager.getLocalId(CoreArtifactTypes.OseeTypeDefinition.getGuid());
- Integer attributeTypeId = manager.getLocalId(CoreAttributeTypes.NativeContent.getGuid());
+ Integer attributeTypeId = manager.getLocalId(CoreAttributeTypes.UriGeneralStringData.getGuid());
Branch commonBranch = branchCache.get(CoreBranches.COMMON);
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslTypeSheetRenderer.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslTypeSheetRenderer.java
index 49f22c950c8..5214f3796de 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslTypeSheetRenderer.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslTypeSheetRenderer.java
@@ -30,6 +30,7 @@ import org.eclipse.osee.framework.skynet.core.types.IArtifact;
import org.eclipse.osee.framework.ui.skynet.render.DefaultArtifactRenderer;
import org.eclipse.osee.framework.ui.skynet.render.FileSystemRenderer;
import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
+import org.eclipse.osee.framework.ui.skynet.render.WholeAttributeUpdateOperation;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.program.Program;
import org.eclipse.ui.IWorkbench;
@@ -110,7 +111,7 @@ public class OseeDslTypeSheetRenderer extends FileSystemRenderer {
public InputStream getRenderInputStream(PresentationType presentationType, List<Artifact> artifacts) throws OseeCoreException {
Artifact artifact = artifacts.iterator().next();
StringBuilder builder = new StringBuilder();
- builder.append(artifact.getSoleAttributeValueAsString(CoreAttributeTypes.GeneralStringData, ""));
+ builder.append(artifact.getSoleAttributeValueAsString(CoreAttributeTypes.UriGeneralStringData, ""));
InputStream inputStream = null;
try {
inputStream = new ByteArrayInputStream(builder.toString().getBytes("UTF-8"));
@@ -127,7 +128,7 @@ public class OseeDslTypeSheetRenderer extends FileSystemRenderer {
@Override
protected IOperation getUpdateOperation(File file, List<Artifact> artifacts, Branch branch, PresentationType presentationType) {
- return null;
+ return new WholeAttributeUpdateOperation(file, artifacts.get(0), CoreAttributeTypes.UriGeneralStringData);
}
}
diff --git a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/AddCommonBranch.java b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/AddCommonBranch.java
index 91222a1da04..b35a80d97d6 100644
--- a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/AddCommonBranch.java
+++ b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/AddCommonBranch.java
@@ -73,12 +73,11 @@ public abstract class AddCommonBranch implements IDbInitializationTask {
Artifact artifact =
ArtifactTypeManager.addArtifact(CoreArtifactTypes.OseeTypeDefinition, BranchManager.getCommonBranch(),
entry.getKey(), GUID.create(), HumanReadableId.generate());
- artifact.setSoleAttributeFromString(CoreAttributeTypes.Extension, ".osee");
artifact.setSoleAttributeValue(CoreAttributeTypes.Active, true);
InputStream inputStream = null;
try {
inputStream = new BufferedInputStream(entry.getValue().openStream());
- artifact.setSoleAttributeFromStream(CoreAttributeTypes.NativeContent, inputStream);
+ artifact.setSoleAttributeFromStream(CoreAttributeTypes.UriGeneralStringData, inputStream);
} catch (IOException ex) {
OseeExceptions.wrap(ex);
} finally {
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/RemoteIdManager.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/RemoteIdManager.java
index bd9c4e42781..f3027e0ebdf 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/RemoteIdManager.java
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/RemoteIdManager.java
@@ -6,6 +6,7 @@
package org.eclipse.osee.framework.database.core;
import java.util.Collection;
+import org.eclipse.osee.framework.core.data.Identity;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
public interface RemoteIdManager {
@@ -14,6 +15,8 @@ public interface RemoteIdManager {
Long getRemoteId(Integer localId) throws OseeCoreException;
+ int getLocalId(Identity<Long> identity) throws OseeCoreException;
+
void store(Collection<Long> remoteIds) throws OseeCoreException;
void clear();
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/RemoteIdManagerImpl.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/RemoteIdManagerImpl.java
index 37b3f4ae281..98d7dbe10cc 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/RemoteIdManagerImpl.java
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/RemoteIdManagerImpl.java
@@ -12,6 +12,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListSet;
+import org.eclipse.osee.framework.core.data.Identity;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
@@ -114,4 +115,9 @@ public class RemoteIdManagerImpl implements RemoteIdManager {
persistedIds.addAll(toPersist);
}
+ @Override
+ public int getLocalId(Identity<Long> identity) throws OseeCoreException {
+ return getLocalId(identity.getGuid());
+ }
+
}
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 52f40c76c71..6c2330a5777 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
@@ -1664,8 +1664,17 @@ relationType "Results Data" {
multiplicity MANY_TO_MANY
}
-artifactType "Osee Type Definition" extends "Native Artifact"{
+attributeType "Uri General String Data" extends StringAttribute {
+ guid "AFnIJbPBoQFQpTP2jfQA"
+ uuid 0x1000000000000195
+ dataProvider UriAttributeDataProvider
+ min 0
+ max unlimited
+}
+
+artifactType "Osee Type Definition" extends "Artifact"{
guid "AFGVEpSssxutyEAP0twA"
uuid 0x000000000000003C
attribute "Active"
+ attribute "Uri General String Data"
}

Back to the top