misc

diff --git a/archive/net.sourceforge.phpeclipse.news/plugin.xml b/archive/net.sourceforge.phpeclipse.news/plugin.xml
index 60d7585..2223db8 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.news/plugin.xml
+++ b/archive/net.sourceforge.phpeclipse.news/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.phpeclipse.news"
    name="PHPeclipse RSS News"
-   version="1.1.1"
+   version="1.1.2"
    provider-name="phpeclipse.de"
    class="net.sourceforge.phpeclipse.news.Plugin">
 

diff --git a/archive/net.sourceforge.phpeclipse.wiki/.classpath b/archive/net.sourceforge.phpeclipse.wiki/.classpath
index 88cef53..9b111bc 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.wiki/.classpath
+++ b/archive/net.sourceforge.phpeclipse.wiki/.classpath
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src/"/>
+       <classpathentry kind="src" path="src"/>
        <classpathentry kind="lib" path="lib/xmlrpc-1.1.jar"/>
        <classpathentry kind="lib" path="lib/radeox.jar"/>
        <classpathentry kind="lib" path="lib/commons-logging.jar"/>
        <classpathentry kind="lib" path="lib/commons-httpclient-2.0.2.jar"/>
-       <classpathentry kind="lib" path="lib/java2html_4.1.jar"/>
        <classpathentry kind="lib" path="lib/plog4u.jar"/>
        <classpathentry kind="lib" path="lib/velocity-dep-1.4.jar"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

diff --git a/archive/net.sourceforge.phpeclipse.wiki/build.properties b/archive/net.sourceforge.phpeclipse.wiki/build.properties
index 202752c..85024c0 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.wiki/build.properties
+++ b/archive/net.sourceforge.phpeclipse.wiki/build.properties
@@ -6,8 +6,13 @@ bin.includes = plugin.xml,\
                commons-httpclient-2.0.2.jar,\
                commons-logging.jar,\
                radeox.jar,\
-               templates/
+               templates/,\
+               lib/,\
+               plugin.properties,\
+               cpl-v10.html,\
+               about.html
 src.includes = .classpath,\
                .project,\
                build.properties,\
-               src/
+               src/,\
+               build.xml

diff --git a/archive/net.sourceforge.phpeclipse.wiki/build.xml b/archive/net.sourceforge.phpeclipse.wiki/build.xml
index 4ad0f51..4242819 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.wiki/build.xml
+++ b/archive/net.sourceforge.phpeclipse.wiki/build.xml
@@ -37,7 +37,7 @@
                <antcall target="gather.bin.parts">
                        <param name="destination.temp.folder" value="${temp.folder}/"/>
                </antcall>
-               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.wiki_1.1.1.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.1" filesonly="false" whenempty="skip" update="false"/>
+               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.wiki_1.1.2.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.2" filesonly="false" whenempty="skip" update="false"/>
                <delete dir="${temp.folder}"/>
        </target>
 
@@ -48,12 +48,6 @@
                <javac destdir="${temp.folder}/wiki.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" source="${javacSource}" target="${javacTarget}"              >
                        <compilerarg line="${compilerArg}"/>
                        <classpath>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.ide_3.0.1/ide.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.win32_3.0.1/ide.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.win32_3.0.1/workbenchwin32.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.core.resources_3.0.1/resources.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.core.resources.win32_3.0.0/resources.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.core.resources.win32_3.0.0/resources-win32.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.core.runtime_3.0.1/runtime.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/core.jar"/>
