diff options
4 files changed, 17 insertions, 30 deletions
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/PurgeBranchOperation.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/PurgeBranchOperation.java index 33411b20d9c..884398cecb9 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/PurgeBranchOperation.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/PurgeBranchOperation.java @@ -13,7 +13,6 @@ package org.eclipse.osee.framework.branch.management.purge; import java.util.ArrayList; import java.util.List; -import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.branch.management.internal.Activator; import org.eclipse.osee.framework.core.enums.StorageState; @@ -27,7 +26,6 @@ import org.eclipse.osee.framework.database.IOseeDatabaseServiceProvider; import org.eclipse.osee.framework.database.core.AbstractDbTxOperation; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.database.core.OseeConnection; -import org.eclipse.osee.framework.logging.OseeLog; /** * @author Megumi Telles @@ -109,23 +107,11 @@ public class PurgeBranchOperation extends AbstractDbTxOperation { purgeFromTable("Conflict", DELETE_FROM_CONFLICT, 0.01, branch.getId()); purgeFromTable("Merge", DELETE_FROM_MERGE, 0.01, branch.getId(), branch.getParentBranch().getId()); purgeFromTable("Branch", DELETE_FROM_BRANCH_TABLE, 0.01, branch.getId()); - } - @Override - protected void doFinally(IProgressMonitor monitor) { - super.doFinally(monitor); - - if (getStatus().isOK()) { - BranchCache branchCache; - try { - branchCache = cachingService.getOseeCachingService().getBranchCache(); - branch.setStorageState(StorageState.PURGED); - branchCache.storeItems(branch); - branchCache.decache(branch); - } catch (OseeCoreException ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); - } - } + BranchCache branchCache = cachingService.getOseeCachingService().getBranchCache(); + branch.setStorageState(StorageState.PURGED); + branchCache.storeItems(branch); + branchCache.decache(branch); } private void purgeGammas(String tableName, double percentage) throws OseeDataStoreException { diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesImportPage.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesImportPage.java index 9b2a5454fcf..a38153ea5ee 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesImportPage.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesImportPage.java @@ -228,7 +228,7 @@ public class OseeTypesImportPage extends WizardDataTransferPage { if (status.isOK()) { setErrorMessage(null); } else { - setErrorMessage(status.getChildren()[0].getMessage()); + setErrorMessage(status.getMessage()); } return true; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java index 2a40e2a4f52..613af51c6da 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java @@ -62,13 +62,12 @@ public class DatabaseHealth extends AbstractBlam { for (String taskName : DatabaseHealthOpsExtensionManager.getVerifyOperationNames()) {
if (verifyAll || variableMap.getBoolean(taskName)) {
dbHealthOperation.addOperation(DatabaseHealthOpsExtensionManager.getVerifyOperationByName(taskName), false);
- }
- }
+ } + } Operations.executeWorkAndCheckStatus(dbHealthOperation, monitor); - println(dbHealthOperation.getStatus().getMessage());
- }
-
- @Override
+ } + + @Override public String getXWidgetsXml() {
StringBuilder builder = new StringBuilder();
builder.append("<xWidgets>");
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java index 89a286600ba..df932f11943 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java @@ -43,6 +43,7 @@ import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.plugin.core.util.OseeData; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; /** * @author Roberto E. Escobar @@ -61,8 +62,7 @@ public abstract class AbstractWordAttributeHealthOperation extends DatabaseHealt List<AttrData> attributesWithErrors = new ArrayList<AttrData>(); IOperation operation = - new FindAllWordAttributesNeedingFix(String.format("Find all %s enabled", baseName), getStatus().getPlugin(), - attributesWithErrors); + new FindAllWordAttributesNeedingFix(String.format("Find all %s enabled", baseName), attributesWithErrors); doSubWork(operation, monitor, 0.40); setItemsToFix(attributesWithErrors.size()); @@ -70,7 +70,9 @@ public abstract class AbstractWordAttributeHealthOperation extends DatabaseHealt appendToDetails(AHTML.beginMultiColumnTable(100, 1)); appendToDetails(AHTML.addHeaderRowMultiColumnTable(new String[] {"HRID", "GAMMA ID", "URI"})); for (AttrData attrData : attributesWithErrors) { - appendToDetails(AHTML.addRowMultiColumnTable(new String[] {attrData.getHrid(), attrData.getGammaId(), + appendToDetails(AHTML.addRowMultiColumnTable(new String[] { + attrData.getHrid(), + attrData.getGammaId(), attrData.getUri()})); } appendToDetails(AHTML.endMultiColumnTable()); @@ -107,8 +109,8 @@ public abstract class AbstractWordAttributeHealthOperation extends DatabaseHealt private final List<AttrData> attributesWithErrors; - public FindAllWordAttributesNeedingFix(String operationName, String pluginId, List<AttrData> attributesWithErrors) { - super(operationName, pluginId); + public FindAllWordAttributesNeedingFix(String operationName, List<AttrData> attributesWithErrors) { + super(operationName, SkynetGuiPlugin.PLUGIN_ID); this.attributesWithErrors = attributesWithErrors; } |