[ui] Allow to setup the auxclasspath in the designer #1159
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /** | ||
| * BSD-style license; for more info see http://pmd.sourceforge.net/license.html | ||
| */ | ||
|
|
||
|
|
||
| package net.sourceforge.pmd.util.fxdesigner.util; | ||
|
There was a problem hiding this comment. I don't think this package is the right one for this... we don't have any controllers in it, and controllers are not utilities... I'd move this up to There was a problem hiding this comment. Oh yes good catch Yeah making a new package for popups and such is a good idea. |
||
|
|
||
| import java.io.File; | ||
| import java.net.URL; | ||
| import java.util.ResourceBundle; | ||
|
|
||
| import net.sourceforge.pmd.util.fxdesigner.DesignerRoot; | ||
| import net.sourceforge.pmd.util.fxdesigner.MainDesignerController; | ||
| import net.sourceforge.pmd.util.fxdesigner.util.beans.SettingsOwner; | ||
|
|
||
| import javafx.fxml.FXML; | ||
| import javafx.fxml.FXMLLoader; | ||
| import javafx.fxml.Initializable; | ||
| import javafx.scene.Parent; | ||
| import javafx.scene.Scene; | ||
| import javafx.scene.control.Button; | ||
| import javafx.scene.control.TableColumn; | ||
| import javafx.scene.control.TableView; | ||
| import javafx.stage.FileChooser; | ||
| import javafx.stage.Stage; | ||
|
|
||
| public class AuxClassPathController implements Initializable, SettingsOwner { | ||
|
|
||
| private final DesignerRoot designerRoot; | ||
|
|
||
| @FXML | ||
| private Button removeFiles; | ||
|
|
||
| @FXML | ||
| private TableView fileTable; | ||
|
|
||
| @FXML | ||
| private Button selectFile; | ||
|
|
||
| @FXML | ||
| private TableColumn fileList; | ||
|
|
||
| @FXML | ||
| private TableColumn fileAdd; | ||
|
|
||
| @FXML | ||
| private final MainDesignerController parent; | ||
|
|
||
|
|
||
| public AuxClassPathController(DesignerRoot designerRoot, MainDesignerController parent) { | ||
| this.designerRoot = designerRoot; | ||
| this.parent = parent; | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| public void initialize(URL location, ResourceBundle resources) { | ||
|
|
||
| selectFile.setOnAction(e -> fileSeleced()); | ||
|
|
||
| } | ||
|
|
||
|
|
||
| private void fileSeleced() { | ||
|
|
||
| FileChooser chooser = new FileChooser(); | ||
|
There was a problem hiding this comment. You should add an extension filter to only allow selecting jar files. There's an example here. |
||
| chooser.setTitle("Load source from file"); | ||
|
There was a problem hiding this comment. "Load source from file"? That's a copy-paste error |
||
| File file = chooser.showOpenDialog(designerRoot.getMainStage()); | ||
|
There was a problem hiding this comment. Also, you should use There was a problem hiding this comment. and don't forget to filter file types: chooser.getExtensionFilters().addAll(
new FileChooser.ExtensionFilter("Java JARs", "*.jar"),
new FileChooser.ExtensionFilter("Java WARs", "*.war"),
new FileChooser.ExtensionFilter("Java EARs", "*.ear"),
new FileChooser.ExtensionFilter("Java class files", "*.class"),
); |
||
|
|
||
| } | ||
|
|
||
|
|
||
| public void showAuxPathWizard() throws Exception { | ||
|
There was a problem hiding this comment. Encapsulating this logic here is actually a very nice idea. I'll refactor the other instances of this problem to follow that design principle |
||
|
|
||
| FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("fxml/aux-controller.fxml")); | ||
| Parent root1 = (Parent) fxmlLoader.load(); | ||
| Stage stage = new Stage(); | ||
|
There was a problem hiding this comment. And your stage should be modal |
||
| stage.setScene(new Scene(root1)); | ||
| stage.show(); | ||
|
|
||
| } | ||
|
|
||
|
|
||
| } | ||
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,57 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <?import javafx.scene.control.Button?> | ||
| <?import javafx.scene.control.Label?> | ||
| <?import javafx.scene.control.TableColumn?> | ||
| <?import javafx.scene.control.TableView?> | ||
| <?import javafx.scene.control.TitledPane?> | ||
| <?import javafx.scene.effect.Blend?> | ||
| <?import javafx.scene.layout.AnchorPane?> | ||
| <?import javafx.scene.layout.BorderPane?> | ||
| <?import javafx.scene.layout.Pane?> | ||
| <AnchorPane prefHeight="444.0" prefWidth="594.0" xmlns="http://javafx.com/javafx/9.0.1" | ||
| xmlns:fx="http://javafx.com/fxml/1" | ||
| fx:controller="net.sourceforge.pmd.util.fxdesigner.util.AuxClassPathController"> | ||
| <children> | ||
| <BorderPane layoutX="14.0" layoutY="14.0" prefHeight="374.0" prefWidth="571.0"> | ||
| <top> | ||
| <TitledPane animated="false" prefHeight="420.0" prefWidth="571.0" text="PMD Configure" | ||
| textAlignment="CENTER" BorderPane.alignment="CENTER"> | ||
| <content> | ||
| <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="542.0" prefWidth="569.0"> | ||
| <children> | ||
| <Pane layoutX="17.0" layoutY="95.0" prefHeight="260.0" prefWidth="536.0"> | ||
| <children> | ||
| <TableView id="fileSelected" layoutX="34.0" layoutY="30.0" prefHeight="200.0" | ||
| prefWidth="172.0"> | ||
| <columns> | ||
| <TableColumn fx:id="fileList" prefWidth="171.0" text="Files Selected"/> | ||
| </columns> | ||
|
There was a problem hiding this comment. The file name is wrong The controller is the Java object of type Consider naming it Also, no offence but the ui is substandard for now
|
||
| </TableView> | ||
| <TableView fx:id="fileTable" id="fileTable" layoutX="247.0" layoutY="30.0" | ||
| prefHeight="200.0" prefWidth="200.0"> | ||
| <columns> | ||
| <TableColumn fx:id="fileAdd" prefWidth="199.0" | ||
| text="Files to be Added"/> | ||
| </columns> | ||
| </TableView> | ||
| <Button fx:id="removeFiles" layoutX="463.0" layoutY="98.0" | ||
| mnemonicParsing="false" text="Remove"/> | ||
| </children> | ||
| </Pane> | ||
| <Label layoutX="47.0" layoutY="78.0" prefHeight="17.0" prefWidth="58.0" | ||
| text="Classpath"> | ||
| <effect> | ||
| <Blend/> | ||
| </effect> | ||
| </Label> | ||
| <Button fx:id="selectFile" layoutX="39.0" layoutY="32.0" mnemonicParsing="false" | ||
| text="Select Files"/> | ||
| </children> | ||
| </AnchorPane> | ||
| </content> | ||
| </TitledPane> | ||
| </top> | ||
| </BorderPane> | ||
| </children> | ||
| </AnchorPane> | ||
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should not be annotated
@FXML. The annotation is only for fields that should be injected by the FxmlLoader. The other controllers are injected because their FXML fragment is included indesigner.fxml. Here you must create a new controller yourself. I'll push to your branch to show you