From 890ddca1c756584f8c7427105bc7857ea227a5c2 Mon Sep 17 00:00:00 2001
From: Adrien Gallou <adriengallou@gmail.com>
Date: Thu, 28 Jan 2016 23:49:01 +0100
Subject: [PATCH] fix namespaces

---
 META-INF/plugin.xml                              |   8 ++++----
 .../idea/plugins/php/atoum/icons/atoum_16_16.png | Bin 238 -> 0 bytes
 .../php/atoum/icons/phpfile-atoum-icon.png       | Bin 680 -> 0 bytes
 .../php/atoum/icons/phpfile-atoum-icon@2x.png    | Bin 1317 -> 0 bytes
 .../intellij/plugin/atoum/AtoumIconProvider.java |   2 --
 src/org/atoum/intellij/plugin/atoum/Icons.java   |  11 +++++++++++
 .../atoum/intellij/plugin/atoum}/Utils.java      |   2 +-
 .../atoum/intellij/plugin/atoum/actions/Run.java |   2 +-
 .../plugin/atoum/actions/SwitchContext.java}     |   5 +++--
 .../linemarker}/ClassLineMarkerProvider.java     |   5 +++--
 .../run/AtoumLocalRunConfigurationType.java      |   2 +-
 .../atoum/intellij/plugin/atoum/run/Runner.java  |   2 +-
 .../idea/plugins/php/atoum/actions/Icons.java    |  11 -----------
 13 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 resources/pl/projectspace/idea/plugins/php/atoum/icons/atoum_16_16.png
 delete mode 100644 resources/pl/projectspace/idea/plugins/php/atoum/icons/phpfile-atoum-icon.png
 delete mode 100644 resources/pl/projectspace/idea/plugins/php/atoum/icons/phpfile-atoum-icon@2x.png
 create mode 100644 src/org/atoum/intellij/plugin/atoum/Icons.java
 rename src/{pl/projectspace/idea/plugins/php/atoum/actions => org/atoum/intellij/plugin/atoum}/Utils.java (98%)
 rename src/{pl/projectspace/idea/plugins/php/atoum/actions/AtoumSwitchContext.java => org/atoum/intellij/plugin/atoum/actions/SwitchContext.java} (93%)
 rename src/{pl/projectspace/idea/plugins/php/atoum/actions => org/atoum/intellij/plugin/atoum/linemarker}/ClassLineMarkerProvider.java (93%)
 delete mode 100644 src/pl/projectspace/idea/plugins/php/atoum/actions/Icons.java

diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
index ee08a26..6455c36 100644
--- a/META-INF/plugin.xml
+++ b/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,8 +38,8 @@
 
   <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"/>
@@ -47,7 +47,7 @@
     </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"/>