@@ -63,6 +57,12 @@
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/defaultAdaptor.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/eclipseAdaptor.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
+                               <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.ide_3.0.1/ide.jar"/>
+                               <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.win32_3.0.1/ide.jar"/>
+                               <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.win32_3.0.1/workbenchwin32.jar"/>
+                               <pathelement path="../../../eclipse301/plugins/org.eclipse.core.resources_3.0.1/resources.jar"/>
+                               <pathelement path="../../../eclipse301/plugins/org.eclipse.core.resources.win32_3.0.0/resources.jar"/>
+                               <pathelement path="../../../eclipse301/plugins/org.eclipse.core.resources.win32_3.0.0/resources-win32.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.help_3.0.0/help.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui_3.0.1/ui.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.swt_3.0.1/ws/${basews}/swt.jar"/>
@@ -88,11 +88,15 @@
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.editors_3.0.1/editors.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench.texteditor_3.0.1/texteditor.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.core.filebuffers_3.0.1/filebuffers.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.webbrowser/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.webbrowser/webbrowser.jar"/>
-                               <pathelement path="radeox.jar"/>
-                               <pathelement path="commons-logging.jar"/>
-                               <pathelement path="commons-httpclient-2.0.2.jar"/>
+                               <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.webbrowser/bin"/>
+                               <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.webbrowser/webbrowser.jar"/>
+                               <pathelement path="lib/xmlrpc-1.1.jar"/>
+                               <pathelement path="lib/radeox.jar"/>
+                               <pathelement path="lib/commons-logging.jar"/>
+                               <pathelement path="lib/commons-httpclient-2.0.2.jar"/>
+                               <pathelement path="lib/java2html_4.1.jar"/>
+                               <pathelement path="lib/plog4u.jar"/>
+                               <pathelement path="lib/velocity-dep-1.4.jar"/>
                        </classpath>
                        <src path="src/"                        />
                        </javac>
@@ -123,12 +127,12 @@
        </target>
 
        <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.1"/>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.1" failonerror="true">
+               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.2"/>
+               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.2" failonerror="true">
                        <fileset dir="${build.result.folder}" includes="wiki.jar"                       />
                </copy>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.1" failonerror="true">
-                       <fileset dir="${basedir}" includes="plugin.xml,wiki.jar,icons/,commons-httpclient-2.0.2.jar,commons-logging.jar,radeox.jar,templates/"                  />
+               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.2" failonerror="true">
+                       <fileset dir="${basedir}" includes="plugin.xml,wiki.jar,icons/,commons-httpclient-2.0.2.jar,commons-logging.jar,radeox.jar,templates/,lib/,plugin.properties,cpl-v10.html,about.html"                   />
                </copy>
        </target>
 
@@ -136,23 +140,23 @@
        </target>
 
        <target name="gather.sources" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.1"/>
-               <copy file="${build.result.folder}/wikisrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.1" failonerror="false"/>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.1" failonerror="false">
-                       <fileset dir="${basedir}" includes=".classpath,.project,build.properties,src/"                  />
+               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.2"/>
+               <copy file="${build.result.folder}/wikisrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.2" failonerror="false"/>
+               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.2" failonerror="false">
+                       <fileset dir="${basedir}" includes=".classpath,.project,build.properties,src/,build.xml"                        />
                </copy>
        </target>
 
        <target name="gather.logs" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.1"/>
-               <copy file="${temp.folder}/wiki.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.1" failonerror="false"/>
+               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.2"/>
+               <copy file="${temp.folder}/wiki.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.wiki_1.1.2" failonerror="false"/>
        </target>
 
        <target name="clean" depends="init" description="Clean the plug-in: net.sourceforge.phpeclipse.wiki of all the zips, jars and logs created.">
                <delete file="${build.result.folder}/wiki.jar"/>
                <delete file="${build.result.folder}/wikisrc.zip"/>
-               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.wiki_1.1.1.jar"/>
-               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.wiki_1.1.1.zip"/>
+               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.wiki_1.1.2.jar"/>
+               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.wiki_1.1.2.zip"/>
                <delete dir="${temp.folder}"/>
        </target>
 
@@ -175,7 +179,7 @@
                <delete>
                        <fileset dir="${temp.folder}" includes="**/*.bin.log"                   />
                </delete>
-               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.wiki_1.1.1.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.wiki_1.1.2.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
                <delete dir="${temp.folder}"/>
        </target>
 

