From 283b9e0ae683b5400b886fb97d3cf0f650359d02 Mon Sep 17 00:00:00 2001
From: Florian Hoelzl <hoelzl@fortiss.org>
Date: Mon, 23 Oct 2017 13:57:18 +0000
Subject: [PATCH] GREEN. refs 2983
---
.../fortiss/tooling/kernel/extension/IConstraint.java | 2 +-
.../kernel/extension/base/ConstraintBases.java | 7 +++----
.../tooling/kernel/internal/ConstraintService.java | 2 +-
.../kernel/internal/ElementCompositorService.java | 11 ++++++-----
.../tooling/kernel/internal/PrototypeService.java | 5 ++---
.../eclipse/EclipseResourceStorageService.java | 2 +-
.../kernel/internal/storage/eclipse/ModelContext.java | 2 +-
7 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConstraint.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConstraint.java
index 4beff1e0a..331043f1f 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConstraint.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConstraint.java
@@ -28,7 +28,7 @@ import org.fortiss.tooling.kernel.service.IConstraintService;
* @author aravantinos
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 50DDDEC610FF3E8FDFFB13DD99B035FB
+ * @ConQAT.Rating GREEN Hash: DB8743455680591CD5D49DB1E2F479A1
*/
public interface IConstraint {
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ConstraintBases.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ConstraintBases.java
index 39a9f7df7..cd55b6e2a 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ConstraintBases.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ConstraintBases.java
@@ -20,6 +20,7 @@ package org.fortiss.tooling.kernel.extension.base;
import static org.fortiss.tooling.kernel.utils.ConstraintsUtils.createConstraintInstance;
import static org.fortiss.tooling.kernel.utils.ConstraintsUtils.createOutdatedStatus;
import static org.fortiss.tooling.kernel.utils.ConstraintsUtils.getConstrained;
+import static org.fortiss.tooling.kernel.utils.ConstraintsUtils.getConstraintInstanceOfType;
import java.math.BigInteger;
import java.util.ArrayList;
@@ -33,7 +34,6 @@ import org.fortiss.tooling.kernel.model.constraints.ConstraintInstance;
import org.fortiss.tooling.kernel.model.constraints.IConstrained;
import org.fortiss.tooling.kernel.model.constraints.IConstraintInstanceContainer;
import org.fortiss.tooling.kernel.model.constraints.IConstraintInstanceStatus;
-import org.fortiss.tooling.kernel.utils.ConstraintsUtils;
/**
* Base for {@link IConstraint}.
@@ -41,10 +41,9 @@ import org.fortiss.tooling.kernel.utils.ConstraintsUtils;
* @author aravantinos
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 2ECE5A013C7307103660EFCF61BC5919
+ * @ConQAT.Rating GREEN Hash: CB38421D745B4C7E2CA06DE4652DCC84
*/
public class ConstraintBases {
-
/** Most generic base. */
public abstract static class ConstraintBase implements IConstraint {
@@ -79,7 +78,7 @@ public class ConstraintBases {
/** {@inheritDoc} */
@Override
public ConstraintInstance addConstraintInstanceIfNeeded(IConstrained constrained) {
- if(ConstraintsUtils.getConstraintInstanceOfType(constrained, this) != null) {
+ if(getConstraintInstanceOfType(constrained, this) != null) {
return null;
}
ConstraintInstance ci = createConstraintInstanceIfNeeded(constrained);
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConstraintService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConstraintService.java
index 95ce63eeb..149cc69ac 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConstraintService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConstraintService.java
@@ -46,7 +46,7 @@ import org.fortiss.tooling.kernel.service.IPersistencyService;
* @author aravantinos
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 2B7E97B87725EFBADF63CECC5E5A223C
+ * @ConQAT.Rating GREEN Hash: 45C3028D690465FC5D35B7DCE832219D
*/
public final class ConstraintService implements IIntrospectiveKernelService, IConstraintService {
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ElementCompositorService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ElementCompositorService.java
index 29de38825..1afb859b2 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ElementCompositorService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ElementCompositorService.java
@@ -17,7 +17,9 @@ $Id$
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.kernel.internal;
+import static java.lang.String.format;
import static java.util.Collections.emptyList;
+import static org.fortiss.tooling.kernel.utils.LoggingUtils.error;
import java.util.List;
@@ -35,7 +37,6 @@ import org.fortiss.tooling.kernel.service.IElementCompositorService;
import org.fortiss.tooling.kernel.service.IKernelIntrospectionSystemService;
import org.fortiss.tooling.kernel.service.IPersistencyService;
import org.fortiss.tooling.kernel.service.base.EObjectAwareServiceBase;
-import org.fortiss.tooling.kernel.utils.LoggingUtils;
/**
* This class implements the {@link IElementCompositorService} interface.
@@ -43,7 +44,7 @@ import org.fortiss.tooling.kernel.utils.LoggingUtils;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 88948AA581DBFFA76EE100BFF77829CE
+ * @ConQAT.Rating GREEN Hash: BDAF66D0A145285262E5396C6EECCF29
*/
public final class ElementCompositorService extends
EObjectAwareServiceBase<IElementCompositor<EObject>> implements IElementCompositorService,
@@ -108,9 +109,9 @@ public final class ElementCompositorService extends
IElementCompositor<EObject> compositor =
findWorkingCompositor(container, element, context, false);
if(compositor == null) {
- LoggingUtils.error(ToolingKernelActivator.getDefault(), String.format(
- "Cannot find compositor for container %s and element %s", container.getClass(),
- element.getClass()));
+ error(ToolingKernelActivator.getDefault(),
+ format("Cannot find compositor for container %s and element %s",
+ container.getClass(), element.getClass()));
return false;
}
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 7739a1629..ca2c6fc5f 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
@@ -29,7 +29,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;
-import org.conqat.lib.commons.collections.CollectionUtils;
import org.conqat.lib.commons.collections.UnmodifiableList;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.emf.ecore.EObject;
@@ -53,7 +52,7 @@ import org.osgi.framework.Bundle;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 518FF7A7F96CCCF60D096BAEA427ABDE
+ * @ConQAT.Rating GREEN Hash: E9D432E84A47B6898E66074BF37924CA
*/
public class PrototypeService implements IPrototypeService, IIntrospectiveKernelService {
/** The singleton instance. */
@@ -128,7 +127,7 @@ public class PrototypeService implements IPrototypeService, IIntrospectiveKernel
/** {@inheritDoc} */
@Override
public UnmodifiableList<IPrototypeProvider> getPrototypeProviders() {
- return CollectionUtils.asUnmodifiable(prototypeProviderList);
+ return asUnmodifiable(prototypeProviderList);
}
/** {@inheritDoc} */
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageService.java
index 5bdef6643..f5e86ba2d 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageService.java
@@ -78,7 +78,7 @@ import org.osgi.framework.Bundle;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: D0BD6E6360A96906F01AC8A26BD13C1B
+ * @ConQAT.Rating GREEN Hash: EA0B225837EFA1B36E58B2BB7E12BC99
*/
public class EclipseResourceStorageService implements IEclipseResourceStorageService,
IResourceChangeListener, IResourceDeltaVisitor, IStorageProvider,
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 2d0efe4b1..51d40e79c 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
@@ -69,7 +69,7 @@ import org.fortiss.tooling.kernel.utils.UniqueIDUtils;
* @author hummel
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 2E4D0D0357C55C92641E29E89730F933
+ * @ConQAT.Rating GREEN Hash: 755F7F0472E9ABD7EFC210888C03D0AC
*/
class ModelContext implements ITopLevelElement, CommandStackListener {
--
GitLab