Merge pull request #60 from CIMug-org/release-1.11.1

Merge pull request #59 from CIMug-org/master
cimug-org · Mar 3, 2023 · a8ce9e3 · a8ce9e3
2 parents f59acfb + 845c713
commit a8ce9e3
Show file tree

Hide file tree

Showing 26 changed files with 827 additions and 251 deletions.
diff --git a/CIMToolFeature/feature.xml b/CIMToolFeature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="au.com.langdale.cimtoole.feature"
       label="CIMTool"
-      version="1.11.0"
+      version="1.11.1"
       provider-name="Langdale Consultants">
 
    <description url="http://cimtool.org">

diff --git a/CIMToolHelp/META-INF/MANIFEST.MF b/CIMToolHelp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CIMTool Help Plug-in
 Bundle-SymbolicName: au.com.langdale.cimtoole.help;singleton:=true
-Bundle-Version: 1.11.0
+Bundle-Version: 1.11.1
 Bundle-ClassPath: CIMToolHelp
 Bundle-Vendor: Langdale Consultants
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/CIMToolPlugin/META-INF/MANIFEST.MF b/CIMToolPlugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CIMTool Plug-in
 Bundle-SymbolicName: au.com.langdale.cimtoole;singleton:=true
-Bundle-Version: 1.11.0
+Bundle-Version: 1.11.1
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: cimtoole.jar,
  lib/commons-logging-1.1.1.jar,

diff --git a/CIMToolPlugin/builders/profile-doc-rtf.xsl b/CIMToolPlugin/builders/profile-doc-rtf.xsl
@@ -11,7 +11,7 @@
 <xsl:template match="a:Catalog">{\rtf1\ansi\ansicpg1252\deff0\deflang1033\deflangfe1033\fs20{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}{\f1\fswiss\fprq2\fcharset0{\*\fname Arial;}Arial CE;}
 {\f23\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Arial;}}{\colortbl;\red0\green0\blue238;}
 \pard\plain \sb120\qj\fs20\lang1033
-{\par\b\fs28<xsl:value-of select="$envelope"/> Profile \par}Profile namespace:  <xsl:value-of select="$baseURI" /> 
+{\par\b\fs28<xsl:value-of select="$envelope"/><xsl:if test="$envelope != 'Profile'"><text> Profile</text></xsl:if>\par}Profile namespace:  <xsl:value-of select="$baseURI" /> 
 \par\pard\plain \sb120\qj\fs20\lang1033 
 <xsl:if test="count(/.//a:ComplexType) > 0">
 {\par\b\fs28 Concrete Classes \par}

diff --git a/CIMToolPlugin/graphics/enumclass.svg b/CIMToolPlugin/graphics/enumclass.svg
diff --git a/CIMToolPlugin/graphics/enumelement.svg b/CIMToolPlugin/graphics/enumelement.svg
diff --git a/CIMToolPlugin/icons/enumclass-32.png b/CIMToolPlugin/icons/enumclass-32.png
diff --git a/CIMToolPlugin/icons/enumclass.png b/CIMToolPlugin/icons/enumclass.png
diff --git a/CIMToolPlugin/icons/enumelement-32.png b/CIMToolPlugin/icons/enumelement-32.png
diff --git a/CIMToolPlugin/icons/enumelement.png b/CIMToolPlugin/icons/enumelement.png
diff --git a/CIMToolPlugin/plugin.xml b/CIMToolPlugin/plugin.xml
@@ -119,7 +119,7 @@
             id="au.com.langdale.cimtoole.wizards.ImportCopyrightTemplates"
             name="Import Copyright Templates">
       	<description>
-            A wizard for importing copyright templates to be used in relevant profiles for a given project.
+      		Import and/or configure copyright templates to be used in the artifacts generated by a project.
 		</description>
       </wizard>      
       <wizard