Skip to content

Commit 8053caa

Browse files
committed
🔧 chore(summaries): Update files related to struts version
1 parent 60e2410 commit 8053caa

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/summaries/ReportingSummaryAction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
114114
import org.slf4j.Logger;
115115
import org.slf4j.LoggerFactory;
116+
import org.cgiar.ccafs.marlo.config.MarloLocalizedTextProviderQualifier;
116117

117118
/**
118119
* ReportingSummaryAction
@@ -200,7 +201,7 @@ public ReportingSummaryAction(APConfig config, GlobalUnitManager crpManager, Pro
200201
ProjectBudgetManager projectBudgetManager, LocElementManager locElementManager, IpElementManager ipElementManager,
201202
SrfTargetUnitManager srfTargetUnitManager, PhaseManager phaseManager,
202203
RepositoryChannelManager repositoryChannelManager,
203-
@Qualifier("marloLocalizedTextProvider") MarloLocalizedTextProvider localizedTextProvider,
204+
@MarloLocalizedTextProviderQualifier MarloLocalizedTextProvider localizedTextProvider,
204205
CrossCuttingScoringManager crossCuttingScoringManager, ResourceManager resourceManager,
205206
ProjectExpectedStudyCountryManager projectExpectedStudyCountryManager,
206207
DeliverableCrossCuttingMarkerManager deliverableCrossCuttingMarkerManager,

marlo-web/src/main/java/org/cgiar/ccafs/marlo/config/MarloLocalizedTextProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
*
3636
* @author GrantL
3737
*/
38-
@Primary
38+
@MarloLocalizedTextProviderQualifier
3939
@Component("marloLocalizedTextProvider")
4040
public class MarloLocalizedTextProvider extends GlobalLocalizedTextProvider implements TextProvider {
4141

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package org.cgiar.ccafs.marlo.config;
2+
3+
import javax.inject.Qualifier;
4+
import java.lang.annotation.ElementType;
5+
import java.lang.annotation.Retention;
6+
import java.lang.annotation.RetentionPolicy;
7+
import java.lang.annotation.Target;
8+
9+
@Qualifier
10+
@Retention(RetentionPolicy.RUNTIME)
11+
@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE })
12+
public @interface MarloLocalizedTextProviderQualifier {
13+
}

0 commit comments

Comments
 (0)