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

Merge branch 'FieldAccessor.get' of https://github.com/dahlstrom-g/intellij-community

Browse Source
This commit is contained in:
Vladislav.Soroka
2017-01-13 12:51:05 +03:00
parent f351ba2ddb da33f0123f
commit fa2b27bfed
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/embedder/FieldAccessor.java
-4
View File
@@ -40,8 +40,4 @@ public class FieldAccessor<FIELD_TYPE> {
private static Object getFieldValue(Class c, String fieldName, Object o) {
return ReflectionUtil.getField(c, o, null, fieldName);
}
public static <FIELD_TYPE> FIELD_TYPE get(Class hostClass, Object host, String fieldName) {
return (FIELD_TYPE)getFieldValue(hostClass, fieldName, host);
}
}
plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java
+3 -3
View File
@@ -239,18 +239,18 @@ public class Maven3ServerEmbedderImpl extends Maven3ServerEmbedder {
myContainer.getLoggerManager().setThreshold(serverSettings.getLoggingLevel());
mySystemProperties = FieldAccessor.get(cliRequestClass, cliRequest, "systemProperties");
mySystemProperties = ReflectionUtil.getField(cliRequestClass, cliRequest, Properties.class, "systemProperties");
if (serverSettings.getProjectJdk() != null) {
mySystemProperties.setProperty("java.home", serverSettings.getProjectJdk());
}
if (settingsBuilder == null) {
settingsBuilder = FieldAccessor.get(MavenCli.class, cli, "settingsBuilder");
settingsBuilder = ReflectionUtil.getField(MavenCli.class, cli, SettingsBuilder.class, "settingsBuilder");
}
myMavenSettings = buildSettings(settingsBuilder, serverSettings, mySystemProperties,
FieldAccessor.<Properties>get(cliRequestClass, cliRequest, "userProperties"));
ReflectionUtil.getField(cliRequestClass, cliRequest, Properties.class, "userProperties"));
myLocalRepository = createLocalRepository();
}
plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java
+5 -4
View File
@@ -19,6 +19,7 @@ import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.ExceptionUtil;
import com.intellij.util.Function;
import com.intellij.util.ReflectionUtil;
import com.intellij.util.SystemProperties;
import com.intellij.util.containers.ContainerUtil;
import gnu.trove.THashMap;
@@ -203,18 +204,18 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder {
}
// reset threshold
myContainer = FieldAccessor.get(MavenCli.class, cli, "container");
myContainer = ReflectionUtil.getField(MavenCli.class, cli, DefaultPlexusContainer.class, "container");
myContainer.getLoggerManager().setThreshold(settings.getLoggingLevel());
mySystemProperties = FieldAccessor.get(cliRequestClass, cliRequest, "systemProperties");
mySystemProperties = ReflectionUtil.getField(cliRequestClass, cliRequest, Properties.class, "systemProperties");
if (settings.getProjectJdk() != null) {
mySystemProperties.setProperty("java.home", settings.getProjectJdk());
}
myMavenSettings =
buildSettings(FieldAccessor.<SettingsBuilder>get(MavenCli.class, cli, "settingsBuilder"), settings, mySystemProperties,
FieldAccessor.<Properties>get(cliRequestClass, cliRequest, "userProperties"));
buildSettings(ReflectionUtil.getField(MavenCli.class, cli, SettingsBuilder.class, "settingsBuilder"), settings, mySystemProperties,
ReflectionUtil.getField(cliRequestClass, cliRequest, Properties.class, "userProperties"));
myLocalRepository = createLocalRepository();
}