Skip to content

Commit

Permalink
Making the threads internal
Browse files Browse the repository at this point in the history
  • Loading branch information
@madhephaestus
madhephaestus committed Jan 9, 2025
1 parent 62c6a98 commit 3ba9847
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 50 deletions.
2 changes: 1 addition & 1 deletion libraries/bowler-script-kernel
Submodule bowler-script-kernel updated 2 files
+0 −47 src/main/java/com/neuronrobotics/bowlerstudio/scripting/GitTimeoutThread.java
+34 −101 src/main/java/com/neuronrobotics/bowlerstudio/scripting/ScriptingEngine.java
99 changes: 52 additions & 47 deletions src/main/java/com/neuronrobotics/bowlerstudio/BowlerStudioMenu.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -604,34 +604,38 @@ public void run() {
}

public static void checkandDelete(String url) {
Alert alert = new Alert(AlertType.CONFIRMATION);
alert.setTitle("Are you sure you have published all your work?");
alert.setHeaderText("This will wipe out the local cache for " + url);
alert.setContentText("All files that are not published will be deleted");
Node root = alert.getDialogPane();
Stage stage = (Stage) alert.getDialogPane().getScene().getWindow();
stage.setOnCloseRequest(ev -> alert.hide());
FontSizeManager.addListener(fontNum -> {
int tmp = fontNum - 10;
if (tmp < 12)
tmp = 12;
root.setStyle("-fx-font-size: " + tmp + "pt");
alert.getDialogPane().applyCss();
alert.getDialogPane().layout();
stage.sizeToScene();
BowlerStudio.runLater(() -> {

Alert alert = new Alert(AlertType.CONFIRMATION);
alert.setTitle("Are you sure you have published all your work?");
alert.setHeaderText("This will wipe out the local cache for " + url);
alert.setContentText("All files that are not published will be deleted");
Node root = alert.getDialogPane();
Stage stage = (Stage) alert.getDialogPane().getScene().getWindow();
stage.setOnCloseRequest(ev -> alert.hide());
FontSizeManager.addListener(fontNum -> {
int tmp = fontNum - 10;
if (tmp < 12)
tmp = 12;
root.setStyle("-fx-font-size: " + tmp + "pt");
alert.getDialogPane().applyCss();
alert.getDialogPane().layout();
stage.sizeToScene();
});
Optional<ButtonType> result = alert.showAndWait();
if (result.get() == ButtonType.OK) {
new Thread(() -> {
ScriptingEngine.deleteRepo(url);
BowlerStudioMenuWorkspace.remove(url);
BowlerStudio.runLater(() -> {
BowlerStudioMenuWorkspace.sort();
});
}).start();
} else {
com.neuronrobotics.sdk.common.Log.error("Nothing was deleted");
}

});
Optional<ButtonType> result = alert.showAndWait();
if (result.get() == ButtonType.OK) {
new Thread(() -> {
ScriptingEngine.deleteRepo(url);
BowlerStudioMenuWorkspace.remove(url);
BowlerStudio.runLater(() -> {
BowlerStudioMenuWorkspace.sort();
});
}).start();
} else {
com.neuronrobotics.sdk.common.Log.error("Nothing was deleted");
}
}

private static MenuResettingEventHandler createLoadCommitsEvent(String url, Menu orgCommits) {
Expand Down Expand Up @@ -665,7 +669,7 @@ public void handle(Event event) {
try {
ScriptingEngine.checkout(url, branchName);

ScriptingEngine.openGit(url,git->{
ScriptingEngine.openGit(url, git -> {
Repository repo = git.getRepository();
// com.neuronrobotics.sdk.common.Log.error("Commits of branch: " + branchName);
// com.neuronrobotics.sdk.common.Log.error("-------------------------------------");
Expand All @@ -687,8 +691,8 @@ public void handle(Event event) {
// RevCommit previous = null;
for (RevCommit commit : commitsList) {
String date = format.format(new Date(commit.getCommitTime() * 1000L));
String fullData = commit.getName() + "\r\n" + commit.getAuthorIdent().getName() + "\r\n"
+ date + "\r\n" + commit.getFullMessage() + "\r\n"
String fullData = commit.getName() + "\r\n" + commit.getAuthorIdent().getName()
+ "\r\n" + date + "\r\n" + commit.getFullMessage() + "\r\n"
+ "---------------------------------------------------\r\n";// +
// previous==null?"":getDiffOfCommit(previous,commit, repo, git);

Expand All @@ -704,7 +708,8 @@ public void handle(Event event) {
tmp.setOnAction(ev -> {
new Thread() {
public void run() {
com.neuronrobotics.sdk.common.Log.error("Selecting \r\n\r\n" + fullData);
com.neuronrobotics.sdk.common.Log
.error("Selecting \r\n\r\n" + fullData);

String branch;
try {
Expand All @@ -726,9 +731,11 @@ public void run() {
ScriptingEngine.setCommitContentsAsCurrent(url,
slugify, commit);
} catch (IOException e) {
exp.uncaughtException(Thread.currentThread(), e);
exp.uncaughtException(Thread.currentThread(),
e);
} catch (GitAPIException e) {
exp.uncaughtException(Thread.currentThread(), e);
exp.uncaughtException(Thread.currentThread(),
e);
}
}
}.start();
Expand All @@ -745,8 +752,6 @@ public void run() {
}
});



BowlerStudio.runLater(() -> {
orgCommits.hide();
BowlerStudio.runLater(() -> {
Expand Down Expand Up @@ -1619,21 +1624,21 @@ public void onLogin(String arg0) {
try {
int i = currentIndex + 1;

double percent =((double)i)/((double)finalIndex)*100;
String x = intermediateShape.getName() + " " + type.trim() + " "+String.format("%.1f", percent)+"% finished : " + i + " of "
+ finalIndex;
double percent = ((double) i) / ((double) finalIndex) * 100;
String x = intermediateShape.getName() + " " + type.trim() + " " + String.format("%.1f", percent)
+ "% finished : " + i + " of " + finalIndex;
if (showCSGProgress.isSelected()) {
System.out.println(x);
if(finalIndex>50) {
if(percent>90) {
if (finalIndex > 50) {
if (percent > 90) {
SplashManager.closeSplash();
}else {
SplashManager.renderSplashFrame((int)percent, x);
} else {
SplashManager.renderSplashFrame((int) percent, x);
}
}else {
} else {
SplashManager.closeSplash();
}
}else
} else
com.neuronrobotics.sdk.common.Log.error(x);
} catch (Exception ex) {
ex.printStackTrace();
Expand All @@ -1655,8 +1660,8 @@ public void onLogin(String arg0) {
// }
// });
Runnable r = () -> {
boolean parseBoolean = Boolean
.parseBoolean(ConfigurationDatabase.getObject("MenueSettings", "CSG_Advanced_STL", CSG.isPreventNonManifoldTriangles()).toString());
boolean parseBoolean = Boolean.parseBoolean(ConfigurationDatabase
.getObject("MenueSettings", "CSG_Advanced_STL", CSG.isPreventNonManifoldTriangles()).toString());
CSG.setPreventNonManifoldTriangles(parseBoolean);
useAdvancedSTL.setSelected(parseBoolean);
showCSGProgress.setSelected(Boolean
Expand All @@ -1665,7 +1670,7 @@ public void onLogin(String arg0) {
new Thread(r).start();

CreatureLab3dController.getEngine().setControls(showRuler, idlespin, autohighlight);
WindowMenu.getItems().addAll(showRuler, idlespin, autohighlight, showCSGProgress,useAdvancedSTL);
WindowMenu.getItems().addAll(showRuler, idlespin, autohighlight, showCSGProgress, useAdvancedSTL);

new Thread() {
public void run() {
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/neuronrobotics/bowlerstudio/BowlerStudioMenuWorkspace.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ public static void loginEvent() {
ScriptingEngine.setPrintProgress(false);
com.neuronrobotics.sdk.common.Log.error("Pulling workspace " + o);
try {
if (!ScriptingEngine.isUrlAlreadyOpen(o))
ScriptingEngine.pull(o);
ScriptingEngine.pull(o);
} catch(WrongRepositoryStateException ex) {
// ignore, unsaved work
}catch (Exception e) {
Expand Down

0 comments on commit 3ba9847

Please sign in to comment.