JavaTX/Plugin_JCC
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Daniel Holle 2023-06-21 16:17:57 +02:00
parent 7cf1419cc4
commit f0fab8c936
4 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/.classpath
View File

@ -1,29 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="lib" path="lib/animal-sniffer-annotations.jar"/> <classpathentry kind="lib" path="lib/animal-sniffer-annotations.jar"/>
<classpathentry kind="lib" path="lib/antlr-runtime.jar"/> <classpathentry kind="lib" path="lib/antlr-runtime.jar"/>
<classpathentry kind="lib" path="lib/antlr4-runtime.jar"/> <classpathentry kind="lib" path="lib/antlr4-runtime.jar"/>
<classpathentry kind="lib" path="lib/antlr4.jar"/> <classpathentry kind="lib" path="lib/antlr4.jar"/>
<classpathentry kind="lib" path="lib/asm.jar"/> <classpathentry kind="lib" path="lib/asm.jar"/>
<classpathentry kind="lib" path="lib/bcel.jar"/> <classpathentry kind="lib" path="lib/bcel.jar"/>
<classpathentry kind="lib" path="lib/checker-qual.jar"/> <classpathentry kind="lib" path="lib/checker-qual.jar"/>
<classpathentry kind="lib" path="lib/commons-collections4.jar"/> <classpathentry kind="lib" path="lib/commons-collections4.jar"/>
<classpathentry kind="lib" path="lib/commons-io.jar"/> <classpathentry kind="lib" path="lib/commons-io.jar"/>
<classpathentry kind="lib" path="lib/error_prone_annotations.jar"/> <classpathentry kind="lib" path="lib/error_prone_annotations.jar"/>
<classpathentry kind="lib" path="lib/failureaccess.jar"/> <classpathentry kind="lib" path="lib/failureaccess.jar"/>
<classpathentry kind="lib" path="lib/guava.jar"/> <classpathentry kind="lib" path="lib/guava.jar"/>
<classpathentry kind="lib" path="lib/icu4j.jar"/> <classpathentry kind="lib" path="lib/icu4j.jar"/>
<classpathentry kind="lib" path="lib/j2objc-annotations.jar"/> <classpathentry kind="lib" path="lib/j2objc-annotations.jar"/>
<classpathentry kind="lib" path="lib/javassist.jar"/> <classpathentry kind="lib" path="lib/javassist.jar"/>
<classpathentry kind="lib" path="lib/JavaTXcompiler.jar" sourcepath="C:/Users/Daniel/Documents/Programming/JavaCompilerCore/src/main/java"/> <classpathentry kind="lib" path="lib/JavaTXcompiler.jar" sourcepath="/home/vic/Documents/Programming/JavaCompilerCore/src"/>
<classpathentry kind="lib" path="lib/javax.json.jar"/> <classpathentry kind="lib" path="lib/javax.json.jar"/>
<classpathentry kind="lib" path="lib/jsr305.jar"/> <classpathentry kind="lib" path="lib/jsr305.jar"/>
<classpathentry kind="lib" path="lib/listenablefuture.jar"/> <classpathentry kind="lib" path="lib/listenablefuture.jar"/>
<classpathentry kind="lib" path="lib/org.abego.treelayout.core.jar"/> <classpathentry kind="lib" path="lib/org.abego.treelayout.core.jar"/>
<classpathentry kind="lib" path="lib/reflections.jar"/> <classpathentry kind="lib" path="lib/reflections.jar"/>
<classpathentry kind="lib" path="lib/ST4.jar"/> <classpathentry kind="lib" path="lib/ST4.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

10
JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/src/typinferenzplugin/Typinferenz.java
View File

@ -10,6 +10,7 @@ import java.io.IOException;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
@ -122,10 +123,11 @@ public class Typinferenz {
} }
public String getOutputDirectory() { public String getOutputDirectory() {
String outputDirectory = editor.getFilePath().toString(); var path = Path.of(editor.getFilePath().toString());
outputDirectory = outputDirectory.substring(0, var parentFolder = path.getParent().getParent();
outputDirectory.length() - editor.getFilePath().lastSegment().length());// ".jav" hat Länge 4 var classFilePath = parentFolder.resolve("classFiles");
return outputDirectory; classFilePath.toFile().mkdirs();
return classFilePath.toString();
} }
public void updateresultSets(Vector<ResultSet> typeInsertResults) { public void updateresultSets(Vector<ResultSet> typeInsertResults) {

6
JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/src/typinferenzplugin/editor/JavOutline.java
View File

@ -1,8 +1,10 @@
package typinferenzplugin.editor; package typinferenzplugin.editor;
import java.awt.GraphicsDevice;
import java.util.Vector; import java.util.Vector;
import org.eclipse.jdt.ui.ISharedImages;
import org.eclipse.jface.action.Action; import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuListener;
@ -17,12 +19,15 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.swt.graphics.Device;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.TreeItem; import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.views.contentoutline.ContentOutlinePage; import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
@ -249,5 +254,4 @@ class SyntaxTreeLabelProvider extends LabelProvider{
return generator.getDescription(); return generator.getDescription();
//return "test"; //return "test";
} }
} }

14
JavaCompilerPlugin/releng/JavaCompilerPlugin.Target/JavaCompilerPlugin.Target.target
View File

@ -2,12 +2,6 @@
<?pde version="3.8"?> <?pde version="3.8"?>
<target name="JavaCompilerPlugin.Target" sequenceNumber="2"> <target name="JavaCompilerPlugin.Target" sequenceNumber="2">
<locations> <locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/eclipse/updates/4.27/"/>
<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.11.1900.v20230120-0604"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.700.v20230220-1352"/>
<unit id="org.eclipse.platform.sdk" version="4.27.0.I20230302-0300"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository/"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository/"/>
<unit id="ch.qos.logback.slf4j" version="1.2.3.v20221112-0806"/> <unit id="ch.qos.logback.slf4j" version="1.2.3.v20221112-0806"/>
@ -31,6 +25,12 @@
<unit id="org.eclipse.swtbot.ide.feature.group" version="4.0.0.202206011610"/> <unit id="org.eclipse.swtbot.ide.feature.group" version="4.0.0.202206011610"/>
<unit id="org.eclipse.swtbot.junit5.feature.group" version="4.0.0.202206011610"/> <unit id="org.eclipse.swtbot.junit5.feature.group" version="4.0.0.202206011610"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/eclipse/updates/4.28/"/>
<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.11.2000.v20230510-1208"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.800.v20230523-2142"/>
<unit id="org.eclipse.platform.sdk" version="4.28.0.I20230605-0440"/>
</location>
</locations> </locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-19"/> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-19"/>
</target> </target>