adds more fixes for #7

Modulefile

@@ -13,11 +13,11 @@ proc ModulesHelp { } {
 #    puts stderr     "Don't forget to execute 'scl enable devtoolset-7 bash'"
 #}
 
-if {![info exists ::env(PROJECT)] && [file exists $::env(HOME)/.sdkman/candidates/java/11.0.9.hs-adpt/] != 1} { 
+if {![info exists ::env(PROJECT)] && [file exists $::env(HOME)/.sdkman/candidates/java/17.0.2-open/] != 1} { 
-    puts stderr "Please install java via 'sdk install java 11.0.9.hs-adpt'!"
+    puts stderr "Please install java via 'sdk install java 17.0.2-open'!"
-    prereq java/11.0.9
+    prereq java/17.0.2
 } else {
-    prepend-path PATH $::env(HOME)/.sdkman/candidates/java/11.0.9.hs-adpt/bin
+    prepend-path PATH $::env(HOME)/.sdkman/candidates/java/17.0.2-open/bin
 }
 
 setenv PROJECT RDL-Editor

com.minres.rdl.parent/com.minres.rdl.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="com.minres.rdl.feature"
       label="RDL Feature "
-      version="1.4.0"
+      version="1.4.1"
       provider-name="MINRES Technologies GmbH">
 
    <plugin

com.minres.rdl.parent/com.minres.rdl.feature/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>com.minres.rdl.feature</artifactId>
 	<packaging>eclipse-feature</packaging>

com.minres.rdl.parent/com.minres.rdl.ide/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl.ide
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.rdl.ide
 Bundle-Vendor: My Company
-Bundle-Version: 1.4.0
+Bundle-Version: 1.4.1
 Bundle-SymbolicName: com.minres.rdl.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.rdl,

com.minres.rdl.parent/com.minres.rdl.ide/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>com.minres.rdl.ide</artifactId>
 	<packaging>eclipse-plugin</packaging>

com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="com.minres.rdl.platform.feature"
       label="Xtext Platform Feature"
-      version="1.4.0"
+      version="1.4.1"
       provider-name="MINRES Technologies GmbH">
 
    <description url="http://www.example.com/description">

com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>com.minres.rdl.platform.feature</artifactId>
 	<packaging>eclipse-feature</packaging>

com.minres.rdl.parent/com.minres.rdl.product.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="com.minres.rdl.product.feature"
       label="RDL Feature "
-      version="1.4.0"
+      version="1.4.1"
       provider-name="MINRES Technologies GmbH">
 
    <requires>

com.minres.rdl.parent/com.minres.rdl.product.feature/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>com.minres.rdl.product.feature</artifactId>
 	<packaging>eclipse-feature</packaging>

com.minres.rdl.parent/com.minres.rdl.product.releng/pom.xml

@@ -7,7 +7,7 @@
 	<name>RDL Editor</name>
 
 	<parent>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
 	</parent>

com.minres.rdl.parent/com.minres.rdl.product/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: RDL Editor
 Bundle-SymbolicName: com.minres.rdl.product;singleton:=true
-Bundle-Version: 1.4.0
+Bundle-Version: 1.4.1
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0"

com.minres.rdl.parent/com.minres.rdl.product/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>com.minres.rdl.product</artifactId>
 	<packaging>eclipse-plugin</packaging>

com.minres.rdl.parent/com.minres.rdl.repository/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>com.minres.rdl.repository</artifactId>
 	<packaging>eclipse-repository</packaging>

com.minres.rdl.parent/com.minres.rdl.standalone/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>com.minres.rdl.parent</artifactId>
 		<groupId>com.minres.rdl</groupId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>com.minres.rdl.standalone</artifactId>
 

com.minres.rdl.parent/com.minres.rdl.target/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>com.minres.rdl.target</artifactId>
 	<packaging>eclipse-target-definition</packaging>

com.minres.rdl.parent/com.minres.rdl.tests/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.rdl.tests
 Bundle-Vendor: My Company
-Bundle-Version: 1.4.0
+Bundle-Version: 1.4.1
 Bundle-SymbolicName: com.minres.rdl.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.rdl,

com.minres.rdl.parent/com.minres.rdl.tests/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>com.minres.rdl.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>

com.minres.rdl.parent/com.minres.rdl.ui.tests/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl.ui.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.rdl.ui.tests
 Bundle-Vendor: My Company
-Bundle-Version: 1.4.0
+Bundle-Version: 1.4.1
 Bundle-SymbolicName: com.minres.rdl.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.rdl.ui,

com.minres.rdl.parent/com.minres.rdl.ui.tests/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>com.minres.rdl.ui.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>

com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl.ui
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.rdl.ui
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 1.4.0
+Bundle-Version: 1.4.1
 Bundle-SymbolicName: com.minres.rdl.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.rdl,

com.minres.rdl.parent/com.minres.rdl.ui/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>com.minres.rdl.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>

com.minres.rdl.parent/com.minres.rdl.web/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>com.minres.rdl.web</artifactId>
 	<packaging>war</packaging>

com.minres.rdl.parent/com.minres.rdl/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.rdl
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 1.4.0
+Bundle-Version: 1.4.1
 Bundle-SymbolicName: com.minres.rdl; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext,

com.minres.rdl.parent/com.minres.rdl/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>com.minres.rdl</artifactId>
 	<packaging>eclipse-plugin</packaging>

com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/AddrmapGenerator.xtend

@@ -20,7 +20,7 @@ class AddrmapGenerator extends RdlBaseGenerator {
     
     override generateHeader(String namespace) {'''
         /*
-         * Copyright (c) 2019 -2022 MINRES Technologies GmbH
+         * Copyright (c) 2023 MINRES Technologies GmbH
          *
          * SPDX-License-Identifier: Apache-2.0
          *
@@ -39,8 +39,6 @@ class AddrmapGenerator extends RdlBaseGenerator {
                 «ENDFOR»
             «ENDFOR»
         }};
-        
-        #endif /* _«componentDefinition.effectiveName.toUpperCase»_MAP_H_ */
     '''
     }
 	    

com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/FwAddrmapGenerator.xtend

@@ -22,7 +22,7 @@ class FwAddrmapGenerator extends RdlBaseGenerator {
     
     override generateHeader(String namespace) {'''
         /*
-         * Copyright (c) 2019 -2022 MINRES Technologies GmbH
+         * Copyright (c) 2023 MINRES Technologies GmbH
          *
          * SPDX-License-Identifier: Apache-2.0
          *

com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/FwRegfileGenerator.xtend

@@ -23,7 +23,7 @@ class FwRegfileGenerator extends RdlBaseGenerator{
     
     override String generateHeader(String namespace)'''
         /*
-         * Copyright (c) 2019 -2022 MINRES Technologies GmbH
+         * Copyright (c) 2023 MINRES Technologies GmbH
          *
          * SPDX-License-Identifier: Apache-2.0
          *
@@ -91,9 +91,7 @@ class FwRegfileGenerator extends RdlBaseGenerator{
                 «ENDFOR»
             «ENDFOR»
         };
-        
+    '''
-        #endif // _«componentDefinition.name.toUpperCase»_H_
-        '''
         
     override generateSource(String namespace) {
         ''

com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/ModuleGenerator.xtend

@@ -30,7 +30,7 @@ class ModuleGenerator extends RdlBaseGenerator {
 //        if(addrMaps.size==0) return ''
         '''
             /*
-             * Copyright (c) 2019 -2022 MINRES Technologies GmbH
+             * Copyright (c) 2023 MINRES Technologies GmbH
              *
              * SPDX-License-Identifier: Apache-2.0
              */
@@ -63,8 +63,6 @@ class ModuleGenerator extends RdlBaseGenerator {
             «FOR ns : namespace.split('::').reverse»
             } // namespace «ns»
             «ENDFOR»
-            
-            #endif /* _«namespace.toUpperCase»_«componentDefinition.effectiveName.toUpperCase»_H_ */
         '''
     }
 	    

com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/RegfileGenerator.xtend

@@ -23,7 +23,7 @@ class RegfileGenerator extends RdlBaseGenerator{
     
     override String generateHeader(String namespace)'''
         /*
-         * Copyright (c) 2019 -2022 MINRES Technologies GmbH
+         * Copyright (c) 2023 MINRES Technologies GmbH
          *
          * SPDX-License-Identifier: Apache-2.0
          *
@@ -157,13 +157,11 @@ class RegfileGenerator extends RdlBaseGenerator{
                     «IF instantiation.componentDefinition.type == ComponentDefinitionType.REGFILE»
                         i_«instance.name».registerResources(target, «instance.addressValue»UL+offset);
                     «ELSEIF instantiation.componentDefinition.type == ComponentDefinitionType.REG»
-                        target.addResource(«instance.name», «instance.addressValue»UL);
+                        target.addResource(«instance.name», «instance.addressValue»UL+offset);
                     «ENDIF»                    
                 «ENDFOR»
             «ENDFOR»
         }
-        
-        #endif // _«namespace.toUpperCase»_GEN_«componentDefinition.effectiveName.toUpperCase»_H_
         '''
     
     override generateSource(String namespace) {

com.minres.rdl.parent/pom.xml

@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.minres.rdl</groupId>
-	<version>1.4.0</version>
+	<version>1.4.1</version>
 	<artifactId>com.minres.rdl.parent</artifactId>
 	<packaging>pom</packaging>
 
@@ -108,7 +108,7 @@
 							<groupId>com.minres.rdl</groupId>
 							<artifactId>com.minres.rdl.target</artifactId>
 <!-- 							<version>${project.version}</version> -->
-							<version>1.4.0</version>
+							<version>1.4.1</version>
 						</artifact>
 					</target>
 					<environments>