Skip to content

Commit

Permalink
integrate Christian's modifications
Browse files Browse the repository at this point in the history
fix rcanconstructor
  • Loading branch information
elfunesto committed Sep 11, 2024
1 parent 4963016 commit f0ba9ce
Show file tree
Hide file tree
Showing 36 changed files with 23 additions and 8 deletions.
5 changes: 5 additions & 0 deletions RCaNconstructor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@
<groupId>io.github.mkpaz</groupId>
<artifactId>atlantafx-base</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>5.3.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down
2 changes: 1 addition & 1 deletion RCaNconstructor/src/main/java/fr/cm/Main/FirstPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public FirstPage(){
double he = Context.getWindowHeight();
double wi = Context.getWindowWidth();
try {
Image image = new Image("/img/CaN2020.png");
Image image = new Image("/CaN2020.png");
double iw = image.getWidth();
double ih = image.getHeight();
double ratio = Math.min(he/ih, wi/iw);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,11 @@ public void start(Stage primaryStage) {
stage.widthProperty().addListener(changeSizelistener);
stage.heightProperty().addListener(changeSizelistener);
setOnClose();
RCommandListXML.init();
HelpListXML.init();
RCommandListXML.init();
Context.init();
ObjectsManager.init();
ObjectsManager.getNetworkView().update();

borderPaneRacine = new BorderPane();

setFirstPage();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public MenuRCaNBuild(BorderPane borderPaneRacine) {
MenuRCaNBuild.borderPaneRacine = borderPaneRacine;
menuItems = new ArrayList<>();
MenuItem test = new MenuItem("TEST BUILD");
menuItems.add(test);
for (RCaNScript rCaNScriptXML : RCommandListXML.getListOfRCommandXML()) {
if (rCaNScriptXML.getMenu().equals("build")) {
MenuItem menuItem = new MenuItem(rCaNScriptXML.getTextMenu());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public MenuRCaNSample(BorderPane borderPaneRacine) {
MenuRCaNSample.borderPaneRacine = borderPaneRacine;
menuItems = new ArrayList<>();
MenuItem test = new MenuItem("TEST SAMPLE");
menuItems.add(test);
for (RCaNScript rCaNScript : RCommandListXML.getListOfRCommandXML()) {
if (rCaNScript.getMenu().equals("sample")) {
MenuItem menuItem = new MenuItem(rCaNScript.getTextMenu());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public static void updateAction(int nu, String comment) {
// META INFORMATION
public static void makeMetaElementsList(){
listOfMetaElements = new ArrayList<>();
String fileName = "project/Project.txt";
String fileName = "Project.txt";
InputStream inst = ObjectsManager.class.getClassLoader().getResourceAsStream(fileName);
if(inst != null){
List<String> elementsResource = new ArrayList<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class HelpListXML {

public static void init(){
listOfHelpXML = new ArrayList<>();
String fileName = "scripts/Helps.xml";
String fileName = "Helps.xml";
try {
InputStream inst = HelpListXML.class.getClassLoader().getResourceAsStream(fileName);
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class RCommandListXML {
public static void init(){
listOfRCaNScripts = new ArrayList<>();

String fileName = "scripts/RCommands.xml";
String fileName = "RCommands.xml";
StringBuilder sb = new StringBuilder("Scripts R");
try {
InputStream inst = RCommandListXML.class.getClassLoader().getResourceAsStream(fileName);
Expand Down
13 changes: 13 additions & 0 deletions RCaNconstructor/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module RCaNconstructor {

requires javafx.controls;
requires javafx.fxml;

requires RCaller;
requires poi;
requires java.logging;
requires commons-io;
requires java.desktop;

opens fr.cm.Main to javafx.graphics;
}
File renamed without changes

0 comments on commit f0ba9ce

Please sign in to comment.