Author: fbricon Date: 2012-02-10 10:24:40 -0500 (Fri, 10 Feb 2012) New Revision: 38606 Modified: trunk/maven/plugins/org.jboss.tools.maven.profiles.core/src/org/jboss/tools/maven/profiles/core/internal/profiles/ProfileManager.java Log: JBIDE-10362 : Make Maven profile selection compatible with m2e 1.1 Modified: trunk/maven/plugins/org.jboss.tools.maven.profiles.core/src/org/jboss/tools/maven/profiles/core/internal/profiles/ProfileManager.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.profiles.core/src/org/jboss/tools/maven/profiles/core/internal/profiles/ProfileManager.java 2012-02-10 15:18:37 UTC (rev 38605) +++ trunk/maven/plugins/org.jboss.tools.maven.profiles.core/src/org/jboss/tools/maven/profiles/core/internal/profiles/ProfileManager.java 2012-02-10 15:24:40 UTC (rev 38606) @@ -52,11 +52,13 @@ final ResolverConfiguration configuration =configurationManager.getResolverConfiguration(project); final String profilesAsString = getAsString(profiles); + //TODO : replace with resolverConfiguration.getSelectedProfiles() when m2e 1.1 is the default requirement if (profilesAsString.equals(configuration.getActiveProfiles())) { //Nothing changed return; } + //TODO : replace with resolverConfiguration.setSelectedProfiles(profilesAsString) when m2e 1.1 is the default requirement configuration.setActiveProfiles(profilesAsString); boolean isSet = configurationManager.setResolverConfiguration(project, configuration); if (isSet) { @@ -126,7 +128,8 @@ ResolverConfiguration resolverConfiguration = MavenPlugin.getProjectConfigurationManager() .getResolverConfiguration(facade.getProject()); - List<String> configuredProfiles = resolverConfiguration.getActiveProfileList(); + //TODO : replace with resolverConfiguration.getSelectedProfiles() when m2e 1.1 is the default requirement + List<String> configuredProfiles = toList(resolverConfiguration.getActiveProfiles()); MavenProject mavenProject = facade.getMavenProject(monitor); @@ -184,6 +187,20 @@ return Collections.unmodifiableList(statuses); } + private List<String> toList(String profilesAsText) { + List<String> profiles; + if (profilesAsText != null && profilesAsText.trim().length() > 0) { + String[] profilesArray = profilesAsText.split("[,\\s\\|]"); + profiles = new ArrayList<String>(profilesArray.length); + for (String profile : profilesArray) { + profiles.add(profile); + } + } else { + profiles = new ArrayList<String>(0); + } + return profiles; + } + private String findSource(Profile profile, List<Model> modelHierarchy) { if (profile != null) { if ("settings.xml".equals(profile.getSource())) { //$NON-NLS-1$