ZakenChannel/PI-12_Kuznetsov_D.V._Hard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-12_Kuznetsov_D.V. LabWork04 Hard #6

Closed
ZakenChannel wants to merge 3 commits from Lab_4 into Lab_3
pull from: Lab_4
merge into: ZakenChannel:Lab_3
Conversation 1 Commits 3 Files Changed 6 +6 -6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 95d9690ca5 - Show all commits

6
ProjectAirFighter/src/main/java/com/projectairfighter/FormWarPlaneCollection.java
View File

@ -232,7 +232,7 @@ public class FormWarPlaneCollection extends Application implements Initializable
}
@FXML
void ButtonCollectionAdd(ActionEvent event) {
void buttonCollectionAdd(ActionEvent event) {
if (textFieldCollectionName.getText().isEmpty() || (!radioButtonList.isSelected() && !radioButtonMassive.isSelected())) {
showError("Не все данные заполнены");
return;
@ -250,7 +250,7 @@ public class FormWarPlaneCollection extends Application implements Initializable
}
@FXML
void ButtonCollectionDel(ActionEvent event) {
void buttonCollectionDel(ActionEvent event) {
if (listViewCollection.getSelectionModel().getSelectedIndex() < 0 || listViewCollection.getSelectionModel().getSelectedItem() == null) {
showError("Коллекция не выбрана");
return;
@ -278,7 +278,7 @@ public class FormWarPlaneCollection extends Application implements Initializable
}
@FXML
void ButtonCreateCompany(ActionEvent event) {
void buttonCreateCompany(ActionEvent event) {
if (listViewCollection.getSelectionModel().getSelectedIndex() < 0 || listViewCollection.getSelectionModel().getSelectedItem() == null) {
showAlert("Коллекция не выбрана");
return;

6
ProjectAirFighter/src/main/resources/com/projectairfighter/FormWarPlaneCollection.fxml
View File

@ -24,9 +24,9 @@
</RadioButton>
<RadioButton fx:id="radioButtonList" layoutX="141.0" layoutY="77.0" mnemonicParsing="false"
text="Список" toggleGroup="$toggle"/>
<Button layoutX="6.0" layoutY="101.0" mnemonicParsing="false" onAction="#ButtonCollectionAdd"
<Button layoutX="6.0" layoutY="101.0" mnemonicParsing="false" onAction="#buttonCollectionAdd"
prefHeight="25.0" prefWidth="224.0" text="Добавить в коллекцию"/>
<Button layoutX="6.0" layoutY="299.0" mnemonicParsing="false" onAction="#ButtonCollectionDel"
<Button layoutX="6.0" layoutY="299.0" mnemonicParsing="false" onAction="#buttonCollectionDel"
prefHeight="25.0" prefWidth="224.0" text="Удалить коллекцию"/>
<ListView fx:id="listViewCollection" layoutX="6.0" layoutY="136.0" prefHeight="155.0"
prefWidth="224.0"/>
@ -39,7 +39,7 @@
<ComboBox fx:id="comboBox" layoutX="6.0" layoutY="15.0"
onAction="#comboBoxSelectorCompany" prefHeight="25.0" prefWidth="224.0"/>
<Button layoutX="6.0" layoutY="46.0" mnemonicParsing="false"
onAction="#ButtonCreateCompany" prefHeight="25.0" prefWidth="224.0"
onAction="#buttonCreateCompany" prefHeight="25.0" prefWidth="224.0"
text="Создать компанию"/>
</AnchorPane>
<AnchorPane disable="true" minHeight="0.0" minWidth="0.0" prefHeight="312.0"