diff --git a/archive/net.sourceforge.phpeclipse.wiki/lib/java2html_4.1.jar b/archive/net.sourceforge.phpeclipse.wiki/lib/java2html_4.1.jar
deleted file mode 100644 (file)
index f35dd46..0000000
Binary files a/archive/net.sourceforge.phpeclipse.wiki/lib/java2html_4.1.jar and /dev/null differ

diff --git a/archive/net.sourceforge.phpeclipse.wiki/plugin.xml b/archive/net.sourceforge.phpeclipse.wiki/plugin.xml
index a5e770e..55114a6 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.wiki/plugin.xml
+++ b/archive/net.sourceforge.phpeclipse.wiki/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.phpeclipse.wiki"
    name="Wikipedia Editor Plug-in"
-   version="1.1.1"
+   version="1.1.2"
    provider-name="www.phpeclipse.de"
    class="net.sourceforge.phpeclipse.wiki.editor.WikiEditorPlugin">
 
@@ -228,7 +228,7 @@
          point="org.eclipse.ui.propertyPages">
       <page
             objectClass="org.eclipse.core.resources.IProject"
-            name="Static Wiki Project Settings"
+            name="Wiki Project Settings"
             class="net.sourceforge.phpeclipse.wiki.preferences.WikiProjectPreferences"
             id="net.sourceforge.phpeclipse.wiki.preferences.WikiProjectPreferences">
       </page>

diff --git a/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/editor/WikiEditorMessages.properties b/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/editor/WikiEditorMessages.properties
index 9b35369..ef7be43 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/editor/WikiEditorMessages.properties
+++ b/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/editor/WikiEditorMessages.properties
@@ -8,3 +8,6 @@ Export.wizardTitle=Wiki Text Exporter
 Export.wizardDescription=Export Wiki texts to the file system
 Export.wizardBrowse=Browse...
 Export.wizardSelectFolder=Select a folder
+Export.wizardFolder=Wiki Texts Directory
+Export.wizardExportDirectory=Wiki Export Directory
+ 
\ No newline at end of file

