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

RemoteConfiguration — move default state to class from RunManager component

Browse Source
This commit is contained in:
Vladimir Krivosheev
2017-12-28 18:30:55 +01:00
parent 833b80e86f
commit 7cc8b40722
4 changed files with 8 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java
+4 -4
View File
@@ -43,11 +43,11 @@ public class RemoteConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
DefaultJDOMExternalizer.readExternal(this, element);
}
public boolean USE_SOCKET_TRANSPORT;
public boolean USE_SOCKET_TRANSPORT = true;
public boolean SERVER_MODE;
public String SHMEM_ADDRESS;
public String HOST;
public String PORT;
public String SHMEM_ADDRESS = "javadebug";
public String HOST = "localhost";
public String PORT = "5005";
public RemoteConfiguration(final Project project, ConfigurationFactory configurationFactory) {
super(new JavaRunConfigurationModule(project, true), configurationFactory);
plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
+2 -2
View File
@@ -44,7 +44,7 @@ public class TestNGConfiguration extends JavaTestConfigurationBase {
@NonNls private static final String PATTERNS_EL_NAME = "patterns";
@NonNls private static final String PATTERN_EL_NAME = "pattern";
@NonNls private static final String TEST_CLASS_ATT_NAME = "testClass";
//private TestNGResultsContainer resultsContainer;
protected TestData data;
protected transient Project project;
@@ -155,7 +155,7 @@ public class TestNGConfiguration extends JavaTestConfigurationBase {
}
public String getWorkingDirectory() {
return data.getWorkingDirectory(project);
return data.getWorkingDirectory();
}
public void setEnvs(@NotNull Map<String, String> envs) {
plugins/testng/src/com/theoryinpractice/testng/model/TestData.java
+2 -17
View File
@@ -1,17 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/
package com.theoryinpractice.testng.model;
@@ -22,7 +10,6 @@ import com.intellij.execution.junit.JUnitUtil;
import com.intellij.execution.junit2.info.MethodLocation;
import com.intellij.execution.testframework.TestSearchScope;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiMethod;
@@ -45,9 +32,7 @@ public class TestData implements Cloneable
public String PARAMETERS;
public String WORKING_DIRECTORY;
public String OUTPUT_DIRECTORY;
public String ANNOTATION_TYPE;
public String ENV_VARIABLES;
private Map<String, String> ENVS = new LinkedHashMap<>();
public boolean PASS_PARENT_ENVS = true;
@@ -116,7 +101,7 @@ public class TestData implements Cloneable
WORKING_DIRECTORY = ExternalizablePath.urlValue(value);
}
public String getWorkingDirectory(Project project) {
public String getWorkingDirectory() {
return ExternalizablePath.localPathValue(WORKING_DIRECTORY);
}
resources/src/idea/RunManager.xml
-15
View File
@@ -1,33 +1,18 @@
<component>
<option name="SHOW_SETTINGS_BEFORE_RUNNING" value="true" />
<option name="COMPILE_BEFORE_RUNNING" value="true" />
<activeType name="Application" />
<configuration name="&lt;template&gt;" type="Application" default="true" selected="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
<configuration name="&lt;template&gt;" type="JUnit" default="true" selected="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" value="-ea"/>
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
</configuration>
<configuration name="&lt;template&gt;" type="TestNG" default="true" selected="false">
<option name="MAIN_CLASS_NAME"/>
<option name="VM_PARAMETERS" value="-ea"/>
<option name="PARAMETERS"/>
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%"/>
</configuration>
<configuration name="&lt;template&gt;" type="Remote" default="true" selected="false">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
</configuration>
</component>