Skip to content

Commit

Permalink
#154 Fixed problems with xhtmltags and bump version to 0.12.2 (#153)
Browse files Browse the repository at this point in the history
* added preference keepXHTMLTags and fixed problems with tag <xhtml:br>

Change-Id: I1ccf845d42214c4ab0eab5884ff28eeaa7d22fb0
Signed-off-by: Cazoni Iulius-Alexandru <iulius.cazoni@thalesgroup.com>
  • Loading branch information
Iulius3456 committed Jan 6, 2022
1 parent 5b7ad86 commit d96a623
Show file tree
Hide file tree
Showing 104 changed files with 224 additions and 139 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.capella.vp.requirements.af.feature"
label="%featureName"
version="0.12.1.qualifier"
version="0.12.2.qualifier"
provider-name="%providerName">

<description url="%descriptionURL">
Expand All @@ -32,7 +32,7 @@
id="org.polarsys.capella.vp.requirements.af"
download-size="0"
install-size="0"
version="0.12.1.qualifier"
version="0.12.2.qualifier"
unpack="false"/>

</feature>
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.1-SNAPSHOT</version>
<version>0.12.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.capella.vp.requirements.cdo.feature"
label="%featureName"
version="0.12.1.qualifier"
version="0.12.2.qualifier"
provider-name="%providerName">

<description url="%descriptionURL">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.1-SNAPSHOT</version>
<version>0.12.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.capella.vp.requirements.feature"
label="%featureName"
version="0.12.1.qualifier"
version="0.12.2.qualifier"
provider-name="%providerName">

<description url="http://www.example.com/description">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.1-SNAPSHOT</version>
<version>0.12.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.capella.vp.requirements.importer.feature"
label="%featureName"
version="0.12.1.qualifier"
version="0.12.2.qualifier"
provider-name="%providerName">

<description url="http://www.example.com/description">
Expand All @@ -29,7 +29,7 @@
</license>

<requires>
<import feature="org.polarsys.capella.vp.requirements.thirdparty.feature" version="0.12.1.qualifier"/>
<import feature="org.polarsys.capella.vp.requirements.thirdparty.feature" version="0.12.2.qualifier"/>
</requires>

<plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.1-SNAPSHOT</version>
<version>0.12.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.capella.vp.requirements.representation.feature"
label="%featureName"
version="0.12.1.qualifier"
version="0.12.2.qualifier"
provider-name="%providerName">

<description url="%descriptionURL">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.1-SNAPSHOT</version>
<version>0.12.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.capella.vp.requirements.tests.feature"
label="%featureName"
version="0.12.1.qualifier"
version="0.12.2.qualifier"
provider-name="%providerName">

<description url="%descriptionURL">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.1-SNAPSHOT</version>
<version>0.12.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.capella.vp.requirements.thirdparty.feature"
label="%featureName"
version="0.12.1.qualifier"
version="0.12.2.qualifier"
provider-name="%providerName">

<description url="http://www.example.com/description">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.1-SNAPSHOT</version>
<version>0.12.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.capella.vp.requirements.ui.feature"
label="%featureName"
version="0.12.1.qualifier"
version="0.12.2.qualifier"
provider-name="%providerName">

<description url="http://www.example.com/description">
Expand All @@ -29,7 +29,7 @@
</license>

<requires>
<import feature="org.polarsys.capella.vp.requirements.thirdparty.feature" version="0.12.1.qualifier"/>
<import feature="org.polarsys.capella.vp.requirements.thirdparty.feature" version="0.12.2.qualifier"/>
</requires>

<plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.1-SNAPSHOT</version>
<version>0.12.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.kitalpha.vp.requirements.af.feature"
label="%featureName"
version="0.12.1.qualifier"
version="0.12.2.qualifier"
provider-name="%providerName">

<description url="%descriptionURL">
Expand All @@ -32,7 +32,7 @@
id="org.polarsys.kitalpha.vp.requirements.af"
download-size="0"
install-size="0"
version="0.12.1.qualifier"
version="0.12.2.qualifier"
unpack="false"/>

</feature>
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.1-SNAPSHOT</version>
<version>0.12.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.kitalpha.vp.requirements.docgen.feature"
label="%featureName"
version="0.12.1.qualifier"
version="0.12.2.qualifier"
provider-name="%providerName">

<description url="http://www.example.com/description">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.1-SNAPSHOT</version>
<version>0.12.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.kitalpha.vp.requirements.feature"
label="%featureName"
version="0.12.1.qualifier"
version="0.12.2.qualifier"
provider-name="%providerName">

<description url="http://www.example.com/description">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.1-SNAPSHOT</version>
<version>0.12.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.kitalpha.vp.requirements.representation.feature"
label="%featureName"
version="0.12.1.qualifier"
version="0.12.2.qualifier"
provider-name="%providerName">

<description url="%descriptionURL">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.1-SNAPSHOT</version>
<version>0.12.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.polarsys.kitalpha.vp.requirements.ui.feature"
label="%featureName"
version="0.12.1.qualifier"
version="0.12.2.qualifier"
provider-name="%providerName">

