Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/main/java/com/github/_1c_syntax/bsl/mdclasses/CF.java
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,15 @@ default List<Subsystem> includedSubsystems(MdoReference mdoReference, boolean ad
.toList();
}

/**
* Возвращает локализованное представление ссылки на объект метаданных с учетом используемого варианта языка разработки
* @param md Объект метаданных, принадлежащий MDClasses
* @return Строковое представление ссылки
*/
default String getMdoRefLocal(MD md) {
return md.getMdoRef(getScriptVariant());
}

@Override
default ModuleType getModuleTypeByURI(URI uri) {
return getModulesByType().getOrDefault(uri, ModuleType.UNKNOWN);
Expand Down
20 changes: 20 additions & 0 deletions src/main/java/com/github/_1c_syntax/bsl/mdo/MD.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString;
import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
import com.github._1c_syntax.bsl.mdo.support.ScriptVariant;
import com.github._1c_syntax.bsl.support.SupportVariant;
import com.github._1c_syntax.bsl.types.MDOType;
import com.github._1c_syntax.bsl.types.MdoReference;
Expand Down Expand Up @@ -60,6 +61,25 @@ default MDOType getMdoType() {
*/
MdoReference getMdoReference();

/**
* Строковое представление MDO-Ссылки на объект, локализованное для указанного языка разработки
*/
default String getMdoRef(ScriptVariant scriptVariant) {
var mdoReference = getMdoReference();
if (scriptVariant == ScriptVariant.ENGLISH) {
return mdoReference.getMdoRef();
} else {
return mdoReference.getMdoRefRu();
}
}

/**
* Строковое представление MDO-Ссылки на объект
*/
default String getMdoRef() {
return getMdoReference().getMdoRef();
}

/**
* Принадлежность объекта конфигурации (собственный или заимствованный)
*/
Expand Down
15 changes: 15 additions & 0 deletions src/test/java/com/github/_1c_syntax/bsl/mdo/EnumTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,15 @@
*/
package com.github._1c_syntax.bsl.mdo;

import com.github._1c_syntax.bsl.mdo.support.ScriptVariant;
import com.github._1c_syntax.bsl.test_utils.MDTestUtils;
import com.github._1c_syntax.bsl.types.MdoReference;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.aggregator.ArgumentsAccessor;
import org.junit.jupiter.params.provider.CsvSource;

import static org.assertj.core.api.Assertions.assertThat;

class EnumTest {
@ParameterizedTest
@CsvSource(
Expand All @@ -38,5 +42,16 @@ class EnumTest {
)
void test(ArgumentsAccessor argumentsAccessor) {
var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor);

var mdoRef = MdoReference.create(argumentsAccessor.getString(2));
var mdoRefString = mdoRef.getMdoRef();
var mdoRefStringRu = mdoRef.getMdoRefRu();

assertThat(mdo.getMdoReference()).isEqualTo(mdoRef);
assertThat(mdo.getMdoRef(ScriptVariant.ENGLISH)).isEqualTo(mdoRefString);
assertThat(mdo.getMdoRef(ScriptVariant.UNKNOWN)).isEqualTo(mdoRefStringRu);
assertThat(mdo.getMdoRef(ScriptVariant.RUSSIAN)).isEqualTo(mdoRefStringRu);

assertThat(mdo.getMdoRef()).isEqualTo(mdo.getMdoRef(ScriptVariant.ENGLISH));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ public String createJson(Object obj) {
xstream.omitField(clazz, "plainItems");
xstream.omitField(clazz, "commonModulesByName");
xstream.omitField(clazz, "childrenByMdoRef");
xstream.omitField(clazz, "mdoRef");

} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
Expand Down