Renamed EclipseResourceStorageProvider to EclipseResourceStorageService.

refs 2590

org.fortiss.tooling.kernel/trunk/OSGI-INF/EclipseResourceStorageService.xml

@@ -5,7 +5,7 @@
   @ConQAT.Rating YELLOW Hash: 1AB4E45B3940C00A982A3C49474361A1
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" name="org.fortiss.tooling.kernel.service.EclipseResourceStorageService">
-   <implementation class="org.fortiss.tooling.kernel.internal.storage.eclipse.EclipseResourceStorageProvider"/>
+   <implementation class="org.fortiss.tooling.kernel.internal.storage.eclipse.EclipseResourceStorageService"/>
    <service>
       <provide interface="org.fortiss.tooling.kernel.service.IEclipseResourceStorageService"/>
    </service>

org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IEclipseResourcePostLoadProvider.java

@@ -29,8 +29,6 @@ import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
  * @version $Rev$
  * @ConQAT.Rating GREEN Hash: 9D7025FE2AE6D9B3CAE8A20352705445
  */
-@Deprecated
-// FIXME: move to IPersistencyService
 public interface IEclipseResourcePostLoadProvider {
 
 	/**

org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IEclipseResourceStorageLocationProvider.java

@@ -32,13 +32,11 @@ import org.fortiss.tooling.kernel.service.IEclipseResourceStorageService;
  * decide whether the file provided with {@link #isStorageLocation(IFile)} should be considered.
  * 
  * 
- * @author hoelzlf
+ * @author hoelzl
  * @author $Author$
  * @version $Rev$
  * @ConQAT.Rating GREEN Hash: 71927EF9BC0DABEA01729368E9D823B9
  */
-// FIXME: incorporate this interface into the IPersistencyService
-@Deprecated
 public interface IEclipseResourceStorageLocationProvider {
 
 	/**

org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PersistencyService.java

@@ -47,7 +47,7 @@ import org.fortiss.tooling.kernel.ToolingKernelActivator;
 import org.fortiss.tooling.kernel.extension.IStorageProvider;
 import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
 import org.fortiss.tooling.kernel.extension.data.ModelStorageError;
-import org.fortiss.tooling.kernel.internal.storage.eclipse.EclipseResourceStorageProvider;
+import org.fortiss.tooling.kernel.internal.storage.eclipse.EclipseResourceStorageService;
 import org.fortiss.tooling.kernel.introspection.IIntrospectionDetailsItem;
 import org.fortiss.tooling.kernel.introspection.IIntrospectionItem;
 import org.fortiss.tooling.kernel.introspection.IIntrospectiveKernelService;
@@ -98,8 +98,8 @@ public class PersistencyService implements IPersistencyService, IIntrospectiveKe
 	public void initializeService() {
 		setupStorageProviders();
 		for(IStorageProvider p : storageProviderList) {
-			if(p instanceof EclipseResourceStorageProvider) {
-				EclipseResourceStorageProvider ersp = (EclipseResourceStorageProvider)p;
+			if(p instanceof EclipseResourceStorageService) {
+				EclipseResourceStorageService ersp = (EclipseResourceStorageService)p;
 				ersp.initializeService();
 			}
 		}

org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ToolingKernelInternal.java

@@ -31,7 +31,7 @@ import org.fortiss.tooling.kernel.extension.IStorageProvider;
 import org.fortiss.tooling.kernel.extension.ITransformationProvider;
 import org.fortiss.tooling.kernel.extension.LogMessageHandler;
 import org.fortiss.tooling.kernel.extension.data.LogMessage;
-import org.fortiss.tooling.kernel.internal.storage.eclipse.EclipseResourceStorageProvider;
+import org.fortiss.tooling.kernel.internal.storage.eclipse.EclipseResourceStorageService;
 import org.fortiss.tooling.kernel.model.constraints.IConstraint;
 import org.fortiss.tooling.kernel.service.IConnectionCompositorService;
 import org.fortiss.tooling.kernel.service.IConstraintCheckerService;
@@ -64,7 +64,7 @@ public final class ToolingKernelInternal {
 		((ConstraintVerificationService)IConstraintVerificationService.getInstance())
 				.initializeService();
 		((ElementCompositorService)IElementCompositorService.getInstance()).initializeService();
-		((EclipseResourceStorageProvider)IEclipseResourceStorageService.getInstance())
+		((EclipseResourceStorageService)IEclipseResourceStorageService.getInstance())
 				.initializeService();
 		((LibraryService)ILibraryService.getInstance()).initializeService();
 		((LoggingService)ILoggingService.getInstance()).initializeService();
@@ -84,7 +84,7 @@ public final class ToolingKernelInternal {
 		((ConstraintVerificationService)IConstraintVerificationService.getInstance())
 				.startService();
 		((ElementCompositorService)IElementCompositorService.getInstance()).startService();
-		((EclipseResourceStorageProvider)IEclipseResourceStorageService.getInstance())
+		((EclipseResourceStorageService)IEclipseResourceStorageService.getInstance())
 				.startService();
 		((LibraryService)ILibraryService.getInstance()).startService();
 		((LoggingService)ILoggingService.getInstance()).startService();

org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageProvider.java → org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageService.java

@@ -82,7 +82,7 @@ import org.osgi.framework.Bundle;
  * @version $Rev$
  * @ConQAT.Rating YELLOW Hash: BC5A41B219C8E63EBCB835612CCD0166
  */
-public class EclipseResourceStorageProvider implements IEclipseResourceStorageService,
+public class EclipseResourceStorageService implements IEclipseResourceStorageService,
 		IResourceChangeListener, IResourceDeltaVisitor, IStorageProvider,
 		IIntrospectiveKernelService {
 
@@ -217,7 +217,7 @@ public class EclipseResourceStorageProvider implements IEclipseResourceStorageSe
 		new WorkspaceJob("ModelFileChangedJob") {
 			@Override
 			public IStatus runInWorkspace(IProgressMonitor monitor) {
-				synchronized(EclipseResourceStorageProvider.this) {
+				synchronized(EclipseResourceStorageService.this) {
 					// Model file that is managed by kernel has been changed
 					if(checkLocationProvider(file)) {
 						if(changeKind == ADDED) {
@@ -233,7 +233,7 @@ public class EclipseResourceStorageProvider implements IEclipseResourceStorageSe
 						}
 						// Refresh the top-level elements
 						IPersistencyService.getInstance().refreshTopLevelElements(
-								EclipseResourceStorageProvider.this);
+								EclipseResourceStorageService.this);
 					} else if(changeKind == REMOVED) {
 						// A file has been removed. Remove it from one of the ResourceSets owned by
 						// the kernel.

org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/EclipseResourceStorageServiceIntrospectionDetailsItem.java

@@ -25,9 +25,10 @@ import org.fortiss.tooling.kernel.extension.IEclipseResourcePostLoadProvider;
 import org.fortiss.tooling.kernel.extension.IEclipseResourceStorageLocationProvider;
 import org.fortiss.tooling.kernel.extension.data.ModelStorageError;
 import org.fortiss.tooling.kernel.introspection.IIntrospectionDetailsItem;
+import org.fortiss.tooling.kernel.service.IEclipseResourceStorageService;
 
 /**
- * {@link IIntrospectionDetailsItem} class for {@link EclipseResourceStorageService}.
+ * {@link IIntrospectionDetailsItem} class for {@link IEclipseResourceStorageService}.
  * 
  * @author hoelzl
  * @author $Author$