Remove all libraries and add dependencies to Maven

pull/35/head
James Ball 2020-11-28 15:43:58 +00:00
rodzic 6905acfa07
commit 98d962d9e7
22 zmienionych plików z 50 dodań i 12 usunięć

Wyświetl plik

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-fxml:11.0.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-fxml/11.0.1/javafx-fxml-11.0.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-fxml/11.0.1/javafx-fxml-11.0.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-fxml/11.0.1/javafx-fxml-11.0.1-sources.jar!/" />
</SOURCES>
</library>
</component>

Wyświetl plik

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-fxml:win:11.0.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-fxml/11.0.1/javafx-fxml-11.0.1-win.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-fxml/11.0.1/javafx-fxml-11.0.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-fxml/11.0.1/javafx-fxml-11.0.1-sources.jar!/" />
</SOURCES>
</library>
</component>

Wyświetl plik

@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/out" />
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/out" />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/out" />
<excludeFolder url="file://$MODULE_DIR$/target" /> <excludeFolder url="file://$MODULE_DIR$/target" />
<excludeFolder url="file://$MODULE_DIR$/win32-x64" /> <excludeFolder url="file://$MODULE_DIR$/win32-x64" />
</content> </content>
@ -25,6 +24,8 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="library" name="Maven: org.openjfx:javafx-fxml:11.0.1" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-fxml:win:11.0.1" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-controls:15.0.1" level="project" /> <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:15.0.1" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-controls:win:15.0.1" level="project" /> <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:win:15.0.1" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:15.0.1" level="project" /> <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:15.0.1" level="project" />

Plik binarny nie jest wyświetlany.

Plik binarny nie jest wyświetlany.

Plik binarny nie jest wyświetlany.

Plik binarny nie jest wyświetlany.

Plik binarny nie jest wyświetlany.

Plik binarny nie jest wyświetlany.

Plik binarny nie jest wyświetlany.

Plik binarny nie jest wyświetlany.

Wyświetl plik

@ -1,3 +0,0 @@
javafx.version=15.0.1
javafx.runtime.version=15.0.1+1
javafx.runtime.build=1

Plik binarny nie jest wyświetlany.

Plik binarny nie jest wyświetlany.

Plik binarny nie jest wyświetlany.

Plik binarny nie jest wyświetlany.

Plik binarny nie jest wyświetlany.

Plik binarny nie jest wyświetlany.

17
pom.xml
Wyświetl plik

@ -8,13 +8,22 @@
<artifactId>osci-render</artifactId> <artifactId>osci-render</artifactId>
<version>1.0</version> <version>1.0</version>
<build> <build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<outputDirectory>out</outputDirectory>
<testOutputDirectory>out</testOutputDirectory>
<resources>
<resource>
<directory>resources</directory>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.openjfx</groupId> <groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId> <artifactId>javafx-maven-plugin</artifactId>
<version>0.0.5</version> <version>0.0.5</version>
<configuration> <configuration>
<mainClass>osci-render/gui.Gui</mainClass> <mainClass>Gui</mainClass>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -36,6 +45,12 @@
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>11.0.1</version>
</dependency>
<dependency> <dependency>
<groupId>org.openjfx</groupId> <groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId> <artifactId>javafx-controls</artifactId>

Wyświetl plik

@ -1,10 +1,8 @@
package engine; package engine;
import com.mokiat.data.front.error.WFException;
import com.mokiat.data.front.parser.*; import com.mokiat.data.front.parser.*;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;

Wyświetl plik

@ -1,5 +1,6 @@
package gui; package gui;
import javafx.application.Application; import javafx.application.Application;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
@ -11,7 +12,7 @@ public class Gui extends Application {
@Override @Override
public void start(Stage primaryStage) throws Exception { public void start(Stage primaryStage) throws Exception {
FXMLLoader loader = new FXMLLoader(getClass().getResource("osci-render.fxml")); FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/osci-render.fxml"));
Parent root = loader.load(); Parent root = loader.load();
Controller controller = loader.getController(); Controller controller = loader.getController();
controller.setStage(primaryStage); controller.setStage(primaryStage);