Report [569767] [569542] [569852] & Bump 1.4.4 (#56)

* [569767] Prevent Capella index extension use on non-Capella models (#53) Prevent to override index item computation on non-Capella model. Change-Id: I00cb4abdd14c99cb007089068012d8f50f84c493 Signed-off-by: Arnaud Dieumegard <[email protected]> * [569542]Broken file/image links in description causes generation failing (#50) * [569542] Broken file/image links in description causes generation failing * [569542] remove commented code and update copyright header * [569852] Handle images references using UNC path - Ensure unique file names for copied images - Handle encoded URI strings in description - Handle UNC path - Handle http(s) references Change-Id: I11870efe57f5423f555176700f31619505280232 Signed-off-by: Arnaud Dieumegard <[email protected]> * [releng] Update TP Change-Id: Ifddae1a51ac787e5e4756d130d4d4db7bad83b81 Signed-off-by: Arnaud Dieumegard <[email protected]> * [releng] Bump to 1.4.4 Change-Id: I4945cd7713967b4ca36bda7df3430d2e75f0c1f6 Signed-off-by: Arnaud Dieumegard <[email protected]> Co-authored-by: Boubekeur Zendagui <[email protected]>
eclipse-capella · Dec 22, 2020 · 63c9bc4 · 63c9bc4
1 parent 769c06a
commit 63c9bc4
Show file tree

Hide file tree

Showing 24 changed files with 326 additions and 210 deletions.
diff --git a/docgenhtml/features/org.polarsys.capella.docgen.configuration.feature/feature.xml b/docgenhtml/features/org.polarsys.capella.docgen.configuration.feature/feature.xml
@@ -12,7 +12,7 @@ Contributors:
 <feature
       id="org.polarsys.capella.docgen.configuration.feature"
       label="%featureName"
-      version="1.4.3.qualifier"
+      version="1.4.4.qualifier"
       provider-name="%providerName">
 
    <description>

diff --git a/docgenhtml/features/org.polarsys.capella.docgen.feature/feature.xml b/docgenhtml/features/org.polarsys.capella.docgen.feature/feature.xml
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, 2019 THALES GLOBAL SERVICES.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
- 
-Contributors:
-  Thales - initial API and implementation
--->
-<feature
-      id="org.polarsys.capella.docgen.feature"
-      label="%featureName"
-      version="1.4.3.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.polarsys.kitalpha.doc.gen.business.core.feature" version="0.5.0.v20140814-0416" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.polarsys.capella.docgen"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.polarsys.capella.docgen.commandline"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.polarsys.capella.docgen.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.polarsys.capella.docgen.preference"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2006, 2019 THALES GLOBAL SERVICES.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+ 
+Contributors:
+  Thales - initial API and implementation
+-->
+<feature
+      id="org.polarsys.capella.docgen.feature"
+      label="%featureName"
+      version="1.4.4.qualifier"
+      provider-name="%providerName">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.polarsys.kitalpha.doc.gen.business.core.feature" version="0.5.0.v20140814-0416" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.polarsys.capella.docgen"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.polarsys.capella.docgen.commandline"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.polarsys.capella.docgen.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.polarsys.capella.docgen.preference"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/docgenhtml/features/org.polarsys.capella.docgen.package.feature/feature.xml b/docgenhtml/features/org.polarsys.capella.docgen.package.feature/feature.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, 2019 THALES GLOBAL SERVICES.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
- 
-Contributors:
-  Thales - initial API and implementation
--->
-<feature
-      id="org.polarsys.capella.docgen.package.feature"
-      label="%featureName"
-      version="1.4.3.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <includes
-         id="org.polarsys.capella.docgen.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.polarsys.kitalpha.doc.gen.business.core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.egf.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.polarsys.capella.docgen.configuration.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.query"
-         version="0.0.0"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2006, 2019 THALES GLOBAL SERVICES.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+ 
+Contributors:
+  Thales - initial API and implementation
+-->
+<feature
+      id="org.polarsys.capella.docgen.package.feature"
+      label="%featureName"
+      version="1.4.4.qualifier"
+      provider-name="%providerName">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <includes
+         id="org.polarsys.capella.docgen.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.polarsys.kitalpha.doc.gen.business.core.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.egf.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.polarsys.capella.docgen.configuration.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.emf.query"
+         version="0.0.0"/>
+
+</feature>
diff --git a/docgenhtml/features/pom.xml b/docgenhtml/features/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.addon.docgen</artifactId>
-		<version>1.4.3-SNAPSHOT</version>
+		<version>1.4.4-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen.commandline/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen.commandline/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.docgen.commandline;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.4.4.qualifier
 Bundle-Vendor: %providerName
 Require-Bundle: org.polarsys.kitalpha.doc.gen.business.core.ui,
  org.eclipse.ui,

diff --git a/...enhtml/plugins/org.polarsys.capella.docgen.configuration.commandline/META-INF/MANIFEST.MF b/...enhtml/plugins/org.polarsys.capella.docgen.configuration.commandline/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.polarsys.kitalpha.doc.gen.business.core.ui,
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.4.4.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-ManifestVersion: 2

diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.edit/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.docgen.configuration.edit;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.4.4.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.polarsys.capella.configuration.provider.ConfigurationEditPlugin$Implementation
 Bundle-Vendor: %providerName

diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.editor/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.docgen.configuration.editor;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.4.4.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.polarsys.capella.configuration.presentation.ConfigurationEditorPlugin$Implementation
 Bundle-Vendor: %providerName

diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.ui/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.ui/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Require-Bundle: org.polarsys.kitalpha.doc.gen.business.core.ui,
  org.eclipse.sirius.table
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.4.4.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.polarsys.capella.docgen.configuration.ui.Activator

diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen.configuration/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen.configuration/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.docgen.configuration;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.4.4.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen.preference/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen.preference/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.docgen.preference;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.4.4.qualifier
 Bundle-Activator: org.polarsys.capella.docgen.preference.internal.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen.ui/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.docgen.ui;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.4.4.qualifier
 Bundle-Activator: org.polarsys.capella.docgen.ui.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.polarsys.kitalpha.doc.gen.business.core.ui,

diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.docgen;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.4.4.qualifier
 Bundle-Activator: org.polarsys.capella.docgen.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.polarsys.kitalpha.doc.gen.business.core;visibility:=reexport,

diff --git a/...docgen/generated/org/polarsys/capella/docgen/index/items/builder/CollectCapellaItems.java b/...docgen/generated/org/polarsys/capella/docgen/index/items/builder/CollectCapellaItems.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.6.1.201906060805
+//Generated with EGF 1.6.2.202001031546
 package org.polarsys.capella.docgen.index.items.builder;
 
 import org.polarsys.kitalpha.doc.gen.business.core.services.IndexItem;
@@ -12,6 +12,7 @@
 import org.eclipse.egf.pattern.execution.*;
 import org.eclipse.egf.pattern.query.*;
 import org.polarsys.kitalpha.doc.gen.business.core.util.DefaultFileNameService;
+import org.polarsys.capella.common.data.modellingcore.ModelElement;
 
 public class CollectCapellaItems {
 	protected static String nl;
@@ -140,6 +141,6 @@ protected void method_body(final StringBuffer stringBuffer, final PatternContext
 	}
 
 	public boolean preCondition(PatternContext ctx) throws Exception {
-		return true;
+		return parameter instanceof ModelElement;
 	}
 }