forked from gluonhq/scenebuilder
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: xdg-open is now used to reveal a file Linux file system (gluonhq…
…#674) (gluonhq#711) Instead of Nautilus, xdg-utils xdg-open command is now used for opening directories in Linux. Also the related error dialogs have been reworked to have a unified look and feel and one can look into the details of the related command line call in case of error. Furthermore, the exit code if the command line call is evaluated. Added proper error dialog for CSS Panel Controller in case revealing a CSS fails.
- Loading branch information
1 parent
d426938
commit f0c5860
Showing
20 changed files
with
454 additions
and
99 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
kit/src/main/java/com/oracle/javafx/scenebuilder/kit/editor/Cmd.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Copyright (c) 2024, Gluon and/or its affiliates. | ||
| * All rights reserved. Use is subject to license terms. | ||
| * | ||
| * This file is available and licensed under the following license: | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * | ||
| * - Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * - Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in | ||
| * the documentation and/or other materials provided with the distribution. | ||
| * - Neither the name of Oracle Corporation and Gluon nor the names of its | ||
| * contributors may be used to endorse or promote products derived | ||
| * from this software without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
| package com.oracle.javafx.scenebuilder.kit.editor; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.util.List; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| /** | ||
| * Cmd allows the execution of a given command line in a defined working directory. The execution is | ||
| * aborted after the timeout. | ||
| */ | ||
| final class Cmd { | ||
|
|
||
| /** | ||
| * Executes a given command line using the working directory and timeout. | ||
| * | ||
| * @param cmd The command line to be executed defined as a {@link List} of {@link String} | ||
| * @param wDir The working directory, where the process shall be executed within. | ||
| * @param timeoutSec Duration in in seconds after which the execution should be stopped. | ||
| * @return exit code of the command line as an Integer | ||
| * | ||
| * @throws IOException - if the command was not found or the program execution exceeds the given timeout duration. | ||
| * @throws InterruptedException - if the current thread is interrupted while waiting | ||
| */ | ||
| public final Integer exec(List<String> cmd, File wDir, long timeoutSec) throws IOException, | ||
| InterruptedException { | ||
| ProcessBuilder builder = new ProcessBuilder(cmd); | ||
| builder = builder.directory(wDir); | ||
| Process proc = builder.start(); | ||
| boolean completed = proc.waitFor(timeoutSec, TimeUnit.SECONDS); | ||
| if (completed) { | ||
| return proc.exitValue(); | ||
| } | ||
| throw new IOException("Process timed out after %s seconds!".formatted(timeoutSec)); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.