Merge branch 'develop' into 'master'

#616 develop to master for v1.0-M1

See merge request eclipse/escet/escet!631

.mvn/extensions.xml

@@ -13,6 +13,6 @@
     <extension>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-build</artifactId>
-        <version>2.7.5</version>
+        <version>4.0.1</version>
     </extension>
 </extensions>

Jenkinsfile

@@ -21,7 +21,7 @@ pipeline {
 
     tools {
         jdk 'openjdk-jdk17-latest'
-        maven 'apache-maven-3.8.6'
+        maven 'apache-maven-3.9.0'
     }
 
     options {

SECURITY.asciidoc

@@ -10,4 +10,14 @@ Whenever the Eclipse ESCET project fixes a vulnerability, it will be included in
 
 == Reporting a Vulnerability
 
-We recommend that in case of suspected vulnerabilities you do not use the ESCET public issue tracker, but instead contact the Eclipse Security Team directly via security@eclipse.org.
+We recommend that in case of suspected vulnerabilities you do not use the ESCET public issue tracker, but instead use one of the following options:
+
+* Report the vulnerability to the Eclipse Security Team, by creating an issue in their dedicated GitLab project:
+** Go to https://gitlab.eclipse.org.
+** Log in with your Eclipse Foundation account.
+** Go to https://gitlab.eclipse.org/security/vulnerability-reports/-/issues/new?issuable_template=new_vulnerability.
+** Fill in the template as completely as possible.
+** Click _Create issue_.
+
+* Contact the Eclipse Security Team directly via security@eclipse-foundation.org.
+Please clearly mention that the suspected vulnerability affects the Eclipse ESCET project.

chi/org.eclipse.escet.chi.codegen/META-INF/MANIFEST.MF

@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ESCET Chi Java Code Generator (Incubation)
 Bundle-SymbolicName: org.eclipse.escet.chi.codegen;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse ESCET
-Require-Bundle: org.eclipse.escet.chi.metamodel;bundle-version="0.10.0",
- org.eclipse.escet.chi.metamodel.java;bundle-version="0.10.0",
- org.eclipse.escet.common.box;bundle-version="0.10.0",
- org.eclipse.escet.common.java;bundle-version="0.10.0",
- org.eclipse.escet.chi.typecheck;bundle-version="0.10.0",
- org.eclipse.escet.common.position.metamodel;bundle-version="0.10.0",
- org.eclipse.escet.chi.runtime;bundle-version="0.10.0",
- org.eclipse.escet.common.position.common;bundle-version="0.10.0"
+Require-Bundle: org.eclipse.escet.chi.metamodel;bundle-version="1.0.0",
+ org.eclipse.escet.chi.metamodel.java;bundle-version="1.0.0",
+ org.eclipse.escet.common.box;bundle-version="1.0.0",
+ org.eclipse.escet.common.java;bundle-version="1.0.0",
+ org.eclipse.escet.chi.typecheck;bundle-version="1.0.0",
+ org.eclipse.escet.common.position.metamodel;bundle-version="1.0.0",
+ org.eclipse.escet.chi.runtime;bundle-version="1.0.0",
+ org.eclipse.escet.common.position.common;bundle-version="1.0.0"
 Import-Package: org.junit.jupiter.api;version="5.9.2"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-17

chi/org.eclipse.escet.chi.documentation.utils/META-INF/MANIFEST.MF

@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ESCET Chi Documentation Utils (Incubation)
 Bundle-SymbolicName: org.eclipse.escet.chi.documentation.utils;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse ESCET
 Automatic-Module-Name: org.eclipse.escet.chi.documentation.utils
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.apache.commons.math3;bundle-version="3.5.0",
- org.eclipse.escet.common.java;bundle-version="0.10.0"
+ org.eclipse.escet.common.java;bundle-version="1.0.0"
 Export-Package: org.eclipse.escet.chi.documentation.utils

chi/org.eclipse.escet.chi.documentation/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ESCET Chi Documentation (Incubation)
 Bundle-SymbolicName: org.eclipse.escet.chi.documentation;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse ESCET
 Require-Bundle: org.eclipse.help

chi/org.eclipse.escet.chi.documentation/asciidoc/release-notes.asciidoc

@@ -22,6 +22,10 @@ The release notes for the versions of Chi and the associated tools, as part of t
 
 See also the Eclipse ESCET link:https://eclipse.dev/escet/{escet-website-version}/release-notes.html[toolkit release notes] covering those aspects that are common to the various Eclipse ESCET tools.
 
+=== Version 1.0
+
+TBD
+
 === Version 0.10 (2023-06-30)
 
 Improvements and fixes:

chi/org.eclipse.escet.chi.documentation/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.eclipse.escet</groupId>
         <artifactId>org.eclipse.escet.root</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 
@@ -49,7 +49,6 @@
                                 ${project.build.directory}/eclipse-help-intermediate/documentation.html
                             </outputFile>
                             <backend>html5</backend>
-                            <sourceHighlighter>coderay</sourceHighlighter>
                             <logHandler>
                                 <failIf>
                                     <severity>DEBUG</severity>
@@ -63,6 +62,7 @@
                                 <sectanchors>false</sectanchors>
                                 <html-output>true</html-output>
                                 <eclipse-help-output>true</eclipse-help-output>
+                                <source-highlighter>coderay</source-highlighter>
                             </attributes>
                         </configuration>
                     </execution>
@@ -77,7 +77,6 @@
                                 ${project.build.directory}/website-intermediate/eclipse-escet-incubation-chi-manual.pdf
                             </outputFile>
                             <backend>pdf</backend>
-                            <sourceHighlighter>coderay</sourceHighlighter>
                             <logHandler>
                                 <failIf>
                                     <severity>DEBUG</severity>
@@ -93,6 +92,7 @@
                                 <toc />
                                 <toclevels>2</toclevels>
                                 <pdf-output>true</pdf-output>
+                                <source-highlighter>coderay</source-highlighter>
                             </attributes>
                         </configuration>
                     </execution>
@@ -105,7 +105,6 @@
                         <configuration>
                             <outputFile>${project.build.directory}/website-intermediate/documentation.html</outputFile>
                             <backend>html5</backend>
-                            <sourceHighlighter>coderay</sourceHighlighter>
                             <logHandler>
                                 <failIf>
                                     <severity>DEBUG</severity>
@@ -121,6 +120,7 @@
                                 <sectanchors>true</sectanchors>
                                 <html-output>true</html-output>
                                 <website-output>true</website-output>
+                                <source-highlighter>coderay</source-highlighter>
                             </attributes>
                         </configuration>
                     </execution>

chi/org.eclipse.escet.chi.feature/feature.xml

@@ -13,11 +13,11 @@
 <feature
       id="org.eclipse.escet.chi.feature"
       label="ESCET Chi (Incubation)"
-      version="0.10.0.qualifier"
+      version="1.0.0.qualifier"
       provider-name="Eclipse ESCET"
       plugin="org.eclipse.escet.product.branding"
       license-feature="org.eclipse.escet.releng.license.mit"
-      license-feature-version="0.10.0.qualifier">
+      license-feature-version="1.0.0.qualifier">
 
    <description>
       Eclipse ESCET tooling for the Chi language.
@@ -32,8 +32,8 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.escet.common.feature" version="0.10.0.qualifier"/>
-      <import feature="org.eclipse.escet.setext.feature" version="0.10.0.qualifier"/>
+      <import feature="org.eclipse.escet.common.feature" version="1.0.0" match="compatible"/>
+      <import feature="org.eclipse.escet.setext.feature" version="1.0.0" match="compatible"/>
       <import plugin="org.apache.commons.math3"/>
    </requires>
 

chi/org.eclipse.escet.chi.metamodel.java/META-INF/MANIFEST.MF

@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ESCET Chi Java Model Constructors (Incubation)
 Bundle-SymbolicName: org.eclipse.escet.chi.metamodel.java;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse ESCET
-Require-Bundle: org.eclipse.escet.chi.metamodel;bundle-version="0.10.0",
- org.eclipse.escet.common.position.metamodel;bundle-version="0.10.0"
+Require-Bundle: org.eclipse.escet.chi.metamodel;bundle-version="1.0.0",
+ org.eclipse.escet.common.position.metamodel;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.escet.chi.metamodel.java

chi/org.eclipse.escet.chi.metamodel/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.escet.chi.metamodel;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,7 +12,7 @@ Export-Package: org.eclipse.escet.chi.metamodel.chi,
  org.eclipse.escet.chi.metamodel.chi.util
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.17.0",
  org.eclipse.emf.ecore;bundle-version="2.20.0";visibility:=reexport,
- org.eclipse.escet.common.position.metamodel;bundle-version="0.10.0";visibility:=reexport,
- org.eclipse.escet.common.emf.ecore.xmi;bundle-version="0.10.0"
+ org.eclipse.escet.common.position.metamodel;bundle-version="1.0.0";visibility:=reexport,
+ org.eclipse.escet.common.emf.ecore.xmi;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.escet.chi.metamodel

chi/org.eclipse.escet.chi.parser/META-INF/MANIFEST.MF

@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ESCET Chi Parser (Incubation)
 Bundle-SymbolicName: org.eclipse.escet.chi.parser;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse ESCET
-Require-Bundle: org.eclipse.escet.chi.metamodel.java;bundle-version="0.10.0",
- org.eclipse.escet.chi.metamodel;bundle-version="0.10.0",
- org.eclipse.escet.common.emf;bundle-version="0.10.0",
- org.eclipse.escet.common.java;bundle-version="0.10.0",
- org.eclipse.escet.common.position.metamodel;bundle-version="0.10.0",
- org.eclipse.escet.setext.runtime;bundle-version="0.10.0",
- org.eclipse.escet.common.position.common;bundle-version="0.10.0",
+Require-Bundle: org.eclipse.escet.chi.metamodel.java;bundle-version="1.0.0",
+ org.eclipse.escet.chi.metamodel;bundle-version="1.0.0",
+ org.eclipse.escet.common.emf;bundle-version="1.0.0",
+ org.eclipse.escet.common.java;bundle-version="1.0.0",
+ org.eclipse.escet.common.position.metamodel;bundle-version="1.0.0",
+ org.eclipse.escet.setext.runtime;bundle-version="1.0.0",
+ org.eclipse.escet.common.position.common;bundle-version="1.0.0",
  org.eclipse.jface.text;bundle-version="3.16.100"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy

chi/org.eclipse.escet.chi.runtime/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ESCET Chi Runtime (Incubation)
 Bundle-SymbolicName: org.eclipse.escet.chi.runtime;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse ESCET
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.eclipse.escet.chi.runtime,
@@ -10,11 +10,11 @@ Export-Package: org.eclipse.escet.chi.runtime,
  org.eclipse.escet.chi.runtime.data.io,
  org.eclipse.escet.chi.runtime.data.random
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.escet.common.java;bundle-version="0.10.0",
- org.eclipse.escet.common.app.framework;bundle-version="0.10.0",
+Require-Bundle: org.eclipse.escet.common.java;bundle-version="1.0.0",
+ org.eclipse.escet.common.app.framework;bundle-version="1.0.0",
  org.apache.commons.math3;bundle-version="3.5.0",
- org.eclipse.escet.common.svg;bundle-version="0.10.0",
- org.eclipse.escet.common.eclipse.ui;bundle-version="0.10.0",
+ org.eclipse.escet.common.svg;bundle-version="1.0.0",
+ org.eclipse.escet.common.eclipse.ui;bundle-version="1.0.0",
  org.w3c.dom.svg;bundle-version="1.1.0",
  org.apache.batik.bridge;bundle-version="1.14.0",
  org.apache.commons.lang3;bundle-version="3.1.0"

chi/org.eclipse.escet.chi.simulator.ui/META-INF/MANIFEST.MF

@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ESCET Chi Simulator UI (Incubation)
 Bundle-SymbolicName: org.eclipse.escet.chi.simulator.ui;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse ESCET
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.core.resources;bundle-version="3.13.600",
- org.eclipse.escet.common.eclipse.ui;bundle-version="0.10.0",
- org.eclipse.escet.common.app.framework;bundle-version="0.10.0",
- org.eclipse.escet.chi.simulator;bundle-version="0.10.0",
+ org.eclipse.escet.common.eclipse.ui;bundle-version="1.0.0",
+ org.eclipse.escet.common.app.framework;bundle-version="1.0.0",
+ org.eclipse.escet.chi.simulator;bundle-version="1.0.0",
  org.eclipse.jface.text;bundle-version="3.16.100"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.escet.chi.simulator.ui

chi/org.eclipse.escet.chi.simulator/META-INF/MANIFEST.MF

@@ -2,24 +2,24 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ESCET Chi Simulator (Incubation)
 Bundle-SymbolicName: org.eclipse.escet.chi.simulator;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse ESCET
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.eclipse.escet.chi.simulator,
  org.eclipse.escet.chi.simulator.options
-Require-Bundle: org.eclipse.escet.common.app.framework;bundle-version="0.10.0",
- org.eclipse.escet.common.java;bundle-version="0.10.0",
- org.eclipse.escet.chi.runtime;bundle-version="0.10.0",
+Require-Bundle: org.eclipse.escet.common.app.framework;bundle-version="1.0.0",
+ org.eclipse.escet.common.java;bundle-version="1.0.0",
+ org.eclipse.escet.chi.runtime;bundle-version="1.0.0",
  org.apache.commons.math3;bundle-version="3.5.0",
- org.eclipse.escet.chi.metamodel;bundle-version="0.10.0",
- org.eclipse.escet.chi.parser;bundle-version="0.10.0",
- org.eclipse.escet.chi.typecheck;bundle-version="0.10.0",
- org.eclipse.escet.common.typechecker;bundle-version="0.10.0",
+ org.eclipse.escet.chi.metamodel;bundle-version="1.0.0",
+ org.eclipse.escet.chi.parser;bundle-version="1.0.0",
+ org.eclipse.escet.chi.typecheck;bundle-version="1.0.0",
+ org.eclipse.escet.common.typechecker;bundle-version="1.0.0",
  org.eclipse.emf.ecore;bundle-version="2.20.0",
- org.eclipse.escet.chi.codegen;bundle-version="0.10.0",
- org.eclipse.escet.common.box;bundle-version="0.10.0",
+ org.eclipse.escet.chi.codegen;bundle-version="1.0.0",
+ org.eclipse.escet.common.box;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.17.0",
- org.eclipse.escet.setext.runtime;bundle-version="0.10.0",
+ org.eclipse.escet.setext.runtime;bundle-version="1.0.0",
  org.eclipse.ui;bundle-version="3.115.0"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.escet.chi.simulator

chi/org.eclipse.escet.chi.tests/META-INF/MANIFEST.MF

@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ESCET Chi Tests (Incubation)
 Bundle-SymbolicName: org.eclipse.escet.chi.tests;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse ESCET
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.junit;bundle-version="4.12.0",
- org.eclipse.escet.common.app.framework;bundle-version="0.10.0",
- org.eclipse.escet.tooldef.interpreter;bundle-version="0.10.0",
- org.eclipse.escet.chi.simulator;bundle-version="0.10.0",
- org.eclipse.escet.chi.tooldefs;bundle-version="0.10.0"
+Require-Bundle: org.eclipse.escet.common.app.framework;bundle-version="1.0.0",
+ org.eclipse.escet.tooldef.interpreter;bundle-version="1.0.0",
+ org.eclipse.escet.chi.simulator;bundle-version="1.0.0",
+ org.eclipse.escet.chi.tooldefs;bundle-version="1.0.0"
+Import-Package: org.junit.jupiter.api;version="5.9.2"
 Export-Package: org.eclipse.escet.chi.tests
 Automatic-Module-Name: org.eclipse.escet.chi.tests

chi/org.eclipse.escet.chi.tests/src-test/org/eclipse/escet/chi/tests/ChiTest.java

@@ -14,7 +14,7 @@
 package org.eclipse.escet.chi.tests;
 
 import org.eclipse.escet.tooldef.interpreter.ToolDefBasedPluginUnitTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Chi integration and regression tests. */
 public class ChiTest extends ToolDefBasedPluginUnitTest {

chi/org.eclipse.escet.chi.tests/test-chi-integration.launch

@@ -22,7 +22,7 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.escet.chi.tests.ChiTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

chi/org.eclipse.escet.chi.texteditor/META-INF/MANIFEST.MF

@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ESCET Chi Text Editor (Incubation)
 Bundle-SymbolicName: org.eclipse.escet.chi.texteditor;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse ESCET
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.escet.chi.parser;bundle-version="0.10.0",
+Require-Bundle: org.eclipse.escet.chi.parser;bundle-version="1.0.0",
  org.eclipse.jface.text;bundle-version="3.16.100",
- org.eclipse.escet.common.eclipse.ui;bundle-version="0.10.0",
- org.eclipse.escet.chi.metamodel;bundle-version="0.10.0",
- org.eclipse.escet.chi.typecheck;bundle-version="0.10.0",
- org.eclipse.escet.common.typechecker;bundle-version="0.10.0",
- org.eclipse.escet.common.position.metamodel;bundle-version="0.10.0",
+ org.eclipse.escet.common.eclipse.ui;bundle-version="1.0.0",
+ org.eclipse.escet.chi.metamodel;bundle-version="1.0.0",
+ org.eclipse.escet.chi.typecheck;bundle-version="1.0.0",
+ org.eclipse.escet.common.typechecker;bundle-version="1.0.0",
+ org.eclipse.escet.common.position.metamodel;bundle-version="1.0.0",
  org.eclipse.core.resources;bundle-version="3.13.600",
  org.eclipse.ui.editors;bundle-version="3.13.0",
- org.eclipse.escet.setext.texteditorbase;bundle-version="0.10.0",
- org.eclipse.escet.setext.runtime;bundle-version="0.10.0",
- org.eclipse.escet.common.java;bundle-version="0.10.0",
+ org.eclipse.escet.setext.texteditorbase;bundle-version="1.0.0",
+ org.eclipse.escet.setext.runtime;bundle-version="1.0.0",
+ org.eclipse.escet.common.java;bundle-version="1.0.0",
  org.eclipse.ui.ide;bundle-version="3.18.200",
- org.eclipse.escet.common.app.framework;bundle-version="0.10.0"
+ org.eclipse.escet.common.app.framework;bundle-version="1.0.0"
 Automatic-Module-Name: org.eclipse.escet.chi.texteditor
 Export-Package: org.eclipse.escet.chi.texteditor