Skip to content

Commit 51f77d5

Browse files
authored
Merge pull request #244 from modelix/MODELIX-305
MODELIX-305 Remove separation between CLTree and CPTree
2 parents 5e49982 + eac0630 commit 51f77d5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1043
-910
lines changed

model-api/src/commonMain/kotlin/org/modelix/model/api/ITree.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ interface ITree {
139139
*/
140140
fun setReferenceTarget(sourceId: Long, role: String, target: INodeReference?): ITree
141141

142+
fun setReferenceTarget(sourceId: Long, role: String, targetId: Long): ITree =
143+
setReferenceTarget(sourceId, role, LocalPNodeReference(targetId))
144+
142145
/**
143146
* Returns all reference roles for the given node in this tree.
144147
*

model-datastructure/build.gradle.kts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@ plugins {
66
kotlin {
77
jvm()
88
js(IR) {
9-
browser {}
9+
browser {
10+
testTask {
11+
useMocha {
12+
timeout = "30s"
13+
}
14+
}
15+
}
1016
nodejs {
1117
testTask {
1218
useMocha {

model-client/src/commonMain/kotlin/org/modelix/model/client/IdGenerator.kt renamed to model-datastructure/src/commonMain/kotlin/org/modelix/model/client/IdGenerator.kt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
/*
2+
* Copyright (c) 2023.
3+
*
24
* Licensed under the Apache License, Version 2.0 (the "License");
35
* you may not use this file except in compliance with the License.
46
* You may obtain a copy of the License at
57
*
6-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
79
*
8-
* Unless required by applicable law or agreed to in writing,
9-
* software distributed under the License is distributed on an
10-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
11-
* KIND, either express or implied. See the License for the
12-
* specific language governing permissions and limitations
13-
* under the License.
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1415
*/
1516

1617
package org.modelix.model.client

model-datastructure/src/commonMain/kotlin/org/modelix/model/lazy/CLHamtInternal.kt

Lines changed: 0 additions & 269 deletions
This file was deleted.

0 commit comments

Comments
 (0)