Skip to content

Commit 7a53b1f

Browse files
author
Vitaliy Boyko
committed
Fixed File separator in tests, fixed imports in CreateAnObserverDialog
1 parent b70eab8 commit 7a53b1f

File tree

9 files changed

+8
-12
lines changed

9 files changed

+8
-12
lines changed

Diff for: src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAnObserverDialog.java

-4
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,17 @@
55
package com.magento.idea.magento2plugin.actions.generation.dialog;
66

77
import com.intellij.openapi.project.Project;
8-
import com.jetbrains.php.lang.psi.elements.Method;
9-
import com.jetbrains.php.lang.psi.elements.PhpClass;
108
import com.magento.idea.magento2plugin.actions.generation.CreateAPluginAction;
119
import com.magento.idea.magento2plugin.actions.generation.CreateAnObserverAction;
1210
import com.magento.idea.magento2plugin.actions.generation.data.ObserverEventsXmlData;
1311
import com.magento.idea.magento2plugin.actions.generation.data.ObserverFileData;
14-
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.CreateAPluginDialogValidator;
1512
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.CreateAnObserverDialogValidator;
1613
import com.magento.idea.magento2plugin.actions.generation.generator.ObserverClassGenerator;
1714
import com.magento.idea.magento2plugin.actions.generation.generator.ObserverEventsXmlGenerator;
1815
import com.magento.idea.magento2plugin.indexes.ModuleIndex;
1916
import com.magento.idea.magento2plugin.magento.packages.Package;
2017
import com.magento.idea.magento2plugin.ui.FilteredComboBox;
2118
import org.jetbrains.annotations.NotNull;
22-
2319
import javax.swing.*;
2420
import java.awt.event.*;
2521
import com.magento.idea.magento2plugin.magento.packages.File;

Diff for: tests/com/magento/idea/magento2plugin/BaseProjectTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.magento.idea.magento2plugin.indexes.IndexManager;
1010
import com.magento.idea.magento2plugin.project.Settings;
1111
import com.magento.idea.magento2plugin.project.util.GetProjectBasePath;
12-
import java.io.File;
12+
import com.magento.idea.magento2plugin.magento.packages.File;
1313

1414
/**
1515
* Configure test environment with Magento 2 project

Diff for: tests/com/magento/idea/magento2plugin/completion/xml/CompletionXmlFixtureTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import com.magento.idea.magento2plugin.BaseProjectTestCase;
88

9-
import java.io.File;
9+
import com.magento.idea.magento2plugin.magento.packages.File;
1010
import java.util.Arrays;
1111
import java.util.List;
1212

Diff for: tests/com/magento/idea/magento2plugin/inspections/php/InspectionPhpFixtureTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
88
import com.magento.idea.magento2plugin.BaseProjectTestCase;
9-
import java.io.File;
9+
import com.magento.idea.magento2plugin.magento.packages.File;
1010
import java.util.List;
1111

1212
abstract public class InspectionPhpFixtureTestCase extends BaseProjectTestCase {

Diff for: tests/com/magento/idea/magento2plugin/inspections/xml/InspectionXmlFixtureTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.magento.idea.magento2plugin.BaseProjectTestCase;
44

5-
import java.io.File;
5+
import com.magento.idea.magento2plugin.magento.packages.File;
66

77
abstract public class InspectionXmlFixtureTestCase extends BaseProjectTestCase {
88

Diff for: tests/com/magento/idea/magento2plugin/inspections/xml/PluginDeclarationInspectionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import com.magento.idea.magento2plugin.magento.files.ModuleDiXml;
88
import com.magento.idea.magento2plugin.magento.packages.Package;
9-
import java.io.File;
9+
import com.magento.idea.magento2plugin.magento.packages.File;
1010

1111
public class PluginDeclarationInspectionTest extends InspectionXmlFixtureTestCase {
1212

Diff for: tests/com/magento/idea/magento2plugin/linemarker/php/LinemarkerPhpFixtureTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.magento.idea.magento2plugin.BaseProjectTestCase;
1010
import org.jetbrains.annotations.NotNull;
1111
import javax.swing.*;
12-
import java.io.File;
12+
import com.magento.idea.magento2plugin.magento.packages.File;
1313
import java.util.List;
1414

1515
abstract public class LinemarkerPhpFixtureTestCase extends BaseProjectTestCase {

Diff for: tests/com/magento/idea/magento2plugin/reference/php/ReferencePhpFixtureTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.intellij.psi.impl.source.xml.XmlAttributeValueImpl;
1010
import com.magento.idea.magento2plugin.BaseProjectTestCase;
1111
import com.magento.idea.magento2plugin.reference.xml.PolyVariantReferenceBase;
12-
import java.io.File;
12+
import com.magento.idea.magento2plugin.magento.packages.File;
1313

1414
abstract public class ReferencePhpFixtureTestCase extends BaseProjectTestCase {
1515

Diff for: tests/com/magento/idea/magento2plugin/reference/xml/ReferenceXmlFixtureTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.intellij.psi.xml.XmlAttributeValue;
1010
import com.jetbrains.php.lang.psi.elements.PhpClass;
1111
import com.magento.idea.magento2plugin.BaseProjectTestCase;
12-
import java.io.File;
12+
import com.magento.idea.magento2plugin.magento.packages.File;
1313

1414
abstract public class ReferenceXmlFixtureTestCase extends BaseProjectTestCase {
1515

0 commit comments

Comments
 (0)