AND, OR added

[phpeclipse.git] / archive / net.sourceforge.phpeclipse.wiki / plugin.xml

diff --git a/archive/net.sourceforge.phpeclipse.wiki/plugin.xml b/archive/net.sourceforge.phpeclipse.wiki/plugin.xml
index a08e763..e90fdb7 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.wiki/plugin.xml
+++ b/archive/net.sourceforge.phpeclipse.wiki/plugin.xml
@@ -15,7 +15,6 @@
       <library name="lib/radeox.jar"/>
       <library name="lib/commons-logging.jar"/>
       <library name="lib/commons-httpclient-2.0.2.jar"/>
-      <library name="lib/java2html_4.1.jar"/>
       <library name="lib/plog4u.jar"/>
       <library name="lib/velocity-dep-1.4.jar"/>
       <library name="lib/mysql-connector.jar"/>
@@ -336,46 +335,61 @@
                id="net.sourceforge.phpeclipse.wiki.actions.blogwiki.NewPostBlogHTMLAction">
          </action> 
       </viewerContribution>       
-      
-      <viewerContribution
+            <viewerContribution
             targetID="#EditorContext"
             id="net.sourceforge.phpeclipse.wiki.texteditor.viewercontribution">
          <menu
-                       id="mediawikiMenu"
-                       label="%MediaWiki.label"
+                       id="mediawikiUploadMenu"
+                       label="%MediaWiki.upload.label"
                        path="rest">
                 </menu>
+         <action
+               label="Upload to Wikipedia..."
+               class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.post.StoreWikipediaAction"
+               menubarPath="mediawikiUploadMenu/additions"
+               id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.post.StoreWikipediaAction">
+         </action>
+      </viewerContribution>
+      <viewerContribution
+            targetID="#EditorContext"
+            id="net.sourceforge.phpeclipse.wiki.texteditor.viewercontribution">
+         <menu
+                       id="mediawikiDownloadMenu"
+                       label="%MediaWiki.download.label"
+                       path="rest">
+                </menu>  
                 <action
                label="Refresh Text from SQL"
                class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.LoadWikipediaSQLAction"
-               menubarPath="mediawikiMenu/additions"
+               menubarPath="mediawikiDownloadMenu/additions"
                id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.LoadWikipediaSQLAction">
          </action>
                 <action
-               label="Refresh Wikibooks-en"
+               label="Download from Wikibooks-en"
                class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikibooksENAction"
-               menubarPath="mediawikiMenu/additions"
+               menubarPath="mediawikiDownloadMenu/additions"
                id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikibooksENAction">
          </action>
          <action
-               label="Refresh Wikipedia-en"
+               label="Download from Wikipedia-en"
                class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikipediaENAction"
-               menubarPath="mediawikiMenu/additions"
+               menubarPath="mediawikiDownloadMenu/additions"
                id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikipediaENAction">
          </action>
   <!--       <action 
                label="Download Link's Wiki Text (Wikibooks.org)"
                class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikiLinkEditorAction"
-               menubarPath="mediawikiMenu/additions"
+               menubarPath="mediawikiDownloadMenu/additions"
                id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikiLinkEditorAction">
          </action> -->
          <action
-               label="Refresh Wikipedia..."
+               label="Download from Wikipedia..."
                class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikipediaAction"
-               menubarPath="mediawikiMenu/additions"
+               menubarPath="mediawikiDownloadMenu/additions"
                id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikipediaAction">
          </action>
       </viewerContribution>   
+      
       <viewerContribution
             targetID="#CompilationUnitEditorContext"
             id="net.sourceforge.phpeclipse.wiki.phpeditor.viewercontribution">