Stand 15.12.2018

This commit is contained in:
Michael Uhl 2018-12-15 12:33:26 +01:00
parent d6184cca91
commit 26c8bdab85
7 changed files with 214 additions and 101 deletions

View File

@ -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

View File

@ -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/

Binary file not shown.

After

Width:  |  Height:  |  Size: 983 B

View File

@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
<!-- Jav-Editor: -->
<extension
point="org.eclipse.ui.editors">
<editor
class="typinferenzplugin.editor.JavEditor"
contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
default="true"
extensions="jav"
icon="icons/sample.gif"
id="typinferenzplugin.editors.XMLEditor"
name="Java-Typinferenz-Editor">
</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>
<!-- 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"
markerType="typinferenzplugin.replacemarker"
markerSeverity="1">
</type>
</extension>
<!-- Src: https://stackoverflow.com/questions/2888207/eclipse-plugin-custom-icon-for-a-marker
<extension point="org.eclipse.ui.editors.markerAnnotationSpecification">
<specification
annotationType="typinferenzplugin.annotation"
icon="icons/sample.gif"
verticalRulerPreferenceKey="myMarkerIndicationInVerticalRuler"
verticalRulerPreferenceValue="true"/>
</extension>
-->
<extension
point="org.eclipse.ui.editors.markerAnnotationSpecification">
<specification
annotationType="typinferenzplugin.annotation"
icon="icons/sample.gif"
colorPreferenceKey="org.eclipse.viatra2.slice.color"
colorPreferenceValue="192,255,192"
contributesToHeader="false"
highlightPreferenceKey="org.eclipse.viatra2.slice.highlight"
highlightPreferenceValue="true"
includeOnPreferencePage="true"
label="GTASM Slice Marker"
overviewRulerPreferenceKey="org.eclipse.viatra2.slice.overview"
overviewRulerPreferenceValue="true"
presentationLayer="0"
textPreferenceKey="org.eclipse.viatra2.slice.text"
textPreferenceValue="true"
textStylePreferenceValue="BOX"
verticalRulerPreferenceKey="org.eclipse.viatra2.slice.ruler"
verticalRulerPreferenceValue="true">
</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">
<markerResolutionGenerator
markerType="typinferenzplugin.replacemarker"
class="typinferenzplugin.marker.QuickFixer"/>
</extension>
</plugin>

View File

@ -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<JavMarker> errorMarkers = new Vector<JavMarker>();

View File

@ -22,5 +22,12 @@
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"/>
</feature>

View File

@ -1,101 +1,112 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaCompilerPlugin.configuration</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
<groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaCompilerPlugin.configuration</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<tycho.version>1.2.0</tycho.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<eclipse-repo.url>http://download.eclipse.org/releases/oxygen</eclipse-repo.url>
</properties>
<properties>
<tycho.version>1.2.0</tycho.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<eclipse-repo.url>http://download.eclipse.org/releases/oxygen</eclipse-repo.url>
</properties>
<repositories>
<repository>
<id>eclipse-release</id>
<url>${eclipse-repo.url}</url>
<layout>p2</layout>
</repository>
</repositories>
<repositories>
<repository>
<id>eclipse-release</id>
<url>${eclipse-repo.url}</url>
<layout>p2</layout>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaCompilerCoreOsgi</artifactId>
<version>0.1</version>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaCompilerCoreOsgi</artifactId>
<version>0.1</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<includeAllDependencies>true</includeAllDependencies>
</configuration>
</plugin>
<!--Enable the replacement of the SNAPSHOT version in the final product
configuration -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<executions>
<execution>
<phase>package</phase>
<id>package-feature</id>
<configuration>
<finalName>${project.artifactId}_${unqualifiedVersion}.${buildQualifier}</finalName>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<pomDependencies>consider</pomDependencies>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<includeAllDependencies>true</includeAllDependencies>
</configuration>
</plugin>
<!--Enable the replacement of the SNAPSHOT version in the final product
configuration -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<executions>
<execution>
<phase>package</phase>
<id>package-feature</id>
<configuration>
<finalName>${project.artifactId}_${unqualifiedVersion}.${buildQualifier}</finalName>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<pomDependencies>consider</pomDependencies>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
</environments>
</configuration>
</plugin>
</plugins>
</build>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
</environments>
</configuration>
</plugin>
</plugins>
<!--
<resources>
<resource>
<directory>bundles/JavaCompilerPlugin.Plugin/icons</directory>
<includes>
<include>sample.gif</include>
</includes>
</resource>
</resources>
-->
</build>
</project>