From 26c8bdab85f162778b7a426b6710429e18cc4e94 Mon Sep 17 00:00:00 2001 From: Michael Uhl Date: Sat, 15 Dec 2018 12:33:26 +0100 Subject: [PATCH] Stand 15.12.2018 --- .../META-INF/MANIFEST.MF | 8 +- .../build.properties | 17 +- .../icons/sample.gif | Bin 0 -> 983 bytes .../JavaCompilerPlugin.Plugin/plugin.xml | 78 +++++++ .../typinferenzplugin/editor/JavEditor.java | 8 +- .../JavaCompilerPlugin.Feature/feature.xml | 7 + .../JavaCompilerPlugin.Configuration/pom.xml | 197 +++++++++--------- 7 files changed, 214 insertions(+), 101 deletions(-) create mode 100644 JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/icons/sample.gif create mode 100644 JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/plugin.xml diff --git a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF index d75ac71..48e308c 100644 --- a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF +++ b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF @@ -1,9 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Plugin +Bundle-Name: JavaCompilerPlugin.Plugin Bundle-SymbolicName: JavaCompilerPlugin.Plugin;singleton:=true Bundle-Version: 0.1.0.qualifier Bundle-Vendor: de.dhbwstuttgart +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: ., + bin Automatic-Module-Name: JavaCompilerPlugin.Plugin;singleton:=true Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -14,5 +17,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.ide, org.eclipse.ui.views, de.dhbwstuttgart.JavaCompilerCoreOsgi -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +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 diff --git a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/build.properties b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/build.properties index 34d2e4d..5fb442f 100644 --- a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/build.properties +++ b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/build.properties @@ -1,4 +1,17 @@ source.. = src/ output.. = bin/ -bin.includes = META-INF/,\ - . +bin.includes = src/,\ + plugin.xml,\ + icons/,\ + build.properties,\ + META-INF/,\ + .classpath,\ + .project,\ + bin/ +src.includes = src/,\ + icons/,\ + build.properties,\ + META-INF/,\ + .classpath,\ + .project,\ + bin/ diff --git a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/icons/sample.gif b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/icons/sample.gif new file mode 100644 index 0000000000000000000000000000000000000000..34fb3c9d8cb7d489681b7f7aee4bdcd7eaf53610 GIT binary patch literal 983 zcmZ?wbhEHb6krfw_|CxKYUg-n!?izO{@9*?jxd%4aX0yzy`dymabz zw#(eg=y~&N&n)dZv2xzduG}5lraiApo3(c4*{Ylg5#|$JO_EEZ<^|a2`Z*=9ns7DV zy=TR&gYw*7f%auV?ip3tvjRPmcdoho{K?x$_vR?C#t5&<;~V}S*>OMCr>h}%%bLZ9 zmo3`hYEwTICo-TTCZwgTsC&VjZRgJ1eE#fBa^%9R zmmfWS@;bnyJ27HWY}kxYzv(Hl>yu;FCPlAEh+34Muq-8Rb6C)<8qA3{r2e5 z`$vyngh#H=FWlqqvnapfc5%(!sQ4v?r7J61-&eJNEN^;KTK}T7{#i-gJh%G*9vcYdwv_*~xdw!Gz4Va?T!sXyyF@8?w<>X`X=#j%uHV4GRvj@+tE@ zQ%F!a)GKcn^~8abN>4la1UNXVL;{ZWi)lEwyeatDu%Lr6;aASiLrXXW zQm# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/src/typinferenzplugin/editor/JavEditor.java b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/src/typinferenzplugin/editor/JavEditor.java index 97a6d6f..890222c 100644 --- a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/src/typinferenzplugin/editor/JavEditor.java +++ b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/src/typinferenzplugin/editor/JavEditor.java @@ -37,8 +37,8 @@ import typinferenzplugin.error.ErrorOutput; //Example from: http://help.eclipse.org/indigo/index.jsp /** - * Editor für .jav-Dateien - * Anmerkung: Für jede geöffnete Datei wird eine Instanz des Editors erstellt + * Editor für .jav-Dateien + * Anmerkung: Für jede geöffnete Datei wird eine Instanz des Editors erstellt * @author janulrich * */ @@ -47,12 +47,12 @@ public class JavEditor extends TextEditor{ private JavOutline outlinePage; /** - * Der SyntaxBaum für das aktuell geöffnete Dokument. + * Der SyntaxBaum für das aktuell geöffnete Dokument. */ private SourceFile sourceFile; /** - * Die TypeReplaceMarker für das aktuell geöffnete Dokument + * Die TypeReplaceMarker für das aktuell geöffnete Dokument */ private Vector errorMarkers = new Vector(); diff --git a/JavaCompilerPlugin/features/JavaCompilerPlugin.Feature/feature.xml b/JavaCompilerPlugin/features/JavaCompilerPlugin.Feature/feature.xml index 3081cfc..20df408 100644 --- a/JavaCompilerPlugin/features/JavaCompilerPlugin.Feature/feature.xml +++ b/JavaCompilerPlugin/features/JavaCompilerPlugin.Feature/feature.xml @@ -22,5 +22,12 @@ install-size="0" version="0.0.0" unpack="false"/> + + diff --git a/JavaCompilerPlugin/releng/JavaCompilerPlugin.Configuration/pom.xml b/JavaCompilerPlugin/releng/JavaCompilerPlugin.Configuration/pom.xml index 3050ab2..1964651 100644 --- a/JavaCompilerPlugin/releng/JavaCompilerPlugin.Configuration/pom.xml +++ b/JavaCompilerPlugin/releng/JavaCompilerPlugin.Configuration/pom.xml @@ -1,101 +1,112 @@ - 4.0.0 - de.dhbwstuttgart - JavaCompilerPlugin.configuration - 0.1.0-SNAPSHOT - pom + 4.0.0 + de.dhbwstuttgart + JavaCompilerPlugin.configuration + 0.1.0-SNAPSHOT + pom - - 1.2.0 - UTF-8 - http://download.eclipse.org/releases/oxygen - + + 1.2.0 + UTF-8 + http://download.eclipse.org/releases/oxygen + - - - eclipse-release - ${eclipse-repo.url} - p2 - - + + + eclipse-release + ${eclipse-repo.url} + p2 + + - - - de.dhbwstuttgart - JavaCompilerCoreOsgi - 0.1 - - + + + de.dhbwstuttgart + JavaCompilerCoreOsgi + 0.1 + + - - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho.version} - true - - - org.eclipse.tycho - tycho-p2-repository-plugin - ${tycho.version} - - true - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - package - package-feature - - ${project.artifactId}_${unqualifiedVersion}.${buildQualifier} - - - - - - org.eclipse.tycho - target-platform-configuration - ${tycho.version} - - consider + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho.version} + + true + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + package + package-feature + + ${project.artifactId}_${unqualifiedVersion}.${buildQualifier} + + + + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + consider - - - linux - gtk - x86 - - - linux - gtk - x86_64 - - - win32 - win32 - x86 - - - win32 - win32 - x86_64 - - - macosx - cocoa - x86_64 - - - - - - + + + linux + gtk + x86 + + + linux + gtk + x86_64 + + + win32 + win32 + x86 + + + win32 + win32 + x86_64 + + + macosx + cocoa + x86_64 + + + + + + + + \ No newline at end of file