From: axelcl Date: Thu, 16 Dec 2004 21:13:06 +0000 (+0000) Subject: misc X-Git-Url: http://git.phpeclipse.com?hp=990f5e0caceb00ae7f4e94832dd3ae952c265232 misc --- diff --git a/archive/net.sourceforge.phpeclipse.news/plugin.xml b/archive/net.sourceforge.phpeclipse.news/plugin.xml index 60d7585..2223db8 100644 --- a/archive/net.sourceforge.phpeclipse.news/plugin.xml +++ b/archive/net.sourceforge.phpeclipse.news/plugin.xml @@ -3,7 +3,7 @@ diff --git a/archive/net.sourceforge.phpeclipse.wiki/.classpath b/archive/net.sourceforge.phpeclipse.wiki/.classpath index 88cef53..9b111bc 100644 --- a/archive/net.sourceforge.phpeclipse.wiki/.classpath +++ b/archive/net.sourceforge.phpeclipse.wiki/.classpath @@ -1,11 +1,10 @@ - + - diff --git a/archive/net.sourceforge.phpeclipse.wiki/build.properties b/archive/net.sourceforge.phpeclipse.wiki/build.properties index 202752c..85024c0 100644 --- 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 --- a/archive/net.sourceforge.phpeclipse.wiki/build.xml +++ b/archive/net.sourceforge.phpeclipse.wiki/build.xml @@ -37,7 +37,7 @@ - + @@ -48,12 +48,6 @@ - - - - - - @@ -63,6 +57,12 @@ + + + + + + @@ -88,11 +88,15 @@ - - - - - + + + + + + + + + @@ -123,12 +127,12 @@ - - + + - - + + @@ -136,23 +140,23 @@ - - - - + + + + - - + + - - + + @@ -175,7 +179,7 @@ - + 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 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 --- a/archive/net.sourceforge.phpeclipse.wiki/plugin.xml +++ b/archive/net.sourceforge.phpeclipse.wiki/plugin.xml @@ -3,7 +3,7 @@ @@ -228,7 +228,7 @@ point="org.eclipse.ui.propertyPages"> 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 --- 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 --- 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 --- a/net.sourceforge.phpeclipse.webbrowser/build.xml +++ b/net.sourceforge.phpeclipse.webbrowser/build.xml @@ -37,7 +37,7 @@ - + @@ -60,12 +60,15 @@ - - + + + + + @@ -84,9 +87,6 @@ - - - @@ -118,11 +118,11 @@ - - + + - + @@ -131,23 +131,23 @@ - - - + + + - - + + - - + + @@ -170,7 +170,7 @@ - + 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 --- 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 --- 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 --- 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 --- 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) {