From 0e5c3216d0b44e81b57121d1030b705e5d68622b Mon Sep 17 00:00:00 2001
From: Michael Uhl <michael.b.uhl@gmail.com>
Date: Wed, 19 Dec 2018 10:38:18 +0100
Subject: [PATCH] Stand 19.12.2018

---
 .../JavaCompilerPlugin.Plugin/.classpath      |  2 +-
 .../META-INF/MANIFEST.MF                      | 29 +++++++++---------
 .../build.properties                          | 22 +++++---------
 .../JavaCompilerPlugin.Plugin/plugin.xml      | 30 +++++++++----------
 .../JavaCompilerPlugin.Feature/feature.xml    | 16 +++++-----
 JavaCompilerPlugin/pom.xml                    |  5 ++--
 6 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/.classpath b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/.classpath
index 6c39188..d9f32c1 100644
--- a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/.classpath
+++ b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="/JavaCompilerCoreOsgiInline/target/JavaCompilerCoreOsgiInline-0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="bin" sourcepath="bin"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF
index 48e308c..2a2fc38 100644
--- a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF
+++ b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF
@@ -1,22 +1,23 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: JavaCompilerPlugin.Plugin
-Bundle-SymbolicName: JavaCompilerPlugin.Plugin;singleton:=true
+Bundle-Name: TypinferenzPlugin
+Bundle-SymbolicName: TypinferenzPlugin;singleton:=true
 Bundle-Version: 0.1.0.qualifier
 Bundle-Vendor: de.dhbwstuttgart
+Bundle-Activator: typinferenzplugin.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench,
+ org.eclipse.core.resources,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.equinox.ds; visibility:=reexport,
+ de.dhbwstuttgart.JavaCompilerCoreOsgi
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
  bin
-Automatic-Module-Name: JavaCompilerPlugin.Plugin;singleton:=true
-Require-Bundle: org.eclipse.ui,
-  org.eclipse.core.runtime,
-  org.eclipse.jface.text,
-  org.eclipse.ui.editors,
-  org.eclipse.ui.workbench,
-  org.eclipse.core.resources,
-  org.eclipse.ui.ide,
-  org.eclipse.ui.views,
-  de.dhbwstuttgart.JavaCompilerCoreOsgi
-Bundle-RequiredExecutionEnvironment: JavaSE-9
 Provide-Capability: osgi.ee;osgi.ee="JavaSE";version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8"
-Bundle-Activator: typinferenzplugin.Activator
+Automatic-Module-Name: TypinferenzPlugin
diff --git a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/build.properties b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/build.properties
index 5fb442f..db1d5c7 100644
--- a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/build.properties
+++ b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/build.properties
@@ -1,17 +1,9 @@
-source.. = src/
-output.. = bin/
-bin.includes = src/,\
-               plugin.xml,\
-               icons/,\
-               build.properties,\
+bin.includes = plugin.xml,\
                META-INF/,\
-               .classpath,\
-               .project,\
-               bin/
-src.includes = src/,\
+               .,\
                icons/,\
-               build.properties,\
-               META-INF/,\
-               .classpath,\
-               .project,\
-               bin/
+               src/,\
+               bin/,\
+               build.properties
+src.includes = src/
+
diff --git a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/plugin.xml b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/plugin.xml
index 19c83ed..1b55516 100644
--- a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/plugin.xml
+++ b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.4"?>
 <plugin>
 
-    <!-- Jav-Editor: --> 
+	<!-- Jav-Editor: --> 
    <extension
          point="org.eclipse.ui.editors">
       <editor
@@ -16,19 +16,19 @@
       </editor>
    </extension>
 
-    <!-- Marker
-    Tutorial dazu: http://cubussapiens.hu/2011/05/custom-markers-and-annotations-the-bright-side-of-eclipse/
-    -->
-    <extension
-        id="typinferenzplugin.replacemarker"
-        name="TypeReplaceMarker"
-        point="org.eclipse.core.resources.markers">
-     <super type="org.eclipse.core.resources.problemmarker" />
-     <super type="org.eclipse.core.resources.textmarker" />
-    </extension>
+	<!-- Marker
+	Tutorial dazu: http://cubussapiens.hu/2011/05/custom-markers-and-annotations-the-bright-side-of-eclipse/
+	-->
+	<extension
+	    id="typinferenzplugin.replacemarker"
+	    name="TypeReplaceMarker"
+	    point="org.eclipse.core.resources.markers">
+	 <super type="org.eclipse.core.resources.problemmarker" />
+	 <super type="org.eclipse.core.resources.textmarker" />
+	</extension>
 
-    <!-- Src: http://help.eclipse.org/indigo/index.jsp?topic=%2Forg.eclipse.platform.doc.isv%2Freference%2Fextension-points%2Forg_eclipse_ui_editors_annotationTypes.html -->
-    <extension
+	<!-- Src: http://help.eclipse.org/indigo/index.jsp?topic=%2Forg.eclipse.platform.doc.isv%2Freference%2Fextension-points%2Forg_eclipse_ui_editors_annotationTypes.html -->
+	<extension
          point="org.eclipse.ui.editors.annotationTypes">
       <type
          name="typinferenzplugin.annotation"
@@ -69,8 +69,8 @@
       </specification>
    </extension>
 
-    <!-- ExtensionPoint für die QuickFixes der ReplaceMarker Quelle: http://wiki.eclipse.org/FAQ_How_do_I_implement_Quick_Fixes_for_my_own_language%3F -->
-    <extension point="org.eclipse.ui.ide.markerResolution">
+	<!-- ExtensionPoint für die QuickFixes der ReplaceMarker Quelle: http://wiki.eclipse.org/FAQ_How_do_I_implement_Quick_Fixes_for_my_own_language%3F -->
+	<extension point="org.eclipse.ui.ide.markerResolution">
       <markerResolutionGenerator
          markerType="typinferenzplugin.replacemarker"
          class="typinferenzplugin.marker.QuickFixer"/>
diff --git a/JavaCompilerPlugin/features/JavaCompilerPlugin.Feature/feature.xml b/JavaCompilerPlugin/features/JavaCompilerPlugin.Feature/feature.xml
index 20df408..92e34a7 100644
--- a/JavaCompilerPlugin/features/JavaCompilerPlugin.Feature/feature.xml
+++ b/JavaCompilerPlugin/features/JavaCompilerPlugin.Feature/feature.xml
@@ -16,18 +16,18 @@
       [Enter License Description here.]
    </license>
 
-   <plugin
-         id="JavaCompilerPlugin.Plugin"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-         
    <plugin
          id="de.dhbwstuttgart.JavaCompilerCoreOsgi"
          download-size="0"
          install-size="0"
          version="0.1.0"
-         unpack="false"/>         
+         unpack="false"/>
+
+   <plugin
+         id="TypinferenzPlugin"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/JavaCompilerPlugin/pom.xml b/JavaCompilerPlugin/pom.xml
index a682f60..dd1a42f 100644
--- a/JavaCompilerPlugin/pom.xml
+++ b/JavaCompilerPlugin/pom.xml
@@ -1,8 +1,7 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    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>de.dhbwstuttgart</groupId>
     <artifactId>JavaCompilerPlugin</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <parent>
         <groupId>de.dhbwstuttgart</groupId>