Initial branch commit, change report, branch archive refactor.

4 files changed, 4 insertions, 10 deletions

diff --git a/org.eclipse.osee.framework.database.init/META-INF/MANIFEST.MF b/org.eclipse.osee.framework.database.init/META-INF/MANIFEST.MF
index 46adadc8436..f46dbc129d4 100644
--- a/org.eclipse.osee.framework.database.init/META-INF/MANIFEST.MF
+++ b/org.eclipse.osee.framework.database.init/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Import-Package: org.apache.commons.lang;version="2.4.0",

  org.apache.commons.lang.builder,

+ org.apache.xml.serialize;version="2.9.0",

  org.eclipse.core.runtime,

  org.eclipse.equinox.app,

  org.eclipse.osee.framework.core.client,

diff --git a/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/AddCommonBranch.java b/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/AddCommonBranch.java
index 6b3e6a3513c..c208a29722e 100644
--- a/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/AddCommonBranch.java
+++ b/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/AddCommonBranch.java
@@ -11,6 +11,7 @@
 
 package org.eclipse.osee.framework.database.init;
 
+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.skynet.core.GlobalXViewerSettings;
@@ -18,7 +19,6 @@ import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
 import org.eclipse.osee.framework.skynet.core.SystemGroup;
 import org.eclipse.osee.framework.skynet.core.UserManager;
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
-import org.eclipse.osee.framework.skynet.core.artifact.Branch;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
 import org.eclipse.osee.framework.skynet.core.artifact.CoreBranches;
 import org.eclipse.osee.framework.skynet.core.artifact.UniversalGroup;
diff --git a/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/DbBootstrapTask.java b/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/DbBootstrapTask.java
index c3b4553cb46..eb8ea271214 100644
--- a/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/DbBootstrapTask.java
+++ b/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/DbBootstrapTask.java
@@ -180,6 +180,7 @@ public class DbBootstrapTask implements IDbInitializationTask {
    /**
     * @throws OseeDataStoreException
     */
+   @SuppressWarnings("unchecked")
    private void addDefaultPermissions() throws OseeDataStoreException {
       for (PermissionEnum permission : PermissionEnum.values()) {
          ConnectionHandler.runPreparedUpdate(ADD_PERMISSION, permission.getPermId(), permission.getName());
diff --git a/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/SkynetDbBranchDataImport.java b/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/SkynetDbBranchDataImport.java
index 0db33b80d3f..f9bd24c8f74 100644
--- a/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/SkynetDbBranchDataImport.java
+++ b/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/SkynetDbBranchDataImport.java
@@ -28,13 +28,13 @@ import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.core.runtime.Platform;

 import org.eclipse.osee.framework.core.client.OseeClientProperties;

+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.database.init.internal.DatabaseInitActivator;

 import org.eclipse.osee.framework.jdk.core.util.Strings;

 import org.eclipse.osee.framework.logging.OseeLog;

 import org.eclipse.osee.framework.plugin.core.util.ExtensionPoints;

-import org.eclipse.osee.framework.skynet.core.artifact.Branch;

 import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;

 import org.eclipse.osee.framework.skynet.core.artifact.CoreBranches;

 import org.eclipse.osee.framework.skynet.core.exportImport.HttpBranchExchange;

@@ -151,14 +151,6 @@ public class SkynetDbBranchDataImport implements IDbInitializationTask {
          return String.format("%s - %s", exchangeFile, selectedBranches);

       }

 

-      public boolean areAllSelected() {

-         return this.selectedBranches.size() == 0;

-      }

-

-      public Set<String> getSelectedBranches() {

-         return selectedBranches;

-      }

-

       public File getExchangeFile() {

          return exchangeFile;

       }