diff --git a/resources/pl/projectspace/idea/plugins/php/atoum/icons/atoum_16_16.png b/resources/pl/projectspace/idea/plugins/php/atoum/icons/atoum_16_16.png
deleted file mode 100644
index fe007975c84b32bec4d4afbac21fd144c69e3cf7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 238
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDUjf#o_GE4UVJhWwt?ZoE?
zFMs+E1~-2Tu>d6)OM?7@862M7NCR<_yxm<GI#^{rfE>;OkH}&M2Dw8Z%$Rqf)D9@f
zUgGKN%Km^+fKNqg<KJJmfkOVCE{-7_*OL<tF!Ts`H8=_!5=apcV_|k?OH4kj5UOzS
zfQH7ZB_bLc3{%()54>_|6*<V`Hlc%odDD~ylZ1{KxQUB1cC6IX3wX`KI#HLM;a?7W
UAxGQ+AE40;p00i_>zopr0Oz1eN&o-=

diff --git a/resources/pl/projectspace/idea/plugins/php/atoum/icons/phpfile-atoum-icon.png b/resources/pl/projectspace/idea/plugins/php/atoum/icons/phpfile-atoum-icon.png
deleted file mode 100644
index b84227622649901cad734bc9ffbc1ef1b351ef73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 680
zcmV;Z0$2TsP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~kyFBP3H~7@Gh90yRlQ
zK~y-)g_GY)Q*ju^Ki_lGv1)53wi-EIHH-#Pm_;y6ktA3Q3JOvPhHGASl@bGk{)gST
zlansIsL(4fk__`o%P^ZO!tzvt7U-g;OvgDpU8u|2X3x!g@x0H&`%|!i_Ha0?xLhs@
zK~+`8$HxapMn<mw%L#xQx7#@3@u2B?L4#eg%)3N_J6&D(g2CYZ?VJSQu-nxZuNPla
zBP(k%^__jxclNQeCgW>rq{ZvSVYjP5NKusTyb6Frfk0p(9*@%<eadih9{?@;f8sw~
z{wNR#T=#f9*laccg2AB3Rks-zYtNi~GdA|(=zL<@^5yF<0Op-mfU;ODW(L-JqLC@U
z*b)!*r^J>4Ro3=X&Vv(J9S+>iCIGD32bvq&F5bQsNz1Z~K;9JIGyr_979r(^AqyJL
zU#6qYPcmhYOhHGRpJP>(sGmn!PR_CT{Vg-^2N8c{xfTF0n{;km3Gw>*FaY&uYiYjF
z!IQxd=juW%Ezgq8YJ5^hIa1w_Zvf!3R**^zAju`9)8D8luSN(N0UW3}j;^hfPXG9O
zjoY!XFoCILiEIA5NN6A+lUW5JnEm*S>6yn=9<Iw<BSZZuBc2$*Y_?J3zJ#u4C@tN?
z`uYkc(_SX09<tk9mgDk<D3CD>&~+`BkjbnfgxH7(bWI~$<XY*8Mqc*Dlu35LgWl+5
zPc-tX;2lW9RF~B;6h$$L85mg%NtkkN`&uoAROq>OKw(}{l>Z5f=KlukT+tyTBl+e4
O0000<MNUMnLSTYuPA{PV

diff --git a/resources/pl/projectspace/idea/plugins/php/atoum/icons/phpfile-atoum-icon@2x.png b/resources/pl/projectspace/idea/plugins/php/atoum/icons/phpfile-atoum-icon@2x.png
deleted file mode 100644
index 60367c559631b6a9c6d02203fbb1c72b6657addc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1317
zcmV+=1={+FP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~kyFBMyk)(M<pV1hPp)
zK~z}7?Urq9Q&kwpfA_YxTh|u4;h?CK0m4>e87NF-Q^pvK7me`)qI^NLjEIr9qC$uW
zCZH%f0=|XaXhIYwF43qsQ6riK2ysMa2W*T{0wlu5pnGXI@2elWk@32AUq}r9<mTR!
zbDrn<o##B~+#?W^0GI$}Wo4!y2qYrYH0iN13}anMNy++nZN(lRz>C1lM1unef<Q1B
zq^hb4Q54t7vb;7S06`EY0HweT`l;I5TFT4I357x?us&W0u{(uTcDvo>bULE|(P%WG
z2f*ocB8nm#H*VCsGa45}PrfggZrI>HR$t%sWkp4@X_{9Cbar-z<0*rZ`SVk~qeruR
z&6=<*%d3D-y8XZD_xs=K3&1SfvV{k-vN#e9B1sZ9n~fE#Ud5X;iKiE?X8-xvO!GV`
zd{g!|$7>Go!8`AvC<>~oGS=tgSbaSUmn{PjWLfqD+xvp(0a*S-aq%0T^z>AV)e3-3
zveKs67+vrT_fDEj-R0Q8>{K{+;15pxzS|sNRRl%V0MIp!mT(v;C57qJr(YMy@Au!Z
zx~<*s(jWHj9SjtDz200+(`amLWcwFCla@c3-%dfYsQ~b2)JEZy$qbP+!9TA^0}cSn
z@ZrOYva_?9eS_e)lC{_OYJfl>U}~C1AP^wZ(T=S}Lu+pZ*8l*t_7*x?1`_FL2WSI|
z05uc}5ekK<tgHk;mSr<hfF5l%3`0~^)t}^aC-47kJzxJ+$)X+A0PJ2^j5%W_;~t&b
zm+!6p0_ZqDYRRT;3s6-RL+!#h>v=AYoQkgK08Dv#Grp`0jHU*Fw4p;rD6hZrIip5A
zbjv_{cFtYWyFGiJOXz(PUXjb0hR>Ui#Uf#oBr<#>$;>Ul&@~KQBQv*v4Btp>l7uLV
z_`LbJoN4_%zpeuiJcBb?TJjMVi<Rnw`)D|N7C{G56cI%cL5GH;XQ@884^a?V{KESf
zdMlSMpY9jHwM$?EM53*@2c+}qwhfHGs4{KECOTUU0PGGZ|M)|ycfE_t;o`eJuc0Wh
zvufO!XUWc*#rHq1<nEz4C~AZ=XAj|a599GkOR?Ki`^*3Uj+B9HfB!EAx!qi7j&L}r
zP*WGCrY_9kpu&ab2!q^io-8V4MCL>$JiGva6OF&d>L}90iIcye>ncM%Ib6DQiX*|V
z;@$<Z4y(jtxw*8B8jEULFl_??P)!R{ixv?U8<3<V#*UebAXxajwt{H1<%+!|*~y!@
z7+qJX`1U0(G#yV2z%)&q4hL=j)Npdw@~is1<BQQ84kXEeAXosfSZwtEhe%Qif?&aF
zwIErO=;~@s44~&;pq@KSQgat6b|+2Eb!fUl^8F9e28g2Nrp2YIotUP9VQ6Ujza%BO
z5(DVT!mxWh6y)V&8V0A&+{JwvkB~QU9y@ne-m<z?HOirC8PhN@44uL0*@*)Pf`H5A
zp}qY)7h6u^a(T${&ABQ=H`C4R5&{4)4V`I)Yf+R)_qxUcKR0K`RpXwTT^g5N!T^RD
z+y6G3BcTH(UOSQ7tlJK7-NMMSy!o1&%*y^aj@QqPY9Me;du2Z-7ndJv95XTh*EMhl
b;Ew(SA@lM(E%2FQ00000NkvXXu0mjf;Qe8s

diff --git a/src/org/atoum/intellij/plugin/atoum/AtoumIconProvider.java b/src/org/atoum/intellij/plugin/atoum/AtoumIconProvider.java
index d580b57..3c15fca 100644
--- a/src/org/atoum/intellij/plugin/atoum/AtoumIconProvider.java
+++ b/src/org/atoum/intellij/plugin/atoum/AtoumIconProvider.java
@@ -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 {
 
diff --git a/src/org/atoum/intellij/plugin/atoum/Icons.java b/src/org/atoum/intellij/plugin/atoum/Icons.java
new file mode 100644
index 0000000..577a5ee
--- /dev/null
+++ b/src/org/atoum/intellij/plugin/atoum/Icons.java
@@ -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");
+}
diff --git a/src/pl/projectspace/idea/plugins/php/atoum/actions/Utils.java b/src/org/atoum/intellij/plugin/atoum/Utils.java
similarity index 98%
rename from src/pl/projectspace/idea/plugins/php/atoum/actions/Utils.java
rename to src/org/atoum/intellij/plugin/atoum/Utils.java
index 20e2be8..758d3cc 100644
--- a/src/pl/projectspace/idea/plugins/php/atoum/actions/Utils.java
+++ b/src/org/atoum/intellij/plugin/atoum/Utils.java
@@ -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;
diff --git a/src/org/atoum/intellij/plugin/atoum/actions/Run.java b/src/org/atoum/intellij/plugin/atoum/actions/Run.java
index e3aa89a..84439eb 100644
--- a/src/org/atoum/intellij/plugin/atoum/actions/Run.java
+++ b/src/org/atoum/intellij/plugin/atoum/actions/Run.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 {
 
diff --git a/src/pl/projectspace/idea/plugins/php/atoum/actions/AtoumSwitchContext.java b/src/org/atoum/intellij/plugin/atoum/actions/SwitchContext.java
similarity index 93%
rename from src/pl/projectspace/idea/plugins/php/atoum/actions/AtoumSwitchContext.java
rename to src/org/atoum/intellij/plugin/atoum/actions/SwitchContext.java
index 2d83391..f0324fd 100644
--- a/src/pl/projectspace/idea/plugins/php/atoum/actions/AtoumSwitchContext.java
+++ b/src/org/atoum/intellij/plugin/atoum/actions/SwitchContext.java
@@ -1,4 +1,4 @@
-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;
@@ -6,8 +6,9 @@
 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) {
diff --git a/src/pl/projectspace/idea/plugins/php/atoum/actions/ClassLineMarkerProvider.java b/src/org/atoum/intellij/plugin/atoum/linemarker/ClassLineMarkerProvider.java
similarity index 93%
rename from src/pl/projectspace/idea/plugins/php/atoum/actions/ClassLineMarkerProvider.java
rename to src/org/atoum/intellij/plugin/atoum/linemarker/ClassLineMarkerProvider.java
index bf07dd7..150360e 100644
--- a/src/pl/projectspace/idea/plugins/php/atoum/actions/ClassLineMarkerProvider.java
+++ b/src/org/atoum/intellij/plugin/atoum/linemarker/ClassLineMarkerProvider.java
@@ -1,7 +1,6 @@
-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;
@@ -9,6 +8,8 @@
 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;
diff --git a/src/org/atoum/intellij/plugin/atoum/run/AtoumLocalRunConfigurationType.java b/src/org/atoum/intellij/plugin/atoum/run/AtoumLocalRunConfigurationType.java
index fad2cba..324156a 100644
--- a/src/org/atoum/intellij/plugin/atoum/run/AtoumLocalRunConfigurationType.java
+++ b/src/org/atoum/intellij/plugin/atoum/run/AtoumLocalRunConfigurationType.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.*;
 
diff --git a/src/org/atoum/intellij/plugin/atoum/run/Runner.java b/src/org/atoum/intellij/plugin/atoum/run/Runner.java
index de8f0ae..5247187 100644
--- a/src/org/atoum/intellij/plugin/atoum/run/Runner.java
+++ b/src/org/atoum/intellij/plugin/atoum/run/Runner.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;
 
diff --git a/src/pl/projectspace/idea/plugins/php/atoum/actions/Icons.java b/src/pl/projectspace/idea/plugins/php/atoum/actions/Icons.java
deleted file mode 100644
index a07353f..0000000
--- a/src/pl/projectspace/idea/plugins/php/atoum/actions/Icons.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package pl.projectspace.idea.plugins.php.atoum.actions;
-
-import com.intellij.openapi.util.IconLoader;
-
-import javax.swing.*;
-
-public class Icons {
-
-    public static final Icon ATOUM = IconLoader.getIcon("/pl/projectspace/idea/plugins/php/atoum/icons/atoum_16_16.png");
-    public static final Icon ATOUM_FILE = IconLoader.getIcon("/pl/projectspace/idea/plugins/php/atoum/icons/phpfile-atoum-icon.png");
-}