Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnsgar Radermacher2016-01-13 14:25:31 +0000
committerAnsgar Radermacher2016-01-13 15:58:21 +0000
commit3741892d2df4b5c60f977d87e2008f271b6d00cb (patch)
tree620cac4767bcf48ad9943d846bf7db00d6ff84a3 /plugins/uml
parent4bd8d77dc28c0a26398a4b7419968ea234754d95 (diff)
downloadorg.eclipse.papyrus-3741892d2df4b5c60f977d87e2008f271b6d00cb.tar.gz
org.eclipse.papyrus-3741892d2df4b5c60f977d87e2008f271b6d00cb.tar.xz
org.eclipse.papyrus-3741892d2df4b5c60f977d87e2008f271b6d00cb.zip
Bug 408215 - [OCL] Loaded Complete OCL resource does not contribute to validation
Move some classes to internal sub-package Add UML specific validation commands (avoid exposure to UMLDiagnostician) Use registry to associate a suitable diagnostician for a given model Change-Id: I1f1ec6999dff3e8585b10aacea44f1769352f3f8
Diffstat (limited to 'plugins/uml')
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF5
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.xml46
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateModelHandler.java32
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateSubtreeHandler.java32
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateModelHandler.java32
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateSubtreeHandler.java32
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/internal/OCLEValidatorAdapter.java (renamed from plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/OCLEValidatorAdapter.java)4
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/internal/UMLDiagnostician.java (renamed from plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/UMLDiagnostician.java)4
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/src/org/eclipse/papyrus/uml/textedit/constraintwithessentialocl/xtext/EssentialOCLEditorConfiguration.java3
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/src/org/eclipse/papyrus/uml/textedit/stereotypeproperty/xtext/ui/contributions/StereotypePropertyEditorConfigurationContribution.java2
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/src/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/utils/commands/ValueSpecificationSetCommand.java4
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/DefaultXtextDirectEditorConfiguration.java3
12 files changed, 18 insertions, 181 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF
index 7c6083d7da0..a7e2f7e9e3b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.uml.service.validation,
- org.eclipse.papyrus.uml.service.validation.handler,
+ org.eclipse.papyrus.uml.service.validation.internal;x-internal:=true,
org.eclipse.papyrus.uml.service.validation.oclpivot
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
org.eclipse.ocl.pivot;bundle-version="1.0.0",
- org.eclipse.ocl.pivot.uml;bundle-version="1.0.0"
+ org.eclipse.ocl.pivot.uml;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0"
Bundle-Vendor: %pluginProvider
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.xml
index dcd811f74ff..447eb7ab9e8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.xml
@@ -2,49 +2,17 @@
<?eclipse version="3.4"?>
<plugin>
<extension
- point="org.eclipse.ui.handlers">
- <handler
- class="org.eclipse.papyrus.uml.service.validation.handler.ValidateModelHandler"
- commandId="org.eclipse.papyrus.validation.ValidateModelCommand">
- <activeWhen>
- <iterate ifEmpty="false">
- <adapt type="org.eclipse.emf.ecore.EObject"></adapt>
- </iterate>
- </activeWhen>
- </handler>
- <handler
- class="org.eclipse.papyrus.uml.service.validation.handler.ValidateSubtreeHandler"
- commandId="org.eclipse.papyrus.validation.ValidateSubtreeCommand">
- <activeWhen>
- <iterate ifEmpty="false">
- <adapt type="org.eclipse.emf.ecore.EObject"></adapt>
- </iterate>
- </activeWhen>
- </handler>
- <handler
- class="org.eclipse.papyrus.uml.service.validation.handler.SelectAndValidateSubtreeHandler"
- commandId="org.eclipse.papyrus.validation.SelectAndValidateSubtreeCommand">
- <activeWhen>
- <iterate ifEmpty="false">
- <adapt type="org.eclipse.emf.ecore.EObject"></adapt>
- </iterate>
- </activeWhen>
- </handler>
- <handler
- class="org.eclipse.papyrus.uml.service.validation.handler.SelectAndValidateModelHandler"
- commandId="org.eclipse.papyrus.validation.SelectAndValidateModelCommand">
- <activeWhen>
- <iterate ifEmpty="false">
- <adapt type="org.eclipse.emf.ecore.EObject"></adapt>
- </iterate>
- </activeWhen>
- </handler>
- </extension>
- <extension
point="org.eclipse.emf.validation.constraintParsers">
<constraintParser
class="org.eclipse.papyrus.uml.service.validation.oclpivot.OCLpivotConstraintParser"
lang="OCLpivot">
</constraintParser>
</extension>
+ <extension
+ point="org.eclipse.papyrus.infra.services.validation.diagnosticians">
+ <diagnostician
+ class="org.eclipse.papyrus.uml.service.validation.internal.UMLDiagnostician"
+ id="org.eclipse.papyrus.uml.language">
+ </diagnostician>
+ </extension>
</plugin>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateModelHandler.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateModelHandler.java
deleted file mode 100644
index bddd850b067..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateModelHandler.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.service.validation.handler;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.services.validation.commands.SelectAndValidateModelCommand;
-import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHandler;
-import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
-
-/**
- * Handler for selecting constraints and then validating a model
- */
-public class SelectAndValidateModelHandler extends AbstractCommandHandler {
-
- @Override
- protected Command getCommand() {
- // not useful to cache command, since selected element may change
- return new GMFtoEMFCommandWrapper(new SelectAndValidateModelCommand(getSelectedElement(), new UMLDiagnostician()));
- }
-}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateSubtreeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateSubtreeHandler.java
deleted file mode 100644
index c1c2882b731..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateSubtreeHandler.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.service.validation.handler;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.services.validation.commands.SelectAndValidateSubtreeCommand;
-import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHandler;
-import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
-
-/**
- * Handler for selecting constraints and then validating a subtree
- */
-public class SelectAndValidateSubtreeHandler extends AbstractCommandHandler {
-
- @Override
- protected Command getCommand() {
- // not useful to cache command, since selected element may change
- return new GMFtoEMFCommandWrapper(new SelectAndValidateSubtreeCommand(getSelectedElement(), new UMLDiagnostician()));
- }
-}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateModelHandler.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateModelHandler.java
deleted file mode 100644
index 4b449071084..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateModelHandler.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.service.validation.handler;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.services.validation.commands.ValidateModelCommand;
-import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHandler;
-import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
-
-/**
- * Handler for validating a model.
- */
-public class ValidateModelHandler extends AbstractCommandHandler {
-
- @Override
- protected Command getCommand() {
- // not useful to cache command, since selected element may change
- return new GMFtoEMFCommandWrapper(new ValidateModelCommand(getSelectedElement(), new UMLDiagnostician()));
- }
-}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateSubtreeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateSubtreeHandler.java
deleted file mode 100644
index 7cf040d3460..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateSubtreeHandler.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.service.validation.handler;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.services.validation.commands.ValidateSubtreeCommand;
-import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHandler;
-import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
-
-/**
- * Handler for validating a subtree
- */
-public class ValidateSubtreeHandler extends AbstractCommandHandler {
-
- @Override
- protected Command getCommand() {
- // not useful to cache command, since selected element may change
- return new GMFtoEMFCommandWrapper(new ValidateSubtreeCommand(getSelectedElement(), new UMLDiagnostician()));
- }
-}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/OCLEValidatorAdapter.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/internal/OCLEValidatorAdapter.java
index d16ca2f0a81..10612be3c95 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/OCLEValidatorAdapter.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/internal/OCLEValidatorAdapter.java
@@ -13,7 +13,7 @@
*****************************************************************************/
-package org.eclipse.papyrus.uml.service.validation;
+package org.eclipse.papyrus.uml.service.validation.internal;
import java.util.Map;
@@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.util.EObjectValidator;
import org.eclipse.emf.validation.model.IConstraintStatus;
import org.eclipse.ocl.pivot.internal.delegate.OCLDelegateValidator;
import org.eclipse.ocl.pivot.uml.internal.validation.UMLOCLEValidator;
-import org.eclipse.papyrus.infra.services.validation.EValidatorAdapter;
+import org.eclipse.papyrus.infra.services.validation.internal.EValidatorAdapter;
import org.eclipse.uml2.uml.InstanceSpecification;
import org.eclipse.uml2.uml.OpaqueAction;
import org.eclipse.uml2.uml.OpaqueBehavior;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/UMLDiagnostician.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/internal/UMLDiagnostician.java
index 7ed41023470..2f14f9b4c71 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/UMLDiagnostician.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/internal/UMLDiagnostician.java
@@ -11,7 +11,7 @@
* Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - Contribution related to bug 410457, 410119 and 410059
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.service.validation;
+package org.eclipse.papyrus.uml.service.validation.internal;
import java.util.Collections;
import java.util.Iterator;
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EValidator;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.ocl.pivot.internal.delegate.OCLDelegateDomain;
-import org.eclipse.papyrus.infra.services.validation.EcoreDiagnostician;
+import org.eclipse.papyrus.infra.services.validation.internal.EcoreDiagnostician;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.UMLPackage;
import org.eclipse.uml2.uml.util.UMLUtil;
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/src/org/eclipse/papyrus/uml/textedit/constraintwithessentialocl/xtext/EssentialOCLEditorConfiguration.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/src/org/eclipse/papyrus/uml/textedit/constraintwithessentialocl/xtext/EssentialOCLEditorConfiguration.java
index b8430c2144b..7ad615e2084 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/src/org/eclipse/papyrus/uml/textedit/constraintwithessentialocl/xtext/EssentialOCLEditorConfiguration.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/src/org/eclipse/papyrus/uml/textedit/constraintwithessentialocl/xtext/EssentialOCLEditorConfiguration.java
@@ -43,7 +43,6 @@ import org.eclipse.ocl.pivot.utilities.PivotUtil;
import org.eclipse.papyrus.infra.emf.dialog.NestedEditingDialogContext;
import org.eclipse.papyrus.infra.services.validation.commands.AbstractValidateCommand;
import org.eclipse.papyrus.infra.services.validation.commands.AsyncValidateSubtreeCommand;
-import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
import org.eclipse.papyrus.uml.xtext.integration.DefaultXtextDirectEditorConfiguration;
import org.eclipse.papyrus.uml.xtext.integration.core.ContextElementAdapter.IContextElementProvider;
import org.eclipse.papyrus.uml.xtext.integration.core.ContextElementAdapter.IContextElementProviderWithInit;
@@ -275,7 +274,7 @@ public class EssentialOCLEditorConfiguration extends DefaultXtextDirectEditorCon
result.add(new UpdateOpaqueExpressionCommand(editingDomain, (OpaqueExpression) semanticObject, newString));
}
if (doValidation) {
- final AbstractValidateCommand validationCommand = new AsyncValidateSubtreeCommand(semanticObject, new UMLDiagnostician());
+ final AbstractValidateCommand validationCommand = new AsyncValidateSubtreeCommand(semanticObject);
validationCommand.disableUIFeedback();
result.add(validationCommand);
}
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/src/org/eclipse/papyrus/uml/textedit/stereotypeproperty/xtext/ui/contributions/StereotypePropertyEditorConfigurationContribution.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/src/org/eclipse/papyrus/uml/textedit/stereotypeproperty/xtext/ui/contributions/StereotypePropertyEditorConfigurationContribution.java
index c0f173adfde..33f7850572d 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/src/org/eclipse/papyrus/uml/textedit/stereotypeproperty/xtext/ui/contributions/StereotypePropertyEditorConfigurationContribution.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/src/org/eclipse/papyrus/uml/textedit/stereotypeproperty/xtext/ui/contributions/StereotypePropertyEditorConfigurationContribution.java
@@ -365,7 +365,7 @@ public class StereotypePropertyEditorConfigurationContribution extends DefaultXt
} else {
result.add(createInvalidStringCommand(newString, semanticObject));
}
- // ValidateSubtreeCommand validationCommand = new ValidateSubtreeCommand(semanticObject, new UMLDiagnostician());
+ // ValidateSubtreeCommand validationCommand = new ValidateSubtreeCommand(semanticObject);
// validationCommand.disableUIFeedback();
// result.add(validationCommand);
return result;
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/src/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/utils/commands/ValueSpecificationSetCommand.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/src/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/utils/commands/ValueSpecificationSetCommand.java
index 2444ffefd28..a8e6e18e007 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/src/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/utils/commands/ValueSpecificationSetCommand.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/src/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/utils/commands/ValueSpecificationSetCommand.java
@@ -26,7 +26,6 @@ import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
import org.eclipse.papyrus.infra.services.validation.commands.AbstractValidateCommand;
import org.eclipse.papyrus.infra.services.validation.commands.AsyncValidateSubtreeCommand;
-import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
import org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule;
import org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.LiteralBooleanRule;
import org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.LiteralIntegerOrUnlimitedNaturalRule;
@@ -157,8 +156,7 @@ public class ValueSpecificationSetCommand {
// The parser of xtext string value throw errors
result.add(manageOpaqueExpression(objectToEdit, structuralFeature, initialValueSpecification, xtextStringValue, defaultLanguages));
}
- AbstractValidateCommand validationCommand = new AsyncValidateSubtreeCommand(
- objectToEdit, new UMLDiagnostician());
+ AbstractValidateCommand validationCommand = new AsyncValidateSubtreeCommand(objectToEdit);
validationCommand.disableUIFeedback();
result.add(validationCommand);
return result;
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/DefaultXtextDirectEditorConfiguration.java b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/DefaultXtextDirectEditorConfiguration.java
index 573dd89fa47..4a86b3736fb 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/DefaultXtextDirectEditorConfiguration.java
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/DefaultXtextDirectEditorConfiguration.java
@@ -37,7 +37,6 @@ import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEd
import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
import org.eclipse.papyrus.infra.services.validation.commands.AbstractValidateCommand;
import org.eclipse.papyrus.infra.services.validation.commands.AsyncValidateSubtreeCommand;
-import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
import org.eclipse.papyrus.uml.xtext.integration.core.ContextElementAdapter;
import org.eclipse.papyrus.uml.xtext.integration.core.ContextElementAdapter.IContextElementProvider;
import org.eclipse.papyrus.uml.xtext.integration.core.ContextElementAdapter.IContextElementProviderWithInit;
@@ -152,7 +151,7 @@ public abstract class DefaultXtextDirectEditorConfiguration extends DefaultDirec
} else {
result.add(createInvalidStringCommand(newString, semanticObject));
}
- AbstractValidateCommand validationCommand = new AsyncValidateSubtreeCommand(semanticObject, new UMLDiagnostician());
+ AbstractValidateCommand validationCommand = new AsyncValidateSubtreeCommand(semanticObject);
validationCommand.disableUIFeedback();
result.add(validationCommand);
return result;

Back to the top