<description url="http://www.example.com/description">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
<version>0.12.1-SNAPSHOT</version>
<version>0.12.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.vp.requirements.af;singleton:=true
Bundle-Version: 0.12.1.qualifier
Bundle-Version: 0.12.2.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.polarsys.kitalpha.ad.viewpoint.ui,
org.polarsys.capella.vp.requirements,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
<vp:Viewpoint xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sirius="http://www.polarsys.org/kitalpha/ad/sirius/1.0.0" xmlns:vp="http://www.polarsys.org/kitalpha/ad/viewpoint/1.0.0" name="Capella Requirements" id="org.polarsys.capella.vp.requirements" vpid="_MB6moB21EeaZT-H7SsDebw" version="0.12.1">
<vp:Viewpoint xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sirius="http://www.polarsys.org/kitalpha/ad/sirius/1.0.0" xmlns:vp="http://www.polarsys.org/kitalpha/ad/viewpoint/1.0.0" name="Capella Requirements" id="org.polarsys.capella.vp.requirements" vpid="_MB6moB21EeaZT-H7SsDebw" version="0.12.2">
<ruleSet vpid="_oNyM8VQPEeas5ZJk-jBSMA" target="_MB6moB21EeaZT-H7SsDebw"/>
<serviceSet vpid="_oNyM8FQPEeas5ZJk-jBSMA" target="_MB6moB21EeaZT-H7SsDebw"/>
<dependencies href="../../org.polarsys.kitalpha.vp.requirements.af/model/Requirements.vp#_SyafgB20EeaZT-H7SsDebw"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.polarsys.capella.vp.requirements.business.queries;singleton:=true
Bundle-Version: 0.12.1.qualifier
Bundle-Version: 0.12.2.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.polarsys.kitalpha.ad.services,
org.polarsys.capella.core.data.business.queries,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.vp.requirements.design;singleton:=true
Bundle-Version: 0.12.1.qualifier
Bundle-Version: 0.12.2.qualifier
Bundle-Activator: org.polarsys.capella.vp.requirements.design.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.vp.requirements.doc;singleton:=true
Bundle-Version: 0.12.1.qualifier
Bundle-Version: 0.12.2.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.vp.requirements.fc;singleton:=true
Bundle-Version: 0.12.1.qualifier
Bundle-Version: 0.12.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CDO Generation Plugin
Bundle-SymbolicName: org.polarsys.capella.vp.requirements.gen.cdo;singleton:=true
Bundle-Version: 0.12.1.qualifier
Bundle-Version: 0.12.2.qualifier
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.vp.requirements.importer.attributes.doors.rmf;singleton:=true
Bundle-Version: 0.12.1.qualifier
Bundle-Version: 0.12.2.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.polarsys.capella.vp.requirements.importer.extension
Bundle-Vendor: %providerName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.vp.requirements.importer.commandline;singleton:=true
Bundle-Version: 0.12.1.qualifier
Bundle-Version: 0.12.2.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime,
org.polarsys.capella.core.commandline.core,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.vp.requirements.importer.extension;singleton:=true
Bundle-Version: 0.12.1.qualifier
Bundle-Version: 0.12.2.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.emf.common,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,15 @@ public static List<AttributeSet> loadContributedCategories() {
}
return contributedAttributes;
}


public static Object getValueForPreferenceKey(String key, Class clazz) {
IPreferenceStore store = RequirementsPreferencesPlugin.getDefault().getPreferenceStore();
if (clazz.equals(String.class)) {
return store.getString(key);
} else if (clazz.equals(Boolean.class)) {
return store.getBoolean(key) ;
}
throw new InternalError("This data type is not supported!");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.polarsys.capella.vp.requirements.importer.preferences;singleton:=true
Bundle-Version: 0.12.1.qualifier
Bundle-Version: 0.12.2.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
public class RequirementsPreferencesConstants {

public static final String REQUIREMENT_PROPERTIES_FILES_KEY = "requirement.properties.files";

public static final String REQUIREMENT_KEEP_XHTML_TAGS = "keepXHTMLTags";
public static final String REQUIREMENT_LABEL_EXPRESSION_KEY = "requirement.label.expression";
public static final String REQUIREMENT_DEFAULT_LABEL_EXPRESSION = "aql:let puid = self.ownedAttributes->any(a | a.definition.ReqIFLongName == 'IE PUID')->collect(a | '['+a.value+']')->first() in let name = OrderedSet{self.ReqIFText, self.ReqIFName, self.ReqIFChapterName, self.ReqIFLongName}->any(s | s != null and s.size() > 0)->first() in OrderedSet{puid, name}->select(s | s != null)->sep(' ')->toString()";
public static final String REQUIREMENT_LABEL_MAX_LEN_KEY = "requirement.label.max.len";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.vp.requirements.importer;singleton:=true
Bundle-Version: 0.12.1.qualifier
Bundle-Version: 0.12.2.qualifier
Bundle-Activator: org.polarsys.capella.vp.requirements.importer.RequirementsVPPlugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.diffmerge.bridge;visibility:=reexport,
Expand Down

0 comments on commit d96a623

Please sign in to comment.