Skip to content

Commit ecaf055

Browse files
otymkootymko
authored
Merge pull request #178 from 1c-syntax/develop
Релиз 0.8.0
2 parents 5acfeaa + d2cab49 commit ecaf055

File tree

301 files changed

+4269
-909
lines changed

Some content is hidden

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

301 files changed

+4269
-909
lines changed

‎.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.gradle.kts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ repositories {
1919
maven { url = URI("https://jitpack.io") }
2020
}
2121

22-
val junitVersion = "5.5.2"
22+
val junitVersion = "5.6.1"
2323
dependencies {
2424

2525
// https://mvnrepository.com/artifact/io.vavr/vavr
@@ -28,22 +28,21 @@ dependencies {
2828
implementation("org.apache.commons", "commons-collections4", "4.4")
2929

3030
// https://mvnrepository.com/artifact/com.thoughtworks.xstream/xstream
31-
// https://github.com/x-stream/xstream/pull/228
32-
implementation("com.github.nixel2007.xstream", "xstream", "7c5b15dedea167761ebeae31097f8d91ad3acc81")
31+
implementation("com.thoughtworks.xstream", "xstream", "1.4.15")
3332

3433
// логирование
3534
implementation("org.slf4j", "slf4j-api", "1.7.30")
3635

3736
// прочее
38-
implementation("commons-io", "commons-io", "2.6")
39-
implementation("org.apache.commons", "commons-lang3", "3.9")
37+
implementation("commons-io", "commons-io", "2.8.0")
38+
implementation("org.apache.commons", "commons-lang3", "3.11")
4039
implementation("com.github.1c-syntax", "utils", "0.2.1")
4140
// генерики
4241
compileOnly("org.projectlombok", "lombok", lombok.version)
4342
// тестирование
4443
testImplementation("org.junit.jupiter", "junit-jupiter-api", junitVersion)
4544
testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", junitVersion)
46-
testImplementation("org.assertj", "assertj-core", "3.12.2")
45+
testImplementation("org.assertj", "assertj-core", "3.18.1")
4746
testImplementation("com.ginsberg", "junit5-system-exit", "1.0.0")
4847
}
4948

@@ -104,8 +103,8 @@ sonarqube {
104103
}
105104

106105
lombok {
107-
version = "1.18.12"
108-
sha256 = "49381508ecb02b3c173368436ef71b24c0d4418ad260e6cc98becbcf4b345406"
106+
version = "1.18.16"
107+
sha256 = "7206cbbfd6efd5e85bceff29545633645650be58d58910a23b0d4835fbd15ed7"
109108
}
110109

111110
license {

‎gradle/wrapper/gradle-wrapper.jar

208 Bytes
Binary file not shown.

‎gradlew

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ esac
8282

8383
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
8484

85+
8586
# Determine the Java command to use to start the JVM.
8687
if [ -n "$JAVA_HOME" ] ; then
8788
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
129130
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
132134
JAVACMD=`cygpath --unix "$JAVACMD"`
133135

134136
# We build the pattern for arguments to be converted via cygpath

‎gradlew.bat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
2929
set APP_BASE_NAME=%~n0
3030
set APP_HOME=%DIRNAME%
3131

32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34+
3235
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
3336
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
3437

@@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
8184

8285
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8386

87+
8488
@rem Execute Gradle
8589
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
8690

‎src/main/java/com/github/_1c_syntax/mdclasses/Main.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/AccountingFlag.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/AccountingRegister.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/AccumulationRegister.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/AddressingAttribute.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/Attribute.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/BusinessProcess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/CalculationRegister.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/Catalog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/ChartOfAccounts.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/ChartOfCalculationTypes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/ChartOfCharacteristicTypes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/Column.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/Command.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/CommandGroup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/CommonAttribute.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/CommonCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/CommonForm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/CommonModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/CommonPicture.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/CommonTemplate.java

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later
@@ -21,21 +21,34 @@
2121
*/
2222
package com.github._1c_syntax.mdclasses.mdo;
2323

24+
import com.github._1c_syntax.mdclasses.mdo.template.TemplateData;
2425
import com.github._1c_syntax.mdclasses.mdo.wrapper.DesignerMDO;
2526
import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
27+
import com.github._1c_syntax.mdclasses.metadata.additional.TemplateType;
28+
import com.thoughtworks.xstream.annotations.XStreamAlias;
29+
import lombok.Data;
2630
import lombok.EqualsAndHashCode;
2731
import lombok.NoArgsConstructor;
2832
import lombok.ToString;
29-
import lombok.Value;
3033

31-
@Value
34+
@Data
3235
@EqualsAndHashCode(callSuper = true)
3336
@ToString(callSuper = true, onlyExplicitlyIncluded = true)
3437
@NoArgsConstructor
35-
public class CommonTemplate extends MDObjectBase {
38+
public class CommonTemplate extends MDObjectBase implements MDOTemplate {
39+
/**
40+
* Тип макета. Например, `ТабличныйДокумент`.
41+
*/
42+
@XStreamAlias("templateType")
43+
private TemplateType templateType = TemplateType.SPREADSHEET_DOCUMENT;
44+
/**
45+
* Содержимое макета. Например, Схема компоновки данных
46+
*/
47+
private TemplateData<?> templateData;
3648

3749
public CommonTemplate(DesignerMDO designerMDO) {
3850
super(designerMDO);
51+
setTemplateType(designerMDO.getProperties().getTemplateType());
3952
}
4053

4154
@Override

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/Constant.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/DataProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/DefinedType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/Dimension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/Document.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/DocumentJournal.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/DocumentNumerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/EventSubscription.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/mdclasses/mdo/ExchangePlan.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
33
*
4-
* Copyright © 2019 - 2020
4+
* Copyright © 2019 - 2021
55
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

0 commit comments

Comments
 (0)