Skip to content

Commit b3cffbe

Browse files
Gerhard GenuitGerhard Genuit
authored andcommitted
remove "von" from "AbscheiderEditor" and add some space to
"abscheiderTabelle" in Anh49Panel.
1 parent 250a755 commit b3cffbe

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

src/de/bielefeld/umweltamt/aui/module/common/editors/AbscheiderEditor.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ public class AbscheiderEditor extends AbstractBaseEditor{
9393
private JTextField typFeld;
9494
private JTextField herstellerFeld;
9595
private JFormattedTextField nrFeld;
96-
private JFormattedTextField vonFeld;
9796
private JFormattedTextField nenngroesseFeld;
9897
private JFormattedTextField vsf1Feld;
9998
private JFormattedTextField vsf2Feld;
@@ -164,9 +163,6 @@ protected JComponent buildContentArea() {
164163
builder.addLabel("Nr.:", cc.xy(1, 3));
165164
builder.add(getNrFeld(), cc.xy(3, 3));
166165

167-
builder.addLabel("Von:", cc.xy(5, 3, "right, center"));
168-
builder.add(getVonFeld(), cc.xy(7, 3));
169-
builder.addLabel("Lage:", cc.xy(1, 5));
170166
builder.add(getLageFeld(), cc.xyw(3, 5, 5));
171167
builder.addLabel("Hersteller:", cc.xy(1, 7));
172168
builder.add(getHerstellerFeld(), cc.xy(3, 7));
@@ -219,7 +215,6 @@ protected void fillForm() {
219215
getLageFeld().setText(details.getLage());
220216
getHerstellerFeld().setText(details.getHersteller());
221217
getNrFeld().setValue(details.getAbscheidernr());
222-
getVonFeld().setValue(details.getVon());
223218
getVsf1Feld().setValue(details.getVsf1());
224219
getVsf2Feld().setValue(details.getVsf2());
225220
getNenngroesseFeld().setValue(details.getNenngroesse());
@@ -269,10 +264,6 @@ protected boolean doSave() {
269264
Integer nr = ((IntegerField)nrFeld).getIntValue();
270265
details.setAbscheidernr(nr);
271266

272-
// Von:
273-
Integer von = ((IntegerField)vonFeld).getIntValue();
274-
details.setVon(von);
275-
276267
//Volumen vorgeschaltetet Schlammfang:
277268
Integer vsf1 = ((IntegerField)vsf1Feld).getIntValue();
278269
details.setVsf1(vsf1);
@@ -427,12 +418,6 @@ private JCheckBox getRueckhaltCheck() {
427418
}
428419
return rueckhaltCheck;
429420
}
430-
private JFormattedTextField getVonFeld() {
431-
if (vonFeld == null) {
432-
vonFeld = new IntegerField();
433-
}
434-
return vonFeld;
435-
}
436421
private JCheckBox getProbeCheck() {
437422
if (probeCheck == null) {
438423
probeCheck = new JCheckBox("Probenahmestelle/-möglichkeit");

src/de/bielefeld/umweltamt/aui/module/objektpanels/Anh49Panel.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public void mouseReleased(MouseEvent e) {
303303
"3dlu, " + //
304304
"pref, " + // Abscheiderdetails
305305
"5dlu, " + //
306-
"fill:50dlu, " + // Tabelle
306+
"fill:100dlu, " + // Tabelle
307307
"5dlu, " + //
308308
"pref"); // Buttons
309309

@@ -688,7 +688,8 @@ public Anh49Fachdaten getFachdaten() {
688688
return this.fachdaten;
689689
}
690690

691-
protected boolean doSavePanelData() {
691+
@Override
692+
protected boolean doSavePanelData() {
692693
boolean success;
693694

694695
this.fachdaten.setAnsprechpartnerIn((String) super

0 commit comments

Comments
 (0)