Skip to content

Commit f2f0f8a

Browse files
vollbrecht-workvollbrecht-work
committed
JPRO-183 fix window resize issues around all propertie description controller
This contains only the hotfix part of ikmdev#688.
1 parent 0537e75 commit f2f0f8a

File tree

8 files changed

+438
-352
lines changed

8 files changed

+438
-352
lines changed

‎kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddFullyQualifiedNameController.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,19 @@ public class AddFullyQualifiedNameController extends AbstractBasicController {
5555
private Label addFqnTitleLabel;
5656

5757
@FXML
58-
private ComboBox<EntityFacade> moduleComboBox;
58+
private TextField fullyQualifiedNameTextField;
5959

6060
@FXML
61-
private TextField fullyQualifiedNameTextField;
61+
private ComboBox<ConceptEntity> typeDisplayComboBox;
62+
63+
@FXML
64+
private ComboBox<EntityFacade> caseSignificanceComboBox;
6265

6366
@FXML
6467
private ComboBox<EntityFacade> statusComboBox;
6568

6669
@FXML
67-
private ComboBox<EntityFacade> caseSignificanceComboBox;
70+
private ComboBox<EntityFacade> moduleComboBox;
6871

6972
@FXML
7073
private ComboBox<EntityFacade> languageComboBox;
@@ -253,7 +256,7 @@ private void saveFullQualifiedName(ActionEvent actionEvent) {
253256
}
254257

255258
@FXML
256-
public void cancel() {
259+
public void handleCancelButtonEvent() {
257260
close();
258261
}
259262

‎kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddOtherNameController.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,19 @@ public class AddOtherNameController extends AbstractBasicController {
5656
private Label addOtherNameTitleLabel;
5757

5858
@FXML
59-
private ComboBox<EntityFacade> moduleComboBox;
59+
private TextField otherNameTextField;
6060

6161
@FXML
62-
private TextField otherNameTextField;
62+
private ComboBox<EntityFacade> typeDisplayComboBox;
63+
64+
@FXML
65+
private ComboBox<EntityFacade> caseSignificanceComboBox;
6366

6467
@FXML
6568
private ComboBox<EntityFacade> statusComboBox;
6669

6770
@FXML
68-
private ComboBox<EntityFacade> caseSignificanceComboBox;
71+
private ComboBox<EntityFacade> moduleComboBox;
6972

7073
@FXML
7174
private ComboBox<EntityFacade> languageComboBox;
@@ -263,7 +266,7 @@ public void clearView() {
263266
}
264267

265268
@FXML
266-
public void cancel() {
269+
public void handleCancelButtonEvent() {
267270
close();
268271
}
269272

‎kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditDescriptionFormController.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@ public class EditDescriptionFormController implements BasicController {
8888
private TextField otherNameTextField;
8989

9090
@FXML
91-
private ComboBox<ConceptEntity> comboBox;
91+
private ComboBox<ConceptEntity> typeDisplayComboBox;
9292

9393
@FXML
94-
private ComboBox<ConceptEntity> moduleComboBox;
94+
private ComboBox<ConceptEntity> caseSignificanceComboBox;
9595

9696
@FXML
9797
private ComboBox<ConceptEntity> statusComboBox;
9898

9999
@FXML
100-
private ComboBox<ConceptEntity> caseSignificanceComboBox;
100+
private ComboBox<ConceptEntity> moduleComboBox;
101101

102102
@FXML
103103
private ComboBox<ConceptEntity> languageComboBox;
@@ -106,13 +106,13 @@ public class EditDescriptionFormController implements BasicController {
106106
private Label editDescriptionTitleLabel;
107107

108108
@FXML
109-
private Label dialect1;
109+
private Label dialect1Label;
110110

111111
@FXML
112-
private Label dialect2;
112+
private Label dialect2Label;
113113

114114
@FXML
115-
private Label dialect3;
115+
private Label dialect3Label;
116116

117117
@FXML
118118
private ComboBox dialectComboBox1;

‎kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditFullyQualifiedNameController.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ public class EditFullyQualifiedNameController implements BasicController {
6868
@FXML
6969
private TextField fqnText;
7070

71+
@FXML
72+
private ComboBox<ConceptEntity> typeDisplayComboBox;
73+
7174
@FXML
7275
private ComboBox<ConceptEntity> moduleComboBox;
7376

@@ -81,13 +84,13 @@ public class EditFullyQualifiedNameController implements BasicController {
8184
private ComboBox<ConceptEntity> languageComboBox;
8285

8386
@FXML
84-
private Label dialect1;
87+
private Label dialect1Label;
8588

8689
@FXML
87-
private Label dialect2;
90+
private Label dialect2Label;
8891

8992
@FXML
90-
private Label dialect3;
93+
private Label dialect3Label;
9194

9295
@FXML
9396
private ComboBox dialectComboBox1;

‎kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/add-fully-qualified-name.fxml‎

Lines changed: 114 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -14,102 +14,117 @@
1414
<?import javafx.scene.layout.VBox?>
1515
<?import dev.ikm.komet.kview.controls.SortedComboBox?>
1616

17-
<BorderPane minHeight="100.0" minWidth="100.0" prefWidth="487.0" stylesheets="@../kview.css" xmlns="http://javafx.com/javafx/23" xmlns:fx="http://javafx.com/fxml/1">
18-
<top>
19-
<HBox alignment="TOP_CENTER" prefHeight="0.0" prefWidth="0.0" styleClass="edit-concept-label-container" BorderPane.alignment="TOP_CENTER">
20-
<children>
21-
<Label fx:id="addFqnTitleLabel" alignment="TOP_CENTER" styleClass="edit-concept-title" text="Add Description: Fully Qualified Name" textAlignment="CENTER" />
22-
</children>
23-
</HBox>
24-
</top>
25-
<bottom>
26-
<VBox alignment="TOP_CENTER" BorderPane.alignment="CENTER">
27-
<children>
28-
<HBox alignment="BOTTOM_RIGHT" styleClass="add-description-bottom-label">
29-
<children>
30-
<Label text="Purpose of this semantic is to help define this concept." />
31-
</children>
32-
</HBox>
33-
<HBox alignment="BOTTOM_RIGHT" layoutX="10.0" layoutY="110.0" prefHeight="50.0" prefWidth="200.0">
34-
<children>
35-
<ButtonBar prefHeight="75.0" prefWidth="200.0">
36-
<buttons>
37-
<Button mnemonicParsing="false" onAction="#cancel" styleClass="edit-concept-cancel-button" text="CANCEL" />
38-
<Button fx:id="submitButton" layoutX="135.0" layoutY="47.0" minWidth="63.0" mnemonicParsing="false" onAction="#saveFullQualifiedName" styleClass="edit-concept-submit-button" text="SUBMIT" />
39-
</buttons>
40-
</ButtonBar>
41-
</children>
42-
<opaqueInsets>
43-
<Insets />
44-
</opaqueInsets>
45-
<VBox.margin>
46-
<Insets right="20.0" />
47-
</VBox.margin>
48-
</HBox>
49-
</children>
50-
</VBox>
51-
</bottom>
52-
<center>
53-
<GridPane prefWidth="487.0" BorderPane.alignment="CENTER">
54-
<columnConstraints>
55-
<ColumnConstraints hgrow="SOMETIMES" maxWidth="100.0" minWidth="100.0" prefWidth="100.0" />
56-
<ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" prefWidth="400.0" />
57-
</columnConstraints>
58-
<rowConstraints>
59-
<RowConstraints maxHeight="40.0" minHeight="10.0" prefHeight="40.0" vgrow="SOMETIMES" />
60-
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
61-
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
62-
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
63-
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
64-
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
65-
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
66-
<RowConstraints maxHeight="1.7976931348623157E308" vgrow="NEVER" />
67-
<RowConstraints vgrow="SOMETIMES" />
68-
</rowConstraints>
69-
<children>
70-
<Label styleClass="add-description-label" text="Name" />
71-
<Label styleClass="add-description-label" text="Type" GridPane.rowIndex="1" />
72-
<Label prefWidth="100.0" styleClass="add-description-label" text="Case Significance" wrapText="true" GridPane.rowIndex="2" />
73-
<Label styleClass="add-description-label" text="Language" GridPane.rowIndex="5" />
74-
<Label styleClass="add-description-label" text="Status" GridPane.rowIndex="3" />
75-
<Label styleClass="add-description-label" text="Module" GridPane.rowIndex="4" />
76-
<TextField styleClass="komet-text-field" fx:id="fullyQualifiedNameTextField" prefHeight="25.0" promptText="Enter Name" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS">
77-
<GridPane.margin>
78-
<Insets right="15.0" />
79-
</GridPane.margin>
80-
</TextField>
81-
<SortedComboBox styleClass="blue-arrow-combo-box" disable="true" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Fully Qualified Name" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1">
82-
<GridPane.margin>
83-
<Insets right="15.0" />
84-
</GridPane.margin>
85-
</SortedComboBox>
86-
<SortedComboBox fx:id="caseSignificanceComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select case sensitivity" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2">
87-
<GridPane.margin>
88-
<Insets right="15.0" />
89-
</GridPane.margin>
90-
</SortedComboBox>
91-
<SortedComboBox fx:id="languageComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Language" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5">
92-
<GridPane.margin>
93-
<Insets right="15.0" />
94-
</GridPane.margin>
95-
</SortedComboBox>
96-
<SortedComboBox fx:id="statusComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Status" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3">
97-
<GridPane.margin>
98-
<Insets right="15.0" />
99-
</GridPane.margin>
100-
</SortedComboBox>
101-
<SortedComboBox fx:id="moduleComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Module" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="4">
102-
<GridPane.margin>
103-
<Insets right="15.0" />
104-
</GridPane.margin>
105-
</SortedComboBox>
106-
<TextArea styleClass="komet-text-area" maxHeight="80.0" maxWidth="1.7976931348623157E308" text="Add comment here..." GridPane.columnSpan="2" GridPane.rowIndex="7">
107-
<GridPane.margin>
108-
<Insets left="15.0" right="15.0" />
109-
</GridPane.margin>
110-
</TextArea>
111-
<Label styleClass="add-description-label" text="Comments" GridPane.rowIndex="6" />
112-
</children>
113-
</GridPane>
114-
</center>
115-
</BorderPane>
17+
<BorderPane minWidth="100.0" prefWidth="487.0" stylesheets="@../kview.css" xmlns="http://javafx.com/javafx/23" xmlns:fx="http://javafx.com/fxml/1">
18+
<top>
19+
<HBox alignment="TOP_CENTER" minHeight="40.0" prefHeight="40.0" prefWidth="0.0" styleClass="edit-concept-label-container" BorderPane.alignment="TOP_CENTER">
20+
<children>
21+
<Label fx:id="addFqnTitleLabel" alignment="TOP_CENTER" styleClass="edit-concept-title" text="Add Description: Fully Qualified Name" textAlignment="CENTER" />
22+
</children>
23+
</HBox>
24+
</top>
25+
<bottom>
26+
<VBox alignment="TOP_CENTER" BorderPane.alignment="CENTER" minHeight="80.0" prefHeight="80.0">
27+
<children>
28+
<HBox alignment="BOTTOM_RIGHT" styleClass="add-description-bottom-label">
29+
<children>
30+
<Label text="Purpose of this semantic is to help define this concept." />
31+
</children>
32+
</HBox>
33+
<HBox alignment="BOTTOM_RIGHT" layoutX="10.0" layoutY="110.0" prefHeight="50.0" prefWidth="200.0">
34+
<children>
35+
<ButtonBar prefHeight="75.0" prefWidth="200.0">
36+
<buttons>
37+
<Button fx:id="cancelButton" mnemonicParsing="false" onAction="#handleCancelButtonEvent" styleClass="edit-concept-cancel-button" text="CANCEL" />
38+
<Button fx:id="submitButton" layoutX="135.0" layoutY="47.0" minWidth="63.0" mnemonicParsing="false" onAction="#saveFullQualifiedName" styleClass="edit-concept-submit-button" text="SUBMIT" />
39+
</buttons>
40+
</ButtonBar>
41+
</children>
42+
<opaqueInsets>
43+
<Insets />
44+
</opaqueInsets>
45+
<VBox.margin>
46+
<Insets right="20.0" />
47+
</VBox.margin>
48+
</HBox>
49+
</children>
50+
</VBox>
51+
</bottom>
52+
<center>
53+
<GridPane prefWidth="487.0" BorderPane.alignment="CENTER">
54+
<columnConstraints>
55+
<ColumnConstraints hgrow="SOMETIMES" maxWidth="100.0" minWidth="100.0" prefWidth="100.0" />
56+
<ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" prefWidth="400.0" />
57+
</columnConstraints>
58+
<rowConstraints>
59+
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
60+
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
61+
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
62+
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
63+
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
64+
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
65+
<!-- Comments label -->
66+
<RowConstraints fx:id="dialectCommentsRowConstraints" minHeight="40.0" prefHeight="40.0" maxHeight="40.0" vgrow="SOMETIMES" />
67+
<!-- Comments section -->
68+
<RowConstraints vgrow="SOMETIMES" minHeight="80.0"/>
69+
</rowConstraints>
70+
<children>
71+
<Label styleClass="add-description-label" text="Name" GridPane.rowIndex="0" />
72+
<Label styleClass="add-description-label" text="Type" GridPane.rowIndex="1" />
73+
<Label prefWidth="100.0" styleClass="add-description-label" text="Case Significance" wrapText="true" GridPane.rowIndex="2" />
74+
<Label styleClass="add-description-label" text="Status" GridPane.rowIndex="3" />
75+
<Label styleClass="add-description-label" text="Module" GridPane.rowIndex="4" />
76+
<Label styleClass="add-description-label" text="Language" GridPane.rowIndex="5" />
77+
<Label fx:id="commentsLabel" styleClass="add-description-label" text="Comments" GridPane.rowIndex="6" />
78+
79+
<!-- Name field -->
80+
<TextField fx:id="fullyQualifiedNameTextField" styleClass="komet-text-field" prefHeight="25.0" promptText="Enter Name" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.hgrow="ALWAYS">
81+
<GridPane.margin>
82+
<Insets right="15.0" />
83+
</GridPane.margin>
84+
</TextField>
85+
86+
<!-- Type display (disabled combo box used as label) -->
87+
<SortedComboBox fx:id="typeDisplayComboBox" styleClass="blue-arrow-combo-box" disable="true" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Type" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1">
88+
<GridPane.margin>
89+
<Insets right="15.0" />
90+
</GridPane.margin>
91+
</SortedComboBox>
92+
93+
<!-- Case Significance -->
94+
<SortedComboBox fx:id="caseSignificanceComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select case sensitivity" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2">
95+
<GridPane.margin>
96+
<Insets right="15.0" />
97+
</GridPane.margin>
98+
</SortedComboBox>
99+
100+
<!-- Status -->
101+
<SortedComboBox fx:id="statusComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Status" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3">
102+
<GridPane.margin>
103+
<Insets right="15.0" />
104+
</GridPane.margin>
105+
</SortedComboBox>
106+
107+
<!-- Module -->
108+
<SortedComboBox fx:id="moduleComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Module" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="4">
109+
<GridPane.margin>
110+
<Insets right="15.0" />
111+
</GridPane.margin>
112+
</SortedComboBox>
113+
114+
<!-- Language -->
115+
<SortedComboBox fx:id="languageComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Language" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5">
116+
<GridPane.margin>
117+
<Insets right="15.0" />
118+
</GridPane.margin>
119+
</SortedComboBox>
120+
121+
<!-- Comments -->
122+
<TextArea fx:id="commentsTextArea" styleClass="komet-text-area" maxHeight="80.0" maxWidth="1.7976931348623157E308" text="Add comment here..." GridPane.columnSpan="2" GridPane.rowIndex="7" GridPane.valignment="TOP">
123+
<GridPane.margin>
124+
<Insets left="15.0" right="15.0" />
125+
</GridPane.margin>
126+
</TextArea>
127+
</children>
128+
</GridPane>
129+
</center>
130+
</BorderPane>

0 commit comments

Comments
 (0)