Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
-->

<extensions defaultExtensionNs="com.intellij">
<codeInsight.lineMarkerProvider language="PHP" implementationClass="pl.projectspace.idea.plugins.php.atoum.actions.ClassLineMarkerProvider" />
<codeInsight.lineMarkerProvider language="PHP" implementationClass="org.atoum.intellij.plugin.atoum.linemarker.ClassLineMarkerProvider" />
<iconProvider implementation="org.atoum.intellij.plugin.atoum.AtoumIconProvider" />
<!-- Add your extensions here -->
</extensions>
Expand All @@ -38,16 +38,16 @@

<actions>
<!-- Add your actions here -->
<action id="AtoumSwitchContext" class="pl.projectspace.idea.plugins.php.atoum.actions.AtoumSwitchContext"
icon="/pl/projectspace/idea/plugins/php/atoum/icons/atoum_16_16.png"
<action id="AtoumSwitchContext" class="org.atoum.intellij.plugin.atoum.actions.SwitchContext"
icon="/org/atoum/intellij/plugin/atoum/icons/atoum_16_16.png"
text="Swicth to test class / tested class">
<add-to-group group-id="GoToCodeGroup" anchor="last"/>
<add-to-group group-id="EditorPopupMenu.GoTo" anchor="last"/>
<keyboard-shortcut first-keystroke="alt shift K" keymap="$default"/>
</action>

<action id="AtoumRunTests" class="org.atoum.intellij.plugin.atoum.actions.Run"
icon="/pl/projectspace/idea/plugins/php/atoum/icons/atoum_16_16.png"
icon="/org/atoum/intellij/plugin/atoum/icons/atoum_16_16.png"
text="run tests">
<add-to-group group-id="RunMenu" anchor="last"/>
<add-to-group group-id="EditorPopupMenu.Run" anchor="last"/>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 0 additions & 2 deletions src/org/atoum/intellij/plugin/atoum/AtoumIconProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
import com.jetbrains.php.lang.psi.PhpFile;
import javax.swing.Icon;
import org.jetbrains.annotations.NotNull;
import pl.projectspace.idea.plugins.php.atoum.actions.Icons;
import pl.projectspace.idea.plugins.php.atoum.actions.Utils;

public class AtoumIconProvider extends IconProvider {

Expand Down
11 changes: 11 additions & 0 deletions src/org/atoum/intellij/plugin/atoum/Icons.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package org.atoum.intellij.plugin.atoum;

import com.intellij.openapi.util.IconLoader;

import javax.swing.*;

public class Icons {

public static final Icon ATOUM = IconLoader.getIcon("/org/atoum/intellij/plugin/atoum/icons/atoum_16_16.png");
public static final Icon ATOUM_FILE = IconLoader.getIcon("/org/atoum/intellij/plugin/atoum/icons/phpfile-atoum-icon.png");
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package pl.projectspace.idea.plugins.php.atoum.actions;
package org.atoum.intellij.plugin.atoum;

import com.google.common.collect.Lists;
import com.intellij.openapi.project.Project;
Expand Down
2 changes: 1 addition & 1 deletion src/org/atoum/intellij/plugin/atoum/actions/Run.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.atoum.intellij.plugin.atoum.model.RunnerConfiguration;
import org.atoum.intellij.plugin.atoum.run.Runner;
import org.jetbrains.annotations.Nullable;
import pl.projectspace.idea.plugins.php.atoum.actions.Utils;
import org.atoum.intellij.plugin.atoum.Utils;

public class Run extends AnAction {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package pl.projectspace.idea.plugins.php.atoum.actions;
package org.atoum.intellij.plugin.atoum.actions;

import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.project.Project;
import com.jetbrains.php.lang.psi.PhpFile;
import com.jetbrains.php.lang.psi.elements.PhpClass;
import org.jetbrains.annotations.Nullable;
import com.intellij.ide.actions.OpenFileAction;
import org.atoum.intellij.plugin.atoum.Utils;

public class AtoumSwitchContext extends AnAction {
public class SwitchContext extends AnAction {

@Override
public void update(AnActionEvent e) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package pl.projectspace.idea.plugins.php.atoum.actions;
package org.atoum.intellij.plugin.atoum.linemarker;

import com.intellij.codeInsight.daemon.LineMarkerInfo;
import com.intellij.codeInsight.daemon.LineMarkerProvider;
import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo;
import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.jetbrains.php.lang.psi.elements.PhpClass;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.atoum.intellij.plugin.atoum.Icons;
import org.atoum.intellij.plugin.atoum.Utils;

import java.util.Collection;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.intellij.openapi.project.Project;
import com.jetbrains.php.run.PhpRunConfigurationFactoryBase;
import org.jetbrains.annotations.NotNull;
import pl.projectspace.idea.plugins.php.atoum.actions.Icons;
import org.atoum.intellij.plugin.atoum.Icons;

import javax.swing.*;

Expand Down
2 changes: 1 addition & 1 deletion src/org/atoum/intellij/plugin/atoum/run/Runner.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.atoum.intellij.plugin.atoum.model.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import pl.projectspace.idea.plugins.php.atoum.actions.Icons;
import org.atoum.intellij.plugin.atoum.Icons;

import java.util.Arrays;

Expand Down
11 changes: 0 additions & 11 deletions src/pl/projectspace/idea/plugins/php/atoum/actions/Icons.java

This file was deleted.