MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 06:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-109913 Maven -> Always Update Snapshots CHECKBOX - Not Aligned

Browse Source
This commit is contained in:
Sergey Evdokimov
2013-08-01 16:28:45 +04:00
parent 0b5592f5d2
commit cad83a246f
2 changed files with 54 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapter.java
View File

@@ -326,6 +326,10 @@ public class MavenRootModelAdapter {
Library.ModifiableModel modifiableModel = library.getModifiableModel();
updateUrl(modifiableModel, OrderRootType.CLASSES, artifact, null, null, true);
modifiableModel.commit();
if (myOrderEntriesBeforeJdk.contains(libraryName)) {
moveLastOrderEntryBeforeJdk();
}
}
public void addLibraryDependency(MavenArtifact artifact,
@@ -349,7 +353,7 @@ public class MavenRootModelAdapter {
LibraryOrderEntry e = myRootModel.addLibraryEntry(library);
e.setScope(scope);
if (myOrderEntriesBeforeJdk.contains(e.getLibraryName())) {
if (myOrderEntriesBeforeJdk.contains(libraryName)) {
moveLastOrderEntryBeforeJdk();
}
}

75
plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java
View File

@@ -2400,33 +2400,56 @@ public class DependenciesImportingTest extends MavenImportingTestCase {
assert "Maven: junit:junit:4.0".equals(((LibraryOrderEntry)orderEntries[1]).getLibraryName());
assert orderEntries[2] instanceof JdkOrderEntry;
assert orderEntries[3] instanceof ModuleSourceOrderEntry;
}
//// swap dependencies position
//createModulePom("m1", "<groupId>test</groupId>" +
// "<artifactId>m1</artifactId>" +
// "<version>1</version>" +
//
// "<dependencies>" +
// " <dependency>" +
// " <groupId>junit</groupId>" +
// " <artifactId>junit</artifactId>" +
// " <version>4.0</version>" +
// " </dependency>" +
// " <dependency>" +
// " <groupId>test</groupId>" +
// " <artifactId>m2</artifactId>" +
// " <version>1</version>" +
// " </dependency>" +
// "</dependencies>");
//importProject();
//
//// JDK was moved to begin back
//orderEntries = ModuleRootManager.getInstance(getModule("m1")).getOrderEntries();
//assert orderEntries.length == 4;
//assert orderEntries[0] instanceof JdkOrderEntry;
//assert orderEntries[1] instanceof ModuleSourceOrderEntry;
//assert ((ModuleOrderEntry)orderEntries[2]).getModuleName().equals("m2");
//assert "Maven: junit:junit:4.0".equals(((LibraryOrderEntry)orderEntries[3]).getLibraryName());
public void testSaveJdkPositionSystemDependency() throws Exception {
createProjectPom("<groupId>test</groupId>" +
"<artifactId>m1</artifactId>" +
"<version>1</version>" +
"<dependencies>" +
" <dependency>" +
" <groupId>test</groupId>" +
" <artifactId>systemDep</artifactId>" +
" <version>1</version>" +
" <scope>system</scope>" +
" <systemPath>${java.home}/lib/rt.jar</systemPath>" +
" </dependency>" +
" <dependency>" +
" <groupId>junit</groupId>" +
" <artifactId>junit</artifactId>" +
" <version>4.0</version>" +
" </dependency>" +
"</dependencies>");
importProject();
new WriteAction() {
@Override
protected void run(Result result) throws Throwable {
ModifiableRootModel rootModel = ModuleRootManager.getInstance(getModule("m1")).getModifiableModel();
OrderEntry[] orderEntries = rootModel.getOrderEntries().clone();
assert orderEntries.length == 4;
assert orderEntries[0] instanceof JdkOrderEntry;
assert orderEntries[1] instanceof ModuleSourceOrderEntry;
assert "Maven: test:systemDep:1".equals(((LibraryOrderEntry)orderEntries[2]).getLibraryName());
assert "Maven: junit:junit:4.0".equals(((LibraryOrderEntry)orderEntries[3]).getLibraryName());
rootModel.rearrangeOrderEntries(new OrderEntry[]{orderEntries[2], orderEntries[3], orderEntries[0], orderEntries[1]});
rootModel.commit();
}
}.execute();
resolveDependenciesAndImport();
// JDK position was saved
OrderEntry[] orderEntries = ModuleRootManager.getInstance(getModule("m1")).getOrderEntries();
assert orderEntries.length == 4;
assert "Maven: test:systemDep:1".equals(((LibraryOrderEntry)orderEntries[0]).getLibraryName());
assert "Maven: junit:junit:4.0".equals(((LibraryOrderEntry)orderEntries[1]).getLibraryName());
assert orderEntries[2] instanceof JdkOrderEntry;
assert orderEntries[3] instanceof ModuleSourceOrderEntry;
}
}