From 62201ecfaf4ccc77af71b527d89097c312df5bd1 Mon Sep 17 00:00:00 2001 From: Florian Hoelzl <hoelzl@fortiss.org> Date: Mon, 29 Aug 2011 09:04:20 +0000 Subject: [PATCH] Refactored kernel.util -> kernel.utils other YELLOW refs 153 --- .../base/ui/action/CopyModelElementsAction.java | 2 +- .../tooling/base/ui/action/CopyPasteUtils.java | 2 +- .../base/ui/action/CutModelElementsAction.java | 2 +- .../kernel/ui/internal/ContextMenuService.java | 4 ++-- .../kernel/ui/internal/EditPartFactoryService.java | 2 +- .../kernel/ui/internal/ModelEditorBindingService.java | 2 +- .../ui/internal/ModelElementHandlerService.java | 2 +- org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF | 2 +- .../kernel/extension/ITransformationProvider.java | 2 +- .../tooling/kernel/internal/CommandStackService.java | 2 +- .../tooling/kernel/internal/PersistencyService.java | 6 +++--- .../tooling/kernel/internal/PrototypeService.java | 4 ++-- .../kernel/internal/TransformationService.java | 2 +- .../storage/eclipse/EMFTransactionalCommand.java | 2 +- .../eclipse/EclipseResourceStorageProvider.java | 6 +++--- .../kernel/internal/storage/eclipse/ModelContext.java | 6 +++--- .../kernel/internal/storage/eclipse/package.html | 11 ++++++----- .../kernel/service/ITransformationService.java | 2 +- .../kernel/service/base/ObjectAware2ServiceBase.java | 4 ++-- .../kernel/service/base/ObjectAwareServiceBase.java | 4 ++-- .../kernel/{util => utils}/EMFResourceUtils.java | 2 +- .../kernel/{util => utils}/ExtensionPointUtils.java | 2 +- .../tooling/kernel/{util => utils}/LoggingUtils.java | 2 +- .../{util => utils}/ProjectRootElementUtils.java | 2 +- .../kernel/{util => utils}/TransformationUtil.java | 2 +- .../tooling/kernel/{util => utils}/package.html | 0 26 files changed, 40 insertions(+), 39 deletions(-) rename org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/{util => utils}/EMFResourceUtils.java (98%) rename org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/{util => utils}/ExtensionPointUtils.java (98%) rename org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/{util => utils}/LoggingUtils.java (98%) rename org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/{util => utils}/ProjectRootElementUtils.java (98%) rename org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/{util => utils}/TransformationUtil.java (98%) rename org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/{util => utils}/package.html (100%) 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 592e9c39d..a173da618 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 c066545fa..3519781c9 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 a055041b4..f173f01f1 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 f9d2aabdf..f67d57914 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 d76f9fade..773117bb9 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 b4a3be93d..2d4f3b953 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 acde3f039..49707551c 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 d96f4aa47..549863ce5 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 fb2144235..08e7a81d4 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 631324527..9e1d71d71 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 736884dc6..9a5fd1cb1 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 e50c5e733..c9a346cab 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 38d6f1f5f..b39711750 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 712c47767..32671194d 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 ca2c023f1..9829afcde 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 ff2e79cc4..2b974c998 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 1de5e9d73..b219afcda 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 c566c8f07..20a625a63 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 d937272d6..5382789dc 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 b3bc67362..84e43a1c5 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 3c96676f3..851a593c9 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 0a8c91b78..f403ff6df 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 86ca0e4c4..2820164fe 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 01a87b363..d775bd69f 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 5084e90af..c7c56ccdd 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 -- GitLab