Skip to content

Testdox is displayed in Others Settings in Idea 2016. Settings remains. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andreykudr wants to merge 1 commit into
base: pre-scala-migration
Choose a base branch
from
Open

Testdox is displayed in Others Settings in Idea 2016. Settings remains. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 0 additions & 87 deletions src/java/META-INF/plugin.xml
View file
Open in desktop

This file was deleted.

31 changes: 17 additions & 14 deletions src/java/org/codehaus/testdox/intellij/config/ConfigurationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,26 @@
import com.intellij.openapi.components.State;
import com.intellij.openapi.components.Storage;
import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.options.ConfigurableProvider;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.project.Project;
import com.intellij.util.xmlb.XmlSerializerUtil;
import org.codehaus.testdox.intellij.IconHelper;
import org.codehaus.testdox.intellij.TemplateNameResolver;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import javax.swing.*;
import java.util.Collections;
import java.util.List;

@State(
name = ConfigurationController.COMPONENT_NAME,
storages = {
@Storage(
id = ConfigurationController.COMPONENT_NAME,
file = "$PROJECT_FILE$"
)}
name = ConfigurationController.COMPONENT_NAME,
storages = {
@Storage(
id = ConfigurationController.COMPONENT_NAME,
file = "$PROJECT_FILE$"
)}
)

public class ConfigurationController implements ProjectComponent, Configurable, PersistentStateComponent<ConfigurationBean> {
Expand Down Expand Up @@ -117,14 +120,14 @@ public Icon getIcon() {

public boolean isModified() {
return bean.isAllowCustomPackages() != panel.getCustomMappingStatus()
|| !equals(bean.getCustomPackages(), panel.getCustomPackageMappings())
|| !bean.getTestNameTemplate().equals(panel.getTestNameTemplate())
|| !bean.getTestMethodIndicator().equals(panel.getTestMethodPrefix())
|| bean.isCreateTestIfMissing() != panel.getCreateTestIfMissing()
|| bean.isUnderscoreMode() != panel.getUseUnderscore()
|| bean.isShowFullyQualifiedClassName() != panel.getShowFullyQualifiedClassName()
|| bean.isAutoApplyChangesToTest() != panel.getAutoApplyChangesToTest()
|| bean.isDeletePackageOccurrences() != panel.getDeletePackageOccurrences();
|| !equals(bean.getCustomPackages(), panel.getCustomPackageMappings())
|| !bean.getTestNameTemplate().equals(panel.getTestNameTemplate())
|| !bean.getTestMethodIndicator().equals(panel.getTestMethodPrefix())
|| bean.isCreateTestIfMissing() != panel.getCreateTestIfMissing()
|| bean.isUnderscoreMode() != panel.getUseUnderscore()
|| bean.isShowFullyQualifiedClassName() != panel.getShowFullyQualifiedClassName()
|| bean.isAutoApplyChangesToTest() != panel.getAutoApplyChangesToTest()
|| bean.isDeletePackageOccurrences() != panel.getDeletePackageOccurrences();
}

private boolean equals(List strings1, List strings2) {
Expand Down
22 changes: 22 additions & 0 deletions src/java/org/codehaus/testdox/intellij/config/ConfigurationControllerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.codehaus.testdox.intellij.config;

import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.options.ConfigurableProvider;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.Nullable;

public class ConfigurationControllerProvider extends ConfigurableProvider {

Project project;

public ConfigurationControllerProvider(Project project) {
this.project = project;
}

@Nullable
@Override
public Configurable createConfigurable() {
return project.getComponent(ConfigurationController.class);
}
}