diff options
| author | rescobar | 2009-11-20 20:02:02 +0000 |
|---|---|---|
| committer | rescobar | 2009-11-20 20:02:02 +0000 |
| commit | b838c33d267f1ff39ba32c412fa4daf81a045a28 (patch) | |
| tree | 233f3a3b12d4aefb523773241df2092ccddfccad | |
| parent | 651ae23b85d1be1d0b64e6f98eec1edd33db4abd (diff) | |
| download | org.eclipse.osee-b838c33d267f1ff39ba32c412fa4daf81a045a28.tar.gz org.eclipse.osee-b838c33d267f1ff39ba32c412fa4daf81a045a28.tar.xz org.eclipse.osee-b838c33d267f1ff39ba32c412fa4daf81a045a28.zip | |
"Team Workflow" - 8DZ0Y - "Convert commit over to OSGI service"
501 files changed, 1732 insertions, 6364 deletions
diff --git a/org.eclipse.osee.framework.oracle/.project b/org.eclipse.osee.framework.oracle/.project index d1bb835576a..b1041fd7d8d 100644 --- a/org.eclipse.osee.framework.oracle/.project +++ b/org.eclipse.osee.framework.oracle/.project @@ -20,6 +20,11 @@ <arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/org.eclipse.osee.framework.oracle/OSGI-INF/oracle.connection.driver.provider.xml b/org.eclipse.osee.framework.oracle/OSGI-INF/oracle.connection.driver.provider.xml index 9951fe6a252..8248f91bcc0 100644 --- a/org.eclipse.osee.framework.oracle/OSGI-INF/oracle.connection.driver.provider.xml +++ b/org.eclipse.osee.framework.oracle/OSGI-INF/oracle.connection.driver.provider.xml @@ -2,6 +2,6 @@ <component name="oracle.connection.driver.provider">
<implementation class="org.eclipse.osee.framework.oracle.OracleConnection"/>
<service>
- <provide interface="org.eclipse.osee.framework.database.core.IConnection"/>
+ <provide interface="org.eclipse.osee.framework.database.core.IConnectionFactory"/>
</service>
</component>
\ No newline at end of file diff --git a/org.eclipse.osee.framework.oracle/src/org/eclipse/osee/framework/oracle/OracleConnection.java b/org.eclipse.osee.framework.oracle/src/org/eclipse/osee/framework/oracle/OracleConnection.java index c8b61b12d8b..6679e454a28 100644 --- a/org.eclipse.osee.framework.oracle/src/org/eclipse/osee/framework/oracle/OracleConnection.java +++ b/org.eclipse.osee.framework.oracle/src/org/eclipse/osee/framework/oracle/OracleConnection.java @@ -13,9 +13,9 @@ package org.eclipse.osee.framework.oracle; import java.sql.Connection;
import java.sql.DriverManager;
import java.util.Properties;
-import org.eclipse.osee.framework.database.core.IConnection;
+import org.eclipse.osee.framework.database.core.IConnectionFactory;
-public class OracleConnection implements IConnection {
+public class OracleConnection implements IConnectionFactory {
private static final String driver = "oracle.jdbc.OracleDriver";
diff --git a/org.eclipse.osee.framework.postgresql/.project b/org.eclipse.osee.framework.postgresql/.project index a4a66b0c183..8d14ab347b2 100644 --- a/org.eclipse.osee.framework.postgresql/.project +++ b/org.eclipse.osee.framework.postgresql/.project @@ -20,6 +20,11 @@ <arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/org.eclipse.osee.framework.postgresql/OSGI-INF/postgresql.connection.driver.provider.xml b/org.eclipse.osee.framework.postgresql/OSGI-INF/postgresql.connection.driver.provider.xml index 70978bffb31..f45bc5fd22e 100644 --- a/org.eclipse.osee.framework.postgresql/OSGI-INF/postgresql.connection.driver.provider.xml +++ b/org.eclipse.osee.framework.postgresql/OSGI-INF/postgresql.connection.driver.provider.xml @@ -2,6 +2,6 @@ <component name="postgresql.connection.driver.provider">
<implementation class="org.eclipse.osee.framework.postgresql.PostgresqlConnection"/>
<service>
- <provide interface="org.eclipse.osee.framework.database.core.IConnection"/>
+ <provide interface="org.eclipse.osee.framework.database.core.IConnectionFactory"/>
</service>
</component>
\ No newline at end of file diff --git a/org.eclipse.osee.framework.postgresql/src/org/eclipse/osee/framework/postgresql/PostgresqlConnection.java b/org.eclipse.osee.framework.postgresql/src/org/eclipse/osee/framework/postgresql/PostgresqlConnection.java index 9210bb17e0d..e651a5cf90a 100644 --- a/org.eclipse.osee.framework.postgresql/src/org/eclipse/osee/framework/postgresql/PostgresqlConnection.java +++ b/org.eclipse.osee.framework.postgresql/src/org/eclipse/osee/framework/postgresql/PostgresqlConnection.java @@ -13,9 +13,9 @@ package org.eclipse.osee.framework.postgresql; import java.sql.Connection;
import java.sql.DriverManager;
import java.util.Properties;
-import org.eclipse.osee.framework.database.core.IConnection;
+import org.eclipse.osee.framework.database.core.IConnectionFactory;
-public class PostgresqlConnection implements IConnection {
+public class PostgresqlConnection implements IConnectionFactory {
private static final String driverName = "org.postgresql.Driver";
diff --git a/org.eclipse.osee.framework.resource.locator.attribute.test/META-INF/MANIFEST.MF b/org.eclipse.osee.framework.resource.locator.attribute.test/META-INF/MANIFEST.MF index 28ec8f62001..423b1989773 100644 --- a/org.eclipse.osee.framework.resource.locator.attribute.test/META-INF/MANIFEST.MF +++ b/org.eclipse.osee.framework.resource.locator.attribute.test/META-INF/MANIFEST.MF @@ -15,3 +15,4 @@ Import-Package: org.eclipse.osee.framework.core.exception, org.osgi.framework,
org.osgi.util.tracker
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.osee.framework.resource.locator.attribute.test
diff --git a/org.eclipse.osee.framework.resource.locator.attribute/META-INF/MANIFEST.MF b/org.eclipse.osee.framework.resource.locator.attribute/META-INF/MANIFEST.MF index 0ae47e6ad7a..3e7519f8c58 100644 --- a/org.eclipse.osee.framework.resource.locator.attribute/META-INF/MANIFEST.MF +++ b/org.eclipse.osee.framework.resource.locator.attribute/META-INF/MANIFEST.MF @@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.resource.locator.attribute;singl Bundle-Version: 0.4.0.qualifier
Bundle-Activator: org.eclipse.osee.framework.resource.locator.attribute.Activator
Bundle-Vendor: Eclipse.org
+Eclipse-ExtensibleAPI: true
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/locator.provider.attribute.xml
Import-Package: org.eclipse.osee.framework.core.data,
diff --git a/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF b/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF index 071b0d5a1ed..c22d622e0bf 100644 --- a/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF +++ b/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF @@ -15,3 +15,4 @@ Import-Package: org.eclipse.osee.framework.core.exception, org.osgi.framework, org.osgi.util.tracker Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Export-Package: org.eclipse.osee.framework.resource.management.test diff --git a/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/util/OptionsProcessorTest.java b/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/util/OptionsProcessorTest.java index 0d8053ed161..86d04ec6d03 100644 --- a/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/util/OptionsProcessorTest.java +++ b/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/util/OptionsProcessorTest.java @@ -12,6 +12,7 @@ package org.eclipse.osee.framework.resource.management.test.util; import org.eclipse.osee.framework.resource.management.util.OptionsProcessor;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -21,6 +22,7 @@ import org.junit.Test; */
public class OptionsProcessorTest {
+ @Ignore
@Test
public void testOptionsProcessor() {
Assert.fail("Error - implement this");
diff --git a/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/util/ResourcesTest.java b/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/util/ResourcesTest.java index 3daa35823a2..bb2e15d84cc 100644 --- a/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/util/ResourcesTest.java +++ b/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/util/ResourcesTest.java @@ -19,6 +19,7 @@ import org.eclipse.osee.framework.resource.management.IResource; import org.eclipse.osee.framework.resource.management.internal.CompressedResourceBridge;
import org.eclipse.osee.framework.resource.management.util.Resources;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -34,6 +35,7 @@ public class ResourcesTest { checkResourceFromBytes("http://a/b/c/d/e/file.zip", "file.zip", true, new byte[] {4, 5, 6, 7, 8, 9});
}
+ @Ignore
@Test
public void testCompressResource() {
Assert.fail("Error - implement this");
@@ -41,6 +43,7 @@ public class ResourcesTest { // Resources.decompressResource(resource)
}
+ @Ignore
@Test
public void testDeCompressResource() {
Assert.fail("Error - implement this");
diff --git a/org.eclipse.osee.framework.resource.management/META-INF/MANIFEST.MF b/org.eclipse.osee.framework.resource.management/META-INF/MANIFEST.MF index a889f025401..1166dc20ca1 100644 --- a/org.eclipse.osee.framework.resource.management/META-INF/MANIFEST.MF +++ b/org.eclipse.osee.framework.resource.management/META-INF/MANIFEST.MF @@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Management Plug-in (Incubation) Bundle-SymbolicName: org.eclipse.osee.framework.resource.management;singleton:=true Bundle-Version: 0.4.0.qualifier +Eclipse-ExtensibleAPI: true Bundle-Activator: org.eclipse.osee.framework.resource.management.Activator Import-Package: org.eclipse.osee.framework.core.exception, org.eclipse.osee.framework.jdk.core.type, diff --git a/org.eclipse.osee.framework.resource.provider.attribute.test/META-INF/MANIFEST.MF b/org.eclipse.osee.framework.resource.provider.attribute.test/META-INF/MANIFEST.MF index 92f3c8f9829..7aa5046775f 100644 --- a/org.eclipse.osee.framework.resource.provider.attribute.test/META-INF/MANIFEST.MF +++ b/org.eclipse.osee.framework.resource.provider.attribute.test/META-INF/MANIFEST.MF @@ -15,3 +15,4 @@ Import-Package: org.eclipse.osee.framework.core.exception, org.osgi.framework, org.osgi.util.tracker Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Export-Package: org.eclipse.osee.framework.resource.provider.attribute.test diff --git a/org.eclipse.osee.framework.resource.provider.attribute.test/src/org/eclipse/osee/framework/resource/provider/attribute/test/AttributeProviderTest.java b/org.eclipse.osee.framework.resource.provider.attribute.test/src/org/eclipse/osee/framework/resource/provider/attribute/test/AttributeProviderTest.java index 74b3df682d7..65f9a5fd4fd 100644 --- a/org.eclipse.osee.framework.resource.provider.attribute.test/src/org/eclipse/osee/framework/resource/provider/attribute/test/AttributeProviderTest.java +++ b/org.eclipse.osee.framework.resource.provider.attribute.test/src/org/eclipse/osee/framework/resource/provider/attribute/test/AttributeProviderTest.java @@ -19,6 +19,7 @@ import org.eclipse.osee.framework.resource.management.IResourceProvider; import org.eclipse.osee.framework.resource.management.util.ResourceLocator;
import org.eclipse.osee.framework.resource.provider.attribute.AttributeProvider;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -42,6 +43,7 @@ public class AttributeProviderTest { Assert.assertTrue(provider.isValid(new ResourceLocator(new URI("attr://hello"))));
}
+ @Ignore
@Test
public void testOps() throws OseeCoreException, URISyntaxException {
// IResourceProvider provider = new AttributeProvider();
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/IRelationSorterId.java b/org.eclipse.osee.framework.resource.provider.attribute.test/src/org/eclipse/osee/framework/resource/provider/attribute/test/AttributeProviderTestSuite.java index cc7ad24540d..df55e07ddaf 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/IRelationSorterId.java +++ b/org.eclipse.osee.framework.resource.provider.attribute.test/src/org/eclipse/osee/framework/resource/provider/attribute/test/AttributeProviderTestSuite.java @@ -1,20 +1,23 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.relation.order; - -/** - * @author Andrew M. Finkbeiner - */ -public interface IRelationSorterId { - String getGuid(); - - String prettyName(); -} +/*******************************************************************************
+ * Copyright (c) 2004, 2007 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.framework.resource.provider.attribute.test;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses( {AttributeProviderTest.class})
+/**
+ * @author Roberto E. Escobar
+ */
+public class AttributeProviderTestSuite {
+
+}
diff --git a/org.eclipse.osee.framework.resource.provider.attribute/META-INF/MANIFEST.MF b/org.eclipse.osee.framework.resource.provider.attribute/META-INF/MANIFEST.MF index 90f4bf44be5..c3865324f9d 100644 --- a/org.eclipse.osee.framework.resource.provider.attribute/META-INF/MANIFEST.MF +++ b/org.eclipse.osee.framework.resource.provider.attribute/META-INF/MANIFEST.MF @@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.resource.provider.attribute;sing Bundle-Version: 0.4.0.qualifier
Bundle-Activator: org.eclipse.osee.framework.resource.provider.attribute.Activator
Bundle-Vendor: Eclipse.org
+Eclipse-ExtensibleAPI: true
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.osee.framework.core.exception,
org.eclipse.osee.framework.core.server,
@@ -13,5 +14,4 @@ Import-Package: org.eclipse.osee.framework.core.exception, org.eclipse.osee.framework.resource.management.util,
org.osgi.framework
Service-Component: OSGI-INF/attribute.provider.xml
-Export-Package: org.eclipse.osee.framework.resource.provider.attribute
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/attribute/AttributeDataStore.java b/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/attribute/AttributeDataStore.java index c52cc5f034b..d07c45d30fc 100644 --- a/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/attribute/AttributeDataStore.java +++ b/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/attribute/AttributeDataStore.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Set;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.JoinUtility;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.database.core.SupportedDatabase;
@@ -55,7 +55,7 @@ public class AttributeDataStore { public static Collection<AttributeData> getAttribute(final OseeConnection connection, final int tagQueueQueryId) throws OseeDataStoreException {
final Collection<AttributeData> attributeData = new ArrayList<AttributeData>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(connection);
+ IOseeStatement chStmt = ConnectionHandler.getStatement(connection);
try {
chStmt.runPreparedQuery(LOAD_ATTRIBUTE, tagQueueQueryId);
while (chStmt.next()) {
@@ -134,7 +134,7 @@ public class AttributeDataStore { public static Set<AttributeData> getAttributesByTags(final int branchId, final SearchOptions options, final Collection<Long> tagData, final Collection<String> attributeTypes) throws OseeDataStoreException {
final Set<AttributeData> toReturn = new HashSet<AttributeData>();
AttributeJoinQuery attributeJoin = null;
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
boolean isNameOnly = attributeTypes.size() == 1 && attributeTypes.contains("Name");
boolean isAttributeFilterValid = !isNameOnly && !attributeTypes.isEmpty();
diff --git a/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/BranchTaggerRunnable.java b/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/BranchTaggerRunnable.java index c13f9239774..3484f599d18 100644 --- a/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/BranchTaggerRunnable.java +++ b/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/BranchTaggerRunnable.java @@ -14,7 +14,7 @@ import java.util.logging.Level; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.search.engine.ISearchEngineTagger;
@@ -50,7 +50,7 @@ public class BranchTaggerRunnable implements Runnable { @Override
protected void convertInput(OseeConnection connection) throws OseeDataStoreException, Exception {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(connection);
+ IOseeStatement chStmt = ConnectionHandler.getStatement(connection);
try {
String sql = AttributeDataStore.getAllTaggableGammasByBranchQuery(branchId);
chStmt.runPreparedQuery(sql, AttributeDataStore.getAllTaggableGammasByBranchQueryData(branchId));
diff --git a/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/utility/SearchTagDataStore.java b/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/utility/SearchTagDataStore.java index 877c5cc2ccf..8f203207771 100644 --- a/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/utility/SearchTagDataStore.java +++ b/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/utility/SearchTagDataStore.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Set;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.search.engine.data.AttributeVersion;
import org.eclipse.osee.framework.search.engine.data.IAttributeLocator;
@@ -50,7 +50,7 @@ public class SearchTagDataStore { public static int deleteTags(OseeConnection connection, int queryId) throws OseeDataStoreException {
int numberDeleted = 0;
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(connection);
+ IOseeStatement chStmt = ConnectionHandler.getStatement(connection);
try {
chStmt.runPreparedQuery("select gamma_id from osee_join_transaction where query_id = ?", queryId);
List<Object[]> datas = new ArrayList<Object[]>();
@@ -108,7 +108,7 @@ public class SearchTagDataStore { final Set<IAttributeLocator> toReturn = new HashSet<IAttributeLocator>();
for (Long codedTag : codedTags) {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(connection);
+ IOseeStatement chStmt = ConnectionHandler.getStatement(connection);
try {
chStmt.runPreparedQuery(SELECT_SEARCH_TAGS, codedTag);
while (chStmt.next()) {
diff --git a/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java b/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java index 9123f41afc8..78f9ffc7df2 100644 --- a/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java +++ b/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java @@ -23,7 +23,7 @@ import org.eclipse.equinox.app.IApplicationContext; import org.eclipse.osee.framework.branch.management.ExportOptions;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -43,7 +43,7 @@ public class DataStoreBackupApplication implements IApplication { private List<Integer> getAllBranches() throws OseeDataStoreException {
List<Integer> toReturn = new ArrayList<Integer>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(100, ALL_BRANCHES_QUERY);
while (chStmt.next()) {
diff --git a/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchExportWorker.java b/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchExportWorker.java index 16dd8bda63a..671e51d2968 100644 --- a/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchExportWorker.java +++ b/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchExportWorker.java @@ -15,7 +15,7 @@ import java.util.List; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.branch.management.ExportOptions;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.resource.management.Options;
import org.eclipse.osee.framework.server.admin.Activator;
import org.eclipse.osee.framework.server.admin.BaseServerCommand;
@@ -87,7 +87,7 @@ public class BranchExportWorker extends BaseServerCommand { }
if (branchIds.isEmpty()) {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(getAllBranchesQuery(includeArchivedBranches));
while (chStmt.next()) {
diff --git a/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java b/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java index 65a5149503f..a5a690fa1d7 100644 --- a/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java +++ b/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.resource.management.IResource;
@@ -195,7 +195,7 @@ public class CompressedContentFix { }
private void doWork(long time) {
- ConnectionHandlerStatement chStmt = null;
+ IOseeStatement chStmt = null;
try {
chStmt = ConnectionHandler.getStatement();
chStmt.runPreparedQuery(FIND_ALL_NATIVE_CONTENT_SQL);
diff --git a/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/Util.java b/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/Util.java index 9ab76f1e12d..23e93f3abbd 100644 --- a/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/Util.java +++ b/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/Util.java @@ -14,7 +14,7 @@ import java.util.HashMap; import java.util.Map;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
/**
* @author Roberto E. Escobar
@@ -30,7 +30,7 @@ public class Util { public static Map<Long, String> getArtIdMap(String attrTypeName) throws OseeDataStoreException {
Map<Long, String> toReturn = new HashMap<Long, String>(250);
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
int typeId = ConnectionHandler.runPreparedQueryFetchInt(-1, sqlExtensionTypeId, attrTypeName);
chStmt.runPreparedQuery(sqlExtensionTypes, typeId);
diff --git a/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/search/TaggerAllWorker.java b/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/search/TaggerAllWorker.java index 611ec5f38f6..ec91e8d88e1 100644 --- a/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/search/TaggerAllWorker.java +++ b/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/search/TaggerAllWorker.java @@ -17,7 +17,7 @@ import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.JoinUtility;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.database.core.JoinUtility.TagQueueJoinQuery;
@@ -41,7 +41,7 @@ class TaggerAllWorker extends BaseServerCommand { }
private void fetchAndProcessGammas(OseeConnection connection, int branchId, TagProcessListener processor) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(connection);
+ IOseeStatement chStmt = ConnectionHandler.getStatement(connection);
try {
chStmt.runPreparedQuery(AttributeDataStore.getAllTaggableGammasByBranchQuery(branchId),
AttributeDataStore.getAllTaggableGammasByBranchQueryData(branchId));
diff --git a/org.eclipse.osee.framework.server.feature.test/feature.xml b/org.eclipse.osee.framework.server.feature.test/feature.xml index 3b275eb2b91..9bc8813a9e4 100644 --- a/org.eclipse.osee.framework.server.feature.test/feature.xml +++ b/org.eclipse.osee.framework.server.feature.test/feature.xml @@ -102,4 +102,11 @@ fragment="true"
unpack="false"/>
+ <plugin
+ id="org.eclipse.osee.framework.server.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF b/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF index cdffe5048fa..c0b3f557944 100644 --- a/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF @@ -12,4 +12,5 @@ Export-Package: org.eclipse.osee.framework.skynet.core.test, org.eclipse.osee.framework.skynet.core.test.types, org.eclipse.osee.framework.skynet.core.test.util Import-Package: org.eclipse.osee.framework.core.enums, + org.eclipse.osee.framework.core.test.mocks, org.eclipse.osee.framework.jdk.core.util diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/branch/BranchUtilityTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/branch/BranchUtilityTest.java index 1cae86a30ef..898644ef9d7 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/branch/BranchUtilityTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/branch/BranchUtilityTest.java @@ -14,18 +14,18 @@ package org.eclipse.osee.framework.skynet.core.test.branch; import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import junit.framework.Assert;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.cache.AbstractOseeCache;
+import org.eclipse.osee.framework.core.cache.BranchCache;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.BranchFactory;
+import org.eclipse.osee.framework.core.test.mocks.MockOseeDataAccessor;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.skynet.core.artifact.BranchUtility;
-import org.eclipse.osee.framework.skynet.core.test.types.OseeTestDataAccessor;
-import org.eclipse.osee.framework.skynet.core.types.BranchCache;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeFactory;
import org.junit.Test;
/**
@@ -139,8 +139,7 @@ public class BranchUtilityTest { }
private Branch createBranch(AbstractOseeCache<Branch> cache, String guid, String name, int id) throws OseeCoreException {
- Branch branch =
- new OseeTypeFactory().createBranch(cache, guid, name, BranchType.WORKING, BranchState.MODIFIED, false);
+ Branch branch = new BranchFactory().create(guid, name, BranchType.WORKING, BranchState.MODIFIED, false);
Assert.assertNotNull(branch);
branch.setId(id);
return branch;
@@ -148,7 +147,7 @@ public class BranchUtilityTest { private final class TestCache extends BranchCache {
public TestCache() {
- super(new OseeTestDataAccessor<Branch>());
+ super(new MockOseeDataAccessor<Branch>());
}
}
}
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactPurgeTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactPurgeTest.java index d5c4cb5ae12..3e7a41a8736 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactPurgeTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactPurgeTest.java @@ -16,7 +16,7 @@ import java.util.Collection; import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryPerformanceTests.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryPerformanceTests.java index 6f9f9e47628..ed96b44ab3b 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryPerformanceTests.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryPerformanceTests.java @@ -16,8 +16,8 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTest.java index 050e7a189eb..617ce9dd009 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTest.java @@ -15,8 +15,8 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactTypeInheritanceTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactTypeInheritanceTest.java index 92458699331..4b135794f6c 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactTypeInheritanceTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactTypeInheritanceTest.java @@ -15,11 +15,11 @@ import java.util.HashSet; import java.util.Set;
import junit.framework.Assert;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.jdk.core.util.Collections;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
/**
* High-level test to ensure demo artifact types correctly inherit from artifact
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_setAttributeValues.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_setAttributeValues.java index 825e13dc3a1..b3b1ec75bbb 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_setAttributeValues.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_setAttributeValues.java @@ -16,7 +16,7 @@ import java.util.Arrays; import java.util.Collection;
import java.util.List;
import junit.framework.Assert;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/BranchPurgeTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/BranchPurgeTest.java index c3d5b690145..42293d8ade4 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/BranchPurgeTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/BranchPurgeTest.java @@ -16,8 +16,8 @@ import java.util.Collection; import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.SystemUser;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/BranchStateTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/BranchStateTest.java index 532af6c79c1..90f27042c80 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/BranchStateTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/BranchStateTest.java @@ -15,10 +15,10 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.SystemUser;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.UserManager;
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ChangeManagerTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ChangeManagerTest.java index 7994f3f1a2a..f150ea9d686 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ChangeManagerTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ChangeManagerTest.java @@ -15,10 +15,10 @@ import static org.junit.Assert.assertTrue; import java.util.logging.Level;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.SystemUser;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java index fd5965fe23e..a7ac0e26da3 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java @@ -17,12 +17,12 @@ import static org.junit.Assert.fail; import java.util.Collection;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.ConflictStatus;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -85,7 +85,7 @@ public class ConflictTest { /**
* Test method for
- * {@link org.eclipse.osee.framework.skynet.core.revision.ConflictManagerInternal#getConflictsPerBranch(org.eclipse.osee.framework.core.data.Branch, org.eclipse.osee.framework.core.data.Branch, org.eclipse.osee.framework.skynet.core.transaction.TransactionId)}
+ * {@link org.eclipse.osee.framework.skynet.core.revision.ConflictManagerInternal#getConflictsPerBranch(org.eclipse.osee.framework.core.model.Branch, org.eclipse.osee.framework.core.model.Branch, org.eclipse.osee.framework.skynet.core.transaction.TransactionId)}
* .
*/
@org.junit.Test
@@ -184,7 +184,6 @@ public class ConflictTest { checkNoTxCurrent("art_id", "osee_artifact_version");
checkNoTxCurrent("attr_id", "osee_attribute");
checkNoTxCurrent("rel_link_id", "osee_relation_link");
-
checkMultipleTxCurrent("art_id", "osee_artifact_version");
checkMultipleTxCurrent("attr_id", "osee_attribute");
checkMultipleTxCurrent("rel_link_id", "osee_relation_link");
@@ -192,7 +191,7 @@ public class ConflictTest { }
private void checkNoTxCurrent(String dataId, String dataTable) throws OseeCoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
StringBuilder builder = new StringBuilder();
builder.append(NO_TX_CURRENT_SET[0]);
builder.append(dataId);
@@ -215,7 +214,7 @@ public class ConflictTest { }
private void checkMultipleTxCurrent(String dataId, String dataTable) throws OseeCoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
StringBuilder builder = new StringBuilder();
builder.append(MULTIPLE_TX_CURRENT_SET[0]);
builder.append(dataId);
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTestManager.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTestManager.java index f1e04f7cbe0..4bc46431d05 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTestManager.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTestManager.java @@ -18,10 +18,11 @@ import java.util.LinkedList; import java.util.List;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
@@ -34,7 +35,6 @@ import org.eclipse.osee.framework.skynet.core.attribute.StringAttribute; import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict;
import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
/**
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DeletionTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DeletionTest.java index e2cd5c99b2d..ced0b53834f 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DeletionTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DeletionTest.java @@ -18,13 +18,13 @@ import java.util.LinkedList; import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.TxChange;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -123,7 +123,7 @@ public class DeletionTest { }
}
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
//Let's check both through the API and the SQL to make sure the Artifact is internally deleted
//and deleted in the Database, That we don't get some bad data case.
@@ -348,7 +348,7 @@ public class DeletionTest { }
private void checkAttribute(Artifact artifact, Attribute<?> attribute, int value) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(CHECK_FOR_ZERO_TX_CURRENT_ATTRIBUTE, artifact.getBranch().getId(),
artifact.getTransactionNumber(), attribute.getAttrId());
@@ -374,7 +374,7 @@ public class DeletionTest { }
public void checkRelation(Artifact artifact, RelationLink relation, int value) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
assertTrue(
"Relation should be deleted between Parent: " + relation.getAArtifactId() + " and child " + relation.getBArtifactId(),
relation.isDeleted());
@@ -406,7 +406,7 @@ public class DeletionTest { }
public static void dumpArtifact(Artifact artifact) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
System.out.println(" Artifact Dump : " + artifact.getName());
chStmt.runPreparedQuery(GET_ARTIFACT_DEBUG, artifact.getBranch().getId(), artifact.getArtId());
@@ -423,7 +423,7 @@ public class DeletionTest { }
public static void dumpAttribute(Attribute<?> attribute) throws OseeDataStoreException, OseeStateException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
System.out.println(" Attribute Dump");
chStmt.runPreparedQuery(GET_ATTRIBUTE_DEBUG, attribute.getArtifact().getBranch().getId(),
@@ -442,7 +442,7 @@ public class DeletionTest { }
public static void dumpRelation(RelationLink relation, Artifact artifact) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
System.out.println(" Relation Dump");
chStmt.runPreparedQuery(GET_RELATION_DEBUG, artifact.getBranch().getId(), relation.getRelationId());
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DuplicateHridTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DuplicateHridTest.java index 65a0f123af4..f5dea0e8d9d 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DuplicateHridTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DuplicateHridTest.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.support.test.util.TestUtil;
import org.junit.After;
@@ -47,7 +47,7 @@ public class DuplicateHridTest { /* Queries the database and grabs the first HRID it sees */
private static String get_used_HRID() throws OseeDataStoreException {
String ret;
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(GET_ARTIFACTS);
chStmt.next();
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/NativeArtifactTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/NativeArtifactTest.java index 3cb37984bcd..48c280c742d 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/NativeArtifactTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/NativeArtifactTest.java @@ -18,7 +18,7 @@ import java.io.File; import java.io.FileInputStream;
import java.io.InputStream;
import java.util.Collection;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/OseeEnumerationValidationTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/OseeEnumerationValidationTest.java index 436dc29cb5b..61dfe1e92bb 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/OseeEnumerationValidationTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/OseeEnumerationValidationTest.java @@ -16,12 +16,12 @@ import java.util.ArrayList; import java.util.List;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
import org.eclipse.osee.framework.skynet.core.validation.IOseeValidator;
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/RelationDeletionTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/RelationDeletionTest.java index 191a4e8d506..d058a5bcaa2 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/RelationDeletionTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/RelationDeletionTest.java @@ -14,8 +14,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue;
import java.util.List;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/RelationOrderingTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/RelationOrderingTest.java index 30e898c0183..e3454a3d742 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/RelationOrderingTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/RelationOrderingTest.java @@ -14,15 +14,15 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.artifact.Attribute; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.attribute.CoreAttributes; import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration; -import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/commit/LoadCommitItemsFromDbTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/commit/LoadCommitItemsFromDbTest.java index d1ae2864402..7d4fe1edf11 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/commit/LoadCommitItemsFromDbTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/commit/LoadCommitItemsFromDbTest.java @@ -16,11 +16,11 @@ import java.util.List; import junit.framework.Assert;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.ChangeItem;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.jdk.core.util.Lib;
@@ -89,7 +89,7 @@ public class LoadCommitItemsFromDbTest { private Branch findASourceBranch(Branch destination, String branchName) throws OseeCoreException {
Branch source = null;
- for (Branch branch : destination.getWorkingBranches()) {
+ for (Branch branch : BranchManager.getWorkingBranches(destination)) {
if (branch.getName().contains(branchName)) {
source = branch;
}
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/LoadDeletedRelationTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/LoadDeletedRelationTest.java index ecea86fcd26..2d3c9eec87d 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/LoadDeletedRelationTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/LoadDeletedRelationTest.java @@ -13,13 +13,13 @@ package org.eclipse.osee.framework.skynet.core.test.relation; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
import org.eclipse.osee.framework.skynet.core.test.util.FrameworkTestUtil;
import org.junit.After;
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationTypeSideSorterTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationTypeSideSorterTest.java index 69b73c07ad2..92bccd519a0 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationTypeSideSorterTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationTypeSideSorterTest.java @@ -21,27 +21,26 @@ import java.util.Map; import java.util.Random;
import java.util.Map.Entry;
import junit.framework.Assert;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.cache.RelationTypeCache;
+import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
+import org.eclipse.osee.framework.core.test.mocks.MockOseeDataAccessor;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSide;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSideSorter;
import org.eclipse.osee.framework.skynet.core.relation.order.IRelationOrderAccessor;
import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter;
-import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorterId;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationSorterProvider;
import org.eclipse.osee.framework.skynet.core.test.types.MockIArtifact;
-import org.eclipse.osee.framework.skynet.core.test.types.OseeTestDataAccessor;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeFactory;
-import org.eclipse.osee.framework.skynet.core.types.RelationTypeCache;
import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -219,13 +218,12 @@ public class RelationTypeSideSorterTest { RelationSorterProvider provider = new RelationSorterProvider();
IRelationOrderAccessor accessor = new DoNothingAccessor();
- OseeTypeFactory factory = new OseeTypeFactory();
- RelationTypeCache cache = new RelationTypeCache(new OseeTestDataAccessor<RelationType>());
+ RelationTypeCache cache = new RelationTypeCache(new MockOseeDataAccessor<RelationType>());
RelationType relationType1 =
- createRelationType(cache, factory, "Rel 1", RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC.getGuid());
+ createRelationType(cache, "Rel 1", RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC.getGuid());
RelationType relationType2 =
- createRelationType(cache, factory, "Rel 2", RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC.getGuid());
+ createRelationType(cache, "Rel 2", RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC.getGuid());
IArtifact art1 = createArtifact("a", GUID.create());
IArtifact art2 = createArtifact("b", GUID.create());
@@ -249,11 +247,11 @@ public class RelationTypeSideSorterTest { return new MockArtifactWithRelations(uniqueId, name, guid, null, null);
}
- private static RelationType createRelationType(RelationTypeCache cache, OseeTypeFactory factory, String name, String delationRelationOrderGuid) throws OseeCoreException {
- ArtifactType type1 = new ArtifactType(null, GUID.create(), "1", false);
- ArtifactType type2 = new ArtifactType(null, GUID.create(), "2", false);
+ private static RelationType createRelationType(RelationTypeCache cache, String name, String delationRelationOrderGuid) throws OseeCoreException {
+ ArtifactType type1 = new ArtifactType(GUID.create(), "1", false);
+ ArtifactType type2 = new ArtifactType(GUID.create(), "2", false);
RelationType relationType =
- factory.createRelationType(cache, GUID.create(), name, name + "_A", name + "_B", type1, type2,
+ new RelationType(GUID.create(), name, name + "_A", name + "_B", type1, type2,
RelationTypeMultiplicity.MANY_TO_MANY, delationRelationOrderGuid);
Assert.assertNotNull(relationType);
cache.cache(relationType);
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderDataTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderDataTest.java index 2f293d14cd2..726c870b71d 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderDataTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderDataTest.java @@ -15,23 +15,22 @@ import java.util.Arrays; import java.util.List;
import java.util.Random;
import java.util.Map.Entry;
+import org.eclipse.osee.framework.core.cache.RelationTypeCache;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.RelationType;
+import org.eclipse.osee.framework.core.test.mocks.MockOseeDataAccessor;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.skynet.core.relation.order.IRelationOrderAccessor;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData;
import org.eclipse.osee.framework.skynet.core.test.types.MockIArtifact;
-import org.eclipse.osee.framework.skynet.core.test.types.OseeTestDataAccessor;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeFactory;
-import org.eclipse.osee.framework.skynet.core.types.RelationTypeCache;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -56,12 +55,11 @@ public class RelationOrderDataTest { accessor = new MockRelationOrderAccessor();
data = new RelationOrderData(accessor, artifact);
- OseeTypeFactory factory = new OseeTypeFactory();
- RelationTypeCache cache = new RelationTypeCache(new OseeTestDataAccessor<RelationType>());
+ RelationTypeCache cache = new RelationTypeCache(new MockOseeDataAccessor<RelationType>());
- relationType1 = createRelationType(cache, factory, "Rel 1", RelationOrderBaseTypes.USER_DEFINED.getGuid());
- relationType2 = createRelationType(cache, factory, "Rel 2", RelationOrderBaseTypes.UNORDERED.getGuid());
- relationType3 = createRelationType(cache, factory, "Rel 3", RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC.getGuid());
+ relationType1 = createRelationType(cache, "Rel 1", RelationOrderBaseTypes.USER_DEFINED.getGuid());
+ relationType2 = createRelationType(cache, "Rel 2", RelationOrderBaseTypes.UNORDERED.getGuid());
+ relationType3 = createRelationType(cache, "Rel 3", RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC.getGuid());
Assert.assertFalse(data.hasEntries());
Assert.assertEquals(0, data.size());
@@ -269,11 +267,11 @@ public class RelationOrderDataTest { return new MockIArtifact(uniqueId, name, guid, null, null);
}
- private static RelationType createRelationType(RelationTypeCache cache, OseeTypeFactory factory, String name, String delationRelationOrderGuid) throws OseeCoreException {
- ArtifactType type1 = new ArtifactType(null, GUID.create(), "1", false);
- ArtifactType type2 = new ArtifactType(null, GUID.create(), "2", false);
+ private static RelationType createRelationType(RelationTypeCache cache, String name, String delationRelationOrderGuid) throws OseeCoreException {
+ ArtifactType type1 = new ArtifactType(GUID.create(), "1", false);
+ ArtifactType type2 = new ArtifactType(GUID.create(), "2", false);
RelationType relationType =
- factory.createRelationType(cache, GUID.create(), name, name + "_A", name + "_B", type1, type2,
+ new RelationType(GUID.create(), name, name + "_A", name + "_B", type1, type2,
RelationTypeMultiplicity.MANY_TO_MANY, delationRelationOrderGuid);
Assert.assertNotNull(relationType);
cache.cache(relationType);
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationSorterProviderTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationSorterProviderTest.java index 56b0c35d52c..f5fe6beb7d0 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationSorterProviderTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationSorterProviderTest.java @@ -12,13 +12,13 @@ package org.eclipse.osee.framework.skynet.core.test.relation.order; import java.util.Arrays;
import java.util.List;
+import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorterId;
import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationSorterProvider;
import org.eclipse.osee.framework.skynet.core.relation.sorters.LexicographicalRelationSorter;
import org.eclipse.osee.framework.skynet.core.relation.sorters.UnorderedRelationSorter;
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/sorters/RelationSorterTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/sorters/RelationSorterTest.java index 7c70298fd85..39902ac1ccb 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/sorters/RelationSorterTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/sorters/RelationSorterTest.java @@ -16,11 +16,11 @@ import java.util.Collection; import java.util.List;
import java.util.Random;
import junit.framework.Assert;
+import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter;
-import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorterId;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
import org.eclipse.osee.framework.skynet.core.relation.sorters.LexicographicalRelationSorter;
import org.eclipse.osee.framework.skynet.core.relation.sorters.UnorderedRelationSorter;
import org.eclipse.osee.framework.skynet.core.relation.sorters.UserDefinedRelationSorter;
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/AbstractOseeCacheTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/AbstractOseeCacheTest.java deleted file mode 100644 index a503641cbb8..00000000000 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/AbstractOseeCacheTest.java +++ /dev/null @@ -1,197 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.test.types;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import junit.framework.Assert;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.AbstractOseeType;
-import org.eclipse.osee.framework.core.data.IOseeStorableType;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-
-/**
- * @author Roberto E. Escobar
- */
-public abstract class AbstractOseeCacheTest<T extends IOseeStorableType> {
- private final List<T> data;
- private final AbstractOseeCache<T> cache;
- private final TypeComparator comparator;
-
- public AbstractOseeCacheTest(List<T> artifactTypes, AbstractOseeCache<T> typeCache) {
- this.comparator = new TypeComparator();
- this.data = artifactTypes;
- this.cache = typeCache;
- }
-
- @org.junit.Test
- public void testAllItems() throws OseeCoreException {
- List<T> actualTypes = new ArrayList<T>(cache.getAll());
- java.util.Collections.sort(actualTypes, comparator);
-
- java.util.Collections.sort(data, comparator);
- Assert.assertEquals(data.size(), actualTypes.size());
- for (int index = 0; index < data.size(); index++) {
- Assert.assertNotNull(actualTypes.get(index));
- checkEquals(data.get(index), actualTypes.get(index));
- }
- }
-
- @org.junit.Test
- public void testExistByGuid() throws OseeCoreException {
- for (T expected : data) {
- Assert.assertTrue(cache.existsByGuid(expected.getGuid()));
- }
- Assert.assertFalse(cache.existsByGuid("notExist"));
- }
-
- @org.junit.Test
- public void testCacheByGuid() throws OseeCoreException {
- for (T expected : data) {
- T actual = cache.getByGuid(expected.getGuid());
- Assert.assertNotNull(actual);
- checkEquals(expected, actual);
- }
- }
-
- @org.junit.Test
- public void testCacheById() throws OseeCoreException {
- for (T expected : data) {
- T actual = cache.getById(expected.getId());
- Assert.assertNotNull(actual);
- checkEquals(expected, actual);
- }
- }
-
- @org.junit.Test
- public void testCacheByName() throws OseeCoreException {
- for (T expected : data) {
- T actual = cache.getUniqueByName(expected.getName());
- Assert.assertNotNull(actual);
- checkEquals(expected, actual);
- }
- }
-
- @SuppressWarnings("unchecked")
- @org.junit.Test
- public void testDecache() throws OseeCoreException {
- T item1 = data.get(0);
- checkCached(item1, true);
-
- cache.decache(item1);
- checkCached(item1, false);
-
- cache.cache(item1);
- checkCached(item1, true);
-
- T item2 = data.get(1);
- checkCached(item2, true);
-
- cache.decache(item1, item2);
- checkCached(item1, false);
- checkCached(item2, false);
-
- cache.cache(item1, item2);
- checkCached(item1, true);
- checkCached(item2, true);
- }
-
- private void checkCached(T item, boolean isInCacheExpected) throws OseeCoreException {
- if (isInCacheExpected) {
- Assert.assertEquals(item, cache.getByGuid(item.getGuid()));
- Assert.assertEquals(item, cache.getById(item.getId()));
- Assert.assertEquals(item, cache.getUniqueByName(item.getName()));
- Assert.assertTrue(cache.getAll().contains(item));
- } else {
- Assert.assertNull(cache.getByGuid(item.getGuid()));
- Assert.assertNull(cache.getById(item.getId()));
- Assert.assertNull(cache.getUniqueByName(item.getName()));
- Assert.assertFalse(cache.getAll().contains(item));
- }
- }
-
- @org.junit.Test
- public void testGetByName() throws OseeCoreException {
- for (T expected : data) {
- Collection<T> actual = cache.getByName(expected.getName());
- Assert.assertNotNull(actual);
- Assert.assertEquals(1, actual.size());
- checkEquals(expected, actual.iterator().next());
- }
- }
-
- @org.junit.Test
- public void testMultipleGetByName() throws OseeCoreException {
- T item1 = data.get(0);
- T item2 = data.get(1);
- Assert.assertNotNull(item1);
- Assert.assertNotNull(item2);
-
- Collection<T> actual = cache.getByName(item1.getName());
- Assert.assertNotNull(actual);
- Assert.assertEquals(1, actual.size());
- checkEquals(item1, actual.iterator().next());
-
- actual = cache.getByName(item2.getName());
- Assert.assertNotNull(actual);
- Assert.assertEquals(1, actual.size());
- checkEquals(item2, actual.iterator().next());
-
- String originalName = item1.getName();
- if (item1 instanceof AbstractOseeType) {
- ((AbstractOseeType) item1).setName(item2.getName());
-
- cache.decache(item1);
- cache.cache(item1);
-
- actual = cache.getByName(originalName);
- Assert.assertNotNull(actual);
- Assert.assertEquals(0, actual.size());
-
- actual = cache.getByName(item2.getName());
- Assert.assertNotNull(actual);
- Assert.assertEquals(2, actual.size());
-
- checkEquals(item2, actual.iterator().next());
-
- ((AbstractOseeType) item1).setName(originalName);
- }
- }
-
- protected void checkEquals(T expected, T actual) throws OseeCoreException {
- Assert.assertEquals(expected, actual);
- }
-
- @org.junit.Test
- abstract public void testDirty() throws OseeCoreException;
-
- private final class TypeComparator implements Comparator<T> {
-
- /*
- * (non-Javadoc)
- * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
- */
- @Override
- public int compare(T o1, T o2) {
- int result = -1;
- if (o1 == null && o2 == null) {
- result = 0;
- } else if (o1 != null && o2 != null) {
- result = o1.getName().compareTo(o2.getName());
- } else if (o2 == null) {
- result = 1;
- }
- return result;
- }
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/ArtifactTypeCacheTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/ArtifactTypeCacheTest.java deleted file mode 100644 index da1eb453a48..00000000000 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/ArtifactTypeCacheTest.java +++ /dev/null @@ -1,307 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.test.types;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import junit.framework.Assert;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.enums.BranchState;
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeInvalidInheritanceException;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
-import org.eclipse.osee.framework.skynet.core.attribute.StringAttribute;
-import org.eclipse.osee.framework.skynet.core.attribute.providers.DefaultAttributeDataProvider;
-import org.eclipse.osee.framework.skynet.core.types.ArtifactTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.AttributeTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.BranchCache;
-import org.eclipse.osee.framework.skynet.core.types.IOseeTypeFactory;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeFactory;
-import org.junit.BeforeClass;
-
-/**
- * Low-level OseeTypeCache Test - Does not require database access
- *
- * @author Roberto E. Escobar
- */
-public class ArtifactTypeCacheTest extends AbstractOseeCacheTest<ArtifactType> {
-
- private static List<ArtifactType> artifactTypes;
- private static List<AttributeType> attributeTypes;
-
- private static IOseeTypeFactory factory;
-
- private static ArtifactTypeCache artCache;
- private static AttributeTypeCache attrCache;
- private static BranchCache branchCache;
-
- @BeforeClass
- public static void prepareTestData() throws OseeCoreException {
- factory = new OseeTypeFactory();
-
- artifactTypes = new ArrayList<ArtifactType>();
- attributeTypes = new ArrayList<AttributeType>();
-
- BranchDataAccessor branchData = new BranchDataAccessor();
- branchCache = new BranchCache(branchData);
-
- AttributeDataAccessor attrData = new AttributeDataAccessor(attributeTypes);
- attrCache = new AttributeTypeCache(attrData);
-
- ArtifactDataAccessor artData = new ArtifactDataAccessor(attrCache, artifactTypes, branchCache);
- artCache = new ArtifactTypeCache(artData);
-
- artCache.ensurePopulated();
- Assert.assertTrue(attrData.wasLoaded());
- Assert.assertTrue(branchData.wasLoaded());
- Assert.assertTrue(artData.wasLoaded());
- }
-
- public ArtifactTypeCacheTest() {
- super(artifactTypes, artCache);
- }
-
- @org.junit.Test
- public void testArtifactInheritanceCycleDetect() throws OseeCoreException {
- ArtifactType baseType = artCache.getUniqueByName("BaseArtifactType");
- Assert.assertNotNull(baseType);
-
- Set<ArtifactType> baseSuperType = new HashSet<ArtifactType>();
- baseSuperType.add(baseType);
-
- try {
- artCache.cacheArtifactSuperType(baseType, baseSuperType);
- Assert.assertTrue(
- "This line should not be execute, an inheritance cycle should have been detected and an exception should have been thrown",
- false);
- } catch (OseeInvalidInheritanceException ex) {
- Assert.assertNotNull(ex);
- }
- }
-
- @org.junit.Test
- public void testArtifactInheritance() throws OseeCoreException {
- OseeTypesUtil.checkInheritance(artCache, "000", "000");// inherits from returns true if comparing against itself
- OseeTypesUtil.checkInheritance(artCache, "111", "000");
- OseeTypesUtil.checkInheritance(artCache, "222", "000");
- OseeTypesUtil.checkInheritance(artCache, "333", "000", "222");
- OseeTypesUtil.checkInheritance(artCache, "444", "000", "222", "333");
- OseeTypesUtil.checkInheritance(artCache, "555", "000", "444", "333", "222");
- OseeTypesUtil.checkInheritance(artCache, "666", "000", "333", "222");
- }
-
- @org.junit.Test
- public void testArtifactInheritanceDescendants() throws OseeCoreException {
- OseeTypesUtil.checkDescendants(artCache, "000", false, "111", "222");
- OseeTypesUtil.checkDescendants(artCache, "000", true, "111", "222", "333", "444", "555", "666");
-
- OseeTypesUtil.checkDescendants(artCache, "111", false);
- OseeTypesUtil.checkDescendants(artCache, "111", true);
-
- OseeTypesUtil.checkDescendants(artCache, "222", false, "333");
- OseeTypesUtil.checkDescendants(artCache, "222", true, "333", "444", "555", "666");
-
- OseeTypesUtil.checkDescendants(artCache, "333", false, "333", "444");
- OseeTypesUtil.checkDescendants(artCache, "333", true, "444", "555", "666");
-
- OseeTypesUtil.checkDescendants(artCache, "444", false, "555");
- OseeTypesUtil.checkDescendants(artCache, "444", true, "555");
- }
-
- @org.junit.Test
- public void testNullArtifactInheritanceCheck() throws OseeCoreException {
- ArtifactType baseType = artCache.getUniqueByName("BaseArtifactType");
- // Check for null inheritance
- Assert.assertFalse(baseType.inheritsFrom((ArtifactType) null));
- }
-
- @org.junit.Test
- public void testArtifactInheritanceByName() throws OseeCoreException {
- Assert.assertTrue(artCache.getByGuid("666").inheritsFrom("ArtifactType3")); // check inherits from using artifact name
- }
-
- @org.junit.Test
- public void testAddArtifactSuperTypeMethod() throws OseeCoreException {
- ArtifactType artifactType = factory.createArtifactType(artCache, "myGUID", false, "TestMethodCreated");
- artCache.cache(artifactType);
-
- ArtifactType baseType = artCache.getUniqueByName("BaseArtifactType");
- Assert.assertFalse(artifactType.inheritsFrom(baseType));
- Assert.assertEquals(0, artifactType.getSuperArtifactTypes().size());
-
- artifactType.setSuperType(new HashSet<ArtifactType>(Arrays.asList(baseType)));
- Assert.assertEquals(1, artifactType.getSuperArtifactTypes().size());
- Assert.assertTrue(artifactType.inheritsFrom(baseType));
- artCache.decache(artifactType);
- }
-
- @org.junit.Test
- public void testInheritedAttributeTypes() throws OseeCoreException {
- Branch branch1 = branchCache.getByGuid("ROOT");
- Branch branch2 = branchCache.getByGuid("TEST");
- Assert.assertNotNull(branch1);
- Assert.assertNotNull(branch2);
- OseeTypesUtil.checkAttributes(artCache, attrCache, "000", branch1, "AAA");
- OseeTypesUtil.checkAttributes(artCache, attrCache, "111", branch1, "AAA", "BBB");
- OseeTypesUtil.checkAttributes(artCache, attrCache, "222", branch1, "AAA", "CCC");
- OseeTypesUtil.checkAttributes(artCache, attrCache, "333", branch1, "AAA", "DDD", "CCC");
- OseeTypesUtil.checkAttributes(artCache, attrCache, "444", branch1, "AAA", "FFF", "CCC", "DDD");
- OseeTypesUtil.checkAttributes(artCache, attrCache, "555", branch1, "AAA", "GGG", "FFF", "CCC", "DDD");
- OseeTypesUtil.checkAttributes(artCache, attrCache, "666", branch1, "AAA", "HHH", "DDD", "CCC");
-
- OseeTypesUtil.checkAttributes(artCache, attrCache, "000", branch2, "AAA");
- OseeTypesUtil.checkAttributes(artCache, attrCache, "111", branch2, "AAA", "BBB");
- OseeTypesUtil.checkAttributes(artCache, attrCache, "222", branch2, "AAA", "CCC");
- OseeTypesUtil.checkAttributes(artCache, attrCache, "333", branch2, "AAA", "DDD", "CCC", "EEE"); // EEE only visible on branch2
- OseeTypesUtil.checkAttributes(artCache, attrCache, "444", branch2, "AAA", "FFF", "CCC", "DDD", "EEE");
- OseeTypesUtil.checkAttributes(artCache, attrCache, "555", branch2, "AAA", "GGG", "FFF", "CCC", "DDD", "EEE");
- OseeTypesUtil.checkAttributes(artCache, attrCache, "666", branch2, "AAA", "HHH", "DDD", "CCC", "EEE");
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.osee.framework.skynet.core.test.types.AbstractOseeCacheTest#testDirty()
- */
- @Override
- public void testDirty() throws OseeCoreException {
- }
-
- private final static class BranchDataAccessor extends OseeTestDataAccessor<Branch> {
-
- @Override
- public void load(AbstractOseeCache<Branch> cache) throws OseeCoreException {
- super.load(cache);
- Branch branch1 =
- OseeTypesUtil.createBranch(cache, factory, "ROOT", "Root Branch", BranchType.SYSTEM_ROOT,
- BranchState.CREATED, false);
- branch1.setId(999);
- cache.cache(branch1);
-
- Branch branch2 =
- OseeTypesUtil.createBranch(cache, factory, "TEST", "Test Branch", BranchType.BASELINE,
- BranchState.CREATED, false);
- branch2.setId(998);
- cache.cache(branch2);
-
- ((BranchCache) cache).setBranchParent(branch1, branch2);
- }
-
- }
-
- private final static class AttributeDataAccessor extends OseeTestDataAccessor<AttributeType> {
-
- private final List<AttributeType> attributeTypes;
-
- public AttributeDataAccessor(List<AttributeType> attributeTypes) {
- super();
- this.attributeTypes = attributeTypes;
- }
-
- private AttributeType createAttributeTypeHelper(AbstractOseeCache<AttributeType> cache, IOseeTypeFactory factory, String guid, String name) throws OseeCoreException {
- return factory.createAttributeType(cache, guid, name, "DummyBase", "DummyProvider", StringAttribute.class,
- DefaultAttributeDataProvider.class, "none", "none", null, 1, 1, "test data", null);
- }
-
- @Override
- public void load(AbstractOseeCache<AttributeType> cache) throws OseeCoreException {
- super.load(cache);
- attributeTypes.add(createAttributeTypeHelper(cache, factory, "AAA", "Attribute1"));
- attributeTypes.add(createAttributeTypeHelper(cache, factory, "BBB", "Attribute2"));
- attributeTypes.add(createAttributeTypeHelper(cache, factory, "CCC", "Attribute3"));
- attributeTypes.add(createAttributeTypeHelper(cache, factory, "DDD", "Attribute4"));
- attributeTypes.add(createAttributeTypeHelper(cache, factory, "EEE", "Attribute5"));
- attributeTypes.add(createAttributeTypeHelper(cache, factory, "FFF", "Attribute6"));
- attributeTypes.add(createAttributeTypeHelper(cache, factory, "GGG", "Attribute7"));
- attributeTypes.add(createAttributeTypeHelper(cache, factory, "HHH", "Attribute8"));
- int typeId = 200;
- for (AttributeType type : attributeTypes) {
- type.setId(typeId++);
- cache.cache(type);
- }
- }
- }
-
- private final static class ArtifactDataAccessor extends OseeTestDataAccessor<ArtifactType> {
- private final AttributeTypeCache attributeCache;
- private final List<ArtifactType> artifactTypes;
- private final BranchCache branchCache;
-
- public ArtifactDataAccessor(AttributeTypeCache attributeCache, List<ArtifactType> artifactTypes, BranchCache branchCache) {
- super();
- this.attributeCache = attributeCache;
- this.artifactTypes = artifactTypes;
- this.branchCache = branchCache;
- }
-
- @Override
- public void load(AbstractOseeCache<ArtifactType> cache) throws OseeCoreException {
- branchCache.ensurePopulated();
- attributeCache.ensurePopulated();
- super.load(cache);
- artifactTypes.add(factory.createArtifactType(cache, "000", true, "BaseArtifactType"));
- artifactTypes.add(factory.createArtifactType(cache, "111", true, "ArtifactType1"));
- artifactTypes.add(factory.createArtifactType(cache, "222", false, "ArtifactType2"));
- artifactTypes.add(factory.createArtifactType(cache, "333", true, "ArtifactType3"));
- artifactTypes.add(factory.createArtifactType(cache, "444", false, "ArtifactType4"));
- artifactTypes.add(factory.createArtifactType(cache, "555", true, "ArtifactType5"));
- artifactTypes.add(factory.createArtifactType(cache, "666", false, "ArtifactType6"));
- int typeId = 100;
- for (ArtifactType type : artifactTypes) {
- type.setId(typeId++);
- cache.cache(type);
- }
- ArtifactTypeCache artCache = (ArtifactTypeCache) cache;
- setUpArtifactTypeInheritance(artCache);
- setUpTypeValidity(artCache);
- }
-
- private void setUpArtifactTypeInheritance(ArtifactTypeCache cache) throws OseeCoreException {
- ArtifactType baseType = cache.getUniqueByName("BaseArtifactType");
-
- Set<ArtifactType> baseSuperType = new HashSet<ArtifactType>();
- baseSuperType.add(baseType);
- // 0<-1
- cache.cacheArtifactSuperType(cache.getByGuid("111"), baseSuperType);
- // 0<-2
- cache.cacheArtifactSuperType(cache.getByGuid("222"), baseSuperType);
- // 2<-3
- cache.cacheArtifactSuperType(cache.getByGuid("333"), Arrays.asList(cache.getByGuid("222")));
- // 3<-4
- cache.cacheArtifactSuperType(cache.getByGuid("444"), Arrays.asList(cache.getByGuid("333")));
- // 4<-5
- cache.cacheArtifactSuperType(cache.getByGuid("555"), Arrays.asList(cache.getByGuid("444")));
- // 3<-6
- cache.cacheArtifactSuperType(cache.getByGuid("666"), Arrays.asList(cache.getByGuid("333")));
- }
-
- private void setUpTypeValidity(ArtifactTypeCache cache) throws OseeCoreException {
- Branch branch1 = branchCache.getByGuid("ROOT");
- Branch branch2 = branchCache.getByGuid("TEST");
- Assert.assertNotNull(branch1);
- Assert.assertNotNull(branch2);
- cache.cacheTypeValidity(cache.getByGuid("000"), attributeCache.getByGuid("AAA"), branch1);
- cache.cacheTypeValidity(cache.getByGuid("111"), attributeCache.getByGuid("BBB"), branch1);
- cache.cacheTypeValidity(cache.getByGuid("222"), attributeCache.getByGuid("CCC"), branch1);
- cache.cacheTypeValidity(cache.getByGuid("333"), attributeCache.getByGuid("DDD"), branch1);
- cache.cacheTypeValidity(cache.getByGuid("333"), attributeCache.getByGuid("EEE"), branch2);
- cache.cacheTypeValidity(cache.getByGuid("444"), attributeCache.getByGuid("FFF"), branch1);
- cache.cacheTypeValidity(cache.getByGuid("555"), attributeCache.getByGuid("GGG"), branch1);
- cache.cacheTypeValidity(cache.getByGuid("666"), attributeCache.getByGuid("HHH"), branch1);
- }
-
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/AttributeTypeCacheTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/AttributeTypeCacheTest.java deleted file mode 100644 index e835b3b342e..00000000000 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/AttributeTypeCacheTest.java +++ /dev/null @@ -1,104 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.test.types;
-
-import java.util.ArrayList;
-import java.util.List;
-import junit.framework.Assert;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
-import org.eclipse.osee.framework.skynet.core.types.AttributeTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.IOseeTypeFactory;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeFactory;
-import org.junit.BeforeClass;
-
-/**
- * Low-level OseeTypeCache Test - Does not require database access
- *
- * @author Roberto E. Escobar
- */
-public class AttributeTypeCacheTest extends AbstractOseeCacheTest<AttributeType> {
-
- private static List<AttributeType> attributeTypes;
- private static AttributeTypeCache attrCache;
- private static IOseeTypeFactory factory;
-
- @BeforeClass
- public static void prepareTestData() throws OseeCoreException {
- attributeTypes = new ArrayList<AttributeType>();
-
- factory = new OseeTypeFactory();
-
- AttributeDataAccessor attrData = new AttributeDataAccessor(attributeTypes);
-
- attrCache = new AttributeTypeCache(attrData);
- attrCache.ensurePopulated();
- Assert.assertTrue(attrData.wasLoaded());
- }
-
- public AttributeTypeCacheTest() {
- super(attributeTypes, attrCache);
- }
-
- @Override
- public void testDirty() throws OseeCoreException {
- AttributeType attributeType = OseeTypesUtil.createAttributeType(attrCache, factory, "GUID", "AttributeDirtyTest");
- Assert.assertTrue(attributeType.isDirty());
- attributeType.clearDirty();
-
- String initialValue = attributeType.getName();
- attributeType.setName("My Name Has Changes");
- Assert.assertTrue(attributeType.isDirty());
-
- // Remains Dirty
- attributeType.setName(initialValue);
- Assert.assertTrue(attributeType.isDirty());
-
- // attributeType.setFields(name, baseAttributeTypeId, attributeProviderNameId, baseAttributeClass,
- // providerAttributeClass, fileTypeExtension, defaultValue, oseeEnumType, minOccurrences, maxOccurrences,
- // description, taggerId);
-
- }
-
- // private void checkDirty(AttributeType attributeType) {
- // // DirtyStateDetail details = attributeType.getDirtyDetails();
- // // details.
- // }
-
- private final static class AttributeDataAccessor extends OseeTestDataAccessor<AttributeType> {
-
- private final List<AttributeType> attributeTypes;
-
- public AttributeDataAccessor(List<AttributeType> attributeTypes) {
- super();
- this.attributeTypes = attributeTypes;
- }
-
- @Override
- public void load(AbstractOseeCache<AttributeType> cache) throws OseeCoreException {
- super.load(cache);
- attributeTypes.add(OseeTypesUtil.createAttributeType(cache, factory, "AAA", "Attribute1"));
- attributeTypes.add(OseeTypesUtil.createAttributeType(cache, factory, "BBB", "Attribute2"));
- attributeTypes.add(OseeTypesUtil.createAttributeType(cache, factory, "CCC", "Attribute3"));
- attributeTypes.add(OseeTypesUtil.createAttributeType(cache, factory, "DDD", "Attribute4"));
- attributeTypes.add(OseeTypesUtil.createAttributeType(cache, factory, "EEE", "Attribute5"));
- attributeTypes.add(OseeTypesUtil.createAttributeType(cache, factory, "FFF", "Attribute6"));
- attributeTypes.add(OseeTypesUtil.createAttributeType(cache, factory, "GGG", "Attribute7"));
- attributeTypes.add(OseeTypesUtil.createAttributeType(cache, factory, "HHH", "Attribute8"));
- int typeId = 200;
- for (AttributeType type : attributeTypes) {
- type.setId(typeId++);
- cache.cache(type);
- }
- }
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/BranchCacheTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/BranchCacheTest.java deleted file mode 100644 index 9fe36da9e10..00000000000 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/BranchCacheTest.java +++ /dev/null @@ -1,368 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.test.types;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import junit.framework.Assert;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
-import org.eclipse.osee.framework.core.enums.BranchState;
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.types.BranchCache;
-import org.eclipse.osee.framework.skynet.core.types.IArtifact;
-import org.eclipse.osee.framework.skynet.core.types.IOseeTypeFactory;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeFactory;
-import org.eclipse.osee.framework.skynet.core.types.ShallowArtifact;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Low-level OseeTypeCache Test - Does not require database access
- *
- * @author Roberto E. Escobar
- */
-public class BranchCacheTest extends AbstractOseeCacheTest<Branch> {
-
- private static List<Branch> branchData;
- private static BranchCache cache;
- private static IOseeTypeFactory factory;
- private static IArtifact defaultAssociatedArtifact;
-
- @BeforeClass
- public static void prepareTestData() throws OseeCoreException {
- factory = new OseeTypeFactory();
- branchData = new ArrayList<Branch>();
-
- BranchDataAccessor branchAccessor = new BranchDataAccessor(branchData);
- cache = new BranchCache(branchAccessor);
- cache.ensurePopulated();
-
- Assert.assertTrue(branchAccessor.wasLoaded());
-
- defaultAssociatedArtifact = new ShallowArtifact(cache, -1);
- cache.setDefaultAssociatedArtifact(defaultAssociatedArtifact);
- }
-
- public BranchCacheTest() {
- super(branchData, cache);
- }
-
- @Test
- public void testSystemRootBranch() throws OseeCoreException {
- Branch systemRootBranch = cache.getSystemRootBranch();
- Assert.assertNotNull(systemRootBranch);
- }
-
- @Test
- public void testBranchHierarchy() throws OseeCoreException {
- OseeTypesUtil.checkHierarchy(cache, "AAA", "BBB", "CCC");
- OseeTypesUtil.checkHierarchy(cache, "BBB", "DDD", "EEE");
- OseeTypesUtil.checkHierarchy(cache, "CCC", "FFF", "GGG", "HHH");
- }
-
- @Test
- public void testMergeBranches() throws OseeCoreException {
- OseeTypesUtil.checkMergeBranch(cache, null, "HHH", "AAA");
- OseeTypesUtil.checkMergeBranch(cache, "III", "DDD", "BBB");
- OseeTypesUtil.checkMergeBranch(cache, "JJJ", "GGG", "CCC");
- OseeTypesUtil.checkMergeBranch(cache, "KKK", "HHH", "CCC");
- }
-
- @Test
- public void testBranchAliases() throws OseeCoreException {
- OseeTypesUtil.checkAliases(cache, "AAA", "root", "system", "main");
- OseeTypesUtil.checkAliases(cache, "BBB", "base 1", "build 1", "common");
- OseeTypesUtil.checkAliases(cache, "CCC", "base 2", "build 2");
-
- OseeTypesUtil.checkAliases(cache, "DDD");
- OseeTypesUtil.checkAliases(cache, "EEE");
- OseeTypesUtil.checkAliases(cache, "FFF");
- OseeTypesUtil.checkAliases(cache, "GGG");
- OseeTypesUtil.checkAliases(cache, "HHH");
- OseeTypesUtil.checkAliases(cache, "III");
- }
-
- @Test
- public void testSameAliasForMultipleBranches() throws OseeCoreException {
- OseeTypesUtil.checkAliases(cache, "JJJ", "a merge branch");
- OseeTypesUtil.checkAliases(cache, "KKK", "a merge branch");
-
- List<Branch> aliasedbranch = new ArrayList<Branch>(cache.getByAlias("a merge branch"));
- Assert.assertEquals(2, aliasedbranch.size());
-
- Collections.sort(aliasedbranch);
- Assert.assertEquals(cache.getByGuid("JJJ"), aliasedbranch.get(0));
- Assert.assertEquals(cache.getByGuid("KKK"), aliasedbranch.get(1));
- }
-
- @Test
- public void testSetAliasForBranch() throws OseeCoreException {
- Branch branch = cache.getByGuid("JJJ");
- Assert.assertNotNull(branch);
-
- branch.setAliases("One", "Two", "Three");
- OseeTypesUtil.checkAliases(cache, "JJJ", "one", "two", "three");
-
- branch.setAliases("One", "Three");
- OseeTypesUtil.checkAliases(cache, "JJJ", "one", "three");
-
- branch.setAliases();
- OseeTypesUtil.checkAliases(cache, "JJJ");
-
- branch.setAliases("a merge branch");
- OseeTypesUtil.checkAliases(cache, "JJJ", "a merge branch");
- }
-
- @Test
- public void testBaseTransaction() throws OseeCoreException {
- Branch branch = cache.getByGuid("BBB");
- Assert.assertNotNull(branch);
-
- Assert.assertNull(branch.getBaseTransaction());
-
- TransactionRecord expectedTx =
- new TransactionRecord(1, branch, "Transaction 1", new Date(), 1, 2, TransactionDetailsType.Baselined);
- cache.cacheBaseTransaction(branch, expectedTx);
-
- TransactionRecord actualTx = branch.getBaseTransaction();
- Assert.assertEquals(expectedTx, actualTx);
- }
-
- @Test
- public void testInvalidBaseTransactionCaching() throws OseeCoreException {
- Branch branch = cache.getByGuid("BBB");
- Assert.assertNotNull(branch);
- TransactionRecord expectedTx =
- new TransactionRecord(1, branch, "Transaction 1", new Date(), 1, 2, TransactionDetailsType.NonBaselined);
-
- try {
- cache.cacheBaseTransaction(null, expectedTx);
- Assert.assertTrue("This line should not be executed", true);
- } catch (Exception ex) {
- Assert.assertTrue(ex instanceof OseeArgumentException);
- }
-
- try {
- cache.cacheBaseTransaction(branch, null);
- Assert.assertTrue("This line should not be executed", true);
- } catch (Exception ex) {
- Assert.assertTrue(ex instanceof OseeArgumentException);
- }
-
- try {
- cache.cacheBaseTransaction(branch, expectedTx);
- Assert.assertTrue("This line should not be executed", true);
- } catch (Exception ex) {
- Assert.assertTrue(ex instanceof OseeArgumentException);
- }
- }
-
- @Test
- public void testSourceTransaction() throws OseeCoreException {
- Branch branch = cache.getByGuid("BBB");
- Assert.assertNotNull(branch);
-
- Assert.assertNull(branch.getSourceTransaction());
-
- TransactionRecord expectedTx =
- new TransactionRecord(1, null, "Transaction 1", new Date(), 1, 2, TransactionDetailsType.NonBaselined);
- cache.cacheSourceTransaction(branch, expectedTx);
-
- TransactionRecord actualTx = branch.getSourceTransaction();
- Assert.assertEquals(expectedTx, actualTx);
- }
-
- @Test
- public void testInvalidSourceTransaction() throws OseeCoreException {
- Branch branch = cache.getByGuid("BBB");
- Assert.assertNotNull(branch);
- TransactionRecord expectedTx =
- new TransactionRecord(1, branch, "Transaction 1", new Date(), 1, 2, TransactionDetailsType.NonBaselined);
- cache.cacheSourceTransaction(branch, expectedTx);
-
- try {
- cache.cacheSourceTransaction(null, expectedTx);
- Assert.assertTrue("This line should not be executed", true);
- } catch (Exception ex) {
- Assert.assertTrue(ex instanceof OseeArgumentException);
- }
-
- try {
- cache.cacheSourceTransaction(branch, null);
- Assert.assertTrue("This line should not be executed", true);
- } catch (Exception ex) {
- Assert.assertTrue(ex instanceof OseeArgumentException);
- }
- }
-
- @Test
- public void testAssociatedArtifact() throws OseeCoreException {
- Assert.assertEquals(defaultAssociatedArtifact, cache.getDefaultAssociatedArtifact());
-
- Branch branch = cache.getByGuid("BBB");
- Assert.assertNotNull(branch);
-
- Assert.assertEquals(defaultAssociatedArtifact, branch.getAssociatedArtifact());
-
- String guid = GUID.create();
- IArtifact expectedArtifact = new TestArtifact(100, guid, "Test Artifact", cache);
- branch.setAssociatedArtifact(expectedArtifact);
-
- Assert.assertEquals(branch.getAssociatedArtifact(), expectedArtifact);
-
- branch.setAssociatedArtifact(null);
- Assert.assertEquals(defaultAssociatedArtifact, branch.getAssociatedArtifact());
- }
-
- @Override
- public void testDirty() throws OseeCoreException {
- // TODO test Rename
-
- // AttributeType attributeType = OseeTypesUtil.createAttributeType(attrCache, factory, "GUID", "AttributeDirtyTest");
- // Assert.assertTrue(attributeType.isDirty());
- // attributeType.clearDirty();
- //
- // String initialValue = attributeType.getName();
- // attributeType.setName("My Name Has Changes");
- // Assert.assertTrue(attributeType.isDirty());
- //
- // // Remains Dirty
- // attributeType.setName(initialValue);
- // Assert.assertTrue(attributeType.isDirty());
- //
- // // attributeType.setFields(name, baseAttributeTypeId, attributeProviderNameId, baseAttributeClass,
- // // providerAttributeClass, fileTypeExtension, defaultValue, oseeEnumType, minOccurrences, maxOccurrences,
- // // description, taggerId);
-
- }
-
- private final static class TestArtifact extends ShallowArtifact {
-
- private final int artId;
- private final String guid;
- private final String name;
-
- public TestArtifact(int uniqueId, String guid, String name, BranchCache cache) {
- super(cache, uniqueId);
- this.artId = uniqueId;
- this.guid = guid;
- this.name = name;
- }
-
- @Override
- public int getArtId() {
- return artId;
- }
-
- @Override
- public ArtifactType getArtifactType() {
- return null;
- }
-
- @Override
- public Artifact getFullArtifact() throws OseeCoreException {
- return null;
- }
-
- @Override
- public String getGuid() {
- return guid;
- }
-
- @Override
- public String getName() {
- return name;
- }
- }
-
- private final static class BranchDataAccessor extends OseeTestDataAccessor<Branch> {
-
- private final List<Branch> data;
-
- public BranchDataAccessor(List<Branch> data) {
- super();
- this.data = data;
- }
-
- @Override
- public void load(AbstractOseeCache<Branch> cache) throws OseeCoreException {
- super.load(cache);
- data.add(OseeTypesUtil.createBranch(cache, factory, "AAA", "Root", BranchType.SYSTEM_ROOT,
- BranchState.CREATED, false));
-
- data.add(OseeTypesUtil.createBranch(cache, factory, "BBB", "B-Branch", BranchType.BASELINE,
- BranchState.CREATED, false));
- data.add(OseeTypesUtil.createBranch(cache, factory, "CCC", "C-Branch", BranchType.BASELINE,
- BranchState.MODIFIED, false));
-
- data.add(OseeTypesUtil.createBranch(cache, factory, "DDD", "D-Branch", BranchType.WORKING,
- BranchState.MODIFIED, false));
- data.add(OseeTypesUtil.createBranch(cache, factory, "EEE", "E-Branch", BranchType.WORKING,
- BranchState.MODIFIED, false));
-
- data.add(OseeTypesUtil.createBranch(cache, factory, "FFF", "F-Branch", BranchType.WORKING,
- BranchState.MODIFIED, false));
- data.add(OseeTypesUtil.createBranch(cache, factory, "GGG", "G-Branch", BranchType.WORKING,
- BranchState.MODIFIED, true));
- data.add(OseeTypesUtil.createBranch(cache, factory, "HHH", "H-Branch", BranchType.WORKING,
- BranchState.MODIFIED, true));
-
- // Merge Branches
- data.add(OseeTypesUtil.createBranch(cache, factory, "III", "Merge-A", BranchType.MERGE, BranchState.CREATED,
- false));
- data.add(OseeTypesUtil.createBranch(cache, factory, "JJJ", "Merge-B", BranchType.MERGE, BranchState.CREATED,
- false));
- data.add(OseeTypesUtil.createBranch(cache, factory, "KKK", "Merge-C", BranchType.MERGE, BranchState.CREATED,
- false));
-
- int typeId = 500;
- for (Branch type : data) {
- type.setId(typeId++);
- cache.cache(type);
- }
- BranchCache branchCache = (BranchCache) cache;
- loadBranchHierarchy(branchCache);
- loadMergeBranches(branchCache);
- loadBranchAliases(branchCache);
- }
-
- private void loadBranchHierarchy(BranchCache cache) throws OseeCoreException {
- OseeTypesUtil.createBranchHierarchy(cache, "AAA", "BBB", "CCC");
- OseeTypesUtil.createBranchHierarchy(cache, "BBB", "DDD", "EEE");
- OseeTypesUtil.createBranchHierarchy(cache, "CCC", "FFF", "GGG", "HHH");
- }
-
- private void loadMergeBranches(BranchCache branchCache) throws OseeCoreException {
- OseeTypesUtil.createMergeBranch(cache, "III", "DDD", "BBB");
- OseeTypesUtil.createMergeBranch(cache, "JJJ", "GGG", "CCC");
- OseeTypesUtil.createMergeBranch(cache, "KKK", "HHH", "CCC");
- }
-
- private void loadBranchAliases(BranchCache branchCache) throws OseeCoreException {
- OseeTypesUtil.createAlias(cache, "AAA", "Root", "System", "Main");
- OseeTypesUtil.createAlias(cache, "BBB", "Base 1", "Build 1", "common");
- OseeTypesUtil.createAlias(cache, "CCC", "Base 2", "Build 2");
-
- OseeTypesUtil.createAlias(cache, "JJJ", "a merge branch");
- OseeTypesUtil.createAlias(cache, "KKK", "a merge branch");
- }
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/MockIArtifact.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/MockIArtifact.java index 6465dc58a13..9ef9abf5bf8 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/MockIArtifact.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/MockIArtifact.java @@ -12,10 +12,10 @@ package org.eclipse.osee.framework.skynet.core.test.types; import java.util.Collections;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSide;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/MockShallowArtifact.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/MockShallowArtifact.java index f04206bba9b..b2feeb4c5e3 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/MockShallowArtifact.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/MockShallowArtifact.java @@ -1,8 +1,8 @@ package org.eclipse.osee.framework.skynet.core.test.types;
+import org.eclipse.osee.framework.core.cache.BranchCache;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.types.BranchCache;
import org.eclipse.osee.framework.skynet.core.types.ShallowArtifact;
// This class is used to avoid needing a full database to run this test.
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/OseeCacheTestSuite.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/OseeCacheTestSuite.java index 33761f360c9..d1e98973a00 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/OseeCacheTestSuite.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/OseeCacheTestSuite.java @@ -14,8 +14,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses( {ShallowArtifactTest.class, ArtifactTypeCacheTest.class, AttributeTypeCacheTest.class,
- RelationTypeCacheTest.class, OseeEnumTypeCacheTest.class, BranchCacheTest.class})
+@Suite.SuiteClasses( {ShallowArtifactTest.class})
/**
* @author Roberto E. Escobar
*/
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/OseeEnumTypeCacheTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/OseeEnumTypeCacheTest.java deleted file mode 100644 index dc255d4db13..00000000000 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/OseeEnumTypeCacheTest.java +++ /dev/null @@ -1,103 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.test.types;
-
-import java.util.ArrayList;
-import java.util.List;
-import junit.framework.Assert;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumEntry;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumType;
-import org.eclipse.osee.framework.skynet.core.types.IOseeTypeFactory;
-import org.eclipse.osee.framework.skynet.core.types.OseeEnumTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeFactory;
-import org.junit.BeforeClass;
-
-/**
- * Low-level OseeTypeCache Test - Does not require database access
- *
- * @author Roberto E. Escobar
- */
-public class OseeEnumTypeCacheTest extends AbstractOseeCacheTest<OseeEnumType> {
-
- private static List<OseeEnumType> data;
- private static IOseeTypeFactory factory;
- private static OseeEnumTypeCache cache;
-
- @BeforeClass
- public static void prepareTestData() throws OseeCoreException {
- factory = new OseeTypeFactory();
- data = new ArrayList<OseeEnumType>();
-
- EnumDataAccessor enumAccessor = new EnumDataAccessor(data);
-
- cache = new OseeEnumTypeCache(enumAccessor);
-
- cache.ensurePopulated();
- Assert.assertTrue(enumAccessor.wasLoaded());
- }
-
- public OseeEnumTypeCacheTest() {
- super(data, cache);
- }
-
- @Override
- protected void checkEquals(OseeEnumType expected, OseeEnumType actual) throws OseeCoreException {
- OseeTypesUtil.checkEnumType(expected, actual);
- }
-
- @Override
- public void testDirty() throws OseeCoreException {
- }
-
- @org.junit.Test
- public void testAddOseeEnumEntry() throws OseeCoreException {
- OseeEnumType enum1 =
- OseeTypesUtil.createEnumType(cache, factory, "Test 1", "Test 1", "OneEntry", 0, "TwoEntry", 1);
- OseeTypesUtil.checkOseeEnumEntries(enum1.values(), "OneEntry", 0, "TwoEntry", 1);
-
- OseeEnumEntry entry = factory.createEnumEntry(cache, "C", "AddedEntry", 4);
- enum1.addEntry(entry);
-
- OseeTypesUtil.checkOseeEnumEntries(enum1.values(), "OneEntry", 0, "TwoEntry", 1, "AddedEntry", 4);
-
- enum1.removeEntry(entry);
- OseeTypesUtil.checkOseeEnumEntries(enum1.values(), "OneEntry", 0, "TwoEntry", 1);
-
- enum1.removeEntry(enum1.values()[0]);
- OseeTypesUtil.checkOseeEnumEntries(enum1.values(), "TwoEntry", 1);
- }
-
- private final static class EnumDataAccessor extends OseeTestDataAccessor<OseeEnumType> {
- private final List<OseeEnumType> oseeEnumTypes;
-
- public EnumDataAccessor(List<OseeEnumType> oseeEnumTypes) {
- super();
- this.oseeEnumTypes = oseeEnumTypes;
- }
-
- @Override
- public void load(AbstractOseeCache<OseeEnumType> cache) throws OseeCoreException {
- super.load(cache);
- oseeEnumTypes.add(OseeTypesUtil.createEnumType(cache, factory, "E1", "Enum1", "AAA", 1, "BBB", 2, "CCC", 3));
- oseeEnumTypes.add(OseeTypesUtil.createEnumType(cache, factory, "E2", "Enum2", "DDD", 4, "EEE", 5, "FFF", 6));
- oseeEnumTypes.add(OseeTypesUtil.createEnumType(cache, factory, "E3", "Enum3", "GGG", 7, "HHH", 8, "III", 9));
- oseeEnumTypes.add(OseeTypesUtil.createEnumType(cache, factory, "E4", "Enum4", "JJJ", 10, "KKK", 11, "LLL", 12));
- oseeEnumTypes.add(OseeTypesUtil.createEnumType(cache, factory, "E5", "Enum5", "MMM", 1, "NNN", 2, "OOO", 3));
- int typeId = 400;
- for (OseeEnumType type : oseeEnumTypes) {
- type.setId(typeId++);
- cache.cache(type);
- }
- }
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/OseeTestDataAccessor.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/OseeTestDataAccessor.java deleted file mode 100644 index f1b66da767f..00000000000 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/OseeTestDataAccessor.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.eclipse.osee.framework.skynet.core.test.types;
-
-import java.util.Collection;
-import junit.framework.Assert;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.IOseeDataAccessor;
-import org.eclipse.osee.framework.core.data.IOseeStorableType;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-
-public class OseeTestDataAccessor<T extends IOseeStorableType> implements IOseeDataAccessor<T> {
-
- private boolean wasLoadCalled = false;
- private boolean wasStoreCalled = false;
-
- public void setLoadCalled(boolean wasLoadCalled) {
- this.wasLoadCalled = wasLoadCalled;
- }
-
- public void setStoreCalled(boolean wasStoreCalled) {
- this.wasStoreCalled = wasStoreCalled;
- }
-
- public boolean wasLoaded() {
- return wasLoadCalled;
- }
-
- public boolean wasStoreCalled() {
- return wasStoreCalled;
- }
-
- @Override
- public void load(AbstractOseeCache<T> cache) throws OseeCoreException {
- Assert.assertNotNull(cache);
- setLoadCalled(true);
- }
-
- @Override
- public void store(AbstractOseeCache<T> cache, Collection<T> types) throws OseeCoreException {
- Assert.assertNotNull(cache);
- Assert.assertNotNull(types);
- setStoreCalled(true);
- }
-
-}
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/OseeTypesUtil.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/OseeTypesUtil.java deleted file mode 100644 index 3a4ed7794a5..00000000000 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/OseeTypesUtil.java +++ /dev/null @@ -1,321 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.osee.framework.skynet.core.test.types;
-
-import static org.junit.Assert.assertEquals;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import junit.framework.Assert;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.enums.BranchState;
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.enums.RelationSide;
-import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumEntry;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumType;
-import org.eclipse.osee.framework.skynet.core.attribute.StringAttribute;
-import org.eclipse.osee.framework.skynet.core.attribute.providers.DefaultAttributeDataProvider;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
-import org.eclipse.osee.framework.skynet.core.types.BranchCache;
-import org.eclipse.osee.framework.skynet.core.types.IOseeTypeFactory;
-
-/**
- * @author Roberto E. Escobar
- */
-public class OseeTypesUtil {
-
- private OseeTypesUtil() {
-
- }
-
- public static void checkAliases(BranchCache cache, String branchGuid, String... expectedAliases) throws OseeCoreException {
- Branch branch = cache.getByGuid(branchGuid);
- Assert.assertNotNull(branch);
-
- List<String> actualAliases = new ArrayList<String>(branch.getAliases());
- Assert.assertEquals(expectedAliases != null ? expectedAliases.length : 0, actualAliases.size());
-
- if (expectedAliases != null) {
- int index = 0;
-
- List<String> expectedAliasesList = Arrays.asList(expectedAliases);
- Collections.sort(expectedAliasesList);
- Collections.sort(actualAliases);
- for (String actualAlias : actualAliases) {
- String expectedAlias = expectedAliasesList.get(index++);
- expectedAlias = expectedAlias.toLowerCase();
- Assert.assertEquals(expectedAlias, actualAlias);
- Collection<Branch> aliasedbranch = cache.getByAlias(expectedAlias);
- Assert.assertTrue(aliasedbranch.contains(branch));
- }
- }
- }
-
- public static void createAlias(BranchCache cache, String branchGuid, String... aliases) throws OseeCoreException {
- Branch branch = cache.getByGuid(branchGuid);
- Assert.assertNotNull(branch);
- cache.setAliases(branch, Arrays.asList(aliases));
- }
-
- public static void checkMergeBranch(BranchCache cache, String expectedMergeBranchGuid, String sourceBranchGuid, String destinationBranchGuid) throws OseeCoreException {
- Branch sourceBranch = cache.getByGuid(sourceBranchGuid);
- Assert.assertNotNull(sourceBranch);
- Branch destionationBranch = cache.getByGuid(destinationBranchGuid);
- Assert.assertNotNull(destionationBranch);
-
- Branch actualMergeBranch = cache.getMergeBranch(sourceBranch, destionationBranch);
- if (expectedMergeBranchGuid == null) {
- Assert.assertNull(actualMergeBranch);
- } else {
- Branch mergeBranch = cache.getByGuid(expectedMergeBranchGuid);
- Assert.assertNotNull(mergeBranch);
- Assert.assertEquals(mergeBranch, actualMergeBranch);
- }
- }
-
- public static void createMergeBranch(BranchCache cache, String mergeBranchGuid, String sourceBranchGuid, String destinationBranchGuid) throws OseeCoreException {
- Branch mergeBranch = cache.getByGuid(mergeBranchGuid);
- Assert.assertNotNull(mergeBranch);
- Branch sourceBranch = cache.getByGuid(sourceBranchGuid);
- Assert.assertNotNull(sourceBranch);
- Branch destionationBranch = cache.getByGuid(destinationBranchGuid);
- Assert.assertNotNull(destionationBranch);
- cache.cacheMergeBranch(mergeBranch, sourceBranch, destionationBranch);
- }
-
- public static void checkHierarchy(BranchCache cache, String parentGuid, String... expected) throws OseeCoreException {
- Branch parentBranch = cache.getByGuid(parentGuid);
- Assert.assertNotNull(parentBranch);
- Collection<Branch> children = parentBranch.getChildren();
- Assert.assertEquals(expected.length, children.size());
- int index = 0;
- for (Branch child : children) {
- Branch expectedBranch = cache.getByGuid(expected[index]);
- Assert.assertNotNull(expectedBranch);
- Assert.assertEquals(expectedBranch, child);
- Assert.assertEquals(parentBranch, child.getParentBranch());
- index++;
- }
- }
-
- public static void createBranchHierarchy(BranchCache cache, String parentGuid, String... childrenGuids) throws OseeCoreException {
- Branch parentBranch = cache.getByGuid(parentGuid);
- Assert.assertNotNull(parentBranch);
- Assert.assertNotNull(childrenGuids);
- Assert.assertTrue(childrenGuids.length > 0);
- for (String childGuid : childrenGuids) {
- Branch childBranch = cache.getByGuid(childGuid);
- Assert.assertNotNull(childBranch);
- cache.setBranchParent(parentBranch, childBranch);
- }
- }
-
- public static RelationType createRelationType(AbstractOseeCache<RelationType> cache, AbstractOseeCache<ArtifactType> artCache, IOseeTypeFactory factory, String guid, String name, String aGUID, String bGUID, RelationTypeMultiplicity multiplicity) throws OseeCoreException {
- ArtifactType type1 = artCache.getByGuid(aGUID);
- ArtifactType type2 = artCache.getByGuid(bGUID);
- RelationType relationType =
- factory.createRelationType(cache, guid, name, name + "_A", name + "_B", type1, type2, multiplicity, "");
- Assert.assertNotNull(relationType);
- return relationType;
- }
-
- public static Branch createBranch(AbstractOseeCache<Branch> cache, IOseeTypeFactory factory, String guid, String name, BranchType branchType, BranchState branchState, boolean isArchived) throws OseeCoreException {
- Branch branch = factory.createBranch(cache, guid, name, branchType, branchState, isArchived);
- Assert.assertNotNull(branch);
- return branch;
- }
-
- public static AttributeType createAttributeType(AbstractOseeCache<AttributeType> cache, IOseeTypeFactory factory, String guid, String name) throws OseeCoreException {
- AttributeType attributeType =
- factory.createAttributeType(cache, guid, name, "DummyBase", "DummyProvider", StringAttribute.class,
- DefaultAttributeDataProvider.class, "none", "none", null, 1, 1, "test data", null);
- Assert.assertNotNull(attributeType);
- return attributeType;
- }
-
- public static void checkOseeEnumEntries(OseeEnumEntry[] actual, Object... entries) {
- Assert.assertEquals(entries.length / 2, actual.length);
- int index2 = 0;
- for (int index = 0; index < entries.length; index++, index2++) {
- String itemName = (String) entries[index];
- Integer ordinal = (Integer) entries[++index];
-
- Assert.assertEquals(itemName, actual[index2].getName());
- Assert.assertEquals((int) ordinal, actual[index2].ordinal());
- }
- }
-
- public static OseeEnumType createEnumType(AbstractOseeCache<OseeEnumType> cache, IOseeTypeFactory factory, String guid, String name, Object... entries) throws OseeCoreException {
- OseeEnumType type = factory.createEnumType(cache, guid, name);
- if (entries != null && entries.length > 0) {
- List<OseeEnumEntry> items = new ArrayList<OseeEnumEntry>();
- for (int index = 0; index < entries.length; index++) {
- String itemName = (String) entries[index];
- Integer ordinal = (Integer) entries[++index];
- items.add(factory.createEnumEntry(cache, null, itemName, ordinal));
- }
- type.setEntries(items);
- }
- return type;
- }
-
- public static void checkEnumType(String expectedName, String[] expectedEntries, Integer[] expectedOrdinals, OseeEnumType actualEnumType) throws OseeCoreException {
- assertEquals(expectedName, actualEnumType.getName());
- OseeEnumEntry[] enumEntries = actualEnumType.values();
- assertEquals(expectedEntries.length, enumEntries.length);
- for (int index = 0; index < expectedEntries.length && index < expectedOrdinals.length; index++) {
- checkEnumEntry(expectedEntries[index], expectedOrdinals[index], actualEnumType, enumEntries[index]);
- }
- }
-
- public static void checkEnumEntry(String expectedName, int expectedOrdinal, OseeEnumType parent, OseeEnumEntry entry) throws OseeCoreException {
- assertEquals(expectedName, entry.getName());
- assertEquals(expectedOrdinal, entry.ordinal());
- assertEquals(parent, entry.getDeclaringClass());
- assertEquals(parent.getId(), entry.getId());
- assertEquals(parent.getName(), entry.getName());
- OseeEnumEntry[] expected = parent.values();
- OseeEnumEntry[] actual = entry.getDeclaringClass().values();
- assertEquals(expected.length, actual.length);
- for (int index = 0; index < expected.length; index++) {
- assertEquals(expected[index], actual[index]);
- }
- }
-
- public static void checkEnumType(OseeEnumType expected, OseeEnumType actual) throws OseeCoreException {
- OseeEnumEntry[] expectedValues = expected.values();
- OseeEnumEntry[] actualValues = actual.values();
- Assert.assertEquals(expectedValues.length, actualValues.length);
-
- for (int index = 0; index < expectedValues.length; index++) {
- checkEnumEntry(expectedValues[index], actualValues[index]);
- }
- }
-
- public static void checkEnumEntry(OseeEnumEntry expected, OseeEnumEntry actual) throws OseeCoreException {
- Assert.assertEquals(expected.getName(), actual.getName());
- Assert.assertEquals(expected.ordinal(), actual.ordinal());
- Assert.assertEquals(expected.getDeclaringClass(), actual.getDeclaringClass());
- Assert.assertEquals(expected.getGuid(), actual.getGuid());
- }
-
- public static void checkInheritance(AbstractOseeCache<ArtifactType> artCache, String artTypeGuid, String... superTypeGuids) throws OseeCoreException {
- ArtifactType target = artCache.getByGuid(artTypeGuid);
- Assert.assertNotNull(target);
-
- List<ArtifactType> expectedSuperTypes = new ArrayList<ArtifactType>();
- for (String superTyperGuid : superTypeGuids) {
- ArtifactType superArtifactType = artCache.getByGuid(superTyperGuid);
- Assert.assertNotNull(superArtifactType);
- expectedSuperTypes.add(superArtifactType);
- }
-
- for (ArtifactType testAgainstType : artCache.getAll()) {
- boolean result = target.inheritsFrom(testAgainstType);
- if (expectedSuperTypes.contains(testAgainstType) || target.equals(testAgainstType)) {
- Assert.assertTrue(String.format("[%s] does not inherit from [%s]", target.getName(),
- testAgainstType.getName()), result);
- } else {
- Assert.assertFalse(String.format("[%s] should not inherit from [%s]", target.getName(),
- testAgainstType.getName()), result);
- }
- }
- }
-
- public static void checkDescendants(AbstractOseeCache<ArtifactType> artCache, String artTypeGuid, boolean isAllLevels, String... descendantGuids) throws OseeCoreException {
- ArtifactType target = artCache.getByGuid(artTypeGuid);
- Assert.assertNotNull(target);
-
- List<ArtifactType> expectedDescendants = new ArrayList<ArtifactType>();
- for (String type : descendantGuids) {
- ArtifactType childType = artCache.getByGuid(type);
- Assert.assertNotNull(childType);
- expectedDescendants.add(childType);
- }
-
- Collection<ArtifactType> descendants =
- isAllLevels ? target.getAllDescendantTypes() : target.getFirstLevelDescendantTypes();
-
- Assert.assertEquals(expectedDescendants.size(), descendants.size());
- for (ArtifactType child : descendants) {
- boolean result = expectedDescendants.contains(target);
- if (result) {
- Assert.assertTrue(String.format("[%s] inherits from [%s]", child.getName(), target.getName()), result);
- } else {
- Assert.assertFalse(String.format("[%s] does not inherit from [%s]", child.getName(), target.getName()),
- result);
- }
- if (target.hasSuperArtifactTypes()) {
- Assert.assertEquals(true, child.inheritsFrom(target));
- }
- }
- }
-
- public static void checkAttributes(AbstractOseeCache<ArtifactType> artCache, AbstractOseeCache<AttributeType> attrCache, String artTypeGuid, Branch branch, String... attributeGuids) throws OseeCoreException {
- ArtifactType artifactType = artCache.getByGuid(artTypeGuid);
- Assert.assertNotNull(artifactType);
-
- List<AttributeType> expectedAttributes = new ArrayList<AttributeType>();
- for (String attrGuid : attributeGuids) {
- AttributeType attributeType = attrCache.getByGuid(attrGuid);
- Assert.assertNotNull(attributeType);
- expectedAttributes.add(attributeType);
- }
-
- Collection<AttributeType> actualTypes = artifactType.getAttributeTypes(branch);
- Assert.assertEquals(String.format("ArtifactType [%s] - incorrect number of attributes actual - %s expected - %s",
- artTypeGuid, actualTypes, expectedAttributes), expectedAttributes.size(), actualTypes.size());
-
- Collection<AttributeType> typesNotFound =
- org.eclipse.osee.framework.jdk.core.util.Collections.setComplement(expectedAttributes, actualTypes);
- Assert.assertTrue(String.format("Artifact [%s] for branch [%s] did not have the following attributes [%s]",
- artifactType.getName(), branch.getName(), typesNotFound), typesNotFound.isEmpty());
-
- typesNotFound =
- org.eclipse.osee.framework.jdk.core.util.Collections.setComplement(actualTypes, expectedAttributes);
- Assert.assertTrue(String.format("Artifact [%s] for branch [%s] the following additional attributes [%s]",
- artifactType.getName(), branch.getName(), typesNotFound), typesNotFound.isEmpty());
- }
-
- public static void checkRelationTypeInheritance(AbstractOseeCache<RelationType> cache, AbstractOseeCache<ArtifactType> artCache, String relGuid, RelationSide relationSide, int maxValue, String... artifactTypesAllowed) throws OseeCoreException {
- RelationType relationType = cache.getByGuid(relGuid);
- Assert.assertNotNull(relationType);
-
- Assert.assertEquals(maxValue, relationType.getMultiplicity().getLimit(relationSide));
- Assert.assertEquals(maxValue == Integer.MAX_VALUE ? "n" : "1", relationType.getMultiplicity().asLimitLabel(
- relationSide));
-
- List<ArtifactType> allowedTypes = new ArrayList<ArtifactType>();
- for (String guid : artifactTypesAllowed) {
- ArtifactType type = artCache.getByGuid(guid);
- Assert.assertNotNull(type);
- allowedTypes.add(type);
- }
-
- for (ArtifactType artifactType : artCache.getAll()) {
- boolean result = relationType.isArtifactTypeAllowed(relationSide, artifactType);
- if (allowedTypes.contains(artifactType)) {
- Assert.assertTrue(String.format("ArtifactType [%s] was not allowed", artifactType), result);
- } else {
- Assert.assertFalse(String.format("ArtifactType [%s] was allowed even though it should not have been",
- artifactType), result);
- }
- }
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/RelationTypeCacheTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/RelationTypeCacheTest.java deleted file mode 100644 index cc80830ea07..00000000000 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/RelationTypeCacheTest.java +++ /dev/null @@ -1,163 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.test.types;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import junit.framework.Assert;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.enums.RelationSide;
-import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
-import org.eclipse.osee.framework.skynet.core.types.ArtifactTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.IOseeTypeFactory;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeFactory;
-import org.eclipse.osee.framework.skynet.core.types.RelationTypeCache;
-import org.junit.BeforeClass;
-
-/**
- * Low-level OseeTypeCache Test - This test does not require database access
- *
- * @author Roberto E. Escobar
- */
-public class RelationTypeCacheTest extends AbstractOseeCacheTest<RelationType> {
-
- private static List<RelationType> data;
- private static IOseeTypeFactory factory;
- private static RelationTypeCache cache;
- private static ArtifactTypeCache artCache;
-
- @BeforeClass
- public static void prepareTestData() throws OseeCoreException {
- factory = new OseeTypeFactory();
- data = new ArrayList<RelationType>();
- List<ArtifactType> artData = new ArrayList<ArtifactType>();
-
- ArtifactDataAccessor artAccessor = new ArtifactDataAccessor(artData);
- artCache = new ArtifactTypeCache(artAccessor);
-
- RelationDataAccessor relationAccessor = new RelationDataAccessor(artCache, data);
- cache = new RelationTypeCache(relationAccessor);
-
- cache.ensurePopulated();
- Assert.assertTrue(artAccessor.wasLoaded());
- Assert.assertTrue(relationAccessor.wasLoaded());
- }
-
- public RelationTypeCacheTest() {
- super(data, cache);
- }
-
- @org.junit.Test
- public void testRelationTypeSides() throws OseeCoreException {
- OseeTypesUtil.checkRelationTypeInheritance(cache, artCache, "1A", RelationSide.SIDE_A, 1, "111");
- OseeTypesUtil.checkRelationTypeInheritance(cache, artCache, "1A", RelationSide.SIDE_B, 1, "444", "555");
-
- OseeTypesUtil.checkRelationTypeInheritance(cache, artCache, "2B", RelationSide.SIDE_A, 1, "555");
- OseeTypesUtil.checkRelationTypeInheritance(cache, artCache, "2B", RelationSide.SIDE_B, Integer.MAX_VALUE, "000",
- "111", "222", "333", "444", "555", "666");
-
- OseeTypesUtil.checkRelationTypeInheritance(cache, artCache, "3C", RelationSide.SIDE_A, Integer.MAX_VALUE, "222",
- "333", "444", "555", "666");
- OseeTypesUtil.checkRelationTypeInheritance(cache, artCache, "3C", RelationSide.SIDE_B, 1, "333", "444", "555",
- "666");
-
- OseeTypesUtil.checkRelationTypeInheritance(cache, artCache, "4D", RelationSide.SIDE_A, Integer.MAX_VALUE, "666");
- OseeTypesUtil.checkRelationTypeInheritance(cache, artCache, "4D", RelationSide.SIDE_B, Integer.MAX_VALUE, "666");
- }
-
- @Override
- public void testDirty() throws OseeCoreException {
- }
-
- private final static class ArtifactDataAccessor extends OseeTestDataAccessor<ArtifactType> {
- private final List<ArtifactType> artifactTypes;
-
- public ArtifactDataAccessor(List<ArtifactType> artifactTypes) {
- super();
- this.artifactTypes = artifactTypes;
- }
-
- @Override
- public void load(AbstractOseeCache<ArtifactType> cache) throws OseeCoreException {
- super.load(cache);
- artifactTypes.add(factory.createArtifactType(cache, "000", true, "BaseArtifactType"));
- artifactTypes.add(factory.createArtifactType(cache, "111", true, "ArtifactType1"));
- artifactTypes.add(factory.createArtifactType(cache, "222", false, "ArtifactType2"));
- artifactTypes.add(factory.createArtifactType(cache, "333", true, "ArtifactType3"));
- artifactTypes.add(factory.createArtifactType(cache, "444", false, "ArtifactType4"));
- artifactTypes.add(factory.createArtifactType(cache, "555", true, "ArtifactType5"));
- artifactTypes.add(factory.createArtifactType(cache, "666", false, "ArtifactType6"));
- int typeId = 100;
- for (ArtifactType type : artifactTypes) {
- type.setId(typeId++);
- cache.cache(type);
- }
- ArtifactTypeCache artCache = (ArtifactTypeCache) cache;
- setUpArtifactTypeInheritance(artCache);
- }
-
- private void setUpArtifactTypeInheritance(ArtifactTypeCache cache) throws OseeCoreException {
- ArtifactType baseType = cache.getUniqueByName("BaseArtifactType");
-
- Set<ArtifactType> baseSuperType = new HashSet<ArtifactType>();
- baseSuperType.add(baseType);
- // 0<-1
- cache.cacheArtifactSuperType(cache.getByGuid("111"), baseSuperType);
- // 0<-2
- cache.cacheArtifactSuperType(cache.getByGuid("222"), baseSuperType);
- // 2<-3
- cache.cacheArtifactSuperType(cache.getByGuid("333"), Arrays.asList(cache.getByGuid("222")));
- // 2,3<-4
- cache.cacheArtifactSuperType(cache.getByGuid("444"), Arrays.asList(cache.getByGuid("222"),
- cache.getByGuid("333"), baseType));
- // 4<-5
- cache.cacheArtifactSuperType(cache.getByGuid("555"), Arrays.asList(cache.getByGuid("444"), baseType));
- // 3<-6
- cache.cacheArtifactSuperType(cache.getByGuid("666"), Arrays.asList(cache.getByGuid("333"), baseType));
- }
- }
-
- private final static class RelationDataAccessor extends OseeTestDataAccessor<RelationType> {
- private final List<RelationType> relationTypes;
- private final AbstractOseeCache<ArtifactType> artCache;
-
- public RelationDataAccessor(AbstractOseeCache<ArtifactType> artCache, List<RelationType> relationTypes) {
- super();
- this.artCache = artCache;
- this.relationTypes = relationTypes;
- }
-
- @Override
- public void load(AbstractOseeCache<RelationType> cache) throws OseeCoreException {
- artCache.ensurePopulated();
- super.load(cache);
- relationTypes.add(OseeTypesUtil.createRelationType(cache, artCache, factory, "1A", "REL_1", "111", "444",
- RelationTypeMultiplicity.ONE_TO_ONE));
- relationTypes.add(OseeTypesUtil.createRelationType(cache, artCache, factory, "2B", "REL_2", "555", "000",
- RelationTypeMultiplicity.ONE_TO_MANY));
- relationTypes.add(OseeTypesUtil.createRelationType(cache, artCache, factory, "3C", "REL_3", "222", "333",
- RelationTypeMultiplicity.MANY_TO_ONE));
- relationTypes.add(OseeTypesUtil.createRelationType(cache, artCache, factory, "4D", "REL_4", "666", "666",
- RelationTypeMultiplicity.MANY_TO_MANY));
- int typeId = 300;
- for (RelationType type : relationTypes) {
- type.setId(typeId++);
- cache.cache(type);
- }
- }
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/ShallowArtifactTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/ShallowArtifactTest.java index 189a612ebe6..5e0ab6c3828 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/ShallowArtifactTest.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/types/ShallowArtifactTest.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.framework.skynet.core.test.types;
-import org.eclipse.osee.framework.skynet.core.types.BranchCache;
+import org.eclipse.osee.framework.core.cache.BranchCache;
import org.junit.Test;
/**
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/util/FrameworkTestUtil.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/util/FrameworkTestUtil.java index 82c3767e0df..e95ec4562bd 100644 --- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/util/FrameworkTestUtil.java +++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/util/FrameworkTestUtil.java @@ -19,12 +19,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.enums.BranchArchivedState; import org.eclipse.osee.framework.core.enums.BranchControlled; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.exception.BranchDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; diff --git a/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF b/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF index 515317542cb..9cf23c7eab7 100644 --- a/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF +++ b/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF @@ -45,21 +45,21 @@ Export-Package: org.eclipse.osee.framework.skynet.core, org.eclipse.osee.framework.skynet.core.revision,
org.eclipse.osee.framework.skynet.core.transaction,
org.eclipse.osee.framework.skynet.core.types,
- org.eclipse.osee.framework.skynet.core.types.impl,
org.eclipse.osee.framework.skynet.core.utility,
org.eclipse.osee.framework.skynet.core.validation,
org.eclipse.osee.framework.skynet.core.word,
org.eclipse.osee.framework.ui.plugin.event
Bundle-Vendor: Eclipse.org
-DynamicImport-Package: *
Import-Package: org.eclipse.debug.core,
- org.eclipse.osee.framework.core,
+ org.eclipse.osee.framework.core.cache,
org.eclipse.osee.framework.core.client,
org.eclipse.osee.framework.core.client.server,
org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.exception,
+ org.eclipse.osee.framework.core.model,
org.eclipse.osee.framework.core.operation,
+ org.eclipse.osee.framework.core.services,
org.eclipse.osee.framework.core.util,
org.eclipse.osee.framework.logging
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeGroup.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeGroup.java index ea8f4ea8313..b30d2c26b94 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeGroup.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeGroup.java @@ -10,8 +10,8 @@ *******************************************************************************/
package org.eclipse.osee.framework.skynet.core;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeSystemArtifacts.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeSystemArtifacts.java index d772d07fb1d..d0f6b5992c8 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeSystemArtifacts.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeSystemArtifacts.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.framework.skynet.core; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java index c64480883e2..b98f4a34aa5 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java @@ -16,15 +16,15 @@ import java.io.StringReader; import java.io.StringWriter;
import java.util.Collection;
import java.util.HashSet;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.SystemUser;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.attribute.CoreAttributes;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java index 60330a904b6..6d9b8981cf6 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java @@ -18,18 +18,18 @@ import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.core.data.IOseeUser;
import org.eclipse.osee.framework.core.data.SystemUser;
import org.eclipse.osee.framework.core.enums.Active;
+import org.eclipse.osee.framework.core.enums.CoreArtifacts;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.UserInDatabaseMultipleTimes;
import org.eclipse.osee.framework.core.exception.UserNotInDatabase;
+import org.eclipse.osee.framework.core.model.ArtifactType;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.artifact.CoreArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java index 783b1658f7c..44f9f9f608a 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java @@ -17,14 +17,15 @@ import java.util.LinkedList; import java.util.List;
import java.util.Map;
import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.IAccessControllable;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.jdk.core.type.DoubleKeyHashMap;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
@@ -115,7 +116,7 @@ public class AccessControlManager implements IBranchEventListener, IArtifactsPur }
private static void populateBranchAccessControlList() throws OseeCoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(GET_ALL_BRANCH_ACCESS_CONTROL_LIST);
while (chStmt.next()) {
@@ -128,7 +129,8 @@ public class AccessControlManager implements IBranchEventListener, IArtifactsPur accessControlListCache.put(subjectId, branchAccessObject, permission);
objectToSubjectCache.put(branchAccessObject, subjectId);
- if (ArtifactTypeManager.getType(subjectArtifactTypeId).inheritsFrom("User Group")) {
+ ArtifactType toCheck = ArtifactTypeManager.getType("User Group");
+ if (ArtifactTypeManager.getType(subjectArtifactTypeId).inheritsFrom(toCheck)) {
populateGroupMembers(subjectId);
}
}
@@ -138,7 +140,7 @@ public class AccessControlManager implements IBranchEventListener, IArtifactsPur }
private static void populateArtifactAccessControlList() throws OseeCoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(GET_ALL_ARTIFACT_ACCESS_CONTROL_LIST);
@@ -156,7 +158,8 @@ public class AccessControlManager implements IBranchEventListener, IArtifactsPur AccessObject accessObject = ArtifactAccessObject.getArtifactAccessObject(objectId, branchId);
cacheAccessObject(objectId, subjectId, permission, accessObject);
- if (ArtifactTypeManager.getType(subjectArtifactTypeId).inheritsFrom("User Group")) {
+ ArtifactType toCheck = ArtifactTypeManager.getType("User Group");
+ if (ArtifactTypeManager.getType(subjectArtifactTypeId).inheritsFrom(toCheck)) {
populateGroupMembers(subjectId);
}
}
@@ -170,7 +173,7 @@ public class AccessControlManager implements IBranchEventListener, IArtifactsPur if (!groupToSubjectsCache.containsKey(groupId)) {
Integer groupMember;
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(USER_GROUP_MEMBERS, groupId, RelationTypeManager.getType("Users").getId());
@@ -357,12 +360,10 @@ public class AccessControlManager implements IBranchEventListener, IArtifactsPur if (data.isBirth()) {
ConnectionHandler.runPreparedUpdate(INSERT_INTO_ARTIFACT_ACL, artifactAccessObject.getArtId(),
- data.getPermission().getPermId(), data.getSubject().getArtId(),
- artifactAccessObject.getId());
+ data.getPermission().getPermId(), data.getSubject().getArtId(), artifactAccessObject.getId());
} else {
ConnectionHandler.runPreparedUpdate(UPDATE_ARTIFACT_ACL, data.getPermission().getPermId(),
- data.getSubject().getArtId(), artifactAccessObject.getArtId(),
- artifactAccessObject.getId());
+ data.getSubject().getArtId(), artifactAccessObject.getArtId(), artifactAccessObject.getId());
}
if (recurse) {
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessObject.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessObject.java index 176db52f815..644812c6907 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessObject.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessObject.java @@ -10,8 +10,8 @@ *******************************************************************************/
package org.eclipse.osee.framework.skynet.core.access;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
/**
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/BranchAccessObject.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/BranchAccessObject.java index 1e8a3f8d97f..d56c43749b6 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/BranchAccessObject.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/BranchAccessObject.java @@ -12,8 +12,8 @@ package org.eclipse.osee.framework.skynet.core.access; import java.util.HashMap;
import java.util.Map;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
/**
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java index 9e2544dbf9a..7001968ba5f 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java @@ -28,13 +28,13 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.IAccessControllable;
import org.eclipse.osee.framework.core.data.IOseeType;
+import org.eclipse.osee.framework.core.data.IRelationSorterId;
import org.eclipse.osee.framework.core.data.SystemUser;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.AttributeDoesNotExist;
@@ -46,6 +46,11 @@ import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.DbTransaction;
import org.eclipse.osee.framework.database.core.OseeConnection;
@@ -66,7 +71,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.annotation.ArtifactAnnota import org.eclipse.osee.framework.skynet.core.artifact.annotation.AttributeAnnotationManager;
import org.eclipse.osee.framework.skynet.core.artifact.annotation.IArtifactAnnotation;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.attribute.CoreAttributes;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
@@ -74,12 +78,9 @@ import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration; import org.eclipse.osee.framework.skynet.core.relation.IRelationEnumeration;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSide;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSideSorter;
-import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorterId;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
@@ -329,7 +330,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, IA * @throws OseeTypeDoesNotExist
*/
public boolean isOfType(String artifactTypeName) throws OseeCoreException {
- return artifactType.inheritsFrom(artifactTypeName);
+ return artifactType.inheritsFrom(ArtifactTypeManager.getType(artifactTypeName));
}
public boolean isOfType(IOseeType oseeType) throws OseeCoreException {
@@ -464,8 +465,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, IA @SuppressWarnings("unchecked")
private <T> Attribute<T> createAttribute(AttributeType attributeType) throws OseeCoreException {
Class<? extends Attribute<T>> attributeClass =
- (Class<? extends Attribute<T>>) attributeType.getBaseAttributeClass();
-
+ (Class<? extends Attribute<T>>) AttributeTypeManager.getAttributeBaseClass(attributeType);
try {
Attribute<T> attribute = attributeClass.newInstance();
attributes.put(attributeType.getName(), attribute);
@@ -1807,7 +1807,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, IA if (transactionId == null) {
return new Date();
}
- return transactionId.getDate();
+ return transactionId.getTimeStamp();
}
public User getLastModifiedBy() throws OseeCoreException {
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java index 8e71c771109..90f463ceaae 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java @@ -17,9 +17,10 @@ import java.util.HashSet; import java.util.List;
import java.util.Set;
import java.util.Map.Entry;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.Active;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.jdk.core.type.Pair;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactFactory.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactFactory.java index e4939127bf6..ba7682fc446 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactFactory.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactFactory.java @@ -13,12 +13,13 @@ package org.eclipse.osee.framework.skynet.core.artifact; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import org.eclipse.osee.framework.core.data.Branch; -import org.eclipse.osee.framework.core.data.TransactionRecord; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.model.ArtifactType; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.database.core.SequenceManager; /** diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java index 29c9179422c..1c5b3019fd6 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java @@ -21,13 +21,15 @@ import java.util.Random; import java.util.logging.Level;
import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.database.core.OseeSql;
import org.eclipse.osee.framework.database.core.SQL3DataType;
@@ -39,7 +41,6 @@ import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
@@ -112,7 +113,7 @@ public final class ArtifactLoader { public static List<Artifact> loadArtifactsFromQueryId(int queryId, ArtifactLoad loadLevel, ISearchConfirmer confirmer, int fetchSize, boolean reload, boolean historical, boolean allowDeleted) throws OseeCoreException {
List<Artifact> artifacts = new ArrayList<Artifact>(fetchSize);
try {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
String sql;
if (historical) {
@@ -274,7 +275,7 @@ public final class ArtifactLoader { * @param artifactCountEstimate
*/
public static void selectArtifacts(int queryId, CompositeKeyHashMap<Integer, Integer, Object[]> insertParameters, String sql, Object[] queryParameters, int artifactCountEstimate, TransactionRecord transactionId) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
long time = System.currentTimeMillis();
try {
@@ -301,7 +302,7 @@ public final class ArtifactLoader { Lib.getElapseString(time), insertParameters.size()), new Exception("Artifact Selection Time"));
}
- private static Artifact retrieveShallowArtifact(ConnectionHandlerStatement chStmt, boolean reload, boolean historical) throws OseeCoreException {
+ private static Artifact retrieveShallowArtifact(IOseeStatement chStmt, boolean reload, boolean historical) throws OseeCoreException {
int artifactId = chStmt.getInt("art_id");
Branch branch = BranchManager.getBranch(chStmt.getInt("branch_id"));
TransactionRecord transactionId = TransactionManager.getTransactionId(chStmt);
@@ -375,7 +376,7 @@ public final class ArtifactLoader { if (historical) {
return; // TODO: someday we might have a use for historical relations, but not now
}
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(artifacts.size() * 8, ClientSessionManager.getSql(OseeSql.LOAD_RELATIONS), queryId);
while (chStmt.next()) {
@@ -410,7 +411,7 @@ public final class ArtifactLoader { return;
}
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
if (historical) {
chStmt.runPreparedQuery(artifacts.size() * 8,
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactPersistenceManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactPersistenceManager.java index e6b18e69572..3c29b099cbf 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactPersistenceManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactPersistenceManager.java @@ -17,16 +17,16 @@ import java.util.Iterator; import java.util.LinkedList;
import java.util.List;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.TxChange;
import org.eclipse.osee.framework.core.exception.BranchDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
@@ -215,7 +215,7 @@ public class ArtifactPersistenceManager { TransactionManager.createNextTransactionId(BranchManager.getBranch(branchId), UserManager.getUser(), "");
long totalTime = System.currentTimeMillis();
//Get attribute Gammas
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(connection);
+ IOseeStatement chStmt = ConnectionHandler.getStatement(connection);
RevertAction revertAction = null;
try {
chStmt.runPreparedQuery(GET_GAMMAS_ATTRIBUTE_REVERT, branchId, attributeId);
@@ -243,7 +243,7 @@ public class ArtifactPersistenceManager { private static void revertRelationLink(OseeConnection connection, int branchId, int relLinkId, int aArtId, int bArtId) throws BranchDoesNotExist, OseeCoreException {
long time = System.currentTimeMillis();
long totalTime = time;
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(connection);
+ IOseeStatement chStmt = ConnectionHandler.getStatement(connection);
TransactionRecord transId =
TransactionManager.createNextTransactionId(BranchManager.getBranch(branchId), UserManager.getUser(), "");
@@ -268,7 +268,7 @@ public class ArtifactPersistenceManager { TransactionManager.createNextTransactionId(BranchManager.getBranch(branchId), UserManager.getUser(), "");
long totalTime = System.currentTimeMillis();
//Get attribute Gammas
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(connection);
+ IOseeStatement chStmt = ConnectionHandler.getStatement(connection);
try {
chStmt.runPreparedQuery(GET_GAMMAS_ARTIFACT_REVERT, branchId, artId, branchId, artId, artId, branchId, artId);
new RevertAction(connection, chStmt, transId).revertObject(totalTime, artId, "Artifact");
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTransactionData.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTransactionData.java index 212dacc37e0..ce5a7c7e59c 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTransactionData.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTransactionData.java @@ -11,9 +11,9 @@ package org.eclipse.osee.framework.skynet.core.artifact;
import java.util.Collection;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.OseeSql;
import org.eclipse.osee.framework.database.core.SequenceManager;
import org.eclipse.osee.framework.skynet.core.event.ArtifactModifiedEvent;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactType.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactType.java deleted file mode 100644 index 5d84169393e..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactType.java +++ /dev/null @@ -1,143 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Set;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.IOseeType;
-import org.eclipse.osee.framework.core.data.OseeField;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
-import org.eclipse.osee.framework.skynet.core.types.AbstractCachingType;
-import org.eclipse.osee.framework.skynet.core.types.ArtifactTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.field.ArtifactSuperTypeField;
-import org.eclipse.osee.framework.skynet.core.types.field.ArtifactTypeAttributesField;
-
-/**
- * @author Robert A. Fisher
- */
-public class ArtifactType extends AbstractCachingType implements Comparable<ArtifactType> {
- public static final String ARTIFACT_IS_ABSTRACT_FIELD_KEY = "osee.artifact.type.is.abstract.field";
- public static final String ARTIFACT_INHERITANCE_FIELD_KEY = "osee.artifact.type.inheritance.field";
- public static final String ARTIFACT_TYPE_ATTRIBUTES_FIELD_KEY = "osee.artifact.type.attributes.field";
-
- public ArtifactType(AbstractOseeCache<ArtifactType> cache, String guid, String name, boolean isAbstract) {
- super(cache, guid, name);
- setAbstract(isAbstract);
- }
-
- @Override
- protected void initializeFields() {
- addField(ARTIFACT_IS_ABSTRACT_FIELD_KEY, new OseeField<Boolean>());
- addField(ARTIFACT_INHERITANCE_FIELD_KEY, new ArtifactSuperTypeField(getCache(), this));
- addField(ARTIFACT_TYPE_ATTRIBUTES_FIELD_KEY, new ArtifactTypeAttributesField(getCache(), this));
- }
-
- @Override
- protected ArtifactTypeCache getCache() {
- return (ArtifactTypeCache) super.getCache();
- }
-
- public boolean hasSuperArtifactTypes() throws OseeCoreException {
- Collection<ArtifactType> superTypes = getSuperArtifactTypes();
- return superTypes != null && !superTypes.isEmpty();
- }
-
- public Collection<ArtifactType> getSuperArtifactTypes() {
- Collection<ArtifactType> defaultValue = Collections.emptyList();
- return getFieldValueLogException(defaultValue, ARTIFACT_INHERITANCE_FIELD_KEY);
- }
-
- public void setSuperType(Set<ArtifactType> superType) throws OseeCoreException {
- setField(ARTIFACT_INHERITANCE_FIELD_KEY, superType);
- }
-
- public Collection<ArtifactType> getFirstLevelDescendantTypes() throws OseeCoreException {
- return getCache().getDescendants(this, false);
- }
-
- public Collection<ArtifactType> getAllDescendantTypes() throws OseeCoreException {
- return getCache().getDescendants(this, true);
- }
-
- public void setAttributeTypeValidity(Collection<AttributeType> attributeTypes, Branch branch) throws OseeCoreException {
- setField(ARTIFACT_TYPE_ATTRIBUTES_FIELD_KEY, Collections.singletonMap(branch, attributeTypes));
- }
-
- public boolean isValidAttributeType(AttributeType attributeType, Branch branch) throws OseeCoreException {
- return getAttributeTypes(branch).contains(attributeType);
- }
-
- public Collection<AttributeType> getAttributeTypes(Branch branch) throws OseeCoreException {
- // Do not use ARTIFACT_TYPE_ATTRIBUTES_FIELD for this call since it must use branch inheritance to get all attribute types
- return getCache().getAttributeTypes(this, branch);
- }
-
- public boolean isAbstract() {
- return getFieldValueLogException(false, ARTIFACT_IS_ABSTRACT_FIELD_KEY);
- }
-
- public void setAbstract(boolean isAbstract) {
- setFieldLogException(ARTIFACT_IS_ABSTRACT_FIELD_KEY, isAbstract);
- }
-
- /**
- * Determines if this artifact type equals, or is a sub-type of,
- * the artifact type specified by the <code>otherType</code> parameter.
- *
- * @param otherType artifact type to check against
- * @return whether this artifact type inherits from otherType
- */
- public boolean inheritsFrom(IOseeType otherType) {
- if (this.equals(otherType)) {
- return true;
- }
- for (ArtifactType superType : getSuperArtifactTypes()) {
- if (superType.inheritsFrom(otherType)) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Determines if this artifact type equals, or is a sub-type of,
- * the artifact type specified by the <code>otherType</code> parameter.
- *
- * @param otherType artifact type to check against
- * @return whether this artifact type inherits from otherType
- * @throws OseeCoreException
- */
- public boolean inheritsFrom(String artifactTypeName) throws OseeCoreException {
- ArtifactType artifactType = getCache().getUniqueByName(artifactTypeName);
- if (artifactType == null) {
- throw new OseeTypeDoesNotExist("Artifact type [" + artifactTypeName + "] is not available.");
- }
- return inheritsFrom(artifactType);
- }
-
- @Override
- public String toString() {
- return getName();
- }
-
- public int compareTo(ArtifactType other) {
- int result = -1;
- if (other != null && other.getName() != null && getName() != null) {
- result = getName().compareTo(other.getName());
- }
- return result;
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java index 2f0ea13ba12..f88fbbf7b05 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java @@ -17,21 +17,23 @@ import java.util.HashMap; import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.cache.ArtifactTypeCache;
import org.eclipse.osee.framework.core.data.IOseeType;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.DbTransaction;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.skynet.core.artifact.factory.ArtifactFactoryManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeManager;
+import org.eclipse.osee.framework.skynet.core.internal.Activator;
/**
* Contains methods specific to artifact types. All artifact methods will eventually be moved from the
@@ -46,6 +48,10 @@ public class ArtifactTypeManager { private ArtifactTypeManager() {
}
+ public static ArtifactTypeCache getCache() {
+ return Activator.getInstance().getOseeCacheService().getArtifactTypeCache();
+ }
+
public static Collection<ArtifactType> getArtifactTypesFromAttributeType(AttributeType attributeType, Branch branch) throws OseeCoreException {
List<ArtifactType> artifactTypes = new ArrayList<ArtifactType>();
for (ArtifactType artifactType : getAllTypes()) {
@@ -79,11 +85,11 @@ public class ArtifactTypeManager { * @throws OseeCoreException
*/
public static Collection<ArtifactType> getAllTypes() throws OseeCoreException {
- return OseeTypeManager.getCache().getArtifactTypeCache().getAll();
+ return getCache().getAll();
}
public static boolean typeExists(String name) throws OseeCoreException {
- return !OseeTypeManager.getCache().getArtifactTypeCache().getByName(name).isEmpty();
+ return !getCache().getByName(name).isEmpty();
}
/**
@@ -96,7 +102,7 @@ public class ArtifactTypeManager { if (!GUID.isValid(guid)) {
throw new OseeArgumentException(String.format("[%s] is not a valid guid", guid));
}
- ArtifactType artifactType = OseeTypeManager.getCache().getArtifactTypeCache().getByGuid(guid);
+ ArtifactType artifactType = getCache().getByGuid(guid);
if (artifactType == null) {
throw new OseeTypeDoesNotExist("Artifact type [" + guid + "] is not available.");
}
@@ -110,7 +116,7 @@ public class ArtifactTypeManager { * @throws OseeTypeDoesNotExist
*/
public static ArtifactType getType(String name) throws OseeCoreException {
- ArtifactType artifactType = OseeTypeManager.getCache().getArtifactTypeCache().getUniqueByName(name);
+ ArtifactType artifactType = getCache().getUniqueByName(name);
if (artifactType == null) {
throw new OseeTypeDoesNotExist("Artifact type [" + name + "] is not available.");
}
@@ -142,7 +148,7 @@ public class ArtifactTypeManager { * @throws OseeTypeDoesNotExist
*/
public static ArtifactType getType(int artTypeId) throws OseeCoreException {
- ArtifactType artifactType = OseeTypeManager.getCache().getArtifactTypeCache().getById(artTypeId);
+ ArtifactType artifactType = getCache().getById(artTypeId);
if (artifactType == null) {
throw new OseeTypeDoesNotExist("Atrifact type: " + artTypeId + " is not available.");
}
@@ -269,12 +275,8 @@ public class ArtifactTypeManager { }
}
- public static ArtifactType createType(String guid, boolean isAbstract, String artifactTypeName) throws OseeCoreException {
- return OseeTypeManager.getCache().getArtifactTypeCache().createType(guid, isAbstract, artifactTypeName);
- }
-
public static void persist() throws OseeCoreException {
- OseeTypeManager.getCache().getArtifactTypeCache().storeAllModified();
+ getCache().storeAllModified();
}
/**
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Attribute.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Attribute.java index f4e2259ae5a..a28d4269c17 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Attribute.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Attribute.java @@ -21,11 +21,12 @@ import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.database.core.DbTransaction;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
+import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.attribute.providers.IAttributeDataProvider;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
@@ -48,8 +49,10 @@ public abstract class Attribute<T> { this.modificationType = modificationType;
try {
+ Class<? extends IAttributeDataProvider> providerClass =
+ AttributeTypeManager.getAttributeProviderClass(attributeType);
Constructor<? extends IAttributeDataProvider> providerConstructor =
- attributeType.getProviderAttributeClass().getConstructor(new Class[] {Attribute.class});
+ providerClass.getConstructor(new Class[] {Attribute.class});
attributeDataProvider = providerConstructor.newInstance(new Object[] {this});
} catch (Exception ex) {
throw new OseeWrappedException(ex);
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java index 381f8b899cc..6e5455b485c 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java @@ -26,17 +26,19 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.jobs.IJobChangeListener;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.cache.BranchCache;
import org.eclipse.osee.framework.core.data.SystemUser;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
import org.eclipse.osee.framework.core.enums.BranchControlled;
import org.eclipse.osee.framework.core.enums.BranchType;
+import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.exception.BranchDoesNotExist;
import org.eclipse.osee.framework.core.exception.MultipleBranchesExist;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.database.core.SQL3DataType;
@@ -54,8 +56,6 @@ import org.eclipse.osee.framework.skynet.core.commit.actions.CommitAction; import org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-import org.eclipse.osee.framework.skynet.core.types.BranchCache;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeManager;
/**
* Provides access to all branches as well as support for creating branches of all types
@@ -81,6 +81,10 @@ public class BranchManager { return instance;
}
+ public static BranchCache getCache() {
+ return Activator.getInstance().getOseeCacheService().getBranchCache();
+ }
+
public static Set<Branch> getAssociatedArtifactBranches(Artifact associatedArtifact, boolean includeArchived, boolean includeDeleted) throws OseeCoreException {
Set<Branch> branches = new HashSet<Branch>();
Set<Branch> branchesToCheck = new HashSet<Branch>(getNormalBranches());
@@ -98,7 +102,7 @@ public class BranchManager { }
public static Branch getCommonBranch() throws OseeCoreException {
- return OseeTypeManager.getBranchCache().getCommonBranch();
+ return getCache().getCommonBranch();
}
/**
@@ -129,7 +133,7 @@ public class BranchManager { public static List<Branch> getBranches(BranchArchivedState archivedState, BranchControlled branchControlled, BranchType... branchTypes) throws OseeCoreException {
List<Branch> branches = new ArrayList<Branch>(1000);
- for (Branch branch : OseeTypeManager.getBranchCache().getAll()) {
+ for (Branch branch : getCache().getAll()) {
if (branch.getArchiveState().matches(archivedState) && //
BranchControlled.fromBoolean(isChangeManaged(branch)).matches(branchControlled) && //
branch.getBranchType().isOfType(branchTypes)) {
@@ -139,8 +143,20 @@ public class BranchManager { return branches;
}
+ public static Collection<Branch> getWorkingBranches(Branch parentBranch) throws OseeCoreException {
+ List<Branch> branches = new ArrayList<Branch>(500);
+ for (Branch branch : getCache().getAll()) {
+ if (branch.getArchiveState().isUnArchived() && //
+ branch.getBranchType().isOfType(BranchType.WORKING) && //
+ parentBranch.equals(branch.getParentBranch())) {
+ branches.add(branch);
+ }
+ }
+ return branches;
+ }
+
public static void refreshBranches() throws OseeCoreException {
- OseeTypeManager.getBranchCache().reloadCache();
+ getCache().reloadCache();
}
public static Branch getBranch(String branchName) throws OseeCoreException {
@@ -155,14 +171,14 @@ public class BranchManager { }
public static Collection<Branch> getBranchesByName(String branchName) throws OseeCoreException {
- return OseeTypeManager.getBranchCache().getByName(branchName);
+ return getCache().getByName(branchName);
}
public static Branch getBranchByGuid(String guid) throws OseeCoreException {
if (!GUID.isValid(guid)) {
throw new OseeArgumentException(String.format("[%s] is not a valid guid", guid));
}
- Branch branch = OseeTypeManager.getBranchCache().getByGuid(guid);
+ Branch branch = getCache().getByGuid(guid);
if (branch == null) {
throw new BranchDoesNotExist(String.format("Branch with guid [%s] does not exist", guid));
}
@@ -177,7 +193,7 @@ public class BranchManager { * returns the merge branch for this source destination pair from the cache or null if not found
*/
public static Branch getMergeBranch(Branch sourceBranch, Branch destinationBranch) throws OseeCoreException {
- return OseeTypeManager.getBranchCache().getMergeBranch(sourceBranch, destinationBranch);
+ return getCache().getMergeBranch(sourceBranch, destinationBranch);
}
public static boolean isMergeBranch(Branch sourceBranch, Branch destBranch) throws OseeCoreException {
@@ -196,7 +212,7 @@ public class BranchManager { Branch mergeBranch = getMergeBranch(sourceBranch, destBranch);
if (mergeBranch == null) {
mergeBranch = createMergeBranch(sourceBranch, destBranch, expectedArtIds);
- OseeTypeManager.getBranchCache().cacheMergeBranch(mergeBranch, sourceBranch, destBranch);
+ getCache().cacheMergeBranch(mergeBranch, sourceBranch, destBranch);
} else {
UpdateMergeBranch dbTransaction = new UpdateMergeBranch(mergeBranch, expectedArtIds, destBranch, sourceBranch);
dbTransaction.execute();
@@ -246,7 +262,7 @@ public class BranchManager { throw new BranchDoesNotExist("Branch Id is null");
}
- BranchCache cache = OseeTypeManager.getBranchCache();
+ BranchCache cache = getCache();
// If someone else made a branch on another machine, we may not know about it
// so refresh the cache.
if (cache.getById(branchId) == null) {
@@ -502,15 +518,15 @@ public class BranchManager { }
public static Branch getSystemRootBranch() throws OseeCoreException {
- return OseeTypeManager.getBranchCache().getSystemRootBranch();
+ return getCache().getSystemRootBranch();
}
public static void persist(Branch... branches) throws OseeCoreException {
- OseeTypeManager.getBranchCache().storeItems(Arrays.asList(branches));
+ getCache().storeItems(Arrays.asList(branches));
}
public static void persist(Collection<Branch> branches) throws OseeCoreException {
- OseeTypeManager.getBranchCache().storeItems(branches);
+ getCache().storeItems(branches);
}
public static String toFileName(Branch branch) throws OseeCoreException {
@@ -518,15 +534,15 @@ public class BranchManager { }
public static Branch fromFileName(String fileName) throws OseeCoreException {
- return BranchUtility.fromFileName(OseeTypeManager.getBranchCache(), fileName);
+ return BranchUtility.fromFileName(getCache(), fileName);
}
public static Branch getKeyedBranch(String alias) throws OseeCoreException {
- return OseeTypeManager.getBranchCache().getUniqueByAlias(alias);
+ return getCache().getUniqueByAlias(alias);
}
public static void decache(Branch branch) throws OseeCoreException {
- OseeTypeManager.getBranchCache().decache(branch);
+ getCache().decache(branch);
}
public static boolean hasChanges(Branch branch) throws OseeCoreException {
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchUtility.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchUtility.java index 7350cfd1cde..76910f68934 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchUtility.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchUtility.java @@ -14,12 +14,12 @@ package org.eclipse.osee.framework.skynet.core.artifact; import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.cache.AbstractOseeCache;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java index 03b3a1feb05..d2e89a8adea 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java @@ -19,8 +19,9 @@ import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/CoreArtifacts.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/CoreArtifacts.java deleted file mode 100644 index 8052cad8316..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/CoreArtifacts.java +++ /dev/null @@ -1,48 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.artifact; - -import org.eclipse.osee.framework.core.data.IOseeType; - -/** - * @author Ryan D. Brooks - */ -public enum CoreArtifacts implements IOseeType { - AbstractSoftwareRequirement("Abstract Software Requirement", "ABNAYPwV6H4EkjQ3+QQA"), - AbstractTestResult("Abstract Test Result", "ATkaanWmHH3PkhGNVjwA"), - CodeUnit("Code Unit", "AAMFDkEh216dzK1mTZgA"), - IndirectSoftwareRequirement("Indirect Software Requirement", "AAMFDiC7HRQMqr5S0QwA"), - Requirement("Requirement", "ABM_vxEEowY+8i2_q9gA"), - SoftwareRequirementDrawing("Software Requirement Drawing", "ABNClhgUfwj6A3EAArQA"), - SubsystemRequirement("Subsystem Requirement", "AAMFDiN9KiAkhuLqOhQA"), - TestUnit("Test Unit", "ABM2d6uxUw66aSdo0LwA"), - TestPlanElement("Test Plan Element", "ATi_kUpvPBiW2upYC_wA"), - TestProcedure("Test Procedure", "AAMFDjsjiGhoWpqM4PQA"), - TestResultWML("Test Result WML", "ATk6NKFFmD_zg1b_eaQA"), - TestResultNative("Test Result Native", "ATkaanWmHH3PkhGNVjwA"), - User("User", "AAMFDhmr+Dqqe5pn3kAA"); - - private final String name; - private final String guid; - - private CoreArtifacts(String name, String guid) { - this.name = name; - this.guid = guid; - } - - public String getName() { - return this.name; - } - - public String getGuid() { - return guid; - } -} diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/CoreBranches.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/CoreBranches.java deleted file mode 100644 index 1ae93bbc496..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/CoreBranches.java +++ /dev/null @@ -1,37 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.artifact;
-
-import org.eclipse.osee.framework.core.data.IOseeType;
-
-/**
- * @author Roberto E. Escobar
- */
-public enum CoreBranches implements IOseeType {
- COMMON("Common", "AyH_fDpMERA+zDfML4gA"),
- SYSTEM_ROOT("System Root Branch", "AyH_fDnM2RFEhyybolQA");
-
- private final String name;
- private final String guid;
-
- private CoreBranches(String name, String guid) {
- this.name = name;
- this.guid = guid;
- }
-
- public String getName() {
- return this.name;
- }
-
- public String getGuid() {
- return guid;
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/DeleteBranchOperation.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/DeleteBranchOperation.java index e5515591bf0..3f5fd24d137 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/DeleteBranchOperation.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/DeleteBranchOperation.java @@ -12,9 +12,9 @@ package org.eclipse.osee.framework.skynet.core.artifact;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
import org.eclipse.osee.framework.core.enums.BranchState;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpBranchCreation.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpBranchCreation.java index 936451cace1..1654e39ab85 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpBranchCreation.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpBranchCreation.java @@ -15,11 +15,11 @@ import java.util.HashMap; import java.util.Map;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.core.client.server.HttpUrlBuilder;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.OseeServerContext;
import org.eclipse.osee.framework.core.data.SystemUser;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.HttpProcessor;
import org.eclipse.osee.framework.jdk.core.util.Strings;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpChangeDataRequester.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpChangeDataRequester.java index 577e72754f2..8bf22de54ec 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpChangeDataRequester.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpChangeDataRequester.java @@ -8,26 +8,26 @@ package org.eclipse.osee.framework.skynet.core.artifact; import java.util.HashMap;
import java.util.Map;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.ChangeReportRequestData;
-import org.eclipse.osee.framework.core.data.ChangeReportResponseData;
+import org.eclipse.osee.framework.core.data.ChangeReportRequest;
+import org.eclipse.osee.framework.core.data.ChangeReportResponse;
import org.eclipse.osee.framework.core.data.OseeServerContext;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.Function;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
/**
* @author Jeff C. Phillips
*/
public class HttpChangeDataRequester {
- public static ChangeReportResponseData getChanges(TransactionRecord toTransactionRecord, TransactionRecord fromTransactionRecord, IProgressMonitor monitor, boolean isHistorical) throws OseeCoreException {
+ public static ChangeReportResponse getChanges(TransactionRecord toTransactionRecord, TransactionRecord fromTransactionRecord, IProgressMonitor monitor, boolean isHistorical) throws OseeCoreException {
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("function", Function.CHANGE_REPORT.name());
- ChangeReportRequestData requestData =
- new ChangeReportRequestData(toTransactionRecord, fromTransactionRecord, isHistorical);
- ChangeReportResponseData response =
- HttpMessage.send(OseeServerContext.BRANCH_CONTEXT, parameters, requestData, ChangeReportResponseData.class);
+ ChangeReportRequest requestData =
+ new ChangeReportRequest(toTransactionRecord, fromTransactionRecord, isHistorical);
+ ChangeReportResponse response =
+ HttpMessage.send(OseeServerContext.BRANCH_CONTEXT, parameters, requestData, ChangeReportResponse.class);
if (response.wasSuccessful()) {
//OseeEventManager.kickBranchEvent(HttpBranchCreation.class, , branch.getId());
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpCommitDataRequester.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpCommitDataRequester.java index d76e2b6db66..c182c1da047 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpCommitDataRequester.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpCommitDataRequester.java @@ -13,12 +13,13 @@ package org.eclipse.osee.framework.skynet.core.artifact; import java.util.HashMap;
import java.util.Map;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.BranchCommitData;
-import org.eclipse.osee.framework.core.data.CommitTransactionRecordResponse;
+import org.eclipse.osee.framework.core.data.BranchCommitRequest;
+import org.eclipse.osee.framework.core.data.BranchCommitResponse;
import org.eclipse.osee.framework.core.data.OseeServerContext;
import org.eclipse.osee.framework.core.enums.Function;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.event.BranchEventType;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
@@ -37,21 +38,21 @@ public class HttpCommitDataRequester { Map<String, String> parameters = new HashMap<String, String>();
parameters.put("function", Function.BRANCH_COMMIT.name());
- BranchCommitData requestData = new BranchCommitData(user, sourceBranch, destinationBranch, isArchiveAllowed);
+ BranchCommitRequest requestData = new BranchCommitRequest(user, sourceBranch, destinationBranch, isArchiveAllowed);
- CommitTransactionRecordResponse response =
+ BranchCommitResponse response =
HttpMessage.send(OseeServerContext.BRANCH_CONTEXT, parameters, requestData,
- CommitTransactionRecordResponse.class);
+ BranchCommitResponse.class);
- int newTransactionNumber = response.getTransactionNumber();
+ TransactionRecord newTransaction = response.getTransaction();
// Update commit artifact cache with new information
if (sourceBranch.getAssociatedArtifact().getArtId() > 0) {
TransactionManager.cacheCommittedArtifactTransaction((IArtifact) sourceBranch.getAssociatedArtifact(),
- TransactionManager.getTransactionId(newTransactionNumber));
+ newTransaction);
}
// reload the committed artifacts since the commit changed them on the destination branch
- Object[] queryData = new Object[] {newTransactionNumber, newTransactionNumber};
+ Object[] queryData = new Object[] {newTransaction.getId(), newTransaction.getId()};
ArtifactLoader.getArtifacts(ARTIFACT_CHANGES, queryData, 400, ArtifactLoad.FULL, true, null, true);
// Kick commit event
OseeEventManager.kickBranchEvent(HttpCommitDataRequester.class, BranchEventType.Committed, sourceBranch.getId());
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpMessage.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpMessage.java index 39cfca4e587..cc3fec0b053 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpMessage.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpMessage.java @@ -15,9 +15,10 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream;
import java.net.URL;
import java.util.Map;
-import org.eclipse.osee.framework.core.IDataTranslationService;
+import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.core.client.server.HttpUrlBuilder;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.services.IDataTranslationService;
import org.eclipse.osee.framework.jdk.core.util.HttpProcessor;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.HttpProcessor.AcquireResult;
@@ -33,6 +34,7 @@ public class HttpMessage { @SuppressWarnings("unchecked")
public static <J, K> J send(String context, Map<String, String> parameters, K requestData, Class<J> clazzResponse) throws OseeCoreException {
+ parameters.put("sessionId", ClientSessionManager.getSessionId());
String urlString = HttpUrlBuilder.getInstance().getOsgiServletServiceUrl(context, parameters);
InputStream inputStream = null;
try {
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/IBranchProvider.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/IBranchProvider.java index 7a7423cf812..7195addfcb8 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/IBranchProvider.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/IBranchProvider.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.skynet.core.artifact;
-import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; /**
* @author Theron Virgin
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/IDefaultInitialBranchesProvider.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/IDefaultInitialBranchesProvider.java index 3a6be60152d..1b0add4fc39 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/IDefaultInitialBranchesProvider.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/IDefaultInitialBranchesProvider.java @@ -11,8 +11,8 @@ package org.eclipse.osee.framework.skynet.core.artifact; import java.util.Collection; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; /** * @author Robert A. Fisher diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeBranchOperation.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeBranchOperation.java index 225bc29f4b7..789f9101762 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeBranchOperation.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeBranchOperation.java @@ -15,20 +15,19 @@ import java.util.ArrayList; import java.util.List;
import java.util.logging.Level;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.AbstractDbTxOperation;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.event.BranchEventType;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
-import org.eclipse.osee.framework.skynet.core.types.impl.BranchStoreOperation;
/**
* @author Jeff C. Phillips
@@ -66,7 +65,7 @@ public class PurgeBranchOperation extends AbstractDbTxOperation { * @param branch
*/
public PurgeBranchOperation(Branch branch) {
- super(String.format("Purge Branch: [(%s)-%s]", branch.getId(), branch.getShortName()), Activator.PLUGIN_ID);
+ super(null, String.format("Purge Branch: [(%s)-%s]", branch.getId(), branch.getShortName()), Activator.PLUGIN_ID);
this.branch = branch;
this.sourceTableName = branch.getArchiveState().isArchived() ? "osee_txs_archived" : "osee_txs";
}
@@ -139,7 +138,7 @@ public class PurgeBranchOperation extends AbstractDbTxOperation { }
private void findDeleteableGammas(String sourceTableName, String columnName, double percentage) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(connection);
+ IOseeStatement chStmt = ConnectionHandler.getStatement(connection);
String sql =
String.format(SELECT_DELETABLE_GAMMAS, columnName, sourceTableName,
TransactionDetailsType.NonBaselined.getId(), columnName, columnName);
@@ -157,7 +156,7 @@ public class PurgeBranchOperation extends AbstractDbTxOperation { private void purgeAddressing(double percentage) throws OseeDataStoreException {
monitor.setTaskName("Purge txs addressing");
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(connection);
+ IOseeStatement chStmt = ConnectionHandler.getStatement(connection);
List<Object[]> addressing = new ArrayList<Object[]>();
String sql = String.format(SELECT_ADDRESSING_BY_BRANCH, sourceTableName);
@@ -170,7 +169,7 @@ public class PurgeBranchOperation extends AbstractDbTxOperation { chStmt.close();
}
- sql = String.format(BranchStoreOperation.DELETE_ADDRESSING, sourceTableName);
+ sql = String.format("delete from %s where transaction_id = ? and gamma_id = ?", sourceTableName);
ConnectionHandler.runBatchUpdate(connection, sql, addressing);
monitor.worked(calculateWork(percentage));
}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeDbTransaction.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeDbTransaction.java index 188eea96939..65310a5b490 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeDbTransaction.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeDbTransaction.java @@ -15,10 +15,10 @@ import java.util.ArrayList; import java.util.Collection;
import java.util.List;
import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.DbTransaction;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.database.core.SQL3DataType;
@@ -83,7 +83,7 @@ public class PurgeDbTransaction extends DbTransaction { }
if (batchParameters.size() > 0) {
ArtifactLoader.insertIntoArtifactJoin(connection, batchParameters);
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(connection);
+ IOseeStatement chStmt = ConnectionHandler.getStatement(connection);
try {
chStmt.runPreparedQuery(COUNT_ARTIFACT_VIOLATIONS, queryId);
boolean failed = false;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionJob.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionJob.java index 50b46cd5cd4..48a6132fcbd 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionJob.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionJob.java @@ -19,14 +19,14 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
import org.eclipse.osee.framework.core.exception.TransactionDoesNotExist;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.DbTransaction;
import org.eclipse.osee.framework.database.core.JoinUtility;
import org.eclipse.osee.framework.database.core.OseeConnection;
@@ -222,7 +222,7 @@ public class PurgeTransactionJob extends Job { }
private void populateJoinQueryFromSql(OseeConnection connection, TransactionJoinQuery joinQuery, String sql, String txFieldName, Object... data) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(connection);
+ IOseeStatement chStmt = ConnectionHandler.getStatement(connection);
try {
chStmt.runPreparedQuery(sql, data);
while (chStmt.next()) {
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/RevertAction.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/RevertAction.java index a38a9ea7afb..515574d9438 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/RevertAction.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/RevertAction.java @@ -14,13 +14,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.eclipse.core.runtime.Platform; -import org.eclipse.osee.framework.core.data.TransactionRecord; import org.eclipse.osee.framework.core.enums.TransactionDetailsType; import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.database.core.ConnectionHandler; -import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement; +import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.database.core.OseeConnection; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.Lib; @@ -55,11 +55,11 @@ public class RevertAction { List<Integer> transactionIds = new ArrayList<Integer>(); private OseeConnection connection; - private ConnectionHandlerStatement chStmt; + private IOseeStatement chStmt; private TransactionRecord transId; private String objectReverted; - public RevertAction(OseeConnection connection, ConnectionHandlerStatement chStmt, TransactionRecord transId) { + public RevertAction(OseeConnection connection, IOseeStatement chStmt, TransactionRecord transId) { this.connection = connection; this.chStmt = chStmt; this.transId = transId; @@ -168,7 +168,7 @@ public class RevertAction { } private void updateArtifactVersionTxCurrents(int branchId, int artId) throws OseeDataStoreException { - ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(connection); + IOseeStatement chStmt = ConnectionHandler.getStatement(connection); if (DEBUG) { try { chStmt.runPreparedQuery(REVERT_ARTIFACT_VERSION_CURRENT_SELECT, artId, branchId, artId); diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/StaticIdManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/StaticIdManager.java index 6d63bf4215c..aef2f5ad7f3 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/StaticIdManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/StaticIdManager.java @@ -15,10 +15,10 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.logging.Level; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.internal.Activator; diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UniversalGroup.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UniversalGroup.java index 3abe09969d7..e00dcb9a330 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UniversalGroup.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UniversalGroup.java @@ -14,9 +14,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; import java.util.logging.Level; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java index 09d95ec26d9..f4b04a161c0 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java @@ -23,14 +23,14 @@ import java.util.LinkedList; import java.util.List;
import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
import org.eclipse.osee.framework.core.enums.TxChange;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.DbTransaction;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.database.core.OseeSql;
@@ -197,7 +197,7 @@ public class UpdateMergeBranch extends DbTransaction { Collection<Integer> artSet = new HashSet<Integer>();
long time = System.currentTimeMillis();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(ClientSessionManager.getSql(OseeSql.MERGE_GET_ARTIFACTS_FOR_BRANCH),
branch.getId());
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/ArtifactFactoryManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/ArtifactFactoryManager.java index 8ebe75f03b1..6772133c303 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/ArtifactFactoryManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/ArtifactFactoryManager.java @@ -16,10 +16,10 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.ArtifactType; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.ExtensionDefinedObjects; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; import org.eclipse.osee.framework.skynet.core.internal.Activator; /** diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/DefaultArtifactFactory.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/DefaultArtifactFactory.java index ef9353be680..a06a387e2c0 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/DefaultArtifactFactory.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/DefaultArtifactFactory.java @@ -10,11 +10,11 @@ *******************************************************************************/
package org.eclipse.osee.framework.skynet.core.artifact.factory;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
/**
* This artifact factory is used when no other ArtifactFactory has registered itself as being responsible. This is the
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/UserArtifactFactory.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/UserArtifactFactory.java index 00ad719fb27..46f2e72fea2 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/UserArtifactFactory.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/UserArtifactFactory.java @@ -13,17 +13,17 @@ package org.eclipse.osee.framework.skynet.core.artifact.factory; import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.enums.CoreArtifacts;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
-import org.eclipse.osee.framework.skynet.core.artifact.CoreArtifacts;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
/**
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/ArtifactOperation.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/ArtifactOperation.java index 1648313aae7..2a9dcced134 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/ArtifactOperation.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/ArtifactOperation.java @@ -12,11 +12,11 @@ package org.eclipse.osee.framework.skynet.core.artifact.operation; import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
/**
* @author Ryan D. Brooks
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/FinishUpdateBranchOperation.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/FinishUpdateBranchOperation.java index 9260e09cf9f..fe171eea71f 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/FinishUpdateBranchOperation.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/FinishUpdateBranchOperation.java @@ -12,9 +12,9 @@ package org.eclipse.osee.framework.skynet.core.artifact.operation; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.IBasicArtifact;
import org.eclipse.osee.framework.core.enums.BranchState;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/UpdateBranchOperation.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/UpdateBranchOperation.java index baac16c36d1..4aa5de11b9d 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/UpdateBranchOperation.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/UpdateBranchOperation.java @@ -12,10 +12,10 @@ package org.eclipse.osee.framework.skynet.core.artifact.operation; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.SystemUser;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.jdk.core.util.Lib;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ActiveArtifactTypeSearch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ActiveArtifactTypeSearch.java index 6166de0c83f..ba242b7403d 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ActiveArtifactTypeSearch.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ActiveArtifactTypeSearch.java @@ -14,9 +14,9 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; import java.util.logging.Level; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.internal.Activator; diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactHridSearch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactHridSearch.java index 26fe7571b82..46df7aa6c4d 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactHridSearch.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactHridSearch.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.skynet.core.artifact.search; import static org.eclipse.osee.framework.skynet.core.artifact.search.DeprecatedOperator.EQUAL;
import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatabase.ARTIFACT_TABLE;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
/**
* @author Robert A. Fisher
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactIdSearch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactIdSearch.java index 1aadce54044..ac617ac250e 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactIdSearch.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactIdSearch.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.skynet.core.artifact.search; import static org.eclipse.osee.framework.skynet.core.artifact.search.DeprecatedOperator.EQUAL;
import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatabase.ARTIFACT_TABLE;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
/**
* @author Donald G. Dunne
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactInTransactionSearch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactInTransactionSearch.java index 5f963cac486..ba2d65aa8a0 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactInTransactionSearch.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactInTransactionSearch.java @@ -14,9 +14,9 @@ import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatab import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatabase.TRANSACTIONS_TABLE; import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatabase.TRANSACTION_DETAIL_TABLE; import java.util.List; -import org.eclipse.osee.framework.core.data.Branch; -import org.eclipse.osee.framework.core.data.TransactionRecord; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; /** diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java index ed2f9d322e9..a6ea0a0dbbc 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java @@ -17,24 +17,24 @@ import java.util.Collections; import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.IOseeType;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactLoad;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactLoader;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
/**
* @author Ryan D. Brooks
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryBuilder.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryBuilder.java index 9f44d43e775..4c8c83b1105 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryBuilder.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryBuilder.java @@ -16,15 +16,16 @@ import java.util.Collection; import java.util.HashMap;
import java.util.List;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.TxChange;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeSql;
import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap;
import org.eclipse.osee.framework.jdk.core.util.Collections;
@@ -32,7 +33,6 @@ import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactLoad;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactLoader;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ISearchConfirmer;
/**
@@ -437,7 +437,7 @@ public class ArtifactQueryBuilder { }
public List<Integer> selectArtifacts(int artifactCountEstimate) throws OseeCoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
List<Integer> artifactIds = new ArrayList<Integer>(artifactCountEstimate);
try {
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactTypeSearch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactTypeSearch.java index cf27a05f5d6..13e9b2e42bc 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactTypeSearch.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactTypeSearch.java @@ -14,7 +14,7 @@ import static org.eclipse.osee.framework.skynet.core.artifact.search.DeprecatedO import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatabase.ARTIFACT_TABLE;
import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatabase.ARTIFACT_TYPE_TABLE;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
/**
* @author Robert A. Fisher
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeCriteria.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeCriteria.java index 0a094f802db..5b0b16f0975 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeCriteria.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeCriteria.java @@ -14,10 +14,10 @@ import java.util.Collection; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.database.core.JoinUtility;
import org.eclipse.osee.framework.database.core.JoinUtility.AttributeJoinQuery;
import org.eclipse.osee.framework.jdk.core.util.Collections;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
/**
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java index dc90af59d5d..9c19891f7af 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java @@ -16,7 +16,7 @@ import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatab import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatabase.TRANSACTIONS_TABLE;
import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatabase.TRANSACTION_DETAIL_TABLE;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
/**
* @author Robert A. Fisher
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/CommittingArtifactSearch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/CommittingArtifactSearch.java index 96e3a974f99..91f7258e4a9 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/CommittingArtifactSearch.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/CommittingArtifactSearch.java @@ -14,7 +14,7 @@ import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatab import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatabase.TRANSACTIONS_TABLE; import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatabase.TRANSACTION_DETAIL_TABLE; import java.util.List; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; /** * Searches for artifacts used as the Control Management artifact of any commit involving a supplied artifact. diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ConflictingArtifactSearch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ConflictingArtifactSearch.java index 811a04d1ef6..8b2dec2e803 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ConflictingArtifactSearch.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ConflictingArtifactSearch.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.artifact.search; import java.util.List;
import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/FromArtifactsSearch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/FromArtifactsSearch.java index ce59ae0884d..d78c7644cac 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/FromArtifactsSearch.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/FromArtifactsSearch.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.skynet.core.artifact.search; import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatabase.ARTIFACT_TABLE; import java.util.ArrayList; import java.util.List; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManager; import org.w3c.dom.Document; diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/HttpArtifactQuery.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/HttpArtifactQuery.java index 0ea6c0ee965..3399f5065cb 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/HttpArtifactQuery.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/HttpArtifactQuery.java @@ -22,11 +22,11 @@ import java.util.List; import java.util.Map;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.core.client.server.HttpUrlBuilder;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.OseeServerContext;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.JoinUtility;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.jdk.core.type.Pair;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ISearchPrimitive.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ISearchPrimitive.java index 662f811401a..00fbdd64386 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ISearchPrimitive.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ISearchPrimitive.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.skynet.core.artifact.search; import java.util.List; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; public interface ISearchPrimitive { diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/InRelationSearch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/InRelationSearch.java index b95ab3096ac..507fe4a6c86 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/InRelationSearch.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/InRelationSearch.java @@ -12,8 +12,8 @@ package org.eclipse.osee.framework.skynet.core.artifact.search; import static org.eclipse.osee.framework.skynet.core.artifact.search.DeprecatedOperator.EQUAL;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.ModificationType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManager;
import org.eclipse.osee.framework.skynet.core.relation.IRelationEnumeration;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/NotSearch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/NotSearch.java index 1be1a02fad4..95da6387701 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/NotSearch.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/NotSearch.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.artifact.search; import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatabase.ARTIFACT_TABLE; import java.util.List; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManager; /** diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/OrphanArtifactSearch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/OrphanArtifactSearch.java index e66813dba9a..735d4905897 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/OrphanArtifactSearch.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/OrphanArtifactSearch.java @@ -11,10 +11,10 @@ package org.eclipse.osee.framework.skynet.core.artifact.search;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelatedToAndOfIDSearch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelatedToAndOfIDSearch.java index 38c84229995..5abc4928dbc 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelatedToAndOfIDSearch.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelatedToAndOfIDSearch.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.skynet.core.artifact.search; import java.util.List; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; /** * @author Robert A. Fisher diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelatedToSearch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelatedToSearch.java index c163d554395..8628ba9196c 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelatedToSearch.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelatedToSearch.java @@ -14,8 +14,8 @@ import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatab import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatabase.TRANSACTIONS_TABLE;
import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatabase.TRANSACTION_DETAIL_TABLE;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.ModificationType;
+import org.eclipse.osee.framework.core.model.Branch;
/**
* @author Robert A. Fisher
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationCriteria.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationCriteria.java index 36df46ad3a7..92180c828e1 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationCriteria.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationCriteria.java @@ -12,8 +12,8 @@ package org.eclipse.osee.framework.skynet.core.artifact.search; import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.skynet.core.relation.IRelationEnumeration;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
/**
* @author Ryan D. Brooks
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationInTransactionSearch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationInTransactionSearch.java index b36565686da..f09bf495604 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationInTransactionSearch.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationInTransactionSearch.java @@ -14,9 +14,9 @@ import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatab import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatabase.TRANSACTIONS_TABLE; import static org.eclipse.osee.framework.skynet.core.artifact.search.SkynetDatabase.TRANSACTION_DETAIL_TABLE; import java.util.List; -import org.eclipse.osee.framework.core.data.Branch; -import org.eclipse.osee.framework.core.data.TransactionRecord; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; /** diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/update/RebaselineDbTransaction.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/update/RebaselineDbTransaction.java index 5de2a502b89..e763957a6c8 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/update/RebaselineDbTransaction.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/update/RebaselineDbTransaction.java @@ -11,8 +11,8 @@ package org.eclipse.osee.framework.skynet.core.artifact.update;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.DbTransaction;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/update/UpdateArtifactHandler.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/update/UpdateArtifactHandler.java index 79905ddfd87..2326e1c5f9a 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/update/UpdateArtifactHandler.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/update/UpdateArtifactHandler.java @@ -14,12 +14,12 @@ import java.sql.Timestamp; import java.util.LinkedList; import java.util.List; import java.util.logging.Level; -import org.eclipse.osee.framework.core.data.Branch; -import org.eclipse.osee.framework.core.data.TransactionRecord; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.OseeConnection; import org.eclipse.osee.framework.database.core.SQL3DataType; diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java index 3be756ba513..57caa19f1b7 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java @@ -11,10 +11,10 @@ package org.eclipse.osee.framework.skynet.core.attribute;
import java.util.Collection;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.OseeSql;
import org.eclipse.osee.framework.database.core.SequenceManager;
import org.eclipse.osee.framework.jdk.core.util.HttpProcessor;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeType.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeType.java deleted file mode 100644 index 2beff91e10a..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeType.java +++ /dev/null @@ -1,188 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.attribute;
-
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.OseeField;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
-import org.eclipse.osee.framework.skynet.core.attribute.providers.IAttributeDataProvider;
-import org.eclipse.osee.framework.skynet.core.types.AbstractCachingType;
-
-/**
- * Type information for dynamic attributes.
- *
- * @author Robert A. Fisher
- * @author Ryan D. Brooks
- */
-public class AttributeType extends AbstractCachingType implements Comparable<AttributeType> {
-
- private static final String ATTRIBUTE_BASE_TYPE_ID_FIELD_KEY = "osee.base.attribute.type.id.field";
- private static final String ATTRIBUTE_PROVIDER_ID_FIELD_KEY = "osee.attribute.provider.id.field";
- private static final String ATTRIBUTE_BASE_TYPE_CLASS_FIELD_KEY = "osee.base.attribute.type.class.field";
- private static final String ATTRIBUTE_PROVIDER_CLASS_FIELD_KEY = "osee.attribute.provider.class.field";
- private static final String ATTRIBUTE_DEFAULT_VALUE_FIELD_KEY = "osee.attribute.default.value.field";
- private static final String ATTRIBUTE_ENUM_TYPE_ID_FIELD_KEY = "osee.attribute.enum.type.field";
- private static final String ATTRIBUTE_MAX_OCCURRENCE_FIELD_KEY = "osee.attribute.max.occurrence.field";
- private static final String ATTRIBUTE_MIN_OCCURRENCE_FIELD_KEY = "osee.attribute.min.occurrence.field";
- private static final String ATTRIBUTE_DESCRIPTION_FIELD_KEY = "osee.attribute.description.field";
- private static final String ATTRIBUTE_FILE_EXTENSION_FIELD_KEY = "osee.attribute.file.type.extension.field";
- private static final String ATTRIBUTE_TAGGER_ID_FIELD_KEY = "osee.attribute.tagger.id.field";
-
- /**
- * Create a dynamic attribute descriptor. Descriptors can be acquired for application use from the
- * <code>ConfigurationPersistenceManager</code>.
- *
- * @param baseAttributeClass
- * @param typeName
- * @param defaultValue
- * @param validityXml
- * @param minOccurrences
- * @param maxOccurrences
- * @param tipText
- */
- public AttributeType(AbstractOseeCache<AttributeType> cache, String guid, String typeName, String baseAttributeTypeId, String attributeProviderNameId, Class<? extends Attribute<?>> baseAttributeClass, Class<? extends IAttributeDataProvider> providerAttributeClass, String fileTypeExtension, String defaultValue, OseeEnumType oseeEnumType, int minOccurrences, int maxOccurrences, String description, String taggerId) {
- super(cache, guid, typeName);
- setFields(typeName, baseAttributeTypeId, attributeProviderNameId, baseAttributeClass, providerAttributeClass,
- fileTypeExtension, defaultValue, oseeEnumType, minOccurrences, maxOccurrences, description, taggerId);
- }
-
- @Override
- protected void initializeFields() {
- addField(ATTRIBUTE_BASE_TYPE_ID_FIELD_KEY, new OseeField<String>());
- addField(ATTRIBUTE_PROVIDER_ID_FIELD_KEY, new OseeField<String>());
- addField(ATTRIBUTE_BASE_TYPE_CLASS_FIELD_KEY, new OseeField<Class<? extends Attribute<?>>>());
- addField(ATTRIBUTE_PROVIDER_CLASS_FIELD_KEY, new OseeField<Class<? extends IAttributeDataProvider>>());
- addField(ATTRIBUTE_DEFAULT_VALUE_FIELD_KEY, new OseeField<String>());
- addField(ATTRIBUTE_ENUM_TYPE_ID_FIELD_KEY, new OseeField<OseeEnumType>());
- addField(ATTRIBUTE_MAX_OCCURRENCE_FIELD_KEY, new OseeField<Integer>());
- addField(ATTRIBUTE_MIN_OCCURRENCE_FIELD_KEY, new OseeField<Integer>());
- addField(ATTRIBUTE_DESCRIPTION_FIELD_KEY, new OseeField<String>());
- addField(ATTRIBUTE_FILE_EXTENSION_FIELD_KEY, new OseeField<String>());
- addField(ATTRIBUTE_TAGGER_ID_FIELD_KEY, new OseeField<String>());
- }
-
- public void setFields(String name, String baseAttributeTypeId, String attributeProviderNameId, Class<? extends Attribute<?>> baseAttributeClass, Class<? extends IAttributeDataProvider> providerAttributeClass, String fileTypeExtension, String defaultValue, OseeEnumType oseeEnumType, int minOccurrences, int maxOccurrences, String description, String taggerId) {
- String fileExtensionToSet = fileTypeExtension != null ? fileTypeExtension : "";
- setName(name);
- setFieldLogException(ATTRIBUTE_BASE_TYPE_ID_FIELD_KEY, baseAttributeTypeId);
- setFieldLogException(ATTRIBUTE_PROVIDER_ID_FIELD_KEY, attributeProviderNameId);
- setFieldLogException(ATTRIBUTE_BASE_TYPE_CLASS_FIELD_KEY, baseAttributeClass);
- setFieldLogException(ATTRIBUTE_PROVIDER_CLASS_FIELD_KEY, providerAttributeClass);
- setFieldLogException(ATTRIBUTE_DEFAULT_VALUE_FIELD_KEY, defaultValue);
- setFieldLogException(ATTRIBUTE_ENUM_TYPE_ID_FIELD_KEY, oseeEnumType);
- setFieldLogException(ATTRIBUTE_MAX_OCCURRENCE_FIELD_KEY, maxOccurrences);
- setFieldLogException(ATTRIBUTE_MIN_OCCURRENCE_FIELD_KEY, minOccurrences);
- setFieldLogException(ATTRIBUTE_DESCRIPTION_FIELD_KEY, description);
- setFieldLogException(ATTRIBUTE_FILE_EXTENSION_FIELD_KEY, fileExtensionToSet);
- setFieldLogException(ATTRIBUTE_TAGGER_ID_FIELD_KEY, taggerId);
- }
-
- public String getBaseAttributeTypeId() {
- return getFieldValueLogException("", ATTRIBUTE_BASE_TYPE_ID_FIELD_KEY);
- }
-
- public String getAttributeProviderId() {
- return getFieldValueLogException("", ATTRIBUTE_PROVIDER_ID_FIELD_KEY);
- }
-
- /**
- * @return Returns the baseAttributeClass.
- */
- public Class<? extends Attribute<?>> getBaseAttributeClass() {
- return getFieldValueLogException(null, ATTRIBUTE_BASE_TYPE_CLASS_FIELD_KEY);
- }
-
- /**
- * @return Returns the defaultValue.
- */
- public String getDefaultValue() {
- return getFieldValueLogException(null, ATTRIBUTE_DEFAULT_VALUE_FIELD_KEY);
- }
-
- /**
- * @return Returns the maxOccurrences.
- */
- public int getMaxOccurrences() {
- return getFieldValueLogException(0, ATTRIBUTE_MAX_OCCURRENCE_FIELD_KEY);
- }
-
- /**
- * @return Returns the minOccurrences.
- */
- public int getMinOccurrences() {
- return getFieldValueLogException(0, ATTRIBUTE_MIN_OCCURRENCE_FIELD_KEY);
- }
-
- public String getDescription() {
- return getFieldValueLogException("", ATTRIBUTE_DESCRIPTION_FIELD_KEY);
- }
-
- public int getOseeEnumTypeId() {
- OseeEnumType oseeEnumType = getOseeEnumType();
- return oseeEnumType == null ? OseeEnumTypeManager.getDefaultEnumTypeId() : oseeEnumType.getId();
- }
-
- public OseeEnumType getOseeEnumType() {
- return getFieldValueLogException(null, ATTRIBUTE_ENUM_TYPE_ID_FIELD_KEY);
- }
-
- @Override
- public String toString() {
- return getName();
- }
-
- public String getFileTypeExtension() {
- return getFieldValueLogException("", ATTRIBUTE_FILE_EXTENSION_FIELD_KEY);
- }
-
- public int compareTo(AttributeType other) {
- int result = -1;
- if (other != null && other.getName() != null && getName() != null) {
- result = getName().compareTo(other.getName());
- }
- return result;
- }
-
- /**
- * @return the providerAttributeClass
- */
- public Class<? extends IAttributeDataProvider> getProviderAttributeClass() {
- return getFieldValueLogException(null, ATTRIBUTE_PROVIDER_CLASS_FIELD_KEY);
- }
-
- /**
- * Get the registered tagger id for this attribute type
- *
- * @return tagger id
- */
- public String getTaggerId() {
- return getFieldValueLogException("", ATTRIBUTE_TAGGER_ID_FIELD_KEY);
- }
-
- /**
- * Whether this attribute type is taggable.
- *
- * @return <b>true</b> if this attribute type is taggable. <b>false</b> if this is not taggable.
- */
- public boolean isTaggable() {
- boolean toReturn = false;
- String taggerId = getTaggerId();
- if (taggerId != null) {
- toReturn = Strings.isValid(taggerId.trim());
- }
- return toReturn;
- }
-
- public boolean isEnumerated() {
- return EnumeratedAttribute.class.isAssignableFrom(getBaseAttributeClass());
- }
-}
\ No newline at end of file diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTypeManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTypeManager.java index 14ebb265c4a..54178f4f694 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTypeManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTypeManager.java @@ -16,20 +16,23 @@ import java.util.Collections; import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.cache.AbstractOseeCache;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.DbTransaction;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
+import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
+import org.eclipse.osee.framework.skynet.core.attribute.providers.IAttributeDataProvider;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeManager;
/**
* @author Ryan D. Brooks
@@ -39,6 +42,10 @@ public class AttributeTypeManager { private AttributeTypeManager() {
}
+ public static AbstractOseeCache<AttributeType> getCache() {
+ return Activator.getInstance().getOseeCacheService().getAttributeTypeCache();
+ }
+
public static Collection<AttributeType> getValidAttributeTypes(Branch branch) throws OseeCoreException {
Set<AttributeType> attributeTypes = new HashSet<AttributeType>(100);
for (ArtifactType artifactType : ArtifactTypeManager.getAllTypes()) {
@@ -48,7 +55,7 @@ public class AttributeTypeManager { }
public static Collection<AttributeType> getAllTypes() throws OseeCoreException {
- return OseeTypeManager.getCache().getAttributeTypeCache().getAll();
+ return getCache().getAll();
}
public static Collection<AttributeType> getTaggableTypes() throws OseeCoreException {
@@ -62,7 +69,7 @@ public class AttributeTypeManager { }
public static boolean typeExists(String name) throws OseeCoreException {
- return !OseeTypeManager.getCache().getAttributeTypeCache().getByName(name).isEmpty();
+ return !getCache().getByName(name).isEmpty();
}
/**
@@ -75,7 +82,7 @@ public class AttributeTypeManager { if (!GUID.isValid(guid)) {
throw new OseeArgumentException(String.format("[%s] is not a valid guid", guid));
}
- AttributeType attributeType = OseeTypeManager.getCache().getAttributeTypeCache().getByGuid(guid);
+ AttributeType attributeType = getCache().getByGuid(guid);
if (attributeType == null) {
throw new OseeTypeDoesNotExist("Attribute Type [" + guid + "] is not available.");
}
@@ -88,7 +95,7 @@ public class AttributeTypeManager { * @throws OseeCoreException
*/
public static AttributeType getType(String name) throws OseeCoreException {
- AttributeType attributeType = OseeTypeManager.getCache().getAttributeTypeCache().getUniqueByName(name);
+ AttributeType attributeType = getCache().getUniqueByName(name);
if (attributeType == null) {
throw new OseeTypeDoesNotExist("Attribute Type with name [" + name + "] does not exist.");
}
@@ -102,7 +109,7 @@ public class AttributeTypeManager { * @throws OseeCoreException
*/
public static AttributeType getType(int attrTypeId) throws OseeCoreException {
- AttributeType attributeType = OseeTypeManager.getCache().getAttributeTypeCache().getById(attrTypeId);
+ AttributeType attributeType = getCache().getById(attrTypeId);
if (attributeType == null) {
throw new OseeTypeDoesNotExist("Attribute type: " + attrTypeId + " is not available.");
}
@@ -147,13 +154,19 @@ public class AttributeTypeManager { };
}
- public static AttributeType createType(String guid, String typeName, String baseAttributeTypeId, String attributeProviderNameId, String fileTypeExtension, String defaultValue, OseeEnumType oseeEnumType, int minOccurrences, int maxOccurrences, String description, String taggerId) throws OseeCoreException {
- return OseeTypeManager.getCache().getAttributeTypeCache().createType(guid, typeName, baseAttributeTypeId,
- attributeProviderNameId, fileTypeExtension, defaultValue, oseeEnumType, minOccurrences, maxOccurrences,
- description, taggerId);
+ public static void persist() throws OseeCoreException {
+ getCache().storeAllModified();
}
- public static void persist() throws OseeCoreException {
- OseeTypeManager.getCache().getAttributeTypeCache().storeAllModified();
+ public static Class<? extends Attribute<?>> getAttributeBaseClass(String attributeType) throws OseeCoreException {
+ return getAttributeBaseClass(getType(attributeType).getBaseAttributeTypeId());
+ }
+
+ public static Class<? extends Attribute<?>> getAttributeBaseClass(AttributeType attributeType) throws OseeCoreException {
+ return AttributeExtensionManager.getAttributeClassFor(attributeType.getBaseAttributeTypeId());
+ }
+
+ public static Class<? extends IAttributeDataProvider> getAttributeProviderClass(AttributeType attributeType) throws OseeCoreException {
+ return AttributeExtensionManager.getAttributeProviderClassFor(attributeType.getAttributeProviderId());
}
}
\ No newline at end of file diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumEntry.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumEntry.java deleted file mode 100644 index 63e75de38c0..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumEntry.java +++ /dev/null @@ -1,83 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.attribute;
-
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.OseeField;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.Pair;
-import org.eclipse.osee.framework.skynet.core.types.AbstractCachingType;
-import org.eclipse.osee.framework.skynet.core.types.OseeEnumTypeCache;
-
-/**
- * @author Roberto E. Escobar
- */
-public class OseeEnumEntry extends AbstractCachingType implements Comparable<OseeEnumEntry> {
- private final static String ENUM_ENTRY_ORDINAL_FIELD = "osee.enum.entry.ordinal.field";
-
- public OseeEnumEntry(AbstractOseeCache<OseeEnumType> cache, String guid, String name, int ordinal) {
- super(cache, guid, name);
- setOrdinal(ordinal);
- }
-
- @Override
- protected void initializeFields() {
- addField(ENUM_ENTRY_ORDINAL_FIELD, new OseeField<Integer>());
- }
-
- @Override
- protected OseeEnumTypeCache getCache() {
- return (OseeEnumTypeCache) super.getCache();
- }
-
- public int ordinal() {
- return getFieldValueLogException(Integer.MIN_VALUE, ENUM_ENTRY_ORDINAL_FIELD);
- }
-
- public void setOrdinal(int ordinal) {
- setFieldLogException(ENUM_ENTRY_ORDINAL_FIELD, ordinal);
- }
-
- public Pair<String, Integer> asPair() {
- return new Pair<String, Integer>(getName(), ordinal());
- }
-
- public OseeEnumType getDeclaringClass() throws OseeCoreException {
- return getCache().getEnumType(this);
- }
-
- @Override
- public boolean equals(Object object) {
- if (object instanceof OseeEnumEntry) {
- OseeEnumEntry other = (OseeEnumEntry) object;
- return super.equals(other) && ordinal() == other.ordinal();
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- final int prime = 37;
- int result = super.hashCode();
- result = prime * result + ordinal();
- return result;
- }
-
- @Override
- public String toString() {
- return String.format("%s:%s", getName(), ordinal());
- }
-
- @Override
- public int compareTo(OseeEnumEntry other) {
- return this.ordinal() - other.ordinal();
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumType.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumType.java deleted file mode 100644 index 62fa8c3639b..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumType.java +++ /dev/null @@ -1,129 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.attribute;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.types.AbstractCachingType;
-import org.eclipse.osee.framework.skynet.core.types.OseeEnumTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.field.EnumEntryField;
-
-/**
- * @author Roberto E. Escobar
- */
-public class OseeEnumType extends AbstractCachingType implements Comparable<OseeEnumType> {
-
- public static final String OSEE_ENUM_TYPE_ENTRIES_FIELD = "osee.enum.type.entries.field";
-
- public OseeEnumType(AbstractOseeCache<OseeEnumType> cache, String guid, String enumTypeName) {
- super(cache, guid, enumTypeName);
- }
-
- @Override
- protected void initializeFields() {
- addField(OSEE_ENUM_TYPE_ENTRIES_FIELD, new EnumEntryField(getCache(), this));
- }
-
- @Override
- protected OseeEnumTypeCache getCache() {
- return (OseeEnumTypeCache) super.getCache();
- }
-
- @Override
- public String toString() {
- List<String> data = new ArrayList<String>();
- try {
- for (OseeEnumEntry entry : values()) {
- data.add(entry.toString());
- }
- } catch (OseeCoreException ex) {
- data.add("Error");
- }
- return String.format("[%s] - %s", getName(), data);
- }
-
- public OseeEnumEntry[] values() throws OseeCoreException {
- List<OseeEnumEntry> entries = getFieldValue(OSEE_ENUM_TYPE_ENTRIES_FIELD);
- Collections.sort(entries);
- return entries.toArray(new OseeEnumEntry[entries.size()]);
- }
-
- public Set<String> valuesAsOrderedStringSet() throws OseeCoreException {
- Set<String> values = new LinkedHashSet<String>();
- for (OseeEnumEntry oseeEnumEntry : values()) {
- values.add(oseeEnumEntry.getName());
- }
- return values;
- }
-
- public OseeEnumEntry valueOf(int ordinal) throws OseeCoreException {
- OseeEnumEntry toReturn = null;
- for (OseeEnumEntry oseeEnumEntry : values()) {
- if (oseeEnumEntry.ordinal() == ordinal) {
- toReturn = oseeEnumEntry;
- }
- }
- if (toReturn == null) {
- throw new OseeArgumentException(String.format("No enum const [%s] - ordinal [%s]", getName(), ordinal));
- }
- return toReturn;
- }
-
- public OseeEnumEntry valueOf(String entryName) throws OseeCoreException {
- OseeEnumEntry toReturn = null;
- for (OseeEnumEntry oseeEnumEntry : values()) {
- if (oseeEnumEntry.getName().equals(entryName)) {
- toReturn = oseeEnumEntry;
- }
- }
- if (toReturn == null) {
- throw new OseeArgumentException(String.format("No enum const [%s].[%s]", getName(), entryName));
- }
- return toReturn;
- }
-
- public void setEntries(List<OseeEnumEntry> entries) throws OseeCoreException {
- setField(OSEE_ENUM_TYPE_ENTRIES_FIELD, entries);
- }
-
- public void addEntry(OseeEnumEntry entry) throws OseeCoreException {
- List<OseeEnumEntry> entries = new ArrayList<OseeEnumEntry>();
- entries.addAll(Arrays.asList(values()));
- entries.add(entry);
- setEntries(entries);
- }
-
- public void removeEntry(OseeEnumEntry entry) throws OseeCoreException {
- List<OseeEnumEntry> entries = new ArrayList<OseeEnumEntry>();
- entries.addAll(Arrays.asList(values()));
- if (!entries.remove(entry)) {
- throw new OseeArgumentException(String.format("OseeEnumEntry[%s] does not exist on OseeEnumType[%s]", entry,
- this));
- }
- setEntries(entries);
- }
-
- @Override
- public int compareTo(OseeEnumType other) {
- int result = -1;
- if (other != null && other.getName() != null && getName() != null) {
- result = getName().compareTo(other.getName());
- }
- return result;
- }
-}
\ No newline at end of file diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumTypeManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumTypeManager.java index 754ad030a51..7deb26f4558 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumTypeManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumTypeManager.java @@ -13,9 +13,11 @@ package org.eclipse.osee.framework.skynet.core.attribute; import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.eclipse.osee.framework.core.cache.AbstractOseeCache;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeManager;
+import org.eclipse.osee.framework.core.model.OseeEnumType;
+import org.eclipse.osee.framework.skynet.core.internal.Activator;
/**
* @author Roberto E. Escobar
@@ -25,8 +27,12 @@ public class OseeEnumTypeManager { private OseeEnumTypeManager() {
}
+ public static AbstractOseeCache<OseeEnumType> getCache() {
+ return Activator.getInstance().getOseeCacheService().getEnumTypeCache();
+ }
+
public static OseeEnumType getType(int enumTypeId) throws OseeCoreException {
- OseeEnumType oseeEnumType = OseeTypeManager.getCache().getEnumTypeCache().getById(enumTypeId);
+ OseeEnumType oseeEnumType = getCache().getById(enumTypeId);
if (oseeEnumType == null) {
throw new OseeTypeDoesNotExist(String.format("Osee Enum Type with id:[%s] does not exist.", enumTypeId));
}
@@ -34,7 +40,7 @@ public class OseeEnumTypeManager { }
public static OseeEnumType getType(String enumTypeName) throws OseeCoreException {
- OseeEnumType itemsFound = OseeTypeManager.getCache().getEnumTypeCache().getUniqueByName(enumTypeName);
+ OseeEnumType itemsFound = getCache().getUniqueByName(enumTypeName);
if (itemsFound == null) {
throw new OseeTypeDoesNotExist(
String.format("OSEE enum types matching [%s] name does not exist", enumTypeName));
@@ -51,11 +57,11 @@ public class OseeEnumTypeManager { }
public static Collection<OseeEnumType> getAllTypes() throws OseeCoreException {
- return OseeTypeManager.getCache().getEnumTypeCache().getAll();
+ return getCache().getAll();
}
public static boolean typeExist(String enumTypeName) throws OseeCoreException {
- OseeEnumType itemsFound = OseeTypeManager.getCache().getEnumTypeCache().getUniqueByName(enumTypeName);
+ OseeEnumType itemsFound = getCache().getUniqueByName(enumTypeName);
return itemsFound != null;
}
@@ -63,53 +69,7 @@ public class OseeEnumTypeManager { return -1;
}
- public static OseeEnumEntry createEnumEntry(String guid, String name, int ordinal) throws OseeCoreException {
- return OseeTypeManager.getCache().getEnumTypeCache().createEntry(guid, name, ordinal);
- }
-
- public static OseeEnumType createEnumType(String guid, String enumTypeName) throws OseeCoreException {
- return OseeTypeManager.getCache().getEnumTypeCache().createType(guid, enumTypeName);
- }
-
public static void persist() throws OseeCoreException {
- OseeTypeManager.getCache().getEnumTypeCache().storeAllModified();
+ getCache().storeAllModified();
}
-
- // public static OseeEnumType createEnumTypeFromXml(String attributeTypeName, String xmlDefinition) throws OseeCoreException {
- // List<Pair<String, Integer>> entries = new ArrayList<Pair<String, Integer>>();
- // String enumTypeName = "";
- //
- // if (!Strings.isValid(xmlDefinition)) {
- // throw new OseeArgumentException("The enum xml definition must not be null or empty");
- // }
- //
- // Document document;
- // try {
- // document = Jaxp.readXmlDocument(xmlDefinition);
- // } catch (Exception ex) {
- // throw new OseeWrappedException(ex);
- // }
- // enumTypeName = attributeTypeName;
- // Element choicesElement = document.getDocumentElement();
- // NodeList enumerations = choicesElement.getChildNodes();
- // Set<String> choices = new LinkedHashSet<String>();
- //
- // for (int i = 0; i < enumerations.getLength(); i++) {
- // Node node = enumerations.item(i);
- // if (node.getNodeName().equalsIgnoreCase("Enum")) {
- // choices.add(node.getTextContent());
- // } else {
- // throw new OseeArgumentException("Validity Xml not of excepted enum format");
- // }
- // }
- //
- // int ordinal = 0;
- // for (String choice : choices) {
- // entries.add(new Pair<String, Integer>(choice, ordinal++));
- // }
- // OseeEnumType enumType =
- // OseeTypeManager.getTypeFactory().createEnumType(GUID.create(), enumTypeName, OseeTypeManager.getCache());
- // enumType.addEntries(entries);
- // return enumType;
- // }
}
\ No newline at end of file diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumerationValidation.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumerationValidation.java index b68d1f2a9d7..7fafa016967 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumerationValidation.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumerationValidation.java @@ -13,6 +13,7 @@ package org.eclipse.osee.framework.skynet.core.attribute; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.validation.IOseeValidator;
@@ -28,8 +29,7 @@ public class OseeEnumerationValidation implements IOseeValidator { @Override
public boolean isApplicable(Artifact artifact, AttributeType attributeType) {
- Class<?> baseClass = attributeType.getBaseAttributeClass();
- return EnumeratedAttribute.class.isAssignableFrom(baseClass);
+ return attributeType.isEnumerated();
}
@Override
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ArtifactChange.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ArtifactChange.java index 41949189303..8edc90ea383 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ArtifactChange.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ArtifactChange.java @@ -11,16 +11,16 @@ package org.eclipse.osee.framework.skynet.core.change;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
/**
* @author Jeff C. Phillips
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ArtifactChangeBuilder.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ArtifactChangeBuilder.java index 2991d5c039a..7ecd73eacc4 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ArtifactChangeBuilder.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ArtifactChangeBuilder.java @@ -5,13 +5,13 @@ */
package org.eclipse.osee.framework.skynet.core.change;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
/**
* @author Jeff C. Phillips
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/AttributeChange.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/AttributeChange.java index 6e8235afb76..a55424fdd55 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/AttributeChange.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/AttributeChange.java @@ -12,8 +12,6 @@ package org.eclipse.osee.framework.skynet.core.change;
import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.AttributeDoesNotExist;
@@ -21,11 +19,13 @@ import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/AttributeChangeBuilder.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/AttributeChangeBuilder.java index a1d6e81804b..0864c75a0d9 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/AttributeChangeBuilder.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/AttributeChangeBuilder.java @@ -5,13 +5,13 @@ */
package org.eclipse.osee.framework.skynet.core.change;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
/**
* @author Jeff C. Phillips
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java index c2880f54936..18425e96180 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java @@ -12,15 +12,15 @@ package org.eclipse.osee.framework.skynet.core.change;
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
/**
* @author Jeff C. Phillips
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ChangeBuilder.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ChangeBuilder.java index 7afb05dd91f..86abf268dfa 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ChangeBuilder.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ChangeBuilder.java @@ -5,15 +5,15 @@ */
package org.eclipse.osee.framework.skynet.core.change;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
/**
* @author Jeff C. Phillips
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ErrorChange.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ErrorChange.java index 17612c16dd5..019dbbaef9e 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ErrorChange.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ErrorChange.java @@ -5,15 +5,15 @@ */
package org.eclipse.osee.framework.skynet.core.change;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
/**
* @author Megumi Telles
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/RelationChange.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/RelationChange.java index 0148f53c381..6ad459b4ba3 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/RelationChange.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/RelationChange.java @@ -12,18 +12,18 @@ package org.eclipse.osee.framework.skynet.core.change;
import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
/**
* @author Jeff C. Phillips
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/RelationChangeBuilder.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/RelationChangeBuilder.java index cbfa1dc77f7..567b61bcb90 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/RelationChangeBuilder.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/RelationChangeBuilder.java @@ -5,16 +5,16 @@ */
package org.eclipse.osee.framework.skynet.core.change;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
/**
* @author Jeff C. Phillips
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/CommitDbOperation.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/CommitDbOperation.java index 198a59c49b3..74be7ca1f9b 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/CommitDbOperation.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/CommitDbOperation.java @@ -18,7 +18,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.data.ChangeItem; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.ConflictStatus; @@ -28,6 +27,7 @@ import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.database.core.AbstractDbTxOperation; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.OseeConnection; @@ -75,7 +75,7 @@ public class CommitDbOperation extends AbstractDbTxOperation { private OseeConnection connection; public CommitDbOperation(Branch sourceBranch, Branch destinationBranch, Branch mergeBranch, List<ChangeItem> changes) { - super("Commit Database Operation", Activator.PLUGIN_ID); + super(null, "Commit Database Operation", Activator.PLUGIN_ID); this.sourceBranch = sourceBranch; this.destinationBranch = destinationBranch; this.mergeBranch = mergeBranch; @@ -133,8 +133,8 @@ public class CommitDbOperation extends AbstractDbTxOperation { String comment = BranchManager.COMMIT_COMMENT + sourceBranch.getName(); int authorId = userToBlame == null ? -1 : userToBlame.getArtId(); ConnectionHandler.runPreparedUpdate(connection, INSERT_COMMIT_TRANSACTION, - TransactionDetailsType.NonBaselined.getId(), destinationBranch.getId(), newTransactionNumber, - comment, timestamp, authorId, sourceBranch.getAssociatedArtifact().getArtId()); + TransactionDetailsType.NonBaselined.getId(), destinationBranch.getId(), newTransactionNumber, comment, + timestamp, authorId, sourceBranch.getAssociatedArtifact().getArtId()); return newTransactionNumber; } diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/LoadChangeDataOperation.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/LoadChangeDataOperation.java index 6f59bd1df12..8a62218429b 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/LoadChangeDataOperation.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/LoadChangeDataOperation.java @@ -16,16 +16,16 @@ import java.util.Map.Entry; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.data.ChangeItem;
import org.eclipse.osee.framework.core.data.ChangeVersion;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
import org.eclipse.osee.framework.core.enums.TxChange;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.JoinUtility;
import org.eclipse.osee.framework.database.core.JoinUtility.IdJoinQuery;
import org.eclipse.osee.framework.database.core.JoinUtility.TransactionJoinQuery;
@@ -105,7 +105,7 @@ public class LoadChangeDataOperation extends AbstractOperation { private TransactionJoinQuery loadSourceBranchChanges(IProgressMonitor monitor) throws OseeCoreException {
TransactionJoinQuery txJoin = JoinUtility.createTransactionJoinQuery();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
Integer currentTransactionNumber;
try {
@@ -139,7 +139,7 @@ public class LoadChangeDataOperation extends AbstractOperation { }
private void loadArtifactItemIdsBasedOnGammas(IProgressMonitor monitor, int queryId, HashMap<Integer, ChangeItem> changesByItemId) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
String query =
"select art_id, txj.gamma_id from osee_artifact_version id, osee_join_transaction txj where id.gamma_id = txj.gamma_id and txj.query_id = ?";
@@ -159,7 +159,7 @@ public class LoadChangeDataOperation extends AbstractOperation { }
private void loadAttributeItemIdsBasedOnGammas(IProgressMonitor monitor, int queryId, HashMap<Integer, ChangeItem> changesByItemId) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
String query =
"select art_id, attr_id, value, txj.gamma_id from osee_attribute id, osee_join_transaction txj where id.gamma_id = txj.gamma_id and txj.query_id = ?";
@@ -181,7 +181,7 @@ public class LoadChangeDataOperation extends AbstractOperation { }
private void loadRelationItemIdsBasedOnGammas(IProgressMonitor monitor, int queryId, HashMap<Integer, ChangeItem> changesByItemId) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
String query =
"select a_art_id, b_art_id, rel_link_id, rel_link_type_id, rationale, txj.gamma_id from osee_relation_link id, osee_join_transaction txj where id.gamma_id = txj.gamma_id and txj.query_id = ?";
@@ -237,7 +237,7 @@ public class LoadChangeDataOperation extends AbstractOperation { }
private void loadCurrentData(IProgressMonitor monitor, String tableName, String columnName, IdJoinQuery idJoin, TransactionRecord destinationTransaction, HashMap<Integer, ChangeItem> changesByItemId) throws OseeCoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
String query;
try {
@@ -289,7 +289,7 @@ public class LoadChangeDataOperation extends AbstractOperation { }
private void loadNonCurrentSourceData(IProgressMonitor monitor, String tableName, String columnName, IdJoinQuery idJoin, HashMap<Integer, ChangeItem> changesByItemId, String columnValueName) throws OseeCoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
String query;
try {
@@ -329,7 +329,7 @@ public class LoadChangeDataOperation extends AbstractOperation { }
}
- private void loadVersionData(ConnectionHandlerStatement chStmt, ChangeVersion versionedChange, String columnValueName) throws OseeArgumentException, OseeDataStoreException {
+ private void loadVersionData(IOseeStatement chStmt, ChangeVersion versionedChange, String columnValueName) throws OseeArgumentException, OseeDataStoreException {
//Tolerates the case of having more than one version of an item on a baseline transaction by picking the most recent one
if (versionedChange.getGammaId() == null || versionedChange.getGammaId() < chStmt.getLong("gamma_id")) {
if (columnValueName != null) {
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/UpdatePreviousTxCurrent.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/UpdatePreviousTxCurrent.java index eaba2551287..ac4188b995d 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/UpdatePreviousTxCurrent.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/UpdatePreviousTxCurrent.java @@ -2,11 +2,11 @@ package org.eclipse.osee.framework.skynet.core.commit; import java.util.ArrayList; import java.util.List; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.database.core.ConnectionHandler; -import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement; +import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.database.core.JoinUtility; import org.eclipse.osee.framework.database.core.OseeConnection; import org.eclipse.osee.framework.database.core.JoinUtility.IdJoinQuery; @@ -54,7 +54,7 @@ public class UpdatePreviousTxCurrent { private void updateNoLongerCurrentGammas(String tableName, String columnName, int queryId) throws OseeDataStoreException { List<Object[]> gammaTxPairs = new ArrayList<Object[]>(); - ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(connection); + IOseeStatement chStmt = ConnectionHandler.getStatement(connection); String query = "SELECT txs.transaction_id, txs.gamma_id FROM osee_join_id idj, " + tableName + " item, osee_txs txs, osee_tx_details txd WHERE idj.query_id = ? and idj.id = item." + columnName + " AND item.gamma_id = txs.gamma_id AND txs.transaction_id = txd.transaction_id AND txd.branch_id = ?"; diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/actions/CatchTrackedChanges.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/actions/CatchTrackedChanges.java index 51356a75218..88a4a57df84 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/actions/CatchTrackedChanges.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/actions/CatchTrackedChanges.java @@ -14,9 +14,9 @@ import java.util.HashSet; import java.util.Set;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/actions/CommitAction.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/actions/CommitAction.java index a823a1ff99b..57622074f78 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/actions/CommitAction.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/actions/CommitAction.java @@ -10,8 +10,8 @@ *******************************************************************************/
package org.eclipse.osee.framework.skynet.core.commit.actions;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
/**
* @author TheronVirgin
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ArtifactConflict.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ArtifactConflict.java index 2ba8aa1b6e7..209f43f29b9 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ArtifactConflict.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ArtifactConflict.java @@ -11,13 +11,13 @@ package org.eclipse.osee.framework.skynet.core.conflict;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ConflictStatus;
import org.eclipse.osee.framework.core.enums.ConflictType;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.BranchMergeException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
/**
* @author Theron Virgin
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ArtifactConflictBuilder.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ArtifactConflictBuilder.java index 0de5733778c..418e00f4dba 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ArtifactConflictBuilder.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ArtifactConflictBuilder.java @@ -12,9 +12,9 @@ package org.eclipse.osee.framework.skynet.core.conflict;
import java.util.Set;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
/**
* @author Theron Virgin
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflict.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflict.java index 3e9f6abd812..74c3d594c17 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflict.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflict.java @@ -18,21 +18,21 @@ import java.util.Collection; import java.util.TreeSet;
import java.util.logging.Level;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ConflictStatus;
import org.eclipse.osee.framework.core.enums.ConflictType;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.AttributeDoesNotExist;
import org.eclipse.osee.framework.core.exception.MergeChangesInArtifactException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.jdk.core.util.io.Streams;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.attribute.WordAttribute;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
@@ -265,11 +265,6 @@ public class AttributeConflict extends Conflict { return new TreeSet<String>(AttributeTypeManager.getEnumerationValues(getAttributeType().getName()));
}
- @SuppressWarnings("unchecked")
- public Class<? extends Attribute> getBaseAttributeClass() throws OseeCoreException {
- return getAttributeType().getBaseAttributeClass();
- }
-
public boolean setStringAttributeValue(String value) throws OseeCoreException {
if (!okToOverwriteMerge()) {
if (DEBUG) {
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflictBuilder.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflictBuilder.java index de6165f20d5..0e20e215906 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflictBuilder.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflictBuilder.java @@ -12,9 +12,9 @@ package org.eclipse.osee.framework.skynet.core.conflict;
import java.util.Set;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
/**
* @author Theron Virgin
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/Conflict.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/Conflict.java index 8c2fe815f44..e2376270483 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/Conflict.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/Conflict.java @@ -12,12 +12,12 @@ package org.eclipse.osee.framework.skynet.core.conflict;
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ConflictStatus;
import org.eclipse.osee.framework.core.enums.ConflictType;
import org.eclipse.osee.framework.core.exception.AttributeDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictBuilder.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictBuilder.java index dc5089d2d3a..f2c053f8aaa 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictBuilder.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictBuilder.java @@ -12,9 +12,9 @@ package org.eclipse.osee.framework.skynet.core.conflict;
import java.util.Set;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
/**
* @author Theron Virgin
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictManagerExternal.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictManagerExternal.java index fc14d9bc4e8..f6ee67946c3 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictManagerExternal.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictManagerExternal.java @@ -13,8 +13,8 @@ package org.eclipse.osee.framework.skynet.core.conflict; import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.revision.ConflictManagerInternal;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictStatusManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictStatusManager.java index e71f43c8bf6..80a15bed875 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictStatusManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictStatusManager.java @@ -15,7 +15,7 @@ import org.eclipse.osee.framework.core.enums.ConflictStatus; import org.eclipse.osee.framework.core.enums.ConflictType;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
/**
* @author Theron Virgin
@@ -34,7 +34,7 @@ public class ConflictStatusManager { "INSERT INTO osee_conflict ( conflict_id, merge_branch_id, source_gamma_id, dest_gamma_id, status, conflict_type) VALUES ( ?, ?, ?, ?, ?, ?)";
public static void setStatus(ConflictStatus status, int sourceGamma, int destGamma, int mergeBranchId) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
//Gammas should be up to date so you can use them to get entry just update the status field.
try {
ConnectionHandler.runPreparedUpdate(MERGE_UPDATE_STATUS, status.getValue(), sourceGamma, destGamma,
@@ -49,7 +49,7 @@ public class ConflictStatusManager { //add it with an unedited setting and return unedited
//If gammas are out of date, update the gammas and down grade markedMerged to Edited
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(MERGE_ATTRIBUTE_STATUS, branchID, objectID, conflictType);
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/RelationConflict.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/RelationConflict.java index c9cc1ed34ca..5aeea62adb4 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/RelationConflict.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/RelationConflict.java @@ -11,12 +11,12 @@ package org.eclipse.osee.framework.skynet.core.conflict;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ConflictStatus;
import org.eclipse.osee.framework.core.enums.ConflictType;
import org.eclipse.osee.framework.core.exception.BranchMergeException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
/**
* @author Theron Virgin
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkTransactionData.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkTransactionData.java index 7be7934aabc..e261bb6e1f7 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkTransactionData.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkTransactionData.java @@ -16,12 +16,12 @@ import java.util.Collections; import java.util.HashSet;
import java.util.Set;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactModType;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.ui.plugin.event.UnloadedArtifact;
import org.eclipse.osee.framework.ui.plugin.event.UnloadedRelation;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IRelationModifiedEventListener.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IRelationModifiedEventListener.java index a4536e36a0e..61844ad8cec 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IRelationModifiedEventListener.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IRelationModifiedEventListener.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.framework.skynet.core.event;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.relation.RelationEventType;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java index 86a3c3c1de7..79ec01c9ec9 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java @@ -23,10 +23,10 @@ import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory;
import java.util.logging.Level;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.messaging.event.skynet.ISkynetEvent;
import org.eclipse.osee.framework.messaging.event.skynet.event.NetworkAccessControlArtifactsEvent;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/LoadedRelation.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/LoadedRelation.java index 23c7bc2f7bb..10afd402e81 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/LoadedRelation.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/LoadedRelation.java @@ -10,9 +10,9 @@ *******************************************************************************/
package org.eclipse.osee.framework.skynet.core.event;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.ui.plugin.event.UnloadedRelation;
/**
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java index fe5a214e730..c6c1a104409 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java @@ -12,9 +12,9 @@ package org.eclipse.osee.framework.skynet.core.event; import java.util.Collection;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactModType;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RelationModifiedEvent.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RelationModifiedEvent.java index cb1bf0bfa22..9625d378379 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RelationModifiedEvent.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RelationModifiedEvent.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.framework.skynet.core.event;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.relation.RelationEventType;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
import org.eclipse.osee.framework.ui.plugin.event.UnloadedRelation;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java index 0b948f679d2..c7b1f2830c7 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java @@ -24,12 +24,14 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.osee.framework.core.cache.BranchCache;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jini.discovery.EclipseJiniClassloader;
import org.eclipse.osee.framework.jini.discovery.IServiceLookupListener;
@@ -71,11 +73,9 @@ import org.eclipse.osee.framework.skynet.core.internal.Activator; import org.eclipse.osee.framework.skynet.core.relation.RelationEventType;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeManager;
import org.eclipse.osee.framework.skynet.core.utility.LoadedArtifacts;
import org.eclipse.osee.framework.ui.plugin.event.UnloadedArtifact;
import org.eclipse.osee.framework.ui.plugin.event.UnloadedRelation;
@@ -368,7 +368,8 @@ public class RemoteEventManager { } else if (event instanceof NetworkDeletedBranchEvent) {
int branchId = ((NetworkDeletedBranchEvent) event).getId();
try {
- Branch branch = OseeTypeManager.getBranchCache().getById(branchId);
+ Branch branch =
+ Activator.getInstance().getOseeCacheService().getBranchCache().getById(branchId);
if (branch != null) {
branch.setBranchState(BranchState.DELETED);
branch.clearDirty();
@@ -380,9 +381,10 @@ public class RemoteEventManager { } else if (event instanceof NetworkPurgeBranchEvent) {
int branchId = ((NetworkPurgeBranchEvent) event).getId();
try {
- Branch branch = OseeTypeManager.getBranchCache().getById(branchId);
+ BranchCache cache = Activator.getInstance().getOseeCacheService().getBranchCache();
+ Branch branch = cache.getById(branchId);
if (branch != null) {
- OseeTypeManager.getBranchCache().decache(branch);
+ cache.decache(branch);
}
InternalEventManager.kickBranchEvent(sender, BranchEventType.Purged, branchId);
} catch (Exception ex) {
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/BaseArtifactLoopbackCmd.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/BaseArtifactLoopbackCmd.java index a6ff799f6bf..1f574ca430e 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/BaseArtifactLoopbackCmd.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/BaseArtifactLoopbackCmd.java @@ -13,8 +13,8 @@ package org.eclipse.osee.framework.skynet.core.httpRequests; import java.net.HttpURLConnection;
import java.util.Map;
import org.eclipse.osee.framework.core.client.server.HttpResponse;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/ExcelOseeTypeDataParser.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/ExcelOseeTypeDataParser.java index 76149216947..bf4a5884438 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/ExcelOseeTypeDataParser.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/ExcelOseeTypeDataParser.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Set;
import java.util.Map.Entry;
import java.util.logging.Level;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
@@ -30,7 +31,6 @@ import org.eclipse.osee.framework.jdk.core.type.Pair; import org.eclipse.osee.framework.jdk.core.util.io.xml.ExcelSaxHandler;
import org.eclipse.osee.framework.jdk.core.util.io.xml.RowProcessor;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifact.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifact.java index 3d98085a798..89d6bea1a80 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifact.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifact.java @@ -18,7 +18,7 @@ import java.util.LinkedHashMap; import java.util.Map;
import java.util.Map.Entry;
import org.eclipse.osee.framework.core.data.IOseeType;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
+import org.eclipse.osee.framework.core.model.ArtifactType;
/**
* @author Robert A. Fisher
@@ -161,4 +161,5 @@ public class RoughArtifact { public void setPrimaryArtifactType(ArtifactType primaryArtifactType) {
this.primaryArtifactType = primaryArtifactType;
}
+
}
\ No newline at end of file diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/FilterArtifactTypesByAttributeTypes.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/FilterArtifactTypesByAttributeTypes.java index 37a10a36398..569ddae0bbe 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/FilterArtifactTypesByAttributeTypes.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/FilterArtifactTypesByAttributeTypes.java @@ -14,12 +14,12 @@ import java.util.Collection; import java.util.HashSet;
import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.jdk.core.util.Collections;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/RoughToRealArtifactOperation.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/RoughToRealArtifactOperation.java index ad4fe3cfe5b..9572674a1bf 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/RoughToRealArtifactOperation.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/RoughToRealArtifactOperation.java @@ -14,8 +14,11 @@ import java.util.HashMap; import java.util.Map;
import java.util.logging.Level;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -25,10 +28,7 @@ import org.eclipse.osee.framework.skynet.core.importing.RoughRelation; import org.eclipse.osee.framework.skynet.core.importing.resolvers.IArtifactImportResolver;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
-import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorterId;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
/**
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ExcelArtifactExtractor.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ExcelArtifactExtractor.java index 29f644cb567..f3d94216993 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ExcelArtifactExtractor.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ExcelArtifactExtractor.java @@ -19,12 +19,12 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.ArtifactType; import org.eclipse.osee.framework.jdk.core.type.DoubleKeyHashMap; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.io.xml.ExcelSaxHandler; import org.eclipse.osee.framework.jdk.core.util.io.xml.RowProcessor; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind; diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataExtractor.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataExtractor.java index d466dc9e6ac..24091354ba1 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataExtractor.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataExtractor.java @@ -14,8 +14,8 @@ import java.io.File; import java.io.FileFilter; import java.io.InputStreamReader; import java.net.URI; +import org.eclipse.osee.framework.core.model.ArtifactType; import org.eclipse.osee.framework.jdk.core.util.Lib; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.importing.operations.RoughArtifactCollector; import org.xml.sax.InputSource; diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataSaxHandler.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataSaxHandler.java index 7e69cefc88c..c971bd2a91a 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataSaxHandler.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataSaxHandler.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.framework.skynet.core.importing.parsers; +import org.eclipse.osee.framework.core.model.ArtifactType; import org.eclipse.osee.framework.jdk.core.util.io.xml.AbstractSaxHandler; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind; import org.eclipse.osee.framework.skynet.core.importing.operations.RoughArtifactCollector; diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/IArtifactImportResolver.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/IArtifactImportResolver.java index 826a934fa83..5bc6bae3459 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/IArtifactImportResolver.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/IArtifactImportResolver.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.framework.skynet.core.importing.resolvers; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact; diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java index d54fb665efb..322cbaabd57 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java @@ -15,12 +15,12 @@ import java.io.IOException; import java.net.MalformedURLException;
import java.net.URI;
import java.util.Map.Entry;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactProcessor;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact;
import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/RootAndAttributeBasedArtifactResolver.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/RootAndAttributeBasedArtifactResolver.java index 79f6996009a..5b7e6fda97d 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/RootAndAttributeBasedArtifactResolver.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/RootAndAttributeBasedArtifactResolver.java @@ -18,14 +18,14 @@ import java.util.List; import java.util.Map;
import java.util.Map.Entry;
import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/Activator.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/Activator.java index 0c3ed4e86fa..7550f27515c 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/Activator.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/Activator.java @@ -10,10 +10,30 @@ *******************************************************************************/ package org.eclipse.osee.framework.skynet.core.internal; -import org.eclipse.osee.framework.core.IDataTranslationService; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.eclipse.osee.framework.core.cache.ArtifactTypeCache; +import org.eclipse.osee.framework.core.cache.AttributeTypeCache; +import org.eclipse.osee.framework.core.cache.BranchCache; +import org.eclipse.osee.framework.core.cache.OseeEnumTypeCache; +import org.eclipse.osee.framework.core.cache.RelationTypeCache; +import org.eclipse.osee.framework.core.cache.TransactionCache; import org.eclipse.osee.framework.core.client.ClientSessionManager; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.OseeCachingService; +import org.eclipse.osee.framework.core.services.IDataTranslationService; +import org.eclipse.osee.framework.core.services.IOseeCachingService; +import org.eclipse.osee.framework.core.services.IOseeModelFactoryService; +import org.eclipse.osee.framework.core.services.IOseeModelFactoryServiceProvider; import org.eclipse.osee.framework.skynet.core.attribute.HttpAttributeTagger; import org.eclipse.osee.framework.skynet.core.event.RemoteEventManager; +import org.eclipse.osee.framework.skynet.core.internal.accessors.ServerArtifactTypeAccessor; +import org.eclipse.osee.framework.skynet.core.internal.accessors.ServerAttributeTypeAccessor; +import org.eclipse.osee.framework.skynet.core.internal.accessors.ServerBranchAccessor; +import org.eclipse.osee.framework.skynet.core.internal.accessors.ServerOseeEnumTypeAccessor; +import org.eclipse.osee.framework.skynet.core.internal.accessors.ServerRelationTypeAccessor; import org.eclipse.osee.framework.skynet.core.serverCommit.CommitService; import org.eclipse.osee.framework.skynet.core.serverCommit.ICommitService; import org.osgi.framework.BundleActivator; @@ -24,12 +44,24 @@ import org.osgi.util.tracker.ServiceTracker; /** * @author Ryan D. Brooks */ -public class Activator implements BundleActivator { +public class Activator implements BundleActivator, IOseeModelFactoryServiceProvider { public static final String PLUGIN_ID = "org.eclipse.osee.framework.skynet.core"; - private ServiceRegistration serviceRegistration; - private ServiceTracker commitServiceTracker; - private ServiceTracker translationServiceTracker; + private static Activator instance; + private final Map<TrackerId, ServiceTracker> mappedTrackers; + private final List<ServiceRegistration> services; + + private enum TrackerId { + TRANSLATION_SERVICE, + OSEE_CACHING_SERVICE, + OSEE_FACTORY_SERVICE, + COMMIT_SERVICE; + } + + public Activator() { + this.mappedTrackers = new HashMap<TrackerId, ServiceTracker>(); + this.services = new ArrayList<ServiceRegistration>(); + } @Override public void start(BundleContext context) throws Exception { @@ -37,13 +69,15 @@ public class Activator implements BundleActivator { ClientSessionManager.class.getCanonicalName(); HttpAttributeTagger.getInstance(); - serviceRegistration = context.registerService(ICommitService.class.getName(), new CommitService(), null); + IOseeCachingService cachingService = createCachingService(); - commitServiceTracker = new ServiceTracker(context, ICommitService.class.getName(), null); - commitServiceTracker.open(); + createService(context, IOseeCachingService.class, cachingService); + createService(context, ICommitService.class, new CommitService()); - translationServiceTracker = new ServiceTracker(context, IDataTranslationService.class.getName(), null); - translationServiceTracker.open(); + createServiceTracker(context, IOseeCachingService.class, TrackerId.OSEE_CACHING_SERVICE); + createServiceTracker(context, ICommitService.class, TrackerId.COMMIT_SERVICE); + createServiceTracker(context, IDataTranslationService.class, TrackerId.TRANSLATION_SERVICE); + createServiceTracker(context, IOseeModelFactoryService.class, TrackerId.OSEE_FACTORY_SERVICE); } @Override @@ -51,26 +85,72 @@ public class Activator implements BundleActivator { HttpAttributeTagger.getInstance().deregisterFromEventManager(); RemoteEventManager.deregisterFromRemoteEventManager(); - serviceRegistration.unregister(); - - commitServiceTracker.close(); - commitServiceTracker = null; + for (ServiceRegistration service : services) { + service.unregister(); + } - translationServiceTracker.close(); - translationServiceTracker = null; + for (ServiceTracker tracker : mappedTrackers.values()) { + tracker.close(); + } + services.clear(); + mappedTrackers.clear(); instance = null; } + private IOseeCachingService createCachingService() { + OseeEnumTypeCache oseeEnumTypeCache = new OseeEnumTypeCache(new ServerOseeEnumTypeAccessor(this)); + + AttributeTypeCache attributeTypeCache = + new AttributeTypeCache(new ServerAttributeTypeAccessor(this, oseeEnumTypeCache)); + + ArtifactTypeCache artifactTypeCache = + new ArtifactTypeCache(new ServerArtifactTypeAccessor(this, attributeTypeCache)); + + RelationTypeCache relationTypeCache = + new RelationTypeCache(new ServerRelationTypeAccessor(this, artifactTypeCache)); + + TransactionCache transactionCache = new TransactionCache(null); + + BranchCache branchCache = new BranchCache(new ServerBranchAccessor(this, transactionCache)); + return new OseeCachingService(branchCache, transactionCache, artifactTypeCache, attributeTypeCache, + relationTypeCache, oseeEnumTypeCache); + } + public static Activator getInstance() { return instance; } + public IOseeCachingService getOseeCacheService() { + return getTracker(TrackerId.OSEE_CACHING_SERVICE, IOseeCachingService.class); + } + public ICommitService getCommitBranchService() { - return (ICommitService) commitServiceTracker.getService(); + return getTracker(TrackerId.COMMIT_SERVICE, ICommitService.class); } public IDataTranslationService getTranslationService() { - return (IDataTranslationService) translationServiceTracker.getService(); + return getTracker(TrackerId.TRANSLATION_SERVICE, IDataTranslationService.class); + } + + @Override + public IOseeModelFactoryService getOseeFactoryService() throws OseeCoreException { + return getTracker(TrackerId.OSEE_FACTORY_SERVICE, IOseeModelFactoryService.class); + } + + private void createService(BundleContext context, Class<?> serviceInterface, Object serviceImplementation) { + services.add(context.registerService(serviceInterface.getName(), serviceImplementation, null)); + } + + private void createServiceTracker(BundleContext context, Class<?> clazz, TrackerId trackerId) { + ServiceTracker tracker = new ServiceTracker(context, clazz.getName(), null); + tracker.open(); + mappedTrackers.put(trackerId, tracker); + } + + private <T> T getTracker(TrackerId trackerId, Class<T> clazz) { + ServiceTracker tracker = mappedTrackers.get(trackerId); + Object service = tracker.getService(); + return clazz.cast(service); } }
\ No newline at end of file diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/AbstractServerDataAccessor.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/AbstractServerDataAccessor.java new file mode 100644 index 00000000000..caa232f7c20 --- /dev/null +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/AbstractServerDataAccessor.java @@ -0,0 +1,80 @@ +/*******************************************************************************
+ * Copyright (c) 2009 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.framework.skynet.core.internal.accessors;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import org.eclipse.osee.framework.core.cache.AbstractOseeCache;
+import org.eclipse.osee.framework.core.cache.IOseeDataAccessor;
+import org.eclipse.osee.framework.core.data.CacheUpdateRequest;
+import org.eclipse.osee.framework.core.data.CacheUpdateResponse;
+import org.eclipse.osee.framework.core.data.OseeServerContext;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.IOseeStorableType;
+import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
+import org.eclipse.osee.framework.core.services.IOseeModelFactoryServiceProvider;
+import org.eclipse.osee.framework.skynet.core.artifact.HttpMessage;
+
+/**
+ * @author Roberto E. Escobar
+ */
+public abstract class AbstractServerDataAccessor<T extends IOseeStorableType> implements IOseeDataAccessor<T> {
+
+ private final IOseeModelFactoryServiceProvider factoryProvider;
+
+ protected AbstractServerDataAccessor(IOseeModelFactoryServiceProvider factoryProvider) {
+ this.factoryProvider = factoryProvider;
+ }
+
+ protected IOseeModelFactoryService getOseeFactoryService() throws OseeCoreException {
+ return factoryProvider.getOseeFactoryService();
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void load(AbstractOseeCache<T> cache) throws OseeCoreException {
+ Map<String, String> parameters = new HashMap<String, String>();
+ parameters.put("request", "update");
+ CacheUpdateRequest<T> updateRequest = new CacheUpdateRequest<T>();
+ CacheUpdateResponse<T> updateResponse =
+ HttpMessage.send(OseeServerContext.CACHE_CONTEXT, parameters, updateRequest, CacheUpdateResponse.class);
+ updateCache(cache, updateResponse);
+
+ for (T updated : updateResponse.getItems()) {
+ T type = cache.getByGuid(updated.getGuid());
+ if (type != null) {
+ type.clearDirty();
+ }
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void store(Collection<T> types) throws OseeCoreException {
+ Map<String, String> parameters = new HashMap<String, String>();
+ parameters.put("request", "storage");
+
+ CacheUpdateRequest<T> updateRequest = new CacheUpdateRequest<T>();
+ CacheUpdateResponse<T> updateResponse =
+ HttpMessage.send(OseeServerContext.CACHE_CONTEXT, parameters, updateRequest, CacheUpdateResponse.class);
+
+ for (T updated : updateResponse.getItems()) {
+ for (T type : types) {
+ if (type.getGuid().equals(updated.getGuid())) {
+ type.clearDirty();
+ }
+ }
+ }
+ }
+
+ protected abstract void updateCache(AbstractOseeCache<T> cache, CacheUpdateResponse<T> updateResponse) throws OseeCoreException;
+}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ServerArtifactTypeAccessor.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ServerArtifactTypeAccessor.java new file mode 100644 index 00000000000..4150ffe947c --- /dev/null +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ServerArtifactTypeAccessor.java @@ -0,0 +1,58 @@ +/*******************************************************************************
+ * Copyright (c) 2004, 2007 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.framework.skynet.core.internal.accessors;
+
+import org.eclipse.osee.framework.core.cache.AbstractOseeCache;
+import org.eclipse.osee.framework.core.data.CacheUpdateResponse;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.ArtifactTypeFactory;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.services.IOseeModelFactoryServiceProvider;
+
+/**
+ * @author Roberto E. Escobar
+ */
+public class ServerArtifactTypeAccessor extends AbstractServerDataAccessor<ArtifactType> {
+
+ private final AbstractOseeCache<AttributeType> attrCache;
+
+ public ServerArtifactTypeAccessor(IOseeModelFactoryServiceProvider factoryProvider, AbstractOseeCache<AttributeType> attrCache) {
+ super(factoryProvider);
+ this.attrCache = attrCache;
+ }
+
+ protected ArtifactTypeFactory getFactory() throws OseeCoreException {
+ return getOseeFactoryService().getArtifactTypeFactory();
+ }
+
+ @Override
+ public void load(AbstractOseeCache<ArtifactType> cache) throws OseeCoreException {
+ attrCache.ensurePopulated();
+ super.load(cache);
+ }
+
+ @Override
+ protected void updateCache(AbstractOseeCache<ArtifactType> cache, CacheUpdateResponse<ArtifactType> updateResponse) throws OseeCoreException {
+ for (ArtifactType updated : updateResponse.getItems()) {
+ ArtifactType type =
+ getFactory().createOrUpdate(cache, updated.getId(), updated.getModificationType(), updated.getGuid(),
+ updated.isAbstract(), updated.getName());
+ }
+
+ for (ArtifactType updated : updateResponse.getItems()) {
+ // for (Entry<Branch, Collection<AttributeType>> entry : updated.getLocalAttributeTypes().entrySet()) {
+ // type.setAttributeTypes(entry.getValue(), entry.getKey());
+ // }
+ // type.setSuperType(new HashSet<ArtifactType>(updated.getSuperArtifactTypes()));
+ }
+ }
+}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ServerAttributeTypeAccessor.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ServerAttributeTypeAccessor.java new file mode 100644 index 00000000000..77451dfe8dd --- /dev/null +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ServerAttributeTypeAccessor.java @@ -0,0 +1,47 @@ +/*******************************************************************************
+ * Copyright (c) 2004, 2007 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.framework.skynet.core.internal.accessors;
+
+import org.eclipse.osee.framework.core.cache.AbstractOseeCache;
+import org.eclipse.osee.framework.core.data.CacheUpdateResponse;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.AttributeTypeFactory;
+import org.eclipse.osee.framework.core.model.OseeEnumType;
+import org.eclipse.osee.framework.core.services.IOseeModelFactoryServiceProvider;
+
+/**
+ * @author Roberto E. Escobar
+ */
+public class ServerAttributeTypeAccessor extends AbstractServerDataAccessor<AttributeType> {
+
+ private final AbstractOseeCache<OseeEnumType> enumCache;
+
+ public ServerAttributeTypeAccessor(IOseeModelFactoryServiceProvider factoryProvider, AbstractOseeCache<OseeEnumType> enumCache) {
+ super(factoryProvider);
+ this.enumCache = enumCache;
+ }
+
+ protected AttributeTypeFactory getFactory() throws OseeCoreException {
+ return getOseeFactoryService().getAttributeTypeFactory();
+ }
+
+ @Override
+ public void load(AbstractOseeCache<AttributeType> cache) throws OseeCoreException {
+ enumCache.ensurePopulated();
+ super.load(cache);
+ }
+
+ @Override
+ protected void updateCache(AbstractOseeCache<AttributeType> cache, CacheUpdateResponse<AttributeType> updateResponse) throws OseeCoreException {
+ }
+
+}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ServerBranchAccessor.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ServerBranchAccessor.java new file mode 100644 index 00000000000..de1d7147e3f --- /dev/null +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ServerBranchAccessor.java @@ -0,0 +1,47 @@ +/*******************************************************************************
+ * Copyright (c) 2004, 2007 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.framework.skynet.core.internal.accessors;
+
+import org.eclipse.osee.framework.core.cache.AbstractOseeCache;
+import org.eclipse.osee.framework.core.cache.TransactionCache;
+import org.eclipse.osee.framework.core.data.CacheUpdateResponse;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.BranchFactory;
+import org.eclipse.osee.framework.core.services.IOseeModelFactoryServiceProvider;
+
+/**
+ * @author Roberto E. Escobar
+ */
+public class ServerBranchAccessor extends AbstractServerDataAccessor<Branch> {
+
+ private final TransactionCache transactionCache;
+
+ public ServerBranchAccessor(IOseeModelFactoryServiceProvider factoryProvider, TransactionCache transactionCache) {
+ super(factoryProvider);
+ this.transactionCache = transactionCache;
+ }
+
+ protected BranchFactory getFactory() throws OseeCoreException {
+ return getOseeFactoryService().getBranchFactory();
+ }
+
+ @Override
+ public void load(AbstractOseeCache<Branch> cache) throws OseeCoreException {
+ transactionCache.ensurePopulated();
+ super.load(cache);
+ }
+
+ @Override
+ protected void updateCache(AbstractOseeCache<Branch> cache, CacheUpdateResponse<Branch> updateResponse) throws OseeCoreException {
+ }
+
+}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ServerOseeEnumTypeAccessor.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ServerOseeEnumTypeAccessor.java new file mode 100644 index 00000000000..b08a3a47103 --- /dev/null +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ServerOseeEnumTypeAccessor.java @@ -0,0 +1,45 @@ +/*******************************************************************************
+ * Copyright (c) 2004, 2007 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.framework.skynet.core.internal.accessors;
+
+import java.util.Arrays;
+import org.eclipse.osee.framework.core.cache.AbstractOseeCache;
+import org.eclipse.osee.framework.core.data.CacheUpdateResponse;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.OseeEnumEntry;
+import org.eclipse.osee.framework.core.model.OseeEnumType;
+import org.eclipse.osee.framework.core.model.OseeEnumTypeFactory;
+import org.eclipse.osee.framework.core.services.IOseeModelFactoryServiceProvider;
+
+/**
+ * @author Roberto E. Escobar
+ */
+public class ServerOseeEnumTypeAccessor extends AbstractServerDataAccessor<OseeEnumType> {
+
+ public ServerOseeEnumTypeAccessor(IOseeModelFactoryServiceProvider factoryProvider) {
+ super(factoryProvider);
+ }
+
+ protected OseeEnumTypeFactory getFactory() throws OseeCoreException {
+ return getOseeFactoryService().getOseeEnumTypeFactory();
+ }
+
+ @Override
+ protected void updateCache(AbstractOseeCache<OseeEnumType> cache, CacheUpdateResponse<OseeEnumType> updateResponse) throws OseeCoreException {
+ for (OseeEnumType updated : updateResponse.getItems()) {
+ OseeEnumType type =
+ getFactory().createOrUpdate(cache, updated.getId(), updated.getModificationType(), updated.getGuid(),
+ updated.getName());
+ OseeEnumEntry[] entries = updated.values();
+ type.setEntries(Arrays.asList(entries));
+ }
+ }
+}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ServerRelationTypeAccessor.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ServerRelationTypeAccessor.java new file mode 100644 index 00000000000..9891a9ec305 --- /dev/null +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ServerRelationTypeAccessor.java @@ -0,0 +1,54 @@ +/*******************************************************************************
+ * Copyright (c) 2004, 2007 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.framework.skynet.core.internal.accessors;
+
+import org.eclipse.osee.framework.core.cache.AbstractOseeCache;
+import org.eclipse.osee.framework.core.data.CacheUpdateResponse;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.RelationType;
+import org.eclipse.osee.framework.core.model.RelationTypeFactory;
+import org.eclipse.osee.framework.core.services.IOseeModelFactoryServiceProvider;
+
+/**
+ * @author Roberto E. Escobar
+ */
+public class ServerRelationTypeAccessor extends AbstractServerDataAccessor<RelationType> {
+
+ private final AbstractOseeCache<ArtifactType> artCache;
+
+ public ServerRelationTypeAccessor(IOseeModelFactoryServiceProvider factoryProvider, AbstractOseeCache<ArtifactType> artCache) {
+ super(factoryProvider);
+ this.artCache = artCache;
+ }
+
+ protected RelationTypeFactory getFactory() throws OseeCoreException {
+ return getOseeFactoryService().getRelationTypeFactory();
+ }
+
+ @Override
+ public void load(AbstractOseeCache<RelationType> cache) throws OseeCoreException {
+ artCache.ensurePopulated();
+ super.load(cache);
+ }
+
+ @Override
+ protected void updateCache(AbstractOseeCache<RelationType> cache, CacheUpdateResponse<RelationType> updateResponse) throws OseeCoreException {
+ for (RelationType updated : updateResponse.getItems()) {
+ ArtifactType aSideType = artCache.getByGuid(updated.getArtifactTypeSideA().getGuid());
+ ArtifactType bSideType = artCache.getByGuid(updated.getArtifactTypeSideB().getGuid());
+ getFactory().createOrUpdate(cache, updated.getId(), updated.getModificationType(), updated.getGuid(),
+ updated.getName(), updated.getSideAName(), updated.getSideBName(), aSideType, bSideType,
+ updated.getMultiplicity(), updated.getDefaultOrderTypeGuid());
+
+ }
+ }
+}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java index c5ac1cee878..34406bcefb3 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java @@ -10,8 +10,8 @@ *******************************************************************************/
package org.eclipse.osee.framework.skynet.core.linking;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.jdk.core.util.xml.Xml;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/WordMlLinkHandler.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/WordMlLinkHandler.java index 77857c0d851..1861dcc255e 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/WordMlLinkHandler.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/WordMlLinkHandler.java @@ -17,10 +17,10 @@ import java.util.List; import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.jdk.core.text.change.ChangeSet;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.jdk.core.util.Collections;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/CoreRelationEnumeration.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/CoreRelationEnumeration.java index 064b582ba76..58fe4a3c847 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/CoreRelationEnumeration.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/CoreRelationEnumeration.java @@ -15,6 +15,7 @@ import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_B; import org.eclipse.osee.framework.core.data.IOseeType; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.RelationType; public enum CoreRelationEnumeration implements IRelationEnumeration, IOseeType { diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/IRelationEnumeration.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/IRelationEnumeration.java index d0c5f4124e7..29a30565e92 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/IRelationEnumeration.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/IRelationEnumeration.java @@ -12,6 +12,7 @@ package org.eclipse.osee.framework.skynet.core.relation; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.RelationType; public interface IRelationEnumeration { boolean isSideA(); diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java index 0b6db5292f1..0898b3d89c5 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java @@ -11,13 +11,14 @@ package org.eclipse.osee.framework.skynet.core.relation;
import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java index 5b56c9febfd..7c2b8d2573c 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.data.IRelationSorterId;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
@@ -30,6 +30,8 @@ import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist; import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.SQL3DataType;
import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap;
@@ -45,7 +47,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactLoader; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManager;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
-import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorterId;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderFactory;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationSorterProvider;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTransactionData.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTransactionData.java index 408d252bde7..b9f40f40d6d 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTransactionData.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTransactionData.java @@ -11,10 +11,10 @@ package org.eclipse.osee.framework.skynet.core.relation;
import java.util.Collection;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.OseeSql;
import org.eclipse.osee.framework.database.core.SequenceManager;
import org.eclipse.osee.framework.skynet.core.event.ArtifactTransactionModifiedEvent;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationType.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationType.java deleted file mode 100644 index f1fdb4b5d5d..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationType.java +++ /dev/null @@ -1,128 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.relation; - -import org.eclipse.osee.framework.core.data.AbstractOseeCache; -import org.eclipse.osee.framework.core.data.OseeField; -import org.eclipse.osee.framework.core.enums.RelationSide; -import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity; -import org.eclipse.osee.framework.core.exception.OseeArgumentException; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; -import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes; -import org.eclipse.osee.framework.skynet.core.types.AbstractCachingType; - -/** - * @author Robert A. Fisher - */ -public class RelationType extends AbstractCachingType implements Comparable<RelationType> { - - private static final String RELATION_SIDE_A_NAME_FIELD_KEY = "osee.relation.type.side.a.name.field"; - private static final String RELATION_SIDE_B_NAME_FIELD_KEY = "osee.relation.type.side.b.name.field"; - private static final String RELATION_SIDE_A_ART_TYPE_FIELD_KEY = "osee.relation.type.side.a.artifact.type.field"; - private static final String RELATION_SIDE_B_ART_TYPE_FIELD_KEY = "osee.relation.type.side.b.artifact.type.field"; - private static final String RELATION_DEFAULT_ORDER_TYPE_GUID_FIELD_KEY = - "osee.relation.type.default.order.type.guid.field"; - private static final String RELATION_MULTIPLICITY_FIELD_KEY = "osee.relation.type.multiplicity.field"; - - public RelationType(AbstractOseeCache<RelationType> cache, String guid, String relationTypeName, String sideAName, String sideBName, ArtifactType artifactTypeSideA, ArtifactType artifactTypeSideB, RelationTypeMultiplicity multiplicity, String defaultOrderTypeGuid) { - super(cache, guid, relationTypeName); - setFields(relationTypeName, sideAName, sideBName, artifactTypeSideA, artifactTypeSideB, multiplicity, - defaultOrderTypeGuid); - } - - @Override - protected void initializeFields() { - addField(RELATION_SIDE_A_NAME_FIELD_KEY, new OseeField<String>()); - addField(RELATION_SIDE_B_NAME_FIELD_KEY, new OseeField<String>()); - addField(RELATION_SIDE_A_ART_TYPE_FIELD_KEY, new OseeField<ArtifactType>()); - addField(RELATION_SIDE_B_ART_TYPE_FIELD_KEY, new OseeField<ArtifactType>()); - addField(RELATION_DEFAULT_ORDER_TYPE_GUID_FIELD_KEY, new OseeField<String>()); - addField(RELATION_MULTIPLICITY_FIELD_KEY, new OseeField<RelationTypeMultiplicity>()); - } - - public void setFields(String relationTypeName, String sideAName, String sideBName, ArtifactType artifactTypeSideA, ArtifactType artifactTypeSideB, RelationTypeMultiplicity multiplicity, String defaultOrderTypeGuid) { - setName(relationTypeName); - setFieldLogException(RELATION_SIDE_A_NAME_FIELD_KEY, sideAName); - setFieldLogException(RELATION_SIDE_B_NAME_FIELD_KEY, sideBName); - setFieldLogException(RELATION_SIDE_A_ART_TYPE_FIELD_KEY, artifactTypeSideA); - setFieldLogException(RELATION_SIDE_B_ART_TYPE_FIELD_KEY, artifactTypeSideB); - setFieldLogException(RELATION_DEFAULT_ORDER_TYPE_GUID_FIELD_KEY, defaultOrderTypeGuid); - setFieldLogException(RELATION_MULTIPLICITY_FIELD_KEY, multiplicity); - } - - public RelationTypeMultiplicity getMultiplicity() { - return getFieldValueLogException(null, RELATION_MULTIPLICITY_FIELD_KEY); - } - - public ArtifactType getArtifactTypeSideA() { - return getFieldValueLogException(null, RELATION_SIDE_A_ART_TYPE_FIELD_KEY); - } - - public ArtifactType getArtifactTypeSideB() { - return getFieldValueLogException(null, RELATION_SIDE_B_ART_TYPE_FIELD_KEY); - } - - public ArtifactType getArtifactType(RelationSide relationSide) { - return relationSide == RelationSide.SIDE_A ? getArtifactTypeSideA() : getArtifactTypeSideB(); - } - - public String getSideName(RelationSide relationSide) { - return relationSide == RelationSide.SIDE_A ? getSideAName() : getSideBName(); - } - - public boolean isArtifactTypeAllowed(RelationSide relationSide, ArtifactType artifactType) { - ArtifactType allowedType = getArtifactType(relationSide); - return artifactType.inheritsFrom(allowedType); - } - - /** - * @return Returns the sideAName. - */ - public String getSideAName() { - return getFieldValueLogException("", RELATION_SIDE_A_NAME_FIELD_KEY); - } - - /** - * @return Returns the sideBName. - */ - public String getSideBName() { - return getFieldValueLogException("", RELATION_SIDE_B_NAME_FIELD_KEY); - } - - public boolean isSideAName(String sideName) throws OseeArgumentException { - if (!getSideAName().equals(sideName) && !getSideBName().equals(sideName)) { - throw new OseeArgumentException("sideName does not match either of the available side names"); - } - - return getSideAName().equals(sideName); - } - - public int compareTo(RelationType other) { - int result = -1; - if (other != null && other.getName() != null && getName() != null) { - result = getName().compareTo(other.getName()); - } - return result; - } - - @Override - public String toString() { - return String.format("[%s]<-[%s]->[%s]", getSideAName(), getName(), getSideBName()); - } - - public boolean isOrdered() { - return !RelationOrderBaseTypes.UNORDERED.getGuid().equals(getDefaultOrderTypeGuid()); - } - - public String getDefaultOrderTypeGuid() { - return getFieldValueLogException("", RELATION_DEFAULT_ORDER_TYPE_GUID_FIELD_KEY); - } -}
\ No newline at end of file diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeManager.java index d73fea12809..4ab910b0f57 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeManager.java @@ -13,13 +13,14 @@ package org.eclipse.osee.framework.skynet.core.relation; import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.cache.AbstractOseeCache;
import org.eclipse.osee.framework.core.enums.RelationSide;
-import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeManager;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
+import org.eclipse.osee.framework.skynet.core.internal.Activator;
/**
* @author Ryan D. Brooks
@@ -30,6 +31,10 @@ public class RelationTypeManager { private RelationTypeManager() {
}
+ public static AbstractOseeCache<RelationType> getCache() {
+ return Activator.getInstance().getOseeCacheService().getRelationTypeCache();
+ }
+
public static List<RelationType> getValidTypes(ArtifactType artifactType, Branch branch) throws OseeCoreException {
Collection<RelationType> relationTypes = getAllTypes();
List<RelationType> validRelationTypes = new ArrayList<RelationType>();
@@ -67,11 +72,11 @@ public class RelationTypeManager { * @throws OseeCoreException
*/
public static Collection<RelationType> getAllTypes() throws OseeCoreException {
- return OseeTypeManager.getCache().getRelationTypeCache().getAll();
+ return getCache().getAll();
}
public static RelationType getType(int relationTypeId) throws OseeCoreException {
- RelationType relationType = OseeTypeManager.getCache().getRelationTypeCache().getById(relationTypeId);
+ RelationType relationType = getCache().getById(relationTypeId);
if (relationType == null) {
throw new OseeTypeDoesNotExist("The relation with type id[" + relationTypeId + "] does not exist");
}
@@ -79,7 +84,7 @@ public class RelationTypeManager { }
public static RelationType getType(String typeName) throws OseeCoreException {
- RelationType relationType = OseeTypeManager.getCache().getRelationTypeCache().getUniqueByName(typeName);
+ RelationType relationType = getCache().getUniqueByName(typeName);
if (relationType == null) {
throw new OseeTypeDoesNotExist("The relation type [" + typeName + "] does not exist");
}
@@ -87,15 +92,10 @@ public class RelationTypeManager { }
public static boolean typeExists(String name) throws OseeCoreException {
- return !OseeTypeManager.getCache().getRelationTypeCache().getByName(name).isEmpty();
- }
-
- public static RelationType createType(String guid, String typeName, String sideAName, String sideBName, ArtifactType artifactTypeSideA, ArtifactType artifactTypeSideB, RelationTypeMultiplicity multiplicity, String defaultOrderTypeGuid) throws OseeCoreException {
- return OseeTypeManager.getCache().getRelationTypeCache().createType(guid, typeName, sideAName, sideBName,
- artifactTypeSideA, artifactTypeSideB, multiplicity, defaultOrderTypeGuid);
+ return !getCache().getByName(name).isEmpty();
}
public static void persist() throws OseeCoreException {
- OseeTypeManager.getCache().getRelationTypeCache().storeAllModified();
+ getCache().storeAllModified();
}
}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSide.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSide.java index e5da04eab09..abdf3781dbd 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSide.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSide.java @@ -12,6 +12,7 @@ package org.eclipse.osee.framework.skynet.core.relation;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.model.RelationType;
/**
* @author Andrew M. Finkbeiner
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorter.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorter.java index 2872417960d..f4108c02867 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorter.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorter.java @@ -13,12 +13,13 @@ package org.eclipse.osee.framework.skynet.core.relation; import java.util.Collections;
import java.util.List;
+import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter;
-import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorterId;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationSorterProvider;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/IRelationSorter.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/IRelationSorter.java index 37310936bf3..f77602c1bae 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/IRelationSorter.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/IRelationSorter.java @@ -11,6 +11,7 @@ package org.eclipse.osee.framework.skynet.core.relation.order; import java.util.List; +import org.eclipse.osee.framework.core.data.IRelationSorterId; import org.eclipse.osee.framework.skynet.core.types.IArtifact; /** diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderBaseTypes.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderBaseTypes.java deleted file mode 100644 index f741f8bb081..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderBaseTypes.java +++ /dev/null @@ -1,65 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.framework.skynet.core.relation.order; - -import org.eclipse.osee.framework.core.exception.OseeArgumentException; - -/** - * @author Andrew M. Finkbeiner - */ -public enum RelationOrderBaseTypes implements IRelationSorterId { - - USER_DEFINED("AAT0xogoMjMBhARkBZQA", "User Defined"), - LEXICOGRAPHICAL_ASC("AAT1QW4eVE+YuzsoHFAA", "Lexicographical Ascending"), - LEXICOGRAPHICAL_DESC("AAmATn6R9m7VCXQQwuQA", "Lexicographical Descending"), - UNORDERED("AAT1uKZpeDQExlygoIAA", "Unordered"); - - private String guid; - private String prettyName; - - RelationOrderBaseTypes(String guid, String prettyName) { - this.guid = guid; - this.prettyName = prettyName; - } - - @Override - public String getGuid() { - return guid; - } - - @Override - public String prettyName() { - return prettyName; - } - - @Override - public String toString() { - return String.format("[%s,%s]", prettyName(), getGuid()); - } - - public static RelationOrderBaseTypes getFromGuid(String guid) throws OseeArgumentException { - for (RelationOrderBaseTypes type : values()) { - if (type.getGuid().equals(guid)) { - return type; - } - } - throw new OseeArgumentException("Order type guid does not map to an enum"); - } - - public static RelationOrderBaseTypes getFromOrderTypeName(String orderTypeName) throws OseeArgumentException { - for (RelationOrderBaseTypes type : values()) { - if (type.prettyName.equals(orderTypeName)) { - return type; - } - } - throw new OseeArgumentException("Order type name does not map to an enum"); - } -} diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java index d6c35663aed..5c1293e0508 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java @@ -16,12 +16,14 @@ import java.util.Collections; import java.util.Comparator;
import java.util.List;
import java.util.Map.Entry;
+import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap;
import org.eclipse.osee.framework.jdk.core.type.Pair;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderFactory.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderFactory.java index b4d5bb67664..2431b020296 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderFactory.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderFactory.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.relation.order; import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSideSorter;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterIdComparator.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterIdComparator.java index b038c579f00..a7467d4464f 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterIdComparator.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterIdComparator.java @@ -11,6 +11,7 @@ package org.eclipse.osee.framework.skynet.core.relation.order; import java.util.Comparator; +import org.eclipse.osee.framework.core.data.IRelationSorterId; /** * @author Andrew M. Finkbeiner diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProvider.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProvider.java index ed951b7bd6c..ee0d4bb348e 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProvider.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProvider.java @@ -16,6 +16,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.eclipse.osee.framework.core.data.IRelationSorterId; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.GUID; diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/LexicographicalRelationSorter.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/LexicographicalRelationSorter.java index dcafa9dcd2c..40ba9d9f355 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/LexicographicalRelationSorter.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/LexicographicalRelationSorter.java @@ -12,10 +12,10 @@ package org.eclipse.osee.framework.skynet.core.relation.sorters; import java.util.Collections; import java.util.List; +import org.eclipse.osee.framework.core.data.IRelationSorterId; +import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactNameComparator; import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter; -import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorterId; -import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes; import org.eclipse.osee.framework.skynet.core.types.IArtifact; /** diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UnorderedRelationSorter.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UnorderedRelationSorter.java index d36fbe3ed48..941a1bea78a 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UnorderedRelationSorter.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UnorderedRelationSorter.java @@ -11,9 +11,9 @@ package org.eclipse.osee.framework.skynet.core.relation.sorters; import java.util.List; +import org.eclipse.osee.framework.core.data.IRelationSorterId; +import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes; import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter; -import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorterId; -import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes; import org.eclipse.osee.framework.skynet.core.types.IArtifact; /** diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UserDefinedRelationSorter.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UserDefinedRelationSorter.java index 8d71cf8f9ff..8407f3289eb 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UserDefinedRelationSorter.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UserDefinedRelationSorter.java @@ -12,9 +12,9 @@ package org.eclipse.osee.framework.skynet.core.relation.sorters; import java.util.Collections; import java.util.List; +import org.eclipse.osee.framework.core.data.IRelationSorterId; +import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes; import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter; -import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorterId; -import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes; import org.eclipse.osee.framework.skynet.core.types.IArtifact; /** diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java index 1ffbc618979..cd0141f67ce 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java @@ -16,11 +16,11 @@ import java.util.Collection; import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeSql;
import org.eclipse.osee.framework.database.core.SQL3DataType;
import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap;
@@ -111,7 +111,7 @@ public class ChangeManager { HashCollection<Artifact, TransactionRecord> transactionMap = new HashCollection<Artifact, TransactionRecord>();
try {
ArtifactLoader.insertIntoArtifactJoin(insertParameters);
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(insertParameters.size() * 2,
ClientSessionManager.getSql(OseeSql.CHANGE_TX_MODIFYING), queryId);
@@ -147,7 +147,7 @@ public class ChangeManager { for (Artifact artifact : artifacts) {
artifactMap.put(artifact.getArtId(), artifact.getBranch(), artifact);
// for each combination of artifact and all working branches in its hierarchy
- for (Branch workingBranch : artifact.getBranch().getWorkingBranches()) {
+ for (Branch workingBranch : BranchManager.getWorkingBranches(artifact.getBranch())) {
insertParameters.add(new Object[] {queryId, insertTime, artifact.getArtId(), workingBranch.getId(),
SQL3DataType.INTEGER});
}
@@ -156,7 +156,7 @@ public class ChangeManager { HashCollection<Artifact, Branch> branchMap = new HashCollection<Artifact, Branch>();
try {
ArtifactLoader.insertIntoArtifactJoin(insertParameters);
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(insertParameters.size() * 2,
ClientSessionManager.getSql(OseeSql.CHANGE_BRANCH_MODIFYING), queryId);
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeReportDataLoader.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeReportDataLoader.java index b85d43b719a..a76310238c7 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeReportDataLoader.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeReportDataLoader.java @@ -14,12 +14,12 @@ import java.util.LinkedList; import java.util.List;
import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.ChangeItem;
import org.eclipse.osee.framework.core.data.ChangeVersion;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.core.operation.CompositeOperation;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java index f46b2cb1c4f..275c1b423c1 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java @@ -21,8 +21,6 @@ import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.ConflictStatus;
import org.eclipse.osee.framework.core.enums.ModificationType;
@@ -31,8 +29,10 @@ import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.TransactionDoesNotExist;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeSql;
import org.eclipse.osee.framework.database.core.SQL3DataType;
import org.eclipse.osee.framework.jdk.core.util.Lib;
@@ -83,7 +83,7 @@ public class ConflictManagerInternal { totalTime = System.currentTimeMillis();
}
ArrayList<Conflict> conflicts = new ArrayList<Conflict>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
if (DEBUG) {
System.out.println("Running Query to find conflicts stored in the DataBase");
time = System.currentTimeMillis();
@@ -251,7 +251,7 @@ public class ConflictManagerInternal { time = System.currentTimeMillis();
}
monitor.subTask("Finding Artifact Version Conflicts");
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(ClientSessionManager.getSql(OseeSql.CONFLICT_GET_ARTIFACTS), sourceBranch.getId(),
@@ -315,7 +315,7 @@ public class ConflictManagerInternal { time = System.currentTimeMillis();
}
monitor.subTask("Finding the Attribute Conflicts");
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
AttributeConflictBuilder attributeConflictBuilder;
try {
chStmt.runPreparedQuery(ClientSessionManager.getSql(OseeSql.CONFLICT_GET_ATTRIBUTES), sourceBranch.getId(),
@@ -382,7 +382,7 @@ public class ConflictManagerInternal { * @throws OseeDataStoreException
*/
private static boolean isAttributeConflictValidOnBranch(int destinationGammaId, Branch branch, int endTransactionNumber) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
boolean isValidConflict;
try {
chStmt.runPreparedQuery(
@@ -437,7 +437,7 @@ public class ConflictManagerInternal { public static Collection<Integer> getDestinationBranchesMerged(int sourceBranchId) throws OseeCoreException {
List<Integer> destinationBranches = new LinkedList<Integer>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(GET_DESTINATION_BRANCHES, sourceBranchId);
while (chStmt.next()) {
@@ -452,7 +452,7 @@ public class ConflictManagerInternal { private static int getCommitTransaction(Branch sourceBranch, Branch destBranch) throws OseeCoreException {
int transactionId = 0;
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
if (sourceBranch != null && destBranch != null) {
chStmt.runPreparedQuery(GET_MERGE_DATA, sourceBranch.getId(), destBranch.getId());
@@ -475,7 +475,7 @@ public class ConflictManagerInternal { public static int getMergeBranchId(int sourceBranchId, int destBranchId) throws OseeCoreException {
int mergeBranchId = 0;
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(GET_MERGE_DATA, sourceBranchId, destBranchId);
if (chStmt.next()) {
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/RevisionChangeLoader.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/RevisionChangeLoader.java index 6aec7f9285e..c7492d18c4f 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/RevisionChangeLoader.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/RevisionChangeLoader.java @@ -17,13 +17,12 @@ import java.util.HashSet; import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.SQL3DataType;
import org.eclipse.osee.framework.jdk.core.util.time.GlobalTime;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -74,7 +73,7 @@ public final class RevisionChangeLoader { private Collection<TransactionRecord> getTransactionsPerArtifact(Branch branch, Artifact artifact, TransactionRecord transactionId) throws OseeCoreException {
Set<TransactionRecord> transactionIds = new HashSet<TransactionRecord>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(
"SELECT /*+ ordered FIRST_ROWS */ td1.transaction_id from osee_tx_details td1, osee_txs tx1, osee_artifact_version av1 where td1.branch_id = ? and td1.transaction_id = tx1.transaction_id and td1.transaction_id <=? and tx1.gamma_id = av1.gamma_id and av1.art_id = ?",
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/ArtifactChangeAcquirer.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/ArtifactChangeAcquirer.java index e3cac673a11..972c6363096 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/ArtifactChangeAcquirer.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/ArtifactChangeAcquirer.java @@ -11,12 +11,12 @@ import java.util.Map; import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeSql;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -43,7 +43,7 @@ public class ArtifactChangeAcquirer extends ChangeAcquirer { TransactionRecord toTransactionId;
getMonitor().subTask("Gathering New or Deleted Artifacts");
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
if (hasBranch) { //Changes per a branch
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/AttributeChangeAcquirer.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/AttributeChangeAcquirer.java index 52384858972..91017f8986a 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/AttributeChangeAcquirer.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/AttributeChangeAcquirer.java @@ -15,13 +15,13 @@ import java.util.Map; import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeSql;
import org.eclipse.osee.framework.database.core.SQL3DataType;
import org.eclipse.osee.framework.jdk.core.type.Pair;
@@ -49,7 +49,7 @@ public class AttributeChangeAcquirer extends ChangeAcquirer { Map<Integer, ChangeBuilder> attributesWasValueCache = new HashMap<Integer, ChangeBuilder>();
Map<Integer, ModificationType> artModTypes = new HashMap<Integer, ModificationType>();
Set<Integer> modifiedArtifacts = new HashSet<Integer>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
boolean hasBranch = getSourceBranch() != null;
long time = System.currentTimeMillis();
try {
@@ -96,7 +96,7 @@ public class AttributeChangeAcquirer extends ChangeAcquirer { return getChangeBuilders();
}
- private void loadIsValues(Branch sourceBranch, Set<Integer> artIds, ArrayList<ChangeBuilder> changeBuilders, Set<Integer> newAndDeletedArtifactIds, IProgressMonitor monitor, Map<Integer, ChangeBuilder> attributesWasValueCache, Map<Integer, ModificationType> artModTypes, Set<Integer> modifiedArtifacts, ConnectionHandlerStatement chStmt, boolean hasBranch, long time, TransactionRecord fromTransactionId, TransactionRecord toTransactionId, boolean hasSpecificArtifact) throws OseeCoreException {
+ private void loadIsValues(Branch sourceBranch, Set<Integer> artIds, ArrayList<ChangeBuilder> changeBuilders, Set<Integer> newAndDeletedArtifactIds, IProgressMonitor monitor, Map<Integer, ChangeBuilder> attributesWasValueCache, Map<Integer, ModificationType> artModTypes, Set<Integer> modifiedArtifacts, IOseeStatement chStmt, boolean hasBranch, long time, TransactionRecord fromTransactionId, TransactionRecord toTransactionId, boolean hasSpecificArtifact) throws OseeCoreException {
ModificationType artModType;
AttributeChangeBuilder attributeChangeBuilder;
@@ -185,7 +185,7 @@ public class AttributeChangeAcquirer extends ChangeAcquirer { int queryId = ArtifactLoader.getNewQueryId();
Timestamp insertTime = GlobalTime.GreenwichMeanTimestamp();
List<Object[]> datas = new LinkedList<Object[]>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
// insert into the artifact_join_table
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/ChangeAcquirer.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/ChangeAcquirer.java index 5bf5ca5dd6d..69f3e0303a5 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/ChangeAcquirer.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/ChangeAcquirer.java @@ -8,9 +8,9 @@ package org.eclipse.osee.framework.skynet.core.revision.acquirer; import java.util.ArrayList;
import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.change.ChangeBuilder;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/RelationChangeAcquirer.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/RelationChangeAcquirer.java index 65183935885..b8b9793775a 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/RelationChangeAcquirer.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/RelationChangeAcquirer.java @@ -9,12 +9,12 @@ import java.util.ArrayList; import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeSql;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -36,7 +36,7 @@ public class RelationChangeAcquirer extends ChangeAcquirer { @Override
public ArrayList<ChangeBuilder> acquireChanges() throws OseeCoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
TransactionRecord fromTransactionId;
TransactionRecord toTransactionId;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/serverCommit/CommitService.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/serverCommit/CommitService.java index 4288fbc34c0..6d77526d6b2 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/serverCommit/CommitService.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/serverCommit/CommitService.java @@ -13,10 +13,10 @@ package org.eclipse.osee.framework.skynet.core.serverCommit; import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.ChangeItem;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.core.operation.CompositeOperation;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/BaseTransactionData.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/BaseTransactionData.java index b6fa9bd12ef..f90829ea08e 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/BaseTransactionData.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/BaseTransactionData.java @@ -11,10 +11,10 @@ package org.eclipse.osee.framework.skynet.core.transaction; import java.util.Collection; -import org.eclipse.osee.framework.core.data.TransactionRecord; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.database.core.OseeSql; import org.eclipse.osee.framework.skynet.core.event.ArtifactTransactionModifiedEvent; diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java index c358acaee14..bb5de94dc76 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java @@ -18,8 +18,6 @@ import java.util.List; import java.util.Map;
import java.util.logging.Level;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.enums.RelationSide;
@@ -27,8 +25,11 @@ import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.DbTransaction;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.database.core.SequenceManager;
@@ -42,7 +43,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTransactionData; import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTransactionData;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.event.ArtifactTransactionModifiedEvent;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
@@ -160,7 +160,7 @@ public class SkynetTransaction extends DbTransaction { }
private void fetchTxNotCurrent(OseeConnection connection, BaseTransactionData transactionData, List<Object[]> results) throws OseeCoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(connection);
+ IOseeStatement chStmt = ConnectionHandler.getStatement(connection);
try {
String query = ClientSessionManager.getSql(transactionData.getSelectTxNotCurrentSql());
chStmt.runPreparedQuery(query, transactionData.getItemId(), this.branch.getId());
@@ -275,7 +275,7 @@ public class SkynetTransaction extends DbTransaction { }
private int getNewAttributeId(Artifact artifact, Attribute<?> attribute) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
AttributeType attributeType = attribute.getAttributeType();
int attrId = -1;
// reuse an existing attribute id when there should only be a max of one and it has already been created on another branch
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java index d5648a05a24..d4dac862ae7 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java @@ -17,15 +17,15 @@ import java.util.HashMap; import java.util.List;
import java.util.Map;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
import org.eclipse.osee.framework.core.exception.BranchDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.TransactionDoesNotExist;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeSql;
import org.eclipse.osee.framework.database.core.SequenceManager;
import org.eclipse.osee.framework.jdk.core.type.Pair;
@@ -63,7 +63,7 @@ public final class TransactionManager { public static List<TransactionRecord> getTransactionsForBranch(Branch branch) throws OseeCoreException {
ArrayList<TransactionRecord> transactions = new ArrayList<TransactionRecord>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(SELECT_TRANSACTIONS, branch.getId());
@@ -83,7 +83,7 @@ public final class TransactionManager { // happen in this client or as remote commit events come through
if (transactionIds == null) {
transactionIds = new ArrayList<TransactionRecord>(5);
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(SELECT_COMMIT_TRANSACTIONS, artifact.getArtId());
while (chStmt.next()) {
@@ -174,7 +174,7 @@ public final class TransactionManager { */
public static TransactionRecord getPriorTransaction(TransactionRecord transactionId) throws OseeCoreException {
TransactionRecord priorTransactionId = null;
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(GET_PRIOR_TRANSACTION, transactionId.getBranch().getId(), transactionId.getId());
@@ -196,11 +196,11 @@ public final class TransactionManager { return getTransactionId(transactionNumber, null);
}
- public static TransactionRecord getTransactionId(ConnectionHandlerStatement chStmt) throws OseeCoreException {
+ public static TransactionRecord getTransactionId(IOseeStatement chStmt) throws OseeCoreException {
return getTransactionId(chStmt.getInt("transaction_id"), chStmt);
}
- private synchronized static TransactionRecord getTransactionId(int transactionNumber, ConnectionHandlerStatement chStmt) throws OseeCoreException {
+ private synchronized static TransactionRecord getTransactionId(int transactionNumber, IOseeStatement chStmt) throws OseeCoreException {
TransactionRecord transactionId = instance.transactionIdCache.get(transactionNumber);
boolean useLocalConnection = chStmt == null;
if (transactionId == null) {
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/AbstractCachingType.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/AbstractCachingType.java deleted file mode 100644 index 4ba89b14a4c..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/AbstractCachingType.java +++ /dev/null @@ -1,30 +0,0 @@ -/*
- * Created on Nov 16, 2009
- *
- * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
- */
-package org.eclipse.osee.framework.skynet.core.types;
-
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.AbstractOseeType;
-import org.eclipse.osee.framework.core.data.IOseeStorableType;
-
-/**
- * @author Roberto E. Escobar
- */
-public abstract class AbstractCachingType extends AbstractOseeType {
-
- private final AbstractOseeCache<? extends IOseeStorableType> cache;
-
- protected AbstractCachingType(AbstractOseeCache<? extends IOseeStorableType> cache, String guid, String name) {
- super(guid, name);
- this.cache = cache;
- initializeFields();
- }
-
- protected AbstractOseeCache<? extends IOseeStorableType> getCache() {
- return cache;
- }
-
- protected abstract void initializeFields();
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/ArtifactTypeCache.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/ArtifactTypeCache.java deleted file mode 100644 index 85522abf1f9..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/ArtifactTypeCache.java +++ /dev/null @@ -1,183 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.IOseeDataAccessor;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeInvalidInheritanceException;
-import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap;
-import org.eclipse.osee.framework.jdk.core.type.HashCollection;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
-
-/**
- * @author Roberto E. Escobar
- */
-public final class ArtifactTypeCache extends AbstractOseeCache<ArtifactType> {
-
- private final HashCollection<ArtifactType, ArtifactType> artifactTypeToSuperTypeMap =
- new HashCollection<ArtifactType, ArtifactType>();
-
- private final CompositeKeyHashMap<ArtifactType, Branch, Collection<AttributeType>> artifactToAttributeMap =
- new CompositeKeyHashMap<ArtifactType, Branch, Collection<AttributeType>>();
-
- public ArtifactTypeCache(IOseeDataAccessor<ArtifactType> dataAccessor) {
- super(dataAccessor);
- }
-
- public ArtifactType createType(String guid, boolean isAbstract, String artifactTypeName) throws OseeCoreException {
- ArtifactType artifactType = getByGuid(guid);
- if (artifactType == null) {
- artifactType = new OseeTypeFactory().createArtifactType(this, guid, isAbstract, artifactTypeName);
- } else {
- decache(artifactType);
- artifactType.setName(artifactTypeName);
- artifactType.setAbstract(isAbstract);
- }
- cache(artifactType);
- return artifactType;
- }
-
- public void cacheTypeValidity(ArtifactType artifactType, AttributeType attributeType, Branch branch) throws OseeCoreException {
- ensurePopulated();
- Collection<AttributeType> attributeTypes = artifactToAttributeMap.get(artifactType, branch);
- if (attributeTypes == null) {
- attributeTypes = new HashSet<AttributeType>();
- artifactToAttributeMap.put(artifactType, branch, attributeTypes);
- }
- attributeTypes.add(attributeType);
- }
-
- public void cacheTypeValidity(ArtifactType artifactType, Collection<AttributeType> attributeTypes, Branch branch) throws OseeCoreException {
- if (branch == null) {
- throw new OseeArgumentException("branch cannot be null");
- }
- if (attributeTypes == null) {
- throw new OseeArgumentException("attribute type list cannot be null");
- }
- ensurePopulated();
- if (attributeTypes.isEmpty()) {
- artifactToAttributeMap.remove(artifactType, branch);
- } else {
- Collection<AttributeType> cachedItems = artifactToAttributeMap.get(artifactType, branch);
- if (cachedItems == null) {
- cachedItems = new HashSet<AttributeType>(attributeTypes);
- artifactToAttributeMap.put(artifactType, branch, cachedItems);
- } else {
- cachedItems.clear();
- cachedItems.addAll(attributeTypes);
- }
- }
- }
-
- public Collection<ArtifactType> getArtifactSuperType(ArtifactType artifactType) throws OseeCoreException {
- ensurePopulated();
- Collection<ArtifactType> types = new HashSet<ArtifactType>();
- Collection<ArtifactType> stored = artifactTypeToSuperTypeMap.getValues(artifactType);
- if (stored != null) {
- types.addAll(stored);
- }
- return types;
- }
-
- public void cacheArtifactSuperType(ArtifactType artifactType, Collection<ArtifactType> superTypes) throws OseeCoreException {
- if (artifactType == null) {
- throw new OseeArgumentException("artifactType cannot be null");
- }
- if (superTypes == null || superTypes.isEmpty()) {
- if (!artifactType.getName().equals("Artifact")) {
- throw new OseeInvalidInheritanceException(String.format(
- "All artifacts must inherit from [Artifact] - attempted make [%s] have null inheritance",
- artifactType));
- }
- } else {
- if (superTypes.contains(artifactType)) {
- throw new OseeInvalidInheritanceException(String.format(
- "Circular inheritance detected for artifact type [%s]", artifactType));
- }
- ensurePopulated();
- artifactTypeToSuperTypeMap.removeValues(artifactType);
- artifactTypeToSuperTypeMap.put(artifactType, superTypes);
- }
- }
-
- public Collection<AttributeType> getLocalAttributeTypes(ArtifactType artifactType, Branch branch) throws OseeCoreException {
- ensurePopulated();
- Collection<AttributeType> types = new HashSet<AttributeType>();
- Collection<AttributeType> data = artifactToAttributeMap.get(artifactType, branch);
- if (data != null) {
- types.addAll(data);
- }
- return types;
- }
-
- public Map<Branch, Collection<AttributeType>> getLocalAttributeTypes(ArtifactType artifactType) throws OseeCoreException {
- ensurePopulated();
- Map<Branch, Collection<AttributeType>> types = new HashMap<Branch, Collection<AttributeType>>();
- Map<Branch, Collection<AttributeType>> data = artifactToAttributeMap.getKeyedValues(artifactType);
- if (data != null) {
- types.putAll(data);
- }
- return types;
- }
-
- public Set<AttributeType> getAttributeTypes(ArtifactType artifactType, Branch branch) throws OseeCoreException {
- ensurePopulated();
- Set<AttributeType> attributeTypes = new HashSet<AttributeType>();
- getAttributeTypes(attributeTypes, artifactType, branch);
- return attributeTypes;
- }
-
- private void getAttributeTypes(Set<AttributeType> attributeTypes, ArtifactType artifactType, Branch branch) throws OseeCoreException {
- Branch branchCursor = branch;
- while (true) {
- Collection<AttributeType> items = artifactToAttributeMap.get(artifactType, branchCursor);
- if (items != null) {
- attributeTypes.addAll(items);
- }
- if (branchCursor.getBranchType().isSystemRootBranch()) {
- break;
- } else {
- branchCursor = branchCursor.getParentBranch();
- }
- }
-
- for (ArtifactType superType : artifactType.getSuperArtifactTypes()) {
- getAttributeTypes(attributeTypes, superType, branch);
- }
- }
-
- public Collection<ArtifactType> getDescendants(ArtifactType artifactType, boolean isRecursionAllowed) throws OseeCoreException {
- ensurePopulated();
- Collection<ArtifactType> descendants = new HashSet<ArtifactType>();
- populateDescendants(artifactType, descendants, isRecursionAllowed);
- return descendants;
- }
-
- private void populateDescendants(ArtifactType artifactType, Collection<ArtifactType> descendants, boolean isRecursionAllowed) throws OseeCoreException {
- for (ArtifactType type : getAll()) {
- if (type.getSuperArtifactTypes().contains(artifactType)) {
- if (isRecursionAllowed) {
- populateDescendants(type, descendants, isRecursionAllowed);
- }
- descendants.add(type);
- }
- }
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/AttributeTypeCache.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/AttributeTypeCache.java deleted file mode 100644 index dc3a0e3484c..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/AttributeTypeCache.java +++ /dev/null @@ -1,56 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types;
-
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.IOseeDataAccessor;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeExtensionManager;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumType;
-import org.eclipse.osee.framework.skynet.core.attribute.providers.IAttributeDataProvider;
-
-/**
- * @author Roberto E. Escobar
- */
-public final class AttributeTypeCache extends AbstractOseeCache<AttributeType> {
-
- public AttributeTypeCache(IOseeDataAccessor<AttributeType> dataAccessor) {
- super(dataAccessor);
- }
-
- public AttributeType createType(String guid, String typeName, String baseAttributeTypeId, String attributeProviderNameId, String fileTypeExtension, String defaultValue, OseeEnumType oseeEnumType, int minOccurrences, int maxOccurrences, String description, String taggerId) throws OseeCoreException {
- AttributeType attributeType = getByGuid(guid);
-
- String resolvedBaseAttributeType = AttributeExtensionManager.resolveAttributeBaseTypeId(baseAttributeTypeId);
- String resolvedProviderType = AttributeExtensionManager.resolveAttributeProviderTypeId(attributeProviderNameId);
-
- Class<? extends Attribute<?>> baseAttributeClass =
- AttributeExtensionManager.getAttributeClassFor(resolvedBaseAttributeType);
- Class<? extends IAttributeDataProvider> providerAttributeClass =
- AttributeExtensionManager.getAttributeProviderClassFor(resolvedProviderType);
-
- if (attributeType == null) {
- attributeType =
- new OseeTypeFactory().createAttributeType(this, guid, typeName, resolvedBaseAttributeType,
- resolvedProviderType, baseAttributeClass, providerAttributeClass, fileTypeExtension, defaultValue,
- oseeEnumType, minOccurrences, maxOccurrences, description, taggerId);
- } else {
- decache(attributeType);
- attributeType.setFields(typeName, resolvedBaseAttributeType, resolvedProviderType, baseAttributeClass,
- providerAttributeClass, fileTypeExtension, defaultValue, oseeEnumType, minOccurrences, maxOccurrences,
- description, taggerId);
- }
- cache(attributeType);
- return attributeType;
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/BranchCache.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/BranchCache.java deleted file mode 100644 index 73e780152cd..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/BranchCache.java +++ /dev/null @@ -1,267 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.IOseeDataAccessor;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
-import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
-import org.eclipse.osee.framework.core.exception.BranchDoesNotExist;
-import org.eclipse.osee.framework.core.exception.MultipleBranchesExist;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap;
-import org.eclipse.osee.framework.jdk.core.type.HashCollection;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.CoreBranches;
-
-/**
- * @author Roberto E. Escobar
- */
-public class BranchCache extends AbstractOseeCache<Branch> {
- private final HashCollection<Branch, Branch> parentToChildrenBranches = new HashCollection<Branch, Branch>();
- private final Map<Branch, Branch> childToParent = new HashMap<Branch, Branch>();
-
- private final HashCollection<Branch, String> branchToAlias = new HashCollection<Branch, String>();
-
- private final CompositeKeyHashMap<Branch, Branch, Branch> sourceDestMerge =
- new CompositeKeyHashMap<Branch, Branch, Branch>();
- private final Map<Branch, IArtifact> branchToAssociatedArtifact = new HashMap<Branch, IArtifact>();
-
- private final Map<Branch, TransactionRecord> branchToBaseTx = new HashMap<Branch, TransactionRecord>();
- private final Map<Branch, TransactionRecord> branchToSourceTx = new HashMap<Branch, TransactionRecord>();
-
- private Branch systemRootBranch;
- private IArtifact defaultAssociatedArtifact;
-
- public BranchCache(IOseeDataAccessor<Branch> dataAccessor) {
- super(dataAccessor);
- this.defaultAssociatedArtifact = null;
- this.systemRootBranch = null;
- }
-
- @Override
- public Branch getByGuid(String typeGuid) throws OseeCoreException {
- ensurePopulated();
- Branch branch = null;
- if (CoreBranches.COMMON.getGuid().equals(typeGuid)) {
- branch = getCommonBranch();
- } else {
- branch = super.getByGuid(typeGuid);
- }
- return branch;
- }
-
- @Override
- public void cache(Branch type) throws OseeCoreException {
- if (type.getBranchType().isSystemRootBranch()) {
- systemRootBranch = type;
- }
- super.cache(type);
- }
-
- @Override
- public void decache(Branch branch) throws OseeCoreException {
- super.decache(branch);
- // TODO add decache from all maps
- }
-
- public Branch getSystemRootBranch() throws OseeCoreException {
- ensurePopulated();
- return systemRootBranch;
- }
-
- public Branch getParentBranch(Branch childBranch) throws OseeCoreException {
- ensurePopulated();
- return childToParent.get(childBranch);
- }
-
- public Collection<Branch> getChildren(Branch parent) throws OseeCoreException {
- ensurePopulated();
- Collection<Branch> childBranches = new HashSet<Branch>();
- Collection<Branch> children = parentToChildrenBranches.getValues(parent);
- if (children != null) {
- childBranches.addAll(children);
- }
- return childBranches;
- }
-
- public Branch getMergeBranch(Branch sourceBranch, Branch destinationBranch) throws OseeCoreException {
- ensurePopulated();
- return sourceDestMerge.get(sourceBranch, destinationBranch);
- }
-
- public void setBranchParent(Branch parentBranch, Branch childBranch) throws OseeCoreException {
- if (parentBranch == null) {
- throw new OseeArgumentException("Parent Branch cannot be null");
- }
- if (childBranch == null) {
- throw new OseeArgumentException("Child Branch cannot be null");
- }
- ensurePopulated();
- parentToChildrenBranches.put(parentBranch, childBranch);
- childToParent.put(childBranch, parentBranch);
- }
-
- public void cacheMergeBranch(Branch mergeBranch, Branch sourceBranch, Branch destinationBranch) throws OseeCoreException {
- if (mergeBranch == null) {
- throw new OseeArgumentException("Merge Branch cannot be null");
- }
- if (sourceBranch == null) {
- throw new OseeArgumentException("Source Branch cannot be null");
- }
- if (destinationBranch == null) {
- throw new OseeArgumentException("Destination Branch cannot be null");
- }
- ensurePopulated();
- sourceDestMerge.put(sourceBranch, destinationBranch, mergeBranch);
- }
-
- public Collection<String> getAliases(Branch branch) throws OseeCoreException {
- ensurePopulated();
- Collection<String> aliases = new HashSet<String>();
- Collection<String> storedAliases = branchToAlias.getValues(branch);
- if (storedAliases != null) {
- aliases.addAll(storedAliases);
- }
- return aliases;
- }
-
- public void setAliases(Branch branch, Collection<String> aliases) throws OseeCoreException {
- if (branch == null) {
- throw new OseeArgumentException("branch cannot be null");
- }
- ensurePopulated();
- branchToAlias.removeValues(branch);
- for (String alias : aliases) {
- branchToAlias.put(branch, alias.toLowerCase());
- }
- }
-
- public Collection<Branch> getByAlias(String alias) throws OseeCoreException {
- if (!Strings.isValid(alias)) {
- throw new OseeArgumentException("Alias cannot be null or empty");
- }
- ensurePopulated();
- Collection<Branch> branches = new HashSet<Branch>();
- String aliasToMatch = alias.toLowerCase();
- for (Branch key : branchToAlias.keySet()) {
- Collection<String> aliases = branchToAlias.getValues(key);
- if (aliases != null) {
- if (aliases.contains(aliasToMatch)) {
- branches.add(key);
- }
- }
- }
- return branches;
- }
-
- public Branch getUniqueByAlias(String alias) throws OseeCoreException {
- ensurePopulated();
- Collection<Branch> branches = getByAlias(alias);
- if (branches.isEmpty()) {
- throw new BranchDoesNotExist(String.format("The alias [%s] does not refer to any branch", alias));
- }
- if (branches.size() > 1) {
- throw new MultipleBranchesExist(String.format("The alias [%s] refers to more than 1 branch [%s]", alias,
- branches));
- }
- return branches.iterator().next();
- }
-
- public void cacheBaseTransaction(Branch branch, TransactionRecord baseTransaction) throws OseeCoreException {
- if (branch == null) {
- throw new OseeArgumentException("branch cannot be null");
- }
- if (baseTransaction == null) {
- throw new OseeArgumentException("base transaction cannot be null");
- }
- if (baseTransaction.getTxType() != TransactionDetailsType.Baselined) {
- throw new OseeArgumentException("Transaction should be a baseline type transaction");
- }
- ensurePopulated();
- branchToBaseTx.put(branch, baseTransaction);
- }
-
- public void cacheSourceTransaction(Branch branch, TransactionRecord sourceTransaction) throws OseeCoreException {
- if (branch == null) {
- throw new OseeArgumentException("branch cannot be null");
- }
- if (sourceTransaction == null) {
- throw new OseeArgumentException("source transaction cannot be null");
- }
- ensurePopulated();
- branchToSourceTx.put(branch, sourceTransaction);
- }
-
- public TransactionRecord getBaseTransaction(Branch branch) throws OseeCoreException {
- ensurePopulated();
- return branchToBaseTx.get(branch);
- }
-
- public TransactionRecord getSourceTransaction(Branch branch) throws OseeCoreException {
- ensurePopulated();
- return branchToSourceTx.get(branch);
- }
-
- public void setAssociatedArtifact(Branch branch, IArtifact artifact) throws OseeCoreException {
- ensurePopulated();
- if (artifact != null) {
- // Artifact has already been loaded so check
- // TODO: this method should allow the artifact to be on any branch, not just common
- if (artifact instanceof Artifact) {
- if (artifact.getBranch() != getCommonBranch()) {
- throw new OseeArgumentException(
- "Setting associated artifact for branch only valid for common branch artifact.");
- }
- }
- IArtifact lastArtifact = branchToAssociatedArtifact.get(branch);
- if (lastArtifact != null) {
- if (!lastArtifact.equals(artifact)) {
- branchToAssociatedArtifact.put(branch, artifact);
- }
- } else {
- branchToAssociatedArtifact.put(branch, artifact);
- }
- } else {
- branchToAssociatedArtifact.remove(branch);
- }
- }
-
- public IArtifact getAssociatedArtifact(Branch branch) throws OseeCoreException {
- ensurePopulated();
- IArtifact associatedArtifact = branchToAssociatedArtifact.get(branch);
- if (associatedArtifact == null) {
- associatedArtifact = getDefaultAssociatedArtifact();
- }
- return associatedArtifact;
- }
-
- public IArtifact getDefaultAssociatedArtifact() throws OseeCoreException {
- ensurePopulated();
- return defaultAssociatedArtifact;
- }
-
- public void setDefaultAssociatedArtifact(IArtifact artifact) {
- this.defaultAssociatedArtifact = artifact;
- }
-
- public Branch getCommonBranch() throws OseeCoreException {
- ensurePopulated();
- return getUniqueByAlias(CoreBranches.COMMON.getName());
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/IArtifact.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/IArtifact.java index 33d31af1922..19958f6f917 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/IArtifact.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/IArtifact.java @@ -11,11 +11,9 @@ package org.eclipse.osee.framework.skynet.core.types;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.IBasicArtifact;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSide;
/**
@@ -23,9 +21,5 @@ import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSide; */
public interface IArtifact extends IBasicArtifact<Artifact> {
- Branch getBranch();
-
- ArtifactType getArtifactType();
-
List<? extends IArtifact> getRelatedArtifacts(RelationTypeSide relationTypeSide) throws OseeCoreException;
}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/IOseeTypeFactory.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/IOseeTypeFactory.java deleted file mode 100644 index 14c02dff5e3..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/IOseeTypeFactory.java +++ /dev/null @@ -1,43 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types;
-
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.enums.BranchState;
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumEntry;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumType;
-import org.eclipse.osee.framework.skynet.core.attribute.providers.IAttributeDataProvider;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface IOseeTypeFactory {
-
- public ArtifactType createArtifactType(AbstractOseeCache<ArtifactType> cache, String guid, boolean isAbstract, String name) throws OseeCoreException;
-
- public AttributeType createAttributeType(AbstractOseeCache<AttributeType> cache, String guid, String name, String baseAttributeTypeId, String attributeProviderNameId, Class<? extends Attribute<?>> baseAttributeClass, Class<? extends IAttributeDataProvider> providerAttributeClass, String fileTypeExtension, String defaultValue, OseeEnumType oseeEnumType, int minOccurrences, int maxOccurrences, String tipText, String taggerId) throws OseeCoreException;
-
- public RelationType createRelationType(AbstractOseeCache<RelationType> cache, String guid, String name, String sideAName, String sideBName, ArtifactType artifactTypeSideA, ArtifactType artifactTypeSideB, RelationTypeMultiplicity multiplicity, String defaultOrderTypeGuid) throws OseeCoreException;
-
- public OseeEnumType createEnumType(AbstractOseeCache<OseeEnumType> cache, String guid, String name) throws OseeCoreException;
-
- public OseeEnumEntry createEnumEntry(AbstractOseeCache<OseeEnumType> cache, String guid, String name, int ordinal) throws OseeCoreException;
-
- public Branch createBranch(AbstractOseeCache<Branch> cache, String guid, String name, BranchType branchType, BranchState branchState, boolean isArchived) throws OseeCoreException;
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/OseeEnumTypeCache.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/OseeEnumTypeCache.java deleted file mode 100644 index bf2ddd2f685..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/OseeEnumTypeCache.java +++ /dev/null @@ -1,155 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.IOseeDataAccessor;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.HashCollection;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumEntry;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumType;
-
-/**
- * @author Roberto E. Escobar
- */
-public final class OseeEnumTypeCache extends AbstractOseeCache<OseeEnumType> {
-
- private final HashCollection<OseeEnumType, OseeEnumEntry> enumTypeToEntryMap =
- new HashCollection<OseeEnumType, OseeEnumEntry>();
- private final Map<OseeEnumEntry, OseeEnumType> enumEntryToEnumType = new HashMap<OseeEnumEntry, OseeEnumType>();
-
- public OseeEnumTypeCache(IOseeDataAccessor<OseeEnumType> dataAccessor) {
- super(dataAccessor);
- }
-
- @Override
- public void decache(OseeEnumType type) throws OseeCoreException {
- super.decache(type);
- // for (OseeEnumEntry entry : type.values()) {
- // enumEntryToEnumType.remove(entry);
- // }
- // enumTypeToEntryMap.removeValues(type);
- }
-
- public void cacheEnumEntries(OseeEnumType oseeEnumType, Collection<OseeEnumEntry> oseeEnumEntries) throws OseeCoreException {
- checkEnumEntryIntegrity(oseeEnumEntries);
- List<OseeEnumEntry> newEntries = new ArrayList<OseeEnumEntry>();
-
- List<OseeEnumEntry> currentEntries = getEnumEntries(oseeEnumType);
- Set<OseeEnumEntry> toRemove = new HashSet<OseeEnumEntry>(currentEntries);
- for (OseeEnumEntry entry : oseeEnumEntries) {
- boolean wasFound = false;
-
- String nameToCheck = entry.getName();
- int ordinalToCheck = entry.ordinal();
- String guidToCheck = entry.getGuid();
-
- for (OseeEnumEntry existingEntry : currentEntries) {
- if (existingEntry.getGuid().equals(guidToCheck)) {
- wasFound = true;
- existingEntry.setName(nameToCheck);
- existingEntry.setOrdinal(ordinalToCheck);
- } else if (existingEntry.getName().equals(nameToCheck)) {
- wasFound = true;
- // existingEntry.setOrdinal(ordinalToCheck);
- }
- // else if (existingEntry.ordinal() == ordinalToCheck) {
- // wasFound = true;
- // existingEntry.setName(nameToCheck);
- // }
-
- if (wasFound) {
- toRemove.remove(existingEntry);
- break;
- }
- }
- if (!wasFound) {
- newEntries.add(entry);
- }
- }
- if (!toRemove.isEmpty()) {
- Collection<OseeEnumEntry> entriesRemoved = enumTypeToEntryMap.getValues(oseeEnumType);
- if (entriesRemoved != null) {
- for (OseeEnumEntry entry : toRemove) {
- entriesRemoved.remove(entry);
- }
- }
- }
- for (OseeEnumEntry entry : newEntries) {
- enumTypeToEntryMap.put(oseeEnumType, entry);
- enumEntryToEnumType.put(entry, oseeEnumType);
- }
- }
-
- private void checkEnumEntryIntegrity(Collection<OseeEnumEntry> oseeEnumEntries) throws OseeArgumentException {
- for (OseeEnumEntry entry : oseeEnumEntries) {
- if (entry.getName() == null) {
- throw new OseeArgumentException("EnumEntry name violation - null is not allowed");
- }
- if (entry.ordinal() < 0) {
- throw new OseeArgumentException("EnumEntry ordinal must be greater than zero");
- }
- for (OseeEnumEntry existingEntry : oseeEnumEntries) {
- if (!entry.equals(existingEntry)) {
- if (entry.getName().equals(existingEntry.getName())) {
- throw new OseeArgumentException(String.format("Unique enumEntry name violation - %s already exists.",
- entry));
- }
- if (entry.ordinal() == existingEntry.ordinal()) {
- throw new OseeArgumentException(
- String.format(
- "Unique enumEntry ordinal violation - ordinal [%d] is used by existing entry:[%s] and new entry:[%s]",
- entry.ordinal(), existingEntry, entry));
- }
- }
- }
- }
- }
-
- public OseeEnumType getEnumType(OseeEnumEntry oseeEnumEntry) throws OseeCoreException {
- ensurePopulated();
- return enumEntryToEnumType.get(oseeEnumEntry);
- }
-
- public List<OseeEnumEntry> getEnumEntries(OseeEnumType oseeEnumType) throws OseeCoreException {
- ensurePopulated();
- List<OseeEnumEntry> itemsToReturn = new ArrayList<OseeEnumEntry>();
- Collection<OseeEnumEntry> entries = enumTypeToEntryMap.getValues(oseeEnumType);
- if (entries != null) {
- itemsToReturn.addAll(entries);
- }
- return itemsToReturn;
- }
-
- public OseeEnumType createType(String guid, String enumTypeName) throws OseeCoreException {
- OseeEnumType oseeEnumType = getByGuid(guid);
- if (oseeEnumType == null) {
- oseeEnumType = new OseeTypeFactory().createEnumType(this, guid, enumTypeName);
- } else {
- decache(oseeEnumType);
- oseeEnumType.setName(enumTypeName);
- }
- cache(oseeEnumType);
- return oseeEnumType;
- }
-
- public OseeEnumEntry createEntry(String guid, String name, int ordinal) throws OseeCoreException {
- return new OseeTypeFactory().createEnumEntry(this, guid, name, ordinal);
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/OseeTypeFactory.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/OseeTypeFactory.java deleted file mode 100644 index 50132ec89e8..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/OseeTypeFactory.java +++ /dev/null @@ -1,145 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types;
-
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.enums.BranchState;
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumEntry;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumType;
-import org.eclipse.osee.framework.skynet.core.attribute.providers.IAttributeDataProvider;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
-import org.eclipse.osee.framework.skynet.core.types.branch.BranchImpl;
-
-/**
- * @author Roberto E. Escobar
- */
-public class OseeTypeFactory implements IOseeTypeFactory {
-
- public OseeTypeFactory() {
- }
-
- private String createGuidIfNeeded(String guid) {
- return guid == null ? GUID.create() : guid;
- }
-
- private void checkName(AbstractOseeCache<?> cache, String typeName) throws OseeCoreException {
- if (!Strings.isValid(typeName)) {
- throw new OseeArgumentException("name cannot be null.");
- }
- }
-
- private void checkNameUnique(AbstractOseeCache<?> cache, String typeName) throws OseeCoreException {
- Object object = cache.getUniqueByName(typeName);
- if (object != null) {
- throw new OseeArgumentException(String.format("Item matching name [%s] already exists", typeName));
- }
- }
-
- @Override
- public ArtifactType createArtifactType(AbstractOseeCache<ArtifactType> cache, String guid, boolean isAbstract, String name) throws OseeCoreException {
- checkName(cache, name);
- checkNameUnique(cache, name);
- return new ArtifactType(cache, createGuidIfNeeded(guid), name, isAbstract);
- }
-
- @Override
- public AttributeType createAttributeType(AbstractOseeCache<AttributeType> cache, String guid, String name, String baseAttributeTypeId, String attributeProviderNameId, Class<? extends Attribute<?>> baseAttributeClass, Class<? extends IAttributeDataProvider> providerAttributeClass, String fileTypeExtension, String defaultValue, OseeEnumType oseeEnumType, int minOccurrences, int maxOccurrences, String tipText, String taggerId) throws OseeCoreException {
- checkName(cache, name);
- checkNameUnique(cache, name);
- if (baseAttributeClass == null) {
- throw new OseeArgumentException("The baseAttributeClass can not be null or empty");
- }
- if (providerAttributeClass == null) {
- throw new OseeArgumentException("The providerAttributeClass can not be null or empty");
- }
- if (!Strings.isValid(baseAttributeTypeId)) {
- throw new OseeArgumentException("The baseAttributeTypeId can not be null or empty");
- }
- if (!Strings.isValid(attributeProviderNameId)) {
- throw new OseeArgumentException("The attributeProviderNameId can not be null or empty");
- }
- if (minOccurrences > 0 && defaultValue == null) {
- throw new OseeArgumentException(
- "DefaultValue must be set for attribute [" + name + "] with minOccurrences " + minOccurrences);
- }
- if (minOccurrences < 0) {
- throw new OseeArgumentException("minOccurrences must be greater than or equal to zero");
- }
- if (maxOccurrences < minOccurrences) {
- throw new OseeArgumentException("maxOccurences can not be less than minOccurences");
- }
- return new AttributeType(cache, createGuidIfNeeded(guid), name, baseAttributeTypeId, attributeProviderNameId,
- baseAttributeClass, providerAttributeClass, fileTypeExtension, defaultValue, oseeEnumType, minOccurrences,
- maxOccurrences, tipText, taggerId);
- }
-
- @Override
- public RelationType createRelationType(AbstractOseeCache<RelationType> cache, String guid, String name, String sideAName, String sideBName, ArtifactType artifactTypeSideA, ArtifactType artifactTypeSideB, RelationTypeMultiplicity multiplicity, String defaultOrderTypeGuid) throws OseeCoreException {
- checkName(cache, name);
- checkNameUnique(cache, name);
- if (!Strings.isValid(sideAName)) {
- throw new OseeArgumentException("The sideAName can not be null or empty");
- }
- if (!Strings.isValid(sideBName)) {
- throw new OseeArgumentException("The sideBName can not be null or empty");
- }
- if (artifactTypeSideA == null) {
- throw new OseeArgumentException("The artifactTypeSideA can not be null or empty");
- }
- if (artifactTypeSideB == null) {
- throw new OseeArgumentException("The artifactTypeSideB can not be null or empty");
- }
- if (multiplicity == null) {
- throw new OseeArgumentException("Multiplicity can not be null or empty");
- }
- return new RelationType(cache, createGuidIfNeeded(guid), name, sideAName, sideBName, artifactTypeSideA,
- artifactTypeSideB, multiplicity, defaultOrderTypeGuid);
- }
-
- @Override
- public OseeEnumType createEnumType(AbstractOseeCache<OseeEnumType> cache, String guid, String name) throws OseeCoreException {
- checkName(cache, name);
- checkNameUnique(cache, name);
- return new OseeEnumType(cache, createGuidIfNeeded(guid), name);
- }
-
- @Override
- public OseeEnumEntry createEnumEntry(AbstractOseeCache<OseeEnumType> cache, String guid, String name, int ordinal) throws OseeCoreException {
- checkName(cache, name);
- if (ordinal < 0) {
- throw new OseeArgumentException("ordinal must be greater than or equal to zero");
- }
- return new OseeEnumEntry(cache, createGuidIfNeeded(guid), name, ordinal);
- }
-
- @Override
- public Branch createBranch(AbstractOseeCache<Branch> cache, String guid, String name, BranchType branchType, BranchState branchState, boolean isArchived) throws OseeCoreException {
- checkName(cache, name);
- if (branchType == null) {
- throw new OseeArgumentException("branchType cannot be null.");
- }
- if (branchState == null) {
- throw new OseeArgumentException("branchState cannot be null.");
- }
- return new BranchImpl(cache, createGuidIfNeeded(guid), name, branchType, branchState, isArchived);
- }
-
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/OseeTypeManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/OseeTypeManager.java deleted file mode 100644 index be83b19e8c2..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/OseeTypeManager.java +++ /dev/null @@ -1,50 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types;
-
-import org.eclipse.osee.framework.skynet.core.types.impl.DatabaseArtifactTypeAccessor;
-import org.eclipse.osee.framework.skynet.core.types.impl.DatabaseAttributeTypeAccessor;
-import org.eclipse.osee.framework.skynet.core.types.impl.DatabaseBranchAccessor;
-import org.eclipse.osee.framework.skynet.core.types.impl.DatabaseOseeEnumTypeAccessor;
-import org.eclipse.osee.framework.skynet.core.types.impl.DatabaseRelationTypeAccessor;
-
-/**
- * @author Roberto E. Escobar
- */
-public class OseeTypeManager {
-
- private static final OseeTypeManager instance = new OseeTypeManager();
-
- private final OseeTypeCache oseeTypeCache;
- private final BranchCache branchCache;
-
- private OseeTypeManager() {
- IOseeTypeFactory factory = new OseeTypeFactory();
-
- OseeEnumTypeCache enumCache = new OseeEnumTypeCache(new DatabaseOseeEnumTypeAccessor(factory));
- AttributeTypeCache attrCache = new AttributeTypeCache(new DatabaseAttributeTypeAccessor(factory, enumCache));
-
- ArtifactTypeCache artCache = new ArtifactTypeCache(new DatabaseArtifactTypeAccessor(factory, attrCache));
- RelationTypeCache relCache = new RelationTypeCache(new DatabaseRelationTypeAccessor(factory, artCache));
-
- branchCache = new BranchCache(new DatabaseBranchAccessor(factory));
-
- oseeTypeCache = new OseeTypeCache(factory, artCache, attrCache, relCache, enumCache);
- }
-
- public static OseeTypeCache getCache() {
- return instance.oseeTypeCache;
- }
-
- public static BranchCache getBranchCache() {
- return instance.branchCache;
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/RelationTypeCache.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/RelationTypeCache.java deleted file mode 100644 index 8a3e7996b18..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/RelationTypeCache.java +++ /dev/null @@ -1,43 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types;
-
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.IOseeDataAccessor;
-import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
-
-/**
- * @author Roberto E. Escobar
- */
-public final class RelationTypeCache extends AbstractOseeCache<RelationType> {
-
- public RelationTypeCache(IOseeDataAccessor<RelationType> dataAccessor) {
- super(dataAccessor);
- }
-
- public RelationType createType(String guid, String typeName, String sideAName, String sideBName, ArtifactType artifactTypeSideA, ArtifactType artifactTypeSideB, RelationTypeMultiplicity multiplicity, String defaultOrderTypeGuid) throws OseeCoreException {
- RelationType relationType = getByGuid(guid);
- if (relationType == null) {
- relationType =
- new OseeTypeFactory().createRelationType(this, guid, typeName, sideAName, sideBName, artifactTypeSideA,
- artifactTypeSideB, multiplicity, defaultOrderTypeGuid);
- } else {
- decache(relationType);
- relationType.setFields(typeName, sideAName, sideBName, artifactTypeSideA, artifactTypeSideB, multiplicity,
- defaultOrderTypeGuid);
- }
- cache(relationType);
- return relationType;
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/ShallowArtifact.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/ShallowArtifact.java index 6b1fc0a9517..9e86976a9ca 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/ShallowArtifact.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/ShallowArtifact.java @@ -13,13 +13,14 @@ package org.eclipse.osee.framework.skynet.core.types; import java.util.List;
import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.cache.BranchCache;
import org.eclipse.osee.framework.core.data.SystemUser;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSide;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/branch/BranchImpl.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/branch/BranchImpl.java deleted file mode 100644 index 4579e5c5c1f..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/branch/BranchImpl.java +++ /dev/null @@ -1,247 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.osee.framework.skynet.core.types.branch;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.BranchField;
-import org.eclipse.osee.framework.core.data.IBasicArtifact;
-import org.eclipse.osee.framework.core.data.OseeField;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
-import org.eclipse.osee.framework.core.enums.BranchArchivedState;
-import org.eclipse.osee.framework.core.enums.BranchState;
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.types.BranchCache;
-import org.eclipse.osee.framework.skynet.core.types.IArtifact;
-import org.eclipse.osee.framework.skynet.core.types.field.AliasesField;
-import org.eclipse.osee.framework.skynet.core.types.field.AssociatedArtifactField;
-
-/**
- * @author Roberto E. Escobar
- */
-public final class BranchImpl extends Branch {
- private static final int SHORT_NAME_LIMIT = 25;
- private final AbstractOseeCache<Branch> cache;
-
- public BranchImpl(AbstractOseeCache<Branch> cache, String guid, String name, BranchType branchType, BranchState branchState, boolean isArchived) {
- super(guid, name);
- this.cache = cache;
- initializeFields();
- setFieldLogException(BranchField.BRANCH_TYPE_FIELD_KEY, branchType);
- setFieldLogException(BranchField.BRANCH_STATE_FIELD_KEY, branchState);
- setFieldLogException(BranchField.BRANCH_ARCHIVED_STATE_FIELD_KEY, BranchArchivedState.fromBoolean(isArchived));
- }
-
- protected void initializeFields() {
- addField(BranchField.BRANCH_TYPE_FIELD_KEY, new OseeField<BranchType>());
- addField(BranchField.BRANCH_STATE_FIELD_KEY, new OseeField<BranchState>());
- addField(BranchField.BRANCH_ARCHIVED_STATE_FIELD_KEY, new OseeField<BranchArchivedState>());
- addField(BranchField.BRANCH_ASSOCIATED_ARTIFACT_FIELD_KEY, new AssociatedArtifactField(getCache(), this));
- addField(BranchField.BRANCH_ALIASES_FIELD_KEY, new AliasesField(getCache(), this));
- }
-
- protected BranchCache getCache() {
- return (BranchCache) cache;
- }
-
- @Override
- public Branch getParentBranch() throws OseeCoreException {
- return getCache().getParentBranch(this);
- }
-
- @Override
- public boolean hasParentBranch() throws OseeCoreException {
- return getParentBranch() != null;
- }
-
- @Override
- public String getShortName() {
- String shortName = "";
- if (Strings.isValid(getName())) {
- shortName = Strings.truncate(getName(), SHORT_NAME_LIMIT);
- }
- return shortName;
- }
-
- @Override
- public BranchType getBranchType() {
- return getFieldValueLogException(null, BranchField.BRANCH_TYPE_FIELD_KEY);
- }
-
- @Override
- public BranchState getBranchState() {
- return getFieldValueLogException(null, BranchField.BRANCH_STATE_FIELD_KEY);
- }
-
- @Override
- public BranchArchivedState getArchiveState() {
- return getFieldValueLogException(null, BranchField.BRANCH_ARCHIVED_STATE_FIELD_KEY);
- }
-
- @Override
- public IArtifact getAssociatedArtifact() throws OseeCoreException {
- return getFieldValue(BranchField.BRANCH_ASSOCIATED_ARTIFACT_FIELD_KEY);
- }
-
- @Override
- public void setAssociatedArtifact(IBasicArtifact<?> artifact) throws OseeCoreException {
- setField(BranchField.BRANCH_ASSOCIATED_ARTIFACT_FIELD_KEY, artifact);
- }
-
- @Override
- public TransactionRecord getBaseTransaction() throws OseeCoreException {
- return getCache().getBaseTransaction(this);
- }
-
- @Override
- public TransactionRecord getSourceTransaction() throws OseeCoreException {
- return getCache().getSourceTransaction(this);
- }
-
- @Override
- public Collection<String> getAliases() throws OseeCoreException {
- return getFieldValue(BranchField.BRANCH_ALIASES_FIELD_KEY);
- }
-
- @Override
- public void setAliases(String... alias) throws OseeCoreException {
- setField(BranchField.BRANCH_ALIASES_FIELD_KEY, Arrays.asList(alias));
- }
-
- @Override
- public void setArchived(boolean isArchived) {
- BranchArchivedState newValue = BranchArchivedState.fromBoolean(isArchived);
- setFieldLogException(BranchField.BRANCH_ARCHIVED_STATE_FIELD_KEY, newValue);
- }
-
- @Override
- public void setBranchState(BranchState branchState) {
- setFieldLogException(BranchField.BRANCH_STATE_FIELD_KEY, branchState);
- }
-
- @Override
- public void setBranchType(BranchType branchType) {
- setFieldLogException(BranchField.BRANCH_TYPE_FIELD_KEY, branchType);
- }
-
- @Override
- public boolean isEditable() {
- BranchState state = getBranchState();
- return !state.isCommitted() && !state.isRebaselined() && //
- !state.isDeleted() && !state.isCreationInProgress() && //
- !getArchiveState().isArchived();
- }
-
- @Override
- public String toString() {
- return getName();
- }
-
- @Override
- public int compareTo(Branch other) {
- int result = -1;
- if (other != null && other.getName() != null && getName() != null) {
- result = getName().compareTo(other.getName());
- }
- return result;
- }
-
- @Override
- public Collection<Branch> getChildren() throws OseeCoreException {
- return getCache().getChildren(this);
- }
-
- // TODO remove this convenience method
- public int getBranchId() {
- return getId();
- }
-
- @Override
- public Branch getAccessControlBranch() {
- return this;
- }
-
- @Override
- public Collection<Branch> getChildBranches() throws OseeCoreException {
- return getChildBranches(false);
- }
-
- @Override
- public Collection<Branch> getChildBranches(boolean recurse) throws OseeCoreException {
- Set<Branch> children = new HashSet<Branch>();
- getChildBranches(this, children, recurse);
- return children;
- }
-
- private void getChildBranches(Branch parentBranch, Collection<Branch> children, boolean recurse) throws OseeCoreException {
- int parentBranchId = parentBranch.getId();
- for (Branch branch : BranchManager.getNormalBranches()) {
- if (branch.hasParentBranch()) {
- if (parentBranchId == branch.getParentBranch().getId()) {
- children.add(branch);
- if (recurse) {
- getChildBranches(branch, children, recurse);
- }
- }
- }
- }
- }
-
- @Override
- public Collection<Branch> getAncestors() throws OseeCoreException {
- List<Branch> ancestors = new ArrayList<Branch>();
- Branch branchCursor = this;
- ancestors.add(branchCursor);
- while (branchCursor.hasParentBranch()) {
- branchCursor = branchCursor.getParentBranch();
- ancestors.add(branchCursor);
- }
- return ancestors;
- }
-
- @Override
- public Collection<Branch> getWorkingBranches() throws OseeCoreException {
- // TODO change this to recurse all Children and then filter by states.
-
- List<Branch> branches = new ArrayList<Branch>(500);
- for (Branch branch : getCache().getAll()) {
- if (branch.getArchiveState().isUnArchived() && //
- branch.getBranchType().isOfType(BranchType.WORKING) && //
- this.equals(branch.getParentBranch())) {
- branches.add(branch);
- }
- }
- return branches;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public Object getAdapter(Class adapter) {
- if (adapter == null) {
- throw new IllegalArgumentException("adapter can not be null");
- }
-
- if (adapter.isInstance(this)) {
- return this;
- }
- return null;
- }
-}
\ No newline at end of file diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/field/AliasesField.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/field/AliasesField.java deleted file mode 100644 index cbec8bd68b7..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/field/AliasesField.java +++ /dev/null @@ -1,46 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types.field;
-
-import java.util.Collection;
-import org.eclipse.osee.framework.core.data.AbstractOseeField;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.util.ChangeUtil;
-import org.eclipse.osee.framework.skynet.core.types.BranchCache;
-
-/**
- * @author Roberto E. Escobar
- */
-public class AliasesField extends AbstractOseeField<Collection<String>> {
-
- private final BranchCache cache;
- private final Branch branch;
-
- public AliasesField(BranchCache cache, Branch branch) {
- super();
- this.branch = branch;
- this.cache = cache;
- }
-
- @Override
- public Collection<String> get() throws OseeCoreException {
- return cache.getAliases(branch);
- }
-
- @Override
- public void set(Collection<String> aliases) throws OseeCoreException {
- Collection<String> original = get();
- cache.setAliases(branch, aliases);
- Collection<String> other = get();
- isDirty |= ChangeUtil.isDifferent(original, other);
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/field/ArtifactSuperTypeField.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/field/ArtifactSuperTypeField.java deleted file mode 100644 index e5b92e3d2f6..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/field/ArtifactSuperTypeField.java +++ /dev/null @@ -1,46 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types.field;
-
-import java.util.Collection;
-import org.eclipse.osee.framework.core.data.AbstractOseeField;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.util.ChangeUtil;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.types.ArtifactTypeCache;
-
-/**
- * @author Roberto E. Escobar
- */
-public final class ArtifactSuperTypeField extends AbstractOseeField<Collection<ArtifactType>> {
-
- private final ArtifactType artifactType;
- private final ArtifactTypeCache cache;
-
- public ArtifactSuperTypeField(ArtifactTypeCache cache, ArtifactType artifactType) {
- super();
- this.artifactType = artifactType;
- this.cache = cache;
- }
-
- @Override
- public Collection<ArtifactType> get() throws OseeCoreException {
- return cache.getArtifactSuperType(artifactType);
- }
-
- @Override
- public void set(Collection<ArtifactType> superType) throws OseeCoreException {
- Collection<ArtifactType> original = get();
- cache.cacheArtifactSuperType(artifactType, superType);
- Collection<ArtifactType> newTypes = artifactType.getSuperArtifactTypes();
- isDirty |= ChangeUtil.isDifferent(original, newTypes);
- }
-}
\ No newline at end of file diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/field/ArtifactTypeAttributesField.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/field/ArtifactTypeAttributesField.java deleted file mode 100644 index 1358aac5f6f..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/field/ArtifactTypeAttributesField.java +++ /dev/null @@ -1,61 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types.field;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Map.Entry;
-import org.eclipse.osee.framework.core.data.AbstractOseeField;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.util.ChangeUtil;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
-import org.eclipse.osee.framework.skynet.core.types.ArtifactTypeCache;
-
-/**
- * @author Roberto E. Escobar
- */
-public final class ArtifactTypeAttributesField extends AbstractOseeField<Map<Branch, Collection<AttributeType>>> {
-
- private final ArtifactType artifactType;
- private final ArtifactTypeCache cache;
-
- public ArtifactTypeAttributesField(ArtifactTypeCache cache, ArtifactType artifactType) {
- super();
- this.artifactType = artifactType;
- this.cache = cache;
- }
-
- @Override
- public Map<Branch, Collection<AttributeType>> get() throws OseeCoreException {
- return cache.getLocalAttributeTypes(artifactType);
- }
-
- @Override
- public void set(Map<Branch, Collection<AttributeType>> attributeTypeMap) throws OseeCoreException {
- if (attributeTypeMap == null) {
- throw new OseeArgumentException("input cannot be null");
- }
-
- for (Entry<Branch, Collection<AttributeType>> entry : attributeTypeMap.entrySet()) {
- set(entry.getKey(), entry.getValue());
- }
- }
-
- private void set(Branch branch, Collection<AttributeType> attributeTypes) throws OseeCoreException {
- Collection<AttributeType> original = cache.getLocalAttributeTypes(artifactType, branch);
- cache.cacheTypeValidity(artifactType, attributeTypes, branch);
- Collection<AttributeType> newTypes = cache.getLocalAttributeTypes(artifactType, branch);
- isDirty |= ChangeUtil.isDifferent(original, newTypes);
- }
-}
\ No newline at end of file diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/field/AssociatedArtifactField.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/field/AssociatedArtifactField.java deleted file mode 100644 index 8b3f9e06e38..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/field/AssociatedArtifactField.java +++ /dev/null @@ -1,46 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types.field;
-
-import org.eclipse.osee.framework.core.data.AbstractOseeField;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.util.ChangeUtil;
-import org.eclipse.osee.framework.skynet.core.types.BranchCache;
-import org.eclipse.osee.framework.skynet.core.types.IArtifact;
-
-/**
- * @author Roberto E. Escobar
- */
-public class AssociatedArtifactField extends AbstractOseeField<IArtifact> {
-
- private final Branch branch;
- private final BranchCache cache;
-
- public AssociatedArtifactField(BranchCache cache, Branch branch) {
- super();
- this.branch = branch;
- this.cache = cache;
- }
-
- @Override
- public IArtifact get() throws OseeCoreException {
- return cache.getAssociatedArtifact(branch);
- }
-
- @Override
- public void set(IArtifact artifact) throws OseeCoreException {
- IArtifact oldArtifact = cache.getAssociatedArtifact(branch);
- cache.setAssociatedArtifact(branch, artifact);
- IArtifact newArtifact = cache.getAssociatedArtifact(branch);
- isDirty |= ChangeUtil.isDifferent(oldArtifact, newArtifact);
- }
-}
\ No newline at end of file diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/field/EnumEntryField.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/field/EnumEntryField.java deleted file mode 100644 index e5d0e1f00bb..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/field/EnumEntryField.java +++ /dev/null @@ -1,80 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types.field;
-
-import java.util.List;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.AbstractOseeField;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.util.ChangeUtil;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumEntry;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumType;
-import org.eclipse.osee.framework.skynet.core.internal.Activator;
-import org.eclipse.osee.framework.skynet.core.types.OseeEnumTypeCache;
-
-/**
- * @author Roberto E. Escobar
- */
-public class EnumEntryField extends AbstractOseeField<List<OseeEnumEntry>> {
-
- private final OseeEnumTypeCache cache;
- private final OseeEnumType type;
-
- public EnumEntryField(OseeEnumTypeCache cache, OseeEnumType type) {
- super();
- this.type = type;
- this.cache = cache;
- }
-
- @Override
- public List<OseeEnumEntry> get() throws OseeCoreException {
- return cache.getEnumEntries(type);
- }
-
- @Override
- public void set(List<OseeEnumEntry> entries) throws OseeCoreException {
- List<OseeEnumEntry> oldEntries = get();
- cache.cacheEnumEntries(type, entries);
- List<OseeEnumEntry> newEntries = get();
- isDirty |= ChangeUtil.isDifferent(oldEntries, newEntries);
- }
-
- @Override
- public void clearDirty() {
- super.clearDirty();
- try {
- for (OseeEnumEntry entry : get()) {
- entry.clearDirty();
- }
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
-
- @Override
- public boolean isDirty() {
- boolean result = super.isDirty();
- if (!result) {
- try {
- for (OseeEnumEntry entry : get()) {
- if (entry.isDirty()) {
- result = true;
- break;
- }
- }
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
- return result;
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/AbstractDatabaseAccessor.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/AbstractDatabaseAccessor.java deleted file mode 100644 index 3d58843cc61..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/AbstractDatabaseAccessor.java +++ /dev/null @@ -1,31 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types.impl;
-
-import org.eclipse.osee.framework.core.data.IOseeDataAccessor;
-import org.eclipse.osee.framework.core.data.IOseeStorableType;
-import org.eclipse.osee.framework.skynet.core.types.IOseeTypeFactory;
-
-/**
- * @author Roberto E. Escobar
- */
-public abstract class AbstractDatabaseAccessor<T extends IOseeStorableType> implements IOseeDataAccessor<T> {
-
- private final IOseeTypeFactory factory;
-
- protected AbstractDatabaseAccessor(IOseeTypeFactory factory) {
- this.factory = factory;
- }
-
- protected IOseeTypeFactory getFactory() {
- return factory;
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/BranchStoreOperation.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/BranchStoreOperation.java deleted file mode 100644 index 8f7db182d86..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/BranchStoreOperation.java +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Created on Oct 19, 2009 - * - * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE - */ -package org.eclipse.osee.framework.skynet.core.types.impl; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.data.AbstractOseeCache; -import org.eclipse.osee.framework.core.data.AbstractOseeType; -import org.eclipse.osee.framework.core.data.Branch; -import org.eclipse.osee.framework.core.data.BranchField; -import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; -import org.eclipse.osee.framework.database.core.AbstractDbTxOperation; -import org.eclipse.osee.framework.database.core.ConnectionHandler; -import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement; -import org.eclipse.osee.framework.database.core.OseeConnection; -import org.eclipse.osee.framework.skynet.core.event.BranchEventType; -import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; -import org.eclipse.osee.framework.skynet.core.internal.Activator; - -/** - * @author Ryan D. Brooks - */ -public class BranchStoreOperation extends AbstractDbTxOperation { - private static final String INSERT_BRANCH_ALIASES = - "insert into osee_branch_definitions (mapped_branch_id, static_branch_name) VALUES (?, ?)"; - private static final String DELETE_BRANCH_ALIASES = "delete from osee_branch_definitions where mapped_branch_id = ?"; - - private static final String UPDATE_BRANCH = - "update osee_branch SET branch_name = ?, parent_branch_id = ?, parent_transaction_id = ?, archived = ?, associated_art_id = ?, branch_type = ?, branch_state = ? where branch_id = ?"; - - private static final String SELECT_ADDRESSING_BY_BRANCH = - "select * from %s txs, osee_tx_details txd where txs.transaction_id = txd.transaction_id and txd.branch_id = ?"; - private static final String INSERT_ADDRESSING = - "insert into %s (transaction_id, gamma_id, mod_type, tx_current) VALUES (?,?,?,?)"; - - public static final String DELETE_ADDRESSING = "delete from %s where transaction_id = ? and gamma_id = ?"; - private final Collection<Branch> branches; - - public BranchStoreOperation(AbstractOseeCache<Branch> cache, Collection<Branch> branches) { - super("Branch Archive Operation", Activator.PLUGIN_ID); - this.branches = branches; - } - - @Override - protected void doTxWork(IProgressMonitor monitor, OseeConnection connection) throws OseeCoreException { - Collection<Branch> dirtyAliases = new HashSet<Branch>(); - - // List<Object[]> insertData = new ArrayList<Object[]>(); - List<Object[]> updateData = new ArrayList<Object[]>(); - List<Object[]> deleteData = new ArrayList<Object[]>(); - - for (Branch branch : branches) { - if (isDataDirty(branch)) { - switch (branch.getModificationType()) { - case NEW: - throw new UnsupportedOperationException( - "Branch Object Creation should only be performed by app server"); - // TODO remove this exception once this class is only useb by the app server. - // branch.setId(SequenceManager.getNextBranchId()); - // insertData.add(toInsertValues(branch)); - // break; - case MODIFIED: - updateData.add(toUpdateValues(branch)); - break; - case DELETED: - deleteData.add(toDeleteValues(branch)); - break; - default: - break; - } - } - if (branch.isFieldDirty(BranchField.BRANCH_ALIASES_FIELD_KEY)) { - dirtyAliases.add(branch); - } - if (branch.isFieldDirty(BranchField.BRANCH_ARCHIVED_STATE_FIELD_KEY)) { - moveBranchAddressing(connection, branch, branch.getArchiveState().isArchived()); - } - - } - // ConnectionHandler.runBatchUpdate(INSERT_BRANCH, insertData); - ConnectionHandler.runBatchUpdate(UPDATE_BRANCH, updateData); - // ConnectionHandler.runBatchUpdate(DELETE_BRANCH, deleteData); - - storeAliases(dirtyAliases); - sendChangeEvents(branches); - - for (Branch branch : branches) { - branch.clearDirty(); - } - } - - public static void moveBranchAddressing(OseeConnection connection, Branch branch, boolean archive) throws OseeDataStoreException { - String sourceTableName = archive ? "osee_txs" : "osee_txs_archived"; - String destinationTableName = archive ? "osee_txs_archived" : "osee_txs"; - - ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(connection); - List<Object[]> addressing = new ArrayList<Object[]>(); - List<Object[]> deleteAddressing = new ArrayList<Object[]>(); - String sql = String.format(SELECT_ADDRESSING_BY_BRANCH, sourceTableName); - - try { - chStmt.runPreparedQuery(10000, sql, branch.getId()); - while (chStmt.next()) { - addressing.add(new Object[] {chStmt.getInt("transaction_id"), chStmt.getLong("gamma_id"), - chStmt.getInt("mod_type"), chStmt.getInt("tx_current")}); - deleteAddressing.add(new Object[] {chStmt.getInt("transaction_id"), chStmt.getLong("gamma_id")}); - } - } finally { - chStmt.close(); - } - sql = String.format(INSERT_ADDRESSING, destinationTableName); - ConnectionHandler.runBatchUpdate(connection, sql, addressing); - - sql = String.format(DELETE_ADDRESSING, sourceTableName); - ConnectionHandler.runBatchUpdate(connection, sql, deleteAddressing); - } - - private boolean isDataDirty(Branch type) throws OseeCoreException { - return type.areFieldsDirty(// - AbstractOseeType.NAME_FIELD_KEY, // - AbstractOseeType.UNIQUE_ID_FIELD_KEY, // - BranchField.BRANCH_ARCHIVED_STATE_FIELD_KEY, // - BranchField.BRANCH_STATE_FIELD_KEY, // - BranchField.BRANCH_TYPE_FIELD_KEY, // - BranchField.BRANCH_ASSOCIATED_ARTIFACT_FIELD_KEY); - } - - private void storeAliases(Collection<Branch> branches) throws OseeCoreException { - List<Object[]> deleteData = new ArrayList<Object[]>(); - List<Object[]> insertData = new ArrayList<Object[]>(); - for (Branch branch : branches) { - deleteData.add(new Object[] {branch.getId()}); - for (String alias : branch.getAliases()) { - insertData.add(new Object[] {branch.getId(), alias}); - } - } - ConnectionHandler.runBatchUpdate(DELETE_BRANCH_ALIASES, deleteData); - ConnectionHandler.runBatchUpdate(INSERT_BRANCH_ALIASES, insertData); - } - - private void sendChangeEvents(Collection<Branch> branches) { - for (Branch branch : branches) { - if (branch.getBranchState().isDeleted()) { - try { - OseeEventManager.kickBranchEvent(this, BranchEventType.Deleted, branch.getId()); - } catch (Exception ex) { - // Do Nothing - } - } - - try { - if (branch.isFieldDirty(AbstractOseeType.NAME_FIELD_KEY)) { - OseeEventManager.kickBranchEvent(this, BranchEventType.Renamed, branch.getId()); - } - } catch (Exception ex) { - // Do Nothing - } - } - } - - private Object[] toUpdateValues(Branch type) throws OseeCoreException { - Branch parentBranch = type.getParentBranch(); - int parentBranchId = parentBranch != null ? parentBranch.getId() : DatabaseBranchAccessor.NULL_PARENT_BRANCH_ID; - return new Object[] {type.getName(), parentBranchId, type.getBaseTransaction().getId(), - type.getArchiveState().getValue(), type.getAssociatedArtifact().getArtId(), - type.getBranchType().getValue(), type.getBranchState().getValue(), type.getId()}; - } - - private Object[] toDeleteValues(Branch branch) throws OseeDataStoreException { - return new Object[] {branch.getId()}; - } - -} diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseArtifactTypeAccessor.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseArtifactTypeAccessor.java deleted file mode 100644 index ad30cd47d1d..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseArtifactTypeAccessor.java +++ /dev/null @@ -1,254 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.AbstractOseeType;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.enums.ModificationType;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.core.exception.OseeInvalidInheritanceException;
-import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
-import org.eclipse.osee.framework.database.core.SequenceManager;
-import org.eclipse.osee.framework.jdk.core.type.HashCollection;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
-import org.eclipse.osee.framework.skynet.core.internal.Activator;
-import org.eclipse.osee.framework.skynet.core.types.ArtifactTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.AttributeTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.IOseeTypeFactory;
-
-/**
- * @author Roberto E. Escobar
- */
-public class DatabaseArtifactTypeAccessor extends AbstractDatabaseAccessor<ArtifactType> {
- protected static final int ABSTRACT_TYPE_INDICATOR = 1;
- protected static final int CONCRETE_TYPE_INDICATOR = 0;
-
- private static final String SELECT_ARTIFACT_TYPES = "select * from osee_artifact_type";
- private static final String INSERT_ARTIFACT_TYPE =
- "insert into osee_artifact_type (art_type_id, art_type_guid, name, is_abstract) VALUES (?,?,?,?)";
-
- private static final String UPDATE_ARTIFACT_TYPE =
- "update osee_artifact_type SET name = ?, is_abstract = ? where art_type_id = ?";
-
- private static final String SELECT_ARTIFACT_TYPE_INHERITANCE =
- "select * from osee_artifact_type_inheritance order by super_art_type_id, art_type_id";
- private static final String INSERT_ARTIFACT_TYPE_INHERITANCE =
- "insert into osee_artifact_type_inheritance (art_type_id, super_art_type_id) VALUES (?,?)";
- private static final String DELETE_ARTIFACT_TYPE_INHERITANCE =
- "delete from osee_artifact_type_inheritance where art_type_id = ?";
-
- private static final String SELECT_ARTIFACT_TYPE_ATTRIBUTES = "SELECT * FROM osee_artifact_type_attributes";
- private static final String INSERT_ARTIFACT_TYPE_ATTRIBUTES =
- "INSERT INTO osee_artifact_type_attributes (art_type_id, attr_type_id, branch_id) VALUES (?, ?, ?)";
- private static final String DELETE_ARTIFACT_TYPE_ATTRIBUTES =
- "delete from osee_artifact_type_attributes where art_type_id = ?";
-
- private final AttributeTypeCache attributeCache;
-
- public DatabaseArtifactTypeAccessor(IOseeTypeFactory factory, AttributeTypeCache attributeCache) {
- super(factory);
- this.attributeCache = attributeCache;
- }
-
- private ArtifactTypeCache getCastedObject(AbstractOseeCache<ArtifactType> cache) {
- return (ArtifactTypeCache) cache;
- }
-
- @Override
- public void load(AbstractOseeCache<ArtifactType> cache) throws OseeCoreException {
- attributeCache.ensurePopulated();
- loadArtifactTypes(cache, getFactory());
- loadTypeInheritance(getCastedObject(cache));
- loadAllTypeValidity(getCastedObject(cache), getFactory());
- for (ArtifactType type : cache.getAll()) {
- type.clearDirty();
- }
- }
-
- private void loadArtifactTypes(AbstractOseeCache<ArtifactType> cache, IOseeTypeFactory factory) throws OseeCoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
- try {
- chStmt.runPreparedQuery(SELECT_ARTIFACT_TYPES);
-
- while (chStmt.next()) {
- try {
- int artTypeId = chStmt.getInt("art_type_id");
- boolean isAbstract = chStmt.getInt("is_abstract") == ABSTRACT_TYPE_INDICATOR;
- String artifactTypeName = chStmt.getString("name");
-
- ArtifactType artifactType = cache.getById(artTypeId);
- if (artifactType == null) {
- artifactType =
- factory.createArtifactType(cache, chStmt.getString("art_type_guid"), isAbstract,
- artifactTypeName);
- artifactType.setId(artTypeId);
- artifactType.setModificationType(ModificationType.MODIFIED);
- cache.cache(artifactType);
- } else {
- artifactType.setName(artifactTypeName);
- artifactType.setAbstract(isAbstract);
- }
- } catch (OseeDataStoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
- } finally {
- chStmt.close();
- }
- }
-
- private void loadTypeInheritance(ArtifactTypeCache cache) throws OseeCoreException {
- ConnectionHandlerStatement chStmt2 = ConnectionHandler.getStatement();
- try {
- chStmt2.runPreparedQuery(SELECT_ARTIFACT_TYPE_INHERITANCE);
- HashCollection<ArtifactType, ArtifactType> baseToSuperTypes =
- new HashCollection<ArtifactType, ArtifactType>(false, HashSet.class);
-
- while (chStmt2.next()) {
- int artTypeId = chStmt2.getInt("art_type_id");
- int superArtTypeId = chStmt2.getInt("super_art_type_id");
- ArtifactType baseArtType = cache.getById(artTypeId);
- ArtifactType superArtType = cache.getById(superArtTypeId);
-
- if (baseArtType == null) {
- throw new OseeInvalidInheritanceException(String.format(
- "ArtifactType [%s] which inherits from [%s] is null", artTypeId, superArtType));
- }
- if (superArtType == null) {
- throw new OseeInvalidInheritanceException(String.format(
- "ArtifactType [%s] which inherits from null artifact [%s]", artTypeId, superArtType));
- }
- baseToSuperTypes.put(baseArtType, superArtType);
- }
- for (ArtifactType artifactType : baseToSuperTypes.keySet()) {
- Collection<ArtifactType> superTypes = baseToSuperTypes.getValues(artifactType);
- if (superTypes != null) {
- cache.cacheArtifactSuperType(artifactType, superTypes);
- }
- }
- } finally {
- chStmt2.close();
- }
- }
-
- private void loadAllTypeValidity(ArtifactTypeCache cache, IOseeTypeFactory factory) throws OseeCoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
- try {
- chStmt.runPreparedQuery(2000, SELECT_ARTIFACT_TYPE_ATTRIBUTES);
- while (chStmt.next()) {
- try {
- ArtifactType artifactType = cache.getById(chStmt.getInt("art_type_id"));
- AttributeType attributeType = attributeCache.getById(chStmt.getInt("attr_type_id"));
-
- // TODO remove dependency on Managers
- Branch branch = BranchManager.getBranch(chStmt.getInt("branch_id")); // Use Branch Cache
- cache.cacheTypeValidity(artifactType, attributeType, branch);
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
- } finally {
- chStmt.close();
- }
- }
-
- @Override
- public void store(AbstractOseeCache<ArtifactType> cache, Collection<ArtifactType> types) throws OseeCoreException {
- Set<ArtifactType> typeInheritanceChanges = new HashSet<ArtifactType>();
- Set<ArtifactType> typeValidityChanges = new HashSet<ArtifactType>();
- List<Object[]> insertData = new ArrayList<Object[]>();
- List<Object[]> updateData = new ArrayList<Object[]>();
-
- for (ArtifactType type : types) {
- if (isDataDirty(type)) {
- int abstractValue = type.isAbstract() ? ABSTRACT_TYPE_INDICATOR : CONCRETE_TYPE_INDICATOR;
- switch (type.getModificationType()) {
- case NEW:
- type.setId(SequenceManager.getNextArtifactTypeId());
- insertData.add(new Object[] {type.getId(), type.getGuid(), type.getName(), abstractValue});
- break;
- case MODIFIED:
- updateData.add(new Object[] {type.getName(), abstractValue, type.getId()});
- break;
- default:
- break;
- }
- }
- if (type.isFieldDirty(ArtifactType.ARTIFACT_INHERITANCE_FIELD_KEY)) {
- typeInheritanceChanges.add(type);
-
- }
- if (type.isFieldDirty(ArtifactType.ARTIFACT_TYPE_ATTRIBUTES_FIELD_KEY)) {
- typeValidityChanges.add(type);
- }
- }
- ConnectionHandler.runBatchUpdate(INSERT_ARTIFACT_TYPE, insertData);
- ConnectionHandler.runBatchUpdate(UPDATE_ARTIFACT_TYPE, updateData);
-
- storeArtifactTypeInheritance(typeInheritanceChanges);
- storeAttributeTypeValidity(getCastedObject(cache), types);
-
- for (ArtifactType type : types) {
- type.clearDirty();
- }
- }
-
- private boolean isDataDirty(ArtifactType type) throws OseeCoreException {
- return type.areFieldsDirty(AbstractOseeType.NAME_FIELD_KEY, AbstractOseeType.UNIQUE_ID_FIELD_KEY,
- ArtifactType.ARTIFACT_IS_ABSTRACT_FIELD_KEY);
- }
-
- private void storeArtifactTypeInheritance(Collection<ArtifactType> types) throws OseeDataStoreException {
- List<Object[]> insertInheritanceData = new ArrayList<Object[]>();
- List<Object[]> deleteInheritanceData = new ArrayList<Object[]>();
- for (ArtifactType type : types) {
- deleteInheritanceData.add(new Object[] {type.getId()});
- for (ArtifactType superType : type.getSuperArtifactTypes()) {
- insertInheritanceData.add(new Object[] {type.getId(), superType.getId()});
- }
- }
- ConnectionHandler.runBatchUpdate(DELETE_ARTIFACT_TYPE_INHERITANCE, deleteInheritanceData);
- ConnectionHandler.runBatchUpdate(INSERT_ARTIFACT_TYPE_INHERITANCE, insertInheritanceData);
- }
-
- private void storeAttributeTypeValidity(ArtifactTypeCache cache, Collection<ArtifactType> types) throws OseeCoreException {
- List<Object[]> insertData = new ArrayList<Object[]>();
- List<Object[]> deleteData = new ArrayList<Object[]>();
- for (ArtifactType artifactType : types) {
- deleteData.add(new Object[] {artifactType.getId()});
- Map<Branch, Collection<AttributeType>> entries = cache.getLocalAttributeTypes(artifactType);
- if (entries != null) {
- for (Entry<Branch, Collection<AttributeType>> entry : entries.entrySet()) {
- Branch branch = entry.getKey();
- for (AttributeType attributeType : entry.getValue()) {
- insertData.add(new Object[] {artifactType.getId(), attributeType.getId(), branch.getId()});
- }
- }
- }
- }
- ConnectionHandler.runBatchUpdate(DELETE_ARTIFACT_TYPE_ATTRIBUTES, deleteData);
- ConnectionHandler.runBatchUpdate(INSERT_ARTIFACT_TYPE_ATTRIBUTES, insertData);
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseAttributeTypeAccessor.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseAttributeTypeAccessor.java deleted file mode 100644 index f5e61751a78..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseAttributeTypeAccessor.java +++ /dev/null @@ -1,193 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.enums.ModificationType;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
-import org.eclipse.osee.framework.database.core.SQL3DataType;
-import org.eclipse.osee.framework.database.core.SequenceManager;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeExtensionManager;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumType;
-import org.eclipse.osee.framework.skynet.core.attribute.providers.IAttributeDataProvider;
-import org.eclipse.osee.framework.skynet.core.internal.Activator;
-import org.eclipse.osee.framework.skynet.core.types.IOseeTypeFactory;
-
-/**
- * @author Roberto E. Escobar
- */
-public class DatabaseAttributeTypeAccessor extends AbstractDatabaseAccessor<AttributeType> {
-
- private static final String SELECT_ATTRIBUTE_TYPES =
- "SELECT * FROM osee_attribute_type aty1, osee_attribute_base_type aby1, osee_attribute_provider_type apy1 WHERE aty1.attr_base_type_id = aby1.attr_base_type_id AND aty1.attr_provider_type_id = apy1.attr_provider_type_id";
- private static final String INSERT_ATTRIBUTE_TYPE =
- "INSERT INTO osee_attribute_type (attr_type_id, attr_type_guid, attr_base_type_id, attr_provider_type_id, file_type_extension, name, default_value, enum_type_id, min_occurence, max_occurence, tip_text, tagger_id) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)";
- private static final String UPDATE_ATTRIBUTE_TYPE =
- "update osee_attribute_type SET attr_base_type_id=?, attr_provider_type_id=?, file_type_extension=?, name=?, default_value=?, enum_type_id=?, min_occurence=?, max_occurence=?, tip_text=?, tagger_id=? where attr_type_id = ?";
-
- private static final String INSERT_BASE_ATTRIBUTE_TYPE =
- "INSERT INTO osee_attribute_base_type (attr_base_type_id, attribute_class) VALUES (?, ?)";
- private static final String INSERT_ATTRIBUTE_PROVIDER_TYPE =
- "INSERT INTO osee_attribute_provider_type (attr_provider_type_id, attribute_provider_class) VALUES (?, ?)";
- private static final String SELECT_ATTRIBUTE_BASE_TYPE =
- "SELECT attr_base_type_id FROM osee_attribute_base_type WHERE attribute_class = ?";
- private static final String SELECT_ATTRIBUTE_PROVIDER_TYPE =
- "SELECT attr_provider_type_id FROM osee_attribute_provider_type WHERE attribute_provider_class = ?";
-
- private final AbstractOseeCache<OseeEnumType> enumCache;
-
- public DatabaseAttributeTypeAccessor(IOseeTypeFactory factory, AbstractOseeCache<OseeEnumType> enumCache) {
- super(factory);
- this.enumCache = enumCache;
- }
-
- @Override
- public void load(AbstractOseeCache<AttributeType> cache) throws OseeCoreException {
- enumCache.ensurePopulated();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
-
- try {
- chStmt.runPreparedQuery(SELECT_ATTRIBUTE_TYPES);
-
- while (chStmt.next()) {
- int attributeTypeId = chStmt.getInt("attr_type_id");
- String baseClassString = chStmt.getString("attribute_class");
- String baseProviderClassString = chStmt.getString("attribute_provider_class");
- try {
- Class<? extends Attribute<?>> baseAttributeClass =
- AttributeExtensionManager.getAttributeClassFor(baseClassString);
- Class<? extends IAttributeDataProvider> providerAttributeClass =
- AttributeExtensionManager.getAttributeProviderClassFor(baseProviderClassString);
- int enumTypeId = chStmt.getInt("enum_type_id");
- OseeEnumType oseeEnumType = enumCache.getById(enumTypeId);
-
- AttributeType attributeType = cache.getById(attributeTypeId);
- if (attributeType == null) {
- attributeType =
- getFactory().createAttributeType(cache, chStmt.getString("attr_type_guid"),
- chStmt.getString("name"), baseClassString, baseProviderClassString, baseAttributeClass,
- providerAttributeClass, chStmt.getString("file_type_extension"),
- chStmt.getString("default_value"), oseeEnumType, chStmt.getInt("min_occurence"),
- chStmt.getInt("max_occurence"), chStmt.getString("tip_text"),
- chStmt.getString("tagger_id"));
- attributeType.setId(attributeTypeId);
- attributeType.setModificationType(ModificationType.MODIFIED);
- cache.cache(attributeType);
- } else {
- attributeType.setFields(chStmt.getString("name"), baseClassString, baseProviderClassString,
- baseAttributeClass, providerAttributeClass, chStmt.getString("file_type_extension"),
- chStmt.getString("default_value"), oseeEnumType, chStmt.getInt("min_occurence"),
- chStmt.getInt("max_occurence"), chStmt.getString("tip_text"), chStmt.getString("tagger_id"));
- }
- attributeType.clearDirty();
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
- } finally {
- chStmt.close();
- }
- }
-
- @Override
- public void store(AbstractOseeCache<AttributeType> cache, Collection<AttributeType> types) throws OseeCoreException {
- List<Object[]> insertData = new ArrayList<Object[]>();
- List<Object[]> updateData = new ArrayList<Object[]>();
- for (AttributeType type : types) {
- if (type.isDirty()) {
- switch (type.getModificationType()) {
- case NEW:
- type.setId(SequenceManager.getNextAttributeTypeId());
- insertData.add(toInsertValues(type));
- break;
- case MODIFIED:
- updateData.add(toUpdateValues(type));
- break;
- default:
- break;
- }
- }
- }
- ConnectionHandler.runBatchUpdate(INSERT_ATTRIBUTE_TYPE, insertData);
- ConnectionHandler.runBatchUpdate(UPDATE_ATTRIBUTE_TYPE, updateData);
- for (AttributeType type : types) {
- type.clearDirty();
- }
- }
-
- private Object[] toInsertValues(AttributeType type) throws OseeDataStoreException {
- int attrBaseTypeId = getOrCreateAttributeBaseType(type.getBaseAttributeTypeId());
- int attrProviderTypeId = getOrCreateAttributeProviderType(type.getAttributeProviderId());
- return new Object[] {type.getId(), type.getGuid(), attrBaseTypeId, attrProviderTypeId,
- type.getFileTypeExtension() == null ? SQL3DataType.VARCHAR : type.getFileTypeExtension(),
- type.getName() == null ? SQL3DataType.VARCHAR : type.getName(),
- type.getDefaultValue() == null ? SQL3DataType.VARCHAR : type.getDefaultValue(), type.getOseeEnumTypeId(),
- type.getMinOccurrences(), type.getMaxOccurrences(),
- type.getDescription() == null ? SQL3DataType.VARCHAR : type.getDescription(),
- type.getTaggerId() == null ? SQL3DataType.VARCHAR : type.getTaggerId()};
- }
-
- private Object[] toUpdateValues(AttributeType type) throws OseeDataStoreException {
- int attrBaseTypeId = getOrCreateAttributeBaseType(type.getBaseAttributeTypeId());
- int attrProviderTypeId = getOrCreateAttributeProviderType(type.getAttributeProviderId());
- return new Object[] {attrBaseTypeId, attrProviderTypeId,
- type.getFileTypeExtension() == null ? SQL3DataType.VARCHAR : type.getFileTypeExtension(),
- type.getName() == null ? SQL3DataType.VARCHAR : type.getName(),
- type.getDefaultValue() == null ? SQL3DataType.VARCHAR : type.getDefaultValue(), type.getOseeEnumTypeId(),
- type.getMinOccurrences(), type.getMaxOccurrences(),
- type.getDescription() == null ? SQL3DataType.VARCHAR : type.getDescription(),
- type.getTaggerId() == null ? SQL3DataType.VARCHAR : type.getTaggerId(), type.getId()};
- }
-
- private int getOrCreateAttributeProviderType(String attrProviderExtension) throws OseeDataStoreException {
- int attrBaseTypeId = -1;
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
- try {
- chStmt.runPreparedQuery(SELECT_ATTRIBUTE_PROVIDER_TYPE, attrProviderExtension);
- if (chStmt.next()) {
- attrBaseTypeId = chStmt.getInt("attr_provider_type_id");
- } else {
- attrBaseTypeId = SequenceManager.getNextAttributeProviderTypeId();
- ConnectionHandler.runPreparedUpdate(INSERT_ATTRIBUTE_PROVIDER_TYPE, attrBaseTypeId, attrProviderExtension);
- }
- } finally {
- chStmt.close();
- }
- return attrBaseTypeId;
- }
-
- private int getOrCreateAttributeBaseType(String attrBaseExtension) throws OseeDataStoreException {
- int attrBaseTypeId = -1;
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
- try {
- chStmt.runPreparedQuery(SELECT_ATTRIBUTE_BASE_TYPE, attrBaseExtension);
- if (chStmt.next()) {
- attrBaseTypeId = chStmt.getInt("attr_base_type_id");
- } else {
- attrBaseTypeId = SequenceManager.getNextAttributeBaseTypeId();
- ConnectionHandler.runPreparedUpdate(INSERT_BASE_ATTRIBUTE_TYPE, attrBaseTypeId, attrBaseExtension);
- }
- } finally {
- chStmt.close();
- }
- return attrBaseTypeId;
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseBranchAccessor.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseBranchAccessor.java deleted file mode 100644 index 5772e32c489..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseBranchAccessor.java +++ /dev/null @@ -1,284 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types.impl;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
-import org.eclipse.osee.framework.core.enums.BranchArchivedState;
-import org.eclipse.osee.framework.core.enums.BranchState;
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.enums.ModificationType;
-import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
-import org.eclipse.osee.framework.core.exception.BranchDoesNotExist;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.operation.Operations;
-import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
-import org.eclipse.osee.framework.database.core.JoinUtility;
-import org.eclipse.osee.framework.database.core.JoinUtility.IdJoinQuery;
-import org.eclipse.osee.framework.jdk.core.type.HashCollection;
-import org.eclipse.osee.framework.jdk.core.util.Collections;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.internal.Activator;
-import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-import org.eclipse.osee.framework.skynet.core.types.BranchCache;
-import org.eclipse.osee.framework.skynet.core.types.IOseeTypeFactory;
-import org.eclipse.osee.framework.skynet.core.types.ShallowArtifact;
-
-/**
- * @author Roberto E. Escobar
- */
-public class DatabaseBranchAccessor extends AbstractDatabaseAccessor<Branch> {
- public static final int NULL_PARENT_BRANCH_ID = -1;
- private static final String SELECT_BRANCHES =
- "SELECT ob.*, txd.transaction_id FROM osee_branch ob, osee_tx_details txd WHERE ob.branch_id = txd.branch_id and txd.tx_type = " + TransactionDetailsType.Baselined.getId();
- // private static final String INSERT_BRANCH =
- // "INSERT INTO osee_branch (branch_id, branch_guid, branch_name, parent_branch_id, parent_transaction_id, archived, associated_art_id, branch_type, branch_state) VALUES (?,?,?,?,?,?,?,?,?)";
- // private static final String DELETE_BRANCH = "DELETE from osee_branch where branch_id = ?";
-
- private static final String SELECT_MERGE_BRANCHES = "SELECT * FROM osee_merge";
-
- private static final String SELECT_BRANCH_ALIASES =
- "select * from osee_branch_definitions order by mapped_branch_id";
-
- private final DatabaseTransactionAccessor transactionData;
-
- public DatabaseBranchAccessor(IOseeTypeFactory factory) {
- super(factory);
- transactionData = new DatabaseTransactionAccessor();
- }
-
- private BranchCache getCastedObject(AbstractOseeCache<Branch> cache) {
- return (BranchCache) cache;
- }
-
- // private Object[] toInsertValues(Branch type) throws OseeCoreException {
- // Branch parentBranch = type.getParentBranch();
- // int parentBranchId = parentBranch != null ? parentBranch.getId() : NULL_PARENT_BRANCH_ID;
- // return new Object[] {type.getId(), type.getGuid(), type.getName(),
- // parentBranchId, type.getBaseTransaction().getTransactionNumber(), type.getArchiveState().getValue(),
- // type.getAssociatedArtifactId(), type.getBranchType().getValue(), type.getBranchState().getValue()};
- // }
-
- @Override
- public void load(AbstractOseeCache<Branch> cache) throws OseeCoreException {
- long startTime = System.currentTimeMillis();
- Map<Branch, Integer> childToParent = new HashMap<Branch, Integer>();
- Map<Branch, Integer> branchToSourceTx = new HashMap<Branch, Integer>();
- Map<Branch, Integer> branchToBaseTx = new HashMap<Branch, Integer>();
- Map<Branch, Integer> associatedArtifact = new HashMap<Branch, Integer>();
-
- BranchCache branchCache = getCastedObject(cache);
- loadBranches(branchCache, getFactory(), childToParent, branchToBaseTx, branchToSourceTx, associatedArtifact);
- loadBranchHierarchy(branchCache, childToParent);
- loadMergeBranches(branchCache);
- loadBranchAliases(branchCache);
- loadAssociatedArtifacts(branchCache, associatedArtifact);
- loadBranchRelatedTransactions(branchCache, branchToBaseTx, branchToSourceTx);
-
- for (Branch branch : cache.getAll()) {
- branch.clearDirty();
- }
- OseeLog.log(Activator.class, Level.INFO,
- String.format("Branch Cache loaded [%s]", Lib.getElapseString(startTime)));
- }
-
- private void loadAssociatedArtifacts(BranchCache cache, Map<Branch, Integer> associatedArtifact) throws OseeCoreException {
- if (cache.getDefaultAssociatedArtifact() == null) {
- cache.setDefaultAssociatedArtifact(new ShallowArtifact(cache, -1));
- }
- for (Entry<Branch, Integer> entry : associatedArtifact.entrySet()) {
- Branch branch = entry.getKey();
- branch.setAssociatedArtifact(new ShallowArtifact(cache, entry.getValue()));
- }
- }
-
- @SuppressWarnings("unchecked")
- private void loadBranchRelatedTransactions(BranchCache cache, Map<Branch, Integer> branchToBaseTx, Map<Branch, Integer> branchToSourceTx) throws OseeCoreException {
- Set<Integer> transactions = Collections.setUnion(branchToBaseTx.values(), branchToSourceTx.values());
- transactionData.loadTransactions(cache, transactions);
-
- for (Entry<Branch, Integer> entry : branchToBaseTx.entrySet()) {
- Branch branch = entry.getKey();
- if (branch.getBaseTransaction() == null) {
- TransactionRecord baseTransaction = TransactionManager.getTransactionFromCache(entry.getValue());
- cache.cacheBaseTransaction(branch, baseTransaction);
- }
- }
-
- for (Entry<Branch, Integer> entry : branchToBaseTx.entrySet()) {
- Branch branch = entry.getKey();
- if (branch.getSourceTransaction() == null) {
- TransactionRecord sourceTransaction = TransactionManager.getTransactionFromCache(entry.getValue());
- cache.cacheSourceTransaction(branch, sourceTransaction);
- }
- }
- }
-
- private void loadBranches(BranchCache cache, IOseeTypeFactory factory, Map<Branch, Integer> childToParent, Map<Branch, Integer> branchToBaseTx, Map<Branch, Integer> branchToSourceTx, Map<Branch, Integer> associatedArtifact) throws OseeCoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
- try {
- chStmt.runPreparedQuery(2000, SELECT_BRANCHES);
- while (chStmt.next()) {
- try {
- int branchId = chStmt.getInt("branch_id");
-
- String branchName = chStmt.getString("branch_name");
- BranchState branchState = BranchState.getBranchState(chStmt.getInt("branch_state"));
- BranchType branchType = BranchType.getBranchType(chStmt.getInt("branch_type"));
- boolean isArchived = BranchArchivedState.valueOf(chStmt.getInt("archived")).isArchived();
- Branch branch = cache.getById(branchId);
- if (branch == null) {
-
- branch =
- factory.createBranch(cache, chStmt.getString("branch_guid"), branchName, branchType,
- branchState, isArchived);
- branch.setId(branchId);
- branch.setModificationType(ModificationType.MODIFIED);
- branch.clearDirty();
- cache.cache(branch);
- } else {
- branch.setName(branchName);
- branch.setArchived(isArchived);
- branch.setBranchType(branchType);
- branch.setBranchState(branchState);
- branch.setModificationType(ModificationType.MODIFIED);
- }
- Integer parentBranchId = chStmt.getInt("parent_branch_id");
- if (parentBranchId != NULL_PARENT_BRANCH_ID) {
- childToParent.put(branch, parentBranchId);
- }
- branchToSourceTx.put(branch, chStmt.getInt("parent_transaction_id"));
- branchToBaseTx.put(branch, chStmt.getInt("transaction_id"));
- associatedArtifact.put(branch, chStmt.getInt("associated_art_id"));
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
- } finally {
- chStmt.close();
- }
- }
-
- private void loadBranchHierarchy(BranchCache branchCache, Map<Branch, Integer> childToParent) throws OseeCoreException {
- for (Entry<Branch, Integer> entry : childToParent.entrySet()) {
- Branch childBranch = entry.getKey();
- Branch parentBranch = branchCache.getById(entry.getValue());
- if (parentBranch == null) {
- throw new BranchDoesNotExist(String.format("Parent Branch id:[%s] does not exist for child branch [%s]",
- entry.getValue(), entry.getKey()));
- }
- branchCache.setBranchParent(parentBranch, childBranch);
-
- }
- }
-
- private void loadMergeBranches(BranchCache branchCache) throws OseeCoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
- try {
- chStmt.runPreparedQuery(1000, SELECT_MERGE_BRANCHES);
- while (chStmt.next()) {
- Branch sourceBranch = branchCache.getById(chStmt.getInt("source_branch_id"));
- Branch destBranch = branchCache.getById(chStmt.getInt("dest_branch_id"));
- Branch mergeBranch = branchCache.getById(chStmt.getInt("merge_branch_id"));
- branchCache.cacheMergeBranch(mergeBranch, sourceBranch, destBranch);
- }
- } finally {
- chStmt.close();
- }
-
- }
-
- private void loadBranchAliases(BranchCache branchCache) throws OseeCoreException {
- HashCollection<Integer, String> aliasMap = new HashCollection<Integer, String>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
- try {
- chStmt.runPreparedQuery(SELECT_BRANCH_ALIASES);
- while (chStmt.next()) {
- int branchId = chStmt.getInt("mapped_branch_id");
- String alias = chStmt.getString("static_branch_name").toLowerCase();
- aliasMap.put(branchId, alias);
- }
- } finally {
- chStmt.close();
- }
- for (Integer branchId : aliasMap.keySet()) {
- Branch branch = branchCache.getById(branchId);
- Collection<String> aliases = aliasMap.getValues(branchId);
- if (aliases != null) {
- branch.setAliases(aliases.toArray(new String[aliases.size()]));
- }
- }
- }
-
- @Override
- public void store(AbstractOseeCache<Branch> cache, Collection<Branch> branches) throws OseeCoreException {
- Operations.executeWork(new BranchStoreOperation(cache, branches), new NullProgressMonitor(), -1);
- }
-
- //TODO Move to its own Cache
- private final static class DatabaseTransactionAccessor {
- private static final String SELECT_TRANSACTIONS_BY_QUERY_ID =
- "select * from osee_tx_details txd, osee_join_id oji where txd.transaction_id = oji.id and oji.query_id = ?";
-
- private void loadTransactions(AbstractOseeCache<Branch> branchCache, Collection<Integer> txNumbers) throws OseeCoreException {
- IdJoinQuery joinQuery = JoinUtility.createIdJoinQuery();
- try {
- for (Integer txNumber : txNumbers) {
- joinQuery.add(txNumber);
- }
- joinQuery.store();
-
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
- try {
- chStmt.runPreparedQuery(5000, SELECT_TRANSACTIONS_BY_QUERY_ID, joinQuery.getQueryId());
- while (chStmt.next()) {
- int transactionNumber = chStmt.getInt("transaction_id");
- String comment = chStmt.getString("osee_comment");
- Date timeStamp = chStmt.getTimestamp("time");
- int authorId = chStmt.getInt("author");
- int commitArtId = chStmt.getInt("commit_art_id");
-
- TransactionRecord transaction = TransactionManager.getTransactionFromCache(transactionNumber);
- if (transaction == null) {
- Branch branch = branchCache.getById(chStmt.getInt("branch_id"));
- TransactionDetailsType txType = TransactionDetailsType.toEnum(chStmt.getInt("tx_type"));
-
- transaction =
- new TransactionRecord(transactionNumber, branch, comment, timeStamp, authorId, commitArtId,
- txType);
- TransactionManager.cacheTransaction(transaction);
- } else {
- transaction.setComment(comment);
- transaction.setAuthor(authorId);
- transaction.setCommit(commitArtId);
- transaction.setTime(timeStamp);
- }
- }
- } finally {
- chStmt.close();
- }
- } finally {
- joinQuery.delete();
- }
- }
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseOseeEnumTypeAccessor.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseOseeEnumTypeAccessor.java deleted file mode 100644 index 0662b91333d..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseOseeEnumTypeAccessor.java +++ /dev/null @@ -1,195 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.AbstractOseeType;
-import org.eclipse.osee.framework.core.data.UniqueIdField;
-import org.eclipse.osee.framework.core.enums.ModificationType;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
-import org.eclipse.osee.framework.database.core.SequenceManager;
-import org.eclipse.osee.framework.jdk.core.type.HashCollection;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumEntry;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumType;
-import org.eclipse.osee.framework.skynet.core.internal.Activator;
-import org.eclipse.osee.framework.skynet.core.types.IOseeTypeFactory;
-
-/**
- * @author Roberto E. Escobar
- */
-public class DatabaseOseeEnumTypeAccessor extends AbstractDatabaseAccessor<OseeEnumType> {
-
- private static final String SELECT_OSEE_ENUM_TYPES =
- "select oet.enum_type_name, oet.enum_type_guid, oetd.* from osee_enum_type oet, osee_enum_type_def oetd where oet.enum_type_id = oetd.enum_type_id order by oetd.enum_type_id, oetd.ordinal";
- private static final String INSERT_ENUM_TYPE =
- "insert into osee_enum_type (enum_type_id, enum_type_guid, enum_type_name) values (?,?,?)";
- private static final String UPDATE_ENUM_TYPE = "update osee_enum_type set enum_type_name=? where enum_type_id=?";
- private static final String DELETE_ENUM_TYPE = "delete from osee_enum_type oet where enum_type_id = ?";
-
- private static final String INSERT_ENUM_TYPE_DEF =
- "insert into osee_enum_type_def (enum_type_id, enum_entry_guid, name, ordinal) values (?,?,?,?)";
- private static final String DELETE_ENUM_TYPE_DEF = "delete from osee_enum_type_def where enum_type_id = ?";
-
- public DatabaseOseeEnumTypeAccessor(IOseeTypeFactory factory) {
- super(factory);
- }
-
- @Override
- public void load(AbstractOseeCache<OseeEnumType> cache) throws OseeCoreException {
- HashCollection<OseeEnumType, OseeEnumEntry> types = new HashCollection<OseeEnumType, OseeEnumEntry>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
- try {
- chStmt.runPreparedQuery(SELECT_OSEE_ENUM_TYPES);
- OseeEnumType oseeEnumType = null;
- int lastEnumTypeId = -1;
- while (chStmt.next()) {
- try {
- int currentEnumTypeId = chStmt.getInt("enum_type_id");
- String currentEnumTypeGuid = chStmt.getString("enum_type_guid");
- if (lastEnumTypeId != currentEnumTypeId) {
- String enumTypeName = chStmt.getString("enum_type_name");
- oseeEnumType = cache.getById(currentEnumTypeId);
- if (oseeEnumType == null) {
- oseeEnumType = getFactory().createEnumType(cache, currentEnumTypeGuid, enumTypeName);
- oseeEnumType.setId(currentEnumTypeId);
- oseeEnumType.setModificationType(ModificationType.MODIFIED);
- cache.cache(oseeEnumType);
- } else {
- oseeEnumType.setName(enumTypeName);
- }
- lastEnumTypeId = currentEnumTypeId;
- }
- OseeEnumEntry entry =
- getFactory().createEnumEntry(cache, chStmt.getString("enum_entry_guid"), chStmt.getString("name"),
- chStmt.getInt("ordinal"));
- entry.setModificationType(ModificationType.MODIFIED);
- entry.clearDirty();
- types.put(oseeEnumType, entry);
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
- } finally {
- chStmt.close();
- }
- for (OseeEnumType oseeEnumType : types.keySet()) {
- List<OseeEnumEntry> oseeEnumEntries = (List<OseeEnumEntry>) types.getValues(oseeEnumType);
- if (oseeEnumEntries != null) {
- oseeEnumType.setEntries(oseeEnumEntries);
- oseeEnumType.clearDirty();
- }
- }
- }
-
- @Override
- public void store(AbstractOseeCache<OseeEnumType> cache, Collection<OseeEnumType> oseeEnumTypes) throws OseeCoreException {
- Set<OseeEnumType> dirtyEntries = new HashSet<OseeEnumType>();
- List<Object[]> insertData = new ArrayList<Object[]>();
- List<Object[]> updateData = new ArrayList<Object[]>();
- List<Object[]> deleteData = new ArrayList<Object[]>();
- for (OseeEnumType oseeEnumType : oseeEnumTypes) {
- if (isDataDirty(oseeEnumType)) {
- switch (oseeEnumType.getModificationType()) {
- case NEW:
- oseeEnumType.setId(SequenceManager.getNextOseeEnumTypeId());
- insertData.add(toInsertValues(oseeEnumType));
- break;
- case MODIFIED:
- updateData.add(toUpdateValues(oseeEnumType));
- break;
- case DELETED:
- deleteData.add(toDeleteValues(oseeEnumType));
- break;
- default:
- break;
- }
- }
- if (oseeEnumType.isFieldDirty(OseeEnumType.OSEE_ENUM_TYPE_ENTRIES_FIELD)) {
- if (!oseeEnumType.getModificationType().isDeleted()) {
- dirtyEntries.add(oseeEnumType);
- }
- }
- }
- ConnectionHandler.runBatchUpdate(INSERT_ENUM_TYPE, insertData);
- ConnectionHandler.runBatchUpdate(UPDATE_ENUM_TYPE, updateData);
- ConnectionHandler.runBatchUpdate(DELETE_ENUM_TYPE, deleteData);
-
- storeOseeEnumEntries(dirtyEntries);
- for (OseeEnumType oseeEnumType : oseeEnumTypes) {
- oseeEnumType.clearDirty();
- }
-
- insertData.clear();
- updateData.clear();
- deleteData.clear();
-
- for (OseeEnumType oseeEnumType : oseeEnumTypes) {
- for (OseeEnumEntry entry : oseeEnumType.values()) {
- entry.clearDirty();
- }
- }
- }
-
- private boolean isDataDirty(OseeEnumType type) throws OseeCoreException {
- return type.areFieldsDirty(AbstractOseeType.NAME_FIELD_KEY, AbstractOseeType.UNIQUE_ID_FIELD_KEY);
- }
-
- private void storeOseeEnumEntries(Collection<OseeEnumType> oseeEnumTypes) throws OseeCoreException {
- List<Object[]> insertData = new ArrayList<Object[]>();
- List<Object[]> deleteData = new ArrayList<Object[]>();
- for (OseeEnumType type : oseeEnumTypes) {
- if (type.getId() != UniqueIdField.UNPERSISTED_VALUE) {
- deleteData.add(toDeleteValues(type));
- }
- for (OseeEnumEntry entry : type.values()) {
- switch (entry.getModificationType()) {
- case NEW:
- entry.setId(type.getId());
- insertData.add(toInsertValues(entry));
- break;
- case MODIFIED:
- insertData.add(toInsertValues(entry));
- break;
- default:
- break;
- }
- }
- }
- ConnectionHandler.runBatchUpdate(DELETE_ENUM_TYPE_DEF, deleteData);
- ConnectionHandler.runBatchUpdate(INSERT_ENUM_TYPE_DEF, insertData);
- }
-
- private Object[] toInsertValues(OseeEnumType type) throws OseeDataStoreException {
- return new Object[] {type.getId(), type.getGuid(), type.getName()};
- }
-
- private Object[] toUpdateValues(OseeEnumType type) throws OseeDataStoreException {
- return new Object[] {type.getName(), type.getId()};
- }
-
- private Object[] toDeleteValues(OseeEnumType type) throws OseeDataStoreException {
- return new Object[] {type.getId()};
- }
-
- private Object[] toInsertValues(OseeEnumEntry type) throws OseeDataStoreException {
- return new Object[] {type.getId(), type.getGuid(), type.getName(), type.ordinal()};
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseRelationTypeAccessor.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseRelationTypeAccessor.java deleted file mode 100644 index ef12e65b3e5..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseRelationTypeAccessor.java +++ /dev/null @@ -1,136 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.enums.ModificationType;
-import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
-import org.eclipse.osee.framework.database.core.SequenceManager;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.internal.Activator;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
-import org.eclipse.osee.framework.skynet.core.types.ArtifactTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.IOseeTypeFactory;
-
-/**
- * @author Roberto E. Escobar
- */
-public class DatabaseRelationTypeAccessor extends AbstractDatabaseAccessor<RelationType> {
- private static final String SELECT_LINK_TYPES = "SELECT * FROM osee_relation_link_type";
- private static final String INSERT_RELATION_TYPE =
- "INSERT INTO osee_relation_link_type (rel_link_type_id, rel_link_type_guid, type_name, a_name, b_name, a_art_type_id, b_art_type_id, multiplicity, default_order_type_guid) VALUES (?,?,?,?,?,?,?,?,?)";
- private static final String UPDATE_RELATION_TYPE =
- "update osee_relation_link_type SET type_name=?, a_name=?, b_name=?, a_art_type_id=?, b_art_type_id=?, multiplicity=?, default_order_type_guid=? where rel_link_type_id = ?";
-
- private final ArtifactTypeCache artifactCache;
-
- public DatabaseRelationTypeAccessor(IOseeTypeFactory factory, ArtifactTypeCache artifactCache) {
- super(factory);
- this.artifactCache = artifactCache;
- }
-
- @Override
- public void load(AbstractOseeCache<RelationType> cache) throws OseeCoreException {
- artifactCache.ensurePopulated();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
-
- try {
- chStmt.runPreparedQuery(SELECT_LINK_TYPES);
-
- while (chStmt.next()) {
- String name = chStmt.getString("type_name");
- int typeId = chStmt.getInt("rel_link_type_id");
- int aArtTypeId = chStmt.getInt("a_art_type_id");
- int bArtTypeId = chStmt.getInt("b_art_type_id");
- int multiplicityValue = chStmt.getInt("multiplicity");
- try {
- ArtifactType artifactTypeSideA = artifactCache.getById(aArtTypeId);
- ArtifactType artifactTypeSideB = artifactCache.getById(bArtTypeId);
- RelationTypeMultiplicity multiplicity =
- RelationTypeMultiplicity.getRelationMultiplicity(multiplicityValue);
- String sideAName = chStmt.getString("a_name");
- String sideBName = chStmt.getString("b_name");
- String defaultOrderTypeGuid = chStmt.getString("default_order_type_guid");
-
- RelationType relationType = cache.getById(typeId);
- if (relationType == null) {
- relationType =
- getFactory().createRelationType(cache, chStmt.getString("rel_link_type_guid"), name, sideAName,
- sideBName, artifactTypeSideA, artifactTypeSideB, multiplicity, defaultOrderTypeGuid);
- relationType.setId(typeId);
- relationType.setModificationType(ModificationType.MODIFIED);
- cache.cache(relationType);
- } else {
- relationType.setFields(name, sideAName, sideBName, artifactTypeSideA, artifactTypeSideB,
- multiplicity, defaultOrderTypeGuid);
- }
- relationType.clearDirty();
- } catch (OseeCoreException ex) {
- String message =
- String.format(
- "Error loading relation type - name:[%s] id:[%s] aArtTypeId:[%s] bArtTypeid:[%s] multiplicity:[%s]",
- name, typeId, aArtTypeId, bArtTypeId, multiplicityValue);
- OseeLog.log(Activator.class, Level.SEVERE, message, ex);
- }
- }
- } finally {
- chStmt.close();
- }
- }
-
- @Override
- public void store(AbstractOseeCache<RelationType> cache, Collection<RelationType> relationTypes) throws OseeCoreException {
- List<Object[]> insertData = new ArrayList<Object[]>();
- List<Object[]> updateData = new ArrayList<Object[]>();
- for (RelationType type : relationTypes) {
- if (type.isDirty()) {
- switch (type.getModificationType()) {
- case NEW:
- type.setId(SequenceManager.getNextRelationTypeId());
- insertData.add(toInsertValues(type));
- break;
- case MODIFIED:
- updateData.add(toUpdateValues(type));
- break;
- default:
- break;
- }
- }
- }
- ConnectionHandler.runBatchUpdate(INSERT_RELATION_TYPE, insertData);
- ConnectionHandler.runBatchUpdate(UPDATE_RELATION_TYPE, updateData);
-
- for (RelationType type : relationTypes) {
- type.clearDirty();
- }
- }
-
- private Object[] toInsertValues(RelationType type) throws OseeDataStoreException {
- return new Object[] {type.getId(), type.getGuid(), type.getName(), type.getSideAName(), type.getSideBName(),
- type.getArtifactTypeSideA().getId(), type.getArtifactTypeSideB().getId(),
- type.getMultiplicity().getValue(), type.getDefaultOrderTypeGuid()};
- }
-
- private Object[] toUpdateValues(RelationType type) throws OseeDataStoreException {
- return new Object[] {type.getName(), type.getSideAName(), type.getSideBName(),
- type.getArtifactTypeSideA().getId(), type.getArtifactTypeSideB().getId(),
- type.getMultiplicity().getValue(), type.getDefaultOrderTypeGuid(), type.getId()};
- }
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseTransactionAccessor.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseTransactionAccessor.java deleted file mode 100644 index 67419128078..00000000000 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/impl/DatabaseTransactionAccessor.java +++ /dev/null @@ -1,18 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types.impl;
-
-/**
- * @author Roberto E. Escobar
- */
-public class DatabaseTransactionAccessor {
-
-}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifact.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifact.java index bbe4c4d1141..0e6b6f34982 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifact.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifact.java @@ -10,8 +10,8 @@ *******************************************************************************/
package org.eclipse.osee.framework.skynet.core.utility;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/LoadedArtifacts.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/LoadedArtifacts.java index 62eff12d149..40077bff911 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/LoadedArtifacts.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/LoadedArtifacts.java @@ -15,8 +15,8 @@ import java.util.Collection; import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/Requirements.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/Requirements.java index eab307287d0..0b13736a925 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/Requirements.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/Requirements.java @@ -13,10 +13,10 @@ package org.eclipse.osee.framework.skynet.core.utility; import java.util.Collection;
import java.util.HashSet;
+import org.eclipse.osee.framework.core.enums.CoreArtifacts;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
+import org.eclipse.osee.framework.core.model.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
-import org.eclipse.osee.framework.skynet.core.artifact.CoreArtifacts;
/**
* @author Donald G. Dunne
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/validation/IOseeValidator.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/validation/IOseeValidator.java index 088af140dc4..575ebb2da67 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/validation/IOseeValidator.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/validation/IOseeValidator.java @@ -12,8 +12,8 @@ package org.eclipse.osee.framework.skynet.core.validation; import org.eclipse.core.runtime.IStatus; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.AttributeType; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; public interface IOseeValidator { diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/validation/OseeValidator.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/validation/OseeValidator.java index d85258b49bf..9f1d0f07fcb 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/validation/OseeValidator.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/validation/OseeValidator.java @@ -12,12 +12,12 @@ package org.eclipse.osee.framework.skynet.core.validation; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.ExtensionDefinedObjects;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/word/WordUtil.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/word/WordUtil.java index 40ffe9136dd..cf41ce0f2c2 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/word/WordUtil.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/word/WordUtil.java @@ -26,17 +26,17 @@ import java.util.List; import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.text.change.ChangeSet;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.io.Streams;
import org.eclipse.osee.framework.jdk.core.util.xml.Xml;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.attribute.WordAttribute;
@@ -107,7 +107,7 @@ public class WordUtil { AttributeType attributeDescriptor = AttributeTypeManager.getType(WordAttribute.WORD_TEMPLATE_CONTENT);
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(SELECT_WORD_VALUES, artId, attributeDescriptor.getId(), branch.getId());
diff --git a/org.eclipse.osee.framework.types.bridge/META-INF/MANIFEST.MF b/org.eclipse.osee.framework.types.bridge/META-INF/MANIFEST.MF index 951f8aee8f2..e2480699a0c 100644 --- a/org.eclipse.osee.framework.types.bridge/META-INF/MANIFEST.MF +++ b/org.eclipse.osee.framework.types.bridge/META-INF/MANIFEST.MF @@ -20,10 +20,14 @@ Require-Bundle: org.eclipse.ui.ide, org.eclipse.ui.forms Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy -Import-Package: org.eclipse.osee.framework.core.data, +Import-Package: org.eclipse.osee.framework.core.cache, + org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.exception, + org.eclipse.osee.framework.core.model, org.eclipse.osee.framework.core.operation, + org.eclipse.osee.framework.core.services, + org.eclipse.osee.framework.database, org.eclipse.osee.framework.database.init, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, diff --git a/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/internal/Activator.java b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/internal/Activator.java index 866fb88cc52..a4cd58ccaf6 100644 --- a/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/internal/Activator.java +++ b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/internal/Activator.java @@ -10,13 +10,17 @@ *******************************************************************************/
package org.eclipse.osee.framework.types.bridge.internal;
+import org.eclipse.osee.framework.core.services.IOseeCachingService;
+import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
+import org.eclipse.osee.framework.core.services.IOseeModelFactoryServiceProvider;
import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
import org.osgi.framework.BundleContext;
+import org.osgi.util.tracker.ServiceTracker;
/**
* @author Roberto E. Escobar
*/
-public class Activator extends OseeUiActivator {
+public class Activator extends OseeUiActivator implements IOseeModelFactoryServiceProvider {
// The plug-in ID
public static final String PLUGIN_ID = "org.eclipse.osee.framework.types.bridge";
@@ -24,6 +28,9 @@ public class Activator extends OseeUiActivator { // The shared instance
private static Activator plugin;
+ private ServiceTracker cacheServiceTracker;
+ private ServiceTracker factoryTracker;
+
/**
* The constructor
*/
@@ -38,6 +45,13 @@ public class Activator extends OseeUiActivator { public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
+
+ factoryTracker = new ServiceTracker(context, IOseeModelFactoryService.class.getName(), null);
+ factoryTracker.open();
+
+ cacheServiceTracker = new ServiceTracker(context, IOseeCachingService.class.getName(), null);
+ cacheServiceTracker.open();
+
}
/*
@@ -47,6 +61,8 @@ public class Activator extends OseeUiActivator { @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
+ cacheServiceTracker.close();
+ factoryTracker.close();
super.stop(context);
}
@@ -59,4 +75,11 @@ public class Activator extends OseeUiActivator { return plugin;
}
+ public IOseeCachingService getOseeCacheService() {
+ return (IOseeCachingService) cacheServiceTracker.getService();
+ }
+
+ public IOseeModelFactoryService getOseeFactoryService() {
+ return (IOseeModelFactoryService) factoryTracker.getService();
+ }
}
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/OseeTypeCache.java b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/internal/OseeTypeCache.java index 6f322fcbccc..b2e546d1f12 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/OseeTypeCache.java +++ b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/internal/OseeTypeCache.java @@ -8,8 +8,12 @@ * Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.types;
+package org.eclipse.osee.framework.types.bridge.internal;
+import org.eclipse.osee.framework.core.cache.ArtifactTypeCache;
+import org.eclipse.osee.framework.core.cache.AttributeTypeCache;
+import org.eclipse.osee.framework.core.cache.OseeEnumTypeCache;
+import org.eclipse.osee.framework.core.cache.RelationTypeCache;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
/**
@@ -24,7 +28,7 @@ public class OseeTypeCache { private boolean duringPopulate;
- public OseeTypeCache(IOseeTypeFactory factory, ArtifactTypeCache artifactCache, AttributeTypeCache attributeCache, RelationTypeCache relationCache, OseeEnumTypeCache oseeEnumTypeCache) {
+ public OseeTypeCache(ArtifactTypeCache artifactCache, AttributeTypeCache attributeCache, RelationTypeCache relationCache, OseeEnumTypeCache oseeEnumTypeCache) {
this.duringPopulate = false;
this.artifactCache = artifactCache;
this.attributeCache = attributeCache;
@@ -39,6 +43,17 @@ public class OseeTypeCache { getRelationTypeCache().storeAllModified();
}
+ public synchronized void ensurePopulated() throws OseeCoreException {
+ if (!duringPopulate) {
+ duringPopulate = true;
+ getEnumTypeCache().ensurePopulated();
+ getAttributeTypeCache().ensurePopulated();
+ getArtifactTypeCache().ensurePopulated();
+ getRelationTypeCache().ensurePopulated();
+ duringPopulate = false;
+ }
+ }
+
public ArtifactTypeCache getArtifactTypeCache() {
return artifactCache;
}
@@ -47,22 +62,11 @@ public class OseeTypeCache { return attributeCache;
}
- public RelationTypeCache getRelationTypeCache() {
- return relationCache;
- }
-
public OseeEnumTypeCache getEnumTypeCache() {
return oseeEnumTypeCache;
}
- public synchronized void ensurePopulated() throws OseeCoreException {
- if (!duringPopulate) {
- duringPopulate = true;
- getEnumTypeCache().ensurePopulated();
- getAttributeTypeCache().ensurePopulated();
- getArtifactTypeCache().ensurePopulated();
- getRelationTypeCache().ensurePopulated();
- duringPopulate = false;
- }
+ public RelationTypeCache getRelationTypeCache() {
+ return relationCache;
}
}
diff --git a/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/CompareOseeTypeCacheOperation.java b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/CompareOseeTypeCacheOperation.java index 4de6bed9fc5..be6a7862999 100644 --- a/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/CompareOseeTypeCacheOperation.java +++ b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/CompareOseeTypeCacheOperation.java @@ -33,18 +33,8 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.oseeTypes.OseeTypeModel;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.skynet.core.types.ArtifactTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.AttributeTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.IOseeTypeFactory;
-import org.eclipse.osee.framework.skynet.core.types.OseeEnumTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeFactory;
-import org.eclipse.osee.framework.skynet.core.types.RelationTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.impl.DatabaseArtifactTypeAccessor;
-import org.eclipse.osee.framework.skynet.core.types.impl.DatabaseAttributeTypeAccessor;
-import org.eclipse.osee.framework.skynet.core.types.impl.DatabaseOseeEnumTypeAccessor;
-import org.eclipse.osee.framework.skynet.core.types.impl.DatabaseRelationTypeAccessor;
import org.eclipse.osee.framework.types.bridge.internal.Activator;
+import org.eclipse.osee.framework.types.bridge.internal.OseeTypeCache;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.progress.UIJob;
@@ -66,14 +56,15 @@ public class CompareOseeTypeCacheOperation extends AbstractOperation { }
private OseeTypeCache createEmptyCache() {
- IOseeTypeFactory factory = new OseeTypeFactory();
- OseeEnumTypeCache enumCache = new OseeEnumTypeCache(new DatabaseOseeEnumTypeAccessor(factory));
- AttributeTypeCache attrCache = new AttributeTypeCache(new DatabaseAttributeTypeAccessor(factory, enumCache));
-
- ArtifactTypeCache artCache = new ArtifactTypeCache(new DatabaseArtifactTypeAccessor(factory, attrCache));
- RelationTypeCache relCache = new RelationTypeCache(new DatabaseRelationTypeAccessor(factory, artCache));
-
- OseeTypeCache storeCache = new OseeTypeCache(factory, artCache, attrCache, relCache, enumCache);
+ // IOseeTypeFactory factory = new OseeTypeFactory();
+ // OseeEnumTypeCache enumCache = new OseeEnumTypeCache(new DatabaseOseeEnumTypeAccessor(factory));
+ // AttributeTypeCache attrCache = new AttributeTypeCache(new DatabaseAttributeTypeAccessor(factory, enumCache));
+ //
+ // ArtifactTypeCache artCache = new ArtifactTypeCache(new DatabaseArtifactTypeAccessor(factory, attrCache));
+ // RelationTypeCache relCache = new RelationTypeCache(new DatabaseRelationTypeAccessor(factory, artCache));
+
+ OseeTypeCache storeCache = null;
+ // new OseeTypeCache(factory, artCache, attrCache, relCache, enumCache);
return storeCache;
}
diff --git a/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/OseeToXtextOperation.java b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/OseeToXtextOperation.java index 404a53cf5ae..36eb63284cf 100644 --- a/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/OseeToXtextOperation.java +++ b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/OseeToXtextOperation.java @@ -16,22 +16,22 @@ import java.util.List; import java.util.Map;
import java.util.Map.Entry;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.OseeEnumEntry;
+import org.eclipse.osee.framework.core.model.OseeEnumType;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.oseeTypes.AttributeTypeRef;
import org.eclipse.osee.framework.oseeTypes.OseeTypeModel;
import org.eclipse.osee.framework.oseeTypes.OseeTypesFactory;
import org.eclipse.osee.framework.oseeTypes.RelationMultiplicityEnum;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumEntry;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumType;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeCache;
import org.eclipse.osee.framework.types.bridge.internal.Activator;
+import org.eclipse.osee.framework.types.bridge.internal.OseeTypeCache;
/**
* @author Roberto E. Escobar
@@ -198,8 +198,7 @@ public class OseeToXtextOperation extends AbstractOperation { org.eclipse.osee.framework.oseeTypes.ArtifactType modelArtifactType =
getArtifactType(model, artifactType.getGuid());
- Map<Branch, Collection<AttributeType>> types =
- cache.getArtifactTypeCache().getLocalAttributeTypes(artifactType);
+ Map<Branch, Collection<AttributeType>> types = artifactType.getLocalAttributeTypes();
if (types != null) {
List<AttributeTypeRef> references = new ArrayList<AttributeTypeRef>();
for (Entry<Branch, Collection<AttributeType>> entry : types.entrySet()) {
diff --git a/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/ReportDirtyOseeTypesOperation.java b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/ReportDirtyOseeTypesOperation.java index 51ba5bbc24c..eebfbb52cc0 100644 --- a/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/ReportDirtyOseeTypesOperation.java +++ b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/ReportDirtyOseeTypesOperation.java @@ -19,19 +19,19 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-import org.eclipse.osee.framework.core.data.AbstractOseeType;
+import org.eclipse.osee.framework.core.cache.ArtifactTypeCache;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AbstractOseeType;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.OseeEnumEntry;
+import org.eclipse.osee.framework.core.model.OseeEnumType;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.jdk.core.util.Collections;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumEntry;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumType;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
-import org.eclipse.osee.framework.skynet.core.types.ArtifactTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeCache;
import org.eclipse.osee.framework.types.bridge.internal.Activator;
+import org.eclipse.osee.framework.types.bridge.internal.OseeTypeCache;
import org.eclipse.osee.framework.ui.skynet.results.IResultsEditorProvider;
import org.eclipse.osee.framework.ui.skynet.results.IResultsEditorTab;
import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor;
@@ -93,9 +93,9 @@ public class ReportDirtyOseeTypesOperation extends AbstractOperation { for (String fieldName : type.getFieldNames()) {
boolean isDirty = type.isFieldDirty(fieldName);
if (isDirty && ArtifactType.ARTIFACT_INHERITANCE_FIELD_KEY.equals(fieldName)) {
- data.add(cache.getArtifactSuperType(type).toString());
+ data.add(type.getSuperArtifactTypes().toString());
} else if (isDirty && ArtifactType.ARTIFACT_TYPE_ATTRIBUTES_FIELD_KEY.equals(fieldName)) {
- data.add(cache.getLocalAttributeTypes(type).toString());
+ data.add(type.getLocalAttributeTypes().toString());
} else {
data.add(String.valueOf(isDirty));
}
diff --git a/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/XTextToOseeTypeOperation.java b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/XTextToOseeTypeOperation.java index e675ba4e3c6..796f1f31a4a 100644 --- a/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/XTextToOseeTypeOperation.java +++ b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/XTextToOseeTypeOperation.java @@ -16,13 +16,15 @@ import java.util.HashSet; import java.util.List;
import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
+import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.oseeTypes.AddEnum;
@@ -38,22 +40,23 @@ import org.eclipse.osee.framework.oseeTypes.OverrideOption; import org.eclipse.osee.framework.oseeTypes.RelationType;
import org.eclipse.osee.framework.oseeTypes.RemoveEnum;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeCache;
import org.eclipse.osee.framework.types.bridge.internal.Activator;
+import org.eclipse.osee.framework.types.bridge.internal.OseeTypeCache;
/**
* @author Ryan D. Brooks
* @author Roberto E. Escobar
*/
public class XTextToOseeTypeOperation extends AbstractOperation {
+ private final IOseeModelFactoryService provider;
private final java.net.URI resource;
private final Object context;
private final OseeTypeCache typeCache;
private final boolean isPersistAllowed;
- public XTextToOseeTypeOperation(OseeTypeCache typeCache, boolean isPersistAllowed, Object context, java.net.URI resource) {
+ public XTextToOseeTypeOperation(IOseeModelFactoryService provider, OseeTypeCache typeCache, boolean isPersistAllowed, Object context, java.net.URI resource) {
super("OSEE Text Model to OSEE", Activator.PLUGIN_ID);
+ this.provider = provider;
this.typeCache = typeCache;
this.resource = resource;
this.context = context;
@@ -64,6 +67,10 @@ public class XTextToOseeTypeOperation extends AbstractOperation { return typeCache;
}
+ private IOseeModelFactoryService getFactory() throws OseeCoreException {
+ return provider;
+ }
+
private void loadDependencies(OseeTypeModel baseModel, List<OseeTypeModel> models) throws OseeCoreException, URISyntaxException {
// for (Import dependant : baseModel.getImports()) {
// OseeTypeModel childModel = OseeTypeModelUtil.loadModel(context, new URI(depenant.getImportURI()));
@@ -140,9 +147,9 @@ public class XTextToOseeTypeOperation extends AbstractOperation { * @throws OseeCoreException
*/
private void handleArtifactTypeCrossRef(ArtifactType artifactType) throws OseeCoreException {
- Set<org.eclipse.osee.framework.skynet.core.artifact.ArtifactType> superTypes =
- new HashSet<org.eclipse.osee.framework.skynet.core.artifact.ArtifactType>();
- org.eclipse.osee.framework.skynet.core.artifact.ArtifactType targetArtifactType =
+ Set<org.eclipse.osee.framework.core.model.ArtifactType> superTypes =
+ new HashSet<org.eclipse.osee.framework.core.model.ArtifactType>();
+ org.eclipse.osee.framework.core.model.ArtifactType targetArtifactType =
getCache().getArtifactTypeCache().getByGuid(artifactType.getTypeGuid());
for (ArtifactType superType : artifactType.getSuperArtifactTypes()) {
@@ -151,8 +158,8 @@ public class XTextToOseeTypeOperation extends AbstractOperation { if (!superTypes.isEmpty()) {
targetArtifactType.setSuperType(superTypes);
}
- HashCollection<Branch, org.eclipse.osee.framework.skynet.core.attribute.AttributeType> items =
- new HashCollection<Branch, org.eclipse.osee.framework.skynet.core.attribute.AttributeType>();
+ HashCollection<Branch, org.eclipse.osee.framework.core.model.AttributeType> items =
+ new HashCollection<Branch, org.eclipse.osee.framework.core.model.AttributeType>();
for (AttributeTypeRef attributeTypeRef : artifactType.getValidAttributeTypes()) {
AttributeType attributeType = attributeTypeRef.getValidAttributeType();
// handleAttributeType(attributeType);
@@ -167,7 +174,7 @@ public class XTextToOseeTypeOperation extends AbstractOperation { }
for (Branch branch : items.keySet()) {
- targetArtifactType.setAttributeTypeValidity(items.getValues(), branch);
+ targetArtifactType.setAttributeTypes(items.getValues(), branch);
}
}
@@ -177,19 +184,19 @@ public class XTextToOseeTypeOperation extends AbstractOperation { private void handleArtifactType(ArtifactType artifactType) throws OseeCoreException {
String artifactTypeName = removeQuotes(artifactType.getName());
- artifactType.setTypeGuid(getCache().getArtifactTypeCache().createType(artifactType.getTypeGuid(),
+ artifactType.setTypeGuid(getFactory().getArtifactTypeFactory().create(artifactType.getTypeGuid(),
artifactType.isAbstract(), artifactTypeName).getGuid());
}
private void handleOseeEnumType(OseeEnumType modelEnumType) throws OseeCoreException {
String enumTypeName = removeQuotes(modelEnumType.getName());
- org.eclipse.osee.framework.skynet.core.attribute.OseeEnumType oseeEnumType =
- getCache().getEnumTypeCache().createType(modelEnumType.getTypeGuid(), enumTypeName);
+ org.eclipse.osee.framework.core.model.OseeEnumType oseeEnumType =
+ getFactory().getOseeEnumTypeFactory().createEnumType(modelEnumType.getTypeGuid(), enumTypeName);
int lastOrdinal = 0;
- List<org.eclipse.osee.framework.skynet.core.attribute.OseeEnumEntry> modelEntries =
- new ArrayList<org.eclipse.osee.framework.skynet.core.attribute.OseeEnumEntry>();
+ List<org.eclipse.osee.framework.core.model.OseeEnumEntry> modelEntries =
+ new ArrayList<org.eclipse.osee.framework.core.model.OseeEnumEntry>();
for (OseeEnumEntry enumEntry : modelEnumType.getEnumEntries()) {
String entryName = removeQuotes(enumEntry.getName());
String ordinal = enumEntry.getOrdinal();
@@ -197,7 +204,7 @@ public class XTextToOseeTypeOperation extends AbstractOperation { lastOrdinal = Integer.parseInt(ordinal);
}
// enumEntry guid set to null but if we had we could modify an existing entry
- modelEntries.add(getCache().getEnumTypeCache().createEntry(null, entryName, lastOrdinal));
+ modelEntries.add(getFactory().getOseeEnumTypeFactory().createEnumEntry(null, entryName, lastOrdinal));
lastOrdinal++;
}
oseeEnumType.setEntries(modelEntries);
@@ -229,12 +236,12 @@ public class XTextToOseeTypeOperation extends AbstractOperation { if (!attributeType.getMax().equals("unlimited")) {
max = Integer.parseInt(attributeType.getMax());
}
- org.eclipse.osee.framework.skynet.core.attribute.OseeEnumType oseeEnumType = null;
+ org.eclipse.osee.framework.core.model.OseeEnumType oseeEnumType = null;
OseeEnumType enumType = attributeType.getEnumType();
if (enumType != null) {
oseeEnumType = getCache().getEnumTypeCache().getByGuid(enumType.getTypeGuid());
}
- attributeType.setTypeGuid(getCache().getAttributeTypeCache().createType(attributeType.getTypeGuid(), //
+ attributeType.setTypeGuid(getFactory().getAttributeTypeFactory().create(attributeType.getTypeGuid(), //
removeQuotes(attributeType.getName()), //
attributeType.getBaseAttributeType(), //
attributeType.getDataProvider(), //
@@ -253,7 +260,7 @@ public class XTextToOseeTypeOperation extends AbstractOperation { RelationTypeMultiplicity.getFromString(relationType.getMultiplicity().name());
relationType.setTypeGuid(//
- getCache().getRelationTypeCache().createType(
+ getFactory().getRelationTypeFactory().create(
relationType.getTypeGuid(),
removeQuotes(relationType.getName()), //
relationType.getSideAName(), //
diff --git a/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/XtextOseeTypesHandler.java b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/XtextOseeTypesHandler.java index 480aedba199..155b2af1164 100644 --- a/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/XtextOseeTypesHandler.java +++ b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/operations/XtextOseeTypesHandler.java @@ -16,9 +16,12 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeWrappedException;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
+import org.eclipse.osee.framework.core.services.IOseeCachingService;
+import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.skynet.core.importing.IOseeTypesHandler;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeManager;
+import org.eclipse.osee.framework.types.bridge.internal.Activator;
+import org.eclipse.osee.framework.types.bridge.internal.OseeTypeCache;
/**
* @author Roberto E. Escobar
@@ -28,9 +31,12 @@ public class XtextOseeTypesHandler implements IOseeTypesHandler { @Override
public void execute(IProgressMonitor monitor, Object context, URL url) throws OseeCoreException {
try {
- IOperation operation = new XTextToOseeTypeOperation(OseeTypeManager.getCache(), true, context, url.toURI());
- Operations.executeWork(operation, monitor, -1);
- Operations.checkForErrorStatus(operation.getStatus());
+ OseeTypeCache cache = null; // TODO
+ IOseeCachingService cacheProvider = Activator.getDefault().getOseeCacheService();
+ IOseeModelFactoryService factoryService = Activator.getDefault().getOseeFactoryService();
+
+ IOperation operation = new XTextToOseeTypeOperation(factoryService, cache, true, context, url.toURI());
+ Operations.executeWorkAndCheckStatus(operation, monitor, -1);
} catch (Exception ex) {
throw new OseeWrappedException(ex);
}
diff --git a/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/wizards/OseeTypesExportWizard.java b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/wizards/OseeTypesExportWizard.java index 60ffccd4fb5..fc34ad25054 100644 --- a/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/wizards/OseeTypesExportWizard.java +++ b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/wizards/OseeTypesExportWizard.java @@ -20,9 +20,10 @@ import org.eclipse.jface.wizard.Wizard; import org.eclipse.osee.framework.core.operation.CompositeOperation;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
+import org.eclipse.osee.framework.core.services.IOseeCachingService;
import org.eclipse.osee.framework.oseeTypes.OseeTypeModel;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeManager;
import org.eclipse.osee.framework.types.bridge.internal.Activator;
+import org.eclipse.osee.framework.types.bridge.internal.OseeTypeCache;
import org.eclipse.osee.framework.types.bridge.operations.ModelToFileOperation;
import org.eclipse.osee.framework.types.bridge.operations.OseeToXtextOperation;
import org.eclipse.ui.IImportWizard;
@@ -46,9 +47,15 @@ public class OseeTypesExportWizard extends Wizard implements IImportWizard { @Override
public boolean performFinish() {
final File folder = mainPage.getFile();
+
+ IOseeCachingService provider = Activator.getDefault().getOseeCacheService();
+ OseeTypeCache cache =
+ new OseeTypeCache(provider.getArtifactTypeCache(), provider.getAttributeTypeCache(),
+ provider.getRelationTypeCache(), provider.getEnumTypeCache());
+
final Map<String, OseeTypeModel> models = new HashMap<String, OseeTypeModel>();
List<IOperation> ops = new ArrayList<IOperation>();
- ops.add(new OseeToXtextOperation(OseeTypeManager.getCache(), models));
+ ops.add(new OseeToXtextOperation(cache, models));
ops.add(new ModelToFileOperation(folder, models));
Operations.executeAsJob(new CompositeOperation("Export Osee Type Model", Activator.PLUGIN_ID, ops), true);
return true;
diff --git a/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/wizards/OseeTypesImportWizard.java b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/wizards/OseeTypesImportWizard.java index 03ad9d56c48..562ae4dc763 100644 --- a/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/wizards/OseeTypesImportWizard.java +++ b/org.eclipse.osee.framework.types.bridge/src/org/eclipse/osee/framework/types/bridge/wizards/OseeTypesImportWizard.java @@ -21,9 +21,10 @@ import org.eclipse.jface.wizard.Wizard; import org.eclipse.osee.framework.core.operation.CompositeOperation;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeManager;
+import org.eclipse.osee.framework.core.services.IOseeCachingService;
+import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
import org.eclipse.osee.framework.types.bridge.internal.Activator;
+import org.eclipse.osee.framework.types.bridge.internal.OseeTypeCache;
import org.eclipse.osee.framework.types.bridge.operations.CompareOseeTypeCacheOperation;
import org.eclipse.osee.framework.types.bridge.operations.ReportDirtyOseeTypesOperation;
import org.eclipse.osee.framework.types.bridge.operations.XTextToOseeTypeOperation;
@@ -51,10 +52,18 @@ public class OseeTypesImportWizard extends Wizard implements IImportWizard { final boolean isPersistAllowed = mainPage.isPersistAllowed();
final boolean isReport = mainPage.isReportChanges();
final boolean useCompareEditor = mainPage.useCompareEditor();
- OseeTypeCache cache = OseeTypeManager.getCache();
+
+ IOseeCachingService cacheProvider = Activator.getDefault().getOseeCacheService();
+ IOseeModelFactoryService factoryService = Activator.getDefault().getOseeFactoryService();
+
+ OseeTypeCache cache = null;
+ //TODO take a snapshot of the current cache ...
+ if (cache == null) {
+ throw new UnsupportedOperationException("Implement Cache copy ");
+ }
List<IOperation> ops = new ArrayList<IOperation>();
- ops.add(new XTextToOseeTypeOperation(cache, isPersistAllowed, null, file.toURI()));
+ ops.add(new XTextToOseeTypeOperation(factoryService, cache, isPersistAllowed, null, file.toURI()));
if (isReport) {
ops.add(new ReportDirtyOseeTypesOperation(cache));
}
diff --git a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbDescribe.java b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbDescribe.java index 71f7156dca7..c1309d79a1b 100644 --- a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbDescribe.java +++ b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbDescribe.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; -import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement; +import org.eclipse.osee.framework.database.core.IOseeStatement; public class DbDescribe { @@ -43,7 +43,7 @@ public class DbDescribe { public List<Describe> getDescription() throws OseeDataStoreException { if (dbColumns == null) { dbColumns = new ArrayList<Describe>(); - ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(); + IOseeStatement chStmt = ConnectionHandler.getStatement(); try { String sql = "SELECT * FROM " + dbItem.getTableName(); chStmt.runPreparedQuery(sql); @@ -65,7 +65,7 @@ public class DbDescribe { public DbTaskList getDbTaskList(List<Describe> describeList) throws OseeDataStoreException { DbTaskList taskList = new DbTaskList(); - ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(); + IOseeStatement chStmt = ConnectionHandler.getStatement(); try { String sql = "SELECT * FROM " + dbItem.getTableName(); chStmt.runPreparedQuery(sql); diff --git a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java index 8054ec6f749..7a74be126cd 100644 --- a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java +++ b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.admin.dbtabletab; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; -import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement; +import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.admin.AdminPlugin; @@ -44,7 +44,7 @@ public class OseeInfoDbItem extends DbItem { public boolean exists(String key) { boolean toReturn = false; - ConnectionHandlerStatement chStmt = null; + IOseeStatement chStmt = null; try { chStmt = ConnectionHandler.getStatement(); String query = "SELECT * FROM " + getTableName() + " WHERE OSEE_KEY = " + returnTic(key); diff --git a/org.eclipse.osee.framework.ui.branch.graph/META-INF/MANIFEST.MF b/org.eclipse.osee.framework.ui.branch.graph/META-INF/MANIFEST.MF index 0e66e800012..53f3e061079 100644 --- a/org.eclipse.osee.framework.ui.branch.graph/META-INF/MANIFEST.MF +++ b/org.eclipse.osee.framework.ui.branch.graph/META-INF/MANIFEST.MF @@ -18,6 +18,7 @@ Require-Bundle: org.eclipse.ui, Import-Package: org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.exception, + org.eclipse.osee.framework.core.model, org.eclipse.osee.framework.database.core, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, diff --git a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/OpenBranchGraph.java b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/OpenBranchGraph.java index fcb752f512d..081aeb4b1bf 100644 --- a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/OpenBranchGraph.java +++ b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/OpenBranchGraph.java @@ -15,7 +15,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.ui.branch.graph.core.BranchGraphEditor;
import org.eclipse.osee.framework.ui.branch.graph.core.BranchGraphEditorInput;
import org.eclipse.osee.framework.ui.skynet.commandHandlers.AbstractSelectionChangedHandler;
diff --git a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphEditorInput.java b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphEditorInput.java index 637c13e5545..84b0db865f7 100644 --- a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphEditorInput.java +++ b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphEditorInput.java @@ -11,9 +11,9 @@ package org.eclipse.osee.framework.ui.branch.graph.core;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPersistableElement;
diff --git a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/figure/FigureFactory.java b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/figure/FigureFactory.java index 63ea447b0eb..a3fb6a4aa4a 100644 --- a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/figure/FigureFactory.java +++ b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/figure/FigureFactory.java @@ -20,7 +20,7 @@ import org.eclipse.draw2d.PolygonDecoration; import org.eclipse.draw2d.PolylineConnection;
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.ui.branch.graph.model.BranchModel;
import org.eclipse.osee.framework.ui.branch.graph.model.TxData;
import org.eclipse.osee.framework.ui.branch.graph.model.TxModel;
diff --git a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/BranchModel.java b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/BranchModel.java index 8ce67c5e9b0..21c1af2d0b1 100644 --- a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/BranchModel.java +++ b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/BranchModel.java @@ -14,7 +14,7 @@ import java.io.Serializable; import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
/**
* @author Roberto E. Escobar
diff --git a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphCache.java b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphCache.java index 41d2e9e6c1d..42c7642c4e1 100644 --- a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphCache.java +++ b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphCache.java @@ -15,9 +15,9 @@ import java.util.Collection; import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
diff --git a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphLoader.java b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphLoader.java index 691fe1f87f6..00711b7bd1f 100644 --- a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphLoader.java +++ b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphLoader.java @@ -13,10 +13,10 @@ package org.eclipse.osee.framework.ui.branch.graph.model; import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.JoinUtility;
import org.eclipse.osee.framework.database.core.JoinUtility.TransactionJoinQuery;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -143,7 +143,7 @@ public class GraphLoader { private static List<TxData> getTxData(int queryId) throws OseeCoreException {
List<TxData> txDatas = new ArrayList<TxData>();
- ConnectionHandlerStatement chStmt = null;
+ IOseeStatement chStmt = null;
try {
chStmt = ConnectionHandler.getStatement();
chStmt.runPreparedQuery(GET_TRANSACTION_DATA, queryId);
diff --git a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/StubBranchModel.java b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/StubBranchModel.java index 4454495a75a..239c32e489d 100644 --- a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/StubBranchModel.java +++ b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/StubBranchModel.java @@ -14,7 +14,7 @@ import java.sql.Timestamp; import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
/**
* @author Roberto E. Escobar
diff --git a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/TxData.java b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/TxData.java index 914b235e639..8e597f2ae70 100644 --- a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/TxData.java +++ b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/TxData.java @@ -11,10 +11,10 @@ package org.eclipse.osee.framework.ui.branch.graph.model;
import java.util.Date;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.UserManager;
@@ -120,7 +120,7 @@ public class TxData { }
protected static TxData createTxData(TransactionRecord txId) {
- return new TxData(txId.getBranch(), txId.getAuthor(), txId.getDate(), txId.getComment(),
+ return new TxData(txId.getBranch(), txId.getAuthor(), txId.getTimeStamp(), txId.getComment(),
txId.getTxType().getId(), txId.getCommit(), txId.getId());
}
}
diff --git a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/operation/LoadGraphOperation.java b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/operation/LoadGraphOperation.java index 376bcf8b6c9..b9e4c191e77 100644 --- a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/operation/LoadGraphOperation.java +++ b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/operation/LoadGraphOperation.java @@ -14,9 +14,9 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.plugin.core.util.IExceptionableRunnable;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
diff --git a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/BranchDataEditPart.java b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/BranchDataEditPart.java index 4b9e536293f..1b346a75062 100644 --- a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/BranchDataEditPart.java +++ b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/BranchDataEditPart.java @@ -18,7 +18,7 @@ import org.eclipse.draw2d.GridLayout; import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Panel;
import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.ui.branch.graph.figure.BranchFigure;
import org.eclipse.osee.framework.ui.branch.graph.figure.PlusMinus;
import org.eclipse.osee.framework.ui.branch.graph.model.GraphCache;
diff --git a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/GraphEditPart.java b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/GraphEditPart.java index 8a2c72a3685..60fb454b2be 100644 --- a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/GraphEditPart.java +++ b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/GraphEditPart.java @@ -42,7 +42,7 @@ import org.eclipse.gef.GraphicalViewer; import org.eclipse.gef.LayerConstants;
import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.branch.graph.BranchGraphActivator;
diff --git a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/GraphEditPartFactory.java b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/GraphEditPartFactory.java index 165dae78b7d..acf92f10075 100644 --- a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/GraphEditPartFactory.java +++ b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/GraphEditPartFactory.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.branch.graph.parts; import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartFactory;
import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.ui.branch.graph.model.BranchModel;
import org.eclipse.osee.framework.ui.branch.graph.model.GraphCache;
import org.eclipse.osee.framework.ui.branch.graph.model.TxModel;
diff --git a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/utility/GraphImageConstants.java b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/utility/GraphImageConstants.java index ccda824df01..e93b74be23e 100644 --- a/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/utility/GraphImageConstants.java +++ b/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/utility/GraphImageConstants.java @@ -10,8 +10,8 @@ *******************************************************************************/
package org.eclipse.osee.framework.ui.branch.graph.utility;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.BranchType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.ImageManager;
import org.eclipse.swt.graphics.Image;
diff --git a/org.eclipse.osee.framework.ui.data.model.editor/META-INF/MANIFEST.MF b/org.eclipse.osee.framework.ui.data.model.editor/META-INF/MANIFEST.MF index b790d864077..5aa1f6afdca 100644 --- a/org.eclipse.osee.framework.ui.data.model.editor/META-INF/MANIFEST.MF +++ b/org.eclipse.osee.framework.ui.data.model.editor/META-INF/MANIFEST.MF @@ -20,6 +20,7 @@ Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.osee.framework.core.client, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.exception, + org.eclipse.osee.framework.core.model, org.eclipse.osee.framework.database.core, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, diff --git a/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeConverter.java b/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeConverter.java index 5f8af1e9b1d..c3f479dc2c7 100644 --- a/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeConverter.java +++ b/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeConverter.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.data.model.editor.input; import java.util.Collection;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumType;
+import org.eclipse.osee.framework.core.model.OseeEnumType;
import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumTypeManager;
import org.eclipse.osee.framework.skynet.core.importing.IOseeDataTypeProcessor;
import org.eclipse.osee.framework.ui.data.model.editor.model.ArtifactDataType;
diff --git a/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeDatastore.java b/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeDatastore.java index 5473256e770..1060f976a61 100644 --- a/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeDatastore.java +++ b/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeDatastore.java @@ -14,17 +14,17 @@ import java.util.ArrayList; import java.util.List;
import java.util.logging.Level;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
import org.eclipse.osee.framework.ui.data.model.editor.model.ArtifactDataType;
import org.eclipse.osee.framework.ui.data.model.editor.model.AttributeDataType;
@@ -44,11 +44,12 @@ public class OseeDataTypeDatastore { public static List<AttributeDataType> getAttributeTypes() throws OseeCoreException {
List<AttributeDataType> attributeDataTypes = new ArrayList<AttributeDataType>();
for (AttributeType attributeType : AttributeTypeManager.getAllTypes()) {
+ String baseClass = AttributeTypeManager.getAttributeBaseClass(attributeType).getCanonicalName();
+ String providerClass = AttributeTypeManager.getAttributeProviderClass(attributeType).getCanonicalName();
AttributeDataType attributeDataType =
- new AttributeDataType(String.valueOf(attributeType.getId()), attributeType.getName(),
- attributeType.getBaseAttributeClass().getCanonicalName(), attributeType.getDefaultValue(),
- attributeType.getFileTypeExtension(), attributeType.getMaxOccurrences(),
- attributeType.getMinOccurrences(), attributeType.getProviderAttributeClass().getCanonicalName(),
+ new AttributeDataType(String.valueOf(attributeType.getId()), attributeType.getName(), baseClass,
+ attributeType.getDefaultValue(), attributeType.getFileTypeExtension(),
+ attributeType.getMaxOccurrences(), attributeType.getMinOccurrences(), providerClass,
attributeType.getTaggerId(), attributeType.getDescription(), attributeType.getOseeEnumTypeId());
attributeDataTypes.add(attributeDataType);
}
@@ -79,7 +80,7 @@ public class OseeDataTypeDatastore { public static HashCollection<String, String> getArtifactToAttributeEntries() throws OseeCoreException {
HashCollection<String, String> toReturn = new HashCollection<String, String>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(2000, SELECT_ATTRIBUTE_VALIDITY);
while (chStmt.next()) {
diff --git a/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/property/EnumPropertySource.java b/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/property/EnumPropertySource.java index 276e4dd5afe..a014ef5b717 100644 --- a/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/property/EnumPropertySource.java +++ b/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/property/EnumPropertySource.java @@ -13,8 +13,8 @@ package org.eclipse.osee.framework.ui.data.model.editor.property; import java.util.List;
import java.util.logging.Level;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.OseeEnumType;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumType;
import org.eclipse.osee.framework.skynet.core.attribute.OseeEnumTypeManager;
import org.eclipse.osee.framework.ui.data.model.editor.ODMEditorActivator;
import org.eclipse.osee.framework.ui.data.model.editor.model.AttributeDataType;
diff --git a/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF b/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF index f99b189327e..3ef227fcea2 100644 --- a/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF +++ b/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF @@ -10,6 +10,7 @@ Export-Package: org.eclipse.osee.framework.ui.skynet.test, Import-Package: com.lowagie.text.pdf, com.lowagie.text.rtf, org.eclipse.osee.framework.core.enums, + org.eclipse.osee.framework.core.test.mocks, org.eclipse.osee.framework.jdk.core.util.windows, org.eclipse.osee.support.test.util, org.junit, diff --git a/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ArtifactPasteOperationTest.java b/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ArtifactPasteOperationTest.java index ed26dc658bc..a473fe0ac0b 100644 --- a/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ArtifactPasteOperationTest.java +++ b/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ArtifactPasteOperationTest.java @@ -16,16 +16,16 @@ import java.util.List; import java.util.Map.Entry;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderFactory;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
diff --git a/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/InterArtifactDropTest.java b/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/InterArtifactDropTest.java index a5c98763ce6..3221b131927 100644 --- a/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/InterArtifactDropTest.java +++ b/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/InterArtifactDropTest.java @@ -15,8 +15,8 @@ import static org.junit.Assert.assertTrue; import java.util.logging.Level;
import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.SystemUser;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
diff --git a/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/PreviewAndMultiPreviewTest.java b/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/PreviewAndMultiPreviewTest.java index 124b07d3809..864d8219eb0 100644 --- a/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/PreviewAndMultiPreviewTest.java +++ b/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/PreviewAndMultiPreviewTest.java @@ -14,8 +14,8 @@ import java.util.ArrayList; import java.util.Arrays;
import java.util.List;
import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
diff --git a/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java b/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java index 011e0c4080e..56f53fd084e 100644 --- a/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java +++ b/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java @@ -14,25 +14,22 @@ import java.util.ArrayList; import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.cache.AbstractOseeCache;
+import org.eclipse.osee.framework.core.cache.ArtifactTypeCache;
+import org.eclipse.osee.framework.core.cache.RelationTypeCache;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
+import org.eclipse.osee.framework.core.test.mocks.MockOseeDataAccessor;
import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.linking.OseeLinkBuilder;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationSorterProvider;
-import org.eclipse.osee.framework.skynet.core.test.types.OseeTestDataAccessor;
-import org.eclipse.osee.framework.skynet.core.test.types.OseeTypesUtil;
-import org.eclipse.osee.framework.skynet.core.types.ArtifactTypeCache;
-import org.eclipse.osee.framework.skynet.core.types.IOseeTypeFactory;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeFactory;
-import org.eclipse.osee.framework.skynet.core.types.RelationTypeCache;
import org.eclipse.osee.framework.ui.skynet.render.ArtifactGuidToWordML;
import org.eclipse.osee.framework.ui.skynet.render.RelationOrderRenderer;
import org.eclipse.osee.framework.ui.skynet.render.word.WordMLProducer;
@@ -53,8 +50,8 @@ public class RelationOrderRendererTest { public static void prepareTest() throws OseeCoreException {
MockArtifactGuidResolver resolver = new MockArtifactGuidResolver(null);
- RelationTypeCache typeCache = new RelationTypeCache(new OseeTestDataAccessor<RelationType>());
- addRelationTypeData(typeCache, new OseeTypeFactory());
+ AbstractOseeCache<RelationType> typeCache = new RelationTypeCache(new MockOseeDataAccessor<RelationType>());
+ addRelationTypeData(typeCache);
sorterProvider = new RelationSorterProvider();
renderer = new RelationOrderRenderer(typeCache, resolver, sorterProvider);
}
@@ -189,29 +186,28 @@ public class RelationOrderRendererTest { Assert.assertEquals(expected, builder.toString());
}
- private final static void addRelationTypeData(AbstractOseeCache<RelationType> cache, IOseeTypeFactory factory) throws OseeCoreException {
- ArtifactTypeCache artCache = new ArtifactTypeCache(new OseeTestDataAccessor<ArtifactType>());
- ArtifactType artifactType1 = createArtifactType(artCache, factory, "Artifact 2");
- ArtifactType artifactType2 = createArtifactType(artCache, factory, "Artifact 1");
+ private final static void addRelationTypeData(AbstractOseeCache<RelationType> cache) throws OseeCoreException {
+ ArtifactTypeCache artCache = new ArtifactTypeCache(new MockOseeDataAccessor<ArtifactType>());
+ ArtifactType artifactType1 = createArtifactType(artCache, "Artifact 2");
+ ArtifactType artifactType2 = createArtifactType(artCache, "Artifact 1");
- createRelationType(cache, artCache, factory, "Relation 1", artifactType1, artifactType2);
- createRelationType(cache, artCache, factory, "Relation 2", artifactType1, artifactType2);
- createRelationType(cache, artCache, factory, "Relation 3", artifactType1, artifactType2);
+ createRelationType(cache, "Relation 1", artifactType1, artifactType2);
+ createRelationType(cache, "Relation 2", artifactType1, artifactType2);
+ createRelationType(cache, "Relation 3", artifactType1, artifactType2);
}
- private final static ArtifactType createArtifactType(AbstractOseeCache<ArtifactType> artCache, IOseeTypeFactory factory, String name) throws OseeCoreException {
- ArtifactType artifactType = factory.createArtifactType(artCache, GUID.create(), false, name);
+ private final static ArtifactType createArtifactType(AbstractOseeCache<ArtifactType> artCache, String name) throws OseeCoreException {
+ ArtifactType artifactType = new ArtifactType(GUID.create(), name, false);
artCache.cache(artifactType);
return artifactType;
}
- private final static void createRelationType(AbstractOseeCache<RelationType> cache, AbstractOseeCache<ArtifactType> artCache, IOseeTypeFactory factory, String name, ArtifactType artifactType1, ArtifactType artifactType2) throws OseeCoreException {
+ private final static void createRelationType(AbstractOseeCache<RelationType> cache, String name, ArtifactType artifactType1, ArtifactType artifactType2) throws OseeCoreException {
RelationType type =
- OseeTypesUtil.createRelationType(cache, artCache, factory, GUID.create(), name, artifactType1.getGuid(),
- artifactType2.getGuid(), RelationTypeMultiplicity.MANY_TO_MANY);
+ new RelationType(GUID.create(), name, name + "_A", name + "_B", artifactType1, artifactType2,
+ RelationTypeMultiplicity.MANY_TO_MANY, "");
cache.cache(type);
}
-
private final static class MockRelationOrderData extends RelationOrderData {
public MockRelationOrderData() {
super(null, null);
diff --git a/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ViewWordChangeAndDiffTest.java b/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ViewWordChangeAndDiffTest.java index 7ce61c7edaf..8cef880bac6 100644 --- a/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ViewWordChangeAndDiffTest.java +++ b/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ViewWordChangeAndDiffTest.java @@ -20,11 +20,11 @@ import java.util.Collection; import java.util.Date;
import java.util.logging.Level;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
diff --git a/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordEditTest.java b/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordEditTest.java index 608a69345bb..6aecbcb98a3 100644 --- a/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordEditTest.java +++ b/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordEditTest.java @@ -25,8 +25,8 @@ import java.util.List; import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
diff --git a/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordTrackedChangesTest.java b/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordTrackedChangesTest.java index 07cd9d5fb1b..c9197d01134 100644 --- a/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordTrackedChangesTest.java +++ b/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/WordTrackedChangesTest.java @@ -23,8 +23,8 @@ import java.util.logging.Level; import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
diff --git a/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF b/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF index ad2f8da62ae..0ba9934bc4c 100644 --- a/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF +++ b/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF @@ -46,6 +46,7 @@ Import-Package: com.lowagie.text, org.eclipse.osee.framework.core.exception,
org.eclipse.osee.framework.core.operation,
org.eclipse.osee.framework.core.util,
+ org.eclipse.osee.framework.database,
org.eclipse.osee.framework.database.core,
org.eclipse.osee.framework.database.init,
org.eclipse.osee.framework.database.sql,
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDragDropSupport.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDragDropSupport.java index f23e48ba3ca..b9a9e403793 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDragDropSupport.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDragDropSupport.java @@ -17,21 +17,21 @@ import java.util.Collection; import org.eclipse.core.resources.IFile;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.window.Window;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.WorkspaceURL;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSideSorter;
import org.eclipse.osee.framework.ui.plugin.util.AWorkspace;
import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactTransfer;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java index 98a7a4258ea..5fa606df495 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java @@ -30,11 +30,14 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.window.Window;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.data.IRelationSorterId;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.jdk.core.util.GUID;
@@ -45,7 +48,6 @@ import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactModType;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider;
@@ -67,8 +69,6 @@ import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData.Cha import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration;
import org.eclipse.osee.framework.skynet.core.relation.RelationEventType;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
-import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorterId;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.skynet.core.utility.LoadedArtifacts;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerDragAndDrop.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerDragAndDrop.java index 0382bddaa30..38ee285cd6b 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerDragAndDrop.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerDragAndDrop.java @@ -14,13 +14,13 @@ import java.io.File; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData; import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration; -import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.Wizards; import org.eclipse.osee.framework.ui.skynet.Import.ArtifactImportWizard; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageProvider.java index d4105944e45..92918cefecb 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageProvider.java @@ -11,8 +11,8 @@ package org.eclipse.osee.framework.ui.skynet; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; /** * This class allows plugins to provide the base images for artifact types by registering via ImageManger.registerImage. diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactTypeDialog.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactTypeDialog.java index 9517b3f0714..508b9c43f57 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactTypeDialog.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactTypeDialog.java @@ -14,7 +14,7 @@ import java.util.Collection; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IconAndMessageDialog; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; +import org.eclipse.osee.framework.core.model.ArtifactType; import org.eclipse.osee.framework.ui.plugin.util.ObjectList; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CLabel; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeMenuSelectionListener.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeMenuSelectionListener.java index 163b8ab2199..81585ad75bf 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeMenuSelectionListener.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeMenuSelectionListener.java @@ -12,9 +12,9 @@ package org.eclipse.osee.framework.ui.skynet; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.AttributeType; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java index 56c65d99f7e..70d22108f84 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java @@ -22,11 +22,11 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewerEditor;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.ui.skynet.widgets.cellEditor.UniversalCellEditor;
import org.eclipse.osee.framework.ui.swt.IDirtiableEditor;
import org.eclipse.swt.SWT;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/BaseImage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/BaseImage.java index a9055507cb0..7cdeb7aad3f 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/BaseImage.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/BaseImage.java @@ -13,10 +13,10 @@ package org.eclipse.osee.framework.ui.skynet; import java.io.ByteArrayInputStream; import java.util.logging.Level; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.framework.core.model.ArtifactType; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; import org.eclipse.osee.framework.skynet.core.attribute.CoreAttributes; import org.eclipse.swt.graphics.ImageData; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ImageManager.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ImageManager.java index 835e89f0072..7aeb1090fe2 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ImageManager.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ImageManager.java @@ -27,15 +27,15 @@ import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
+import org.eclipse.osee.framework.core.model.ArtifactType;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.SQL3DataType;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.ExtensionDefinedObjects;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.annotation.ArtifactAnnotation;
import org.eclipse.osee.framework.skynet.core.change.Change;
@@ -96,7 +96,7 @@ public class ImageManager { artifactTypeImagesLoaded = true;
// Load base images from database (which can override the ImageManager.registerImage() calls provided
// through the ArtifactImageProviders
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(SELECT_ARTIFACT_TYPES_IMAGE_QUERY);
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java index 24399895c99..4d82f868455 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java @@ -20,16 +20,16 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.core.operation.CompositeOperation;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.importing.ArtifactExtractorContributionManager;
import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact;
import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind;
@@ -357,9 +357,9 @@ public class ArtifactImportPage extends WizardDataTransferPage { }
} else {
attributeTypeSelectPanel.setAllowedAttributeTypes(new ArrayList<AttributeType>());
- }
}
}
+ }
@Override
protected void saveWidgetValues() {
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 998f3beb5d8..953e3222cba 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 @@ -24,14 +24,14 @@ import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.ArtifactType; +import org.eclipse.osee.framework.core.model.AttributeType; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.CompositeOperation; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; -import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; import org.eclipse.osee.framework.skynet.core.importing.operations.CompleteArtifactImportOperation; import org.eclipse.osee.framework.skynet.core.importing.operations.RoughArtifactCollector; import org.eclipse.osee.framework.skynet.core.importing.operations.RoughToRealArtifactOperation; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationContentProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationContentProvider.java index b845ac60daf..92947cd7422 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationContentProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationContentProvider.java @@ -21,10 +21,10 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.RelationType; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.relation.RelationManager; -import org.eclipse.osee.framework.skynet.core.relation.RelationType; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSideSorter; import org.eclipse.osee.framework.skynet.core.types.IArtifact; 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 1b81e88d442..79cabfaffb8 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 @@ -16,11 +16,11 @@ import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.RelationType; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.relation.RelationLink; import org.eclipse.osee.framework.skynet.core.relation.RelationManager; -import org.eclipse.osee.framework.skynet.core.relation.RelationType; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSideSorter; import org.eclipse.swt.graphics.Image; 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 e8f57d50879..512ee7a9765 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 @@ -29,10 +29,12 @@ import org.eclipse.jface.viewers.ITreeViewerListener; import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.jface.viewers.TreeExpansionEvent;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.data.IRelationSorterId;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -47,10 +49,8 @@ import org.eclipse.osee.framework.skynet.core.relation.IRelationEnumeration; import org.eclipse.osee.framework.skynet.core.relation.RelationEventType;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSide;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSideSorter;
-import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorterId;
import org.eclipse.osee.framework.ui.plugin.util.Displays;
import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java index 8d533808d70..cc96c632d12 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java @@ -14,6 +14,9 @@ import java.util.logging.Level; import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
+import org.eclipse.osee.framework.core.services.IOseeCachingService;
+import org.eclipse.osee.framework.database.IOseeDatabaseService;
+import org.eclipse.osee.framework.database.IOseeDatabaseServiceProvider;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.User;
@@ -32,7 +35,7 @@ import org.osgi.framework.BundleContext; import org.osgi.service.packageadmin.PackageAdmin;
import org.osgi.util.tracker.ServiceTracker;
-public class SkynetGuiPlugin extends OseeFormActivator implements IBroadcastEventListener {
+public class SkynetGuiPlugin extends OseeFormActivator implements IBroadcastEventListener, IOseeDatabaseServiceProvider {
private static SkynetGuiPlugin pluginInstance; // The shared instance.
public static final String PLUGIN_ID = "org.eclipse.osee.framework.ui.skynet";
public static final String CHANGE_REPORT_ATTRIBUTES_PREF =
@@ -43,6 +46,8 @@ public class SkynetGuiPlugin extends OseeFormActivator implements IBroadcastEven public static final String ARTIFACT_SEARCH_RESULTS_ATTRIBUTES_PREF =
"org.eclipse.osee.framework.ui.skynet.artifactSearchResultsAttributes";
private ServiceTracker packageAdminTracker;
+ private ServiceTracker cacheServiceTracker;
+ private ServiceTracker databaseServiceTracker;
public SkynetGuiPlugin() {
super();
@@ -53,6 +58,8 @@ public class SkynetGuiPlugin extends OseeFormActivator implements IBroadcastEven public void stop(BundleContext context) throws Exception {
super.stop(context);
packageAdminTracker.close();
+ cacheServiceTracker.close();
+ databaseServiceTracker.close();
}
@Override
@@ -60,6 +67,13 @@ public class SkynetGuiPlugin extends OseeFormActivator implements IBroadcastEven super.start(context);
packageAdminTracker = new ServiceTracker(context, PackageAdmin.class.getName(), null);
packageAdminTracker.open();
+
+ cacheServiceTracker = new ServiceTracker(context, IOseeCachingService.class.getName(), null);
+ cacheServiceTracker.open();
+
+ databaseServiceTracker = new ServiceTracker(context, IOseeDatabaseService.class.getName(), null);
+ databaseServiceTracker.open();
+
OseeEventManager.addListener(this);
if (PlatformUI.isWorkbenchRunning()) {
@@ -100,6 +114,14 @@ public class SkynetGuiPlugin extends OseeFormActivator implements IBroadcastEven return (PackageAdmin) this.packageAdminTracker.getService();
}
+ public IOseeCachingService getOseeCacheService() {
+ return (IOseeCachingService) cacheServiceTracker.getService();
+ }
+
+ public IOseeDatabaseService getOseeDatabaseService() {
+ return (IOseeDatabaseService) databaseServiceTracker.getService();
+ }
+
@Override
public void handleBroadcastEvent(Sender sender, BroadcastEventType broadcastEventType, String[] userIds, final String message) {
boolean isShutdownAllowed = false;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/WrapperForRelationLink.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/WrapperForRelationLink.java index b8c36230654..a56dbc03f61 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/WrapperForRelationLink.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/WrapperForRelationLink.java @@ -12,8 +12,8 @@ package org.eclipse.osee.framework.ui.skynet; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.osee.framework.core.enums.RelationSide; +import org.eclipse.osee.framework.core.model.RelationType; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.relation.RelationType; /** * @author b1528444 diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java index b43a43397aa..c54919e39e0 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java @@ -16,10 +16,10 @@ import java.util.Collections; import java.util.Comparator;
import java.util.logging.Level;
import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.IAccessControllable;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.skynet.core.access.AccessControlData;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java index 44bd5e79615..5e0a6e24105 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
@@ -25,7 +26,6 @@ import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration; import org.eclipse.osee.framework.skynet.core.relation.IRelationEnumeration;
import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.util.ArtifactPasteConfiguration;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChange.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChange.java index 925ef95c681..65f6218948a 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChange.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChange.java @@ -49,8 +49,7 @@ public class ArtifactPromptChange { public static boolean promptChangeAttribute(String attributeName, String displayName, final Collection<? extends Artifact> artifacts, boolean persist) {
try {
- Class<? extends Attribute<?>> attributeBaseType =
- AttributeTypeManager.getType(attributeName).getBaseAttributeClass();
+ Class<? extends Attribute<?>> attributeBaseType = AttributeTypeManager.getAttributeBaseClass(attributeName);
if (attributeBaseType.equals(DateAttribute.class)) {
return ArtifactPromptChange.promptChangeDate(attributeName, displayName, artifacts, persist);
} else if (attributeBaseType.equals(FloatingPointAttribute.class)) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactSaveNotificationHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactSaveNotificationHandler.java index 4b9b3fe51af..e295e44e57c 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactSaveNotificationHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactSaveNotificationHandler.java @@ -11,8 +11,8 @@ package org.eclipse.osee.framework.ui.skynet.artifact;
import java.util.Collection;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/AbstractEventArtifactEditor.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/AbstractEventArtifactEditor.java index d95ee9d784f..305e2001d0a 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/AbstractEventArtifactEditor.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/AbstractEventArtifactEditor.java @@ -11,8 +11,8 @@ package org.eclipse.osee.framework.ui.skynet.artifact.editor;
import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactModType;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactEditorOutlinePage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactEditorOutlinePage.java index ff7f5323f36..38131e0f955 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactEditorOutlinePage.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactEditorOutlinePage.java @@ -23,9 +23,9 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.AttributeType; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.ImageManager; import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/AttributeFormPart.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/AttributeFormPart.java index 285009dec71..49f00b36dba 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/AttributeFormPart.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/AttributeFormPart.java @@ -14,10 +14,11 @@ import java.util.Arrays; import java.util.List;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
+import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.attribute.CoreAttributes;
import org.eclipse.osee.framework.skynet.core.attribute.WordAttribute;
import org.eclipse.osee.framework.ui.plugin.util.Result;
@@ -77,7 +78,7 @@ public class AttributeFormPart extends AbstractFormPart { List<AttributeType> types = Arrays.asList(AttributeTypeUtil.getTypesWithData(artifact));
boolean willHaveASection = hasWordAttribute(types);
for (AttributeType attributeType : types) {
- if (attributeType.getBaseAttributeClass().equals(WordAttribute.class) || CoreAttributes.RELATION_ORDER.getGuid().equals(
+ if (AttributeTypeManager.getAttributeBaseClass(attributeType).equals(WordAttribute.class) || CoreAttributes.RELATION_ORDER.getGuid().equals(
attributeType.getGuid())) {
createAttributeTypeControlsInSection(parent, toolkit, attributeType, willHaveASection, false);
} else {
@@ -97,9 +98,9 @@ public class AttributeFormPart extends AbstractFormPart { composite.setVisible(true);
}
- private boolean hasWordAttribute(List<AttributeType> types) {
+ private boolean hasWordAttribute(List<AttributeType> types) throws OseeCoreException {
for (AttributeType attributeType : types) {
- if (attributeType.getBaseAttributeClass().equals(WordAttribute.class)) {
+ if (AttributeTypeManager.getAttributeBaseClass(attributeType).equals(WordAttribute.class)) {
return true;
}
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeActionContribution.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeActionContribution.java index 3f6b844a396..5e8d06cc950 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeActionContribution.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeActionContribution.java @@ -23,11 +23,11 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.window.Window; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.AttributeType; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.Attribute; -import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeUtil.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeUtil.java index 25af08c7f08..bd0101d838a 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeUtil.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeUtil.java @@ -16,9 +16,9 @@ import java.util.HashSet; import java.util.List;
import java.util.Set;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
/**
* @author Roberto E. Escobar
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java index 09618b0d5fe..7731ed172f7 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java @@ -18,8 +18,8 @@ import java.util.Set; import java.util.logging.Level;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.UserManager;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassLabelProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassLabelProvider.java index 7062ec091e1..8d8e31fe923 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassLabelProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassLabelProvider.java @@ -78,7 +78,7 @@ public class MassLabelProvider extends XViewerLabelProvider { if (!artifact.isAttributeTypeValid(colName)) { return ""; } - if (AttributeTypeManager.getType(colName).getBaseAttributeClass().equals(DateAttribute.class)) { + if (AttributeTypeManager.getAttributeBaseClass(colName).equals(DateAttribute.class)) { try { return new DateAttribute().MMDDYYHHMM.format(artifact.getSoleAttributeValue(colName)); } catch (OseeCoreException ex) { diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/VariableMap.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/VariableMap.java index f522f911b96..296d6e02ec4 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/VariableMap.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/VariableMap.java @@ -14,12 +14,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.model.ArtifactType; +import org.eclipse.osee.framework.core.model.AttributeType; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; -import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; /** * @author Ryan D. Brooks diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CheckDefaulHierarchy.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CheckDefaulHierarchy.java index 0449ccc5b11..d9bfaf42a66 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CheckDefaulHierarchy.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CheckDefaulHierarchy.java @@ -15,10 +15,10 @@ import java.util.Arrays; import java.util.Collection;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelations.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelations.java index fb79bb2cef6..05cf0a00617 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelations.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelations.java @@ -15,6 +15,7 @@ import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
+import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
@@ -30,7 +31,7 @@ public class ConsolidateRelations extends AbstractBlam { @Override
public void runOperation(VariableMap variableMap, IProgressMonitor monitor) throws Exception {
- IOperation operation = new ConsolidateRelationsTxOperation();
+ IOperation operation = new ConsolidateRelationsTxOperation(SkynetGuiPlugin.getInstance());
Operations.executeWork(operation, monitor, -1);
Operations.checkForErrorStatus(operation.getStatus());
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelationsTxOperation.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelationsTxOperation.java index 5c5adfb51a6..0436171fae9 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelationsTxOperation.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelationsTxOperation.java @@ -23,9 +23,10 @@ import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.exception.OseeWrappedException; +import org.eclipse.osee.framework.database.IOseeDatabaseServiceProvider; import org.eclipse.osee.framework.database.core.AbstractDbTxOperation; import org.eclipse.osee.framework.database.core.ConnectionHandler; -import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement; +import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.database.core.JoinUtility; import org.eclipse.osee.framework.database.core.OseeConnection; import org.eclipse.osee.framework.database.core.JoinUtility.ExportImportJoinQuery; @@ -67,7 +68,7 @@ public class ConsolidateRelationsTxOperation extends AbstractDbTxOperation { boolean materiallyDifferent; boolean updateAddressing; private int counter; - private ConnectionHandlerStatement chStmt; + private IOseeStatement chStmt; long previousNetGammaId; long previousObsoleteGammaId; @@ -75,8 +76,8 @@ public class ConsolidateRelationsTxOperation extends AbstractDbTxOperation { ModificationType netModType; TxChange netTxCurrent; - public ConsolidateRelationsTxOperation() { - super("Consolidate Relations", SkynetGuiPlugin.PLUGIN_ID); + public ConsolidateRelationsTxOperation(IOseeDatabaseServiceProvider provider) { + super(provider, "Consolidate Relations", SkynetGuiPlugin.PLUGIN_ID); } private void init() throws OseeCoreException, IOException { @@ -271,7 +272,7 @@ public class ConsolidateRelationsTxOperation extends AbstractDbTxOperation { return previousRelationTypeId != relationTypeId || previousArtifactAId != artifactAId || previousArtiafctBId != artiafctBId; } - private void relationMateriallyDifferes(ConnectionHandlerStatement chStmt) throws OseeCoreException { + private void relationMateriallyDifferes(IOseeStatement chStmt) throws OseeCoreException { if (!materiallyDifferent) { String currentRationale = chStmt.getString("rationale"); materiallyDifferent |= Strings.isValid(currentRationale) && !currentRationale.equals(netRationale); diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CopyTransactionDataToBaseline.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CopyTransactionDataToBaseline.java index 29aab714dfc..c47d6cf6aa6 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CopyTransactionDataToBaseline.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CopyTransactionDataToBaseline.java @@ -13,8 +13,8 @@ package org.eclipse.osee.framework.ui.skynet.blam.operation; import java.util.Arrays;
import java.util.Collection;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CreateNewUser.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CreateNewUser.java index 462bfa8f841..98601bcd655 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CreateNewUser.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CreateNewUser.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.List; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.enums.CoreArtifacts; import org.eclipse.osee.framework.core.exception.UserNotInDatabase; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -23,7 +24,6 @@ import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; -import org.eclipse.osee.framework.skynet.core.artifact.CoreArtifacts; import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatastoreStatistics.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatastoreStatistics.java index 8641ff9df4b..9402f28002f 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatastoreStatistics.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatastoreStatistics.java @@ -14,7 +14,7 @@ import java.util.Arrays; import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.database.core.ConnectionHandler; -import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement; +import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; @@ -32,7 +32,7 @@ public class DatastoreStatistics extends AbstractBlam { @Override public void runOperation(VariableMap variableMap, IProgressMonitor monitor) throws Exception { - ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(); + IOseeStatement chStmt = ConnectionHandler.getStatement(); try { chStmt.runPreparedQuery(1000, SELECT_ARTIFACT_COUNTS); diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DeleteUnneededUnspecifiedAttributes.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DeleteUnneededUnspecifiedAttributes.java index bf8defb90ba..aca3ddc1719 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DeleteUnneededUnspecifiedAttributes.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DeleteUnneededUnspecifiedAttributes.java @@ -14,11 +14,11 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.AttributeType; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.Attribute; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; import org.eclipse.osee.framework.skynet.core.attribute.EnumeratedAttribute; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExperimentalBlam.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExperimentalBlam.java index b2bf6a622ae..fc705808acb 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExperimentalBlam.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExperimentalBlam.java @@ -10,17 +10,21 @@ *******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.blam.operation;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
import org.eclipse.osee.framework.core.enums.BranchControlled;
import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.database.core.ConnectionHandler;
+import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.database.IOseeDatabaseService;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.PurgeBranchOperation;
-import org.eclipse.osee.framework.skynet.core.types.impl.BranchStoreOperation;
+import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
@@ -36,6 +40,7 @@ public class ExperimentalBlam extends AbstractBlam { @Override
public void runOperation(VariableMap variableMap, IProgressMonitor monitor) throws Exception {
+ IOseeDatabaseService service = SkynetGuiPlugin.getInstance().getOseeDatabaseService();
int increment = 0;
if (!variableMap.getBoolean("Even Branches")) {
increment = 1;
@@ -44,14 +49,47 @@ public class ExperimentalBlam extends AbstractBlam { for (Branch branch : BranchManager.getBranches(BranchArchivedState.ARCHIVED, BranchControlled.ALL,
BranchType.WORKING)) {
if ((branch.getId() + increment) % 2 == 0) {
- if (ConnectionHandler.runPreparedQueryFetchInt(0, PurgeBranchOperation.TEST_TXS, branch.getId()) == 1) {
+ if (service.runPreparedQueryFetchObject(0, PurgeBranchOperation.TEST_TXS, branch.getId()) == 1) {
System.out.println("Moving: " + branch);
- BranchStoreOperation.moveBranchAddressing(null, branch, true);
+ moveBranchAddressing(null, branch, true);
}
}
}
}
+ private static final String SELECT_ADDRESSING_BY_BRANCH =
+ "select * from %s txs, osee_tx_details txd where txs.transaction_id = txd.transaction_id and txd.branch_id = ?";
+ private static final String INSERT_ADDRESSING =
+ "insert into %s (transaction_id, gamma_id, mod_type, tx_current) VALUES (?,?,?,?)";
+
+ public static final String DELETE_ADDRESSING = "delete from %s where transaction_id = ? and gamma_id = ?";
+
+ public void moveBranchAddressing(IOseeDatabaseService service, Branch branch, boolean archive) throws OseeDataStoreException {
+ String sourceTableName = archive ? "osee_txs" : "osee_txs_archived";
+ String destinationTableName = archive ? "osee_txs_archived" : "osee_txs";
+
+ IOseeStatement chStmt = service.getStatement();
+ List<Object[]> addressing = new ArrayList<Object[]>();
+ List<Object[]> deleteAddressing = new ArrayList<Object[]>();
+ String sql = String.format(SELECT_ADDRESSING_BY_BRANCH, sourceTableName);
+
+ try {
+ chStmt.runPreparedQuery(10000, sql, branch.getId());
+ while (chStmt.next()) {
+ addressing.add(new Object[] {chStmt.getInt("transaction_id"), chStmt.getLong("gamma_id"),
+ chStmt.getInt("mod_type"), chStmt.getInt("tx_current")});
+ deleteAddressing.add(new Object[] {chStmt.getInt("transaction_id"), chStmt.getLong("gamma_id")});
+ }
+ } finally {
+ chStmt.close();
+ }
+ sql = String.format(INSERT_ADDRESSING, destinationTableName);
+ service.runBatchUpdate(sql, addressing);
+
+ sql = String.format(DELETE_ADDRESSING, sourceTableName);
+ service.runBatchUpdate(sql, deleteAddressing);
+ }
+
@Override
public Collection<String> getCategories() {
return Arrays.asList("Admin");
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExportArtifacts.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExportArtifacts.java index 4b0b70bf72d..80eff5a2c8f 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExportArtifacts.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExportArtifacts.java @@ -19,12 +19,12 @@ import java.util.List; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.AttributeType; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.io.CharBackedInputStream; import org.eclipse.osee.framework.jdk.core.util.io.xml.ExcelXmlWriter; import org.eclipse.osee.framework.jdk.core.util.io.xml.ISheetWriter; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.skynet.core.utility.AIFile; import org.eclipse.osee.framework.skynet.core.utility.OseeData; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FindArtifactsWithMinAttributeContraintProblems.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FindArtifactsWithMinAttributeContraintProblems.java index 0bcd694bf80..98b57fc44a8 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FindArtifactsWithMinAttributeContraintProblems.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FindArtifactsWithMinAttributeContraintProblems.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.blam.operation; import java.util.Arrays; import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FindInvalidUTF8Chars.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FindInvalidUTF8Chars.java index edac6ed359a..2a0aeaacdc5 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FindInvalidUTF8Chars.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FindInvalidUTF8Chars.java @@ -15,7 +15,7 @@ import java.util.Arrays; import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.database.core.ConnectionHandler; -import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement; +import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; @@ -34,7 +34,7 @@ public class FindInvalidUTF8Chars extends AbstractBlam { public void runOperation(VariableMap variableMap, IProgressMonitor monitor) throws Exception { int count = 0; - ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(); + IOseeStatement chStmt = ConnectionHandler.getStatement(); try { chStmt.runPreparedQuery(1000, READ_ATTRIBUTE_VALUES); while (chStmt.next()) { diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java index efbfebb584e..e72731974fa 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java @@ -36,7 +36,7 @@ import org.eclipse.osee.framework.core.data.OseeServerContext; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.jdk.core.util.HttpProcessor;
import org.eclipse.osee.framework.jdk.core.util.Lib;
@@ -179,7 +179,7 @@ public class FixTemplateContentArtifacts extends AbstractBlam { private ArrayList<AttrData> loadAttrData() throws OseeCoreException {
ArrayList<AttrData> attrData = new ArrayList<AttrData>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(GET_ATTRS, AttributeTypeManager.getType(WordAttribute.WORD_TEMPLATE_CONTENT).getId());
while (chStmt.next()) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/LoadAllArtifactsOnBranch.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/LoadAllArtifactsOnBranch.java index 38a7dc24b55..b78eb85f823 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/LoadAllArtifactsOnBranch.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/LoadAllArtifactsOnBranch.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.blam.operation; import java.util.Arrays;
import java.util.Collection;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/MigrateRelationOrder.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/MigrateRelationOrder.java index 60387cf8f45..ea0804de9f4 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/MigrateRelationOrder.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/MigrateRelationOrder.java @@ -17,15 +17,16 @@ import java.util.Collections; import java.util.List;
import java.util.logging.Level;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactNameComparator;
@@ -33,7 +34,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration;
import org.eclipse.osee.framework.skynet.core.relation.IRelationEnumeration;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSide;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -116,7 +116,7 @@ public class MigrateRelationOrder extends AbstractBlam { private void addToChildBaseilnes(Integer branchId, Integer transactionNumber) throws OseeCoreException {
final List<Object[]> txGammaList = new ArrayList<Object[]>(3000);
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(3000, SELECT_GAMMA_FROM_TXS, transactionNumber);
while (chStmt.next()) {
@@ -175,7 +175,7 @@ public class MigrateRelationOrder extends AbstractBlam { private void fixPreviousBugForBranch(Integer branchId, Integer transactionNumber) throws OseeDataStoreException {
final List<Object[]> txGammaList = new ArrayList<Object[]>(3000);
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(3000, SELECT_GAMMA_FROM_TXS, transactionNumber);
while (chStmt.next()) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeArchivedBranch.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeArchivedBranch.java index 03eca2f8d79..bfc8b9a4983 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeArchivedBranch.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeArchivedBranch.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -80,7 +80,7 @@ public class PurgeArchivedBranch extends AbstractBlam { private List<BranchInfo> purgeSelectedBranches() throws Exception {
final List<BranchInfo> branches = new ArrayList<BranchInfo>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(SELECT_ARCHIVED_BRANCHES, systemUserArtId, BranchArchivedState.ARCHIVED.getValue(),
BranchState.REBASELINED.getValue(), BranchState.DELETED.getValue());
@@ -113,7 +113,7 @@ public class PurgeArchivedBranch extends AbstractBlam { private List<BranchInfo> checkUnusualArchivedBranches() throws Exception {
// check to make sure archived branches are not in states other than Committed, Deleted, Rebaselined
List<BranchInfo> branches = new ArrayList<BranchInfo>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(SELECT_UNUSUAL_ARCHIVED_BRANCHES, systemUserArtId,
BranchArchivedState.ARCHIVED.getValue(), BranchState.COMMITTED.getValue(),
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeArtifactType.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeArtifactType.java index cda313ea9da..1f65fd2d79f 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeArtifactType.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeArtifactType.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.blam.operation; import java.util.Arrays; import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; +import org.eclipse.osee.framework.core.model.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeAttributeType.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeAttributeType.java index 7affdf0d480..fc590f5012b 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeAttributeType.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeAttributeType.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.blam.operation; import java.util.Arrays; import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; +import org.eclipse.osee.framework.core.model.AttributeType; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeDeletedAttributes.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeDeletedAttributes.java index b3107e5672f..3b0dff96fa0 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeDeletedAttributes.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeDeletedAttributes.java @@ -15,13 +15,13 @@ import java.util.Collection; import java.util.List; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.AttributeType; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactLoad; import org.eclipse.osee.framework.skynet.core.artifact.Attribute; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; import org.eclipse.osee.framework.skynet.core.utility.AIFile; import org.eclipse.osee.framework.skynet.core.utility.OseeData; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderAnalysisOnBranch.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderAnalysisOnBranch.java index 7a5d7bc6452..08c735c126b 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderAnalysisOnBranch.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderAnalysisOnBranch.java @@ -27,8 +27,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.ILoggerListener;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReportAttributeTypesUsageBlam.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReportAttributeTypesUsageBlam.java index b837da3c516..4552accc7c4 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReportAttributeTypesUsageBlam.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReportAttributeTypesUsageBlam.java @@ -13,11 +13,11 @@ package org.eclipse.osee.framework.ui.skynet.blam.operation; import java.util.Arrays;
import java.util.Collection;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ResourceManipulation.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ResourceManipulation.java index c838446e647..bae39facbd3 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ResourceManipulation.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ResourceManipulation.java @@ -37,7 +37,7 @@ import org.eclipse.osee.framework.core.data.OseeServerContext; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.jdk.core.util.HttpProcessor;
import org.eclipse.osee.framework.jdk.core.util.Lib;
@@ -284,7 +284,7 @@ public class ResourceManipulation extends AbstractBlam { private ArrayList<AttrData> loadAttrData() throws OseeCoreException {
ArrayList<AttrData> attrData = new ArrayList<AttrData>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(GET_ATTRS_TEST,
AttributeTypeManager.getType(WordAttribute.WORD_TEMPLATE_CONTENT).getId());
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetRequirementCategory.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetRequirementCategory.java index 78310839632..ccce8126e74 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetRequirementCategory.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetRequirementCategory.java @@ -16,13 +16,13 @@ import java.util.HashMap; import java.util.List;
import java.util.logging.Level;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.attribute.CoreAttributes;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ShowRevertTransactions.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ShowRevertTransactions.java index 41cb070a6c4..8e7517f3301 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ShowRevertTransactions.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ShowRevertTransactions.java @@ -14,7 +14,7 @@ import java.util.Arrays; import java.util.Collection;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
@@ -39,7 +39,7 @@ public class ShowRevertTransactions extends AbstractBlam { sbFull.append(AHTML.addHeaderRowMultiColumnTable(new String[] {"Branch ID", "User", "Transaction_ID", "Date"}));
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(GET_REVERT_TRANSACTIONS);
while (chStmt.next()) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SwitchParentBranch.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SwitchParentBranch.java index 738a8519703..7ffe07e83af 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SwitchParentBranch.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SwitchParentBranch.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.blam.operation; import java.util.Arrays; import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UniqueNumberOfCurrentOseeUsers.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UniqueNumberOfCurrentOseeUsers.java index 4de67198915..97ba66ca4f7 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UniqueNumberOfCurrentOseeUsers.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UniqueNumberOfCurrentOseeUsers.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.database.core.ConnectionHandler; -import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement; +import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; @@ -42,7 +42,7 @@ public class UniqueNumberOfCurrentOseeUsers extends AbstractBlam { // removeColonFromActionNames monitor.beginTask("Counting Users", IProgressMonitor.UNKNOWN); - ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(); + IOseeStatement chStmt = ConnectionHandler.getStatement(); try { chStmt.runPreparedQuery(SELECT_USER_COUNT); if (chStmt.next()) { diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateArtifactTypeImage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateArtifactTypeImage.java index 0f90c8c8ac6..a3c2e7fde9a 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateArtifactTypeImage.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateArtifactTypeImage.java @@ -18,11 +18,11 @@ import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.ui.plugin.util.Displays;
import org.eclipse.osee.framework.ui.skynet.ImageManager;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchCheckTreeDialog.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchCheckTreeDialog.java index 600b23ee0eb..66f37885214 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchCheckTreeDialog.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchCheckTreeDialog.java @@ -16,7 +16,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchNameSorter.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchNameSorter.java index ec81c014deb..97020195bd8 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchNameSorter.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchNameSorter.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.branch; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; /** * Default sorter for branch. Sorts on descriptive name diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectComposite.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectComposite.java index bb9b7383272..9a6b8bcffcc 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectComposite.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectComposite.java @@ -14,8 +14,8 @@ package org.eclipse.osee.framework.ui.skynet.branch; import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectionDialog.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectionDialog.java index e16b53f9ded..ea3d9f9378d 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectionDialog.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectionDialog.java @@ -15,7 +15,7 @@ import java.util.List; import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.window.Window;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchOptions;
import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.XBranchWidget;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java index 349f17d5d2a..3a27d103332 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java @@ -15,10 +15,10 @@ import java.util.logging.Level; import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.IAccessControllable;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ChangeReportHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ChangeReportHandler.java index 235f61930d4..be05609c7ff 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ChangeReportHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ChangeReportHandler.java @@ -15,9 +15,9 @@ import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CopyHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CopyHandler.java index 895b050c92f..9a707f78475 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CopyHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CopyHandler.java @@ -19,7 +19,7 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.util.ArtifactClipboard;
import org.eclipse.search.ui.text.Match;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/Handlers.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/Handlers.java index a70d085244f..8a6c83339bc 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/Handlers.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/Handlers.java @@ -15,8 +15,8 @@ import java.util.LinkedList; import java.util.List;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.change.Change;
import org.eclipse.search.ui.text.Match;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenArtifactExplorerHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenArtifactExplorerHandler.java index 753759cd8f9..a332fa40609 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenArtifactExplorerHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenArtifactExplorerHandler.java @@ -17,7 +17,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.ArtifactExplorer;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PasteHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PasteHandler.java index d1b4dba7e77..74ac58db368 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PasteHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PasteHandler.java @@ -17,7 +17,7 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactNameConflictHandler;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/WordChangesToParentHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/WordChangesToParentHandler.java index 7f546133314..a32764fd085 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/WordChangesToParentHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/WordChangesToParentHandler.java @@ -19,8 +19,8 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchCompoundContributionItem.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchCompoundContributionItem.java index 33e4610757c..33487245aa4 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchCompoundContributionItem.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchCompoundContributionItem.java @@ -19,9 +19,9 @@ import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchHandler.java index 296b54c0b83..1ee89bc4747 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchHandler.java @@ -15,9 +15,9 @@ import java.util.List; import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java index aca84e1d420..25c85ec8ccc 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java @@ -17,11 +17,11 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.IExceptionableRunnable;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/DeleteBranchHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/DeleteBranchHandler.java index 431ff2ab172..98bc1bd924d 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/DeleteBranchHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/DeleteBranchHandler.java @@ -16,8 +16,8 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.access.AccessControlManager; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java index 8b8c0dc4aa9..6be811b73fb 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java @@ -14,9 +14,9 @@ import java.util.List; import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.UserManager;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java index 92457caed6b..956d2908047 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java @@ -16,8 +16,8 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.access.AccessControlManager; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java index f72020b2d97..07d8bb51cae 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java @@ -18,8 +18,8 @@ import org.eclipse.core.runtime.jobs.IJobChangeEvent; import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.framework.core.data.TransactionRecord; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.access.AccessControlManager; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/RenameBranchHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/RenameBranchHandler.java index 1a38d39ae6d..34946a703c1 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/RenameBranchHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/RenameBranchHandler.java @@ -16,8 +16,8 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java index fad10e1c521..d5f51f730d9 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java @@ -15,8 +15,8 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.access.AccessControlManager; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchContributionItem.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchContributionItem.java index 6c9ab0a7f4f..6ef4ac99f2d 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchContributionItem.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchContributionItem.java @@ -18,8 +18,8 @@ import org.eclipse.core.commands.Command; import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchHandler.java index 57bbe19652c..5fc8b8f38bc 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchHandler.java @@ -14,8 +14,8 @@ import java.util.List; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java index 0e304cb97e1..f92997a4955 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java @@ -19,9 +19,9 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.jdk.core.type.MutableInteger;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoHandler.java index 2456b7b285b..3f9b46c913a 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoHandler.java @@ -15,8 +15,8 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.Window; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.Jobs; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java index 7261176c614..942f7d35aaa 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java @@ -21,8 +21,8 @@ import org.eclipse.core.commands.common.NotDefinedException; import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/UpdateBranchHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/UpdateBranchHandler.java index b3d77d30941..5da5edb7f5f 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/UpdateBranchHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/UpdateBranchHandler.java @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.update.ConflictResolverOperation;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java index 49b7c5a8d33..6e3f8c88849 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java @@ -22,8 +22,8 @@ import org.eclipse.core.commands.common.NotDefinedException; import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.revision.ConflictManagerInternal;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java index 2627c40f27b..2670a1be9d0 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java @@ -16,8 +16,8 @@ import java.util.logging.Level; import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java index a2da9218a29..e4fb4ec7df5 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java @@ -31,16 +31,16 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.jdk.core.util.HttpProcessor;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.jdk.core.util.HttpProcessor.AcquireResult;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.attribute.WordAttribute;
import org.eclipse.osee.framework.skynet.core.utility.OseeData;
@@ -156,7 +156,7 @@ public abstract class AbstractWordAttributeHealthOperation extends DatabaseHealt private List<AttrData> loadAttributeData(IProgressMonitor monitor, AttributeType attributeType) throws OseeDataStoreException, OseeTypeDoesNotExist {
List<AttrData> attrData = new ArrayList<AttrData>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(GET_ATTRS, attributeType.getId());
while (chStmt.next()) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ArtifactIdWithoutVersionsCheck.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ArtifactIdWithoutVersionsCheck.java index 119d6c0f5a3..9f9112bdcb1 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ArtifactIdWithoutVersionsCheck.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ArtifactIdWithoutVersionsCheck.java @@ -18,7 +18,7 @@ import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
/**
@@ -103,7 +103,7 @@ public class ArtifactIdWithoutVersionsCheck extends DatabaseHealthOperation { private Set<Integer> getInvalidEntries(IProgressMonitor monitor, Set<Integer> allInvalidArtIds, String query, boolean hasItemId) throws OseeDataStoreException {
Set<Integer> toReturn = new HashSet<Integer>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(query);
while (chStmt.next()) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AttributeBackingDataCheck.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AttributeBackingDataCheck.java index 0e4e707be13..24080f6d7e9 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AttributeBackingDataCheck.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AttributeBackingDataCheck.java @@ -24,7 +24,7 @@ import org.eclipse.osee.framework.core.data.OseeServerContext; import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.jdk.core.util.HttpProcessor;
import org.eclipse.osee.framework.jdk.core.util.Lib;
@@ -75,7 +75,7 @@ public class AttributeBackingDataCheck extends DatabaseHealthOperation { private List<AttrData> getInvalidAttributeData(IProgressMonitor monitor) throws OseeDataStoreException, OseeTypeDoesNotExist {
List<AttrData> data = new ArrayList<AttrData>();
SubMonitor subMonitor = SubMonitor.convert(monitor, (int) (getTotalWorkUnits() * 0.80));
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(READ_VALID_ATTRIBUTES);
while (chStmt.next()) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AuthorIdCheck.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AuthorIdCheck.java index 91e630f1afe..22212518539 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AuthorIdCheck.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AuthorIdCheck.java @@ -15,7 +15,7 @@ import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.data.SystemUser;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -54,7 +54,7 @@ public class AuthorIdCheck extends DatabaseHealthOperation { rd.addRaw(AHTML.addHeaderRowMultiColumnTable(columnHeaders));
Set<Integer> authors = new HashSet<Integer>();
- ConnectionHandlerStatement chStmt1 = ConnectionHandler.getStatement();
+ IOseeStatement chStmt1 = ConnectionHandler.getStatement();
try {
chStmt1.runPreparedQuery(GET_AUTHOR_IDS);
while (chStmt1.next()) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java index 24b40eb6fae..75927605ebe 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.jdk.core.util.Strings;
@@ -156,7 +156,7 @@ public class BranchStateHealthCheck extends DatabaseHealthOperation { private Collection<BranchData> getAllBranchData() throws OseeDataStoreException {
Map<Integer, BranchData> data = new HashMap<Integer, BranchData>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery("select * from osee_branch");
while (chStmt.next()) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/CleanUpAddressingData.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/CleanUpAddressingData.java index 3ff8af72e59..f549637de48 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/CleanUpAddressingData.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/CleanUpAddressingData.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.dbHealth; import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
/**
@@ -41,7 +41,7 @@ public class CleanUpAddressingData extends DatabaseHealthOperation { protected void doHealthCheck(IProgressMonitor monitor) throws Exception {
boolean fix = isFixOperationEnabled();
boolean verify = !fix;
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
if (verify || gammas == null) {
gammas =
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/CleanUpBackingData.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/CleanUpBackingData.java index 4420d270af0..bc46c174d50 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/CleanUpBackingData.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/CleanUpBackingData.java @@ -18,7 +18,7 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.ui.skynet.results.table.ResultsEditorTableTab;
import org.eclipse.osee.framework.ui.skynet.results.table.ResultsXViewerRow;
import org.eclipse.swt.SWT;
@@ -45,7 +45,7 @@ public class CleanUpBackingData extends DatabaseHealthOperation { checkForCancelledStatus(monitor);
List<Object[]> notAddressedGammas = new LinkedList<Object[]>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
String sql = String.format(NOT_ADDRESSESED_GAMMAS, tableName);
ResultsEditorTableTab resultsTab = new ResultsEditorTableTab(tableName + " gammas");
@@ -75,7 +75,7 @@ public class CleanUpBackingData extends DatabaseHealthOperation { checkForCancelledStatus(monitor);
List<Object[]> emptyTransactions = new LinkedList<Object[]>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
ResultsEditorTableTab resultsTab = new ResultsEditorTableTab("Empty transactions");
getResultsProvider().addResultsTab(resultsTab);
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/CommitTransactions.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/CommitTransactions.java index 4b5e85ac862..7c031d51d38 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/CommitTransactions.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/CommitTransactions.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.dbHealth; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.Strings;
/**
@@ -44,7 +44,7 @@ public class CommitTransactions extends DatabaseHealthOperation { if (isFixOperationEnabled()) {
checkForCancelledStatus(monitor);
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(GET_COMMIT_TRANSACTIONS, new Object[0]);
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateAttributes.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateAttributes.java index 21481fc3493..765849d94ed 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateAttributes.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateAttributes.java @@ -15,7 +15,7 @@ import java.util.List; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations;
@@ -40,7 +40,7 @@ public class DuplicateAttributes extends DatabaseHealthOperation { super("Duplicate Attribute Errors");
}
- private DuplicateAttributeData createAttributeData(ConnectionHandlerStatement chStmt) throws OseeDataStoreException {
+ private DuplicateAttributeData createAttributeData(IOseeStatement chStmt) throws OseeDataStoreException {
AttributeData attributeData1 =
new AttributeData(chStmt.getInt("attr_id_1"), chStmt.getInt("gamma_id_1"), chStmt.getString("value_1"),
chStmt.getString("uri_1"));
@@ -65,7 +65,7 @@ public class DuplicateAttributes extends DatabaseHealthOperation { //--- Test's for two attributes that are on the same artifact but have different attr_ids, when ---//
//--- the attribute type has a maximum of 1 allowable attributes. ---------------------------------//
- ConnectionHandlerStatement chStmt1 = ConnectionHandler.getStatement();
+ IOseeStatement chStmt1 = ConnectionHandler.getStatement();
try {
chStmt1.runPreparedQuery(GET_DUPLICATE_ATTRIBUTES);
monitor.worked(6);
@@ -169,7 +169,7 @@ public class DuplicateAttributes extends DatabaseHealthOperation { //--- Find out if there is an attribute that is on every branch that has either one of the attributes ---//
private void loadBranchesWhereOnlyOneIsUsed(AttributeData attributeData, int otherAttrId) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(String.format(BRANCHES_WITH_ONLY_ATTR, chStmt.getComplementSql()),
attributeData.getAttrId(), otherAttrId);
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateHRID.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateHRID.java index b7c616f1fbe..e692487c2c2 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateHRID.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateHRID.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
@@ -137,7 +137,7 @@ public class DuplicateHRID extends DatabaseHealthOperation { private List<ArtifactData> getDuplicateHRIDArtifacts(IProgressMonitor monitor) throws OseeDataStoreException {
List<ArtifactData> duplicateItems = new LinkedList<ArtifactData>();
- ConnectionHandlerStatement chStmt1 = ConnectionHandler.getStatement();
+ IOseeStatement chStmt1 = ConnectionHandler.getStatement();
try {
chStmt1.runPreparedQuery(GET_DUPLICATE_HRIDS);
while (chStmt1.next()) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/HealthHelper.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/HealthHelper.java index 9467bdcedae..473464be5e3 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/HealthHelper.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/HealthHelper.java @@ -17,7 +17,7 @@ import java.util.List; import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.jdk.core.util.Lib;
@@ -83,7 +83,7 @@ public class HealthHelper { public static List<Object[]> runSingleResultQuery(String sql, String dbColumn) throws OseeCoreException {
List<Object[]> foundItems = new LinkedList<Object[]>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(sql);
while (chStmt.next()) {
@@ -97,7 +97,7 @@ public class HealthHelper { public static HashSet<Pair<Integer, Integer>> getNoTxCurrentSet(String dataColumnName, String tableName, ResultsEditorTableTab resultsTab) throws Exception {
HashSet<Pair<Integer, Integer>> noneSet = new HashSet<Pair<Integer, Integer>>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
String sql =
NO_TX_CURRENT_SET[0] + dataColumnName + NO_TX_CURRENT_SET[1] + tableName + String.format(
NO_TX_CURRENT_SET[2], chStmt.getComplementSql()) + dataColumnName + NO_TX_CURRENT_SET[3] + tableName + NO_TX_CURRENT_SET[4];
@@ -120,7 +120,7 @@ public class HealthHelper { public static HashSet<LocalTxData> getMultipleTxCurrentSet(String dataId, String dataTable, Appendable builder, String data) throws Exception {
String sql =
MULTIPLE_TX_CURRENT_SET[0] + dataId + MULTIPLE_TX_CURRENT_SET[1] + dataId + MULTIPLE_TX_CURRENT_SET[2] + dataTable + MULTIPLE_TX_CURRENT_SET[3] + dataId + MULTIPLE_TX_CURRENT_SET[4];
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
HashSet<LocalTxData> multipleSet = new HashSet<LocalTxData>();
long time = System.currentTimeMillis();
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/InvalidTxCurrentsAndModTypes.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/InvalidTxCurrentsAndModTypes.java index 72e7f4f0d7c..a9e820c0daa 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/InvalidTxCurrentsAndModTypes.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/InvalidTxCurrentsAndModTypes.java @@ -12,7 +12,7 @@ import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.results.MultiPageResultsProvider;
import org.eclipse.osee.framework.ui.skynet.results.table.ResultsEditorTableTab;
@@ -206,7 +206,7 @@ public class InvalidTxCurrentsAndModTypes extends AbstractOperation { resultsTab.addColumn(new XViewerColumn("6", "Mod Type", 80, SWT.LEFT, true, SortDataType.String, false, ""));
resultsTab.addColumn(new XViewerColumn("7", "TX Current", 80, SWT.LEFT, true, SortDataType.String, false, ""));
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
String sql = String.format(SELECT_ADDRESSES, columnName, tableName, columnName);
try {
chStmt.runPreparedQuery(10000, sql);
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java index 5f580194075..f1e27565055 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java @@ -21,7 +21,7 @@ import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.TxChange;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations;
@@ -68,7 +68,7 @@ public class ItemsDeletedWithNoOtherModification extends DatabaseHealthOperation }
private void loadData(String sql, TxChange txChange, ModificationType modificationType) throws OseeCoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(sql, txChange.getValue(), modificationType.getValue(), modificationType.getValue());
while (chStmt.next()) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/MultipleParentRelations.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/MultipleParentRelations.java index 59a2ea5b8b5..22173b79b05 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/MultipleParentRelations.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/MultipleParentRelations.java @@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
@@ -198,7 +198,7 @@ public class MultipleParentRelations extends DatabaseHealthOperation { //int relLinkId1, int relLinkId2, Timestamp time1, Timestamp time2, int transactionId1, int transactionId2) {
private void loadData() throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(GET_DUPLICATE_DEFAULT_HIER_LINKS);
while (chStmt.next()) {
@@ -214,7 +214,7 @@ public class MultipleParentRelations extends DatabaseHealthOperation { }
private void setAuthors(LocalRelationLink link) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(GET_AUTHOR, link.transactionId1);
if (chStmt.next()) {
@@ -234,7 +234,7 @@ public class MultipleParentRelations extends DatabaseHealthOperation { }
private void setData(LocalRelationLink link) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(GET_ARTIFACT_NAME, link.parentArtId1);
if (chStmt.next()) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationDatabaseIntegrityCheck.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationDatabaseIntegrityCheck.java index 5b54634c314..50eb8a1576b 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationDatabaseIntegrityCheck.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationDatabaseIntegrityCheck.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.TxChange;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.type.DoubleKeyHashMap;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
@@ -214,7 +214,7 @@ public class RelationDatabaseIntegrityCheck extends DatabaseHealthOperation { }
private void loadData(String sql, boolean forDelete) throws OseeDataStoreException {
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
DoubleKeyHashMap<Integer, Integer, LocalRelationLink> map = forDelete ? deleteMap : updateMap;
try {
chStmt.runPreparedQuery(sql);
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java index 6bfd77e76bc..5ef7f1d7bd2 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java @@ -16,19 +16,19 @@ import java.util.HashSet; import java.util.List;
import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.TxChange;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -121,7 +121,7 @@ public class RepeatEnumerationAttributeValues extends DatabaseHealthOperation { private Set<AttrData> getRepeatEnumeratedAttrs(IProgressMonitor monitor, Branch branch) throws OseeDataStoreException, OseeTypeDoesNotExist {
Set<AttrData> attrData = new HashSet<AttrData>();
- ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement();
+ IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(FIND_REPEAT_ENUMS, branch.getId(), branch.getId());
while (chStmt.next()) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java index 05ae47df1cd..e7323541d2b 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java @@ -23,7 +23,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ExportBranchPage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ExportBranchPage.java index 67b4bc527d9..946cec555f3 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ExportBranchPage.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ExportBranchPage.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.export; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.ui.plugin.util.DirectoryOrFileSelector;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ExportBranchWizard.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ExportBranchWizard.java index f6be2279444..a965d3ff9ce 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ExportBranchWizard.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ExportBranchWizard.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.export; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.ui.IExportWizard; import org.eclipse.ui.IWorkbench; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java index 08670f67ac9..115c8d563cd 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java @@ -25,9 +25,9 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.BranchDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java index 6d08b48bf13..911740b8022 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java @@ -18,14 +18,14 @@ import java.util.List; import java.util.Set;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData;
import org.eclipse.osee.framework.skynet.core.artifact.UniversalGroup;
import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/ArtifactDiffMenu.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/ArtifactDiffMenu.java index 8b9dc8c3680..6f1d8b85d31 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/ArtifactDiffMenu.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/ArtifactDiffMenu.java @@ -12,8 +12,8 @@ package org.eclipse.osee.framework.ui.skynet.menu; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.change.Change;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenuPermissions.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenuPermissions.java index 1bd44fb01fd..799554ebd0b 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenuPermissions.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenuPermissions.java @@ -12,9 +12,9 @@ package org.eclipse.osee.framework.ui.skynet.menu; import java.util.Arrays;
import java.util.Collection;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbededAttributeEditorFactory.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbededAttributeEditorFactory.java index 4d6884bbc70..0c86dbc51ab 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbededAttributeEditorFactory.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbededAttributeEditorFactory.java @@ -37,8 +37,7 @@ public class EmbededAttributeEditorFactory { public static IEmbeddedAttributeEditor getEmbeddedEditor(String attributeName, String displayName, final Collection<?> attributeHolder, boolean persist) {
try {
- Class<? extends Attribute> attClass;
- attClass = AttributeTypeManager.getType(attributeName).getBaseAttributeClass();
+ Class<? extends Attribute> attClass = AttributeTypeManager.getAttributeBaseClass(attributeName);
if (attClass.equals(DateAttribute.class)) {
return new EmbeddedDateAttributeEditor(null, attributeHolder, displayName, attributeName, persist);
@@ -54,8 +53,9 @@ public class EmbededAttributeEditorFactory { return new EmbeddedEnumAttributeEditor(null, attributeHolder, displayName, attributeName, persist);
} else if (attClass.equals(StringAttribute.class)) {
return new EmbeddedStringAttributeEditor(null, attributeHolder, displayName, attributeName, persist);
- } else
+ } else {
AWorkbench.popup("ERROR", "Unhandled attribute type. No editor defined for this type");
+ }
} catch (Exception ex) {
OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactSelectPanel.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactSelectPanel.java index bf8d51b786a..94679d3f944 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactSelectPanel.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactSelectPanel.java @@ -14,8 +14,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.ui.skynet.ArtifactLabelProvider;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactTypeSelectPanel.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactTypeSelectPanel.java index 640a1d44a30..d69db4c4e10 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactTypeSelectPanel.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactTypeSelectPanel.java @@ -18,7 +18,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
+import org.eclipse.osee.framework.core.model.ArtifactType;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.util.ArtifactTypeLabelProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ArtifactTypeFilteredTreeDialog;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AttributeTypeSelectPanel.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AttributeTypeSelectPanel.java index 351a412bf44..76db7a5f994 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AttributeTypeSelectPanel.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AttributeTypeSelectPanel.java @@ -14,7 +14,7 @@ import java.util.Collection; import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.AttributeTypeCheckTreeDialog;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.AttributeTypeLabelProvider;
import org.eclipse.swt.widgets.Shell;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java index 5e6a69767c9..bee17d7db3d 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java @@ -17,7 +17,7 @@ import java.util.HashSet; import java.util.List;
import java.util.Set;
import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java index bce971a086f..4b858c0f2ef 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java @@ -15,7 +15,7 @@ import java.text.SimpleDateFormat; import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeInfo;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.jdk.core.util.Lib;
@@ -114,7 +114,7 @@ public class DataSourceDetails extends PreferencePage implements IWorkbenchPrefe StringBuilder builder = new StringBuilder();
builder.append("<table class=\"oseeTable\" width=\"100%\">");
builder.append(AHTML.addHeaderRowMultiColumnTable(new String[] {"Source Id", "Exported On", "Imported On"}));
- ConnectionHandlerStatement chStmt = null;
+ IOseeStatement chStmt = null;
try {
chStmt = ConnectionHandler.getStatement();
chStmt.runPreparedQuery("select * from osee_import_source");
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 2bf33f2a1de..abb6bd62956 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 @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.relation.explorer; +import org.eclipse.osee.framework.core.model.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; public class ArtifactModel { diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java index 60637c7637f..04c1179a1fc 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java @@ -12,12 +12,12 @@ package org.eclipse.osee.framework.ui.skynet.relation.explorer; import java.util.ArrayList;
import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSide;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSideSorter;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableCellModifier.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableCellModifier.java index 741f34a54cc..c3a5585d3e8 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableCellModifier.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableCellModifier.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.ui.skynet.relation.explorer; import org.eclipse.jface.viewers.ICellModifier; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; +import org.eclipse.osee.framework.core.model.ArtifactType; import org.eclipse.swt.widgets.TableItem; public class RelationTableCellModifier implements ICellModifier { diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java index 3e77969bf49..e1ae3f3bad3 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java @@ -20,12 +20,12 @@ import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.swt.SWT;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuidToWordML.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuidToWordML.java index 99c7d336a80..e8c2bfb67f6 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuidToWordML.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuidToWordML.java @@ -12,8 +12,8 @@ package org.eclipse.osee.framework.ui.skynet.render; import java.util.ArrayList;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.linking.LinkType;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java index a514721793d..d5e047eb244 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java @@ -16,10 +16,10 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.database.core.ConnectionHandler; -import org.eclipse.osee.framework.database.core.ConnectionHandlerStatement; +import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.plugin.util.Displays; @@ -45,7 +45,7 @@ public class ArtifactGuis { // Can only be on other branches it has already been saved if (artifact.isInDb()) { - ConnectionHandlerStatement chStmt = ConnectionHandler.getStatement(); + IOseeStatement chStmt = ConnectionHandler.getStatement(); try { chStmt.runPreparedQuery(OTHER_EDIT_SQL, artifact.getArtId(), artifact.getBranch().getId(), artifact.getBranch().getId()); diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java index 5911ea7a989..39f51e1bb62 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java @@ -15,9 +15,9 @@ import java.util.List; import java.util.logging.Level;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.xml.Xml;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -25,7 +25,6 @@ import org.eclipse.osee.framework.skynet.core.attribute.CoreAttributes; import org.eclipse.osee.framework.skynet.core.linking.OseeLinkBuilder;
import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData;
-import org.eclipse.osee.framework.skynet.core.types.OseeTypeManager;
import org.eclipse.osee.framework.ui.skynet.ImageManager;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
@@ -172,8 +171,8 @@ public class DefaultArtifactRenderer implements IRenderer { try {
ArtifactGuidToWordML guidResolver = new ArtifactGuidToWordML(new OseeLinkBuilder());
RelationOrderRenderer renderer =
- new RelationOrderRenderer(OseeTypeManager.getCache().getRelationTypeCache(), guidResolver,
- RelationManager.getSorterProvider());
+ new RelationOrderRenderer(SkynetGuiPlugin.getInstance().getOseeCacheService().getRelationTypeCache(),
+ guidResolver, RelationManager.getSorterProvider());
WordMLProducer producer = new WordMLProducer(builder);
RelationOrderData relationOrderData = RelationManager.createRelationOrderData(artifact);
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileRenderer.java index 9a2bc6863f1..c490ef6c843 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileRenderer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileRenderer.java @@ -25,8 +25,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileSystemRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileSystemRenderer.java index 23fad272eb4..eb59b06977c 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileSystemRenderer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileSystemRenderer.java @@ -15,9 +15,9 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.utility.OseeData;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java index c3dd598f7e4..30244c4cc9b 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java @@ -13,9 +13,9 @@ package org.eclipse.osee.framework.ui.skynet.render; import java.util.List;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
import org.eclipse.osee.framework.ui.skynet.render.word.AttributeElement;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java index cacbdb87aa5..a6f2abe729e 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java @@ -13,13 +13,13 @@ package org.eclipse.osee.framework.ui.skynet.render; import java.util.List;
import java.util.Map.Entry;
import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.AbstractOseeCache;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.cache.AbstractOseeCache;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationSorterProvider;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactJob.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactJob.java index 01bc0846a31..722f665badf 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactJob.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactJob.java @@ -28,11 +28,11 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UrlRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UrlRenderer.java index 1c1e5a900f4..66e82c72eee 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UrlRenderer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UrlRenderer.java @@ -12,8 +12,8 @@ package org.eclipse.osee.framework.ui.skynet.render; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.AttributeType; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; /** diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeDocumentRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeDocumentRenderer.java index ec034700bb3..b22fdf009ff 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeDocumentRenderer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeDocumentRenderer.java @@ -16,10 +16,10 @@ import java.util.ArrayList; import java.util.List;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.jdk.core.util.io.Streams;
import org.eclipse.osee.framework.skynet.core.UserManager;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java index 53cca92636c..bdeba45cb4d 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java @@ -30,9 +30,9 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java index cb84ec243c8..7e1b7e79597 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java @@ -30,16 +30,16 @@ import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.io.CharBackedInputStream;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.attribute.CoreAttributes;
import org.eclipse.osee.framework.skynet.core.attribute.WordAttribute;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/BasicTemplateAttributeHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/BasicTemplateAttributeHandler.java index 99b5262843a..513a3b47789 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/BasicTemplateAttributeHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/BasicTemplateAttributeHandler.java @@ -15,10 +15,10 @@ import java.util.Collection; import java.util.HashSet;
import java.util.Set;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.attribute.WordAttribute;
import org.eclipse.osee.framework.ui.skynet.render.word.WordMLProducer;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/WordAttributeTypeAttributeHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/WordAttributeTypeAttributeHandler.java index 53684a9ad8a..7f743ea1f87 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/WordAttributeTypeAttributeHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/WordAttributeTypeAttributeHandler.java @@ -13,10 +13,10 @@ package org.eclipse.osee.framework.ui.skynet.render.word.template; import java.util.Collection;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.jdk.core.util.xml.Xml;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.WordAttribute;
import org.eclipse.osee.framework.ui.skynet.render.word.WordMLProducer;
import org.eclipse.osee.framework.ui.skynet.render.word.WordTemplateProcessor;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/WordTemplateManager.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/WordTemplateManager.java index 46ab002f76d..c15c2bd41dc 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/WordTemplateManager.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/WordTemplateManager.java @@ -17,8 +17,8 @@ import java.util.List; import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.CoreAttributes;
import org.eclipse.osee.framework.skynet.core.word.WordUtil;
import org.eclipse.osee.framework.ui.skynet.render.word.WordMLProducer;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java index e9d1ed9d2f9..f2d03b7f171 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.results.html; import java.net.URL; import java.util.regex.Pattern; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/revert/RevertWizardPage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/revert/RevertWizardPage.java index 76acf5f63f1..40edfb17984 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/revert/RevertWizardPage.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/revert/RevertWizardPage.java @@ -17,8 +17,8 @@ import java.util.logging.Level; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java index a642a9bd9c4..3581d9931fb 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java @@ -27,17 +27,17 @@ import org.eclipse.jface.viewers.ListViewer; import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
-import org.eclipse.osee.framework.skynet.core.relation.RelationType;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.search.filter.FilterModel;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AttributeFindReplaceDialog.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AttributeFindReplaceDialog.java index 1290fd8fe05..86990719cd1 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AttributeFindReplaceDialog.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AttributeFindReplaceDialog.java @@ -29,13 +29,13 @@ import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/FilterArtifactSearchQuery.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/FilterArtifactSearchQuery.java index df9c20d53ca..fbd81b47fb6 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/FilterArtifactSearchQuery.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/FilterArtifactSearchQuery.java @@ -14,8 +14,8 @@ import java.util.Collection; import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ISearchPrimitive;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/HistoricalArtifactSearchQuery.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/HistoricalArtifactSearchQuery.java index f408841b9e5..454c70bb435 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/HistoricalArtifactSearchQuery.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/HistoricalArtifactSearchQuery.java @@ -11,8 +11,8 @@ package org.eclipse.osee.framework.ui.skynet.search;
import java.util.Collection;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/IdArtifactSearch.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/IdArtifactSearch.java index 6528764f52b..960eefbcde0 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/IdArtifactSearch.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/IdArtifactSearch.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/InRelationFilter.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/InRelationFilter.java index b4178f47c4b..1a9b486feb8 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/InRelationFilter.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/InRelationFilter.java @@ -13,11 +13,11 @@ package org.eclipse.osee.framework.ui.skynet.search; import java.util.logging.Level; import org.eclipse.jface.viewers.ComboViewer; import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.model.RelationType; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.search.ISearchPrimitive; import org.eclipse.osee.framework.skynet.core.artifact.search.InRelationSearch; import org.eclipse.osee.framework.skynet.core.artifact.search.NotSearch; -import org.eclipse.osee.framework.skynet.core.relation.RelationType; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.search.filter.FilterTableViewer; import org.eclipse.swt.widgets.Control; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/OrphanSearchFilter.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/OrphanSearchFilter.java index f905653b3d3..6c2da3ed3df 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/OrphanSearchFilter.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/OrphanSearchFilter.java @@ -12,9 +12,9 @@ package org.eclipse.osee.framework.ui.skynet.search; import org.eclipse.jface.viewers.ListViewer; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.ArtifactType; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ISearchPrimitive; import org.eclipse.osee.framework.skynet.core.artifact.search.NotSearch; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java index 2d6cf6401e4..459f4b151f7 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java @@ -24,9 +24,9 @@ import java.util.logging.Level; import org.apache.commons.lang.StringUtils;
import org.eclipse.jface.window.Window;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.ImageManager;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java index 593567be93b..2f63198aeda 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java @@ -15,7 +15,7 @@ import java.net.URLDecoder; import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.ui.skynet.OseeContributionItem;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.ats.IActionable;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/RemoteArtifactSearch.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/RemoteArtifactSearch.java index 0e3fbc4d9a1..9b7cadaddbc 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/RemoteArtifactSearch.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/RemoteArtifactSearch.java @@ -17,8 +17,8 @@ import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchPage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchPage.java index 9e3402a0bd1..279320e4a40 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchPage.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchPage.java @@ -34,8 +34,8 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java index 4fcd5cb8b99..b91889a6b9e 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java @@ -19,9 +19,9 @@ import java.util.Set; import java.util.logging.Level; import org.eclipse.jface.viewers.Viewer; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.RelationType; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.relation.RelationType; import org.eclipse.osee.framework.skynet.core.types.IArtifact; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.skywalker.RelTypeContentProvider.RelationLinkDescriptorSide; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/RelTypeContentProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/RelTypeContentProvider.java index 4c1e4bfc92b..df7cab6e6d2 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/RelTypeContentProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/RelTypeContentProvider.java @@ -17,9 +17,9 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist; +import org.eclipse.osee.framework.core.model.RelationType; import org.eclipse.osee.framework.skynet.core.relation.IRelationEnumeration; import org.eclipse.osee.framework.skynet.core.relation.RelationLink; -import org.eclipse.osee.framework.skynet.core.relation.RelationType; /** * @author Donald G. Dunne diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerArtTypeTabItem.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerArtTypeTabItem.java index 9cb88799b63..ca59fe4e889 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerArtTypeTabItem.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerArtTypeTabItem.java @@ -19,7 +19,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
+import org.eclipse.osee.framework.core.model.ArtifactType;
import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider;
import org.eclipse.osee.framework.ui.skynet.ImageManager;
import org.eclipse.osee.framework.ui.skynet.skywalker.ISkyWalkerOptionsChangeListener.ModType;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java index 9228496a6a0..ededc89a125 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java @@ -19,18 +19,18 @@ import java.util.Map; import java.util.Set; import java.util.Map.Entry; import java.util.logging.Level; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.ArtifactType; +import org.eclipse.osee.framework.core.model.AttributeType; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.model.RelationType; import org.eclipse.osee.framework.jdk.core.util.AXml; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; -import org.eclipse.osee.framework.skynet.core.relation.RelationType; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.skywalker.ISkyWalkerOptionsChangeListener.ModType; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandler.java index 9b7fc2dd3c5..52c717dfd1f 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandler.java @@ -16,11 +16,12 @@ import java.util.LinkedList; import java.util.List;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.window.Window;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -28,7 +29,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactLoad; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactLoader;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration;
-import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderBaseTypes;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.swt.widgets.Display;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactTypeLabelProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactTypeLabelProvider.java index f56c8ea101e..c01d684d65e 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactTypeLabelProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactTypeLabelProvider.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.util; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; +import org.eclipse.osee.framework.core.model.ArtifactType; import org.eclipse.osee.framework.ui.skynet.ImageManager; import org.eclipse.swt.graphics.Image; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactTypeNameSorter.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactTypeNameSorter.java index 2f8d19f4e07..df4f76d9b6b 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactTypeNameSorter.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactTypeNameSorter.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.util; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; +import org.eclipse.osee.framework.core.model.ArtifactType; /** * Default sorter for artifacts. Sorts on descriptive name diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/AttributeCheckListDialog.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/AttributeCheckListDialog.java index 962191043cf..44ade62699a 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/AttributeCheckListDialog.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/AttributeCheckListDialog.java @@ -21,12 +21,12 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ArtifactTreeContentProvider;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ShowAttributeAction.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ShowAttributeAction.java index 1084f8449f8..8e0a106284f 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ShowAttributeAction.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ShowAttributeAction.java @@ -15,10 +15,10 @@ import java.util.logging.Level; import org.eclipse.jface.action.Action;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.ImageManager;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java index 5e1f12ac564..b813011534d 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java @@ -15,13 +15,13 @@ import java.util.LinkedList; import java.util.List;
import java.util.logging.Level;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.OseeInfo;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.swt.widgets.Display;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/TransactionIdLabelProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/TransactionIdLabelProvider.java index a823bb10042..d9666db12f3 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/TransactionIdLabelProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/TransactionIdLabelProvider.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.ui.skynet.util;
import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
/**
* @author Donald G. Dunne
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/backup/BackupBranchesJob.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/backup/BackupBranchesJob.java index 81099d8938c..16361d2dffb 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/backup/BackupBranchesJob.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/backup/BackupBranchesJob.java @@ -16,7 +16,7 @@ import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.jdk.core.util.io.Zip;
import org.eclipse.osee.framework.logging.OseeLog;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/ArtifactTypeContentProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/ArtifactTypeContentProvider.java index 32e5217ce5f..a2fbd06b5b3 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/ArtifactTypeContentProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/ArtifactTypeContentProvider.java @@ -13,8 +13,8 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import java.util.logging.Level; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/AttributeContentProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/AttributeContentProvider.java index 9b6ff7dbc4c..1fd1ad95c57 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/AttributeContentProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/AttributeContentProvider.java @@ -14,9 +14,9 @@ import java.util.ArrayList; import java.util.logging.Level; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.AttributeType; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/DefaultBranchContentProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/DefaultBranchContentProvider.java index 1b4fdf3aa06..ea4bc03eb83 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/DefaultBranchContentProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/DefaultBranchContentProvider.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.event.BranchEventType;
import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/IBranchArtifact.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/IBranchArtifact.java index 46773908f88..a3589cc1f7c 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/IBranchArtifact.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/IBranchArtifact.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.widgets; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; /** diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/RelationTypeContentProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/RelationTypeContentProvider.java index 8594488628b..879cedb904d 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/RelationTypeContentProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/RelationTypeContentProvider.java @@ -14,10 +14,10 @@ import java.util.ArrayList; import java.util.logging.Level; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.model.RelationType; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.skynet.core.relation.RelationType; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeListViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeListViewer.java index 140067c1aec..1e61c85b350 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeListViewer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeListViewer.java @@ -11,9 +11,9 @@ package org.eclipse.osee.framework.ui.skynet.widgets;
import java.util.ArrayList;
+import org.eclipse.osee.framework.core.model.ArtifactType;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeListViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeListViewer.java index a041658e5d5..bf7e16c5582 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeListViewer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeListViewer.java @@ -11,9 +11,9 @@ package org.eclipse.osee.framework.ui.skynet.widgets;
import java.util.ArrayList;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java index 8eb97365bcb..e334b55b56d 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.panels.BranchSelectSimpleComposite;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java index 80ac4d4a8d2..e843a00df03 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectComposite;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFlatDam.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFlatDam.java index 94f262c77c3..063c0e4a813 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFlatDam.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFlatDam.java @@ -22,13 +22,13 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.attribute.CompressedContentAttribute;
import org.eclipse.osee.framework.skynet.core.attribute.DateAttribute;
@@ -201,15 +201,15 @@ public class XFlatDam extends XFlatWidget<String> implements IArtifactWidget { private XWidget getWidget(String attributeType, Composite parent, String initialInput) {
XWidget xWidget = null;
- AttributeType type = null;
+ Class<?> type = null;
try {
- type = AttributeTypeManager.getType(attributeType);
+ type = AttributeTypeManager.getAttributeBaseClass(attributeType);
} catch (OseeCoreException ex) {
OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
if (type != null) {
- if (type.getBaseAttributeClass().equals(IntegerAttribute.class)) {
+ if (type.equals(IntegerAttribute.class)) {
XInteger xInteger = new XInteger("");
xInteger.setFillHorizontally(true);
xInteger.createWidgets(getManagedForm(), parent, 2);
@@ -217,7 +217,7 @@ public class XFlatDam extends XFlatWidget<String> implements IArtifactWidget { xInteger.setText(initialInput);
}
xWidget = xInteger;
- } else if (type.getBaseAttributeClass().equals(DateAttribute.class)) {
+ } else if (type.equals(DateAttribute.class)) {
XDate xDate = new XDate("");
xDate.setFillHorizontally(true);
xDate.createWidgets(getManagedForm(), parent, 2);
@@ -225,7 +225,7 @@ public class XFlatDam extends XFlatWidget<String> implements IArtifactWidget { xDate.setDate(toDate(initialInput));
}
xWidget = xDate;
- } else if (type.getBaseAttributeClass().equals(FloatingPointAttribute.class)) {
+ } else if (type.equals(FloatingPointAttribute.class)) {
XFloat xFloat = new XFloat("");
xFloat.setFillHorizontally(true);
xFloat.createWidgets(getManagedForm(), parent, 2);
@@ -233,8 +233,7 @@ public class XFlatDam extends XFlatWidget<String> implements IArtifactWidget { xFloat.setText(initialInput);
}
xWidget = xFloat;
- } else if (type.getBaseAttributeClass().equals(CompressedContentAttribute.class) || type.getBaseAttributeClass().equals(
- JavaObjectAttribute.class)) {
+ } else if (type.equals(CompressedContentAttribute.class) || type.equals(JavaObjectAttribute.class)) {
XLabel xLabel = new XLabel("");
xLabel.setFillHorizontally(true);
xLabel.createWidgets(getManagedForm(), parent, 2);
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceBranch.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceBranch.java index 1c0e9097f06..1ef023079ae 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceBranch.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceBranch.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.widgets;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.ui.skynet.branch.BranchCheckTreeDialog;
import org.eclipse.osee.framework.ui.skynet.util.filteredTree.MinMaxOSEECheckedFilteredTreeDialog;
import org.eclipse.swt.SWT;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceDam.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceDam.java index 9bd0d502ed5..76f386c3e9b 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceDam.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromMultiChoiceDam.java @@ -15,9 +15,9 @@ import java.util.List; import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.validation.IOseeValidator;
import org.eclipse.osee.framework.skynet.core.validation.OseeValidator;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java index 0bc3d40bfd1..b31c6e32280 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java @@ -22,13 +22,13 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.attribute.CompressedContentAttribute;
import org.eclipse.osee.framework.skynet.core.attribute.DateAttribute;
@@ -209,15 +209,15 @@ public class XStackedDam extends XStackedWidget<String> implements IArtifactWidg private XWidget getWidget(String attributeType, Composite parent, String initialInput) {
XWidget xWidget = null;
- AttributeType type = null;
+ Class<?> type = null;
try {
- type = AttributeTypeManager.getType(attributeType);
+ type = AttributeTypeManager.getAttributeBaseClass(attributeType);
} catch (OseeCoreException ex) {
OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
if (type != null) {
- if (type.getBaseAttributeClass().equals(IntegerAttribute.class)) {
+ if (type.equals(IntegerAttribute.class)) {
XInteger xInteger = new XInteger("");
xInteger.setFillHorizontally(true);
xInteger.createWidgets(getManagedForm(), parent, 2);
@@ -225,7 +225,7 @@ public class XStackedDam extends XStackedWidget<String> implements IArtifactWidg xInteger.setText(initialInput);
}
xWidget = xInteger;
- } else if (type.getBaseAttributeClass().equals(DateAttribute.class)) {
+ } else if (type.equals(DateAttribute.class)) {
XDate xDate = new XDate("");
xDate.setFillHorizontally(true);
xDate.createWidgets(getManagedForm(), parent, 2);
@@ -233,7 +233,7 @@ public class XStackedDam extends XStackedWidget<String> implements IArtifactWidg xDate.setDate(toDate(initialInput));
}
xWidget = xDate;
- } else if (type.getBaseAttributeClass().equals(FloatingPointAttribute.class)) {
+ } else if (type.equals(FloatingPointAttribute.class)) {
XFloat xFloat = new XFloat("");
xFloat.setFillHorizontally(true);
xFloat.createWidgets(getManagedForm(), parent, 2);
@@ -241,8 +241,7 @@ public class XStackedDam extends XStackedWidget<String> implements IArtifactWidg xFloat.setText(initialInput);
}
xWidget = xFloat;
- } else if (type.getBaseAttributeClass().equals(CompressedContentAttribute.class) || type.getBaseAttributeClass().equals(
- JavaObjectAttribute.class)) {
+ } else if (type.equals(CompressedContentAttribute.class) || type.equals(JavaObjectAttribute.class)) {
XLabel xLabel = new XLabel("");
xLabel.setFillHorizontally(true);
xLabel.createWidgets(getManagedForm(), parent, 2);
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java index 4e50c249ecb..257767c9835 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java @@ -12,8 +12,8 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTypeFilteredTreeDialog.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTypeFilteredTreeDialog.java index cbab6fb1dbc..39f146079c1 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTypeFilteredTreeDialog.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTypeFilteredTreeDialog.java @@ -15,9 +15,9 @@ import java.util.Collection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.osee.framework.core.model.ArtifactType; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/AttributeTypeCheckTreeDialog.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/AttributeTypeCheckTreeDialog.java index 0b014fd80fe..c9357af68e8 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/AttributeTypeCheckTreeDialog.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/AttributeTypeCheckTreeDialog.java @@ -15,7 +15,7 @@ import java.util.Collection; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; +import org.eclipse.osee.framework.core.model.AttributeType; import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/AttributeTypeLabelProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/AttributeTypeLabelProvider.java index 78bb201c467..f15c19e0aff 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/AttributeTypeLabelProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/AttributeTypeLabelProvider.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets.dialog; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; +import org.eclipse.osee.framework.core.model.AttributeType; import org.eclipse.swt.graphics.Image; /** diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialogWithBranchSelect.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialogWithBranchSelect.java index 07989669cd6..48ae94747c9 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialogWithBranchSelect.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialogWithBranchSelect.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.ui.plugin.util.IShellCloseEvent;
import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectComposite;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/AttributeXWidgetManager.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/AttributeXWidgetManager.java index d1b98ce91e6..3c0e601bdc0 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/AttributeXWidgetManager.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/AttributeXWidgetManager.java @@ -11,8 +11,8 @@ package org.eclipse.osee.framework.ui.skynet.widgets.workflow;
import java.util.List;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.plugin.core.util.ExtensionDefinedObjects;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
/**
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DefaultAttributeXWidgetProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DefaultAttributeXWidgetProvider.java index 9f6edfb7cf9..9d6962525af 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DefaultAttributeXWidgetProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DefaultAttributeXWidgetProvider.java @@ -13,8 +13,9 @@ package org.eclipse.osee.framework.ui.skynet.widgets.workflow; import java.util.ArrayList;
import java.util.List;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.jdk.core.util.Collections;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.attribute.BooleanAttribute;
import org.eclipse.osee.framework.skynet.core.attribute.CompressedContentAttribute;
@@ -54,52 +55,71 @@ public class DefaultAttributeXWidgetProvider implements IAttributeXWidgetProvide DynamicXWidgetLayoutData defaultData = createDynamicXWidgetLayout(attributeType);
xWidgetLayoutData.add(defaultData);
- if (attributeType.getBaseAttributeClass().equals(EnumeratedAttribute.class)) {
- if (maxOccurrence == 1) {
- defaultData.setXWidgetName("XComboDam(" + Collections.toString(",",
- AttributeTypeManager.getEnumerationValues(attributeType)) + ")");
- } else {
- defaultData.setXWidgetName("XSelectFromMultiChoiceDam(" + Collections.toString(",",
- AttributeTypeManager.getEnumerationValues(attributeType)) + ")");
- }
- } else if (attributeType.getBaseAttributeClass().equals(BooleanAttribute.class)) {
- if (minOccurrence == 1) {
- defaultData.setXWidgetName("XCheckBoxDam");
+ Throwable th = null;
+ Class<?> baseType = null;
+ try {
+ baseType = AttributeTypeManager.getAttributeBaseClass(attributeType);
+ } catch (OseeCoreException ex) {
+ th = ex;
+ }
+ if (baseType != null) {
+ if (baseType.equals(EnumeratedAttribute.class)) {
+ if (maxOccurrence == 1) {
+ defaultData.setXWidgetName("XComboDam(" + Collections.toString(",",
+ AttributeTypeManager.getEnumerationValues(attributeType)) + ")");
+ } else {
+ defaultData.setXWidgetName("XSelectFromMultiChoiceDam(" + Collections.toString(",",
+ AttributeTypeManager.getEnumerationValues(attributeType)) + ")");
+ }
+ } else if (baseType.equals(BooleanAttribute.class)) {
+ if (minOccurrence == 1) {
+ defaultData.setXWidgetName("XCheckBoxDam");
+ } else {
+ defaultData.setXWidgetName("XComboBooleanDam");
+ }
+ } else if (baseType.equals(WordAttribute.class) || CoreAttributes.RELATION_ORDER.getGuid().equals(
+ attributeType.getGuid())) {
+ defaultData.setXWidgetName("XStackedDam");
+ defaultData.getXOptionHandler().add(XOption.NOT_EDITABLE);
} else {
- defaultData.setXWidgetName("XComboBooleanDam");
+ String xWidgetName = "";
+ if (maxOccurrence == 1) {
+ xWidgetName = getXWidgetName(baseType);
+ } else {
+ xWidgetName = "XStackedDam";
+ }
+ defaultData.setXWidgetName(xWidgetName);
}
- } else if (attributeType.getBaseAttributeClass().equals(WordAttribute.class) || CoreAttributes.RELATION_ORDER.getGuid().equals(
- attributeType.getGuid())) {
- defaultData.setXWidgetName("XStackedDam");
- defaultData.getXOptionHandler().add(XOption.NOT_EDITABLE);
} else {
- String xWidgetName = "";
- if (maxOccurrence == 1) {
- xWidgetName = getXWidgetName(attributeType);
- } else {
- xWidgetName = "XStackedDam";
+ defaultData.setXWidgetName("XTextDam");
+ StringBuilder builder = new StringBuilder();
+ builder.append("Unable to determine base type for attribute type");
+ builder.append(String.format("[%]", attributeType.getName()));
+ if (th != null) {
+ builder.append(org.eclipse.osee.framework.jdk.core.util.Lib.exceptionToString(th));
}
- defaultData.setXWidgetName(xWidgetName);
+ defaultData.setDefaultValue(builder.toString());
}
defaultData.getXOptionHandler().add(XOption.FILL_HORIZONTALLY);
defaultData.getXOptionHandler().add(XOption.NO_DEFAULT_VALUE);
+
return xWidgetLayoutData;
}
- private String getXWidgetName(AttributeType attributeType) {
+ private String getXWidgetName(Class<?> baseType) {
String toReturn = "";
- if (attributeType.getBaseAttributeClass().equals(DateAttribute.class)) {
+ if (baseType.equals(DateAttribute.class)) {
toReturn = "XDateDam";
- } else if (attributeType.getBaseAttributeClass().equals(IntegerAttribute.class)) {
+ } else if (baseType.equals(IntegerAttribute.class)) {
toReturn = "XIntegerDam";
- } else if (attributeType.getBaseAttributeClass().equals(FloatingPointAttribute.class)) {
+ } else if (baseType.equals(FloatingPointAttribute.class)) {
toReturn = "XFloatDam";
- } else if (attributeType.getBaseAttributeClass().equals(CompressedContentAttribute.class) || attributeType.getBaseAttributeClass().equals(
- JavaObjectAttribute.class)) {
+ } else if (baseType.equals(CompressedContentAttribute.class) || baseType.equals(JavaObjectAttribute.class)) {
toReturn = "XLabelDam";
} else {
toReturn = "XTextDam";
}
return toReturn;
}
+
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/IAttributeXWidgetProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/IAttributeXWidgetProvider.java index 635fe71bc06..59e070fbb29 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/IAttributeXWidgetProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/IAttributeXWidgetProvider.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets.workflow;
import java.util.List;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
+import org.eclipse.osee.framework.core.model.AttributeType;
/**
* @author Donald G. Dunne
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java index 9d411965e59..e6b0f32db78 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java @@ -19,8 +19,8 @@ import org.eclipse.jface.action.Separator; import org.eclipse.nebula.widgets.xviewer.action.TableCustomizationAction;
import org.eclipse.nebula.widgets.xviewer.action.ViewSelectedCellDataAction;
import org.eclipse.nebula.widgets.xviewer.action.ViewTableReportAction;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.event.BranchEventType;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewImageHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewImageHandler.java index 05b563df185..9d2a422bdd0 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewImageHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewImageHandler.java @@ -12,9 +12,9 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xBranch; import java.util.List; import java.util.logging.Level; -import org.eclipse.osee.framework.core.data.Branch; -import org.eclipse.osee.framework.core.data.TransactionRecord; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java index a920953e9dd..4aece634c67 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java @@ -17,7 +17,7 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator;
import org.eclipse.nebula.widgets.xviewer.XViewer;
import org.eclipse.nebula.widgets.xviewer.XViewerTextFilter;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.ui.skynet.ArtifactExplorer;
import org.eclipse.swt.widgets.Composite;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/FavoriteSorter.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/FavoriteSorter.java index 2c9461ece3b..04233e48027 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/FavoriteSorter.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/FavoriteSorter.java @@ -14,8 +14,8 @@ import java.util.logging.Level; import org.eclipse.jface.viewers.Viewer; import org.eclipse.nebula.widgets.xviewer.XViewer; import org.eclipse.nebula.widgets.xviewer.XViewerSorter; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java index 089c799a7d7..2bf6b5881ad 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java @@ -19,12 +19,12 @@ import java.util.List; import java.util.logging.Level; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.osee.framework.core.data.Branch; -import org.eclipse.osee.framework.core.data.TransactionRecord; import org.eclipse.osee.framework.core.enums.BranchArchivedState; import org.eclipse.osee.framework.core.enums.BranchControlled; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.access.AccessControlManager; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java index c35aa826443..52abf7c3930 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java @@ -19,9 +19,9 @@ import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.nebula.widgets.xviewer.XViewerCells; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.XViewerLabelProvider; -import org.eclipse.osee.framework.core.data.Branch; -import org.eclipse.osee.framework.core.data.TransactionRecord; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -80,7 +80,7 @@ public class XBranchLabelProvider extends XViewerLabelProvider { if (columnIndex == 0) { columnText = String.valueOf(headTransaction.getId() + "..." + tailTransaction.getId()); } else if (columnIndex == 1) { - columnText = DATE_FORMAT.format(headTransaction.getDate()); + columnText = DATE_FORMAT.format(headTransaction.getTimeStamp()); } } else { columnText = @@ -96,7 +96,7 @@ public class XBranchLabelProvider extends XViewerLabelProvider { return branch.getArchiveState().toString(); } else if (cCol.equals(BranchXViewerFactory.timeStamp)) { try { - return DATE_FORMAT.format(branch.getBaseTransaction().getDate()); + return DATE_FORMAT.format(branch.getBaseTransaction().getTimeStamp()); } catch (OseeCoreException ex) { return XViewerCells.getCellExceptionString(ex); } @@ -145,7 +145,7 @@ public class XBranchLabelProvider extends XViewerLabelProvider { columnText = String.valueOf(transaction.getId()); } if (cCol.equals(BranchXViewerFactory.timeStamp)) { - columnText = DATE_FORMAT.format(transaction.getDate()); + columnText = DATE_FORMAT.format(transaction.getTimeStamp()); } else if (cCol.equals(BranchXViewerFactory.author)) { columnText = UserManager.getUserNameById(transaction.getAuthor()); } else if (cCol.equals(BranchXViewerFactory.comment)) { diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchTextFilter.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchTextFilter.java index 4217861f4dc..75f3715e929 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchTextFilter.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchTextFilter.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.nebula.widgets.xviewer.XViewer;
import org.eclipse.nebula.widgets.xviewer.XViewerTextFilter;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
/**
* @author Donald G. Dunne
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java index 8e4218089aa..d8ddb990de9 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java @@ -21,8 +21,8 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryLabelProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryLabelProvider.java index 169e0803844..543b12c3e75 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryLabelProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryLabelProvider.java @@ -59,7 +59,7 @@ public class XHistoryLabelProvider extends XViewerLabelProvider { } else if (cCol.equals(HistoryXViewerFactory.is)) { return data.getIsValue(); } else if (cCol.equals(HistoryXViewerFactory.timeStamp)) { - return new SimpleDateFormat("MM/dd/yyyy hh:mm a").format(data.getToTransactionId().getDate()); + return new SimpleDateFormat("MM/dd/yyyy hh:mm a").format(data.getToTransactionId().getTimeStamp()); } else if (cCol.equals(HistoryXViewerFactory.author)) { return UserManager.getUserNameById(data.getToTransactionId().getAuthor()); } else if (cCol.equals(HistoryXViewerFactory.comment)) { diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java index 9c642917d7b..702980be7ab 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java @@ -22,8 +22,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeView.java index 9fa17252c10..322764bc773 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeView.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeView.java @@ -21,9 +21,9 @@ import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java index 7eb0f92580a..99b096b00be 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java @@ -19,8 +19,8 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.nebula.widgets.xviewer.XViewer;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.UserManager;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeWidget.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeWidget.java index 6078f5c1c40..c8603d575a7 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeWidget.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeWidget.java @@ -22,10 +22,10 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java index e39a08cec1a..cccd91ac010 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java @@ -25,11 +25,11 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.ConflictType;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.jdk.core.text.change.ChangeSet;
import org.eclipse.osee.framework.jdk.core.util.AFile;
import org.eclipse.osee.framework.logging.OseeLevel;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java index 3aa6c711242..0abdfd9f661 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java @@ -27,10 +27,10 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osee.framework.core.data.Branch;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeViewer.java index 6b5b057f9c1..fa47f1f355f 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeViewer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeViewer.java @@ -30,10 +30,10 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.SystemUser;
-import org.eclipse.osee.framework.core.data.TransactionRecord;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/AttributeSortDataType.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/AttributeSortDataType.java index 9f98ec54023..65f3c0a4eab 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/AttributeSortDataType.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/AttributeSortDataType.java @@ -11,7 +11,9 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.attribute.BooleanAttribute;
import org.eclipse.osee.framework.skynet.core.attribute.DateAttribute;
import org.eclipse.osee.framework.skynet.core.attribute.FloatingPointAttribute;
@@ -22,15 +24,18 @@ import org.eclipse.osee.framework.skynet.core.attribute.IntegerAttribute; */
public class AttributeSortDataType {
- public static SortDataType getSortDataType(AttributeType attributeType) {
+ public static SortDataType getSortDataType(AttributeType attributeType) throws OseeCoreException {
SortDataType sortType = SortDataType.String;
- if (attributeType.getBaseAttributeClass().equals(DateAttribute.class))
+ Class<?> baseType = AttributeTypeManager.getAttributeBaseClass(attributeType);
+ if (baseType.equals(DateAttribute.class)) {
sortType = SortDataType.Date;
- else if (attributeType.getBaseAttributeClass().equals(FloatingPointAttribute.class))
+ } else if (baseType.equals(FloatingPointAttribute.class)) {
sortType = SortDataType.Float;
- else if (attributeType.getBaseAttributeClass().equals(IntegerAttribute.class))
+ } else if (baseType.equals(IntegerAttribute.class)) {
sortType = SortDataType.Integer;
- else if (attributeType.getBaseAttributeClass().equals(BooleanAttribute.class)) sortType = SortDataType.Boolean;
+ } else if (baseType.equals(BooleanAttribute.class)) {
+ sortType = SortDataType.Boolean;
+ }
return sortType;
}
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java index 14c76d84943..31ffacef349 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java @@ -23,10 +23,10 @@ import org.eclipse.nebula.widgets.xviewer.XViewerTreeReport; import org.eclipse.nebula.widgets.xviewer.customize.IXViewerCustomizations;
import org.eclipse.nebula.widgets.xviewer.customize.XViewerCustomizations;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.OseeXViewerTreeReport;
@@ -91,7 +91,7 @@ public class SkynetXViewerFactory extends XViewerFactory { return columns;
}
- public static XViewerColumn getAttributeColumn(AttributeType attributeType) {
+ public static XViewerColumn getAttributeColumn(AttributeType attributeType) throws OseeCoreException {
return new XViewerAttributeColumn("attribute." + attributeType.getName(), attributeType.getName(),
attributeType.getName(), 75, SWT.LEFT, false, XViewerAttributeSortDataType.get(attributeType), false, null);
}
@@ -99,8 +99,9 @@ public class SkynetXViewerFactory extends XViewerFactory { /**
* @param artifacts
* @return columns for attributes valid for at least on of the given artifacts
+ * @throws OseeCoreException
*/
- public static List<XViewerColumn> getAllAttributeColumnsForArtifacts(Collection<? extends Artifact> artifacts) {
+ public static List<XViewerColumn> getAllAttributeColumnsForArtifacts(Collection<? extends Artifact> artifacts) throws OseeCoreException {
List<XViewerColumn> columns = new ArrayList<XViewerColumn>();
Set<AttributeType> attributeTypes = new HashSet<AttributeType>();
try {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/XViewerAttributeSortDataType.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/XViewerAttributeSortDataType.java index 520ee44822a..a75b174b3fd 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/XViewerAttributeSortDataType.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/XViewerAttributeSortDataType.java @@ -11,7 +11,9 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
+import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.attribute.BooleanAttribute;
import org.eclipse.osee.framework.skynet.core.attribute.DateAttribute;
import org.eclipse.osee.framework.skynet.core.attribute.FloatingPointAttribute;
@@ -22,15 +24,18 @@ import org.eclipse.osee.framework.skynet.core.attribute.IntegerAttribute; */
public class XViewerAttributeSortDataType {
- public static SortDataType get(AttributeType attributeType) {
+ public static SortDataType get(AttributeType attributeType) throws OseeCoreException {
SortDataType sortType = SortDataType.String;
- if (attributeType.getBaseAttributeClass().equals(DateAttribute.class))
+ Class<?> clazz = AttributeTypeManager.getAttributeBaseClass(attributeType);
+ if (clazz.equals(DateAttribute.class)) {
sortType = SortDataType.Date;
- else if (attributeType.getBaseAttributeClass().equals(FloatingPointAttribute.class))
+ } else if (clazz.equals(FloatingPointAttribute.class)) {
sortType = SortDataType.Float;
- else if (attributeType.getBaseAttributeClass().equals(IntegerAttribute.class))
+ } else if (clazz.equals(IntegerAttribute.class)) {
sortType = SortDataType.Integer;
- else if (attributeType.getBaseAttributeClass().equals(BooleanAttribute.class)) sortType = SortDataType.Boolean;
+ } else if (clazz.equals(BooleanAttribute.class)) {
+ sortType = SortDataType.Boolean;
+ }
return sortType;
}
}
diff --git a/org.eclipse.osee.ote.define/META-INF/MANIFEST.MF b/org.eclipse.osee.ote.define/META-INF/MANIFEST.MF index 69e926bbdf5..0b0e4265839 100644 --- a/org.eclipse.osee.ote.define/META-INF/MANIFEST.MF +++ b/org.eclipse.osee.ote.define/META-INF/MANIFEST.MF @@ -28,4 +28,5 @@ Import-Package: org.apache.commons.lang, org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.exception,
+ org.eclipse.osee.framework.core.model,
org.eclipse.osee.framework.logging
diff --git a/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OTE_SKYNET_RELATIONS.java b/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OTE_SKYNET_RELATIONS.java index da25ba0341e..8c546a48f79 100644 --- a/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OTE_SKYNET_RELATIONS.java +++ b/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OTE_SKYNET_RELATIONS.java @@ -12,9 +12,9 @@ package org.eclipse.osee.ote.define.AUTOGEN; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.RelationType; import org.eclipse.osee.framework.skynet.core.relation.IRelationEnumeration; import org.eclipse.osee.framework.skynet.core.relation.RelationLink; -import org.eclipse.osee.framework.skynet.core.relation.RelationType; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager; public enum OTE_SKYNET_RELATIONS implements IRelationEnumeration { diff --git a/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/artifacts/OteArtifactFetcher.java b/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/artifacts/OteArtifactFetcher.java index d2b980ffe88..faa391f52d1 100644 --- a/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/artifacts/OteArtifactFetcher.java +++ b/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/artifacts/OteArtifactFetcher.java @@ -16,11 +16,11 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.logging.Level; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; diff --git a/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/artifacts/TestRunOperator.java b/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/artifacts/TestRunOperator.java index 66a27b8cba0..9ad5eec4def 100644 --- a/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/artifacts/TestRunOperator.java +++ b/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/artifacts/TestRunOperator.java @@ -15,11 +15,11 @@ import java.io.InputStream; import java.net.URI; import java.util.Date; import java.util.List; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.AttributeDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeWrappedException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/jobs/OutfileToArtifactJob.java b/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/jobs/OutfileToArtifactJob.java index f992a7cba96..a749f0c3b7e 100644 --- a/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/jobs/OutfileToArtifactJob.java +++ b/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/jobs/OutfileToArtifactJob.java @@ -15,7 +15,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.ote.define.OteDefinePlugin;
import org.eclipse.osee.ote.define.operations.LinkTestRunToTestScriptOperation;
diff --git a/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/operations/ImportOutfileOperation.java b/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/operations/ImportOutfileOperation.java index 7bc570f5791..105b620b0a7 100644 --- a/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/operations/ImportOutfileOperation.java +++ b/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/operations/ImportOutfileOperation.java @@ -20,10 +20,10 @@ import java.util.Map; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
import org.eclipse.osee.ote.define.artifacts.TestRunOperator;
diff --git a/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/operations/OutfileToArtifactOperation.java b/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/operations/OutfileToArtifactOperation.java index e4632082245..b2a174fd91b 100644 --- a/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/operations/OutfileToArtifactOperation.java +++ b/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/operations/OutfileToArtifactOperation.java @@ -16,7 +16,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.util.ChecksumUtil; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF b/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF index 902a2bb036b..6a801c8d24b 100644 --- a/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF +++ b/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF @@ -43,6 +43,7 @@ Import-Package: com.lowagie.text, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.exception, + org.eclipse.osee.framework.core.model, org.eclipse.osee.framework.core.util, org.eclipse.osee.framework.logging, org.eclipse.ui.forms.widgets diff --git a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java index 0094ef75e84..9ccf826c7df 100644 --- a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java +++ b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java @@ -19,8 +19,8 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.window.Window; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.ImageManager; import org.eclipse.osee.framework.ui.skynet.panels.BranchSelectSimpleComposite; diff --git a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/ImportOutfileUIOperation.java b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/ImportOutfileUIOperation.java index ca3acfd7e48..058c0c6e799 100644 --- a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/ImportOutfileUIOperation.java +++ b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/ImportOutfileUIOperation.java @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.ote.define.jobs.FindCommitableJob;
import org.eclipse.osee.ote.define.jobs.OutfileToArtifactJob;
diff --git a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java index 08ee78fc12f..95985417750 100644 --- a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java +++ b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java @@ -32,8 +32,8 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.ui.skynet.widgets.XBranchSelectWidget;
diff --git a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/jobs/CommitTestRunJob.java b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/jobs/CommitTestRunJob.java index a637ec9d17b..9b2ee25caaa 100644 --- a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/jobs/CommitTestRunJob.java +++ b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/jobs/CommitTestRunJob.java @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.ote.define.artifacts.TestRunOperator; diff --git a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/GrayableBranchSelectionComposite.java b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/GrayableBranchSelectionComposite.java index 89f3c42c8cc..b03eaa03ba3 100644 --- a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/GrayableBranchSelectionComposite.java +++ b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/GrayableBranchSelectionComposite.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ote.ui.define.panels; import org.eclipse.osee.framework.core.client.ClientSessionManager; -import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.event.AccessControlEventType; import org.eclipse.osee.framework.skynet.core.event.IAccessControlEventListener; import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; diff --git a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/test/manager/TestRunArtifactOptions.java b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/test/manager/TestRunArtifactOptions.java index a5dae5897a6..719048dd78f 100644 --- a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/test/manager/TestRunArtifactOptions.java +++ b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/test/manager/TestRunArtifactOptions.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ote.ui.define.test.manager;
-import org.eclipse.osee.framework.core.data.Branch; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.IPropertyStore;
import org.eclipse.osee.ote.define.TestRunStorageKey;
import org.eclipse.osee.ote.ui.define.panels.GrayableBranchSelectionComposite;
diff --git a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/DragDropHandler.java b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/DragDropHandler.java index 6db9d7092b1..dcf7691db60 100644 --- a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/DragDropHandler.java +++ b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/DragDropHandler.java @@ -27,10 +27,10 @@ import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData;
diff --git a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewer.java b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewer.java index 4a57448865f..281af246264 100644 --- a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewer.java +++ b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewer.java @@ -27,10 +27,10 @@ import org.eclipse.nebula.widgets.xviewer.XViewer; import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.ArtifactType;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.ui.skynet.ImageManager;
diff --git a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/XViewerDataManager.java b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/XViewerDataManager.java index a839bfb8a66..9312e72cfe0 100644 --- a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/XViewerDataManager.java +++ b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/XViewerDataManager.java @@ -19,9 +19,9 @@ import java.util.List; import java.util.Map;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.nebula.widgets.xviewer.XViewer;
-import org.eclipse.osee.framework.core.data.Branch; import org.eclipse.osee.framework.core.exception.AttributeDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassXViewerFactory;
import org.eclipse.osee.ote.define.artifacts.TestRunOperator;
diff --git a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/ArtifactItem.java b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/ArtifactItem.java index 27e7a726bd2..eb42aaa3313 100644 --- a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/ArtifactItem.java +++ b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/ArtifactItem.java @@ -18,10 +18,10 @@ import org.eclipse.nebula.widgets.xviewer.XViewer; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AttributeType;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.attribute.DateAttribute;
import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
@@ -136,7 +136,7 @@ public class ArtifactItem extends DataItem implements IXViewerItem, IFrameworkTr } else {
if (artifact.isAttributeTypeValid(colName)) {
AttributeType attributeType = AttributeTypeManager.getType(colName);
- if (attributeType.getBaseAttributeClass().equals(DateAttribute.class)) {
+ if (AttributeTypeManager.getAttributeBaseClass(attributeType).equals(DateAttribute.class)) {
Date date = null;
try {
date = artifact.getSoleAttributeValue(colName);
diff --git a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/BranchItem.java b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/BranchItem.java index 163ed2957d6..8a540b13baf 100644 --- a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/BranchItem.java +++ b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/BranchItem.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ote.ui.define.viewers.data; import java.util.ArrayList;
import java.util.List;
-import org.eclipse.osee.framework.core.data.Branch;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.ui.skynet.ImageManager;
import org.eclipse.osee.ote.ui.define.OteDefineImage;
import org.eclipse.swt.graphics.Image;
diff --git a/org.eclipse.osee.ote.ui.host.cmd/META-INF/MANIFEST.MF b/org.eclipse.osee.ote.ui.host.cmd/META-INF/MANIFEST.MF index 69bbcd84336..12037b38760 100644 --- a/org.eclipse.osee.ote.ui.host.cmd/META-INF/MANIFEST.MF +++ b/org.eclipse.osee.ote.ui.host.cmd/META-INF/MANIFEST.MF @@ -21,4 +21,5 @@ Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse.org
Export-Package: org.eclipse.osee.ote.ui.host.cmd
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.osee.framework.logging
+Import-Package: org.eclipse.osee.framework.core.model,
+ org.eclipse.osee.framework.logging
diff --git a/org.eclipse.osee.support.config/launchConfig/DB Config [localhost].launch b/org.eclipse.osee.support.config/launchConfig/DB Config [localhost].launch index c801a0b7986..79ab006a8d8 100644 --- a/org.eclipse.osee.support.config/launchConfig/DB Config [localhost].launch +++ b/org.eclipse.osee.support.config/launchConfig/DB Config [localhost].launch @@ -24,8 +24,8 @@ <stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="lba.ote.server.LbaTestServerProduct"/>
<booleanAttribute key="restart" value="false"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.emf.mwe.core@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.swt@default:default,org.eclipse.xtext@default:default,org.eclipse.team.svn.core.nl1@default:false,org.antlr.runtime*3.0.0.v200908120607@default:default,com.ibm.icu@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.team.core@default:default,org.eclipse.draw2d@default:default,org.eclipse.team.svn.ui.nl1@default:false,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.workbench.texteditor@default:default,com.google.guice@default:default,org.eclipse.team.ui@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.search@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.databinding.property@default:default,com.jcraft.jsch@default:default,org.eclipse.ant.core@default:default,org.eclipse.xpand@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.help.base@default:default,org.eclipse.emf.ecore@default:default,org.apache.commons.logging*1.1.1.v200904062255@default:default,org.eclipse.emf.edit.ui@default:default,org.mozilla.rhino@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.equinox.http.jetty@default:default,org.junit4@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.variables@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.birt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.compiler.tool@default:false,org.apache.lucene@default:default,org.eclipse.gef@default:default,org.eclipse.ui.views@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.update.configurator@3:true,org.eclipse.jface@default:default,org.eclipse.xtext.util@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.equinox.registry@default:default,org.apache.commons.cli@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.compare.core@default:default,org.eclipse.xtext.ui.common@default:default,org.eclipse.osgi.services@default:default,org.eclipse.update.core@default:default,org.mortbay.jetty.util@default:default,org.eclipse.xtext.log4j@default:default,org.apache.jasper@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.security@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.xtend.util.stdlib@default:default,org.eclipse.core.net@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.ecf.ssl@default:false,org.antlr.gen@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.apache.commons.httpclient@default:default,org.eclipse.ecf@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.emf.codegen@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.emf.common.ui@default:default,org.apache.lucene.analysis@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.help@default:default,org.eclipse.equinox.util@default:default,org.apache.commons.el@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.app@default:default,org.eclipse.core.resources@default:default,org.junit@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.p2.repository@default:default,org.hamcrest.core@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.ui.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.jface.text@default:default,org.eclipse.ui.win32@default:false,de.itemis.xtext.antlr@default:default,org.apache.ant@default:default,org.eclipse.xtext.generator@default:default,org.apache.commons.lang@default:default,org.eclipse.compare@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.debug.core@default:default,javax.servlet.jsp@default:default,com.google.collect@default:default,org.eclipse.ui.console@default:default,org.eclipse.debug.ui@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.core.jobs@default:default,org.eclipse.jdt.core@default:default,org.eclipse.ui@default:default,org.apache.commons.codec@default:default,org.eclipse.text@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.ui.ide@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.index@default:default,org.eclipse.equinox.common@2:true"/>
-<stringAttribute key="selected_workspace_plugins" value="com.lowagie.text@default:default,org.eclipse.osee.ote.connection.service@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,lba.ats.config.common.test@default:false,org.eclipse.osee.framework.ui.service.control@default:default,org.eclipse.osee.ote.ui.test.manager@default:default,org.apache.commons.net@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.zest.core@default:default,org.eclipse.osee.framework.types@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.osee.ote.core@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.framework.types.ui@default:default,lba.ats.config.tools@default:default,lba.framework.ui.skynet@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.messaging@default:default,lba.ats.config.process@default:default,lba.framework.ui.skynet.test@default:false,org.eclipse.osee.ote.ui@default:default,org.eclipse.osee.ote.ui.markers@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.ote.client@default:default,org.eclipse.osee.framework.oracle@default:default,lba.ats.config.common@default:default,org.eclipse.osee.framework.types.bridge@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.ote.runtimeManager@default:default,org.apache.oro@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.osee.framework.ui.skynet@default:default,net.jini@default:default,org.eclipse.osee.ote.message@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.ats@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.osee.framework.ui.jdk@default:default,javax.activation@default:default,org.eclipse.osee.framework.messaging.event.skynet@default:default,lba.ats.config.osee@default:default,lba.define.test@default:false,lba.help@default:default,lba.define@default:default,org.eclipse.osee.framework.ui.workspacebundleloader@default:default,org.eclipse.osee.framework.help.ui@default:default,lba.ats.config.deliverable@default:default,org.eclipse.osee.define.help.ui@default:default,lba.ats.config.cte@default:default,javax.mail.glassfish@default:default,org.eclipse.osee.framework.jini@default:default,org.postgresql.driver@default:default,org.eclipse.osee.ote.messaging.dds@default:default,oracle.driver@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.framework.database@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.debug.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.ui.navigator@default:default,org.eclipse.update.core@default:default,org.eclipse.draw2d@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ui.forms@default:default,org.eclipse.help.base@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.emf.mwe.utils@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui.navigator.resources@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore@default:default,org.mozilla.rhino@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.ui.ide@default:default,org.eclipse.compare@default:default,org.eclipse.core.net.win32.x86@default:false,org.sat4j.core@default:default,org.eclipse.emf.ecore.xmi@default:default,org.antlr.runtime*3.0.0.v200908110347@default:default,org.apache.ant@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.util@default:default,javax.servlet@default:default,org.apache.jasper@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.help@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.junit@default:default,org.eclipse.xtext@default:default,org.antlr.gen@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.databinding.property@default:default,com.google.guice@default:default,com.google.collect@default:default,org.eclipse.core.resources@default:default,org.eclipse.gef@default:default,org.eclipse.swt@default:default,org.eclipse.core.commands@default:default,org.eclipse.emf.mwe.core@default:default,de.itemis.xtext.antlr@default:default,org.hamcrest.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtext.log4j@default:default,org.eclipse.text@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.xtend.util.stdlib@default:default,org.eclipse.core.net@default:default,org.eclipse.birt.chart.engine@default:default,com.jcraft.jsch@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.xtext.ui.common@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.team.svn.core@default:default,org.apache.commons.logging*1.1.1.v200904062255@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ui.win32@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.emf.compare.diff@default:default,javax.servlet.jsp@default:default,org.eclipse.update.configurator@3:true,org.eclipse.core.databinding.observable@default:default,org.eclipse.emf.common@default:default,org.junit4@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.core.runtime@default:true,org.apache.commons.httpclient*3.1.0.v20080605-1935@default:default,org.eclipse.team.ui@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.browser@default:default,org.eclipse.xtext.util@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ecf.ssl@default:false,org.apache.commons.lang*2.4.0.v20081016-1030@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.xtext.ui.core@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.birt.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.debug.core@default:default,org.eclipse.jface@default:default,org.eclipse.xtext.xtend@default:default,org.apache.commons.httpclient*3.0.1.v20080605-1930@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.apache.commons.codec@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.search@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.lucene@default:default,org.eclipse.equinox.p2.director@default:default,org.mortbay.jetty.server@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.compare.core@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.ui@default:default,org.eclipse.ui.console@default:default,org.eclipse.jface.text@default:default,org.eclipse.osgi@-1:true,org.apache.commons.lang*2.1.0.v200803061811@default:default,org.eclipse.xtend@default:default,org.eclipse.equinox.security@default:default,org.eclipse.jdt.debug@default:default,org.apache.commons.el@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.xpand@default:default,org.eclipse.emf.index@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ecf@default:default,org.eclipse.jdt.core@default:default,org.eclipse.emf@default:default,org.sat4j.pb@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.team.core@default:default,org.apache.commons.cli@default:default,org.eclipse.equinox.common@2:true,org.eclipse.emf.compare@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.framework.core@default:default,org.apache.commons.net@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.osee.framework.ui.workspacebundleloader@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.ote.ui@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.ote.message@default:default,org.eclipse.osee.ats@default:default,lba.ote.shared.memory@default:default,org.eclipse.osee.ote.ui.test.manager@default:default,lba.ats.config.tools@default:default,org.eclipse.osee.ote.runtimeManager@default:default,lba.ote.core@default:default,lba.framework.ui.skynet@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.types.bridge@default:default,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.framework.oracle@default:default,lba.define@default:default,org.apache.oro@default:default,javax.mail.glassfish@default:default,lba.help@default:default,lba.ats.config.osee@default:default,org.eclipse.osee.ote.core@default:default,org.eclipse.osee.framework.ui.skynet@default:default,lba.ote.client@default:default,lba.ats.config.process@default:default,lba.ats.config.deliverable@default:default,org.eclipse.osee.framework.types.ui@default:default,org.eclipse.osee.framework.database.init@default:default,lba.ats.config.common.test@default:false,lba.framework.ui.skynet.test@default:false,org.eclipse.osee.ote.ui.markers@default:default,oracle.driver@default:default,org.eclipse.osee.framework.types@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.ote.client@default:default,org.eclipse.osee.ote.connection.service@default:default,org.eclipse.osee.ats.config.demo@default:default,lba.ote.message.support@default:default,org.eclipse.osee.define.help.ui@default:default,com.lowagie.text@default:default,org.eclipse.osee.framework.messaging.event.skynet@default:default,org.eclipse.osee.ote.messaging.dds@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.osee.ote.connection.jini@default:default,org.eclipse.osee.support.test.util@default:default,org.postgresql.driver@default:default,org.eclipse.osee.coverage@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.ui.service.control@default:default,org.eclipse.osee.framework.ui.plugin@default:default,javax.activation@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.zest.core@default:default,lba.ats.config.cte@default:default,org.eclipse.osee.framework.ui.swt@default:default,lba.define.test@default:false,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.database@default:default,lba.ats.config.common@default:default,lba.coverage@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.osee.ats.test@default:false,lba.rdt.core@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.framework.core.client@default:default,net.jini@default:default,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.ui.jdk@default:default,lba.ote.server@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.jini@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value=""/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/org.eclipse.osee.support.test/MasterTestSuite_DemoDbFastTests.launch b/org.eclipse.osee.support.test/MasterTestSuite_DemoDbFastTests.launch index 3c530d32df6..5a2818535ad 100644 --- a/org.eclipse.osee.support.test/MasterTestSuite_DemoDbFastTests.launch +++ b/org.eclipse.osee.support.test/MasterTestSuite_DemoDbFastTests.launch @@ -32,8 +32,8 @@ <stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.osee.framework.ui.product.osee"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.jsch.core@default:default,org.eclipse.ecf.filetransfer@default:default,net.sf.eclipsecs.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ui.workbench@default:default,org.apache.commons.net@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt@default:default,com.jcraft.jsch@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.compare@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.core.runtime@default:true,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.junit@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.gef@default:default,org.eclipse.pde.ui@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.core.expressions@default:default,org.eclipse.osgi.services@default:default,org.eclipse.cvs@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.team.svn.help@default:default,org.apache.commons.lang@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.p2.metadata.repository@default:default,javax.mail.glassfish@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.sdk@default:default,org.eclipse.ui.browser@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.mortbay.jetty.util@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.pde@default:default,org.eclipse.team.core@default:default,net.sf.eclipsecs.checkstyle@default:default,org.eclipse.draw2d@default:default,com.lowagie.itext@default:default,org.eclipse.jdt.core.manipulation@default:default,org.apache.oro@default:default,org.eclipse.team.cvs.ssh2@default:default,org.apache.lucene@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.team.cvs.ssh@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.intro@default:default,org.apache.ant@default:default,org.eclipse.update.ui@default:default,org.eclipse.compare.core@default:default,org.apache.commons.httpclient*3.1.0.v20080605-1935@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.console@default:default,org.eclipse.ant.ui@default:default,org.eclipse.core.databinding@default:default,org.eclipse.pde.core@default:default,org.eclipse.osee.ats.help.ui@default:default,org.mozilla.rhino@default:default,org.eclipse.emf.common@default:default,org.apache.commons.lang@default:default,org.eclipse.equinox.util@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.filebuffers@default:default,org.eclipse.core.contenttype@default:default,org.apache.jasper@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.eclipse.help.appserver@default:default,org.eclipse.rcp@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.jdt.core@default:default,org.apache.lucene.analysis@default:default,org.eclipse.platform@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.ui.externaltools@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.mylyn.wikitext.core@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.core.jobs@default:default,org.apache.commons.lang@default:default,org.eclipse.help@default:default,org.eclipse.ui.editors@default:default,org.eclipse.osgi.util@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.help.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.pde.doc.user@default:default,org.eclipse.ui.net@default:default,org.eclipse.debug.core@default:default,org.apache.commons.logging*1.0.4.v200904062259@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.pde.build@default:default,org.eclipse.birt.core@default:default,javax.xml@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.boot@default:default,org.eclipse.help.base@default:default,org.eclipse.jface.text@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.app@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.ui.views@default:default,com.ibm.icu@default:default,org.eclipse.help.webapp@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ecf@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.jdt.junit.runtime@default:default,org.apache.derby.core@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.core.commands@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.core.filesystem@default:default,org.junit4@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.debug.ui@default:default,org.junit@default:default,org.eclipse.ui.win32@default:false,org.eclipse.equinox.http.servlet@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.jdt.debug@default:default,org.apache.commons.httpclient*3.0.1.v20080605-1930@default:default,javax.servlet@default:default,com.lowagie.text@default:default,org.sat4j.core@default:default,org.eclipse.osee.define.help.ui@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.resources@default:default,javax.servlet.jsp@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.team.cvs.core@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.update.core@default:default,org.eclipse.zest.core@default:default,org.apache.commons.codec@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.core.databinding.beans@default:default,org.eclipse.text@default:default,org.eclipse.team.ui@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.team.svn@default:default,org.eclipse.equinox.security.ui@default:default,org.apache.commons.logging*1.1.1.v200904062255@default:default,javax.activation@default:default,org.eclipse.ui.ide.application@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.search@default:default,org.eclipse.ui@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.framework.ui.security@default:default,org.eclipse.osee.ote.ui.markers@default:default,org.eclipse.osee.framework.updater@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.artifact.servlet@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.resource.provider.common@default:default,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.ats@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.core.server@default:default,net.jini@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.ote.ui@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.ote.connection.service@default:default,org.eclipse.osee.ote.client@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.osee.framework.ui.service.control@default:default,org.postgresql.driver@default:default,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.framework.ui.branch.graph@default:default,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.framework.ui.data.model.editor@default:default,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.ote.runtimeManager@default:default,org.eclipse.osee.ote.ui.test.manager@default:default,org.eclipse.osee.framework.jini@default:default,oracle.driver@default:default,org.eclipse.osee.framework.search.engine.servlet@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.ote.core@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.osee.framework.search.engine@default:default,org.eclipse.osee.framework.resource.management.servlet@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.framework.resource.management.test@default:default,org.eclipse.osee.framework.ui.admin@default:default,org.eclipse.osee.framework.resource.management.servlet.test@default:default,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.ote.message@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.messaging.event.skynet@default:default,org.eclipse.osee.framework.derby@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.ote.messaging.dds@default:default,org.eclipse.osee.framework.client.info.servlet@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.branch.management@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.server.lookup.servlet@default:default,org.eclipse.osee.support.test@default:default,org.eclipse.osee.framework.resource.locator.attribute@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.session.management.servlet@default:default,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.framework.resource.provider.attribute@default:default,org.eclipse.osee.framework.ui.workspacebundleloader@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.framework.ui.encrypter@default:default,org.eclipse.osee.framework.branch.management.servlet@default:default,org.eclipse.osee.framework.resource.locator.attribute.test@default:default,org.eclipse.osee.framework.server.admin@default:default,derby.driver@default:default,org.eclipse.osee.framework.core@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.ui@default:default,org.eclipse.core.commands@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.team.svn@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.birt.core@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.pde.build@default:default,org.eclipse.emf.common@default:default,org.apache.ant@default:default,org.eclipse.help.base@default:default,com.lowagie.itext@default:default,org.eclipse.jdt@default:default,org.eclipse.jsch.core@default:default,org.apache.derby.client@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.intro@default:default,org.apache.xml.serializer@default:default,org.eclipse.gef@default:default,org.eclipse.team.ui@default:default,org.sat4j.core@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.ds@1:true,org.junit4@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.jdt.core@default:default,org.eclipse.help.webapp@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.ide@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.ant.ui@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.update.core@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.text@default:default,org.apache.oro@default:default,org.mortbay.jetty.server@default:default,org.apache.commons.lang*2.4.0.v20081016-1030@default:default,org.eclipse.ecf@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.compare.core@default:default,org.apache.derby.net@default:default,org.eclipse.core.databinding@default:default,org.eclipse.compare@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.views@default:default,org.eclipse.team.svn.ui@default:default,org.apache.commons.logging*1.0.4.v200904062259@default:default,org.apache.commons.httpclient*3.1.0.v20080605-1935@default:default,org.eclipse.ui.net@default:default,org.eclipse.update.configurator@3:true,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.ui.editors@default:default,org.apache.derby.core@default:default,org.eclipse.pde.core@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.help@default:default,org.eclipse.core.net@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.hamcrest.core@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.osgi.util@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.databinding.property@default:default,org.apache.xml.resolver@default:default,org.eclipse.jface@default:default,org.eclipse.ui.win32@default:false,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.cvs@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.jdt.core.manipulation@default:default,org.apache.commons.lang*2.1.0.v200803061811@default:default,org.eclipse.search@default:default,javax.activation@default:default,org.eclipse.jdt.ui@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.debug.ui@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.draw2d@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.team.core@default:default,org.apache.commons.httpclient*3.0.1.v20080605-1930@default:default,org.eclipse.core.variables@default:default,javax.xml@default:default,org.eclipse.jdt.debug@default:default,org.apache.commons.el@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.swt@default:default,com.jcraft.jsch@default:default,org.apache.commons.net@default:default,javax.servlet.jsp@default:default,org.eclipse.core.contenttype@default:default,net.sf.eclipsecs.checkstyle@default:default,org.eclipse.core.net.win32.x86@default:false,org.mortbay.jetty.util@default:default,org.eclipse.zest.core@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.ui.forms@default:default,org.apache.derby.engine@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.apache.xerces@default:default,org.eclipse.ui.console@default:default,org.eclipse.equinox.app@default:default,org.eclipse.sdk@default:default,org.apache.lucene@default:default,javax.servlet@default:default,org.eclipse.osee.define.help.ui@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.jdt.doc.user@default:default,com.lowagie.text@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.team.cvs.core@default:default,org.junit@default:default,org.eclipse.pde@default:default,org.eclipse.platform@default:default,org.eclipse.osgi.services@default:default,org.mozilla.rhino@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.core.resources@default:default,org.apache.commons.codec@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.pde.ui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.update.ui@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.p2.engine@default:default,org.apache.jasper@default:default,org.eclipse.equinox.p2.updatesite@default:default,javax.mail.glassfish@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.core.jobs@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.rcp@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ecf.ssl@default:false,org.apache.commons.logging*1.1.1.v200904062255@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.apache.lucene.analysis@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.help.appserver@default:default,org.eclipse.ant.core@default:default,org.sat4j.pb@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.boot@default:default,org.eclipse.team.cvs.ssh@default:default,org.eclipse.debug.core@default:default,org.eclipse.ui@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.jdt.junit4.runtime@default:default,com.ibm.icu@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.equinox.util@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,net.sf.eclipsecs.core@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.p2.core@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.ote.messaging.dds@default:default,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.framework.ui.encrypter@default:default,org.eclipse.osee.framework.resource.locator.attribute.test@default:false,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.ui.workspacebundleloader@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.resource.management.test@default:false,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.derby@default:default,net.jini@default:default,oracle.driver@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.branch.management@default:default,org.eclipse.osee.framework.resource.management.servlet.test@default:default,org.eclipse.osee.ote.ui.markers@default:default,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.framework.ui.data.model.editor@default:default,org.eclipse.osee.ats@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.updater@default:default,org.eclipse.osee.framework.core.server.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.ote.ui@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.framework.branch.management.test@default:false,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.messaging.event.skynet@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.ote.runtimeManager@default:default,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.framework.ui.service.control@default:default,org.eclipse.osee.framework.core@default:default,org.postgresql.driver@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.framework.resource.provider.attribute@default:default,org.eclipse.osee.ote.client@default:default,org.eclipse.osee.ote.connection.service@default:default,org.eclipse.osee.framework.ui.branch.graph@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.ui.admin@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.osee.framework.core.server@default:default,org.eclipse.osee.ote.core@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.ote.ui.test.manager@default:default,org.eclipse.osee.framework.ui.security@default:default,org.eclipse.osee.framework.search.engine@default:default,org.eclipse.osee.framework.server.admin@default:default,org.eclipse.osee.framework.resource.locator.attribute@default:default,org.eclipse.osee.ote.message@default:default,org.eclipse.osee.framework.resource.provider.attribute.test@default:false,org.eclipse.osee.support.test@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
|