From 5b3106a78d3954e9bbb1c2f47fba2abdc608e978 Mon Sep 17 00:00:00 2001
From: axelcl <axelcl>
Date: Tue, 14 Jun 2005 04:42:19 +0000
Subject: [PATCH] Created a separated 'externaltools' plugin
---
.../icons/externaltools/full/clcl16/activate.gif | Bin 138 -> 0 bytes
.../icons/externaltools/full/clcl16/add_co.gif | Bin 125 -> 0 bytes
.../icons/externaltools/full/clcl16/deactivate.gif | Bin 108 -> 0 bytes
.../icons/externaltools/full/clcl16/element.gif | Bin 140 -> 0 bytes
.../icons/externaltools/full/clcl16/elements.gif | Bin 232 -> 0 bytes
.../icons/externaltools/full/clcl16/error.gif | Bin 167 -> 0 bytes
.../externaltools/full/clcl16/gotoobj_tsk.gif | Bin 167 -> 0 bytes
.../icons/externaltools/full/clcl16/moveDown.gif | Bin 105 -> 0 bytes
.../icons/externaltools/full/clcl16/moveUp.gif | Bin 132 -> 0 bytes
.../icons/externaltools/full/clcl16/properties.gif | Bin 116 -> 0 bytes
.../icons/externaltools/full/clcl16/refresh.gif | Bin 182 -> 0 bytes
.../externaltools/full/clcl16/removeAll_co.gif | Bin 117 -> 0 bytes
.../icons/externaltools/full/clcl16/remove_co.gif | Bin 97 -> 0 bytes
.../icons/externaltools/full/clcl16/run_tool.gif | Bin 128 -> 0 bytes
.../icons/externaltools/full/clcl16/search.gif | Bin 153 -> 0 bytes
.../externaltools/full/ctool16/external_tools.gif | Bin 240 -> 0 bytes
.../externaltools/full/cview16/external_tools.gif | Bin 240 -> 0 bytes
.../full/cview16/log_console_view.gif | Bin 250 -> 0 bytes
.../icons/externaltools/full/dlcl16/copy_tool.gif | Bin 84 -> 0 bytes
.../icons/externaltools/full/dlcl16/del_tool.gif | Bin 91 -> 0 bytes
.../icons/externaltools/full/dlcl16/new_tool.gif | Bin 96 -> 0 bytes
.../icons/externaltools/full/dlcl16/paste_tool.gif | Bin 100 -> 0 bytes
.../icons/externaltools/full/dlcl16/prop_tool.gif | Bin 116 -> 0 bytes
.../icons/externaltools/full/dlcl16/refresh.gif | Bin 104 -> 0 bytes
.../externaltools/full/dlcl16/rename_tool.gif | Bin 90 -> 0 bytes
.../icons/externaltools/full/dlcl16/run_tool.gif | Bin 79 -> 0 bytes
.../externaltools/full/dlcl16/runwith_tool.gif | Bin 79 -> 0 bytes
.../externaltools/full/dtool16/external_tools.gif | Bin 96 -> 0 bytes
.../icons/externaltools/full/elcl16/copy_tool.gif | Bin 160 -> 0 bytes
.../icons/externaltools/full/elcl16/del_tool.gif | Bin 110 -> 0 bytes
.../icons/externaltools/full/elcl16/new_tool.gif | Bin 127 -> 0 bytes
.../icons/externaltools/full/elcl16/paste_tool.gif | Bin 139 -> 0 bytes
.../icons/externaltools/full/elcl16/prop_tool.gif | Bin 116 -> 0 bytes
.../icons/externaltools/full/elcl16/refresh.gif | Bin 144 -> 0 bytes
.../externaltools/full/elcl16/rename_tool.gif | Bin 158 -> 0 bytes
.../icons/externaltools/full/elcl16/run_tool.gif | Bin 97 -> 0 bytes
.../externaltools/full/elcl16/runwith_tool.gif | Bin 97 -> 0 bytes
.../externaltools/full/etool16/external_tools.gif | Bin 175 -> 0 bytes
.../externaltools/full/eview16/external_tools.gif | Bin 175 -> 0 bytes
.../full/eview16/log_console_view.gif | Bin 250 -> 0 bytes
.../icons/externaltools/full/obj16/builder.gif | Bin 157 -> 0 bytes
.../icons/externaltools/full/obj16/classpath.gif | Bin 171 -> 0 bytes
.../externaltools/full/obj16/external_tools.gif | Bin 240 -> 0 bytes
.../icons/externaltools/full/obj16/file_obj.gif | Bin 152 -> 0 bytes
.../full/obj16/invalid_build_tool.gif | Bin 159 -> 0 bytes
.../icons/externaltools/full/obj16/jar_l_obj.gif | Bin 259 -> 0 bytes
.../icons/externaltools/full/obj16/main_tab.gif | Bin 158 -> 0 bytes
.../icons/externaltools/full/obj16/options_tab.gif | Bin 108 -> 0 bytes
.../icons/externaltools/full/obj16/prop_ps.gif | Bin 116 -> 0 bytes
.../externaltools/full/obj16/ttype_program.gif | Bin 240 -> 0 bytes
.../icons/externaltools/full/obj16/type.gif | Bin 163 -> 0 bytes
net.sourceforge.phpeclipse/icons/obj16/apache.gif | Bin 157 -> 0 bytes
.../icons/obj16/apache_restart.gif | Bin 159 -> 0 bytes
.../icons/obj16/apache_stop.gif | Bin 154 -> 0 bytes
net.sourceforge.phpeclipse/icons/obj16/sql.gif | Bin 225 -> 0 bytes
.../icons/obj16/xampp_start.gif | Bin 1755 -> 0 bytes
.../icons/obj16/xampp_stop.gif | Bin 1713 -> 0 bytes
net.sourceforge.phpeclipse/plugin.xml | 218 ++------------
.../phpdt/internal/ui/util/PHPFileUtil.java | 2 -
.../phpdt/internal/ui/util/StringUtil.java | 34 --
.../phpeclipse/actions/ExternalPHPParser.java | 318 --------------------
.../phpeclipse/actions/PHPDocumentorAction.java | 104 -------
.../actions/PHPExternalParserAction.java | 89 ------
.../actions/PHPOpenSQLTableEditorAction.java | 316 -------------------
.../phpeclipse/actions/PHPRestartApacheAction.java | 29 --
.../phpeclipse/actions/PHPStartApacheAction.java | 94 ------
.../phpeclipse/actions/PHPStartMySQLAction.java | 29 --
.../phpeclipse/actions/PHPStartXAMPPAction.java | 90 ------
.../phpeclipse/actions/PHPStopApacheAction.java | 29 --
.../phpeclipse/actions/PHPStopXAMPPAction.java | 90 ------
.../phpeclipse/phpeditor/PHPParserAction.java | 126 --------
.../phpeditor/php/PHPCompletionProcessor.java | 150 +++++-----
.../PHPEclipseParserPreferencePage.java | 109 -------
73 files changed, 104 insertions(+), 1723 deletions(-)
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/activate.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/add_co.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/deactivate.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/element.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/elements.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/error.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/gotoobj_tsk.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/moveDown.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/moveUp.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/properties.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/refresh.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/removeAll_co.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/remove_co.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/run_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/search.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/ctool16/external_tools.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/cview16/external_tools.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/cview16/log_console_view.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/copy_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/del_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/new_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/paste_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/prop_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/refresh.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/rename_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/run_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/runwith_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/dtool16/external_tools.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/copy_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/del_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/new_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/paste_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/prop_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/refresh.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/rename_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/run_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/runwith_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/etool16/external_tools.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/eview16/external_tools.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/eview16/log_console_view.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/obj16/builder.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/obj16/classpath.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/obj16/external_tools.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/obj16/file_obj.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/obj16/invalid_build_tool.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/obj16/jar_l_obj.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/obj16/main_tab.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/obj16/options_tab.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/obj16/prop_ps.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/obj16/ttype_program.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/externaltools/full/obj16/type.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/obj16/apache.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/obj16/apache_restart.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/obj16/apache_stop.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/obj16/sql.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/obj16/xampp_start.gif
delete mode 100644 net.sourceforge.phpeclipse/icons/obj16/xampp_stop.gif
delete mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/StringUtil.java
delete mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/ExternalPHPParser.java
delete mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPDocumentorAction.java
delete mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPExternalParserAction.java
delete mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPOpenSQLTableEditorAction.java
delete mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPRestartApacheAction.java
delete mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartApacheAction.java
delete mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartMySQLAction.java
delete mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartXAMPPAction.java
delete mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStopApacheAction.java
delete mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStopXAMPPAction.java
delete mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
delete mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPEclipseParserPreferencePage.java
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/activate.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/activate.gif
deleted file mode 100644
index 7a1511dd8e0da3fca9c8daf75e6334e6284f8c80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 138
zcmZ?wbhEHb6krfw*v!E2|G#~Gz5W0H_5c6R|9{{9{(SrTcpw)97_b4wpDc_F3>*wP
zAW4uJ3@qjXCp}m1wa6AR<DGk4HZip!!(hTRMxKH_(<V9Iv0&h6b(Cyf@Zp-VWS@sq
SA@i5YKBX38ucIyu4Aub7oh^C*
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/add_co.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/add_co.gif
deleted file mode 100644
index dad7260880de1fef7808e1a914d07208127b5b6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 125
zcmV-@0D}KVNk%w1VGsZi0HOc@|NmeA|9}7AKmWf!zn@?KpFh8UKmY&#A^8LW000L7
zEC2ui01yBW0009*c)HyFj}X%&U4sNOu;z+X07iL;q^SXbAW&=j9;NY`^?eOCsPM1O
fqIR0lOpnY)2tg5>0ha6X$UPxIA4GB8dJ_OU>C!b3
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/deactivate.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/deactivate.gif
deleted file mode 100644
index 740419b4a18ab0cf162c701caf8635acfdf36a49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 108
zcmZ?wbhEHb6krfwSj52a|G#~Gz5W0H^Z(zszdzr;J|4&h0mYvzj0_Cy3_1)z08-1q
zY*?}D&Od`w3Xu!GvNSIj43`i&t2So^!vt@~6$cc~=XjrRS$F+gz#oTsz7juEqmDl@
IWMr@g0CDgwHUIzs
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/element.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/element.gif
deleted file mode 100644
index 06d007905b264182beffbb389d5b836f58f0a74d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 140
zcmZ?wbhEHb6krfw*!-X2z<~qy_VEiAEU}NTx38aXKYzdd{{8j)_us$2|NsC0`}gl>
zKn03FSr|bgIv@gMh69VGzzNT6-=kBUJUp&V=}GpOxO8P3XOhgV1r1?~c<yfC`10z%
eL$G)749<9$Lkr4p6-<$Ts4MV*b^SsP25SIVVl>VG
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/elements.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/elements.gif
deleted file mode 100644
index 76b351e0452b676339ec1f56e7d3b27e1ceb0129..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 232
zcmZ?wbhEHb6krfwIKlt~4fgi??d{|3<M-Rg&$qANZ$E!OLqmi8ejsE1{Qdjy-{1fL
z_lN)g{{wjq4Gr<}@jy06A8|nOCkrD3gCK(rNIA$(2G-OBmA({Bri@j~nml;U81lHz
zz2hmp)@GG`?}CCG5e_a63zL=!NKHJ<cu1f?PWj}60|qPD=HFPTB#=?J{=m}%Yr+~D
qgI1MERhVy!)!p8g*K^vjJ}-m2wXMB1oKK*qx37m^ZIX&2gEatS<W3a;
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/error.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/error.gif
deleted file mode 100644
index c2bfdd606b59240410feb5ce0f1dc8ec7c7f35e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 167
zcmZ?wbhEHb6krfw*v!E2zux{wgvI}O`yUn-_wDWX+uP5uu&B4U|G$6#{QCO;V8DO`
z6o0ZXGB9v6=zzpPW-zdX6rA*2y|-fNA@5U175H2dV-y!~I4+nGYQ(^>h=(hvE?DY;
zrO+Dl1V-1T%&K2D-)-?qI$*Y7n%`s=Msp_xpFN$84tlc}i8{9@J46e;ZC0GK^0uZR
GgEaspw>pUc
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/gotoobj_tsk.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/gotoobj_tsk.gif
deleted file mode 100644
index 082e49fbe666f9bb0fed3b66dbe70d17c1e805be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 167
zcmZ?wbhEHb6krfw*v!DNV8N3A|LyDR?f?I;|Nnpf|NHj$=iArE1G)bX95^t4{(J@o
z1|S<qLV)5=7DfgJ9tIr{7i0zlOUQ(io~uJGvO_2SS1{*fm^3G&sbi8ulcK7^`^;5c
ztA$HAwObZU_#Pz@-kM@0AR)nLJ}1%2*UtOc(N_naimlrq`jlbY%?O@#`aO12f;0?O
MWfteW6J)Rk0NK4jvj6}9
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/moveDown.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/moveDown.gif
deleted file mode 100644
index 8392f3345c5604c94541efb92e1b3704eb1d2fbd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 105
zcmZ?wbhEHb6krfwSj52a|G#~Gz5W0H^Z(zszdzr;J|4&h0mYvzj0_Cy3_1)z08-1q
ztXHw?&cA@EmW#O(CM5X_NTt^%y635N*f~}QDG5t7O_-`PckKn84-*+K2)&l*=VY)3
E0GlZ&O8@`>
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/moveUp.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/moveUp.gif
deleted file mode 100644
index 9b278e6fa81e0c65af60510fdcd9e6212432c53b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 132
zcmZ?wbhEHb6krfw*v!E2|G#~Gz5W0H_5c6R|9{{9{(SrTcpw)97_b4wpDc_F3>*wP
zAW4uJ3@nBMCp}m1oiQuM`KFAJ%%S7G%nmceX9;P0u$CAcaqGKTcw+O+`8nmx??R4w
N=SgN+2?{b;0|4zHEKL9a
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/properties.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/properties.gif
deleted file mode 100644
index ec0cba1aad910c9e7c40b3fde1fab65e8078cd53..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 116
zcmZ?wbhEHb6krfwSj52a|NsB}`}a3AG{ncp1KA8Pp!k!8k%57QK?fuNQp><>>9On1
zKi?kD*CJUhy4$`xr}YN2%{jPomEywM57+pzc5RB3IsdhHx0M9{Q|q%$^A!&~%l7mT
L<zbn`z+epkD2gh4
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/refresh.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/refresh.gif
deleted file mode 100644
index a063c230aca909c805f6a97a93c524c89198cc6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 182
zcmZ?wbhEHb6krfw*v!E2|G#~Gz5V?8@&EtNpFh8T|Ni;^@7vF>x4%E%zCPam|NsB{
zfkN}=0~ripp!k!8k%57iK?lSGnZdx4yy2uL^Ir3ap5|M3p71&;7@R&L;67QxL54l!
zu*}gfQtm|zTcZ0WIjBgri1Vs5s`jxmIW;RhF|qP|cz{DfsHKg4$<s1M+k+2`ZyHH;
dZ|3=sE5niR8S}vSinEnlgNu7}WP>1sH2{nEMt%SQ
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/removeAll_co.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/removeAll_co.gif
deleted file mode 100644
index 2c069ab3f436fd881cf865d804334c046b01ea8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 117
zcmZ?wbhEHb6krfwSj50!Zy#?TUvD{UZ}qOdQL$0~|NmzI1I3>#j0_B{3_2hlNG$`i
zRm844{|vl5oAyrMVzBG`0X3dvPo~CYEKaX?9T3oBNw{yWxFGA`zV$cO1RQ=?a#+;h
QhK5w`-p&#!PX-2S0EeR~4gdfE
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/remove_co.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/remove_co.gif
deleted file mode 100644
index 12a9167c59da498127a6cf382a9b95d4db744c2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 97
zcmZ?wbhEHb6krfwSj50!Zy#?TUvD{UZ}qOdQL$0~|NmzI1I3>#j0_B{3_2hlNG$`i
vTEwn9{|rufYO5$_`$kD5NHEPanDN5XsPVzR_qzlfa&OOF`o1P!g~1vCV?ZBe
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/run_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/run_tool.gif
deleted file mode 100644
index 2088548a49976e78327ba108045cd744910b045f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 128
zcmZ?wbhEHb6krfw*v!CSZy!4ifB2K)W?_Va-}`vZ3l?BBot|Ns9C*nr|s7DfgJ
z4h9{NB*+W~7F~gpo~!p-yzXr=h%x72St07|HA{Tfs?^`-jwbG0AHcF{SGtC*KeGUj
L^9dCrCI)K&>p~<h
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/search.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/clcl16/search.gif
deleted file mode 100644
index 6dc3ebefc928e708a5b735b99c84498d7cf09b49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 153
zcmZ?wbhEHb6krfw*v!CSZy!IEXCKG@gKpTB?q|NlT@{{Q>+|9^k@e}De}|Nj{n
z7$78&0R)OaSr{1@co=j*9FQ3dEN&A{damA^lVE-1*5w8bIgLq&%a<;mki^`mv+k5&
ym(guegCkZ<{Y4fmNn1}Z3^4fDHtFdK&IY3;R;xA{I4KCVz4c&co2f3yU=09-x;`ra
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/ctool16/external_tools.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/ctool16/external_tools.gif
deleted file mode 100644
index 2133b4582a8da9cab60d1c0acce1d6c3c4034fa7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 240
zcmZ?wbhEHb6krfwIP#z2zkU4w`TGwXIKaTrU~eBEA74Lz{(k%V{R|Ba2ksnbXkfU1
zfB%1=90S9Bd;9(N_V?rC@7LGw-@kwU{P_()X+l8pCkrD30~3P|NFm5h2G-mK3VJG<
z^HvxLvOe^Cxih5O=lI3N@2jVnF*-0aB$!BW9(_=-%0#Oz{cwOMkJi-7&59`%!U?Am
z7U&wuq;rZ@OF2k=_>p38JV<NGj2Ce;I|Qq8BMcgwM420^>NrZ0A`Q#K`;)5rHHup`
JOF0x7tO1FyP*MN@
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/cview16/external_tools.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/cview16/external_tools.gif
deleted file mode 100644
index 2133b4582a8da9cab60d1c0acce1d6c3c4034fa7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 240
zcmZ?wbhEHb6krfwIP#z2zkU4w`TGwXIKaTrU~eBEA74Lz{(k%V{R|Ba2ksnbXkfU1
zfB%1=90S9Bd;9(N_V?rC@7LGw-@kwU{P_()X+l8pCkrD30~3P|NFm5h2G-mK3VJG<
z^HvxLvOe^Cxih5O=lI3N@2jVnF*-0aB$!BW9(_=-%0#Oz{cwOMkJi-7&59`%!U?Am
z7U&wuq;rZ@OF2k=_>p38JV<NGj2Ce;I|Qq8BMcgwM420^>NrZ0A`Q#K`;)5rHHup`
JOF0x7tO1FyP*MN@
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/cview16/log_console_view.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/cview16/log_console_view.gif
deleted file mode 100644
index 3200ac39357b3c3b094dfdfc6c3c63a4d61b4f90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 250
zcmZ?wbhEHb6krfwIP#z2zkU4w`TGwXIACudA0J;ofByaj3zqEPKmY#y{r~UV|7T!m
zU|_g!Z@=H({(gM?{rdX<|NjFO?+2=wKfj@&0jP%oFHro+!pOkD#GnIG1+tTYwR}NA
zPfBK&fJx*LgNWc+avDjlMJb9#wKlyA0$$AM6k|NV#1Nn(($o4eVWrrrY1yT>0vL3-
zyi$FZ{gCo)U8H2VgLhKb`Hd^|wb<4iRd7G4P$9+{T4Pt=P#Mu$XOxp)P|MyfQWcuk
WQ(q`16s$H+g=yiU#Y>nJ8LR<RGg-y}
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/copy_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/copy_tool.gif
deleted file mode 100644
index c7a98e8526fa186db91cfc3cc9bb46121fd9215e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 84
zcmZ?wbhEHb6krfwXkcKNKY#xJ|Nj+#vM@3*Ff!;c00Bsbfl0fkKl1=@m0Xg+iKiJ`
mbTh3h6<!qhSN5LDoTn=3r1NXj>@|~0e|P@db;^Q^!5RQVyB-k$
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/del_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/del_tool.gif
deleted file mode 100644
index a6bfcfd98d7d8a3b592fac81eb992431979de093..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 91
zcmZ?wbhEHb6krfwn8?7efB*jZ^XLEn|DS<@LGdRGBLf2ygAR}llobH7b*A*MJiS+-
up)tr&FhAsBOI|}q1gH4)Ibu6?AAPBEUwP`8`qg`qM<2iE;NoXxum%7>t{^o4
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/new_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/new_tool.gif
deleted file mode 100644
index 813cb2f7bfab10d0dedda811ca5fbdbd85eae111..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 96
zcmZ?wbhEHb6krfwn8?7efB*jZ^XLEn|DS<@LGdRGBLf2ygAR}llobH74X5<4-2Lz+
y6O&PcbF1mQOS@{NOq3RUFKOBlHhp5Q`;w*Sh4%NHGJ7Jo%dm)N@`eteR%-wY%_9W>
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/paste_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/paste_tool.gif
deleted file mode 100644
index 0dd5d216d9bd3351a5646a9b58a388740cd88b6d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 100
zcmZ?wbhEHb6krfwn8?7efB*jZ^XLEn|DS<@LGdRGBLf2ygAR}llobH7O{ee*7To1r
z;JoVA)uxDz*|ixbk2bVf=FTi$xI${yd-vwgDVw8N?_0^-(yZD)H6i8T(iU+?Mh0sD
Dl*%OH
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/prop_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/prop_tool.gif
deleted file mode 100644
index eb165ffcadbcfc1e5bb2f8a762fd289b1d25171c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 116
zcmZ?wbhEHb6krfwSj52a|NsB}`}fbEKfj@&0mx>60mYvzj0_Ac3_2hIkXi<2OOIW5
z{`vNJz81-9(cSjlIjuLCZO*}!s}vX3ez?Y$wQEzP%=xdqyR9VnpIV=7ny+}^S+=K#
LC=bgd1_o;YZ(%Du
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/refresh.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/refresh.gif
deleted file mode 100644
index b2281b40cc6021d69a9c5d0e0d4097e9e3f67463..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 104
zcmZ?wbhEHb6krfwn8?7efB*jZ^XLEn|DS<@LGdRGBLf2ygAR}llobH7EvNK1?p}E2
zO7n9|cD{n7R}*q)CKfKZQF7>7V#-p6+p62A8hX#%((&f&p~kSoQ@lAs0`umnrq65;
IV_>ib0D3tm>i_@%
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/rename_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/rename_tool.gif
deleted file mode 100644
index 99f30921c7b4caa70fbcaade63894ec27dab0180..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 90
zcmZ?wbhEHb6krfwn8?7efB*jZ^XLEn|DS<@LGdRGBLf2ygAR}llobH7wWsv26l2^Q
t(vf|tZL^qJ>9N+!Cn8nUnl8-jTJmbz!Y5O2@w&>he(IV0S(l5!8UQXsAh-Yk
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/run_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/run_tool.gif
deleted file mode 100644
index a281bc1196dad271034a1edd6e612ad8c285529f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 79
zcmZ?wbhEHb6krfwn8?7efB*jZ^XLEn|DS<@LGdRGBLf2ygAR}llobH76{hsBJpESR
hiNWC5&qEWZWFFCtZ<?5rDYdY?^la48q8J7SYXIen8vp<R
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/runwith_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/dlcl16/runwith_tool.gif
deleted file mode 100644
index a281bc1196dad271034a1edd6e612ad8c285529f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 79
zcmZ?wbhEHb6krfwn8?7efB*jZ^XLEn|DS<@LGdRGBLf2ygAR}llobH76{hsBJpESR
hiNWC5&qEWZWFFCtZ<?5rDYdY?^la48q8J7SYXIen8vp<R
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/dtool16/external_tools.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/dtool16/external_tools.gif
deleted file mode 100644
index fae592db869f44d2c9d2e5c5435318b16a52f52c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 96
zcmZ?wbhEHb6krfwnE0RJz<~q%_wS!Se?9{PgW^vXMj*wY10q233`~YC{gsDwcU=lz
xXT<3%p!n>W<877+$15bKHRsJe!IHP^*q2Lty595|aNKb4ky6SP(O_V(1^^CxA@TqK
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/copy_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/copy_tool.gif
deleted file mode 100644
index 41bf445a98ef6895216de294eb9c0b2976d03aca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 160
zcmZ?wbhEHb6krfw*v!Ci|Nj2}|NkF2aA5!b{qyI~Z)j+!udk1fj|U1eU;~OjSr{1@
zI2d$5k{~k}SbPOedal;75V!XJAzxU~!JZ}gRPso|yvM9;@1Gydp3VQ|;q=W?90s?Z
ta;#+#teC~y%{WcF%SSK!(D~2<qB3h;?=wEWaxCQTmrX$eyK4m*tO0dQIu!r_
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/del_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/del_tool.gif
deleted file mode 100644
index 34643b8b65e305ec15b7dc207664af5d5469a414..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 110
zcmZ?wbhEHb6krfwSj51vfB*jZ^XE4-G{ncp|NsA=0R|L*vM@3*urTO=1VCyTn2kMl
z-T7x=XV9?d+QoqKQfCFeha6oiG<f_w*Iigvmn(H(`L9jBJNcTV*S9nCIrc10IqAc|
GU=09#LnSi+
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/new_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/new_tool.gif
deleted file mode 100644
index 234594a0de7b79a96edb14086b9dd0f8c1b5d8d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 127
zcmZ?wbhEHb6krfwSj50^|Nj2}|NrmbzkmMx`3(&XKsEyyDE?$&WME)r&;jv4Y8jYa
zB6i*Rmw!Tyomp96!-i+ADlANiol7Ly7#|2_|88q(Sm|6F&AK6XuDr)YYu_#begPq=
Z9<Mzdr=KQ2%kfy2e>x^*_gxkSYXFH$F600J
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/paste_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/paste_tool.gif
deleted file mode 100644
index 6e761529a97bf000e7689556be0c9a171475f6ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 139
zcmZ?wbhEHb6krfwSj52a|Ns932M+AtzkmMx`3(&X_4W1f@$o=G#h)yU3=HfHIt)Mn
zQp>;`P_Zh-P5YSGp~+c0&YtaP6XkiLAeC^Tq-APYL66=-pF8Kcg&p|sY?;9oAi-eP
rb?e;o*_zsWoG!i)`84DBlBpJF<>ooR@!2dX!1Ce?&*oP$LJZabhN3!0
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/prop_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/prop_tool.gif
deleted file mode 100644
index eb165ffcadbcfc1e5bb2f8a762fd289b1d25171c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 116
zcmZ?wbhEHb6krfwSj52a|NsB}`}fbEKfj@&0mx>60mYvzj0_Ac3_2hIkXi<2OOIW5
z{`vNJz81-9(cSjlIjuLCZO*}!s}vX3ez?Y$wQEzP%=xdqyR9VnpIV=7ny+}^S+=K#
LC=bgd1_o;YZ(%Du
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/refresh.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/refresh.gif
deleted file mode 100644
index 919423d435727bf8525c777e1957a3606e413047..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 144
zcmZ?wbhEHb6krfwSj51vV8N3A|NrmbzkmMx`3(&X_4W1f@$o<r#h)yU3=HfHIt)Mn
zQp>;`TCpqU&w2|E?-?aG4NgfMQsOz1$l*AvN>NfP-9h5WSHbs1QpXc+Sg;;DAkC=4
waKUj=FbBunhQtkfZ05<I&e<U3$iKMP>p=4}w|!EUhi`1Wy{CNgTm}Yf0Og}O-v9sr
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/rename_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/rename_tool.gif
deleted file mode 100644
index 8337ba9a731362b92b8ccac296ec2c85c2d468a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 158
zcmZ?wbhEHb6krfw*v!CSZy$gE{{H{}{~tJTVE_L8^XJd6udk1fk7r<D015(0G@$sC
zg^_`QlR*b04l;v*#oOSd=jy2srZBH_y~i5mmO1T2rc9?GkBg%C%ac;g2^_8SxORnh
vGd%g}Wp!}v_Uvnuydy7tXx<j0arNziw{ik;c^M*$CY+w>yIiJ=fx#L8)r>i&
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/run_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/run_tool.gif
deleted file mode 100644
index 053738cf6b36cd3a7d303776923fd5ddf758b13d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 97
zcmZ?wbhEHb6krfwSj50!Zy&#Z|Ni;&=QlJo#K*_~|Nox>3>1H|FfuT(GU$MKAhit4
vY7x8c{4+Qe$-%jW%V>j&(}_xciLThnb<>mQO<T~Fz;aADAid_kI)gO;w$2}F
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/runwith_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/elcl16/runwith_tool.gif
deleted file mode 100644
index 053738cf6b36cd3a7d303776923fd5ddf758b13d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 97
zcmZ?wbhEHb6krfwSj50!Zy&#Z|Ni;&=QlJo#K*_~|Nox>3>1H|FfuT(GU$MKAhit4
vY7x8c{4+Qe$-%jW%V>j&(}_xciLThnb<>mQO<T~Fz;aADAid_kI)gO;w$2}F
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/etool16/external_tools.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/etool16/external_tools.gif
deleted file mode 100644
index f7472c98555c4e3083663e52246916ed9ae6c0b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 175
zcmZ?wbhEHb6krfw*!-X2z<~n`7A!e%=fM5@`{V8H_wV07fByW2hKBn3`uO;G1`MG1
zlZ6o^r~@KEW-zeC2%K<Sxko}`Qiu6XQ;lYiHn&CVv^xZkI?Av+DI8j;Fx^R`QC@L@
zfJWbR7N@ohu6b6jo37=E^?7tUJ$or7a)0qVfk`gBR&kNlC2McGo33K(o3=PIHgeX_
KeZLC@8LR<ji#^x?
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/eview16/external_tools.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/eview16/external_tools.gif
deleted file mode 100644
index f7472c98555c4e3083663e52246916ed9ae6c0b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 175
zcmZ?wbhEHb6krfw*!-X2z<~n`7A!e%=fM5@`{V8H_wV07fByW2hKBn3`uO;G1`MG1
zlZ6o^r~@KEW-zeC2%K<Sxko}`Qiu6XQ;lYiHn&CVv^xZkI?Av+DI8j;Fx^R`QC@L@
zfJWbR7N@ohu6b6jo37=E^?7tUJ$or7a)0qVfk`gBR&kNlC2McGo33K(o3=PIHgeX_
KeZLC@8LR<ji#^x?
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/eview16/log_console_view.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/eview16/log_console_view.gif
deleted file mode 100644
index 3f6fff3cbbb6536a2a23ee424e51270b3ed84a05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 250
zcmZ?wbhEHb6krfwIP#z2z<~q*|NnpZ@ZsINcY*Bv`}gnNyLZo?Jqs5uT(Drl{Q2`|
z&z{}e+uPOE)zs9~(9lp*Q<ImMmzbCsA0O}N=xAqW$AA|o{$ybUDbN8CAUhdY%M}uO
zQZl<77eolTMtaSXdXXS#l*nt8t21#yz>OK5TI_DE2Ma=ECUjj)SgEvXT6U>ap@B}{
z@f4rBA4<OM$w3}Fgj+k;2d)fP<6NVv=zfx^LX0W2#;(4hGNQH4C?~(5maUz?Dm1O9
WzEF%cSZ$sP!@@<2moO+YSOWkj##*`n
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/builder.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/builder.gif
deleted file mode 100644
index 20e7baed143d3176e99c0e0602aead85133b37eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 157
zcmZ?wbhEHb6krfw*vtR~4fgf(85$bm=g+@?fB*mc^Z)<<zkmP!2B1iMJdh1if&>(Q
zvM@3*a53nB#6V^+uy_TW^nC4N5#81G^M;yYn}LL<)}(lCttFNMj0`MX2ez^?)>z$L
tYBJ+5&%xN!>}Lx3E;KJHD~=0Vb=}S5XlIN2!!V(`#@X?n;ew0|)&Q<|Hv<3w
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/classpath.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/classpath.gif
deleted file mode 100644
index f966fc39d9b2531c732fd3025c47fe6a9e5f37d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 171
zcmZ?wbhEHb6krfw*vtR~4fgT#?d#|7-(P?K{{H{><M+?EpI>jke}4S^`S$zk?d#+1
z=f~T}+uQ&D{~xGY@h1x-0|Os}4oEA=3<j2n3nx8Sm$n%eYkQw8N}cmr^|)b$m-1Zq
z!VNwG5(zZ|BA2<CB%H4OW_9d-nDZ!`!Jk|9eQJx)lrvhF7M`~1S6r8Kt0r%~%Vaa1
WI4LQ1h6fuWrU<aRq{}lhSOWmqNI(++
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/external_tools.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/external_tools.gif
deleted file mode 100644
index 2133b4582a8da9cab60d1c0acce1d6c3c4034fa7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 240
zcmZ?wbhEHb6krfwIP#z2zkU4w`TGwXIKaTrU~eBEA74Lz{(k%V{R|Ba2ksnbXkfU1
zfB%1=90S9Bd;9(N_V?rC@7LGw-@kwU{P_()X+l8pCkrD30~3P|NFm5h2G-mK3VJG<
z^HvxLvOe^Cxih5O=lI3N@2jVnF*-0aB$!BW9(_=-%0#Oz{cwOMkJi-7&59`%!U?Am
z7U&wuq;rZ@OF2k=_>p38JV<NGj2Ce;I|Qq8BMcgwM420^>NrZ0A`Q#K`;)5rHHup`
JOF0x7tO1FyP*MN@
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/file_obj.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/file_obj.gif
deleted file mode 100644
index 6b86d079780c2b7ec903f8d74607748e933632a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 152
zcmZ?wbhEHb6krfw*v!Dd(9jS+fByXa`|sc1|Ns8{|Ns9VIB=i=C>S3PWCP{VfZ|UU
zMg|5>1|5(%$P5M+SA&zD+O`(S+WeXd6$*C*+vFl=ItXwa?N~9nvW@w!=-S_6JFoIC
o_uf#m|3NB8(6tJW8O6uvNX<O(=-`33Wm`9I*l}W`3j>2S00V0|RR910
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/invalid_build_tool.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/invalid_build_tool.gif
deleted file mode 100644
index b04020bc723a345d97f68c485286138159294b51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 159
zcmZ?wbhEHb6krfw*v!E2zux{wgvI}O`yUn-_wDWX+uP5uu&B4U|G$6#{QCO;V8DO`
z6o0ZXGB9v6=zzpPW-ze$6rA*2z1QM-NY$mI3PP=oty~H$UYV-Q4I0f&6XZpi*4R!^
xyPL3d!C$U+FAW1@CT-3`IR?znG}u@ZyB#DZi90X<d{t#%+v>ElaV`uD)&M;ZHrxOJ
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/jar_l_obj.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/jar_l_obj.gif
deleted file mode 100644
index 11e04e21bc641147f8e76fd857cbd3c4ead74c16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 259
zcmZ?wbhEHb6krfwIKlt~4fgT#?d$h1IPqcr{QCX-=ij)o<Np2q|L@1|pKt&F_lNoQ
z_WS3@-=A;4zuvw+9>}hrA8%i8Zy#@O|NsC0{Xh-#=QlJo#K*@2xghgUf#OdVMg|5+
z1|5(v$W8{<hJ-NNK+U-kQ`f#>mSkfQbZOa`yV6}_pWKYj0t?F@TGJbgR&J4qJjs~q
zb@kz-D=wWvnKoiQqGeKrK0D%$IO(X)X1>e%C{d>PY?Foa+>O)KE8~jzYjevRV&jY1
r#aY?ex#}BBs=39)#l%D>bxQIVONvQoI&m{_^SAIM*sZlwWUvMR&n91;
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/main_tab.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/main_tab.gif
deleted file mode 100644
index f9fb6b0cabf363fe7a2db9c4986a151e85e5a297..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 158
zcmZ?wbhEHb6krfw*vtR~4fgi&_VN4e<LBGg?`LReu%ADF{(c~sfB*je|Gz){|NkGz
zX=rGOkB<kk6@RiYGBEHn=zz3>%wS;g{&3QB^<J?TXG>=^FA!;RnB(@#GnRXe|KT$w
zXDxy^zp0u3K<KWbtBHu%{+RqumSbXvuS}fIV^r&Rw=}$0ao+<2rPms>&!_fO<#sYK
GSOWkQuSGEc
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/options_tab.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/options_tab.gif
deleted file mode 100644
index 8670a384bd36f59f518211ebd6c6bdb1d4e69e7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 108
zcmZ?wbhEHb6krfwSj51vfB*jZ^XJFM$1^Z6{Qv(SNJ4<(PZmZ71{MY#5ErDDf!WYw
z*PVX`n+$Go^gXJay+YQNrzteZ;d`&Mx7MspM*6Fo-bpp7Zr9z|*70q!ME{8=%8U%w
E0J$b3w*UYD
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/prop_ps.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/prop_ps.gif
deleted file mode 100644
index ec0cba1aad910c9e7c40b3fde1fab65e8078cd53..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 116
zcmZ?wbhEHb6krfwSj52a|NsB}`}a3AG{ncp1KA8Pp!k!8k%57QK?fuNQp><>>9On1
zKi?kD*CJUhy4$`xr}YN2%{jPomEywM57+pzc5RB3IsdhHx0M9{Q|q%$^A!&~%l7mT
L<zbn`z+epkD2gh4
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/ttype_program.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/ttype_program.gif
deleted file mode 100644
index 2133b4582a8da9cab60d1c0acce1d6c3c4034fa7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 240
zcmZ?wbhEHb6krfwIP#z2zkU4w`TGwXIKaTrU~eBEA74Lz{(k%V{R|Ba2ksnbXkfU1
zfB%1=90S9Bd;9(N_V?rC@7LGw-@kwU{P_()X+l8pCkrD30~3P|NFm5h2G-mK3VJG<
z^HvxLvOe^Cxih5O=lI3N@2jVnF*-0aB$!BW9(_=-%0#Oz{cwOMkJi-7&59`%!U?Am
z7U&wuq;rZ@OF2k=_>p38JV<NGj2Ce;I|Qq8BMcgwM420^>NrZ0A`Q#K`;)5rHHup`
JOF0x7tO1FyP*MN@
diff --git a/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/type.gif b/net.sourceforge.phpeclipse/icons/externaltools/full/obj16/type.gif
deleted file mode 100644
index 2db76045e86fc1fc21ca61494fd9268e57ca7244..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 163
zcmZ?wbhEHb6krfw*!-X2z<~qy^Xu*F<Lmd&x1VosA8)_^{{H&?@&Et-XTSy&f3h%w
z#C1Rf$P5P-cYzb0uSHrUL^i3jw${!M=v7giA+}-P+X@9XLj}3lX~nhat0NLuWJ@M%
uBm^osTktysrd?KSoe}K!s!R3EJjr*eni@L&Q#lx{Z?3rdkVlP)!5RQFRx|<t
diff --git a/net.sourceforge.phpeclipse/icons/obj16/apache.gif b/net.sourceforge.phpeclipse/icons/obj16/apache.gif
deleted file mode 100644
index 312055f2067f93b4e7dd06e9e02e75789b9536c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 157
zcmZ?wbhEHb6krfwc+9~71`Q1iAo!mFi2gS;H2eorIDq0$7DfgJeg++oMvxf{EM6aE
zKCapu#?@3Us_;CKC7>hORpel2U#ho+$=$UM2?{p+cUonWE;#?u+kCI#hILfS;Z$Mf
dSg+oYr=ry>jcR2dPM6l3WZO`3ONf!d8UUDxM412p
diff --git a/net.sourceforge.phpeclipse/icons/obj16/apache_restart.gif b/net.sourceforge.phpeclipse/icons/obj16/apache_restart.gif
deleted file mode 100644
index 55d97b333049ba1852050d0ea379ea8772a124a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 159
zcmZ?wbhEHb6krfwc+3C+4Gjz+_@4oY{x>u<{0CA%j14IMWMO1r;AhYQNrKE^VDb4N
z^KsSQFs`O*QHAG;ECC(Kt|A9J`%=9nOzy6ANKmlhztbw4f8lp*n(dK>7l+?)Tu{B7
gQR%jnBkQQwfwZ|NQ#UGy^w~a5<2sNQt;Apr0C8?I^Z)<=
diff --git a/net.sourceforge.phpeclipse/icons/obj16/apache_stop.gif b/net.sourceforge.phpeclipse/icons/obj16/apache_stop.gif
deleted file mode 100644
index 1649c3d74f2b58102a398c0bb5ee0cd0e225dfe4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 154
zcmZ?wbhEHb6krfwc+AcK1`Q1i4gVP!{xke<XlVEkq;LbppDc_F3>*wPAdMh17+Bmd
zNHnh68`jlWEvoQ5k=dam*;L?QXJ4wdh{@fx4goSY{C8Sn*MHxArtQQc*9r-XPKjm3
b40}E1@6#w+5tGLsn{Cv}Fyrhr4hCxg_(Dbr
diff --git a/net.sourceforge.phpeclipse/icons/obj16/sql.gif b/net.sourceforge.phpeclipse/icons/obj16/sql.gif
deleted file mode 100644
index c17116d767e0874e154b918fdcde8cc23c7794a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 225
zcmV<703QEGNk%w1VGsZi0J9GO`~CZmyKhF6Qa^}F$=u3#scf3VnJj%jezS#6oLYa(
zBV?&>UzcGxi9>F*E&u=jA^8LW000jFEC2ui01yBW000Dz@X1Ll1rLeVMlugJ0ZXGO
zfngxYfQY1koM>Pd^3)W8FbodcO(4+(aEAk<uq+q~h(`iI1sn)fD8N8`JrN85VgMju
z4TpySTQ&d~S3p3VMrg2M1DOy;q}@~o4Qy`<RT&8y90z*@2`wNG4FVe+4GSud2@+xg
bEdv~$36zmVq6?^_9~K!6Ne2R@4-o)6@ApT2
diff --git a/net.sourceforge.phpeclipse/icons/obj16/xampp_start.gif b/net.sourceforge.phpeclipse/icons/obj16/xampp_start.gif
deleted file mode 100644
index f08b147e0f587da81a88004392190eb790b3539f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1755
zcmZ?wbhEHb6k-r!_|5<V4Pe{=rW$~}hK2(`aOc3XQy+lf`}gm^E0umX=>Bdp`qO3i
zr`zGrB%eRCBmXQ;|GT>M@0RAjdnW!pI{)9<wg0Z}{&(-hzh~F}zkl-o`=|f^{{syk
z1*0J_up#jO_lE@wmNYapfRf{X25_nb5+D{3DE?#tJ5L8hg7QQ=kZu6u(HsE`hEXv5
zLI8h`;Ml<+$|2*iLBWxoS4b;n$A!iNY&=R{b1XI<bncQ+wF+S{Olsj0R<c@=@UZbj
zH;-1yhX;(!ExbCG9tj%+7di8bCmcG{aIl$e7L%+&!-56OEnGUH4h0VyottL~npWI!
zaBO1X(6miqI5p9cd4`CR-Px$d)d3u`W(FM_7Us6F$=2oB+-^MFGEYZ8Amf)vD%-SR
uT@8j9F)d#nX(N{e2ghbMZuQ-1M=~lt9qHwl$+&lBrg32N0&X@I25SJars6mN
diff --git a/net.sourceforge.phpeclipse/icons/obj16/xampp_stop.gif b/net.sourceforge.phpeclipse/icons/obj16/xampp_stop.gif
deleted file mode 100644
index cccf4ee0baf72402e2803eb6317a9b14547ef4ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1713
zcmZ?wbhEHb6k-r!_|5<V4Pe{=rW$~}hK2(`aOc3XQy&-@SU-ID@csMu-<3+g8+3m+
z8U5*Y_%q4p&+N!Qi_`zEF8#Zu`R|^I|IV)ccXju_dnf)qyY~P6lmFj8{r~?TXzC~!
z4S@j<f&afhELgClp`ihkBL6dh6DE)Vv4BAFCkxnxIv^61C)$B@0~n9y2w*Ubg5ehe
z_;UnDAA>lDjK>BAM+OdAjhGVxiVTf>j3zTY3X@zq1hu2~>^R`)!XT_>_v44df@U^(
zeUBeE7Ni`XCU2jXq4~j)nS(n?>CJ|Nji)E`8kKZJE@Wn#r7xQy@oQrS>k>1?f(x7t
zhkd38u2g#SQ#jRyS1jV+pAJPQW-b*&t1B<AE{y8Txovl*^F!m^-4%DG?nE0XFjxZs
DHs;ZG
diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 83b3cff..1a46707 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -36,8 +36,9 @@
<import plugin="org.eclipse.search"/>
<import plugin="org.eclipse.update.ui"/>
<!-- <import plugin="net.sourceforge.phpeclipse.quantum.sql"/> -->
- <import plugin="com.quantum.Quantum"/>
+ <!-- <import plugin="com.quantum.Quantum"/> -->
<import plugin="net.sourceforge.phpeclipse.webbrowser"/>
+ <import plugin="net.sourceforge.phpeclipse.externaltools"/>
<import plugin="net.sourceforge.phpeclipse.core"/>
<import plugin="net.sourceforge.phpeclipse.ui"/>
<import plugin="net.sourceforge.phpeclipse.xml.core"/>
@@ -241,17 +242,7 @@
id="net.sourceforge.phpeclipse.PHPPerspective">
</perspective>
</extension>
- <extension
- point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension
- targetID="net.sourceforge.phpeclipse.PHPPerspective">
- <actionSet id="net.sourceforge.phpeclipse.PHPActionSet"/>
- </perspectiveExtension>
- <perspectiveExtension
- targetID="net.sourceforge.phpeclipse.PHPPerspective">
- <actionSet id="net.sf.eclipsetidy.ActionSet"/>
- </perspectiveExtension>
- </extension>
+
<extension
point="org.eclipse.ui.newWizards">
<category
@@ -521,73 +512,6 @@
<extension
point="org.eclipse.ui.actionSets">
<actionSet
- label="PHP/Apache"
- visible="false"
- id="net.sourceforge.phpeclipse.PHPActionSet">
- <menu
- label="PHP/Apache"
- id="net.sourceforge.phpeclipse.PHPMenu">
- <separator
- name="phpeclipse">
- </separator>
- </menu>
- <action
- label="Restart Apache"
- icon="icons/obj16/apache_restart.gif"
- tooltip="Restart Apache"
- class="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction"
- menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
- toolbarPath="Normal"
- id="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction">
- </action>
- <action
- label="Stop Apache"
- icon="icons/obj16/apache_stop.gif"
- tooltip="Stop Apache"
- class="net.sourceforge.phpeclipse.actions.PHPStopApacheAction"
- menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
- toolbarPath="Normal"
- id="net.sourceforge.phpeclipse.actions.PHPStopApacheAction">
- </action>
- <action
- label="Start Apache"
- icon="icons/obj16/apache.gif"
- tooltip="Start Apache"
- class="net.sourceforge.phpeclipse.actions.PHPStartApacheAction"
- menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
- toolbarPath="Normal"
- id="net.sourceforge.phpeclipse.actions.PHPStartApacheAction">
- </action>
- <action
- label="Start MySQL"
- icon="icons/obj16/sql.gif"
- tooltip="Start MySQL"
- class="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction"
- menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
- toolbarPath="Normal"
- id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction">
- </action>
- <action
- label="Stop XAMPP"
- icon="icons/obj16/xampp_stop.gif"
- tooltip="Stop XAMPP"
- class="net.sourceforge.phpeclipse.actions.PHPStopXAMPPAction"
- menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
- toolbarPath="Normal"
- id="net.sourceforge.phpeclipse.actions.PHPStopXAMPPAction">
- </action>
- <action
- label="Start XAMPP"
- icon="icons/obj16/xampp_start.gif"
- tooltip="Start XAMPP"
- class="net.sourceforge.phpeclipse.actions.PHPStartXAMPPAction"
- menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
- toolbarPath="Normal"
- id="net.sourceforge.phpeclipse.actions.PHPStartXAMPPAction">
- </action>
- </actionSet>
-
- <actionSet
label="%CodingActionSet.label"
description="%CodingActionSet.description"
visible="false"
@@ -750,93 +674,6 @@
<extension
point="org.eclipse.ui.popupMenus">
- <!-- <objectContribution
- objectClass="org.eclipse.core.resources.IProject"
- id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction">
- <action
- label="Run PHPDocumentor"
- class="net.sourceforge.phpeclipse.actions.PHPDocumentorAction"
- menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction">
- </action>
- </objectContribution> -->
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.php"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
- <action
- label="Run External PHP Parser"
- class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
- menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
- </action>
- </objectContribution>
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.php3"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
- <action
- label="Run External PHP Parser"
- class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
- menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
- </action>
- </objectContribution>
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.php4"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
- <action
- label="Run External PHP Parser"
- class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
- menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
- </action>
- </objectContribution>
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.php5"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
- <action
- label="Run External PHP Parser"
- class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
- menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
- </action>
- </objectContribution>
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.module"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
- <action
- label="Run External PHP Parser"
- class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
- menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
- </action>
- </objectContribution>
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.inc"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
- <action
- label="Run External PHP Parser"
- class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
- menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
- </action>
- </objectContribution>
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.phtml"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
- <action
- label="Run External PHP Parser"
- class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
- menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
- </action>
- </objectContribution>
<objectContribution
objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.php"
@@ -948,7 +785,7 @@
</action>
</objectContribution>
- <viewerContribution
+ <!-- <viewerContribution
targetID="#PHPEditorContext"
id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable">
<action
@@ -957,7 +794,7 @@
menubarPath="additions"
id="net.sourceforge.phpeclipse.actions.opensqltable">
</action>
- </viewerContribution>
+ </viewerContribution> -->
<viewerContribution
targetID="#PHPEditorContext"
id="net.sourceforge.phpeclipse.actions.popupHTMLWizard">
@@ -1458,97 +1295,97 @@
<extension
point="org.eclipse.ui.preferencePages">
- <page
+ <!-- <page
name="PHP"
category="net.sourceforge.phpeclipse.ui.preferencePage"
class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage"
id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
+ </page> -->
+ <page name="PHP"
+ category="net.sourceforge.phpeclipse.ui.preferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+ id="net.sourceforge.phpeclipse.preferences.PHPPreferencePage">
</page>
<page
name="Code Templates"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpdt.internal.ui.preferences.CodeTemplatePreferencePage"
id="net.sourceforge.phpeclipse.preference.CodeTemplatePreferencePage">
</page>
<!-- <page
name="Members Sort Order"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpdt.internal.ui.preferences.MembersOrderPreferencePage"
id="net.sourceforge.phpeclipse.preference.MembersOrderPreferencePage">
- </page> -->
+ </page>
<page
name="PHP External Parser Command"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage"
id="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage">
</page>
-<!-- <page
+ <page
name="Editor2"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage"
id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage">
</page>
<page
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
name="PHP Project Defaults"
class="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences"
id="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences">
</page>
<page
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
name="PHP Browser Preview"
class="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences"
id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences">
</page> -->
<page
name="%compilerOptionsPrefName"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPreferencePage"
id="net.sourceforge.phpeclipse.preference.CompilerPreferencePage">
</page>
<page
name="%todoTaskPrefName"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPreferencePage"
id="net.sourceforge.phpeclipse.preference.TodoTaskPreferencePage">
</page>
<page
name="Formatter"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
id="net.sourceforge.phpeclipse.preference.CodeFormatterPreferencePage">
</page>
- <page name="Editor"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
- class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
- id="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage">
- </page>
<page name="%codeAssistPageName"
- category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage"
id="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage">
</page>
<page
name="%templatePageName"
- category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpdt.internal.ui.preferences.JavaTemplatePreferencePage"
id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
</page>
<!-- <page
name="%templatePageName"
- category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
</page>
<page
name="Language Settings"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
</page> -->
<page
name="%spellingPrefName"
- category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage"
id = "net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage">
</page>
@@ -1872,6 +1709,7 @@
expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkingSetExpander">
</variable>
</extension>
+
<extension
point= "net.sourceforge.phpeclipse.foldingStructureProviders">
<provider
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/PHPFileUtil.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/PHPFileUtil.java
index 32db3b0..b205146 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/PHPFileUtil.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/PHPFileUtil.java
@@ -150,8 +150,6 @@ public class PHPFileUtil {
}
}
- // int index = includeNameString.indexOf('/');
- // if (index < 0) {
// includeNameString contains no path separator
path = project.getLocation().append(resourcePath.removeLastSegments(1));
path = path.append(includeNameString);
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/StringUtil.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/StringUtil.java
deleted file mode 100644
index 0e36009..0000000
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/StringUtil.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Created on 28.06.2003
- *
- */
-package net.sourceforge.phpdt.internal.ui.util;
-
-/**
- * some string utilities
- *
- */
-public class StringUtil {
-
- /**
- * Replace each substring of str which matches findStr with replaceStr
- *
- * @param str the string the substrings should be replaced in
- * @param findStr the substring to be replaced
- * @param replaceStr the replacement
- * @return the resultstring
- */
- public static final String replaceAll(String str, String findStr, String replaceStr) {
- StringBuffer buf = new StringBuffer();
-
- int lastindex = 0;
- int indexOf = 0;
- while ((indexOf=str.indexOf(findStr, lastindex)) != -1) {
- buf.append(str.substring(lastindex, indexOf)).append(replaceStr);
- lastindex = indexOf + findStr.length();
- }
- buf.append(str.substring(lastindex));
- return buf.toString();
- }
-
-}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/ExternalPHPParser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/ExternalPHPParser.java
deleted file mode 100644
index 6841740..0000000
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/ExternalPHPParser.java
+++ /dev/null
@@ -1,318 +0,0 @@
-package net.sourceforge.phpeclipse.actions;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.MessageFormat;
-import java.util.Hashtable;
-
-import net.sourceforge.phpdt.internal.ui.util.StringUtil;
-import net.sourceforge.phpeclipse.PHPConsole;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.texteditor.MarkerUtilities;
-
-/**
- * Calls the external parser and generates problem markers if necessary
- */
-public class ExternalPHPParser {
- private final static String PROBLEM_ID = "net.sourceforge.phpeclipse.problem";
-
- // strings for external parser call
- private static final String PARSE_ERROR_STRING = "Parse error"; //$NON-NLS-1$
-
- private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$
-
- public static final int ERROR = 2;
-
- public static final int WARNING = 1;
-
- public static final int INFO = 0;
-
- public static final int TASK = 3;
-
- // TODO design error? Analyze why fileToParse must be static ???
- final protected IFile fFileToParse;
-
- public ExternalPHPParser(IFile file) {
- fFileToParse = file;
- }
-
- /**
- * Call the php parse command ( php -l -f <filename> ) and create markers according to the external parser output.
- *
- * @param file
- * the file that will be parsed
- */
- public void phpExternalParse() {
- //IFile file = (IFile) resource;
- // final IPath path = file.getFullPath();
- final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
- final String filename = fFileToParse.getLocation().toString();
-
- final String[] arguments = { filename };
- final MessageFormat form = new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF));
- final String command = form.format(arguments);
-
- final String parserResult = getParserOutput(command, "External parser: ");
-
- try {
- // parse the buffer to find the errors and warnings
- createMarkers(parserResult, fFileToParse);
- } catch (CoreException e) {
- }
- }
-
- /**
- * Create markers according to the external parser output.
- *
- * @param output
- * the external parser output
- * @param file
- * the file that was parsed.
- */
- protected void createMarkers(final String output, final IFile file) throws CoreException {
- // delete all markers
- file.deleteMarkers(PROBLEM_ID, false, 0);
-
- int indx = 0;
- int brIndx;
- boolean flag = true;
- while ((brIndx = output.indexOf("<br />", indx)) != -1) {
- // newer php error output (tested with 4.2.3)
- scanLine(output, file, indx, brIndx);
- indx = brIndx + 6;
- flag = false;
- }
- if (flag) {
- while ((brIndx = output.indexOf("<br>", indx)) != -1) {
- // older php error output (tested with 4.2.3)
- scanLine(output, file, indx, brIndx);
- indx = brIndx + 4;
- }
- }
- }
-
- private void scanLine(final String output, final IFile file, final int indx, final int brIndx) throws CoreException {
- String current;
- // String outLineNumberString; never used
- final StringBuffer lineNumberBuffer = new StringBuffer(10);
- char ch;
- current = output.substring(indx, brIndx);
-
- if (current.indexOf(PARSE_WARNING_STRING) != -1 || current.indexOf(PARSE_ERROR_STRING) != -1) {
- final int onLine = current.indexOf("on line <b>");
- if (onLine != -1) {
- lineNumberBuffer.delete(0, lineNumberBuffer.length());
- for (int i = onLine; i < current.length(); i++) {
- ch = current.charAt(i);
- if ('0' <= ch && '9' >= ch) {
- lineNumberBuffer.append(ch);
- }
- }
-
- final int lineNumber = Integer.parseInt(lineNumberBuffer.toString());
-
- final Hashtable attributes = new Hashtable();
-
- current = StringUtil.replaceAll(current, "\n", "");
- current = StringUtil.replaceAll(current, "<b>", "");
- current = StringUtil.replaceAll(current, "</b>", "");
- MarkerUtilities.setMessage(attributes, current);
-
- if (current.indexOf(PARSE_ERROR_STRING) != -1)
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR));
- else if (current.indexOf(PARSE_WARNING_STRING) != -1)
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING));
- else
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO));
- MarkerUtilities.setLineNumber(attributes, lineNumber);
- MarkerUtilities.createMarker(file, attributes, PROBLEM_ID);
- }
- }
- }
-
- /**
- * This will set a marker.
- *
- * @param file
- * the file that generated the marker
- * @param message
- * the message
- * @param charStart
- * the starting character
- * @param charEnd
- * the end character
- * @param errorLevel
- * the error level ({@link ExternalPHPParser#ERROR},{@link ExternalPHPParser#INFO},{@link ExternalPHPParser#WARNING}),
- * {@link ExternalPHPParser#TASK})
- * @throws CoreException
- * an exception throwed by the MarkerUtilities
- */
- private void setMarker(final IFile file, final String message, final int charStart, final int charEnd, final int errorLevel)
- throws CoreException {
- if (file != null) {
- final Hashtable attributes = new Hashtable();
- MarkerUtilities.setMessage(attributes, message);
- switch (errorLevel) {
- case ERROR:
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR));
- break;
- case WARNING:
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING));
- break;
- case INFO:
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO));
- break;
- case TASK:
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.TASK));
- break;
- }
- MarkerUtilities.setCharStart(attributes, charStart);
- MarkerUtilities.setCharEnd(attributes, charEnd);
- MarkerUtilities.createMarker(file, attributes, PROBLEM_ID);
- }
- }
-
- /**
- * This will set a marker.
- *
- * @param file
- * the file that generated the marker
- * @param message
- * the message
- * @param line
- * the line number
- * @param errorLevel
- * the error level ({@link ExternalPHPParser#ERROR},{@link ExternalPHPParser#INFO},{@link ExternalPHPParser#WARNING})
- * @throws CoreException
- * an exception throwed by the MarkerUtilities
- */
- private void setMarker(final IFile file, final String message, final int line, final int errorLevel, final String location)
- throws CoreException {
- if (file != null) {
- String markerKind = PROBLEM_ID;
- final Hashtable attributes = new Hashtable();
- MarkerUtilities.setMessage(attributes, message);
- switch (errorLevel) {
- case ERROR:
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR));
- break;
- case WARNING:
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING));
- break;
- case INFO:
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO));
- break;
- case TASK:
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO));
- markerKind = IMarker.TASK;
- break;
- }
- attributes.put(IMarker.LOCATION, location);
- MarkerUtilities.setLineNumber(attributes, line);
- MarkerUtilities.createMarker(file, attributes, markerKind);
- }
- }
-
- /**
- * This will set a marker.
- *
- * @param message
- * the message
- * @param charStart
- * the starting character
- * @param charEnd
- * the end character
- * @param errorLevel
- * the error level ({@link ExternalPHPParser#ERROR},{@link ExternalPHPParser#INFO},{@link ExternalPHPParser#WARNING})
- * @throws CoreException
- * an exception throwed by the MarkerUtilities
- */
- private void setMarker(final String message, final int charStart, final int charEnd, final int errorLevel, final String location)
- throws CoreException {
- if (fFileToParse != null) {
- setMarker(fFileToParse, message, charStart, charEnd, errorLevel, location);
- }
- }
-
- /**
- * This will set a marker.
- *
- * @param file
- * the file that generated the marker
- * @param message
- * the message
- * @param charStart
- * the starting character
- * @param charEnd
- * the end character
- * @param errorLevel
- * the error level ({@link ExternalPHPParser#ERROR},{@link ExternalPHPParser#INFO},{@link ExternalPHPParser#WARNING})
- * @param location
- * the location of the error
- * @throws CoreException
- * an exception throwed by the MarkerUtilities
- */
- private void setMarker(final IFile file, final String message, final int charStart, final int charEnd, final int errorLevel,
- final String location) throws CoreException {
- if (file != null) {
- final Hashtable attributes = new Hashtable();
- MarkerUtilities.setMessage(attributes, message);
- switch (errorLevel) {
- case ERROR:
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR));
- break;
- case WARNING:
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING));
- break;
- case INFO:
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO));
- break;
- case TASK:
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.TASK));
- break;
- }
- attributes.put(IMarker.LOCATION, location);
- MarkerUtilities.setCharStart(attributes, charStart);
- MarkerUtilities.setCharEnd(attributes, charEnd);
- MarkerUtilities.createMarker(file, attributes, PROBLEM_ID); //IMarker.PROBLEM);
- }
- }
-
- private String getParserOutput(String command, String consoleMessage) {
- try {
- PHPConsole console = new PHPConsole();
- try {
- console.println(consoleMessage + command);
- } catch (Throwable th) {
-
- }
-
- Runtime runtime = Runtime.getRuntime();
-
- // runs the command
- Process p = runtime.exec(command);
-
- // gets the input stream to have the post-compile-time information
- InputStream stream = p.getInputStream();
-
- // get the string from Stream
- String consoleOutput = PHPConsole.getStringFromStream(stream);
-
- // prints out the information
- if (console != null) {
- console.print(consoleOutput);
- }
- return consoleOutput;
-
- } catch (IOException e) {
- MessageDialog.openInformation(null, "IOException: ", e.getMessage());
- }
- return "";
- }
-}
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPDocumentorAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPDocumentorAction.java
deleted file mode 100644
index 420c23a..0000000
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPDocumentorAction.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-
-Contributors:
- IBM Corporation - Initial implementation
- www.phpeclipse.de
-**********************************************************************/
-package net.sourceforge.phpeclipse.actions;
-
-import java.util.Iterator;
-
-import net.sourceforge.phpdt.externaltools.launchConfigurations.ExternalToolsUtil;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-public class PHPDocumentorAction implements IObjectActionDelegate {
-
- private IWorkbenchPart workbenchPart;
- /**
- * Constructor for Action1.
- */
- public PHPDocumentorAction() {
- super();
- }
-
- /**
- * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
- */
- public void setActivePart(IAction action, IWorkbenchPart targetPart) {
- workbenchPart = targetPart;
- }
-
- // public static void open(final URL url, final Shell shell, final String dialogTitle) {
- // IHelp help= WorkbenchHelp.getHelpSupport();
- // if (help != null) {
- // WorkbenchHelp.getHelpSupport().displayHelpResource(url.toExternalForm());
- // } else {
- // showMessage(shell, dialogTitle, ActionMessages.getString("OpenBrowserUtil.help_not_available"), false); //$NON-NLS-1$
- // }
- // }
-
- public void run(IAction action) {
- ISelectionProvider selectionProvider = null;
- selectionProvider = workbenchPart.getSite().getSelectionProvider();
-
- StructuredSelection selection = null;
- selection = (StructuredSelection) selectionProvider.getSelection();
-
- final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
- final String phpExecutable = store.getString(PHPeclipsePlugin.PHP_RUN_PREF);
-
- //Shell shell = null;
- Iterator iterator = null;
- iterator = selection.iterator();
- while (iterator.hasNext()) {
- // obj => selected object in the view
- Object obj = iterator.next();
-
- // is it a resource
- if (obj instanceof IResource) {
- IResource resource = (IResource) obj;
-
- // check the resource
- switch (resource.getType()) {
- case IResource.PROJECT :
- IProject project = (IProject) resource;
- String projectName = project.getLocation().toString();
- String targetDirectory = projectName + "/phpdoc";
- // example:
- // C:\>php.exe "C:\Path\To\phpdoc" -t targetdir -o HTML:default:default -d parsedir
- String argument =
- "\"C:\\php\\phpDocumentor\\phpdoc\" -t " + targetDirectory + " -o HTML:default:default -d " + projectName;
- ExternalToolsUtil.execute("phpdocumentor", phpExecutable, argument, true);
- break;
- // case IResource.FILE :
- // // single file:
- // IFile file = (IFile) resource;
- // PHPParserSuperclass.phpExternalParse(file);
- }
- }
- }
- }
-
- /**
- * @see IActionDelegate#selectionChanged(IAction, ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection) {
- }
-
-}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPExternalParserAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPExternalParserAction.java
deleted file mode 100644
index ff9ef33..0000000
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPExternalParserAction.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-
-Contributors:
- IBM Corporation - Initial implementation
- www.phpeclipse.de
-**********************************************************************/
-package net.sourceforge.phpeclipse.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-
-public class PHPExternalParserAction implements IObjectActionDelegate {
-
- private IWorkbenchPart workbenchPart;
- /**
- * Constructor for Action1.
- */
- public PHPExternalParserAction() {
- super();
- }
-
- /**
- * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
- */
- public void setActivePart(IAction action, IWorkbenchPart targetPart) {
- workbenchPart = targetPart;
- }
-
- // public static void open(final URL url, final Shell shell, final String dialogTitle) {
- // IHelp help= WorkbenchHelp.getHelpSupport();
- // if (help != null) {
- // WorkbenchHelp.getHelpSupport().displayHelpResource(url.toExternalForm());
- // } else {
- // showMessage(shell, dialogTitle, ActionMessages.getString("OpenBrowserUtil.help_not_available"), false); //$NON-NLS-1$
- // }
- // }
-
- public void run(IAction action) {
- ISelectionProvider selectionProvider = null;
- selectionProvider = workbenchPart.getSite().getSelectionProvider();
-
- StructuredSelection selection = null;
- selection = (StructuredSelection) selectionProvider.getSelection();
-
- //Shell shell = null;
- Iterator iterator = null;
- iterator = selection.iterator();
- while (iterator.hasNext()) {
- // obj => selected object in the view
- Object obj = iterator.next();
-
- // is it a resource
- if (obj instanceof IResource) {
- IResource resource = (IResource) obj;
-
- // check if it's a file resource
- switch (resource.getType()) {
-
- case IResource.FILE :
- // single file:
- ExternalPHPParser parser = new ExternalPHPParser((IFile)resource);
- parser.phpExternalParse();
- }
- }
- }
- }
-
- /**
- * @see IActionDelegate#selectionChanged(IAction, ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection) {
- }
-
-}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPOpenSQLTableEditorAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPOpenSQLTableEditorAction.java
deleted file mode 100644
index 2900c62..0000000
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPOpenSQLTableEditorAction.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/***********************************************************************************************************************************
- * Copyright (c) 2000, 2002 IBM Corp. and others. All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors: www.phpeclipse.de
- **********************************************************************************************************************************/
-package net.sourceforge.phpeclipse.actions;
-
-import java.sql.SQLException;
-
-import net.sourceforge.phpeclipse.phpeditor.PHPEditor;
-import net.sourceforge.phpeclipse.ui.WebUI;
-import net.sourceforge.phpeclipse.ui.overlaypages.ProjectPrefUtil;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.ActionDelegate;
-
-import com.quantum.ExternalInterface;
-import com.quantum.QuantumPlugin;
-// import com.quantum.util.connection.NotConnectedException;
-
-public class PHPOpenSQLTableEditorAction extends ActionDelegate implements IEditorActionDelegate {
-
- private IWorkbenchWindow fWindow;
-
- private PHPEditor fEditor;
-
- private IProject fProject;
-
- public void dispose() {
- }
-
- public void init(IWorkbenchWindow window) {
- this.fWindow = window;
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
- if (!selection.isEmpty()) {
- if (selection instanceof TextSelection) {
- action.setEnabled(true);
- } else if (fWindow.getActivePage() != null && fWindow.getActivePage().getActivePart() != null) {
- //
- }
- }
- }
-
- private IWorkbenchPage getActivePage() {
- fWindow = fEditor.getEditorSite().getWorkbenchWindow();
- IWorkbenchPage page = fWindow.getActivePage();
- return page;
- }
-
- public IContainer getWorkingLocation(IFileEditorInput editorInput) {
- if (editorInput == null || editorInput.getFile() == null) {
- return null;
- }
- return editorInput.getFile().getParent();
- }
-
- private IFile getIncludeFile(IProject project, IFileEditorInput editorInput, String relativeFilename) {
- // IContainer container = getWorkingLocation(editorInput);
- // String fullPath = project.getLocation().toString();
- Path path = new Path(relativeFilename);
- IFile file = project.getFile(path);
- return file;
- }
-
- public void run(IAction action) {
- if (fEditor == null) {
- IEditorPart targetEditor = fWindow.getActivePage().getActiveEditor();
- if (targetEditor != null && (targetEditor instanceof PHPEditor)) {
- fEditor = (PHPEditor) targetEditor;
- }
- }
- if (fEditor != null) {
- fWindow = fEditor.getEditorSite().getWorkbenchWindow();
- IFile f = ((IFileEditorInput) fEditor.getEditorInput()).getFile();
- fProject = f.getProject();
- String bookmarkString = ProjectPrefUtil.getMiscProjectsPreferenceValue(fProject, WebUI.PHP_BOOKMARK_DEFAULT);
- if (bookmarkString != null && !bookmarkString.equals("")) {
- ITextSelection selection = (ITextSelection) fEditor.getSelectionProvider().getSelection();
- IDocument doc = fEditor.getDocumentProvider().getDocument(fEditor.getEditorInput());
- int pos = selection.getOffset();
- // System.out.println(selection.getText());
- String tableName = getSQLTableName(doc, pos);
- if (tableName != null && tableName.length() > 0)
- try {
- ExternalInterface.displayTable(bookmarkString, tableName);
-
- IViewPart viewPart = null;
- String view = "com.quantum.view.tableview.TableView";
- try {
- IWorkbenchPage page = QuantumPlugin.getDefault().getActivePage();
- viewPart = page.findView(view);
- if (viewPart == null) {
- viewPart = page.showView(view);
- }
- page.bringToTop(viewPart);
- } catch (PartInitException e) {
- e.printStackTrace();
- }
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (Exception /* NotConnectedException */ e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- //
- // IViewPart viewPart = null;
- // String view = "com.quantum.view.tableview.TableView";
- // try {
- // IWorkbenchPage page = QuantumPlugin.getDefault().getActivePage();
- // viewPart = page.findView(view);
- // if (viewPart == null) {
- // viewPart = page.showView(view);
- // }
- // page.bringToTop(viewPart);
- // getTables((TableView) viewPart, fProject, tableName);
- // } catch (PartInitException e) {
- // e.printStackTrace();
- // }
-
- }
- }
-
- public void setActiveEditor(IAction action, IEditorPart targetEditor) {
- if (targetEditor != null && (targetEditor instanceof PHPEditor)) {
- fEditor = (PHPEditor) targetEditor;
- }
- }
-
- private String getSQLTableName(IDocument doc, int pos) {
- Point word = null;
- int start = -1;
- int end = -1;
-
- try {
-
- int position = pos;
- char character;
-
- while (position >= 0) {
- character = doc.getChar(position);
- if (Character.isWhitespace(character) || (character == '\"') || (character == '\'') || (character == '\r')
- || (character == '\n'))
- break;
- --position;
- }
-
- start = position;
-
- position = pos;
- int length = doc.getLength();
-
- while (position < length) {
- character = doc.getChar(position);
- if (Character.isWhitespace(character) || (character == '\"') || (character == '\'') || (character == '\r')
- || (character == '\n'))
- break;
- ++position;
- }
-
- start++;
- end = position;
-
- if (end > start)
- word = new Point(start, end - start);
-
- } catch (BadLocationException x) {
- }
-
- if (word != null) {
- try {
- return doc.get(word.x, word.y);
- } catch (BadLocationException e) {
- }
- }
- return "";
- }
-
- // public void getTables(TableView tableView, IProject project, String tableName) {
- // // Get The Database bookmark from the Quantum SQL plugin:
- // BookmarkCollection sqlBookMarks = BookmarkCollection.getInstance();
- // if (sqlBookMarks != null) {
- // String bookmarkString = ProjectPrefUtil.getMiscProjectsPreferenceValue(project,
- // WebUI.PHP_BOOKMARK_DEFAULT);
- // if (bookmarkString != null && !bookmarkString.equals("")) {
- // Bookmark bookmark = sqlBookMarks.find(bookmarkString);
- // ArrayList sqlList = new ArrayList();
- // if (bookmark != null && !bookmark.isConnected()) {
- // new ConnectionUtil().connect(bookmark, null);
- // }
- // if (bookmark != null && bookmark.isConnected()) {
- // try {
- // Connection connection = bookmark.getConnection();
- // DatabaseMetaData metaData = connection.getMetaData();
- // ConnectionUtil connectionUtil = new ConnectionUtil();
- // Entity entity;
- // DatabaseAdapter adapter;
- //
- // if (metaData != null) {
- // String columnName;
- // String prefixWithoutDollar = tableName;
- // if (prefixWithoutDollar.charAt(0) == '$') {
- // prefixWithoutDollar = prefixWithoutDollar.substring(1);
- // }
- // ResultSet set;
- // set = metaData.getTables(null, null, "%" + prefixWithoutDollar
- // + "%", null);
- // while (set.next()) {
- // tableName = set.getString("TABLE_NAME");
- // tableName = (tableName == null) ? "" : tableName.trim();
- // if (tableName != null && tableName.length() > 0) {
- // sqlList.add(tableName);
- // }
- // }
- // set.close();
- // EntityFactory entityFactory = EntityFactory.getInstance();
- // if (sqlList.size() == 1) {
- // adapter = bookmark.getAdapter();
- // entity = entityFactory.create(bookmark, null, (String) sqlList
- // .get(0), Entity.TABLE_TYPE, false);
- // String query = adapter.getTableQuery(entity.getQualifiedName());
- //
- // try {
- // SQLResults results = MultiSQLServer.getInstance().execute(
- // bookmark, connectionUtil.connect(bookmark, fWindow.getShell()),
- // entity, query);
- //
- // if (results != null && results.isResultSet()) {
- // SQLResultSetCollection.getInstance().addSQLResultSet(
- // (SQLResultSetResults) results);
- // }
- // } catch (SQLException e) {
- // ExceptionDisplayDialog.openError(fWindow.getShell(), null, null, e);
- // }
- // // tableView.loadTable(entityFactory.create(
- // // bookmark, null,
- // // (String) sqlList.get(0),
- // // Entity.TABLE_TYPE));
- // } else if (sqlList.size() > 1) {
- // ListSelectionDialog listSelectionDialog = new ListSelectionDialog(
- // PHPeclipsePlugin.getDefault().getWorkbench()
- // .getActiveWorkbenchWindow().getShell(), sqlList,
- // new ListContentProvider(), new LabelProvider(),
- // "Select the SQL table to open.");
- // listSelectionDialog.setTitle("Multiple tablenames found");
- // if (listSelectionDialog.open() == Window.OK) {
- // Object[] locations = listSelectionDialog.getResult();
- // if (locations != null) {
- // for (int i = 0; i < locations.length; i++) {
- // adapter = bookmark.getAdapter();
- // entity = entityFactory.create(bookmark, null,
- // (String) locations[i], Entity.TABLE_TYPE, false);
- // String query = adapter.getTableQuery(entity
- // .getQualifiedName());
- //
- // try {
- // SQLResults results = MultiSQLServer.getInstance()
- // .execute(bookmark,
- // connectionUtil.connect(bookmark, fWindow.getShell()),
- // entity, query);
- //
- // if (results != null && results.isResultSet()) {
- // SQLResultSetCollection.getInstance().addSQLResultSet(
- // (SQLResultSetResults) results);
- // }
- // } catch (SQLException e) {
- // ExceptionDisplayDialog.openError(fWindow.getShell(), null, null, e);
- // }
- //
- // // tableView
- // // .loadTable(entityFactory
- // // .create(
- // // bookmark,
- // // null,
- // // (String) locations[i],
- // // Entity.TABLE_TYPE));
- // }
- //
- // }
- // }
- // }
- // }
- // } catch (NotConnectedException e) {
- // // ignore this - not mission critical
- // } catch (SQLException e) {
- // e.printStackTrace();
- // }
- // }
- // }
- // }
- // }
-
-}
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPRestartApacheAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPRestartApacheAction.java
deleted file mode 100644
index dc350e7..0000000
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPRestartApacheAction.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-
-Contributors:
- IBM Corporation - Initial implementation
- www.phpeclipse.de
-**********************************************************************/
-package net.sourceforge.phpeclipse.actions;
-
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-public class PHPRestartApacheAction extends PHPStartApacheAction {
- public void run(IAction action) {
- final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
- // execute(store.getString(PHPeclipsePlugin.APACHE_RESTART_PREF), "Restart Apache: ");
- execute(
- "apache_restart",
- store.getString(PHPeclipsePlugin.APACHE_RUN_PREF),
- store.getString(PHPeclipsePlugin.APACHE_RESTART_PREF),
- store.getBoolean(PHPeclipsePlugin.APACHE_RESTART_BACKGROUND));
- }
-}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartApacheAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartApacheAction.java
deleted file mode 100644
index a87c8a1..0000000
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartApacheAction.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-
-Contributors:
- IBM Corporation - Initial implementation
- www.phpeclipse.de
-**********************************************************************/
-package net.sourceforge.phpeclipse.actions;
-
-import java.text.MessageFormat;
-
-import net.sourceforge.phpdt.externaltools.launchConfigurations.ExternalToolsUtil;
-import net.sourceforge.phpeclipse.PHPConsole;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.ui.WebUI;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-public class PHPStartApacheAction implements IWorkbenchWindowActionDelegate {
- protected IWorkbenchWindow activeWindow = null;
-
- public void run(IAction action) {
- final IPreferenceStore store =
- PHPeclipsePlugin.getDefault().getPreferenceStore();
- String documentRoot = store.getString(WebUI.PHP_DOCUMENTROOT_PREF);
- // replace backslash with slash in the DocumentRoot under Windows
- documentRoot = documentRoot.replace('\\', '/');
- String[] arguments = { documentRoot };
- MessageFormat form =
- new MessageFormat(store.getString(PHPeclipsePlugin.APACHE_START_PREF));
- execute(
- "apache_start",
- store.getString(PHPeclipsePlugin.APACHE_RUN_PREF),
- form.format(arguments),
- store.getBoolean(PHPeclipsePlugin.APACHE_START_BACKGROUND));
- }
-
- /**
- * Executes an external progam and saves the LaunchConfiguration under external tools
- * @param command external tools command name
- * @param executable executable path i.e.c:\apache\apache.exe
- * @param arguments arguments for this configuration
- * @param background run this configuration in background mode
- */
- public static void execute(
- String command,
- String executable,
- String arguments,
- boolean background) {
- PHPConsole console = new PHPConsole();
- String consoleMessage;
- if (background) {
- consoleMessage =
- "run in background mode-"
- + command
- + ": "
- + executable
- + " "
- + arguments;
- } else {
- consoleMessage =
- "run in foreground mode-"
- + command
- + ": "
- + executable
- + " "
- + arguments;
- }
- console.println(consoleMessage);
-
- ExternalToolsUtil.execute(command, executable, arguments, background);
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
-
- }
-
- public void init(IWorkbenchWindow window) {
- this.activeWindow = window;
- }
-
- public void dispose() {
-
- }
-
-}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartMySQLAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartMySQLAction.java
deleted file mode 100644
index cc237ea..0000000
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartMySQLAction.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-
-Contributors:
- IBM Corporation - Initial implementation
- www.phpeclipse.de
-**********************************************************************/
-package net.sourceforge.phpeclipse.actions;
-
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-public class PHPStartMySQLAction extends PHPStartApacheAction {
- public void run(IAction action) {
- final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
- // execute(store.getString(PHPeclipsePlugin.MYSQL_PREF), "Start MySQL: ");
- execute(
- "mysql_start",
- store.getString(PHPeclipsePlugin.MYSQL_RUN_PREF),
- store.getString(PHPeclipsePlugin.MYSQL_PREF),
- store.getBoolean(PHPeclipsePlugin.MYSQL_START_BACKGROUND));
- }
-}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartXAMPPAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartXAMPPAction.java
deleted file mode 100644
index e3dcfff..0000000
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartXAMPPAction.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-
-Contributors:
- IBM Corporation - Initial implementation
- www.phpeclipse.de
-**********************************************************************/
-package net.sourceforge.phpeclipse.actions;
-
-import java.io.File;
-
-import net.sourceforge.phpdt.externaltools.launchConfigurations.ExternalToolsUtil;
-import net.sourceforge.phpeclipse.PHPConsole;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-public class PHPStartXAMPPAction implements IWorkbenchWindowActionDelegate {
- protected IWorkbenchWindow activeWindow = null;
-
- public void run(IAction action) {
- final IPreferenceStore store =
- PHPeclipsePlugin.getDefault().getPreferenceStore();
- String executable = store.getString(PHPeclipsePlugin.XAMPP_START_PREF);
- String workingDirectory = null;
- if (executable!=null && executable.length()>0) {
- int index = executable.lastIndexOf(File.separatorChar);
- if (index>0) {
- workingDirectory = executable.substring(0, index);
- }
- }
- execute(
- "xampp_start",
- executable,
- workingDirectory,
- true);
- }
-
- /**
- * Executes an external progam and saves the LaunchConfiguration under external tools
- * @param command external tools command name
- * @param executable executable path i.e.c:\apache\apache.exe
- * @param background run this configuration in background mode
- */
- public static void execute(
- String command,
- String executable,
- String workingDirectory,
- boolean background) {
- PHPConsole console = new PHPConsole();
- String consoleMessage;
- if (background) {
- consoleMessage =
- "run in background mode-"
- + command
- + ": "
- + executable;
- } else {
- consoleMessage =
- "run in foreground mode-"
- + command
- + ": "
- + executable;
- }
- console.println(consoleMessage);
-
- ExternalToolsUtil.execute(command, executable, workingDirectory, null, background);
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
-
- }
-
- public void init(IWorkbenchWindow window) {
- this.activeWindow = window;
- }
-
- public void dispose() {
-
- }
-
-}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStopApacheAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStopApacheAction.java
deleted file mode 100644
index e5b75e9..0000000
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStopApacheAction.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-
-Contributors:
- IBM Corporation - Initial implementation
- www.phpeclipse.de
-**********************************************************************/
-package net.sourceforge.phpeclipse.actions;
-
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-public class PHPStopApacheAction extends PHPStartApacheAction {
- public void run(IAction action) {
- final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
- // execute(store.getString(PHPeclipsePlugin.APACHE_STOP_PREF), "Stop Apache: ");
- execute(
- "apache_stop",
- store.getString(PHPeclipsePlugin.APACHE_RUN_PREF),
- store.getString(PHPeclipsePlugin.APACHE_STOP_PREF),
- store.getBoolean(PHPeclipsePlugin.APACHE_STOP_BACKGROUND));
- }
-}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStopXAMPPAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStopXAMPPAction.java
deleted file mode 100644
index 89c6e0d..0000000
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStopXAMPPAction.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-
-Contributors:
- IBM Corporation - Initial implementation
- www.phpeclipse.de
-**********************************************************************/
-package net.sourceforge.phpeclipse.actions;
-
-import java.io.File;
-
-import net.sourceforge.phpdt.externaltools.launchConfigurations.ExternalToolsUtil;
-import net.sourceforge.phpeclipse.PHPConsole;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-public class PHPStopXAMPPAction implements IWorkbenchWindowActionDelegate {
- protected IWorkbenchWindow activeWindow = null;
-
- public void run(IAction action) {
- final IPreferenceStore store =
- PHPeclipsePlugin.getDefault().getPreferenceStore();
- String executable = store.getString(PHPeclipsePlugin.XAMPP_STOP_PREF);
- String workingDirectory = null;
- if (executable!=null && executable.length()>0) {
- int index = executable.lastIndexOf(File.separatorChar);
- if (index>0) {
- workingDirectory = executable.substring(0, index);
- }
- }
- execute(
- "xampp_stop",
- executable,
- workingDirectory,
- true);
- }
-
- /**
- * Executes an external progam and saves the LaunchConfiguration under external tools
- * @param command external tools command name
- * @param executable executable path i.e.c:\apache\apache.exe
- * @param background run this configuration in background mode
- */
- public static void execute(
- String command,
- String executable,
- String workingDirectory,
- boolean background) {
- PHPConsole console = new PHPConsole();
- String consoleMessage;
- if (background) {
- consoleMessage =
- "run in background mode-"
- + command
- + ": "
- + executable;
- } else {
- consoleMessage =
- "run in foreground mode-"
- + command
- + ": "
- + executable;
- }
- console.println(consoleMessage);
-
- ExternalToolsUtil.execute(command, executable, workingDirectory, null, background);
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
-
- }
-
- public void init(IWorkbenchWindow window) {
- this.activeWindow = window;
- }
-
- public void dispose() {
-
- }
-
-}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
deleted file mode 100644
index 6197bae..0000000
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package net.sourceforge.phpeclipse.phpeditor;
-
-/**********************************************************************
- Copyright (c) 2000, 2002 IBM Corp. and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Common Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/cpl-v10.html
-
- Contributors:
- IBM Corporation - Initial implementation
- www.phpeclipse.de
- **********************************************************************/
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import net.sourceforge.phpdt.internal.compiler.util.Util;
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.actions.ExternalPHPParser;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.TextEditorAction;
-
-//import test.PHPParserManager;
-
-/**
- * ClassDeclaration that defines the action for parsing the current PHP file
- */
-public class PHPParserAction extends TextEditorAction {
-
- private static PHPParserAction instance = new PHPParserAction();
-
- protected IFile fileToParse;
-
- protected List fVariables = new ArrayList(100);
-
- /**
- * Constructs and updates the action.
- */
- private PHPParserAction() {
- super(PHPEditorMessages.getResourceBundle(), "ParserAction.", null); //$NON-NLS-1$
- update();
- }
-
- public static PHPParserAction getInstance() {
- return instance;
- }
-
- /**
- * Code called when the action is fired.
- */
- public void run() {
- boolean phpFlag = false;
-
- // try {
- fileToParse = getPHPFile();
- parseFile(fileToParse);
- }
-
- public static void parseFile(IFile fileToParse) {
- boolean phpFlag = false;
- // try {
-
- if (fileToParse == null) {
- // TODO should never happen => should throw an exception
- System.err.println("Error : no file in the editor");
-
- return;
- }
- String name = fileToParse.getName(); //.toLowerCase();
-
- if (PHPFileUtil.isPHPFileName(name)) {
- IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
- ExternalPHPParser parser = new ExternalPHPParser(fileToParse);
- parser.phpExternalParse();
- }
- }
-
- /**
- * Finds the file that's currently opened in the PHP Text Editor
- */
- protected IFile getPHPFile() {
- ITextEditor editor = getTextEditor();
-
- IEditorInput editorInput = null;
- if (editor != null) {
- editorInput = editor.getEditorInput();
- }
-
- if (editorInput instanceof IFileEditorInput)
- return ((IFileEditorInput) editorInput).getFile();
-
- // if nothing was found, which should never happen
- return null;
- }
-
- protected static void parse(IFile fileToParse) {
- InputStream stream = null;
- char[] charArray;
- try {
- stream = new BufferedInputStream(fileToParse.getContents());
- charArray = Util.getInputStreamAsCharArray(stream, -1, null);
- ExternalPHPParser parser = new ExternalPHPParser(fileToParse);
- parser.phpExternalParse();
- } catch (CoreException e) {
- } catch (IOException e) {
- } finally {
- try {
- if (stream != null) {
- stream.close();
- }
- } catch (IOException e) {
- }
- }
- }
-}
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
index 54fe5a6..0ccf4c7 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
@@ -78,7 +78,7 @@ import org.eclipse.swt.graphics.Point;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IFileEditorInput;
-import com.quantum.ExternalInterface;
+//import com.quantum.ExternalInterface;
// import com.quantum.util.connection.NotConnectedException;
/**
@@ -650,23 +650,25 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
builtinResults = builtinEngine.getResults();
}
}
- ICompletionProposal[] sqlResults = new ICompletionProposal[0];
- if (project != null) {
- sqlResults = getSQLProposals(viewer, project, context, prefix, sqlTable);
- }
+// ICompletionProposal[] sqlResults = new ICompletionProposal[0];
+// if (project != null) {
+// sqlResults = getSQLProposals(viewer, project, context, prefix, sqlTable);
+// }
// concatenate the result arrays
IPHPCompletionProposal[] total;
total = new IPHPCompletionProposal[localVariableResults.length + templateResults.length + identifierResults.length
- + builtinResults.length + declarationResults.length + sqlResults.length];
+ + builtinResults.length + declarationResults.length];// + sqlResults.length];
System.arraycopy(templateResults, 0, total, 0, templateResults.length);
System.arraycopy(identifierResults, 0, total, templateResults.length, identifierResults.length);
System.arraycopy(builtinResults, 0, total, templateResults.length + identifierResults.length, builtinResults.length);
System.arraycopy(declarationResults, 0, total, templateResults.length + identifierResults.length + builtinResults.length,
declarationResults.length);
- System.arraycopy(sqlResults, 0, total, templateResults.length + identifierResults.length + builtinResults.length
- + declarationResults.length, sqlResults.length);
+// System.arraycopy(sqlResults, 0, total, templateResults.length + identifierResults.length + builtinResults.length
+// + declarationResults.length, sqlResults.length);
+// System.arraycopy(localVariableResults, 0, total, templateResults.length + identifierResults.length + builtinResults.length
+// + declarationResults.length + sqlResults.length, localVariableResults.length);
System.arraycopy(localVariableResults, 0, total, templateResults.length + identifierResults.length + builtinResults.length
- + declarationResults.length + sqlResults.length, localVariableResults.length);
+ + declarationResults.length, localVariableResults.length);
results = total;
fNumberOfComputedResults = (results == null ? 0 : results.length);
/*
@@ -814,71 +816,71 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
* @param sqlResults
* @return
*/
- private ICompletionProposal[] getSQLProposals(ITextViewer viewer, IProject project, DocumentTemplateContext context,
- String prefix, TableName sqlTable) {
- ICompletionProposal[] sqlResults = new ICompletionProposal[0];
- // Get The Database bookmark from the Quantum SQL plugin:
- // BookmarkCollection sqlBookMarks = BookmarkCollection.getInstance();
- // if (sqlBookMarks != null) {
- String bookmarkString = ProjectPrefUtil.getMiscProjectsPreferenceValue(project, IPreferenceConstants.PHP_BOOKMARK_DEFAULT);
- if (bookmarkString != null && !bookmarkString.equals("")) {
- String[] bookmarks = ExternalInterface.getBookmarkNames();
- boolean foundBookmark = false;
- for (int i = 0; i < bookmarks.length; i++) {
- if (bookmarks[i].equals(bookmarkString)) {
- foundBookmark = true;
- }
- }
- if (!foundBookmark) {
- return sqlResults;
- }
- // Bookmark bookmark = sqlBookMarks.find(bookmarkString);
- ArrayList sqlList = new ArrayList();
- if (!ExternalInterface.isBookmarkConnected(bookmarkString)) {
- ExternalInterface.connectBookmark(bookmarkString, null);
- if (!ExternalInterface.isBookmarkConnected(bookmarkString)) {
- return sqlResults;
- }
- }
- // if (ExternalInterface.isBookmarkConnected(bookmarkString)) {
- try {
- int start = context.getStart();
- int end = context.getEnd();
- String foundSQLTableName = sqlTable.getTableName();
- String tableName;
- String columnName;
- String prefixWithoutDollar = prefix;
- boolean isDollarPrefix = false;
- if (prefix.length() > 0 && prefix.charAt(0) == '$') {
- prefixWithoutDollar = prefix.substring(1);
- isDollarPrefix = true;
- }
- IRegion region = new Region(start, end - start);
- ResultSet set;
- if (!isDollarPrefix) {
- String[] tableNames = ExternalInterface.getMatchingTableNames(null, bookmarkString, prefixWithoutDollar, null, false);
- for (int i = 0; i < tableNames.length; i++) {
- sqlList.add(new SQLProposal(tableNames[i], context, region, viewer, PHPUiImages.get(PHPUiImages.IMG_TABLE)));
- }
- }
-
- String[] columnNames = ExternalInterface.getMatchingColumnNames(null, bookmarkString, prefixWithoutDollar, null, false);
- for (int i = 0; i < columnNames.length; i++) {
- sqlList.add(new SQLProposal(columnNames[i], context, region, viewer, PHPUiImages.get(PHPUiImages.IMG_TABLE)));
- }
-
- sqlResults = new IPHPCompletionProposal[sqlList.size()];
- for (int i = 0; i < sqlList.size(); i++) {
- sqlResults[i] = (SQLProposal) sqlList.get(i);
- }
- } catch (Exception /* NotConnectedException */ e) {
-
- }
- // }
- }
- // }
- return sqlResults;
- }
+// private ICompletionProposal[] getSQLProposals(ITextViewer viewer, IProject project, DocumentTemplateContext context,
+// String prefix, TableName sqlTable) {
+// ICompletionProposal[] sqlResults = new ICompletionProposal[0];
+// // Get The Database bookmark from the Quantum SQL plugin:
+// // BookmarkCollection sqlBookMarks = BookmarkCollection.getInstance();
+// // if (sqlBookMarks != null) {
+// String bookmarkString = ProjectPrefUtil.getMiscProjectsPreferenceValue(project, IPreferenceConstants.PHP_BOOKMARK_DEFAULT);
+// if (bookmarkString != null && !bookmarkString.equals("")) {
+// String[] bookmarks = ExternalInterface.getBookmarkNames();
+// boolean foundBookmark = false;
+// for (int i = 0; i < bookmarks.length; i++) {
+// if (bookmarks[i].equals(bookmarkString)) {
+// foundBookmark = true;
+// }
+// }
+// if (!foundBookmark) {
+// return sqlResults;
+// }
+// // Bookmark bookmark = sqlBookMarks.find(bookmarkString);
+// ArrayList sqlList = new ArrayList();
+// if (!ExternalInterface.isBookmarkConnected(bookmarkString)) {
+// ExternalInterface.connectBookmark(bookmarkString, null);
+// if (!ExternalInterface.isBookmarkConnected(bookmarkString)) {
+// return sqlResults;
+// }
+// }
+// // if (ExternalInterface.isBookmarkConnected(bookmarkString)) {
+// try {
+// int start = context.getStart();
+// int end = context.getEnd();
+// String foundSQLTableName = sqlTable.getTableName();
+// String tableName;
+// String columnName;
+// String prefixWithoutDollar = prefix;
+// boolean isDollarPrefix = false;
+// if (prefix.length() > 0 && prefix.charAt(0) == '$') {
+// prefixWithoutDollar = prefix.substring(1);
+// isDollarPrefix = true;
+// }
+// IRegion region = new Region(start, end - start);
+// ResultSet set;
+// if (!isDollarPrefix) {
+// String[] tableNames = ExternalInterface.getMatchingTableNames(null, bookmarkString, prefixWithoutDollar, null, false);
+// for (int i = 0; i < tableNames.length; i++) {
+// sqlList.add(new SQLProposal(tableNames[i], context, region, viewer, PHPUiImages.get(PHPUiImages.IMG_TABLE)));
+// }
+// }
+//
+// String[] columnNames = ExternalInterface.getMatchingColumnNames(null, bookmarkString, prefixWithoutDollar, null, false);
+// for (int i = 0; i < columnNames.length; i++) {
+// sqlList.add(new SQLProposal(columnNames[i], context, region, viewer, PHPUiImages.get(PHPUiImages.IMG_TABLE)));
+// }
+//
+// sqlResults = new IPHPCompletionProposal[sqlList.size()];
+// for (int i = 0; i < sqlList.size(); i++) {
+// sqlResults[i] = (SQLProposal) sqlList.get(i);
+// }
+// } catch (Exception /* NotConnectedException */ e) {
+//
+// }
+// // }
+// }
+// // }
+// return sqlResults;
+// }
private boolean looksLikeMethod(PHPCodeReader reader) throws IOException {
int curr = reader.read();
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPEclipseParserPreferencePage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPEclipseParserPreferencePage.java
deleted file mode 100644
index 43a1175..0000000
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPEclipseParserPreferencePage.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package net.sourceforge.phpeclipse.preferences;
-
-import net.sourceforge.phpeclipse.IPreferenceConstants;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-public class PHPEclipseParserPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-
-// private SelectionListener SelectionListener;
-// private ModifyListener ModifyListener;
-// private ModifyListener TextModifyListener;
-//
-// private ArrayList CheckBoxes = new ArrayList();
-// private ArrayList ComboBoxes = new ArrayList();
-// private ArrayList TextBoxes = new ArrayList();
-// private ArrayList RadioButtons = new ArrayList();
-
-
-// RadioGroupFieldEditor chooseParser;
- StringFieldEditor externalParserSFE;
- // BooleanFieldEditor parseOnSave;
-
- public PHPEclipseParserPreferencePage() {
- super();
- setPreferenceStore(PHPeclipsePlugin.getDefault().getPreferenceStore());
- setDescription(PHPPreferencesMessages.getString("PHPBasePreferencePage.description")); //$NON-NLS-1$
- }
-
- public void init(IWorkbench workbench) {
- }
- protected void performDefaults() {
-// chooseParser.loadDefault();
- externalParserSFE.loadDefault();
-// parseOnSave.loadDefault();
- super.performDefaults();
- }
-
- public boolean performOk() {
-// chooseParser.store();
- externalParserSFE.store();
-// parseOnSave.store();
- return super.performOk();
- }
-
- protected Control createContents(Composite parent) {
- initializeDialogUnits(parent);
- final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
- Composite composite = new Composite(parent, SWT.LEFT);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- composite.setLayout(new GridLayout());
-
- //Create parser settings composite
- Composite parserSettingsComposite = new Composite(composite, SWT.NONE);
- parserSettingsComposite.setLayout(new GridLayout());
- parserSettingsComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- Group parserSettingsGroup = new Group(parserSettingsComposite, SWT.NONE);
- parserSettingsGroup.setText(PHPPreferencesMessages.getString("PHPBasePreferencePage.parsers"));
- parserSettingsGroup.setLayout(new GridLayout());
- parserSettingsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-// chooseParser =
-// new RadioGroupFieldEditor(
-// IPreferenceConstants.PHP_PARSER_DEFAULT,
-// PHPPreferencesMessages.getString("PHPBasePreferencePage.parsers.choose"),
-// 1,
-// new String[][] {
-// { PHPPreferencesMessages.getString("PHPBasePreferencePage.parsers.internal"), IPreferenceConstants.PHP_INTERNAL_PARSER },
-// {
-// PHPPreferencesMessages.getString("PHPBasePreferencePage.parsers.external"), IPreferenceConstants.PHP_EXTERNAL_PARSER }
-// }, parserSettingsGroup);
-// chooseParser.setPreferencePage(this);
-// chooseParser.setPreferenceStore(getPreferenceStore());
-// chooseParser.load();
- //create a copmposte just for the StringEditor - makes layout simpler
- Composite externalParserCompo = new Composite(parserSettingsGroup, SWT.NONE);
- externalParserSFE =
- new StringFieldEditor(
- IPreferenceConstants.EXTERNAL_PARSER_PREF,
- PHPPreferencesMessages.getString("PHPBasePreferencePage.parsers.extcommand"),
- externalParserCompo
- /*parserSettingsGroup*/
- );
- externalParserSFE.setPreferencePage(this);
- externalParserSFE.setPreferenceStore(getPreferenceStore());
- externalParserSFE.load();
-
-// parseOnSave =
-// new BooleanFieldEditor(
-// PHPeclipsePlugin.PHP_PARSE_ON_SAVE,
-// PHPPreferencesMessages.getString("PHPBasePreferencePage.parsers.pos"),
-// parserSettingsGroup);
-// parseOnSave.setPreferencePage(this);
-// parseOnSave.setPreferenceStore(getPreferenceStore());
-// parseOnSave.load();
-
- return composite;
- }
-}
--
1.7.1