Mercurial > lada > lada-server
comparison src/main/java/de/intevation/lada/importer/laf/LafObjectListener.java @ 1256:1d9552e05b76
Initialize map for ort attributes once and reset attribute indicator for entnahmeOrt.
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Tue, 17 Jan 2017 17:28:21 +0100 |
| parents | 315df94c679b |
| children | b9eb9229df21 |
comparison
equal
deleted
inserted
replaced
| 1254:23b75545dbf0 | 1256:1d9552e05b76 |
|---|---|
| 37 public LafObjectListener() { | 37 public LafObjectListener() { |
| 38 data = new LafRawData(); | 38 data = new LafRawData(); |
| 39 errors = new HashMap<String, List<ReportItem>>(); | 39 errors = new HashMap<String, List<ReportItem>>(); |
| 40 currentErrors = new ArrayList<ReportItem>(); | 40 currentErrors = new ArrayList<ReportItem>(); |
| 41 currentUOrt = new HashMap<String, String>(); | 41 currentUOrt = new HashMap<String, String>(); |
| 42 currentEOrt = new HashMap<String, String>(); | |
| 42 } | 43 } |
| 43 | 44 |
| 44 public LafRawData getData() { | 45 public LafRawData getData() { |
| 45 return data; | 46 return data; |
| 46 } | 47 } |
| 120 } | 121 } |
| 121 if (currentEOrt != null && !currentEOrt.isEmpty()) { | 122 if (currentEOrt != null && !currentEOrt.isEmpty()) { |
| 122 currentProbe.addEntnahmeOrt(currentEOrt); | 123 currentProbe.addEntnahmeOrt(currentEOrt); |
| 123 currentEOrt.clear(); | 124 currentEOrt.clear(); |
| 124 } | 125 } |
| 125 currentEOrt = new HashMap<String, String>(); | |
| 126 currentProbe = data.new Probe(); | 126 currentProbe = data.new Probe(); |
| 127 hasEKoordinaten = false; | |
| 128 hasEGemeinde = false; | |
| 129 hasEHerkunfstland = false; | |
| 127 } | 130 } |
| 128 | 131 |
| 129 /** | 132 /** |
| 130 * {@inheritDoc} | 133 * {@inheritDoc} |
| 131 * | 134 * |
| 143 } | 146 } |
| 144 if (currentEOrt != null && !currentEOrt.isEmpty()) { | 147 if (currentEOrt != null && !currentEOrt.isEmpty()) { |
| 145 currentProbe.addEntnahmeOrt(currentEOrt); | 148 currentProbe.addEntnahmeOrt(currentEOrt); |
| 146 currentEOrt.clear(); | 149 currentEOrt.clear(); |
| 147 } | 150 } |
| 148 currentEOrt = new HashMap<String, String>(); | |
| 149 currentProbe = data.new Probe(); | 151 currentProbe = data.new Probe(); |
| 150 if (!currentErrors.isEmpty()) { | 152 if (!currentErrors.isEmpty()) { |
| 151 errors.put(currentProbe.getIdentifier(), | 153 errors.put(currentProbe.getIdentifier(), |
| 152 (ArrayList)currentErrors.clone()); | 154 (ArrayList)currentErrors.clone()); |
| 153 } | 155 } |
| 154 currentErrors.clear(); | 156 currentErrors.clear(); |
| 155 currentProbe = null; | 157 currentProbe = null; |
| 158 hasEKoordinaten = false; | |
| 159 hasEGemeinde = false; | |
| 160 hasEHerkunfstland = false; | |
| 156 hasDatenbasis = false; | 161 hasDatenbasis = false; |
| 157 hasMessprogramm = false; | 162 hasMessprogramm = false; |
| 158 hasUmwelt = false; | 163 hasUmwelt = false; |
| 159 hasZeitbasis = false; | 164 hasZeitbasis = false; |
| 160 } | 165 } |