Merge pull request #40 from agallou/fix_namespace

fix namespaces

Author: agallou

META-INF/plugin.xml

@@ -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>
@@ -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"/>

resources/pl/projectspace/idea/plugins/php/atoum/icons/atoum_16_16.png

@@ -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 {
 

resources/pl/projectspace/idea/plugins/php/atoum/icons/phpfile-atoum-icon.png

@@ -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");
+}

resources/pl/projectspace/idea/plugins/php/atoum/icons/[email protected]

@@ -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;

src/org/atoum/intellij/plugin/atoum/AtoumIconProvider.java

@@ -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 {
 

src/org/atoum/intellij/plugin/atoum/Icons.java

@@ -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) {

src/pl/projectspace/idea/plugins/php/atoum/actions/Utils.java renamed to src/org/atoum/intellij/plugin/atoum/Utils.java

@@ -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;

src/org/atoum/intellij/plugin/atoum/actions/Run.java

@@ -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.*;
 

src/pl/projectspace/idea/plugins/php/atoum/actions/AtoumSwitchContext.java renamed to src/org/atoum/intellij/plugin/atoum/actions/SwitchContext.java

@@ -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;