diff options
Diffstat (limited to 'plugins/infra')
3 files changed, 15 insertions, 6 deletions
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/EcoreDiagnostician.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/EcoreDiagnostician.java index 25c89b5c292..0a06f3af747 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/EcoreDiagnostician.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/EcoreDiagnostician.java @@ -32,7 +32,16 @@ public class EcoreDiagnostician extends Diagnostician implements IPapyrusDiagnos protected AdapterFactory adapterFactory;
protected IProgressMonitor progressMonitor;
+ /**
+ * Create diagnostician with custom validator (that must subclass ECore validator)
+ * @param validatorAdapter custom validator adapter
+ */
+ public EcoreDiagnostician(EValidatorAdapter validatorAdapter) {
+ this.validatorAdapter = validatorAdapter;
+ }
+
public EcoreDiagnostician() {
+ validatorAdapter = new EValidatorAdapter();
}
public void initialize (final AdapterFactory adapterFactory, final IProgressMonitor progressMonitor) {
@@ -40,7 +49,7 @@ public class EcoreDiagnostician extends Diagnostician implements IPapyrusDiagnos this.progressMonitor=progressMonitor;
}
- protected EValidatorAdapter validatorAdapter = new EValidatorAdapter();
+ protected EValidatorAdapter validatorAdapter;
@Override
public String getObjectLabel(EObject eObject) {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/ValidationFunctions.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/ValidationFunctions.java index 553d5dfc013..efa81b4be64 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/ValidationFunctions.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/ValidationFunctions.java @@ -29,11 +29,11 @@ import org.eclipse.ui.PlatformUI; public class ValidationFunctions implements IDecorationSpecificFunctions { - public static final String error_co = "icons/etool16/error_co.gif"; + public static final String error_co = "icons/etool16/error_co.gif"; //$NON-NLS-1$ - public static final String warning_co = "icons/etool16/warning_co.gif"; + public static final String warning_co = "icons/etool16/warning_co.gif"; //$NON-NLS-1$ - public static final String info_co = "icons/etool16/info_co.gif"; + public static final String info_co = "icons/etool16/info_co.gif"; //$NON-NLS-1$ /** * Return the image descriptor associated with an validation marker @@ -104,7 +104,7 @@ public class ValidationFunctions implements IDecorationSpecificFunctions { public String getMessage(IPapyrusMarker marker) { // message is stored within marker - return marker.getAttribute(IPapyrusMarker.MESSAGE, ""); + return marker.getAttribute(IPapyrusMarker.MESSAGE, ""); //$NON-NLS-1$ } public int getPriority(IPapyrusMarker marker) { 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 33eadfffb1f..22358c24cc4 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 @@ -96,7 +96,7 @@ abstract public class AbstractValidateCommand extends AbstractTransactionalComma super(domain, label, Collections.EMPTY_LIST); this.domain = domain; this.selectedElement = selectedElement; - this.diagnostician= diagnostician; + this.diagnostician = diagnostician; this.showUIfeedback = true; // default is true; } |