Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrescobar2010-08-24 17:33:04 -0400
committerrescobar2010-08-24 17:33:04 -0400
commit9552aa2e6c9505f73bd5a8b786993aeac2556cfa (patch)
tree222670cc8f4a5a2ea52af38ce3525c585d69dab9 /plugins/org.eclipse.osee.framework.core.message/src/org
parent046596c4aeaac8082373a4e41a2aa6237bc75aba (diff)
downloadorg.eclipse.osee-9552aa2e6c9505f73bd5a8b786993aeac2556cfa.tar.gz
org.eclipse.osee-9552aa2e6c9505f73bd5a8b786993aeac2556cfa.tar.xz
org.eclipse.osee-9552aa2e6c9505f73bd5a8b786993aeac2556cfa.zip
Cleaned up warnings and fixed service dependencies
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.message/src/org')
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/Activator.java1
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java3
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceRegHandler.java8
3 files changed, 3 insertions, 9 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/Activator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/Activator.java
index d2edeeaaa6e..018cdc4667a 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/Activator.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/Activator.java
@@ -16,7 +16,6 @@ import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
public class Activator implements BundleActivator {
- public static final String PLUGIN_ID = "org.eclipse.osee.framework.core.model";
private ServiceDependencyTracker dependencyTracker;
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java
index c8157d3c083..f56db4176a9 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java
@@ -39,7 +39,6 @@ import org.eclipse.osee.framework.core.message.internal.translation.TransactionC
import org.eclipse.osee.framework.core.message.internal.translation.TransactionRecordTranslator;
import org.eclipse.osee.framework.core.model.TransactionRecordFactory;
import org.eclipse.osee.framework.core.model.type.AttributeTypeFactory;
-import org.eclipse.osee.framework.core.services.IOseeCachingService;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
/**
@@ -52,7 +51,7 @@ public class DataTranslationServiceFactory {
//
}
- public IDataTranslationService createService(IOseeCachingService cachingService, TransactionRecordFactory txRecordFactory, AttributeTypeFactory attributeTypeFactory) throws OseeCoreException {
+ public IDataTranslationService createService(TransactionRecordFactory txRecordFactory, AttributeTypeFactory attributeTypeFactory) throws OseeCoreException {
IDataTranslationService service = new DataTranslationService();
service.addTranslator(new TransactionRecordTranslator(txRecordFactory), CoreTranslatorId.TRANSACTION_RECORD);
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceRegHandler.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceRegHandler.java
index b5a40ecca61..56068766371 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceRegHandler.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceRegHandler.java
@@ -15,7 +15,6 @@ import java.util.logging.Level;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.TransactionRecordFactory;
import org.eclipse.osee.framework.core.model.type.AttributeTypeFactory;
-import org.eclipse.osee.framework.core.services.IOseeCachingService;
import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
import org.eclipse.osee.framework.core.util.AbstractTrackingHandler;
@@ -29,8 +28,7 @@ import org.osgi.framework.ServiceRegistration;
public class DataTranslationServiceRegHandler extends AbstractTrackingHandler {
private static final Class<?>[] DEPENDENCIES = new Class<?>[] {//
- IOseeCachingService.class, //
- IOseeModelFactoryService.class //
+ IOseeModelFactoryService.class //
};
private ServiceRegistration registration;
@@ -42,15 +40,13 @@ public class DataTranslationServiceRegHandler extends AbstractTrackingHandler {
@Override
public void onActivate(BundleContext context, Map<Class<?>, Object> services) {
- IOseeCachingService cachingService = getService(IOseeCachingService.class, services);
IOseeModelFactoryService factoryService = getService(IOseeModelFactoryService.class, services);
TransactionRecordFactory txFactory = factoryService.getTransactionFactory();
AttributeTypeFactory attributeTypeFactory = factoryService.getAttributeTypeFactory();
-
DataTranslationServiceFactory factory = new DataTranslationServiceFactory();
try {
- IDataTranslationService service = factory.createService(cachingService, txFactory, attributeTypeFactory);
+ IDataTranslationService service = factory.createService(txFactory, attributeTypeFactory);
registration = context.registerService(IDataTranslationService.class.getName(), service, null);
} catch (OseeCoreException ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);

Back to the top