Author: max.andersen(a)jboss.com Date: 2008-09-17 05:54:39 -0400 (Wed, 17 Sep 2008) New Revision: 10308 Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java Removed: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java Log: whoops - rollback accidential delete of src directories (JBIDE-2177) Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src (from rev 10303, trunk/common/plugins/org.jboss.tools.common.el.core/src) Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org (from rev 10303, trunk/common/plugins/org.jboss.tools.common.el.core/src/org) Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss (from rev 10303, trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss) Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools (from rev 10303, trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools) Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common (from rev 10303, trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common) Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el (from rev 10303, trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el) Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core (from rev 10303, trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core) Deleted: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java 2008-09-17 08:07:42 UTC (rev 10303) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java 2008-09-17 09:54:39 UTC (rev 10308) @@ -1,50 +0,0 @@ -package org.jboss.tools.common.el.core; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.common.el"; - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - -} Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java (from rev 10303, trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java) =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java 2008-09-17 09:54:39 UTC (rev 10308) @@ -0,0 +1,50 @@ +package org.jboss.tools.common.el.core; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.common.el"; + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} Deleted: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java 2008-09-17 08:07:42 UTC (rev 10303) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java 2008-09-17 09:54:39 UTC (rev 10308) @@ -1,36 +0,0 @@ -package org.jboss.tools.common.el.core; - - -import org.eclipse.core.runtime.QualifiedName; -import org.jboss.tools.common.resref.core.ResourceReferenceList; - - -/** - * The Class ELReferenceList. - */ -public class ELReferenceList extends ResourceReferenceList { - - /** The PROPERT y_ NAME. */ - private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.ELReference"); - - /** The instance. */ - static ELReferenceList instance = new ELReferenceList(); - - /** - * Gets the instance. - * - * @return the instance - */ - public static ELReferenceList getInstance() { - return instance; - } - - /** - * Gets the property name. - * - * @return the property name - */ - protected QualifiedName getPropertyName() { - return PROPERTY_NAME; - } -} Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java (from rev 10303, trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java) =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java 2008-09-17 09:54:39 UTC (rev 10308) @@ -0,0 +1,36 @@ +package org.jboss.tools.common.el.core; + + +import org.eclipse.core.runtime.QualifiedName; +import org.jboss.tools.common.resref.core.ResourceReferenceList; + + +/** + * The Class ELReferenceList. + */ +public class ELReferenceList extends ResourceReferenceList { + + /** The PROPERT y_ NAME. */ + private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.ELReference"); + + /** The instance. */ + static ELReferenceList instance = new ELReferenceList(); + + /** + * Gets the instance. + * + * @return the instance + */ + public static ELReferenceList getInstance() { + return instance; + } + + /** + * Gets the property name. + * + * @return the property name + */ + protected QualifiedName getPropertyName() { + return PROPERTY_NAME; + } +} Deleted: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java 2008-09-17 08:07:42 UTC (rev 10303) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java 2008-09-17 09:54:39 UTC (rev 10308) @@ -1,51 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.common.el.core; - -import org.eclipse.core.runtime.QualifiedName; -import org.jboss.tools.common.resref.core.ResourceReferenceList; - -/** - * @author Evgenij Stherbin - * - */ -public class GlobalELReferenceList extends ResourceReferenceList { - /** The PROPERT y_ NAME. */ - private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.GlobalELReference"); - - /** The instance. */ - private static GlobalELReferenceList instance = new GlobalELReferenceList(); - - /** - * Gets the instance. - * - * @return the instance - */ - public synchronized static GlobalELReferenceList getInstance() { - return instance; - } - - private GlobalELReferenceList() { - super(); - } - - /** - * Gets the property name. - * - * @return the property name - */ - protected QualifiedName getPropertyName() { - return PROPERTY_NAME; - } - - -} Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java (from rev 10303, trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java) =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java 2008-09-17 09:54:39 UTC (rev 10308) @@ -0,0 +1,51 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.common.el.core; + +import org.eclipse.core.runtime.QualifiedName; +import org.jboss.tools.common.resref.core.ResourceReferenceList; + +/** + * @author Evgenij Stherbin + * + */ +public class GlobalELReferenceList extends ResourceReferenceList { + /** The PROPERT y_ NAME. */ + private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.GlobalELReference"); + + /** The instance. */ + private static GlobalELReferenceList instance = new GlobalELReferenceList(); + + /** + * Gets the instance. + * + * @return the instance + */ + public synchronized static GlobalELReferenceList getInstance() { + return instance; + } + + private GlobalELReferenceList() { + super(); + } + + /** + * Gets the property name. + * + * @return the property name + */ + protected QualifiedName getPropertyName() { + return PROPERTY_NAME; + } + + +} Copied: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src (from rev 10304, trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src) Copied: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org (from rev 10304, trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org) Copied: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse (from rev 10304, trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse) Copied: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt (from rev 10304, trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt) Copied: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser (from rev 10304, trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser) Deleted: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java 2008-09-17 08:30:28 UTC (rev 10304) +++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java 2008-09-17 09:54:39 UTC (rev 10308) @@ -1,55 +0,0 @@ -package org.eclipse.swt.browser; - -import java.io.File; -import java.io.IOException; -import java.net.URL; - -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.Platform; -import org.osgi.framework.Bundle; - -public class XULRunnerInitializer { - - private static final String XULRUNNER_PATH = "org.eclipse.swt.browser.XULRunnerPath"; - private static final String XULRUNNER_ENTRY = "/xulrunner"; - - static { - String xulrunnerPath = System.getProperty(XULRUNNER_PATH); - if (xulrunnerPath != null) { - File xulrunnerFile = new File(xulrunnerPath); - if (!xulrunnerFile.exists()) { - xulrunnerPath = null; - } - } - if (xulrunnerPath == null) { - String XULRUNNER_BUNDLE = (new StringBuffer("org.mozilla.xulrunner")) - .append(".") - .append(Platform.getWS()) - .append(".") - .append(Platform.getOS()) - .append(Platform.OS_MACOSX.equals(Platform.getOS()) ? "" : (new StringBuffer(".")).append(Platform.getOSArch()).toString()) - .toString(); - Bundle xulRunnerBundle = Platform.getBundle(XULRUNNER_BUNDLE); - if (xulRunnerBundle == null) { - System.out.println("Bundle " + XULRUNNER_BUNDLE + " is not found."); - } else { - URL url = xulRunnerBundle.getEntry(XULRUNNER_ENTRY); - if (url == null) { - System.out.println("Bundle " + XULRUNNER_BUNDLE + " doesn't contain " + XULRUNNER_ENTRY); - } else { - File xulrunnerFile; - try { - URL url1 = FileLocator.resolve(url); - xulrunnerFile = new File(FileLocator.toFileURL(url1) - .getFile()); - xulrunnerPath = xulrunnerFile.getAbsolutePath(); - System.setProperty(XULRUNNER_PATH, xulrunnerPath); - } catch (IOException ioe) { - System.out.println("Cannot get path to XULRunner from bundle " + XULRUNNER_BUNDLE); - ioe.printStackTrace(); - } - } - } - } - } -} Copied: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java (from rev 10304, trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java) =================================================================== --- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java 2008-09-17 09:54:39 UTC (rev 10308) @@ -0,0 +1,55 @@ +package org.eclipse.swt.browser; + +import java.io.File; +import java.io.IOException; +import java.net.URL; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.Platform; +import org.osgi.framework.Bundle; + +public class XULRunnerInitializer { + + private static final String XULRUNNER_PATH = "org.eclipse.swt.browser.XULRunnerPath"; + private static final String XULRUNNER_ENTRY = "/xulrunner"; + + static { + String xulrunnerPath = System.getProperty(XULRUNNER_PATH); + if (xulrunnerPath != null) { + File xulrunnerFile = new File(xulrunnerPath); + if (!xulrunnerFile.exists()) { + xulrunnerPath = null; + } + } + if (xulrunnerPath == null) { + String XULRUNNER_BUNDLE = (new StringBuffer("org.mozilla.xulrunner")) + .append(".") + .append(Platform.getWS()) + .append(".") + .append(Platform.getOS()) + .append(Platform.OS_MACOSX.equals(Platform.getOS()) ? "" : (new StringBuffer(".")).append(Platform.getOSArch()).toString()) + .toString(); + Bundle xulRunnerBundle = Platform.getBundle(XULRUNNER_BUNDLE); + if (xulRunnerBundle == null) { + System.out.println("Bundle " + XULRUNNER_BUNDLE + " is not found."); + } else { + URL url = xulRunnerBundle.getEntry(XULRUNNER_ENTRY); + if (url == null) { + System.out.println("Bundle " + XULRUNNER_BUNDLE + " doesn't contain " + XULRUNNER_ENTRY); + } else { + File xulrunnerFile; + try { + URL url1 = FileLocator.resolve(url); + xulrunnerFile = new File(FileLocator.toFileURL(url1) + .getFile()); + xulrunnerPath = xulrunnerFile.getAbsolutePath(); + System.setProperty(XULRUNNER_PATH, xulrunnerPath); + } catch (IOException ioe) { + System.out.println("Cannot get path to XULRunner from bundle " + XULRUNNER_BUNDLE); + ioe.printStackTrace(); + } + } + } + } + } +}