Merge branch 'reiner' into 'main'

Cleanup

See merge request !80

analysis/src/main/java/org/oceandsl/analysis/generic/stages/RewriteBeforeAndAfterEventsStage.java

@@ -65,12 +65,12 @@ public class RewriteBeforeAndAfterEventsStage extends AbstractConsumerStage<IMon
             final BeforeOperationEvent before = (BeforeOperationEvent) element;
             final AddrOutput rewriteInfo = this.findRewriteInfo(before.getOperationSignature());
             this.outputPort.send(new BeforeOperationEvent(before.getTimestamp(), before.getTraceId(),
-                    before.getOrderIndex(), rewriteInfo.name, rewriteInfo.getFilename()));
+                    before.getOrderIndex(), rewriteInfo.name, rewriteInfo.filename));
         } else if (element instanceof AfterOperationEvent) {
             final AfterOperationEvent before = (AfterOperationEvent) element;
             final AddrOutput rewriteInfo = this.findRewriteInfo(before.getOperationSignature());
             this.outputPort.send(new AfterOperationEvent(before.getTimestamp(), before.getTraceId(),
-                    before.getOrderIndex(), rewriteInfo.name, rewriteInfo.getFilename()));
+                    before.getOrderIndex(), rewriteInfo.name, rewriteInfo.filename));
         } else {
             this.outputPort.send(element);
         }
@@ -136,18 +136,6 @@ public class RewriteBeforeAndAfterEventsStage extends AbstractConsumerStage<IMon
             this.linenumber = linenumber;
         }
 
-        public String getName() {
-            return this.name;
-        }
-
-        public String getFilename() {
-            return this.filename;
-        }
-
-        public Integer getLinenumber() {
-            return this.linenumber;
-        }
-
         @Override
         public String toString() {
             return String.format("%s:%d -- %s", this.filename, this.linenumber, this.name);

tools/restructuring/META-INF/MANIFEST.MF

-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: restructuring;singleton:=true
-Automatic-Module-Name: restructuring
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Export-Package: org.oceandsl.tools.restructuring.restructuremodel,
- org.oceandsl.tools.restructuring.restructuremodel.impl,
- org.oceandsl.tools.restructuring.restructuremodel.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport
-Bundle-ActivationPolicy: lazy

tools/restructuring/build.properties

-#
-
-bin.includes = .,\
-               model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties
-jars.compile.order = .
-source.. = src/main/org/oceandsl/tools/restructuring/restructuremodel/
-output.. = bin/

tools/restructuring/plugin.properties

-#
-
-pluginName = Restructure Model
-providerName = www.example.org

tools/restructuring/plugin.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
--->
-
-<plugin>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated restructure -->
-      <package
-            uri="http://restructur.net/restructuremodel"
-            class="org.oceandsl.tools.restructuring.restructuremodel.RestructuremodelPackage"
-            genModel="restructure-model/restructure.genmodel"/>
-   </extension>
-
-</plugin>