[Plog4u-devel] net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/editor WikiEdit
Status: Beta
Brought to you by:
axelcl
From: Axel C. K. <ax...@us...> - 2006-06-18 16:03:02
|
Update of /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10043/src/net/sourceforge/phpeclipse/wiki/editor Modified Files: WikiEditorPlugin.java Log Message: Added nmespaces for Image and Template Index: WikiEditorPlugin.java =================================================================== RCS file: /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/editor/WikiEditorPlugin.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** WikiEditorPlugin.java 12 Mar 2006 21:01:57 -0000 1.8 --- WikiEditorPlugin.java 18 Jun 2006 16:02:57 -0000 1.9 *************** *** 48,57 **** import org.plog4u.webbrowser.internal.Trace; ! public class WikiEditorPlugin extends AbstractUIPlugin { private static WikiEditorPlugin fgPlugin; public final static boolean ENABLE_WIKI_PARSER = false; ! public final static String UTF8 = "UTF-8"; --- 48,58 ---- import org.plog4u.webbrowser.internal.Trace; ! public class WikiEditorPlugin extends AbstractUIPlugin ! { private static WikiEditorPlugin fgPlugin; public final static boolean ENABLE_WIKI_PARSER = false; ! public final static String UTF8 = "UTF-8"; *************** *** 62,67 **** public final static String XML_START_1 = "<?xml version=\"1.0\" encoding=\""; ! public final static String XML_START_2 = "\" ?>\n" ! + "<mediawiki version=\"0.1\">\n"; public final static String XML_END = "\n</mediawiki>"; --- 63,67 ---- public final static String XML_START_1 = "<?xml version=\"1.0\" encoding=\""; ! public final static String XML_START_2 = "\" ?>\n" + "<mediawiki version=\"0.1\">\n"; public final static String XML_END = "\n</mediawiki>"; *************** *** 92,98 **** public static final String PLOG4U_ORG_STORE = PREFIX_STORE + "Plog4UORG"; ! public static final String[] PREDEFINED_TYPES = { HTTP_QUERY, ! WIKIPEDIA_SQL, ! // PLOG4U_DE_LOAD, // PLOG4U_DE_STORE, // PLOG4U_ORG_LOAD, --- 92,97 ---- public static final String PLOG4U_ORG_STORE = PREFIX_STORE + "Plog4UORG"; ! public static final String[] PREDEFINED_TYPES = { HTTP_QUERY, WIKIPEDIA_SQL, ! // PLOG4U_DE_LOAD, // PLOG4U_DE_STORE, // PLOG4U_ORG_LOAD, *************** *** 147,150 **** --- 146,153 ---- public final static String EXPORT_CSS_URL = "__export_css_url"; + public final static String WIKI_LOCALE = "__wiki_locale"; + + public final static String DOWNLOAD_IMAGES = "__download_images"; + public final static String PREF_STRING_CONFIGURATIONS = "__configurations4"; *************** *** 225,230 **** * the base URL for the image */ ! protected static void createImageDescriptor(WikiEditorPlugin plugin, ! String id, URL baseURL) { // Delegate to the plugin instance to avoid concurrent class loading // problems --- 228,233 ---- * the base URL for the image */ ! protected static void createImageDescriptor(WikiEditorPlugin plugin, String id, URL baseURL) ! { // Delegate to the plugin instance to avoid concurrent class loading // problems *************** *** 232,236 **** } ! public static WikiEditorPlugin getDefault() { return fgPlugin; } --- 235,240 ---- } ! public static WikiEditorPlugin getDefault() ! { return fgPlugin; } *************** *** 244,248 **** * @return the image associated with the given ID */ ! public static ImageDescriptor getImageDescriptor(String id) { // Delegate to the plugin instance to avoid concurrent class loading // problems --- 248,253 ---- * @return the image associated with the given ID */ ! public static ImageDescriptor getImageDescriptor(String id) ! { // Delegate to the plugin instance to avoid concurrent class loading // problems *************** *** 259,266 **** * @return the image */ ! public static ImageDescriptor getImageDescriptorFromExtension( ! IExtension extension, String subdirectoryAndFilename) { ! IPluginDescriptor pluginDescriptor = extension ! .getDeclaringPluginDescriptor(); URL path = pluginDescriptor.getInstallURL(); URL fullPathString = null; --- 264,270 ---- * @return the image */ ! public static ImageDescriptor getImageDescriptorFromExtension(IExtension extension, String subdirectoryAndFilename) ! { ! IPluginDescriptor pluginDescriptor = extension.getDeclaringPluginDescriptor(); URL path = pluginDescriptor.getInstallURL(); URL fullPathString = null; *************** *** 273,279 **** } ! public static String getResourceString(String key) { ! ResourceBundle bundle = WikiEditorPlugin.getDefault() ! .getResourceBundle(); try { return (bundle != null) ? bundle.getString(key) : key; --- 277,283 ---- } ! public static String getResourceString(String key) ! { ! ResourceBundle bundle = WikiEditorPlugin.getDefault().getResourceBundle(); try { return (bundle != null) ? bundle.getString(key) : key; *************** *** 288,292 **** * is returned. Otherwise the method returns the default display. */ ! public static Display getStandardDisplay() { Display display = Display.getCurrent(); if (display == null) { --- 292,297 ---- * is returned. Otherwise the method returns the default display. */ ! public static Display getStandardDisplay() ! { Display display = Display.getCurrent(); if (display == null) { *************** *** 304,308 **** private Hashtable imageDescriptors = new Hashtable(20); ! public WikiEditorPlugin(IPluginDescriptor descriptor) { super(descriptor); initializeImages(); --- 309,314 ---- private Hashtable imageDescriptors = new Hashtable(20); ! public WikiEditorPlugin(IPluginDescriptor descriptor) ! { super(descriptor); initializeImages(); *************** *** 314,319 **** List list = loadWikipediaFavorites(); for (int i = 0; i < list.size(); i++) { ! SETTINGS_MAP.put((String) list.get(i), new WikipediaSettings( ! new WikiProperties((String) list.get(i)))); } for (int i = 0; i < list.size(); i++) { --- 320,324 ---- List list = loadWikipediaFavorites(); for (int i = 0; i < list.size(); i++) { ! SETTINGS_MAP.put((String) list.get(i), new WikipediaSettings(new WikiProperties((String) list.get(i)))); } for (int i = 0; i < list.size(); i++) { *************** *** 332,337 **** list = loadSOAPFavorites(); for (int i = 0; i < list.size(); i++) { ! SETTINGS_MAP.put((String) list.get(i), new WikipediaSettings( ! new WikiProperties((String) list.get(i)))); } for (int i = 0; i < list.size(); i++) { --- 337,341 ---- list = loadSOAPFavorites(); for (int i = 0; i < list.size(); i++) { ! SETTINGS_MAP.put((String) list.get(i), new WikipediaSettings(new WikiProperties((String) list.get(i)))); } for (int i = 0; i < list.size(); i++) { *************** *** 341,346 **** manager = ConfigurationManager.getInstance(); try { ! fResourceBundle = ResourceBundle ! .getBundle("net.sourceforge.phpeclipse.wiki.editor.WikiEditorMessages"); } catch (MissingResourceException x) { fResourceBundle = null; --- 345,349 ---- manager = ConfigurationManager.getInstance(); try { ! fResourceBundle = ResourceBundle.getBundle("net.sourceforge.phpeclipse.wiki.editor.WikiEditorMessages"); } catch (MissingResourceException x) { fResourceBundle = null; *************** *** 351,355 **** * Creates an image and places it in the image registry. */ ! protected void createImageDescriptor(String id, URL baseURL) { URL url = null; try { --- 354,359 ---- * Creates an image and places it in the image registry. */ ! protected void createImageDescriptor(String id, URL baseURL) ! { URL url = null; try { *************** *** 361,365 **** } ! public IWorkbenchPage getActivePage() { IWorkbenchWindow window = getWorkbench().getActiveWorkbenchWindow(); if (window != null) --- 365,370 ---- } ! public IWorkbenchPage getActivePage() ! { IWorkbenchWindow window = getWorkbench().getActiveWorkbenchWindow(); if (window != null) *************** *** 368,381 **** } ! public ContextTypeRegistry getContextTypeRegistry() { if (fContextTypeRegistry == null) { fContextTypeRegistry = new ContributionContextTypeRegistry(); ! fContextTypeRegistry ! .addContextType("net.sourceforge.phpeclipse.wiki.editor.templates"); } return fContextTypeRegistry; } ! public Image getImage(String key) { Image image = getImageRegistry().get(key); if (image == null) { --- 373,387 ---- } ! public ContextTypeRegistry getContextTypeRegistry() ! { if (fContextTypeRegistry == null) { fContextTypeRegistry = new ContributionContextTypeRegistry(); ! fContextTypeRegistry.addContextType("net.sourceforge.phpeclipse.wiki.editor.templates"); } return fContextTypeRegistry; } ! public Image getImage(String key) ! { Image image = getImageRegistry().get(key); if (image == null) { *************** *** 387,399 **** } ! public ResourceBundle getResourceBundle() { return fResourceBundle; } ! public TemplateStore getTemplateStore() { if (fTemplateStore == null) { ! fTemplateStore = new ContributionTemplateStore( ! getContextTypeRegistry(), ! getDefault().getPreferenceStore(), "templates"); try { fTemplateStore.load(); --- 393,405 ---- } ! public ResourceBundle getResourceBundle() ! { return fResourceBundle; } ! public TemplateStore getTemplateStore() ! { if (fTemplateStore == null) { ! fTemplateStore = new ContributionTemplateStore(getContextTypeRegistry(), getDefault().getPreferenceStore(), "templates"); try { fTemplateStore.load(); *************** *** 406,410 **** } ! private static boolean isDefined(String test) { if (test != null && test.length() > 0) { for (int i = 0; i < test.length(); i++) { --- 412,417 ---- } ! private static boolean isDefined(String test) ! { if (test != null && test.length() > 0) { for (int i = 0; i < test.length(); i++) { *************** *** 422,426 **** * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeDefaultPreferences(org.eclipse.jface.preference.IPreferenceStore) */ ! protected void initializeDefaultPreferences(IPreferenceStore store) { store.setDefault(PREF_STRING_CONFIGURATIONS, CONFIG_MEMENTO); store.setDefault(CONSOLE_OUTPUT, "true"); --- 429,434 ---- * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeDefaultPreferences(org.eclipse.jface.preference.IPreferenceStore) */ ! protected void initializeDefaultPreferences(IPreferenceStore store) ! { store.setDefault(PREF_STRING_CONFIGURATIONS, CONFIG_MEMENTO); store.setDefault(CONSOLE_OUTPUT, "true"); *************** *** 431,444 **** InputStream is = null; try { ! is = getDefault().openStream( ! new Path("prefs/default_" + operatingSystem ! + ".properties")); } catch (IOException ioe) { // use this as the default settings: ! is = getDefault().openStream( ! new Path("prefs/default_unknown.properties")); } ! PropertyResourceBundle resourceBundle = new PropertyResourceBundle( ! is); String key = EDITOR_WRAP_WORDS; --- 439,448 ---- InputStream is = null; try { ! is = getDefault().openStream(new Path("prefs/default_" + operatingSystem + ".properties")); } catch (IOException ioe) { // use this as the default settings: ! is = getDefault().openStream(new Path("prefs/default_unknown.properties")); } ! PropertyResourceBundle resourceBundle = new PropertyResourceBundle(is); String key = EDITOR_WRAP_WORDS; *************** *** 548,559 **** } catch (Exception e) { ! store.setDefault(EDITOR_WRAP_WORDS, "false"); ! store.setDefault(HTTP_GET_THROTTLE, "1000"); // 1 second ! store.setDefault(HTTP_PUT_THROTTLE, "5000"); // 5 seconds ! store.setDefault(HTTP_TIMEOUT, "30000"); // 30 seconds timeout ! store.setDefault(HTTP_PROXYHOST, System.getProperty(HTTP_PROXYHOST, "")); ! store.setDefault(HTTP_PROXYPORT, System.getProperty(HTTP_PROXYPORT, "80")); ! store.setDefault(HTTP_PROXYUSERNAME, System.getProperty(HTTP_PROXYUSERNAME, "")); ! store.setDefault(HTTP_PROXYPASSWORD, System.getProperty(HTTP_PROXYPASSWORD, "")); } --- 552,563 ---- } catch (Exception e) { ! store.setDefault(EDITOR_WRAP_WORDS, "false"); ! store.setDefault(HTTP_GET_THROTTLE, "1000"); // 1 second ! store.setDefault(HTTP_PUT_THROTTLE, "5000"); // 5 seconds ! store.setDefault(HTTP_TIMEOUT, "30000"); // 30 seconds timeout ! store.setDefault(HTTP_PROXYHOST, System.getProperty(HTTP_PROXYHOST, "")); ! store.setDefault(HTTP_PROXYPORT, System.getProperty(HTTP_PROXYPORT, "80")); ! store.setDefault(HTTP_PROXYUSERNAME, System.getProperty(HTTP_PROXYUSERNAME, "")); ! store.setDefault(HTTP_PROXYPASSWORD, System.getProperty(HTTP_PROXYPASSWORD, "")); } *************** *** 566,570 **** * of why this is required. */ ! private void initializeImages() { URL baseURL = getDescriptor().getInstallURL(); --- 570,575 ---- * of why this is required. */ ! private void initializeImages() ! { URL baseURL = getDescriptor().getInstallURL(); *************** *** 581,601 **** } ! public void log(String message) { ! getDefault().getLog().log( ! new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, null)); } ! public void log(String message, Exception e) { ! getDefault().getLog().log( ! new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, ! "Caught exception", e)); } ! public void logAndReport(String title, String message, Exception e) { log(message, e); reportError(title, message); } ! private void privateCreateImageDescriptor(String id, URL baseURL) { URL url = null; try { --- 586,607 ---- } ! public void log(String message) ! { ! getDefault().getLog().log(new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, null)); } ! public void log(String message, Exception e) ! { ! getDefault().getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, "Caught exception", e)); } ! public void logAndReport(String title, String message, Exception e) ! { log(message, e); reportError(title, message); } ! private void privateCreateImageDescriptor(String id, URL baseURL) ! { URL url = null; try { *************** *** 607,614 **** } ! private ImageDescriptor privateGetImageDescriptor(String id) { if (!imageDescriptors.containsKey(id)) { ! URL baseURL = WikiEditorPlugin.getDefault().getDescriptor() ! .getInstallURL(); createImageDescriptor(getDefault(), id, baseURL); } --- 613,620 ---- } ! private ImageDescriptor privateGetImageDescriptor(String id) ! { if (!imageDescriptors.containsKey(id)) { ! URL baseURL = WikiEditorPlugin.getDefault().getDescriptor().getInstallURL(); createImageDescriptor(getDefault(), id, baseURL); } *************** *** 616,620 **** } ! public void reportError(String title, String message) { try { // Shell shell = --- 622,627 ---- } ! public void reportError(String title, String message) ! { try { // Shell shell = *************** *** 637,641 **** * java.lang.String */ ! public static String getResource(String key) { try { return Platform.getResourceString(getDefault().getBundle(), key); --- 644,649 ---- * java.lang.String */ ! public static String getResource(String key) ! { try { return Platform.getResourceString(getDefault().getBundle(), key); *************** *** 655,659 **** * @return java.lang.String */ ! public static String getResource(String key, Object[] obj) { try { return MessageFormat.format(getResource(key), obj); --- 663,668 ---- * @return java.lang.String */ ! public static String getResource(String key, Object[] obj) ! { try { return MessageFormat.format(getResource(key), obj); *************** *** 673,677 **** * @return java.lang.String */ ! public static String getResource(String key, String s) { try { return MessageFormat.format(getResource(key), new String[] { s }); --- 682,687 ---- * @return java.lang.String */ ! public static String getResource(String key, String s) ! { try { return MessageFormat.format(getResource(key), new String[] { s }); *************** *** 686,690 **** * @return java.util.List */ ! public static List getConfigurations() { return manager.getConfigurations(); } --- 696,701 ---- * @return java.util.List */ ! public static List getConfigurations() ! { return manager.getConfigurations(); } *************** *** 695,707 **** * @return working copy */ ! public static IConfigurationWorkingCopy createConfiguration() { return manager.createConfiguration(); } ! public static ArrayList getTypes() { return CONFIGURATION_TYPES; } ! public static void addType(String type) { CONFIGURATION_TYPES.add(type); } --- 706,721 ---- * @return working copy */ ! public static IConfigurationWorkingCopy createConfiguration() ! { return manager.createConfiguration(); } ! public static ArrayList getTypes() ! { return CONFIGURATION_TYPES; } ! public static void addType(String type) ! { CONFIGURATION_TYPES.add(type); } *************** *** 710,714 **** * (non - Javadoc) Method declared in Plugin */ ! public void start(BundleContext context) throws Exception { super.start(context); } --- 724,729 ---- * (non - Javadoc) Method declared in Plugin */ ! public void start(BundleContext context) throws Exception ! { super.start(context); } *************** *** 717,721 **** * @see org.eclipse.core.runtime.Plugin#stop */ ! public void stop(BundleContext context) throws Exception { try { if (fWikiDB != null) { --- 732,737 ---- * @see org.eclipse.core.runtime.Plugin#stop */ ! public void stop(BundleContext context) throws Exception ! { try { if (fWikiDB != null) { *************** *** 730,746 **** } ! public static void log(int severity, String message) { ! Status status = new Status(severity, PLUGIN_ID, IStatus.OK, message, ! null); log(status); } ! public static void log(IStatus status) { getDefault().getLog().log(status); } ! public static void log(Throwable e) { ! log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, ! "PHPeclipsePlugin.internalErrorOccurred", e)); //$NON-NLS-1$ } --- 746,763 ---- } ! public static void log(int severity, String message) ! { ! Status status = new Status(severity, PLUGIN_ID, IStatus.OK, message, null); log(status); } ! public static void log(IStatus status) ! { getDefault().getLog().log(status); } ! public static void log(Throwable e) ! { ! log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, "PHPeclipsePlugin.internalErrorOccurred", e)); //$NON-NLS-1$ } *************** *** 756,762 **** * @throws InvocationTargetException */ ! public static IWikipedia getWikiInstance(String wikiLocale) ! throws NoSuchMethodException, IllegalAccessException, ! ClassNotFoundException, InvocationTargetException { return (WikipediaSettings) SETTINGS_MAP.get(wikiLocale); // String className = --- 773,778 ---- * @throws InvocationTargetException */ ! public static IWikipedia getWikiInstance(String wikiLocale) ! { return (WikipediaSettings) SETTINGS_MAP.get(wikiLocale); // String className = *************** *** 771,783 **** * Returns the workspace instance. */ ! public static IWorkspace getWorkspace() { return ResourcesPlugin.getWorkspace(); } ! private static List loadWikipediaFavorites() { Trace.trace(Trace.FINEST, "->- Loading .favorites extension point ->-"); IExtensionRegistry registry = Platform.getExtensionRegistry(); ! IConfigurationElement[] cf = registry.getConfigurationElementsFor( ! PLUGIN_ID, "favorites"); int size = cf.length; --- 787,800 ---- * Returns the workspace instance. */ ! public static IWorkspace getWorkspace() ! { return ResourcesPlugin.getWorkspace(); } ! private static List loadWikipediaFavorites() ! { Trace.trace(Trace.FINEST, "->- Loading .favorites extension point ->-"); IExtensionRegistry registry = Platform.getExtensionRegistry(); ! IConfigurationElement[] cf = registry.getConfigurationElementsFor(PLUGIN_ID, "favorites"); int size = cf.length; *************** *** 788,810 **** if (type == null || type.equals("wikipedia")) { favorites.add(cf[i].getAttribute("name")); ! Trace.trace(Trace.FINEST, " Loaded favorite: " ! + cf[i].getAttribute("id")); } } catch (Throwable t) { ! Trace.trace(Trace.SEVERE, " Could not load favorite: " ! + cf[i].getAttribute("id"), t); } } ! Trace.trace(Trace.FINEST, ! "-<- Done loading .favorites extension point -<-"); return favorites; } ! private static List loadSOAPFavorites() { Trace.trace(Trace.FINEST, "->- Loading .favorites extension point ->-"); IExtensionRegistry registry = Platform.getExtensionRegistry(); ! IConfigurationElement[] cf = registry.getConfigurationElementsFor( ! PLUGIN_ID, "favorites"); int size = cf.length; --- 805,824 ---- if (type == null || type.equals("wikipedia")) { favorites.add(cf[i].getAttribute("name")); ! Trace.trace(Trace.FINEST, " Loaded favorite: " + cf[i].getAttribute("id")); } } catch (Throwable t) { ! Trace.trace(Trace.SEVERE, " Could not load favorite: " + cf[i].getAttribute("id"), t); } } ! Trace.trace(Trace.FINEST, "-<- Done loading .favorites extension point -<-"); return favorites; } ! private static List loadSOAPFavorites() ! { Trace.trace(Trace.FINEST, "->- Loading .favorites extension point ->-"); IExtensionRegistry registry = Platform.getExtensionRegistry(); ! IConfigurationElement[] cf = registry.getConfigurationElementsFor(PLUGIN_ID, "favorites"); int size = cf.length; *************** *** 815,829 **** if (type != null && type.equals("soap")) { favorites.add(cf[i].getAttribute("name")); ! Trace.trace(Trace.FINEST, " Loaded favorite: " ! + cf[i].getAttribute("id")); } } catch (Throwable t) { ! Trace.trace(Trace.SEVERE, " Could not load favorite: " ! + cf[i].getAttribute("id"), t); } } ! Trace.trace(Trace.FINEST, ! "-<- Done loading .favorites extension point -<-"); return favorites; } --- 829,840 ---- if (type != null && type.equals("soap")) { favorites.add(cf[i].getAttribute("name")); ! Trace.trace(Trace.FINEST, " Loaded favorite: " + cf[i].getAttribute("id")); } } catch (Throwable t) { ! Trace.trace(Trace.SEVERE, " Could not load favorite: " + cf[i].getAttribute("id"), t); } } ! Trace.trace(Trace.FINEST, "-<- Done loading .favorites extension point -<-"); return favorites; } |