Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java @ 3453:e74e707ff650
Replace string comparison with empty string with length equals zero comparison
flys-artifacts/trunk@5117 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Tue, 24 Jul 2012 09:16:00 +0000 |
| parents | d35f28655fa6 |
| children | f858028dde5f |
comparison
equal
deleted
inserted
replaced
| 3452:200e70f31f6f | 3453:e74e707ff650 |
|---|---|
| 67 // Add Facet per Diagram type if data given. | 67 // Add Facet per Diagram type if data given. |
| 68 for (ChartType ct: ChartType.values()) { | 68 for (ChartType ct: ChartType.values()) { |
| 69 // Handle points. | 69 // Handle points. |
| 70 String pointData = points.getDataAsString(ct + "." + MANUALPOINTS + | 70 String pointData = points.getDataAsString(ct + "." + MANUALPOINTS + |
| 71 DOT_DATA); | 71 DOT_DATA); |
| 72 if (pointData != null && !pointData.equals("") | 72 if (pointData != null && pointData.length() != 0 |
| 73 && !pointData.equals("[]")) { | 73 && !pointData.equals("[]")) { |
| 74 String fName = ct + "." + MANUALPOINTS; | 74 String fName = ct + "." + MANUALPOINTS; |
| 75 ManualPointsFacet facet = new ManualPointsFacet( | 75 ManualPointsFacet facet = new ManualPointsFacet( |
| 76 0, | 76 0, |
| 77 fName, | 77 fName, |
| 84 } | 84 } |
| 85 | 85 |
| 86 // Handle lines. | 86 // Handle lines. |
| 87 String linesData = points.getDataAsString(ct + "." + MANUALPOINTS + | 87 String linesData = points.getDataAsString(ct + "." + MANUALPOINTS + |
| 88 DOT_LINES); | 88 DOT_LINES); |
| 89 if (linesData != null && !linesData.equals("") | 89 if (linesData != null && linesData.length() != 0 |
| 90 && !linesData.equals("[]")) { | 90 && !linesData.equals("[]")) { |
| 91 try { | 91 try { |
| 92 JSONArray lines = new JSONArray((String) linesData); | 92 JSONArray lines = new JSONArray((String) linesData); |
| 93 for (int i = 0, P = lines.length(); i < P; i++) { | 93 for (int i = 0, P = lines.length(); i < P; i++) { |
| 94 JSONArray array = lines.getJSONArray(i); | 94 JSONArray array = lines.getJSONArray(i); |