Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnsgar Radermacher2014-04-29 08:09:31 +0000
committerAnsgar Radermacher2014-04-29 08:10:50 +0000
commitfecb208e71175b1109aa28ffe16a779155381148 (patch)
treeee3bb58099c00564045af179bb6f4ae23757ce0f /plugins
parent8d4eb0afc9a65820c06967aef366360b8b60deea (diff)
downloadorg.eclipse.papyrus-fecb208e71175b1109aa28ffe16a779155381148.tar.gz
org.eclipse.papyrus-fecb208e71175b1109aa28ffe16a779155381148.tar.xz
org.eclipse.papyrus-fecb208e71175b1109aa28ffe16a779155381148.zip
Bug 433506 - [validation] Validation does not work from the diagram (+fixed some comments)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/Messages.java (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/Messages.java)6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/ValidationTool.java5
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/AbstractValidateCommand.java1
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/SelectAndValidateModelCommand.java1
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/SelectAndValidateSubtreeCommand.java1
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateDelMarkersFromModelCommand.java8
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateDelMarkersFromSubtreeCommand.java1
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateModelCommand.java1
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateSubtreeCommand.java1
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateModelHandler.java4
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateSubtreeHandler.java4
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromModelHandler.java4
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromSubtreeHandler.java4
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateModelHandler.java4
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateSubtreeHandler.java4
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/messages.properties (renamed from plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/messages.properties)2
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/PreferencePage.java5
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.xml132
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateModelHandler.java4
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateSubtreeHandler.java4
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateDelMarkersFromModelHandler.java34
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateDelMarkersFromSubtreeHandler.java34
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateModelHandler.java4
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateSubtreeHandler.java4
24 files changed, 67 insertions, 205 deletions
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/Messages.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/Messages.java
index 8f452dccb34..bd811dde95d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/Messages.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/Messages.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.infra.services.validation.commands;
+package org.eclipse.papyrus.infra.services.validation;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.validation.commands.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.validation.messages"; //$NON-NLS-1$
public static String AbstractValidateCommand_CreateNMarkers;
public static String AbstractValidateCommand_DeleteExistingMarkers;
public static String ValidateDelMarkersFromModelCommand_DeleteMarkersFromModel;
@@ -11,6 +11,8 @@ public class Messages extends NLS {
public static String ValidateDelMarkersFromSubtreeCommand_DelMarkersFromSubtree;
public static String ValidateModelCommand_ValidateModel;
public static String ValidateSubtreeCommand_ValidateSubtree;
+ public static String PreferencePage_AutoOpenValidationView;
+ public static String PreferencePage_MarkParents;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/ValidationTool.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/ValidationTool.java
index 833162524db..be93c2467fc 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/ValidationTool.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/ValidationTool.java
@@ -17,7 +17,6 @@ package org.eclipse.papyrus.infra.services.validation;
import java.util.Collection;
import java.util.Collections;
-import java.util.List;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.CoreException;
@@ -32,12 +31,8 @@ import org.eclipse.papyrus.infra.services.markerlistener.providers.IMarkerProvid
import org.eclipse.papyrus.infra.services.markerlistener.providers.WorkspaceMarkerProvider;
import org.eclipse.papyrus.infra.services.markerlistener.util.MarkerListenerUtils;
-@SuppressWarnings("restriction")
public class ValidationTool {
- /** Current element */
- private Object element;
-
/** current eobject */
private EObject eObject;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/AbstractValidateCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/AbstractValidateCommand.java
index 22358c24cc4..d844721108a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/AbstractValidateCommand.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/AbstractValidateCommand.java
@@ -36,6 +36,7 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.papyrus.infra.services.validation.EcoreDiagnostician;
import org.eclipse.papyrus.infra.services.validation.IPapyrusDiagnostician;
+import org.eclipse.papyrus.infra.services.validation.Messages;
import org.eclipse.papyrus.infra.services.validation.ValidationTool;
import org.eclipse.papyrus.infra.services.validation.ValidationUtils;
import org.eclipse.papyrus.infra.services.validation.preferences.PreferenceUtils;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/SelectAndValidateModelCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/SelectAndValidateModelCommand.java
index 57b22fd6693..d8b720c56cb 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/SelectAndValidateModelCommand.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/SelectAndValidateModelCommand.java
@@ -23,6 +23,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.papyrus.infra.services.validation.IPapyrusDiagnostician;
+import org.eclipse.papyrus.infra.services.validation.Messages;
import org.eclipse.ui.dialogs.PreferencesUtil;
/**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/SelectAndValidateSubtreeCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/SelectAndValidateSubtreeCommand.java
index 1b7b6bbbc30..00601fd3299 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/SelectAndValidateSubtreeCommand.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/SelectAndValidateSubtreeCommand.java
@@ -23,6 +23,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.papyrus.infra.services.validation.IPapyrusDiagnostician;
+import org.eclipse.papyrus.infra.services.validation.Messages;
import org.eclipse.ui.dialogs.PreferencesUtil;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateDelMarkersFromModelCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateDelMarkersFromModelCommand.java
index 4e9395a2aa7..9c4c070b885 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateDelMarkersFromModelCommand.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateDelMarkersFromModelCommand.java
@@ -16,6 +16,7 @@
package org.eclipse.papyrus.infra.services.validation.commands;
import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -23,8 +24,10 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.transaction.util.TransactionUtil;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.papyrus.infra.services.markerlistener.providers.IMarkerProvider;
import org.eclipse.papyrus.infra.services.markerlistener.util.MarkerListenerUtils;
import org.eclipse.papyrus.infra.services.validation.IPapyrusDiagnostician;
+import org.eclipse.papyrus.infra.services.validation.Messages;
public class ValidateDelMarkersFromModelCommand extends AbstractValidateCommand {
@@ -41,8 +44,9 @@ public class ValidateDelMarkersFromModelCommand extends AbstractValidateCommand
Resource resource = getValidationResource();
if (resource != null) {
try {
- MarkerListenerUtils.getMarkerProvider(getValidationResource())
- .deleteMarkers(resource, monitor);
+ for (IMarkerProvider provider : MarkerListenerUtils.getMarkerProviders(getValidationResource())) {
+ provider.deleteMarkers(resource, monitor, IMarker.PROBLEM, true);
+ }
} catch (CoreException e) {
throw new ExecutionException(Messages.ValidateDelMarkersFromModelCommand_FailedToDeleteMarkers, e);
}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateDelMarkersFromSubtreeCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateDelMarkersFromSubtreeCommand.java
index 0e1bbf0789d..f93089cb246 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateDelMarkersFromSubtreeCommand.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateDelMarkersFromSubtreeCommand.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.transaction.util.TransactionUtil;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.papyrus.infra.services.validation.IPapyrusDiagnostician;
+import org.eclipse.papyrus.infra.services.validation.Messages;
import org.eclipse.papyrus.infra.services.validation.ValidationTool;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateModelCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateModelCommand.java
index 43d686a03dc..f06ee730146 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateModelCommand.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateModelCommand.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.transaction.util.TransactionUtil;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.papyrus.infra.services.validation.IPapyrusDiagnostician;
+import org.eclipse.papyrus.infra.services.validation.Messages;
/**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateSubtreeCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateSubtreeCommand.java
index 3a069670dfe..50f26c13505 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateSubtreeCommand.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/ValidateSubtreeCommand.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.transaction.util.TransactionUtil;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.papyrus.infra.services.validation.IPapyrusDiagnostician;
+import org.eclipse.papyrus.infra.services.validation.Messages;
/**
* Validate a sub-tree (in the sense of ecore containment hierarchy).
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateModelHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateModelHandler.java
index 9569ddda9d0..fe73f1927fc 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateModelHandler.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateModelHandler.java
@@ -20,9 +20,7 @@ import org.eclipse.papyrus.infra.services.validation.EcoreDiagnostician;
import org.eclipse.papyrus.infra.services.validation.commands.SelectAndValidateModelCommand;
/**
- * Action used for pasting either a model element or a shape (i.e. the model element represented
- * by the shape). Delegates to PasteShapeOrElementCommand
- *
+ * Handler for selecting constraints and then validating a model
*/
public class SelectAndValidateModelHandler extends AbstractCommandHandler {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateSubtreeHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateSubtreeHandler.java
index e1628b237c6..727503bdbcb 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateSubtreeHandler.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateSubtreeHandler.java
@@ -20,9 +20,7 @@ import org.eclipse.papyrus.infra.services.validation.EcoreDiagnostician;
import org.eclipse.papyrus.infra.services.validation.commands.SelectAndValidateSubtreeCommand;
/**
- * Action used for pasting either a model element or a shape (i.e. the model element represented
- * by the shape). Delegates to PasteShapeOrElementCommand
- *
+ * Handler for selecting constraints and then validating a subtree
*/
public class SelectAndValidateSubtreeHandler extends AbstractCommandHandler {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromModelHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromModelHandler.java
index 19f6c3345ad..f4c82ac5fad 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromModelHandler.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromModelHandler.java
@@ -20,9 +20,7 @@ import org.eclipse.papyrus.infra.services.validation.EcoreDiagnostician;
import org.eclipse.papyrus.infra.services.validation.commands.ValidateDelMarkersFromModelCommand;
/**
- * Action used for pasting either a model element or a shape (i.e. the model element represented
- * by the shape). Delegates to PasteShapeOrElementCommand
- *
+ * Handler for deleting markers form the selected model
*/
public class ValidateDelMarkersFromModelHandler extends AbstractCommandHandler {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromSubtreeHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromSubtreeHandler.java
index 2291a799433..91993cf579c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromSubtreeHandler.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromSubtreeHandler.java
@@ -20,9 +20,7 @@ import org.eclipse.papyrus.infra.services.validation.EcoreDiagnostician;
import org.eclipse.papyrus.infra.services.validation.commands.ValidateDelMarkersFromSubtreeCommand;
/**
- * Action used for pasting either a model element or a shape (i.e. the model element represented
- * by the shape). Delegates to PasteShapeOrElementCommand
- *
+ * Handler for deleting markers from selected subtree
*/
public class ValidateDelMarkersFromSubtreeHandler extends AbstractCommandHandler {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateModelHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateModelHandler.java
index 1a87b68ed77..d55842a674a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateModelHandler.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateModelHandler.java
@@ -20,9 +20,7 @@ import org.eclipse.papyrus.infra.services.validation.EcoreDiagnostician;
import org.eclipse.papyrus.infra.services.validation.commands.ValidateModelCommand;
/**
- * Action used for pasting either a model element or a shape (i.e. the model element represented
- * by the shape). Delegates to PasteShapeOrElementCommand
- *
+ * Handler for validating a model
*/
public class ValidateModelHandler extends AbstractCommandHandler {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateSubtreeHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateSubtreeHandler.java
index bd349eee418..c97b34bcdb7 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateSubtreeHandler.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateSubtreeHandler.java
@@ -20,9 +20,7 @@ import org.eclipse.papyrus.infra.services.validation.EcoreDiagnostician;
import org.eclipse.papyrus.infra.services.validation.commands.ValidateSubtreeCommand;
/**
- * Action used for pasting either a model element or a shape (i.e. the model element represented
- * by the shape). Delegates to PasteShapeOrElementCommand
- *
+ * Handler for validating a subtree
*/
public class ValidateSubtreeHandler extends AbstractCommandHandler {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/messages.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/messages.properties
index b7588e0cab7..c92c2d96ba6 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/commands/messages.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/messages.properties
@@ -5,3 +5,5 @@ ValidateDelMarkersFromModelCommand_FailedToDeleteMarkers=Failed to delete all ma
ValidateDelMarkersFromSubtreeCommand_DelMarkersFromSubtree=Delete markers from subtree
ValidateModelCommand_ValidateModel=Validate model
ValidateSubtreeCommand_ValidateSubtree=Validate subtree
+PreferencePage_AutoOpenValidationView=Automatically open the validation view, once validation is finished (and errors/warnings are present)
+PreferencePage_MarkParents=Mark parents of erroneous elements in model explorer
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/PreferencePage.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/PreferencePage.java
index 4646d599aa9..83f40437673 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/PreferencePage.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/preferences/PreferencePage.java
@@ -23,6 +23,7 @@ import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
import org.eclipse.papyrus.infra.core.utils.EditorUtils;
import org.eclipse.papyrus.infra.services.validation.Activator;
+import org.eclipse.papyrus.infra.services.validation.Messages;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
@@ -40,10 +41,10 @@ public class PreferencePage extends FieldEditorPreferencePage implements IWorkbe
{ "&Direct parent", "DIRECT" }, //$NON-NLS-1$//$NON-NLS-2$
{ "&All parents", "ALL" } //$NON-NLS-1$//$NON-NLS-2$
};
- addField(new RadioGroupFieldEditor(PreferenceConstants.HIERARCHICAL_MARKERS, "Mark parents of erroneous elements in model explorer",
+ addField(new RadioGroupFieldEditor(PreferenceConstants.HIERARCHICAL_MARKERS, Messages.PreferencePage_MarkParents,
1, selection, getFieldEditorParent()));
- addField(new BooleanFieldEditor(PreferenceConstants.AUTO_SHOW_VALIDATION_VIEW, "Automatically open the validation view, once validation is finished (and errors/warnings are present)",
+ addField(new BooleanFieldEditor(PreferenceConstants.AUTO_SHOW_VALIDATION_VIEW, Messages.PreferencePage_AutoOpenValidationView,
getFieldEditorParent()));
// stringField1 = new StringFieldEditor("MySTRING1",
// "A &text preference:", getFieldEditorParent());
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 a0ce1c267b8..2e18251a7a3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.xml
@@ -2,103 +2,43 @@
<?eclipse version="3.4"?>
<plugin>
- <extension
+ <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.ValidateModelHandler"
- commandId="org.eclipse.papyrus.validation.ValidateModelCommand">
- <activeWhen>
- <with
- variable="selection">
- <iterate
- ifEmpty="false"
- operator="or">
- <instanceof
- value="org.eclipse.emf.ecore.EObject">
- </instanceof>
- </iterate>
- </with>
- </activeWhen>
- </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.ValidateSubtreeHandler"
- commandId="org.eclipse.papyrus.validation.ValidateSubtreeCommand">
- <activeWhen>
- <with
- variable="selection">
- <iterate
- ifEmpty="false"
- operator="or">
- <instanceof
- value="org.eclipse.emf.ecore.EObject">
- </instanceof>
- </iterate>
- </with>
- </activeWhen>
- </handler>
- <handler
- class="org.eclipse.papyrus.uml.service.validation.handler.SelectAndValidateSubtreeHandler"
- commandId="org.eclipse.papyrus.validation.SelectAndValidateSubtreeCommand">
- <activeWhen>
- <with
- variable="selection">
- <iterate
- ifEmpty="false"
- operator="or">
- <instanceof
- value="org.eclipse.emf.ecore.EObject">
- </instanceof>
- </iterate>
- </with>
- </activeWhen>
- </handler>
- <handler
- class="org.eclipse.papyrus.uml.service.validation.handler.SelectAndValidateModelHandler"
- commandId="org.eclipse.papyrus.validation.SelectAndValidateModelCommand">
- <activeWhen>
- <with
- variable="selection">
- <iterate
- ifEmpty="false"
- operator="or">
- <instanceof
- value="org.eclipse.emf.ecore.EObject">
- </instanceof>
- </iterate>
- </with>
- </activeWhen>
- </handler>
- <handler
- class="org.eclipse.papyrus.uml.service.validation.handler.ValidateDelMarkersFromModelHandler"
- commandId="org.eclipse.papyrus.validation.ValidateDelMarkersFromModelCommand">
- <activeWhen>
- <with
- variable="selection">
- <iterate
- ifEmpty="false"
- operator="or">
- <instanceof
- value="org.eclipse.emf.ecore.EObject">
- </instanceof>
- </iterate>
- </with>
- </activeWhen>
- </handler>
- <handler
- class="org.eclipse.papyrus.validation.ValidateDelMarkersFromSubtreeCommand"
- commandId="org.eclipse.papyrus.uml.service.validation.handler6">
- <activeWhen>
- <with
- variable="selection">
- <iterate
- ifEmpty="false"
- operator="or">
- <instanceof
- value="org.eclipse.emf.ecore.EObject">
- </instanceof>
- </iterate>
- </with>
- </activeWhen>
- </handler>
- </extension>
+ 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>
</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
index f6b94d7cc18..c0f5c2ff8cd 100644
--- 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
@@ -20,9 +20,7 @@ import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHand
import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
/**
- * Action used for pasting either a model element or a shape (i.e. the model element represented
- * by the shape). Delegates to PasteShapeOrElementCommand
- *
+ * Handler for selecting constraints and then validating a model
*/
public class SelectAndValidateModelHandler extends AbstractCommandHandler {
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
index 765a2241cd4..e81b365685b 100644
--- 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
@@ -20,9 +20,7 @@ import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHand
import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
/**
- * Action used for pasting either a model element or a shape (i.e. the model element represented
- * by the shape). Delegates to PasteShapeOrElementCommand
- *
+ * Handler for selecting constraints and then validating a subtree
*/
public class SelectAndValidateSubtreeHandler extends AbstractCommandHandler {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateDelMarkersFromModelHandler.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateDelMarkersFromModelHandler.java
deleted file mode 100644
index a5ebe4a2aa5..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateDelMarkersFromModelHandler.java
+++ /dev/null
@@ -1,34 +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.ValidateDelMarkersFromModelCommand;
-import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHandler;
-import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
-
-/**
- * Action used for pasting either a model element or a shape (i.e. the model element represented
- * by the shape). Delegates to PasteShapeOrElementCommand
- *
- */
-public class ValidateDelMarkersFromModelHandler extends AbstractCommandHandler {
-
- @Override
- protected Command getCommand() {
- // not useful to cache command, since selected element may change
- return new GMFtoEMFCommandWrapper(new ValidateDelMarkersFromModelCommand(getSelectedElement(), new UMLDiagnostician()));
- }
-}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateDelMarkersFromSubtreeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateDelMarkersFromSubtreeHandler.java
deleted file mode 100644
index 3183d4b30b6..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateDelMarkersFromSubtreeHandler.java
+++ /dev/null
@@ -1,34 +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.ValidateDelMarkersFromSubtreeCommand;
-import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHandler;
-import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
-
-/**
- * Action used for pasting either a model element or a shape (i.e. the model element represented
- * by the shape). Delegates to PasteShapeOrElementCommand
- *
- */
-public class ValidateDelMarkersFromSubtreeHandler extends AbstractCommandHandler {
-
- @Override
- protected Command getCommand() {
- // not useful to cache command, since selected element may change
- return new GMFtoEMFCommandWrapper(new ValidateDelMarkersFromSubtreeCommand(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
index 1d11dc60c86..8cd72eb1e3c 100644
--- 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
@@ -20,9 +20,7 @@ import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHand
import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
/**
- * Action used for pasting either a model element or a shape (i.e. the model element represented
- * by the shape). Delegates to PasteShapeOrElementCommand
- *
+ * Handler for validating a model.
*/
public class ValidateModelHandler extends AbstractCommandHandler {
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
index e53ee277849..9f0237ad2ce 100644
--- 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
@@ -20,9 +20,7 @@ import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHand
import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
/**
- * Action used for pasting either a model element or a shape (i.e. the model element represented
- * by the shape). Delegates to PasteShapeOrElementCommand
- *
+ * Handler for validating a subtree
*/
public class ValidateSubtreeHandler extends AbstractCommandHandler {

Back to the top