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

merging from lab_4 to lab_5

Browse Source
This commit is contained in:
ZakenChannel 2024-04-20 01:50:24 +04:00
commit 038c844c37
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -20,8 +20,8 @@
</toggleGroup> </toggleGroup>
</RadioButton> </RadioButton>
<RadioButton fx:id="radioButtonList" layoutX="141.0" layoutY="77.0" mnemonicParsing="false" text="Список" toggleGroup="$toggle" /> <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" prefHeight="25.0" prefWidth="224.0" text="Добавить в коллекцию" /> <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" prefHeight="25.0" prefWidth="224.0" text="Удалить коллекцию" /> <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" /> <ListView fx:id="listViewCollection" layoutX="6.0" layoutY="136.0" prefHeight="155.0" prefWidth="224.0" />
<Label layoutX="56.0" layoutY="26.0" text="Название коллекции" /> <Label layoutX="56.0" layoutY="26.0" text="Название коллекции" />
</AnchorPane> </AnchorPane>
@ -29,7 +29,7 @@
<SplitPane fx:id="splitPane" dividerPositions="0.18691588785046728" layoutY="-8.0" orientation="VERTICAL" prefHeight="430.0" prefWidth="237.0"> <SplitPane fx:id="splitPane" dividerPositions="0.18691588785046728" layoutY="-8.0" orientation="VERTICAL" prefHeight="430.0" prefWidth="237.0">
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="116.0" prefWidth="235.0"> <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="116.0" prefWidth="235.0">
<ComboBox fx:id="comboBox" layoutX="6.0" layoutY="15.0" onAction="#comboBoxSelectorCompany" prefHeight="25.0" prefWidth="224.0" /> <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" text="Создать компанию" /> <Button layoutX="6.0" layoutY="46.0" mnemonicParsing="false" onAction="#buttonCreateCompany" prefHeight="25.0" prefWidth="224.0" text="Создать компанию" />
</AnchorPane> </AnchorPane>
<AnchorPane disable="true" minHeight="0.0" minWidth="0.0" prefHeight="312.0" prefWidth="235.0"> <AnchorPane disable="true" minHeight="0.0" minWidth="0.0" prefHeight="312.0" prefWidth="235.0">
<Button alignment="CENTER" contentDisplay="CENTER" layoutX="5.0" layoutY="12.0" mnemonicParsing="false" onAction="#buttonGoToFormCreate" prefHeight="35.0" prefWidth="224.0" text="Добавление самолета" /> <Button alignment="CENTER" contentDisplay="CENTER" layoutX="5.0" layoutY="12.0" mnemonicParsing="false" onAction="#buttonGoToFormCreate" prefHeight="35.0" prefWidth="224.0" text="Добавление самолета" />