Mercurial > dive4elements > river
comparison gwt-client/src/main/java/org/dive4elements/river/client/shared/model/ToLoad.java @ 8856:5e38e2924c07 3.2.x
Fix code style.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Thu, 18 Jan 2018 20:12:01 +0100 |
| parents | b1f446f675b1 |
| children | 84397da33d17 |
comparison
equal
deleted
inserted
replaced
| 8855:d7c005e12af0 | 8856:5e38e2924c07 |
|---|---|
| 38 public boolean equals(Object o) { | 38 public boolean equals(Object o) { |
| 39 if (!(o instanceof StringTriple)) { | 39 if (!(o instanceof StringTriple)) { |
| 40 return false; | 40 return false; |
| 41 } | 41 } |
| 42 StringTriple other = (StringTriple) o; | 42 StringTriple other = (StringTriple) o; |
| 43 return second.equals(other.second) && first.equals(other.first) && third.equals(other.third); | 43 return second.equals(other.second) |
| 44 && first.equals(other.first) | |
| 45 && third.equals(other.third); | |
| 44 } | 46 } |
| 45 } | 47 } |
| 46 public static final String SYNTHETIC_KEY = "key-"; | 48 public static final String SYNTHETIC_KEY = "key-"; |
| 47 | 49 |
| 48 protected Map<String, Map<StringTriple, ArtifactFilter>> artifacts; | 50 protected Map<String, Map<StringTriple, ArtifactFilter>> artifacts; |
| 87 | 89 |
| 88 if (artifactName == null) { | 90 if (artifactName == null) { |
| 89 artifactName = uniqueKey(artifacts); | 91 artifactName = uniqueKey(artifacts); |
| 90 } | 92 } |
| 91 | 93 |
| 92 Map<StringTriple, ArtifactFilter> artifact = artifacts.get(artifactName); | 94 Map<StringTriple, ArtifactFilter> artifact = artifacts.get( |
| 95 artifactName); | |
| 93 | 96 |
| 94 if (artifact == null) { | 97 if (artifact == null) { |
| 95 artifact = new HashMap<StringTriple, ArtifactFilter>(); | 98 artifact = new HashMap<StringTriple, ArtifactFilter>(); |
| 96 artifacts.put(artifactName, artifact); | 99 artifacts.put(artifactName, artifact); |
| 97 } | 100 } |
| 98 | 101 |
| 99 ArtifactFilter filter = artifact.get(factory); | 102 ArtifactFilter filter = artifact.get(factory); |
| 100 if (filter == null) { | 103 if (filter == null) { |
| 101 filter = new ArtifactFilter(factory); | 104 filter = new ArtifactFilter(factory); |
| 102 artifact.put(new StringTriple(factory, displayName, targetOut), filter); | 105 artifact.put(new StringTriple( |
| 106 factory, displayName, targetOut), filter); | |
| 103 } | 107 } |
| 104 | 108 |
| 105 filter.add(out, name, ids); | 109 filter.add(out, name, ids); |
| 106 } | 110 } |
| 107 | 111 |