Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java @ 4432:e8a4d2fd25cc
Merged.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 07 Nov 2012 09:47:44 +0100 |
| parents | 48e09640e8ec |
| children | 5b8919ef601d |
comparison
equal
deleted
inserted
replaced
| 4431:83fe6eeba83a | 4432:e8a4d2fd25cc |
|---|---|
| 79 public Boolean isInitialActive( | 79 public Boolean isInitialActive( |
| 80 Artifact artifact, | 80 Artifact artifact, |
| 81 Facet facet, | 81 Facet facet, |
| 82 String output | 82 String output |
| 83 ) { | 83 ) { |
| 84 log.debug("Registry:is active? " + output + "/" + facet.getName()); | |
| 84 if (output.contains(FacetTypes.ChartType.FLSC.toString())) { | 85 if (output.contains(FacetTypes.ChartType.FLSC.toString())) { |
| 85 // Longitudinal section chart | 86 // Longitudinal section chart |
| 86 String name = facet.getName(); | 87 String name = facet.getName(); |
| 87 | 88 |
| 88 if (name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_DWT) | 89 if (name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_DWT) |
| 89 || name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_LS) | 90 || name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_LS) |
| 90 || name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_WQ) | 91 || name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_WQ) |
| 91 || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_DWT) | 92 || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_DWT) |
| 92 || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_LS) | 93 || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_LS) |
| 93 || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_WQ) | 94 || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_WQ) |
| 95 // Wrong palace! Go to AnnotationArtifact. | |
| 96 || name.contains(FacetTypes.LONGITUDINAL_ANNOTATION) | |
| 94 ) { | 97 ) { |
| 95 return Boolean.FALSE; | 98 return Boolean.FALSE; |
| 96 } | 99 } |
| 97 } | 100 } |
| 98 if (output.contains(FacetTypes.ChartType.FDWC.toString()) | 101 else if (output.contains(FacetTypes.ChartType.FDWC.toString()) |
| 99 && facet.getName().contains(FacetTypes.FIX_SECTOR_AVERAGE_DWT)) { | 102 && facet.getName().contains(FacetTypes.FIX_SECTOR_AVERAGE_DWT)) { |
| 103 return Boolean.FALSE; | |
| 104 } | |
| 105 else if (output.contains(FacetTypes.ChartType.LS.toString()) | |
| 106 && facet.getName().contains(FacetTypes.LONGITUDINAL_ANNOTATION)) { | |
| 107 | |
| 100 return Boolean.FALSE; | 108 return Boolean.FALSE; |
| 101 } | 109 } |
| 102 | 110 |
| 103 return Boolean.TRUE; | 111 return Boolean.TRUE; |
| 104 } | 112 } |