diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/CopyModelElementsAction.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/CopyModelElementsAction.java
index 592e9c39dd4c682b018c01a6c329a5534cc5ccb1..a173da618d59bdac06db54a8a86c898f3f52d980 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/CopyModelElementsAction.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/CopyModelElementsAction.java
@@ -27,7 +27,7 @@ import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionFactory;
import org.fortiss.tooling.base.ui.ToolingBaseUIActivator;
-import org.fortiss.tooling.kernel.util.LoggingUtils;
+import org.fortiss.tooling.kernel.utils.LoggingUtils;
/**
* Action for copying the current selection.
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/CopyPasteUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/CopyPasteUtils.java
index c066545fa8ac70dbd2dfb9e5d1f9c8da56122e19..3519781c91b5052bce9f34f25b8869475aac3b00 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/CopyPasteUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/CopyPasteUtils.java
@@ -36,7 +36,7 @@ import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.widgets.Display;
import org.fortiss.tooling.kernel.service.IElementCompositorService;
-import org.fortiss.tooling.kernel.util.EMFResourceUtils;
+import org.fortiss.tooling.kernel.utils.EMFResourceUtils;
/**
* Methods for simplifying copy/paste.
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/CutModelElementsAction.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/CutModelElementsAction.java
index a055041b4bceb8c2ab8242275d8a72e6ad7f5828..f173f01f1b399eedf52d2149428808554b703617 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/CutModelElementsAction.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/CutModelElementsAction.java
@@ -28,7 +28,7 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionFactory;
import org.fortiss.tooling.base.ui.ToolingBaseUIActivator;
import org.fortiss.tooling.kernel.service.IElementCompositorService;
-import org.fortiss.tooling.kernel.util.LoggingUtils;
+import org.fortiss.tooling.kernel.utils.LoggingUtils;
/**
* Action for cutting the current selection.
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ContextMenuService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ContextMenuService.java
index f9d2aabdfb10d7081013342e85206a574e36840e..f67d57914727f76197df599eabdaa1a794a444d6 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ContextMenuService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ContextMenuService.java
@@ -33,8 +33,8 @@ import org.fortiss.tooling.kernel.ui.extension.IContextMenuContributor;
import org.fortiss.tooling.kernel.ui.extension.data.ContextMenuContextProvider;
import org.fortiss.tooling.kernel.ui.service.IActionService;
import org.fortiss.tooling.kernel.ui.service.IContextMenuService;
-import org.fortiss.tooling.kernel.util.ExtensionPointUtils;
-import org.fortiss.tooling.kernel.util.LoggingUtils;
+import org.fortiss.tooling.kernel.utils.ExtensionPointUtils;
+import org.fortiss.tooling.kernel.utils.LoggingUtils;
import org.osgi.framework.Bundle;
/**
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/EditPartFactoryService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/EditPartFactoryService.java
index d76f9fadea560e15ec0d0500bbd0cf1553fc1137..773117bb92fac5fc00a3bc329ce5ec6b03ffbb02 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/EditPartFactoryService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/EditPartFactoryService.java
@@ -25,7 +25,7 @@ import org.fortiss.tooling.kernel.service.base.EObjectAwareServiceBase;
import org.fortiss.tooling.kernel.ui.ToolingKernelUIActivator;
import org.fortiss.tooling.kernel.ui.extension.IEditPartFactory;
import org.fortiss.tooling.kernel.ui.service.IEditPartFactoryService;
-import org.fortiss.tooling.kernel.util.LoggingUtils;
+import org.fortiss.tooling.kernel.utils.LoggingUtils;
/**
* This class implements the {@link IEditPartFactoryService} interface.
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelEditorBindingService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelEditorBindingService.java
index b4a3be93df8e6730a6ce318c666a2c9b4795c05b..2d4f3b9537100ea01f29f8117a941c9380e45556 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelEditorBindingService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelEditorBindingService.java
@@ -31,7 +31,7 @@ import org.fortiss.tooling.kernel.ui.extension.IModelEditorBinding;
import org.fortiss.tooling.kernel.ui.internal.editor.BindingEditor;
import org.fortiss.tooling.kernel.ui.internal.editor.ModelElementEditorInput;
import org.fortiss.tooling.kernel.ui.service.IModelEditorBindingService;
-import org.fortiss.tooling.kernel.util.LoggingUtils;
+import org.fortiss.tooling.kernel.utils.LoggingUtils;
/**
* This class implements the {@link IModelEditorBindingService} interface.
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java
index acde3f039b431f5c0053a67a776e8600917714c8..49707551c8290f13df3ab45a21d3f738cee04d73 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java
@@ -24,7 +24,7 @@ import org.fortiss.tooling.kernel.ToolingKernelActivator;
import org.fortiss.tooling.kernel.service.base.EObjectAwareServiceBase;
import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
-import org.fortiss.tooling.kernel.util.LoggingUtils;
+import org.fortiss.tooling.kernel.utils.LoggingUtils;
/**
* This class implements the {@link IModelElementHandlerService} interface. It
diff --git a/org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF b/org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF
index d96f4aa47b9cc909902759f9b17225aea59864cf..549863ce51865105c7955b4b71eb84a27be4ad32 100644
--- a/org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF
@@ -32,4 +32,4 @@ Export-Package: org.fortiss.tooling.kernel;uses:="org.eclipse.core.runtime,org.o
org.conqat.lib.commons.collections",
org.fortiss.tooling.kernel.service.base,
org.fortiss.tooling.kernel.service.listener,
- org.fortiss.tooling.kernel.util;uses:="org.eclipse.emf.ecore,org.eclipse.core.resources"
+ org.fortiss.tooling.kernel.utils;uses:="org.eclipse.emf.ecore,org.eclipse.core.resources"
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITransformationProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITransformationProvider.java
index fb21442350e51b9e34f46ef2c1757c90ca470d22..08e7a81d472cd7c1d9bd4a05079b21a447dfd656 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITransformationProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITransformationProvider.java
@@ -33,7 +33,7 @@ import org.fortiss.tooling.kernel.service.base.IObjectAware2;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: D798E691812994DC6321748E8CAC1C20
+ * @ConQAT.Rating YELLOW Hash: BD2DD3B19C8FF84B0F5544D6D1BFD19D
*/
public interface ITransformationProvider extends IObjectAware2<Object, Object> {
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java
index 631324527c328f255bf3a18f25fbb3c4f5b19a85..9e1d71d71aae5087a1b6141062c380bb2abfb6ec 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java
@@ -23,7 +23,7 @@ import org.fortiss.tooling.kernel.ToolingKernelActivator;
import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
import org.fortiss.tooling.kernel.service.ICommandStackService;
import org.fortiss.tooling.kernel.service.IPersistencyService;
-import org.fortiss.tooling.kernel.util.LoggingUtils;
+import org.fortiss.tooling.kernel.utils.LoggingUtils;
/**
* This class implements the {@link ICommandStackService} interface. This class
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PersistencyService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PersistencyService.java
index 736884dc6e0fa6578c6ab7fb34c1ef2046eb1863..9a5fd1cb1540146d8ecb794508490a181b793fa3 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PersistencyService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PersistencyService.java
@@ -38,8 +38,8 @@ import org.fortiss.tooling.kernel.extension.IStorageProvider;
import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
import org.fortiss.tooling.kernel.service.IPersistencyService;
import org.fortiss.tooling.kernel.service.listener.IPersistencyServiceListener;
-import org.fortiss.tooling.kernel.util.ExtensionPointUtils;
-import org.fortiss.tooling.kernel.util.LoggingUtils;
+import org.fortiss.tooling.kernel.utils.ExtensionPointUtils;
+import org.fortiss.tooling.kernel.utils.LoggingUtils;
import org.osgi.framework.Bundle;
/**
@@ -49,7 +49,7 @@ import org.osgi.framework.Bundle;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: CB508205D42FEB9375EBF45173CCE1BC
+ * @ConQAT.Rating YELLOW Hash: 5BEC676F284500DFF68D2C56ADA1C3D0
*/
public class PersistencyService implements IPersistencyService {
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PrototypeService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PrototypeService.java
index e50c5e733a9d9844514b85351f98cc3f410cc00d..c9a346cabef290643cc018c84144c48f75bbc4fb 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PrototypeService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PrototypeService.java
@@ -30,8 +30,8 @@ import org.fortiss.tooling.kernel.extension.IPrototypeProvider;
import org.fortiss.tooling.kernel.extension.data.Prototype;
import org.fortiss.tooling.kernel.service.IElementCompositorService;
import org.fortiss.tooling.kernel.service.IPrototypeService;
-import org.fortiss.tooling.kernel.util.ExtensionPointUtils;
-import org.fortiss.tooling.kernel.util.LoggingUtils;
+import org.fortiss.tooling.kernel.utils.ExtensionPointUtils;
+import org.fortiss.tooling.kernel.utils.LoggingUtils;
import org.osgi.framework.Bundle;
/**
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/TransformationService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/TransformationService.java
index 38d6f1f5f2f0e4fa4da81f474385f792792d3332..b39711750b62143088fc6c833f7c811f9fb11310 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/TransformationService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/TransformationService.java
@@ -37,7 +37,7 @@ import org.fortiss.tooling.kernel.service.base.ObjectAware2ServiceBase;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 47E6FF87D2593D1197B151977E9B1F44
+ * @ConQAT.Rating YELLOW Hash: F56BA3742E56A3E35A84F57E987FEED3
*/
public class TransformationService extends
ObjectAware2ServiceBase<ITransformationProvider> implements
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EMFTransactionalCommand.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EMFTransactionalCommand.java
index 712c4776707bd65a195369281dc1be533b408751..32671194dff255d24007b97efc68e1b90c0d056e 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EMFTransactionalCommand.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EMFTransactionalCommand.java
@@ -27,7 +27,7 @@ import org.eclipse.emf.transaction.Transaction;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
import org.fortiss.tooling.kernel.ToolingKernelActivator;
-import org.fortiss.tooling.kernel.util.LoggingUtils;
+import org.fortiss.tooling.kernel.utils.LoggingUtils;
/**
* This class wraps another EMF command and makes sure that all execute methods
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageProvider.java
index ca2c023f17fded36a0d5c88260f5323e6e1afe4b..9829afcde1f574079d9a64c53adb99744e72cdf7 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageProvider.java
@@ -45,8 +45,8 @@ import org.fortiss.tooling.kernel.extension.IStorageProvider;
import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
import org.fortiss.tooling.kernel.service.IEclipseResourceStorageService;
import org.fortiss.tooling.kernel.service.IPersistencyService;
-import org.fortiss.tooling.kernel.util.ExtensionPointUtils;
-import org.fortiss.tooling.kernel.util.LoggingUtils;
+import org.fortiss.tooling.kernel.utils.ExtensionPointUtils;
+import org.fortiss.tooling.kernel.utils.LoggingUtils;
import org.osgi.framework.Bundle;
/**
@@ -56,7 +56,7 @@ import org.osgi.framework.Bundle;
* @author hoelzlf
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: 17E9760429C421C70BB25ED0F6D3A243
+ * @ConQAT.Rating GREEN Hash: 937C16FE047D3D6450FA133EDFCD95D1
*/
public class EclipseResourceStorageProvider implements
IEclipseResourceStorageService, IResourceChangeListener,
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/ModelContext.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/ModelContext.java
index ff2e79cc45fc6aefa41dbd0804950de80562e7d1..2b974c998518891874e42feae94b750ac6ca7ba8 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/ModelContext.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/ModelContext.java
@@ -42,8 +42,8 @@ import org.fortiss.tooling.kernel.ToolingKernelActivator;
import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
import org.fortiss.tooling.kernel.model.IIdLabeled;
import org.fortiss.tooling.kernel.service.IPersistencyService;
-import org.fortiss.tooling.kernel.util.EMFResourceUtils;
-import org.fortiss.tooling.kernel.util.LoggingUtils;
+import org.fortiss.tooling.kernel.utils.EMFResourceUtils;
+import org.fortiss.tooling.kernel.utils.LoggingUtils;
/**
* The model context provides additional commands and hooks for a model.
@@ -52,7 +52,7 @@ import org.fortiss.tooling.kernel.util.LoggingUtils;
* @author hummel
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: D91F459A3B3AB2253163176447AE0D65
+ * @ConQAT.Rating YELLOW Hash: CD42B63C274F623DE3D9BAFA6CFB5846
*/
class ModelContext implements ITopLevelElement {
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/package.html b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/package.html
index 1de5e9d733e36f6b57c7067b069fef7b70ec1857..b219afcda679f4318d2542764b794560265df2ee 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/package.html
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/package.html
@@ -1,7 +1,7 @@
<!--
$Id$
@version $Rev$
- @ConQAT.Rating YELLOW Hash: A6BD025E9E6FF9A37EC043180BD12299
+ @ConQAT.Rating YELLOW Hash: C8BC7DC15E2C9B1D3EEB7A9611BBB9B1
-->
<body>
Implementation of the <code>IStorageProvider</code> interface using Eclipse file resources as storage mechanism for models.
@@ -10,8 +10,9 @@ This storage provider searches all projects in the Eclipse workspace for model f
Only files in the project's root folder are considered.
For each such files the set of registered <code>eclipseResourceStorageLocationProvider</code> extensions is
asked whether the respective file should be considered a model file. This extension mechanism is used
-to allow different tools to use different file extensions for their models, e.g., tool A uses *.toolA, while
-tool B uses *.
-<p>
-TODO: What do you mean here with tool A and tool B? Do we make an infrastructure for more tools?
+to allow independent tools (running in the same Eclipse instance or two RCPs running independently) to use
+different file extensions for their models, e.g., tool A uses file pattern "*.toolA", while tool B uses
+the file pattern "*.toolP". The file extension is usually a hint on the meta-model class of the contained root
+model element.
+
</body>
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ITransformationService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ITransformationService.java
index c566c8f072598c892d0c37bd95387dd92f4b473f..20a625a639ce0cd22bdf143a53fcc4dddbc884df 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ITransformationService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ITransformationService.java
@@ -36,7 +36,7 @@ import org.fortiss.tooling.kernel.internal.TransformationService;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating RED Hash: 04E7821466A71D96E214234950636F6D
+ * @ConQAT.Rating YELLOW Hash: AE9EAD90C7E6E1BBEF27698F49CA2F69
*/
public interface ITransformationService {
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAware2ServiceBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAware2ServiceBase.java
index d937272d688dad77c52e6b24307625e20113aedd..5382789dca1b2101ba8dbec676ffe6948178d111 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAware2ServiceBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAware2ServiceBase.java
@@ -27,8 +27,8 @@ import org.eclipse.core.runtime.IConfigurationElement;
import org.fortiss.tooling.kernel.ToolingKernelActivator;
import org.fortiss.tooling.kernel.internal.ConnectionCompositorService;
import org.fortiss.tooling.kernel.internal.ElementCompositorService;
-import org.fortiss.tooling.kernel.util.ExtensionPointUtils;
-import org.fortiss.tooling.kernel.util.LoggingUtils;
+import org.fortiss.tooling.kernel.utils.ExtensionPointUtils;
+import org.fortiss.tooling.kernel.utils.LoggingUtils;
import org.osgi.framework.Bundle;
/**
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java
index b3bc67362ce72acd16ea08684c91f53d59e54449..84e43a1c5836b362c719bf4c7bb2e3658e952aef 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java
@@ -28,8 +28,8 @@ import org.conqat.lib.commons.reflect.ReflectionUtils;
import org.eclipse.core.runtime.IConfigurationElement;
import org.fortiss.tooling.kernel.ToolingKernelActivator;
import org.fortiss.tooling.kernel.internal.ConnectionCompositorService;
-import org.fortiss.tooling.kernel.util.ExtensionPointUtils;
-import org.fortiss.tooling.kernel.util.LoggingUtils;
+import org.fortiss.tooling.kernel.utils.ExtensionPointUtils;
+import org.fortiss.tooling.kernel.utils.LoggingUtils;
import org.osgi.framework.Bundle;
/**
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/EMFResourceUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EMFResourceUtils.java
similarity index 98%
rename from org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/EMFResourceUtils.java
rename to org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EMFResourceUtils.java
index 3c96676f36957957b94c4426fad3506cf0ec638c..851a593c9b7692c10c655addb3895805fb8aad46 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/EMFResourceUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EMFResourceUtils.java
@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.util;
+package org.fortiss.tooling.kernel.utils;
import java.io.IOException;
import java.util.HashMap;
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ExtensionPointUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ExtensionPointUtils.java
similarity index 98%
rename from org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ExtensionPointUtils.java
rename to org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ExtensionPointUtils.java
index 0a8c91b7851bea61a137d76c5996df00cca1eb1d..f403ff6dfce59382f992dc802147cc0b78141190 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ExtensionPointUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ExtensionPointUtils.java
@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.util;
+package org.fortiss.tooling.kernel.utils;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/LoggingUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/LoggingUtils.java
similarity index 98%
rename from org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/LoggingUtils.java
rename to org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/LoggingUtils.java
index 86ca0e4c49061be68d30e484eb06d1fcfcaaa955..2820164feb97ce77bfb0a13e33395c79c8093605 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/LoggingUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/LoggingUtils.java
@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.util;
+package org.fortiss.tooling.kernel.utils;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Plugin;
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ProjectRootElementUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ProjectRootElementUtils.java
similarity index 98%
rename from org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ProjectRootElementUtils.java
rename to org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ProjectRootElementUtils.java
index 01a87b3633b7a9c3ff72e9ce449a4fc20549a517..d775bd69fe4b0b65eb5e07fac53d546a7f32af9b 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ProjectRootElementUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ProjectRootElementUtils.java
@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.util;
+package org.fortiss.tooling.kernel.utils;
import java.util.Iterator;
import java.util.StringTokenizer;
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/TransformationUtil.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/TransformationUtil.java
similarity index 98%
rename from org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/TransformationUtil.java
rename to org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/TransformationUtil.java
index 5084e90afac322c54f2e5487c9c266330d183985..c7c56ccdd39a4aad93440569688af1373b8f968b 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/TransformationUtil.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/TransformationUtil.java
@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.util;
+package org.fortiss.tooling.kernel.utils;
import java.util.List;
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/package.html b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/package.html
similarity index 100%
rename from org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/package.html
rename to org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/package.html