Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrbrooks2010-08-29 01:02:11 -0400
committerrbrooks2010-08-29 01:02:11 -0400
commit5a4058affbff23e1fad7c559eeb691161ea94b57 (patch)
tree709ca8587ec038ecdd4bfbcaff50bb6379e2fa6a /plugins/org.eclipse.osee.framework.core.datastore
parentc850774504ad977892dfece2dc330ab769b234f1 (diff)
downloadorg.eclipse.osee-5a4058affbff23e1fad7c559eeb691161ea94b57.tar.gz
org.eclipse.osee-5a4058affbff23e1fad7c559eeb691161ea94b57.tar.xz
org.eclipse.osee-5a4058affbff23e1fad7c559eeb691161ea94b57.zip
Eclipse source cleanup and format
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.datastore')
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/BranchStoreOperation.java27
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/BranchUpdateEventImpl.java3
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseAttributeTypeAccessor.java25
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseRelationTypeAccessor.java23
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/OseeCachingServiceRegistrationHandler.java8
5 files changed, 63 insertions, 23 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/BranchStoreOperation.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/BranchStoreOperation.java
index c1b4d38be6..5275a3fb7e 100644
--- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/BranchStoreOperation.java
+++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/BranchStoreOperation.java
@@ -57,9 +57,17 @@ public class BranchStoreOperation extends AbstractDbTxOperation {
int parentBranchId = parentBranch != null ? parentBranch.getId() : NULL_PARENT_BRANCH_ID;
int baselineTransaction = baseTxRecord != null ? baseTxRecord.getId() : NULL_PARENT_BRANCH_ID;
- return new Object[] {branch.getId(), branch.getGuid(), branch.getName(), parentBranchId,
- branch.getSourceTransaction().getId(), branch.getArchiveState().getValue(), branch.getAssociatedArtifactId(),
- branch.getBranchType().getValue(), branch.getBranchState().getValue(), baselineTransaction};
+ return new Object[] {
+ branch.getId(),
+ branch.getGuid(),
+ branch.getName(),
+ parentBranchId,
+ branch.getSourceTransaction().getId(),
+ branch.getArchiveState().getValue(),
+ branch.getAssociatedArtifactId(),
+ branch.getBranchType().getValue(),
+ branch.getBranchState().getValue(),
+ baselineTransaction};
}
private Object[] toUpdateValues(Branch branch) throws OseeCoreException {
@@ -67,9 +75,16 @@ public class BranchStoreOperation extends AbstractDbTxOperation {
TransactionRecord baseTxRecord = branch.getBaseTransaction();
int parentBranchId = parentBranch != null ? parentBranch.getId() : NULL_PARENT_BRANCH_ID;
int baselineTransaction = baseTxRecord != null ? baseTxRecord.getId() : NULL_PARENT_BRANCH_ID;
- return new Object[] {branch.getName(), parentBranchId, branch.getSourceTransaction().getId(),
- branch.getArchiveState().getValue(), branch.getAssociatedArtifactId(), branch.getBranchType().getValue(),
- branch.getBranchState().getValue(), baselineTransaction, branch.getId()};
+ return new Object[] {
+ branch.getName(),
+ parentBranchId,
+ branch.getSourceTransaction().getId(),
+ branch.getArchiveState().getValue(),
+ branch.getAssociatedArtifactId(),
+ branch.getBranchType().getValue(),
+ branch.getBranchState().getValue(),
+ baselineTransaction,
+ branch.getId()};
}
private Object[] toDeleteValues(Branch branch) {
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/BranchUpdateEventImpl.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/BranchUpdateEventImpl.java
index 77324b9cf7..aac3570e5f 100644
--- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/BranchUpdateEventImpl.java
+++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/BranchUpdateEventImpl.java
@@ -123,7 +123,8 @@ public class BranchUpdateEventImpl implements IBranchUpdateEvent {
is_0_9_2_Compatible(serverInfo.getVersion()) ? request : request0_9_1;
AcquireResult updateResponse =
- HttpMessage.send(urlString, translationService, CoreTranslatorId.BRANCH_CACHE_STORE_REQUEST, message, null);
+ HttpMessage.send(urlString, translationService, CoreTranslatorId.BRANCH_CACHE_STORE_REQUEST,
+ message, null);
if (!updateResponse.wasSuccessful()) {
OseeLog.log(Activator.class, Level.SEVERE, "Error relaying branch updates to servers");
}
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseAttributeTypeAccessor.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseAttributeTypeAccessor.java
index b84d642a24..3e5fa9066f 100644
--- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseAttributeTypeAccessor.java
+++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseAttributeTypeAccessor.java
@@ -129,11 +129,17 @@ public class DatabaseAttributeTypeAccessor extends AbstractDatabaseAccessor<Attr
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,
+ 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.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()};
}
@@ -141,13 +147,18 @@ public class DatabaseAttributeTypeAccessor extends AbstractDatabaseAccessor<Attr
private Object[] toUpdateValues(AttributeType type) throws OseeDataStoreException {
int attrBaseTypeId = getOrCreateAttributeBaseType(type.getBaseAttributeTypeId());
int attrProviderTypeId = getOrCreateAttributeProviderType(type.getAttributeProviderId());
- return new Object[] {attrBaseTypeId, attrProviderTypeId,
+ 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.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()};
+ type.getTaggerId() == null ? SQL3DataType.VARCHAR : type.getTaggerId(),
+ type.getId()};
}
@SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseRelationTypeAccessor.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseRelationTypeAccessor.java
index 0abe571e59..b97bced596 100644
--- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseRelationTypeAccessor.java
+++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseRelationTypeAccessor.java
@@ -120,14 +120,27 @@ public class DatabaseRelationTypeAccessor extends AbstractDatabaseAccessor<Relat
}
private Object[] toInsertValues(RelationType type) {
- return new Object[] {type.getId(), type.getGuid(), type.getName(), type.getSideAName(), type.getSideBName(),
- type.getArtifactTypeSideA().getId(), type.getArtifactTypeSideB().getId(), type.getMultiplicity().getValue(),
+ 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) {
- return new Object[] {type.getName(), type.getSideAName(), type.getSideBName(),
- type.getArtifactTypeSideA().getId(), type.getArtifactTypeSideB().getId(), type.getMultiplicity().getValue(),
- type.getDefaultOrderTypeGuid(), type.getId()};
+ 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/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/OseeCachingServiceRegistrationHandler.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/OseeCachingServiceRegistrationHandler.java
index bdeceed3a4..a97585f83d 100644
--- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/OseeCachingServiceRegistrationHandler.java
+++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/OseeCachingServiceRegistrationHandler.java
@@ -28,10 +28,10 @@ import org.osgi.framework.ServiceRegistration;
public class OseeCachingServiceRegistrationHandler extends AbstractTrackingHandler {
//@formatter:off
- private final static Class<?>[] SERVICE_DEPENDENCIES = new Class<?>[] {
- IOseeDatabaseService.class,
- IOseeModelFactoryService.class,
- IDataTranslationService.class,
+ private final static Class<?>[] SERVICE_DEPENDENCIES = new Class<?>[] {
+ IOseeDatabaseService.class,
+ IOseeModelFactoryService.class,
+ IDataTranslationService.class,
IApplicationServerLookup.class,
IApplicationServerManager.class
};

Back to the top