#165 bugfixes

cismet · Feb 24, 2022 · fd9fc95 · fd9fc95
1 parent 846c8c8
commit fd9fc95
Show file tree

Hide file tree

Showing 19 changed files with 2,419 additions and 1,527 deletions.
diff --git a/src/main/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/BioMstStammdatenEditor.form b/src/main/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/BioMstStammdatenEditor.form
@@ -308,7 +308,7 @@
                     </Property>
                   </Properties>
                   <BindingProperties>
-                    <BindingProperty name="text" source="Form" sourcePath="${cidsBean.lawa_typ.code}-${cidsBean.lawa_typ.description}" target="lblLawaVal" targetPath="text" updateStrategy="0" immediately="false">
+                    <BindingProperty name="text" source="Form" sourcePath="${cidsBean.lawa_typ.value}-${cidsBean.lawa_typ.name}" target="lblLawaVal" targetPath="text" updateStrategy="0" immediately="false">
                       <Property name="nullValue" type="java.lang.String" value="&lt;nicht gesetzt&gt;"/>
                       <Property name="incompletePathValue" type="java.lang.String" value="&lt;nicht gesetzt&gt;"/>
                     </BindingProperty>

diff --git a/src/main/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/BioMstStammdatenEditor.java b/src/main/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/BioMstStammdatenEditor.java
@@ -196,7 +196,7 @@ private void initComponents() {
         panFooter.setOpaque(false);
         panFooter.setLayout(new java.awt.GridBagLayout());
 
-        lblFoot.setFont(new java.awt.Font("Tahoma", 1, 12));
+        lblFoot.setFont(new java.awt.Font("Tahoma", 1, 12)); // NOI18N
         lblFoot.setForeground(new java.awt.Color(255, 255, 255));
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
@@ -403,8 +403,7 @@ private void initComponents() {
         binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(
                 org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE,
                 this,
-                org.jdesktop.beansbinding.ELProperty.create(
-                    "${cidsBean.lawa_typ.code}-${cidsBean.lawa_typ.description}"),
+                org.jdesktop.beansbinding.ELProperty.create("${cidsBean.lawa_typ.value}-${cidsBean.lawa_typ.name}"),
                 lblLawaVal,
                 org.jdesktop.beansbinding.BeanProperty.create("text"));
         binding.setSourceNullValue("<nicht gesetzt>");

diff --git a/src/main/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/ChemieMstStammdatenEditor.form b/src/main/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/ChemieMstStammdatenEditor.form
@@ -308,7 +308,7 @@
                     </Property>
                   </Properties>
                   <BindingProperties>
-                    <BindingProperty name="text" source="Form" sourcePath="${cidsBean.lawa_typ.code}-${cidsBean.lawa_typ.description}" target="lblLawaVal" targetPath="text" updateStrategy="0" immediately="false">
+                    <BindingProperty name="text" source="Form" sourcePath="${cidsBean.lawa_typ.value}-${cidsBean.lawa_typ.name}" target="lblLawaVal" targetPath="text" updateStrategy="0" immediately="false">
                       <Property name="nullValue" type="java.lang.String" value="&lt;nicht gesetzt&gt;"/>
                       <Property name="incompletePathValue" type="java.lang.String" value="&lt;nicht gesetzt&gt;"/>
                     </BindingProperty>

diff --git a/src/main/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/ChemieMstStammdatenEditor.java b/src/main/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/ChemieMstStammdatenEditor.java
@@ -391,8 +391,7 @@ private void initComponents() {
         binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(
                 org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE,
                 this,
-                org.jdesktop.beansbinding.ELProperty.create(
-                    "${cidsBean.lawa_typ.code}-${cidsBean.lawa_typ.description}"),
+                org.jdesktop.beansbinding.ELProperty.create("${cidsBean.lawa_typ.value}-${cidsBean.lawa_typ.name}"),
                 lblLawaVal,
                 org.jdesktop.beansbinding.BeanProperty.create("text"));
         binding.setSourceNullValue("<nicht gesetzt>");

diff --git a/...main/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/EntwicklungszielRouteEditor.form b/...main/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/EntwicklungszielRouteEditor.form
@@ -132,10 +132,10 @@
     <Container class="de.cismet.tools.gui.RoundedPanel" name="panInfo">
       <Properties>
         <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[640, 310]"/>
+          <Dimension value="[640, 500]"/>
         </Property>
         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[640, 310]"/>
+          <Dimension value="[640, 500]"/>
         </Property>
       </Properties>
       <Constraints>

diff --git a/...main/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/EntwicklungszielRouteEditor.java b/...main/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/EntwicklungszielRouteEditor.java
@@ -359,8 +359,8 @@ public void actionPerformed(final java.awt.event.ActionEvent evt) {
         setPreferredSize(new java.awt.Dimension(1050, 700));
         setLayout(new java.awt.GridBagLayout());
 
-        panInfo.setMinimumSize(new java.awt.Dimension(640, 310));
-        panInfo.setPreferredSize(new java.awt.Dimension(640, 310));
+        panInfo.setMinimumSize(new java.awt.Dimension(640, 500));
+        panInfo.setPreferredSize(new java.awt.Dimension(640, 500));
 
         panHeadInfo.setBackground(new java.awt.Color(51, 51, 51));
         panHeadInfo.setMinimumSize(new java.awt.Dimension(109, 24));

diff --git a/...n/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/FgskKartierabschnittErgebnisse.form b/...n/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/FgskKartierabschnittErgebnisse.form
@@ -708,7 +708,7 @@
                     <Component class="javax.swing.JLabel" name="lblSpacing3">
                       <Constraints>
                         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                          <GridBagConstraints gridX="0" gridY="7" gridWidth="7" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="1.0"/>
+                          <GridBagConstraints gridX="0" gridY="8" gridWidth="7" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="1.0"/>
                         </Constraint>
                       </Constraints>
                     </Component>
@@ -935,7 +935,7 @@
                       </Properties>
                       <Constraints>
                         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                          <GridBagConstraints gridX="0" gridY="7" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="10" insetsBottom="5" insetsRight="5" anchor="18" weightX="0.0" weightY="1.0"/>
+                          <GridBagConstraints gridX="0" gridY="7" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="10" insetsBottom="5" insetsRight="5" anchor="18" weightX="0.0" weightY="0.0"/>
                         </Constraint>
                       </Constraints>
                     </Component>
@@ -994,6 +994,52 @@
                         </Constraint>
                       </Constraints>
                     </Component>
+                    <Component class="javax.swing.JLabel" name="lblBedSubDiv">
+                      <Properties>
+                        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                          <ResourceString bundle="de/cismet/cids/custom/objecteditors/wrrl_db_mv/Bundle.properties" key="FgskKartierabschnittErgebnisse.lblBedSubDiv.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                        </Property>
+                        <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                          <Dimension value="[230, 17]"/>
+                        </Property>
+                        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                          <Dimension value="[230, 17]"/>
+                        </Property>
+                        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                          <Dimension value="[230, 17]"/>
+                        </Property>
+                      </Properties>
+                      <Constraints>
+                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+                          <GridBagConstraints gridX="0" gridY="8" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="10" insetsBottom="5" insetsRight="5" anchor="18" weightX="0.0" weightY="1.0"/>
+                        </Constraint>
+                      </Constraints>
+                    </Component>
+                    <Component class="javax.swing.JTextField" name="txtBedSubDiv">
+                      <Properties>
+                        <Property name="editable" type="boolean" value="false"/>
+                        <Property name="horizontalAlignment" type="int" value="11"/>
+                        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+                          <Border info="null"/>
+                        </Property>
+                        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                          <Dimension value="[170, 20]"/>
+                        </Property>
+                        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                          <Dimension value="[170, 20]"/>
+                        </Property>
+                      </Properties>
+                      <BindingProperties>
+                        <BindingProperty name="text" source="Form" sourcePath="${cidsBean.bewertung_substratdiversitaet}" target="txtBedSubDiv" targetPath="text" updateStrategy="0" immediately="false">
+                          <BindingParameter name="javax.swing.binding.ParameterKeys.TEXT_CHANGE_STRATEGY" value="javax.swing.binding.TextChangeStrategy.ON_TYPE"/>
+                        </BindingProperty>
+                      </BindingProperties>
+                      <Constraints>
+                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+                          <GridBagConstraints gridX="1" gridY="8" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="5" insetsBottom="5" insetsRight="10" anchor="18" weightX="1.0" weightY="0.0"/>
+                        </Constraint>
+                      </Constraints>
+                    </Component>
                   </SubComponents>
                 </Container>
               </SubComponents>

diff --git a/...n/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/FgskKartierabschnittErgebnisse.java b/...n/java/de/cismet/cids/custom/objecteditors/wrrl_db_mv/FgskKartierabschnittErgebnisse.java
@@ -63,6 +63,7 @@ public class FgskKartierabschnittErgebnisse extends javax.swing.JPanel implement
     private javax.swing.JLabel lblBedRating;
     private javax.swing.JLabel lblBedStructureCritCount;
     private javax.swing.JLabel lblBedStructureRating;
+    private javax.swing.JLabel lblBedSubDiv;
     private javax.swing.JLabel lblCourseEvoCritCount;
     private javax.swing.JLabel lblCourseEvoRating;
     private javax.swing.JLabel lblCrossProfileCritCount;
@@ -118,6 +119,7 @@ public class FgskKartierabschnittErgebnisse extends javax.swing.JPanel implement
     private javax.swing.JTextField txtBedRating;
     private javax.swing.JTextField txtBedStructureCritCount;
     private javax.swing.JTextField txtBedStructureRating;
+    private javax.swing.JTextField txtBedSubDiv;
     private javax.swing.JTextField txtCourseEvoCritCount;
     private javax.swing.JTextField txtCourseEvoRating;
     private javax.swing.JTextField txtCrossProfileCritCount;
@@ -212,6 +214,8 @@ private void initComponents() {
         lblBedStructureCritCount = new javax.swing.JLabel();
         txtBedStructureRating = new javax.swing.JTextField();
         txtBedStructureCritCount = new javax.swing.JTextField();
+        lblBedSubDiv = new javax.swing.JLabel();
+        txtBedSubDiv = new javax.swing.JTextField();
         jpTeilbewertungUfer = new javax.swing.JPanel();
         panInfo5 = new de.cismet.tools.gui.RoundedPanel();
         panHeadInfo4 = new de.cismet.tools.gui.SemiRoundedPanel();
@@ -670,7 +674,7 @@ private void initComponents() {
         panInfoContent3.setLayout(new java.awt.GridBagLayout());
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
-        gridBagConstraints.gridy = 7;
+        gridBagConstraints.gridy = 8;
         gridBagConstraints.gridwidth = 7;
         gridBagConstraints.weighty = 1.0;
         panInfoContent3.add(lblSpacing3, gridBagConstraints);
@@ -839,7 +843,6 @@ private void initComponents() {
         gridBagConstraints.gridx = 0;
         gridBagConstraints.gridy = 7;
         gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
-        gridBagConstraints.weighty = 1.0;
         gridBagConstraints.insets = new java.awt.Insets(5, 10, 5, 5);
         panInfoContent3.add(lblBedStructureCritCount, gridBagConstraints);
 
@@ -890,6 +893,42 @@ private void initComponents() {
         gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 10);
         panInfoContent3.add(txtBedStructureCritCount, gridBagConstraints);
 
+        lblBedSubDiv.setText(org.openide.util.NbBundle.getMessage(
+                FgskKartierabschnittErgebnisse.class,
+                "FgskKartierabschnittErgebnisse.lblBedSubDiv.text")); // NOI18N
+        lblBedSubDiv.setMaximumSize(new java.awt.Dimension(230, 17));
+        lblBedSubDiv.setMinimumSize(new java.awt.Dimension(230, 17));
+        lblBedSubDiv.setPreferredSize(new java.awt.Dimension(230, 17));
+        gridBagConstraints = new java.awt.GridBagConstraints();
+        gridBagConstraints.gridx = 0;
+        gridBagConstraints.gridy = 8;
+        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
+        gridBagConstraints.weighty = 1.0;
+        gridBagConstraints.insets = new java.awt.Insets(5, 10, 5, 5);
+        panInfoContent3.add(lblBedSubDiv, gridBagConstraints);
+
+        txtBedSubDiv.setEditable(false);
+        txtBedSubDiv.setHorizontalAlignment(javax.swing.JTextField.TRAILING);
+        txtBedSubDiv.setBorder(null);
+        txtBedSubDiv.setMinimumSize(new java.awt.Dimension(170, 20));
+        txtBedSubDiv.setPreferredSize(new java.awt.Dimension(170, 20));
+
+        binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(
+                org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE,
+                this,
+                org.jdesktop.beansbinding.ELProperty.create("${cidsBean.bewertung_substratdiversitaet}"),
+                txtBedSubDiv,
+                org.jdesktop.beansbinding.BeanProperty.create("text"));
+        bindingGroup.addBinding(binding);
+
+        gridBagConstraints = new java.awt.GridBagConstraints();
+        gridBagConstraints.gridx = 1;
+        gridBagConstraints.gridy = 8;
+        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
+        gridBagConstraints.weightx = 1.0;
+        gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 10);
+        panInfoContent3.add(txtBedSubDiv, gridBagConstraints);
+
         panInfo4.add(panInfoContent3, java.awt.BorderLayout.CENTER);
 
         jpTeilbewertungSohle.add(panInfo4, java.awt.BorderLayout.CENTER);