MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Rename MavenArtifactResourceConfiguration to MavenWebArtifactConfiguration

Browse Source
This commit is contained in:
Sergey Evdokimov
2014-03-18 17:58:00 +04:00
parent a1bf8d42d6
commit aab8fbd674
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenWebArtifactRootCopyingHandlerProvider.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class MavenWebArtifactRootCopyingHandlerProvider extends ArtifactRootCopy
if (!mavenExtensionService.hasMavenProjectConfiguration(buildDataPaths)) return null;
MavenProjectConfiguration projectConfiguration = mavenExtensionService.getMavenProjectConfiguration(buildDataPaths);
MavenArtifactResourceConfiguration artifactResourceConfiguration = projectConfiguration.artifactsResources.get(artifact.getName());
MavenWebArtifactConfiguration artifactResourceConfiguration = projectConfiguration.webArtifactConfigs.get(artifact.getName());
if (artifactResourceConfiguration == null) return null;
ResourceRootConfiguration rootConfiguration = artifactResourceConfiguration.getRootConfiguration(root);
plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenProjectConfiguration.java
+2 -2
View File
@@ -49,9 +49,9 @@ public class MavenProjectConfiguration {
@MapAnnotation(surroundWithTag = false, surroundKeyWithTag = false, surroundValueWithTag = false, entryTagName = "maven-module", keyAttributeName = "name")
public Map<String, MavenModuleResourceConfiguration> moduleConfigurations = new THashMap<String, MavenModuleResourceConfiguration>();
@Tag("web-resources")
@Tag("web-artifact-cfg")
@MapAnnotation(surroundWithTag = false, surroundKeyWithTag = false, surroundValueWithTag = false, entryTagName = "artifact", keyAttributeName = "name")
public Map<String, MavenArtifactResourceConfiguration> artifactsResources = new THashMap<String, MavenArtifactResourceConfiguration>();
public Map<String, MavenWebArtifactConfiguration> webArtifactConfigs = new THashMap<String, MavenWebArtifactConfiguration>();
@Nullable
public MavenModuleResourceConfiguration findProject(MavenIdBean id) {
plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenArtifactResourceConfiguration.java → plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenWebArtifactConfiguration.java
+1 -1
View File
@@ -31,7 +31,7 @@ import java.util.Map;
/**
* @author Sergey Evdokimov
*/
public class MavenArtifactResourceConfiguration {
public class MavenWebArtifactConfiguration {
@Tag("web-artifact-name")
public String webArtifactName;
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java
+4 -4
View File
@@ -241,15 +241,15 @@ public class MavenResourceCompilerConfigurationGenerator {
String webArtifactName = MavenUtil.getArtifactName("war", module, true);
MavenArtifactResourceConfiguration artifactResourceCfg = projectCfg.artifactsResources.get(webArtifactName);
MavenWebArtifactConfiguration artifactResourceCfg = projectCfg.webArtifactConfigs.get(webArtifactName);
if (artifactResourceCfg == null) {
artifactResourceCfg = new MavenArtifactResourceConfiguration();
artifactResourceCfg = new MavenWebArtifactConfiguration();
artifactResourceCfg.webArtifactName = webArtifactName;
artifactResourceCfg.moduleName = module.getName();
projectCfg.artifactsResources.put(webArtifactName, artifactResourceCfg);
projectCfg.webArtifactConfigs.put(webArtifactName, artifactResourceCfg);
}
else {
LOG.error("MavenArtifactResourceConfiguration already exists.");
LOG.error("MavenWebArtifactConfiguration already exists.");
}
if (webResources != null) {