diff --git a/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/export/WikiExporter.java b/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/export/WikiExporter.java
index 998bdc7..29a3bb8 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/export/WikiExporter.java
+++ b/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/export/WikiExporter.java
@@ -21,10 +21,10 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 
-import de.java2html.converter.JavaSource2HTMLConverter;
-import de.java2html.javasource.JavaSource;
-import de.java2html.javasource.JavaSourceParser;
-import de.java2html.options.Java2HtmlConversionOptions;
+//import de.java2html.converter.JavaSource2HTMLConverter;
+//import de.java2html.javasource.JavaSource;
+//import de.java2html.javasource.JavaSourceParser;
+//import de.java2html.options.Java2HtmlConversionOptions;
 
 public final class WikiExporter {
 
@@ -128,19 +128,19 @@ public final class WikiExporter {
     return "java".equals(resource.getFileExtension());
   }
 
-  private void javaToHtml(File source, File destination) throws IOException {
-    JavaSource java = new JavaSourceParser().parse(new FileReader(source));
-    JavaSource2HTMLConverter converter = new JavaSource2HTMLConverter(java);
-    Java2HtmlConversionOptions options = Java2HtmlConversionOptions.getDefault();
-    options.setShowLineNumbers(true);
-    options.setShowFileName(true);
-    options.setShowJava2HtmlLink(true);
-    converter.setConversionOptions(options);
-    FileWriter writer = new FileWriter(destination);
-    converter.convert(writer);
-    writer.flush();
-    writer.close();
-  }
+//  private void javaToHtml(File source, File destination) throws IOException {
+//    JavaSource java = new JavaSourceParser().parse(new FileReader(source));
+//    JavaSource2HTMLConverter converter = new JavaSource2HTMLConverter(java);
+//    Java2HtmlConversionOptions options = Java2HtmlConversionOptions.getDefault();
+//    options.setShowLineNumbers(true);
+//    options.setShowFileName(true);
+//    options.setShowJava2HtmlLink(true);
+//    converter.setConversionOptions(options);
+//    FileWriter writer = new FileWriter(destination);
+//    converter.convert(writer);
+//    writer.flush();
+//    writer.close();
+//  }
 
   private void copy(File source, File dest) throws IOException {
     FileChannel in = null;

diff --git a/net.sourceforge.phpeclipse.webbrowser/build.xml b/net.sourceforge.phpeclipse.webbrowser/build.xml
index 9f0a91c..da21309 100644 (file)
--- a/net.sourceforge.phpeclipse.webbrowser/build.xml
+++ b/net.sourceforge.phpeclipse.webbrowser/build.xml
@@ -37,7 +37,7 @@
                <antcall target="gather.bin.parts">
                        <param name="destination.temp.folder" value="${temp.folder}/"/>
                </antcall>
-               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.webbrowser_1.1.1.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1" filesonly="false" whenempty="skip" update="false"/>
+               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.webbrowser_1.1.2.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2" filesonly="false" whenempty="skip" update="false"/>
                <delete dir="${temp.folder}"/>
        </target>
 
@@ -60,12 +60,15 @@
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/defaultAdaptor.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/eclipseAdaptor.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.ui_3.0.1/ui.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.help_3.0.0/help.jar"/>
+                               <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench.texteditor_3.0.1/texteditor.jar"/>
+                               <pathelement path="../../../eclipse301/plugins/org.eclipse.jface.text_3.0.1/jfacetext.jar"/>
+                               <pathelement path="../../../eclipse301/plugins/org.eclipse.text_3.0.1/text.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.swt_3.0.1/ws/${basews}/swt.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.swt.win32_3.0.1/ws/${basews}/swt.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.swt.win32_3.0.1"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.jface_3.0.0/jface.jar"/>
+                               <pathelement path="../../../eclipse301/plugins/org.eclipse.ui_3.0.1/ui.jar"/>
+                               <pathelement path="../../../eclipse301/plugins/org.eclipse.help_3.0.0/help.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench_3.0.1/compatibility.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench_3.0.1/workbench.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench.compatibility_3.0.0/compatibility.jar"/>
@@ -84,9 +87,6 @@
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.help.appserver_3.0.0/appserver.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.forms_3.0.0/forms.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.editors_3.0.1/editors.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench.texteditor_3.0.1/texteditor.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.jface.text_3.0.1/jfacetext.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.text_3.0.1/text.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.core.filebuffers_3.0.1/filebuffers.jar"/>
                        </classpath>
                        <src path="src/"                        />
@@ -118,11 +118,11 @@
        </target>
 
        <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1"/>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1" failonerror="true">
+               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2"/>
+               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2" failonerror="true">
                        <fileset dir="${build.result.folder}" includes="webbrowser.jar"                 />
                </copy>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1" failonerror="true">
+               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2" failonerror="true">
                        <fileset dir="${basedir}" includes="plugin.xml,*.jar,plugin.properties/,webbrowser.jar,icons/,home/,plugin.properties,defaultBrowsers.xml,.options"                     />
                </copy>
        </target>
@@ -131,23 +131,23 @@
        </target>
 
        <target name="gather.sources" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1"/>
-               <copy file="${build.result.folder}/webbrowsersrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1" failonerror="false"/>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1" failonerror="false">
+               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2"/>
+               <copy file="${build.result.folder}/webbrowsersrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2" failonerror="false"/>
+               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2" failonerror="false">
                        <fileset dir="${basedir}" includes="plugin.properties/,schema/,build.properties,src/,.classpath,.cvsignore,.project"                    />
                </copy>
        </target>
 
        <target name="gather.logs" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1"/>
-               <copy file="${temp.folder}/webbrowser.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1" failonerror="false"/>
+               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2"/>
+               <copy file="${temp.folder}/webbrowser.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2" failonerror="false"/>
        </target>
 
        <target name="clean" depends="init" description="Clean the plug-in: net.sourceforge.phpeclipse.webbrowser of all the zips, jars and logs created.">
                <delete file="${build.result.folder}/webbrowser.jar"/>
                <delete file="${build.result.folder}/webbrowsersrc.zip"/>
-               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.webbrowser_1.1.1.jar"/>
-               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.webbrowser_1.1.1.zip"/>
+               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.webbrowser_1.1.2.jar"/>
+               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.webbrowser_1.1.2.zip"/>
                <delete dir="${temp.folder}"/>
        </target>
 
@@ -170,7 +170,7 @@
                <delete>
                        <fileset dir="${temp.folder}" includes="**/*.bin.log"                   />
                </delete>
-               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.webbrowser_1.1.1.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.webbrowser_1.1.2.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
                <delete dir="${temp.folder}"/>
        </target>
 

diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BrowserManager.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BrowserManager.java
index 30a22f9..d5dea45 100644 (file)
--- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BrowserManager.java
+++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BrowserManager.java
@@ -189,12 +189,16 @@ public class BrowserManager {
     }
 
     // add the internal browser if we can
+//    WebBrowserUIPlugin.getInstance().getLog().log(
+//        new Status(IStatus.INFO, WebBrowserUIPlugin.PLUGIN_ID, 0, WebBrowserUtil.canUseInternalWebBrowser() + "/"
+//            + WebBrowserUtil.isInternalBrowserOperational(), null));
+//    if (!WebBrowserUtil.canUseInternalWebBrowser() || !WebBrowserUtil.isInternalBrowserOperational())
+//      return;
     WebBrowserUIPlugin.getInstance().getLog().log(
-        new Status(IStatus.INFO, WebBrowserUIPlugin.PLUGIN_ID, 0, WebBrowserUtil.canUseInternalWebBrowser() + "/"
-            + WebBrowserUtil.isInternalBrowserOperational(), null));
-    if (!WebBrowserUtil.canUseInternalWebBrowser() || !WebBrowserUtil.isInternalBrowserOperational())
+        new Status(IStatus.INFO, WebBrowserUIPlugin.PLUGIN_ID, 0, 
+            "-"+WebBrowserUtil.isInternalBrowserOperational(), null));
+    if (!WebBrowserUtil.isInternalBrowserOperational())
       return;
-
     browserList.add(0, new InternalWebBrowser());
   }
 

diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java
index d0b396f..0a27dfd 100644 (file)
--- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java
+++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java
@@ -131,7 +131,8 @@ public class WebBrowser extends Composite {
     }
 
     // create a new SWT Web browser widget, checking once again to make sure we can use it in this environment
-    if (WebBrowserUtil.canUseInternalWebBrowser() & WebBrowserUtil.isInternalBrowserOperational())
+//    if (WebBrowserUtil.canUseInternalWebBrowser() & WebBrowserUtil.isInternalBrowserOperational())
+    if (WebBrowserUtil.isInternalBrowserOperational())
       this.browser = new Browser(this, SWT.NONE);
     else {
       WebBrowserUtil.openError(WebBrowserUIPlugin.getResource("%errorCouldNotLaunchInternalWebBrowser"));

diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserUtil.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserUtil.java
index 372058f..8c9c278 100644 (file)
--- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserUtil.java
+++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserUtil.java
@@ -245,7 +245,7 @@ public class WebBrowserUtil {
         * 
         * @return boolean
         */
-       protected static boolean isInternalBrowserOperational() {
+       public static boolean isInternalBrowserOperational() {
                // if we have already figured this out, don't do it again.
                if (isInternalBrowserOperational != null)
                        return isInternalBrowserOperational.booleanValue();

diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java
index 5f13ca2..3cd384e 100644 (file)
--- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java
+++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java
@@ -38,7 +38,7 @@ public class BrowserView extends ViewPart {
    */
   public void createPartControl(Composite frame) {
     try {
-      if (WebBrowserUtil.canUseInternalWebBrowser()) {
+      if (WebBrowserUtil.isInternalBrowserOperational()) {
         instance = new WebBrowser(frame, true, true);
       } 
     } catch (Exception e) {