From f7825893af4be448f1eb4484c9829c5ce37e3906 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 17 Dec 2022 19:02:47 +0300 Subject: [PATCH 1/7] RGM should [optionally] supply a bundle [fragment] with .html pages #156 Update target to SimRel 2022-12 Signed-off-by: Alexander Fedorov --- .../ru.arsysop.loft.rgm.target.target | 99 +++++-------------- 1 file changed, 27 insertions(+), 72 deletions(-) diff --git a/releng/ru.arsysop.loft.rgm.target/ru.arsysop.loft.rgm.target.target b/releng/ru.arsysop.loft.rgm.target/ru.arsysop.loft.rgm.target.target index d7b503071..99fa68e92 100644 --- a/releng/ru.arsysop.loft.rgm.target/ru.arsysop.loft.rgm.target.target +++ b/releng/ru.arsysop.loft.rgm.target/ru.arsysop.loft.rgm.target.target @@ -14,51 +14,54 @@ # or other consequences of any sort that using RGM Sources can cause to you # (as an individual or Legal Entity), even if aware of such consequences. # ---> - - +--> - + - + + + + + + - + - + - + - + - + - + - + @@ -66,82 +69,34 @@ - + - + - + - + - - - com.fasterxml.jackson.core - jackson-annotations - 2.11.4 - jar - - - - - - - com.fasterxml.jackson.core - jackson-core - 2.11.4 - jar - - - - - - - com.fasterxml.jackson.core - jackson-databind - 2.11.4 - jar - - - - - - - com.github.jtidy - jtidy - 1.0.2 - jar - - - - - - - org.dom4j - dom4j - 2.1.3 - jar - - + com.github.jtidy + jtidy + 1.0.2 + jar - - - org.emfjson - emfjson-jackson - 1.3.0 - jar - - + org.dom4j + dom4j + 2.1.3 + jar \ No newline at end of file From 15387f5205ee7512538f865d9c2d1f5e79e2250e Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 17 Dec 2022 19:36:35 +0300 Subject: [PATCH 2/7] RGM should [optionally] supply a bundle [fragment] with .html pages #156 Remove EMF JSON from rgm.base.emf Signed-off-by: Alexander Fedorov --- .../META-INF/MANIFEST.MF | 6 +--- .../ru.arsysop.loft.rgm.target.target | 33 ++++++++++++------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/bundles/ru.arsysop.loft.rgm.base.emf/META-INF/MANIFEST.MF b/bundles/ru.arsysop.loft.rgm.base.emf/META-INF/MANIFEST.MF index 0c09c047b..221d88b4f 100644 --- a/bundles/ru.arsysop.loft.rgm.base.emf/META-INF/MANIFEST.MF +++ b/bundles/ru.arsysop.loft.rgm.base.emf/META-INF/MANIFEST.MF @@ -6,13 +6,9 @@ Bundle-Version: 0.2.0.qualifier Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.11.4";visibility:=reexport, - com.fasterxml.jackson.core.jackson-core;bundle-version="2.11.4";visibility:=reexport, - com.fasterxml.jackson.core.jackson-databind;bundle-version="2.11.4";visibility:=reexport, - org.eclipse.core.runtime;bundle-version="0.0.0", +Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0", org.eclipse.emf.ecore.xmi;bundle-version="0.0.0", org.eclipse.emf.edit;bundle-version="0.0.0";visibility:=reexport, - org.emfjson.jackson;bundle-version="1.3.0";visibility:=reexport, ru.arsysop.loft.rgm.seal;bundle-version="0.0.0" Bundle-ActivationPolicy: lazy Export-Package: ru.arsysop.loft.rgm.base.emf.command, diff --git a/releng/ru.arsysop.loft.rgm.target/ru.arsysop.loft.rgm.target.target b/releng/ru.arsysop.loft.rgm.target/ru.arsysop.loft.rgm.target.target index 99fa68e92..95f15125b 100644 --- a/releng/ru.arsysop.loft.rgm.target/ru.arsysop.loft.rgm.target.target +++ b/releng/ru.arsysop.loft.rgm.target/ru.arsysop.loft.rgm.target.target @@ -14,7 +14,8 @@ # or other consequences of any sort that using RGM Sources can cause to you # (as an individual or Legal Entity), even if aware of such consequences. # ---> +--> + @@ -86,17 +87,25 @@ - - com.github.jtidy - jtidy - 1.0.2 - jar - - - org.dom4j - dom4j - 2.1.3 - jar + + + + com.github.jtidy + jtidy + 1.0.2 + jar + + + + + + + org.dom4j + dom4j + 2.1.3 + jar + + \ No newline at end of file From 1128c6bcff296da47a0a95b0e52092ceb30ffe64 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 17 Dec 2022 19:39:08 +0300 Subject: [PATCH 3/7] RGM should [optionally] supply a bundle [fragment] with .html pages #156 Remove EMF JSON from rgm.base.feature Signed-off-by: Alexander Fedorov --- .../feature.xml | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/features/ru.arsysop.loft.rgm.base.feature/feature.xml b/features/ru.arsysop.loft.rgm.base.feature/feature.xml index f37ff1f06..746e97355 100644 --- a/features/ru.arsysop.loft.rgm.base.feature/feature.xml +++ b/features/ru.arsysop.loft.rgm.base.feature/feature.xml @@ -48,32 +48,4 @@ version="0.0.0" unpack="false"/> - - - - - - - - From 1006e591b87d330ce52942b6b8d444fe6b8072cc Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 17 Dec 2022 19:41:22 +0300 Subject: [PATCH 4/7] RGM should [optionally] supply a bundle [fragment] with .html pages #156 Switch to Tycho 2.7.5 Signed-off-by: Alexander Fedorov --- .mvn/extensions.xml | 6 +++--- releng/ru.arsysop.loft.rgm.parent/pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 1f6a1e868..8d6f3346f 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -17,8 +17,8 @@ - org.eclipse.tycho.extras - tycho-pomless - 2.5.0 + org.eclipse.tycho + tycho-build + 2.7.5 \ No newline at end of file diff --git a/releng/ru.arsysop.loft.rgm.parent/pom.xml b/releng/ru.arsysop.loft.rgm.parent/pom.xml index b0d1bd70c..9db6907da 100644 --- a/releng/ru.arsysop.loft.rgm.parent/pom.xml +++ b/releng/ru.arsysop.loft.rgm.parent/pom.xml @@ -37,7 +37,7 @@ ${unqualifiedVersion}.${buildQualifier} scm:git:https://github.com/arsysop/loft-rgm.git - 2.5.0 + 2.7.5 1.3.1 https://repo.eclipse.org/content/repositories/tycho-snapshots/ From 54dc4606dd870f58d9df48081baef135b9183d7f Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 17 Dec 2022 19:44:36 +0300 Subject: [PATCH 5/7] RGM should [optionally] supply a bundle [fragment] with .html pages #156 Add encoding preferences Signed-off-by: Alexander Fedorov --- .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ 19 files changed, 38 insertions(+) create mode 100644 bundles/ru.arsysop.loft.rgm.base.emf/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm.base.workbench/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm.cxxdraft/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm.markup.ecore/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm.markup.edit/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm.markup.editor/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm.markup.model/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm.seal/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm.spec.ecore/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm.spec.edit/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm.spec.editor/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm.spec.workbench/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm.spec.workspace/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm.synopsis.ecore/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm.synopsis.edit/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm.synopsis.editor/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm.synopsis.model/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/ru.arsysop.loft.rgm/.settings/org.eclipse.core.resources.prefs create mode 100644 tests/ru.arsysop.loft.rgm.cxxdraft.tests/.settings/org.eclipse.core.resources.prefs diff --git a/bundles/ru.arsysop.loft.rgm.base.emf/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.base.emf/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.base.emf/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.base.workbench/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.base.workbench/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.base.workbench/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.cxxdraft/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.cxxdraft/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.cxxdraft/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.markup.ecore/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.markup.ecore/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.markup.ecore/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.markup.edit/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.markup.edit/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.markup.edit/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.markup.editor/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.markup.editor/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.markup.editor/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.markup.model/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.markup.model/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.markup.model/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.seal/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.seal/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.seal/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.spec.ecore/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.spec.ecore/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.spec.ecore/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.spec.edit/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.spec.edit/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.spec.edit/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.spec.editor/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.spec.editor/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.spec.editor/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.spec.workbench/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.spec.workbench/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.spec.workbench/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.spec.workspace/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.spec.workspace/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.spec.workspace/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.synopsis.ecore/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.synopsis.ecore/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.synopsis.ecore/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.synopsis.edit/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.synopsis.edit/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.synopsis.edit/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.synopsis.editor/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.synopsis.editor/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.synopsis.editor/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.synopsis.model/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.synopsis.model/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.synopsis.model/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/tests/ru.arsysop.loft.rgm.cxxdraft.tests/.settings/org.eclipse.core.resources.prefs b/tests/ru.arsysop.loft.rgm.cxxdraft.tests/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/tests/ru.arsysop.loft.rgm.cxxdraft.tests/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 From c5de95be9de5f8c91c911ccf1295f029117dc00b Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 17 Dec 2022 19:44:54 +0300 Subject: [PATCH 6/7] RGM should [optionally] supply a bundle [fragment] with .html pages #156 Improve .gitignore Signed-off-by: Alexander Fedorov --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f748000e0..063b49ccd 100644 --- a/.gitignore +++ b/.gitignore @@ -33,7 +33,6 @@ hs_err_pid* releng/**/.settings/ #tycho -.polyglot.build.properties .META-INF_MANIFEST.MF -.polyglot..META-INF_MANIFEST.MF +.polyglot.* *.takari_issue_192 From 4d52e07587b49e2674b2fc74eac705fa55a6824d Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 17 Dec 2022 19:45:12 +0300 Subject: [PATCH 7/7] RGM should [optionally] supply a bundle [fragment] with .html pages #156 Improve location resolution Signed-off-by: Alexander Fedorov --- .../ru/arsysop/loft/rgm/cxxdraft/ResolutionContext.java | 4 +++- .../loft/rgm/cxxdraft/base/InvestigateHtmlTree.java | 2 +- .../loft/rgm/cxxdraft/base/SimpleResolutionContext.java | 7 ++++++- .../arsysop/loft/rgm/internal/cxxdraft/TocStructure.java | 4 ++-- .../arsysop/loft/rgm/internal/cxxdraft/element/PickId.java | 2 +- .../cxxdraft/tests/cxx14/integrity/Cxx14IntegrityTest.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../rgm/spec/cpp14/tests/integrity/CxxIntegrityTest.java | 2 +- 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/ResolutionContext.java b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/ResolutionContext.java index 632021d19..ac8d878de 100644 --- a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/ResolutionContext.java +++ b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/ResolutionContext.java @@ -26,7 +26,9 @@ public interface ResolutionContext { Document document(); - String location(); + String rootLocation(); + + String resolveLocation(String suffix); ContentResolution parts(); diff --git a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/base/InvestigateHtmlTree.java b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/base/InvestigateHtmlTree.java index 8a1812e3a..8dde8bead 100644 --- a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/base/InvestigateHtmlTree.java +++ b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/base/InvestigateHtmlTree.java @@ -111,7 +111,7 @@ private void parseLocation(EObject container, SubMonitor split) throws CoreExcep .filter(Part.class::isInstance)// .map(Part.class::cast)// .map(Part::getLocation)// - .orElseGet(context::location); + .orElseGet(context::rootLocation); Structure structure = new StructureSwitch(context, revision).doSwitch(container); new PublishedHtml(location, structure).run(split); } diff --git a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/base/SimpleResolutionContext.java b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/base/SimpleResolutionContext.java index def92a673..bb233a45b 100644 --- a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/base/SimpleResolutionContext.java +++ b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/base/SimpleResolutionContext.java @@ -48,10 +48,15 @@ public SimpleResolutionContext(String location, Document document) { } @Override - public String location() { + public String rootLocation() { return location; } + @Override + public String resolveLocation(String suffix) { + return rootLocation() + suffix; + } + @Override public Document document() { return document; diff --git a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/internal/cxxdraft/TocStructure.java b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/internal/cxxdraft/TocStructure.java index d525b7249..fe5a87a27 100644 --- a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/internal/cxxdraft/TocStructure.java +++ b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/internal/cxxdraft/TocStructure.java @@ -127,7 +127,7 @@ private void completeParagraph(TocChapter chapter, DomElement node, Consumer chapters, Co chapters.accept(chapter); Index index = factory.createIndex(); index.setId(new EncodeId().apply(chapter.getId())); - index.setLocation(context.location() + chapter.getId()); + index.setLocation(context.resolveLocation(chapter.getId())); index.setName(chapter.getName()); chapter.setPart(index); indexes.accept(index); diff --git a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/internal/cxxdraft/element/PickId.java b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/internal/cxxdraft/element/PickId.java index fe134a11f..e0080e8e3 100644 --- a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/internal/cxxdraft/element/PickId.java +++ b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/internal/cxxdraft/element/PickId.java @@ -29,7 +29,7 @@ public PickId(ResolutionContext context) { @Override public String apply(String link) { - return link.replace(context.location(), ""); //$NON-NLS-1$ + return link.replace(context.rootLocation(), ""); //$NON-NLS-1$ } } diff --git a/tests/ru.arsysop.loft.rgm.cxxdraft.tests/src/ru/arsysop/loft/rgm/cxxdraft/tests/cxx14/integrity/Cxx14IntegrityTest.java b/tests/ru.arsysop.loft.rgm.cxxdraft.tests/src/ru/arsysop/loft/rgm/cxxdraft/tests/cxx14/integrity/Cxx14IntegrityTest.java index 67b2d7059..2fc4ccb7e 100644 --- a/tests/ru.arsysop.loft.rgm.cxxdraft.tests/src/ru/arsysop/loft/rgm/cxxdraft/tests/cxx14/integrity/Cxx14IntegrityTest.java +++ b/tests/ru.arsysop.loft.rgm.cxxdraft.tests/src/ru/arsysop/loft/rgm/cxxdraft/tests/cxx14/integrity/Cxx14IntegrityTest.java @@ -37,7 +37,7 @@ public abstract class Cxx14IntegrityTest { public static void performParsing() throws CoreException { document.setToc(SpecFactory.eINSTANCE.createToc()); new PublishedHtml(// - context.location(), // + context.rootLocation(), // new TocStructure(document.getToc(), context)// ).run(new NullProgressMonitor()); } diff --git a/tests/ru.arsysop.loft.rgm.spec.cpp14.tests/META-INF/MANIFEST.MF b/tests/ru.arsysop.loft.rgm.spec.cpp14.tests/META-INF/MANIFEST.MF index ab0b37586..774e5e70f 100644 --- a/tests/ru.arsysop.loft.rgm.spec.cpp14.tests/META-INF/MANIFEST.MF +++ b/tests/ru.arsysop.loft.rgm.spec.cpp14.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 0.2.0.qualifier Require-Bundle: org.junit;bundle-version="4.13.0", ru.arsysop.loft.rgm.spec.model;bundle-version="0.0.0", ru.arsysop.loft.rgm.cxxdraft;bundle-version="0.0.0", - org.eclipse.core.runtime;bundle-version="3.23.0" + org.eclipse.core.runtime;bundle-version="0.0.0" Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/tests/ru.arsysop.loft.rgm.spec.cpp14.tests/src/ru/arsysop/loft/rgm/spec/cpp14/tests/integrity/CxxIntegrityTest.java b/tests/ru.arsysop.loft.rgm.spec.cpp14.tests/src/ru/arsysop/loft/rgm/spec/cpp14/tests/integrity/CxxIntegrityTest.java index fd3d79dd4..23ba684c4 100644 --- a/tests/ru.arsysop.loft.rgm.spec.cpp14.tests/src/ru/arsysop/loft/rgm/spec/cpp14/tests/integrity/CxxIntegrityTest.java +++ b/tests/ru.arsysop.loft.rgm.spec.cpp14.tests/src/ru/arsysop/loft/rgm/spec/cpp14/tests/integrity/CxxIntegrityTest.java @@ -54,7 +54,7 @@ private void performParsing() throws CoreException { ResolutionContext context = new SimpleResolutionContext(URL, document); document.setToc(SpecFactory.eINSTANCE.createToc()); new PublishedHtml(// - context.location(), // + context.rootLocation(), // new TocStructure(document.getToc(), context)// ).run(new NullProgressMonitor()); document.getSections().stream() //