JBoss Tools SVN: r15347 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-05-19 11:37:40 -0400 (Tue, 19 May 2009)
New Revision: 15347
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbProjectFactory.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbProjectFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbProjectFactory.java 2009-05-19 14:32:53 UTC (rev 15346)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbProjectFactory.java 2009-05-19 15:37:40 UTC (rev 15347)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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.jst.web.kb;
import org.eclipse.core.resources.IProject;
15 years, 4 months
JBoss Tools SVN: r15346 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-05-19 10:32:53 -0400 (Tue, 19 May 2009)
New Revision: 15346
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamComponentRenameHandler.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4262
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamComponentRenameHandler.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamComponentRenameHandler.java 2009-05-19 14:07:58 UTC (rev 15345)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamComponentRenameHandler.java 2009-05-19 14:32:53 UTC (rev 15346)
@@ -18,6 +18,8 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorInput;
@@ -48,11 +50,11 @@
*/
public Object execute(ExecutionEvent event) throws ExecutionException {
IEditorPart editor = HandlerUtil.getActiveEditor(event);
+ Shell activeShell = HandlerUtil.getActiveShell(event);
IEditorInput input = editor.getEditorInput();
if (input instanceof IFileEditorInput) {
IFile file = ((IFileEditorInput)input).getFile();
- Shell activeShell = HandlerUtil.getActiveShell(event);
IProject project = file.getProject();
ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
@@ -72,12 +74,20 @@
}
}
}
+ invokeRenameWizard(null, activeShell);
return null;
}
public static void invokeRenameWizard(ISeamComponent component, Shell activeShell) {
if(!SeamGuiPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().saveAllEditors(true))
return;
+
+ try {
+ Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
+ } catch (InterruptedException e) {
+ // do nothing
+ }
+
RenameComponentProcessor processor = new RenameComponentProcessor(component);
RenameComponentRefactoring refactoring = new RenameComponentRefactoring(processor);
RenameComponentWizard wizard = new RenameComponentWizard(refactoring, component);
15 years, 4 months
JBoss Tools SVN: r15345 - in branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner: editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-05-19 10:07:58 -0400 (Tue, 19 May 2009)
New Revision: 15345
Modified:
branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3155
Modified: branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2009-05-19 13:24:49 UTC (rev 15344)
+++ branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2009-05-19 14:07:58 UTC (rev 15345)
@@ -1,445 +1,455 @@
-/*******************************************************************************
- * 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
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.vpe.xulrunner.browser;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Listener;
-import org.jboss.tools.vpe.xulrunner.XPCOM;
-import org.jboss.tools.vpe.xulrunner.XulRunnerException;
-import org.mozilla.interfaces.nsIComponentManager;
-import org.mozilla.interfaces.nsIPrefService;
-import org.mozilla.interfaces.nsIRequest;
-import org.mozilla.interfaces.nsIServiceManager;
-import org.mozilla.interfaces.nsISupports;
-import org.mozilla.interfaces.nsITooltipListener;
-import org.mozilla.interfaces.nsIURI;
-import org.mozilla.interfaces.nsIWebBrowser;
-import org.mozilla.interfaces.nsIWebBrowserChrome;
-import org.mozilla.interfaces.nsIWebBrowserSetup;
-import org.mozilla.interfaces.nsIWebNavigation;
-import org.mozilla.interfaces.nsIWebProgress;
-import org.mozilla.interfaces.nsIWebProgressListener;
-import org.mozilla.xpcom.GREVersionRange;
-import org.mozilla.xpcom.Mozilla;
-import org.osgi.framework.Bundle;
-
-/**
- *
- * @author Sergey Vasilyev (svasilyev(a)exadel.com)
- *
- */
-
-public class XulRunnerBrowser implements nsIWebBrowserChrome,
- nsIWebProgressListener, nsITooltipListener {
- private static final String XULRUNNER_LOWER_VERSION = "1.8.1.2"; //$NON-NLS-1$
- private static final String XULRUNNER_HIGHER_VERSION = "1.8.1.9"; //$NON-NLS-1$
- // TODO Sergey Vasilyev Think. May be XULRUNNER_BUNDLE shouldn't be final?
- private static final String XULRUNNER_BUNDLE;
- private static final String XULRUNNER_ENTRY = "/xulrunner"; //$NON-NLS-1$
-
- // TEMPORARY CODE (@see org.eclipse.swt.browser.Mozilla)
- static final String XULRUNNER_INITIALIZED = "org.eclipse.swt.browser.XULRunnerInitialized"; //$NON-NLS-1$
- static final String XULRUNNER_PATH = "org.eclipse.swt.browser.XULRunnerPath"; //$NON-NLS-1$
-
- private static final String ROOT_BRANCH_NAME = ""; //$NON-NLS-1$
-
- private static final String PREFERENCE_DISABLEOPENDURINGLOAD = "dom.disable_open_during_load"; //$NON-NLS-1$
- private static final String PREFERENCE_DISABLEWINDOWSTATUSCHANGE = "dom.disable_window_status_change"; //$NON-NLS-1$
-
- private static final Mozilla mozilla;
- private Browser browser = null;
- private nsIWebBrowser webBrowser = null;
- private long chrome_flags = nsIWebBrowserChrome.CHROME_ALL;
-
- static {
- XULRUNNER_BUNDLE = (new StringBuffer("org.mozilla.xulrunner")) // $NON-NLS-1$
- .append(".").append(Platform.getWS()) // $NON-NLS-1$
- .append(".").append(Platform.getOS()) // $NON-NLS-1$
- .append(Platform.OS_MACOSX.equals(Platform.getOS()) ? "" : (new StringBuffer(".")).append(Platform.getOSArch()).toString()) //$NON-NLS-1$ //$NON-NLS-2$
- .toString();
-
- mozilla = Mozilla.getInstance();
- }
-
- public XulRunnerBrowser(Composite parent) throws XulRunnerException {
- initXulRunner();
-
- browser = new Browser(parent, SWT.MOZILLA);
-
- webBrowser = (nsIWebBrowser) browser.getWebBrowser();
- if (webBrowser == null) {
- throw new XulRunnerException("nsIWebBrowser is not available"); // $NON-NLS-1$
- }
-
- setBoolRootPref(PREFERENCE_DISABLEOPENDURINGLOAD, true);
- setBoolRootPref(PREFERENCE_DISABLEWINDOWSTATUSCHANGE, true);
-
- nsIWebBrowserSetup setup = (nsIWebBrowserSetup) webBrowser
- .queryInterface(nsIWebBrowserSetup.NS_IWEBBROWSERSETUP_IID);
- setup.setProperty(nsIWebBrowserSetup.SETUP_IS_CHROME_WRAPPER, 1);
-
- // JBIDE-1329 Solution was contributed by Snjezana Peco
-// webBrowser.addWebBrowserListener(this,
-// nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID);
- nsIServiceManager serviceManager = mozilla.getServiceManager();
- nsIWebProgress webProgress = (nsIWebProgress) serviceManager
- .getServiceByContractID("@mozilla.org/docloaderservice;1", // $NON-NLS-1$
- nsIWebProgress.NS_IWEBPROGRESS_IID);
- webProgress.addProgressListener(this, nsIWebProgress.NOTIFY_STATE_ALL);
- webBrowser.addWebBrowserListener(this,
- nsITooltipListener.NS_ITOOLTIPLISTENER_IID);
- }
-
- public synchronized void initXulRunner() throws XulRunnerException {
- String xulRunnerPath = getXulRunnerPath();
-
- if (!"true".equals(System.getProperty(XULRUNNER_INITIALIZED))) { //$NON-NLS-1$
- File file = new File(xulRunnerPath);
- mozilla.initialize(file);
- mozilla.initEmbedding(file, file, new AppFileLocProvider(file));
- System.setProperty(XULRUNNER_INITIALIZED, "true"); // $NON-NLS-1$
- }
- }
-
- /**
- * Decorate Widget.getDisplay()
- */
- public Display getDisplay() {
- return browser.getDisplay();
- }
-
- /**
- * Decorate Control.setCursor(org.eclipse.swt.graphics.Cursor)
- */
- public void setCursor(Cursor cursor) {
- browser.setCursor(cursor);
- }
-
- /**
- * Decorate Composite.setFocus()
- */
- public boolean setFocus() {
- return browser.setFocus();
- }
-
- /**
- * Decorate Control.setLayoutData(Object)
- */
- public void setLayoutData(Object layoutData) {
- browser.setLayoutData(layoutData);
- }
-
- /**
- * Decorate Widget.addListener(int eventType, Listener listener)
- */
- public void addListener(int eventType, Listener listener) {
- browser.addListener(eventType, listener);
- }
-
- public void removeListener(int eventType, Listener listener) {
- browser.removeListener(eventType, listener);
- }
-
- /**
- * Decorate Widget.dispose()
- */
- public void dispose() {
- //added by mareshkau, here we remove listener.
- //if we hasn't do it, listener will be continue work even after close browser
- nsIServiceManager serviceManager = mozilla.getServiceManager();
- nsIWebProgress webProgress = (nsIWebProgress) serviceManager
- .getServiceByContractID("@mozilla.org/docloaderservice;1", // $NON-NLS-1$
- nsIWebProgress.NS_IWEBPROGRESS_IID);
- webProgress.removeProgressListener(this);
-
- browser.dispose();
- browser = null;
- }
-
- public static String getXulRunnerBundle() {
- return XULRUNNER_BUNDLE;
- }
-
- public synchronized static String getXulRunnerPath() throws XulRunnerException {
- //this function should be call
- String xulRunnerPath = System.getProperty(XULRUNNER_PATH);
- if (xulRunnerPath == null) {
-
- GREVersionRange[] greRanges = {new GREVersionRange(XULRUNNER_LOWER_VERSION, true, XULRUNNER_HIGHER_VERSION, true)};
- File xulRunnerFile = null;
-
- // JBIDE-1222 begin
- /*try {
- if(!XULRUNNER_LOADING_INDICATOR) {
-
- XULRUNNER_LOADING_INDICATOR=true;
- //this function should be call
- xulRunnerFile = Mozilla.getGREPathWithProperties(greRanges, null);
- } else {
-
- xulRunnerFile = null;
- }
- } catch (FileNotFoundException fnfe) {
- // Ignre this exception. Will try to get XULRunner from plugin
- }*/
- // JBIDE-1222 end
-
- if (xulRunnerFile == null
- || !xulRunnerFile.exists()) {
- Bundle xulRunnerBundle = Platform.getBundle(getXulRunnerBundle());
- if (xulRunnerBundle == null) {
- throw new XulRunnerException("Bundle " + getXulRunnerBundle() + " is not found."); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- String xulRunnerVersion = (String) xulRunnerBundle.getHeaders().get("Bundle-Version"); //$NON-NLS-1$
- if (!greRanges[0].check(xulRunnerVersion)) {
- throw new XulRunnerException("the version of the bundled XULRunner must be >= " + XulRunnerBrowser.XULRUNNER_LOWER_VERSION //$NON-NLS-1$
- + " and <= " + XulRunnerBrowser.XULRUNNER_HIGHER_VERSION); //$NON-NLS-1$
- }
-
-
- URL url = xulRunnerBundle.getEntry(XULRUNNER_ENTRY);
- if (url == null) {
- throw new XulRunnerException("Bundle " + getXulRunnerBundle() + " doesn't contain " + XULRUNNER_ENTRY); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- try {
- URL url1 = FileLocator.resolve(url);
- xulRunnerFile = new File(FileLocator.toFileURL(url1).getFile());
- } catch (IOException ioe) {
- throw new XulRunnerException("Cannot get path to XULRunner from bundle " + getXulRunnerBundle(), ioe); // $NON-NLS-1$
- }
- }
-
- xulRunnerPath = xulRunnerFile.getAbsolutePath();
- System.setProperty(XULRUNNER_PATH, xulRunnerPath);
- }
-
-
- return xulRunnerPath;
- }
-
- public nsIServiceManager getServiceManager() {
- return mozilla.getServiceManager();
- }
-
- public nsIComponentManager getComponentManager() {
- return mozilla.getComponentManager();
- }
-
- public void setURL(String url) {
- nsIWebNavigation webNavigation = (nsIWebNavigation) webBrowser.queryInterface(nsIWebNavigation.NS_IWEBNAVIGATION_IID);
- webNavigation.loadURI(url, nsIWebNavigation.LOAD_FLAGS_NONE, null, null, null);
- }
-
- public String getURL() {
- nsIWebNavigation webNavigation = (nsIWebNavigation) webBrowser.queryInterface(nsIWebNavigation.NS_IWEBNAVIGATION_IID);
- return webNavigation.getCurrentURI().getSpec();
- }
-
- public void stop() {
- nsIWebNavigation webNavigation = (nsIWebNavigation) webBrowser.queryInterface(nsIWebNavigation.NS_IWEBNAVIGATION_IID);
- webNavigation.stop(nsIWebNavigation.STOP_ALL);
- }
-
- public void reload() {
- nsIWebNavigation webNavigation = (nsIWebNavigation) webBrowser.queryInterface(nsIWebNavigation.NS_IWEBNAVIGATION_IID);
- webNavigation.reload(nsIWebNavigation.LOAD_FLAGS_NONE);
- }
-
- public void goBack() {
- nsIWebNavigation webNavigation = (nsIWebNavigation) webBrowser.queryInterface(nsIWebNavigation.NS_IWEBNAVIGATION_IID);
- webNavigation.goBack();
- }
-
- public void goForward() {
- nsIWebNavigation webNavigation = (nsIWebNavigation) webBrowser.queryInterface(nsIWebNavigation.NS_IWEBNAVIGATION_IID);
- webNavigation.goForward();
- }
-
- public void onLoadWindow() {
- }
-
- public nsIPrefService getPrefService() {
- return (nsIPrefService) getServiceManager().getServiceByContractID(XPCOM.NS_PREFSERVICE_CONTRACTID, nsIPrefService.NS_IPREFSERVICE_IID);
- }
-
-
- public void setBoolRootPref(String aPrefName, boolean aValue) {
- getPrefService().getBranch(ROOT_BRANCH_NAME).setBoolPref(aPrefName, aValue ? 1 : 0);
- }
-
-
- public void setCharRootPref(String aPrefName, String aValue) {
- getPrefService().getBranch(ROOT_BRANCH_NAME).setCharPref(aPrefName, aValue);
- }
-
-
- public void setComplexRootValue(String aPrefName, String aType, nsISupports aValue) {
- getPrefService().getBranch(ROOT_BRANCH_NAME).setComplexValue(aPrefName, aType, aValue);
- }
-
- public void setIntRootPref(String aPrefName, int aValue) {
- getPrefService().getBranch(ROOT_BRANCH_NAME).setIntPref(aPrefName, aValue);
- }
-
- public boolean getBoolRootPref(String aPrefName) {
- return getPrefService().getBranch(ROOT_BRANCH_NAME).getBoolPref(aPrefName);
- }
-
- public String getCharRootPref(String aPrefName) {
- return getPrefService().getBranch(ROOT_BRANCH_NAME).getCharPref(aPrefName);
- }
-
- public nsISupports getComplextRootPref(String aPrefName, String aType) {
- return getPrefService().getBranch(ROOT_BRANCH_NAME).getComplexValue(aPrefName, aType);
- }
-
- public int getIntRootf(String aPrefName) {
- return getPrefService().getBranch(ROOT_BRANCH_NAME).getIntPref(aPrefName);
- }
-
- /*
- * nsISupports
- *
- * @see org.mozilla.interfaces.nsISupports#queryInterface(java.lang.String)
- */
- public nsISupports queryInterface(String arg0) {
- return Mozilla.queryInterface(this, arg0);
- }
-
- /*
- * nsIWebBrowserChrome
- *
- * @see org.mozilla.interfaces.nsIWebBrowserChrome
- */
- public void destroyBrowserWindow() {
- // TODO Sergey Vasilyev implement
- throw new RuntimeException("Not implemented"); //$NON-NLS-1$
- }
-
- public void exitModalEventLoop(long arg0) {
- throw new RuntimeException("Not implemented"); //$NON-NLS-1$
- }
-
- public long getChromeFlags() {
- return chrome_flags;
- }
-
- public nsIWebBrowser getWebBrowser() {
- return webBrowser;
- }
-
- public boolean isWindowModal() {
- // TODO Sergey Vasilyev implement
- return false;
- }
-
- public void setChromeFlags(long arg0) {
- chrome_flags = arg0;
- }
-
- public void setStatus(long arg0, String arg1) {
- // TODO Sergey Vasilyev implement
- throw new RuntimeException("Not implemented"); //$NON-NLS-1$
- }
-
- public void setWebBrowser(nsIWebBrowser arg0) {
- webBrowser = arg0;
- }
-
- public void showAsModal() {
- // TODO Sergey Vasilyev implement
- throw new RuntimeException("Not implemented"); //$NON-NLS-1$
- }
-
- public void sizeBrowserTo(int arg0, int arg1) {
- // TODO Sergey Vasilyev implement
- throw new RuntimeException("Not implemented"); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.mozilla.interfaces.nsIWebProgressListener#onLocationChange(org.mozilla.interfaces.nsIWebProgress, org.mozilla.interfaces.nsIRequest, org.mozilla.interfaces.nsIURI)
- */
- public void onLocationChange(nsIWebProgress arg0, nsIRequest arg1,
- nsIURI arg2) {
- }
-
- /* (non-Javadoc)
- * @see org.mozilla.interfaces.nsIWebProgressListener#onProgressChange(org.mozilla.interfaces.nsIWebProgress, org.mozilla.interfaces.nsIRequest, int, int, int, int)
- */
- public void onProgressChange(nsIWebProgress arg0, nsIRequest arg1,
- int arg2, int arg3, int arg4, int arg5) {
- }
-
- /* (non-Javadoc)
- * @see org.mozilla.interfaces.nsIWebProgressListener#onSecurityChange(org.mozilla.interfaces.nsIWebProgress, org.mozilla.interfaces.nsIRequest, long)
- */
- public void onSecurityChange(nsIWebProgress arg0, nsIRequest arg1, long arg2) {
- }
-
- /* (non-Javadoc)
- * @see org.mozilla.interfaces.nsIWebProgressListener#onStateChange(org.mozilla.interfaces.nsIWebProgress, org.mozilla.interfaces.nsIRequest, long, long)
- */
- public void onStateChange(nsIWebProgress aWebProgress, nsIRequest aRequest, long aStateFlags, long aStstus) {
- if ((aStateFlags & nsIWebProgressListener.STATE_IS_WINDOW) != 0
- && (aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
- onLoadWindow();
- }
- }
-
- /* (non-Javadoc)
- * @see org.mozilla.interfaces.nsIWebProgressListener#onStatusChange(org.mozilla.interfaces.nsIWebProgress, org.mozilla.interfaces.nsIRequest, long, java.lang.String)
- */
- public void onStatusChange(nsIWebProgress arg0, nsIRequest arg1, long aStatus, String message) {
- }
-
-
-
- /* (non-Javadoc)
- * @see org.mozilla.interfaces.nsITooltipListener#onHideTooltip()
- */
- public void onHideTooltip() {
- }
-
- /* (non-Javadoc)
- * @see org.mozilla.interfaces.nsITooltipListener#onShowTooltip(int, int, java.lang.String)
- */
- public void onShowTooltip(int aXCoords, int aYCoords, String aTipText) {
- }
-
- /**
- * @return the browser
- */
- public Browser getBrowser() {
- return browser;
- }
-
- protected void onDispose() {
-
- }
-
- public void setText(String html) {
- browser.setText(html);
- }
-}
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.vpe.xulrunner.browser;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Listener;
+import org.jboss.tools.vpe.xulrunner.XPCOM;
+import org.jboss.tools.vpe.xulrunner.XulRunnerException;
+import org.mozilla.interfaces.nsIComponentManager;
+import org.mozilla.interfaces.nsIPrefService;
+import org.mozilla.interfaces.nsIRequest;
+import org.mozilla.interfaces.nsIServiceManager;
+import org.mozilla.interfaces.nsISupports;
+import org.mozilla.interfaces.nsITooltipListener;
+import org.mozilla.interfaces.nsIURI;
+import org.mozilla.interfaces.nsIWebBrowser;
+import org.mozilla.interfaces.nsIWebBrowserChrome;
+import org.mozilla.interfaces.nsIWebBrowserSetup;
+import org.mozilla.interfaces.nsIWebNavigation;
+import org.mozilla.interfaces.nsIWebProgress;
+import org.mozilla.interfaces.nsIWebProgressListener;
+import org.mozilla.xpcom.GREVersionRange;
+import org.mozilla.xpcom.Mozilla;
+import org.mozilla.xpcom.XPCOMException;
+import org.osgi.framework.Bundle;
+
+/**
+ *
+ * @author Sergey Vasilyev (svasilyev(a)exadel.com)
+ *
+ */
+
+public class XulRunnerBrowser implements nsIWebBrowserChrome,
+ nsIWebProgressListener, nsITooltipListener {
+ private static final String XULRUNNER_LOWER_VERSION = "1.8.1.2"; //$NON-NLS-1$
+ private static final String XULRUNNER_HIGHER_VERSION = "1.8.1.9"; //$NON-NLS-1$
+ // TODO Sergey Vasilyev Think. May be XULRUNNER_BUNDLE shouldn't be final?
+ private static final String XULRUNNER_BUNDLE;
+ private static final String XULRUNNER_ENTRY = "/xulrunner"; //$NON-NLS-1$
+
+ // TEMPORARY CODE (@see org.eclipse.swt.browser.Mozilla)
+ static final String XULRUNNER_INITIALIZED = "org.eclipse.swt.browser.XULRunnerInitialized"; //$NON-NLS-1$
+ static final String XULRUNNER_PATH = "org.eclipse.swt.browser.XULRunnerPath"; //$NON-NLS-1$
+
+ private static final String ROOT_BRANCH_NAME = ""; //$NON-NLS-1$
+
+ private static final String PREFERENCE_DISABLEOPENDURINGLOAD = "dom.disable_open_during_load"; //$NON-NLS-1$
+ private static final String PREFERENCE_DISABLEWINDOWSTATUSCHANGE = "dom.disable_window_status_change"; //$NON-NLS-1$
+
+ private static final Mozilla mozilla;
+ private Browser browser = null;
+ private nsIWebBrowser webBrowser = null;
+ private long chrome_flags = nsIWebBrowserChrome.CHROME_ALL;
+ protected static final long NS_ERROR_FAILURE = 0x80004005L;
+
+ static {
+ XULRUNNER_BUNDLE = (new StringBuffer("org.mozilla.xulrunner")) // $NON-NLS-1$
+ .append(".").append(Platform.getWS()) // $NON-NLS-1$
+ .append(".").append(Platform.getOS()) // $NON-NLS-1$
+ .append(Platform.OS_MACOSX.equals(Platform.getOS()) ? "" : (new StringBuffer(".")).append(Platform.getOSArch()).toString()) //$NON-NLS-1$ //$NON-NLS-2$
+ .toString();
+
+ mozilla = Mozilla.getInstance();
+ }
+
+ public XulRunnerBrowser(Composite parent) throws XulRunnerException {
+ initXulRunner();
+
+ browser = new Browser(parent, SWT.MOZILLA);
+
+ webBrowser = (nsIWebBrowser) browser.getWebBrowser();
+ if (webBrowser == null) {
+ throw new XulRunnerException("nsIWebBrowser is not available"); // $NON-NLS-1$
+ }
+
+ setBoolRootPref(PREFERENCE_DISABLEOPENDURINGLOAD, true);
+ setBoolRootPref(PREFERENCE_DISABLEWINDOWSTATUSCHANGE, true);
+
+ nsIWebBrowserSetup setup = (nsIWebBrowserSetup) webBrowser
+ .queryInterface(nsIWebBrowserSetup.NS_IWEBBROWSERSETUP_IID);
+ setup.setProperty(nsIWebBrowserSetup.SETUP_IS_CHROME_WRAPPER, 1);
+
+ // JBIDE-1329 Solution was contributed by Snjezana Peco
+// webBrowser.addWebBrowserListener(this,
+// nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID);
+ nsIServiceManager serviceManager = mozilla.getServiceManager();
+ nsIWebProgress webProgress = (nsIWebProgress) serviceManager
+ .getServiceByContractID("@mozilla.org/docloaderservice;1", // $NON-NLS-1$
+ nsIWebProgress.NS_IWEBPROGRESS_IID);
+ webProgress.addProgressListener(this, nsIWebProgress.NOTIFY_STATE_ALL);
+ webBrowser.addWebBrowserListener(this,
+ nsITooltipListener.NS_ITOOLTIPLISTENER_IID);
+ }
+
+ public synchronized void initXulRunner() throws XulRunnerException {
+ String xulRunnerPath = getXulRunnerPath();
+
+ if (!"true".equals(System.getProperty(XULRUNNER_INITIALIZED))) { //$NON-NLS-1$
+ File file = new File(xulRunnerPath);
+ mozilla.initialize(file);
+ mozilla.initEmbedding(file, file, new AppFileLocProvider(file));
+ System.setProperty(XULRUNNER_INITIALIZED, "true"); // $NON-NLS-1$
+ }
+ }
+
+ /**
+ * Decorate Widget.getDisplay()
+ */
+ public Display getDisplay() {
+ return browser.getDisplay();
+ }
+
+ /**
+ * Decorate Control.setCursor(org.eclipse.swt.graphics.Cursor)
+ */
+ public void setCursor(Cursor cursor) {
+ browser.setCursor(cursor);
+ }
+
+ /**
+ * Decorate Composite.setFocus()
+ */
+ public boolean setFocus() {
+ return browser.setFocus();
+ }
+
+ /**
+ * Decorate Control.setLayoutData(Object)
+ */
+ public void setLayoutData(Object layoutData) {
+ browser.setLayoutData(layoutData);
+ }
+
+ /**
+ * Decorate Widget.addListener(int eventType, Listener listener)
+ */
+ public void addListener(int eventType, Listener listener) {
+ browser.addListener(eventType, listener);
+ }
+
+ public void removeListener(int eventType, Listener listener) {
+ browser.removeListener(eventType, listener);
+ }
+
+ /**
+ * Decorate Widget.dispose()
+ */
+ public void dispose() {
+ //added by mareshkau, here we remove listener.
+ //if we hasn't do it, listener will be continue work even after close browser
+ nsIServiceManager serviceManager = mozilla.getServiceManager();
+ nsIWebProgress webProgress = (nsIWebProgress) serviceManager
+ .getServiceByContractID("@mozilla.org/docloaderservice;1", // $NON-NLS-1$
+ nsIWebProgress.NS_IWEBPROGRESS_IID);
+ try {
+ webProgress.removeProgressListener(this);
+ } catch(XPCOMException xpcomException) {
+ //this exception throws when progress listener already has been deleted,
+ //so just ignore if error code NS_ERROR_FAILURE
+ if(xpcomException.errorcode!=XulRunnerBrowser.NS_ERROR_FAILURE) {
+ throw xpcomException;
+ }
+ }
+
+ browser.dispose();
+ browser = null;
+ }
+
+ public static String getXulRunnerBundle() {
+ return XULRUNNER_BUNDLE;
+ }
+
+ public synchronized static String getXulRunnerPath() throws XulRunnerException {
+ //this function should be call
+ String xulRunnerPath = System.getProperty(XULRUNNER_PATH);
+ if (xulRunnerPath == null) {
+
+ GREVersionRange[] greRanges = {new GREVersionRange(XULRUNNER_LOWER_VERSION, true, XULRUNNER_HIGHER_VERSION, true)};
+ File xulRunnerFile = null;
+
+ // JBIDE-1222 begin
+ /*try {
+ if(!XULRUNNER_LOADING_INDICATOR) {
+
+ XULRUNNER_LOADING_INDICATOR=true;
+ //this function should be call
+ xulRunnerFile = Mozilla.getGREPathWithProperties(greRanges, null);
+ } else {
+
+ xulRunnerFile = null;
+ }
+ } catch (FileNotFoundException fnfe) {
+ // Ignre this exception. Will try to get XULRunner from plugin
+ }*/
+ // JBIDE-1222 end
+
+ if (xulRunnerFile == null
+ || !xulRunnerFile.exists()) {
+ Bundle xulRunnerBundle = Platform.getBundle(getXulRunnerBundle());
+ if (xulRunnerBundle == null) {
+ throw new XulRunnerException("Bundle " + getXulRunnerBundle() + " is not found."); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ String xulRunnerVersion = (String) xulRunnerBundle.getHeaders().get("Bundle-Version"); //$NON-NLS-1$
+ if (!greRanges[0].check(xulRunnerVersion)) {
+ throw new XulRunnerException("the version of the bundled XULRunner must be >= " + XulRunnerBrowser.XULRUNNER_LOWER_VERSION //$NON-NLS-1$
+ + " and <= " + XulRunnerBrowser.XULRUNNER_HIGHER_VERSION); //$NON-NLS-1$
+ }
+
+
+ URL url = xulRunnerBundle.getEntry(XULRUNNER_ENTRY);
+ if (url == null) {
+ throw new XulRunnerException("Bundle " + getXulRunnerBundle() + " doesn't contain " + XULRUNNER_ENTRY); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ try {
+ URL url1 = FileLocator.resolve(url);
+ xulRunnerFile = new File(FileLocator.toFileURL(url1).getFile());
+ } catch (IOException ioe) {
+ throw new XulRunnerException("Cannot get path to XULRunner from bundle " + getXulRunnerBundle(), ioe); // $NON-NLS-1$
+ }
+ }
+
+ xulRunnerPath = xulRunnerFile.getAbsolutePath();
+ System.setProperty(XULRUNNER_PATH, xulRunnerPath);
+ }
+
+
+ return xulRunnerPath;
+ }
+
+ public nsIServiceManager getServiceManager() {
+ return mozilla.getServiceManager();
+ }
+
+ public nsIComponentManager getComponentManager() {
+ return mozilla.getComponentManager();
+ }
+
+ public void setURL(String url) {
+ nsIWebNavigation webNavigation = (nsIWebNavigation) webBrowser.queryInterface(nsIWebNavigation.NS_IWEBNAVIGATION_IID);
+ webNavigation.loadURI(url, nsIWebNavigation.LOAD_FLAGS_NONE, null, null, null);
+ }
+
+ public String getURL() {
+ nsIWebNavigation webNavigation = (nsIWebNavigation) webBrowser.queryInterface(nsIWebNavigation.NS_IWEBNAVIGATION_IID);
+ return webNavigation.getCurrentURI().getSpec();
+ }
+
+ public void stop() {
+ nsIWebNavigation webNavigation = (nsIWebNavigation) webBrowser.queryInterface(nsIWebNavigation.NS_IWEBNAVIGATION_IID);
+ webNavigation.stop(nsIWebNavigation.STOP_ALL);
+ }
+
+ public void reload() {
+ nsIWebNavigation webNavigation = (nsIWebNavigation) webBrowser.queryInterface(nsIWebNavigation.NS_IWEBNAVIGATION_IID);
+ webNavigation.reload(nsIWebNavigation.LOAD_FLAGS_NONE);
+ }
+
+ public void goBack() {
+ nsIWebNavigation webNavigation = (nsIWebNavigation) webBrowser.queryInterface(nsIWebNavigation.NS_IWEBNAVIGATION_IID);
+ webNavigation.goBack();
+ }
+
+ public void goForward() {
+ nsIWebNavigation webNavigation = (nsIWebNavigation) webBrowser.queryInterface(nsIWebNavigation.NS_IWEBNAVIGATION_IID);
+ webNavigation.goForward();
+ }
+
+ public void onLoadWindow() {
+ }
+
+ public nsIPrefService getPrefService() {
+ return (nsIPrefService) getServiceManager().getServiceByContractID(XPCOM.NS_PREFSERVICE_CONTRACTID, nsIPrefService.NS_IPREFSERVICE_IID);
+ }
+
+
+ public void setBoolRootPref(String aPrefName, boolean aValue) {
+ getPrefService().getBranch(ROOT_BRANCH_NAME).setBoolPref(aPrefName, aValue ? 1 : 0);
+ }
+
+
+ public void setCharRootPref(String aPrefName, String aValue) {
+ getPrefService().getBranch(ROOT_BRANCH_NAME).setCharPref(aPrefName, aValue);
+ }
+
+
+ public void setComplexRootValue(String aPrefName, String aType, nsISupports aValue) {
+ getPrefService().getBranch(ROOT_BRANCH_NAME).setComplexValue(aPrefName, aType, aValue);
+ }
+
+ public void setIntRootPref(String aPrefName, int aValue) {
+ getPrefService().getBranch(ROOT_BRANCH_NAME).setIntPref(aPrefName, aValue);
+ }
+
+ public boolean getBoolRootPref(String aPrefName) {
+ return getPrefService().getBranch(ROOT_BRANCH_NAME).getBoolPref(aPrefName);
+ }
+
+ public String getCharRootPref(String aPrefName) {
+ return getPrefService().getBranch(ROOT_BRANCH_NAME).getCharPref(aPrefName);
+ }
+
+ public nsISupports getComplextRootPref(String aPrefName, String aType) {
+ return getPrefService().getBranch(ROOT_BRANCH_NAME).getComplexValue(aPrefName, aType);
+ }
+
+ public int getIntRootf(String aPrefName) {
+ return getPrefService().getBranch(ROOT_BRANCH_NAME).getIntPref(aPrefName);
+ }
+
+ /*
+ * nsISupports
+ *
+ * @see org.mozilla.interfaces.nsISupports#queryInterface(java.lang.String)
+ */
+ public nsISupports queryInterface(String arg0) {
+ return Mozilla.queryInterface(this, arg0);
+ }
+
+ /*
+ * nsIWebBrowserChrome
+ *
+ * @see org.mozilla.interfaces.nsIWebBrowserChrome
+ */
+ public void destroyBrowserWindow() {
+ // TODO Sergey Vasilyev implement
+ throw new RuntimeException("Not implemented"); //$NON-NLS-1$
+ }
+
+ public void exitModalEventLoop(long arg0) {
+ throw new RuntimeException("Not implemented"); //$NON-NLS-1$
+ }
+
+ public long getChromeFlags() {
+ return chrome_flags;
+ }
+
+ public nsIWebBrowser getWebBrowser() {
+ return webBrowser;
+ }
+
+ public boolean isWindowModal() {
+ // TODO Sergey Vasilyev implement
+ return false;
+ }
+
+ public void setChromeFlags(long arg0) {
+ chrome_flags = arg0;
+ }
+
+ public void setStatus(long arg0, String arg1) {
+ // TODO Sergey Vasilyev implement
+ throw new RuntimeException("Not implemented"); //$NON-NLS-1$
+ }
+
+ public void setWebBrowser(nsIWebBrowser arg0) {
+ webBrowser = arg0;
+ }
+
+ public void showAsModal() {
+ // TODO Sergey Vasilyev implement
+ throw new RuntimeException("Not implemented"); //$NON-NLS-1$
+ }
+
+ public void sizeBrowserTo(int arg0, int arg1) {
+ // TODO Sergey Vasilyev implement
+ throw new RuntimeException("Not implemented"); //$NON-NLS-1$
+ }
+
+ /* (non-Javadoc)
+ * @see org.mozilla.interfaces.nsIWebProgressListener#onLocationChange(org.mozilla.interfaces.nsIWebProgress, org.mozilla.interfaces.nsIRequest, org.mozilla.interfaces.nsIURI)
+ */
+ public void onLocationChange(nsIWebProgress arg0, nsIRequest arg1,
+ nsIURI arg2) {
+ }
+
+ /* (non-Javadoc)
+ * @see org.mozilla.interfaces.nsIWebProgressListener#onProgressChange(org.mozilla.interfaces.nsIWebProgress, org.mozilla.interfaces.nsIRequest, int, int, int, int)
+ */
+ public void onProgressChange(nsIWebProgress arg0, nsIRequest arg1,
+ int arg2, int arg3, int arg4, int arg5) {
+ }
+
+ /* (non-Javadoc)
+ * @see org.mozilla.interfaces.nsIWebProgressListener#onSecurityChange(org.mozilla.interfaces.nsIWebProgress, org.mozilla.interfaces.nsIRequest, long)
+ */
+ public void onSecurityChange(nsIWebProgress arg0, nsIRequest arg1, long arg2) {
+ }
+
+ /* (non-Javadoc)
+ * @see org.mozilla.interfaces.nsIWebProgressListener#onStateChange(org.mozilla.interfaces.nsIWebProgress, org.mozilla.interfaces.nsIRequest, long, long)
+ */
+ public void onStateChange(nsIWebProgress aWebProgress, nsIRequest aRequest, long aStateFlags, long aStstus) {
+ if ((aStateFlags & nsIWebProgressListener.STATE_IS_WINDOW) != 0
+ && (aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
+ onLoadWindow();
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.mozilla.interfaces.nsIWebProgressListener#onStatusChange(org.mozilla.interfaces.nsIWebProgress, org.mozilla.interfaces.nsIRequest, long, java.lang.String)
+ */
+ public void onStatusChange(nsIWebProgress arg0, nsIRequest arg1, long aStatus, String message) {
+ }
+
+
+
+ /* (non-Javadoc)
+ * @see org.mozilla.interfaces.nsITooltipListener#onHideTooltip()
+ */
+ public void onHideTooltip() {
+ }
+
+ /* (non-Javadoc)
+ * @see org.mozilla.interfaces.nsITooltipListener#onShowTooltip(int, int, java.lang.String)
+ */
+ public void onShowTooltip(int aXCoords, int aYCoords, String aTipText) {
+ }
+
+ /**
+ * @return the browser
+ */
+ public Browser getBrowser() {
+ return browser;
+ }
+
+ protected void onDispose() {
+
+ }
+
+ public void setText(String html) {
+ browser.setText(html);
+ }
+}
Modified: branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
===================================================================
--- branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2009-05-19 13:24:49 UTC (rev 15344)
+++ branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2009-05-19 14:07:58 UTC (rev 15345)
@@ -596,7 +596,17 @@
if (this.selectionListener != null) {
nsISelection selection = getSelection();
nsISelectionPrivate selectionPrivate = (nsISelectionPrivate) selection.queryInterface(nsISelectionPrivate.NS_ISELECTIONPRIVATE_IID);
- selectionPrivate.removeSelectionListener(selectionListener);
+ try {
+ selectionPrivate.removeSelectionListener(this.selectionListener);
+ } catch (XPCOMException xpcomException) {
+ //this exception throws when progress listener already has been deleted,
+ //so just ignore if error code NS_ERROR_FAILURE
+ //mareshkau fix for jbide-3155
+ if(xpcomException.errorcode!=XulRunnerBrowser.NS_ERROR_FAILURE) {
+ throw xpcomException;
+ }
+ }
+
}
selectionListener=null;
}
15 years, 4 months
JBoss Tools SVN: r15344 - in trunk/seam/tests/org.jboss.tools.seam.core.test: projects/Test1-ear/EarContent and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-05-19 09:24:49 -0400 (Tue, 19 May 2009)
New Revision: 15344
Removed:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.jsp
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.properties
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/WEB-INF/components.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4326
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/WEB-INF/components.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/WEB-INF/components.xml 2009-05-19 12:07:13 UTC (rev 15343)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/WEB-INF/components.xml 2009-05-19 13:24:49 UTC (rev 15344)
@@ -13,6 +13,8 @@
http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd">
<core:init debug="true" jndi-pattern="Test1/#{ejbName}/local"/>
+
+ <component class="org.domain.Test1.session.TestComponent" name="test" />
<core:manager concurrent-request-timeout="500"
conversation-timeout="120000"
@@ -33,6 +35,9 @@
<security:identity authenticate-method="#{authenticator.authenticate}"
security-rules="#{securityRules}"/>
+
+ <security:identity authenticate-method="#{test.value}"
+ security-rules="#{securityRules}"/>
<event type="org.jboss.seam.notLoggedIn">
<action expression="#{redirect.captureCurrentView}"/>
Deleted: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.jsp
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.jsp 2009-05-19 12:07:13 UTC (rev 15343)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.jsp 2009-05-19 13:24:49 UTC (rev 15344)
@@ -1,12 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<html>
- <head>
- <title></title>
- </head>
- <body>
- <f:view>
- <h:outputText value="Test value is #{test.value}!" />
- </f:view>
- </body>
-</html>
Deleted: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.properties 2009-05-19 12:07:13 UTC (rev 15343)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.properties 2009-05-19 13:24:49 UTC (rev 15344)
@@ -1 +0,0 @@
-TEST_VALUE = This value is #{test.value}!
\ No newline at end of file
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2009-05-19 12:07:13 UTC (rev 15343)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2009-05-19 13:24:49 UTC (rev 15344)
@@ -67,14 +67,14 @@
TestChangeStructure structure = new TestChangeStructure(ejbProject.getProject(), "/ejbModule/org/domain/"+warProjectName+"/session/TestComponent.java",
89, 6, "\"best\"");
list.add(structure);
- /*
- structure = new TestChangeStructure("/WebContent/WEB-INF/components.xml",
- 2660, 6, "best");
+
+ structure = new TestChangeStructure(warProject, "/WebContent/WEB-INF/components.xml",
+ 1106, 4, "best");
list.add(structure);
- structure = new TestChangeStructure("/WebContent/WEB-INF/components.xml",
- 2756, 4, "best");
+ structure = new TestChangeStructure(warProject, "/WebContent/WEB-INF/components.xml",
+ 1934, 4, "best");
list.add(structure);
- */
+
structure = new TestChangeStructure(ejbProject, "/ejbModule/org/domain/"+warProjectName+"/session/TestSeamComponent.java",
420, 11, "@In(\"best\")");
list.add(structure);
@@ -107,17 +107,6 @@
29, 4, "best");
list.add(structure);
-// structure = new TestChangeStructure(earProject, "/EarContent/test.jsp",
-// 227, 4, "best");
-// list.add(structure);
-//
-// structure = new TestChangeStructure(earProject, "/EarContent/test.properties",
-// 29, 4, "best");
-// list.add(structure);
-
- /*
-
- */
renameComponent(seamEjbProject, "test", "best", list);
}
15 years, 4 months
JBoss Tools SVN: r15343 - trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2009-05-19 08:07:13 -0400 (Tue, 19 May 2009)
New Revision: 15343
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools/hibernate-tools.jar
Log:
updated hibernatetools to latest build
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools/hibernate-tools.jar
===================================================================
(Binary files differ)
15 years, 4 months
JBoss Tools SVN: r15342 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-05-19 06:46:46 -0400 (Tue, 19 May 2009)
New Revision: 15342
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4326
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-05-19 10:29:11 UTC (rev 15341)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-05-19 10:46:46 UTC (rev 15342)
@@ -91,6 +91,7 @@
private ISeamComponent component;
private String newName;
SeamContextValidationHelper coreHelper = new SeamContextValidationHelper();
+ SeamProjectsSet projectsSet;
/**
* @param component Renamed component
@@ -117,8 +118,6 @@
if(declarationFile == null)
return;
- SeamProjectsSet projectsSet = new SeamProjectsSet(declarationFile.getProject());
-
IProject[] projects = projectsSet.getAllProjects();
for (IProject project : projects) {
scan(project);
@@ -159,9 +158,9 @@
private void findDeclarations() throws CoreException{
files.clear();
- findDeclarations(component);
+ findDeclarations(component, true);
- SeamProjectsSet projectsSet = new SeamProjectsSet(declarationFile.getProject());
+ projectsSet = new SeamProjectsSet(declarationFile.getProject());
IProject[] projects = projectsSet.getAllProjects();
for (IProject project : projects) {
@@ -169,18 +168,18 @@
if(seamProject != null){
ISeamComponent comp = seamProject.getComponent(component.getName());
if(comp != null)
- findDeclarations(comp);
+ findDeclarations(comp, false);
}
}
}
- private void findDeclarations(ISeamComponent component) throws CoreException{
+ private void findDeclarations(ISeamComponent component, boolean force) throws CoreException{
if(component.getJavaDeclaration() != null){
if(!files.contains(component.getJavaDeclaration().getResource().getFullPath())){
files.add(component.getJavaDeclaration().getResource().getFullPath());
renameJavaDeclaration(component.getJavaDeclaration());
- }
-
+ }else if(force)
+ renameJavaDeclaration(component.getJavaDeclaration());
}
Set<ISeamXmlComponentDeclaration> xmlDecls = component.getXmlDeclarations();
@@ -189,7 +188,8 @@
if(!files.contains(xmlDecl.getResource().getFullPath())){
files.add(xmlDecl.getResource().getFullPath());
renameXMLDeclaration(xmlDecl);
- }
+ }else if(force)
+ renameXMLDeclaration(xmlDecl);
}
}
@@ -431,15 +431,33 @@
}
private void findAnnotations(){
- // find @In annotations
ISeamProject seamProject = SeamCorePlugin.getSeamProject(declarationFile.getProject(), true);
+ files.clear();
+ findAnnotations(seamProject, true);
+ IProject[] projects = projectsSet.getAllProjects();
+ for (IProject project : projects) {
+ ISeamProject sProject = SeamCorePlugin.getSeamProject(project, true);
+ if(sProject != null){
+ findAnnotations(sProject, false);
+ }
+ }
+
+ }
+
+ private void findAnnotations(ISeamProject seamProject, boolean force){
+ // find @In annotations
Set<IBijectedAttribute> inSet = seamProject.getBijectedAttributesByName(component.getName(), BijectedAttributeType.IN);
for(IBijectedAttribute inAtt : inSet){
ITextSourceReference location = inAtt.getLocationFor(SeamAnnotations.IN_ANNOTATION_TYPE);
- if(location != null)
- changeAnnotation(location, (IFile)inAtt.getResource());
+ if(location != null){
+ if(!files.contains(inAtt.getResource().getFullPath())){
+ files.add(inAtt.getResource().getFullPath());
+ changeAnnotation(location, (IFile)inAtt.getResource());
+ }else if(force)
+ changeAnnotation(location, (IFile)inAtt.getResource());
+ }
}
// find @Factory annotations
@@ -449,12 +467,22 @@
IFile file = (IFile)factory.getResource();
if(file.getFileExtension().equalsIgnoreCase(JAVA_EXT)){
ITextSourceReference location = factory.getLocationFor(SeamAnnotations.FACTORY_ANNOTATION_TYPE);
- if(location != null)
- changeAnnotation(location, file);
+ if(location != null){
+ if(!files.contains(file.getFullPath())){
+ files.add(file.getFullPath());
+ changeAnnotation(location, file);
+ }else if(force)
+ changeAnnotation(location, file);
+ }
}else{
ITextSourceReference location = factory.getLocationFor(ISeamXmlComponentDeclaration.NAME);
- if(location != null)
- changeXMLNode(location, file);
+ if(location != null){
+ if(!files.contains(file.getFullPath())){
+ files.add(file.getFullPath());
+ changeXMLNode(location, file);
+ }else if(force)
+ changeXMLNode(location, file);
+ }
}
}
}
15 years, 4 months
JBoss Tools SVN: r15341 - trunk/documentation/jboss-tools-docs-archetype.
by jbosstools-commits＠lists.jboss.org
Author: msorokin
Date: 2009-05-19 06:29:11 -0400 (Tue, 19 May 2009)
New Revision: 15341
Modified:
trunk/documentation/jboss-tools-docs-archetype/readme.txt
Log:
https://jira.jboss.org/jira/browse/JBDS-708
Archetype is created
Modified: trunk/documentation/jboss-tools-docs-archetype/readme.txt
===================================================================
--- trunk/documentation/jboss-tools-docs-archetype/readme.txt 2009-05-19 09:16:36 UTC (rev 15340)
+++ trunk/documentation/jboss-tools-docs-archetype/readme.txt 2009-05-19 10:29:11 UTC (rev 15341)
@@ -1,8 +1,8 @@
jboss-tools-docs-archetype
-The "jboss-tools-docs-archetype" archetype help create a skeleton for a new guide. To use it you need to take a few simple steps:
+The "jboss-tools-docs-archetype" archetype helps create a skeleton for a new guide. To use it you need to take a few simple steps:
1. Build the archetype in the current folder with "mvn install"
2. Navigate to the folder with the new plugin for which you want to make a new guide.
-3. Create the docs folder
+3. Create the docs folder. If the folder already exists just proceed to the next step.
4. CD to docs folder
5. Run mvn "archetype:generate -DarchetypeGroupId=org.jboss.tools -DarchetypeArtifactId=jboss-tools-docs-archetype -DarchetypeVersion=1.0-SNAPSHOT -DartifactId=XXX_Guide -DgroupId=org.jboss.tools"
6. That's it. A new guide is created. You can build it (CD to XXX_Guide directory and run "mvn install" ) to see that everything's ok.
15 years, 4 months
JBoss Tools SVN: r15340 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui: src/org/jboss/tools/smooks/configuration/validate and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-05-19 05:16:36 -0400 (Tue, 19 May 2009)
New Revision: 15340
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java
Log:
JBIDE-4232
fix some problems with the smooks validator
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2009-05-19 07:26:26 UTC (rev 15339)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2009-05-19 09:16:36 UTC (rev 15340)
@@ -105,9 +105,6 @@
</contentType>
</rules>
</include>
- <group
- id="org.eclipse.wst.sse.core.structuredModelGroup">
- </group>
</validator>
</extension>
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java 2009-05-19 07:26:26 UTC (rev 15339)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java 2009-05-19 09:16:36 UTC (rev 15340)
@@ -39,7 +39,6 @@
import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PartInitException;
import org.eclipse.wst.validation.AbstractValidator;
import org.eclipse.wst.validation.ValidationResult;
import org.eclipse.wst.validation.ValidationState;
@@ -78,12 +77,15 @@
private boolean waiting = false;
private Object lock = new Object();
private AdapterFactoryEditingDomain innerEditingDomain;
+
+ private SmooksMarkerHelper markerHelper = new SmooksMarkerHelper();
private long watingTime = 300;
private List<ISmooksModelValidateListener> listeners = new ArrayList<ISmooksModelValidateListener>();
private List<ISmooksValidator> validatorList = new ArrayList<ISmooksValidator>();
+ private ComposedAdapterFactory adapterFactory;
public SmooksModelValidator(Collection<?> selectedObjects, EditingDomain domain) {
this();
@@ -241,47 +243,49 @@
}
private AdapterFactoryEditingDomain newEditingDomain() {
- ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
- ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
- adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new XslItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new FreemarkerItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new JavabeanItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new CommonItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new SmooksItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new MEdiItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new EdiItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new IoroutingItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new JsonItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new JmsroutingItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new DbroutingItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new CsvItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new DatasourceItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new CalcItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new GroovyItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new FileRoutingItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
BasicCommandStack commandStack = new BasicCommandStack();
- AdapterFactoryEditingDomain editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack,
+ AdapterFactoryEditingDomain editingDomain = new AdapterFactoryEditingDomain(getAdapterFactory(), commandStack,
new HashMap<Resource, Boolean>());
return editingDomain;
}
- @Override
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
- System.out.println("validate file : " + resource.getFullPath().toOSString() + ", resource change type : "
- + kind);
+ public ComposedAdapterFactory getAdapterFactory() {
+ if(adapterFactory == null){
+ adapterFactory = new ComposedAdapterFactory(
+ ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
- AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) this.domain;
- if (editingDomain == null) {
- editingDomain = this.innerEditingDomain;
+ adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new XslItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new FreemarkerItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new JavabeanItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new CommonItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new SmooksItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new MEdiItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new EdiItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new IoroutingItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new JsonItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new JmsroutingItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new DbroutingItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new CsvItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new DatasourceItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new CalcItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new GroovyItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new FileRoutingItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
}
+ return adapterFactory;
+ }
+
+ @Override
+ public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
+ System.out.println("validate file : " + resource.getFullPath().toString() + ", change type is " + kind);
+ AdapterFactoryEditingDomain editingDomain = newEditingDomain();
if (editingDomain == null)
return null;
Object smooksModel = null;
Resource smooksResource = new SmooksResourceFactoryImpl().createResource(URI.createPlatformResourceURI(resource
.getFullPath().toPortableString(), false));
+ editingDomain.getResourceSet().getResources().add(smooksResource);
try {
smooksResource.load(Collections.emptyMap());
smooksModel = smooksResource.getContents().get(0);
@@ -293,40 +297,21 @@
}
List<Object> list = new ArrayList<Object>();
list.add(smooksModel);
- for (Iterator<?> iterator = listeners.iterator(); iterator.hasNext();) {
- final ISmooksModelValidateListener l = (ISmooksModelValidateListener) iterator.next();
- Display.getDefault().syncExec(new Runnable() {
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Runnable#run()
- */
- public void run() {
- l.validateStart();
- }
-
- });
-
- }
-
+
final List<Diagnostic> d = this.validate(list, editingDomain, monitor);
- for (Iterator<?> iterator = listeners.iterator(); iterator.hasNext();) {
- final ISmooksModelValidateListener l = (ISmooksModelValidateListener) iterator.next();
- Display.getDefault().syncExec(new Runnable() {
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Runnable#run()
- */
- public void run() {
- l.validateEnd(d);
+ try{
+ markerHelper.deleteMarkers(smooksResource);
+ for (Iterator<?> iterator = d.iterator(); iterator.hasNext();) {
+ Diagnostic diagnostic = (Diagnostic) iterator.next();
+ if (resource != null && diagnostic.getSeverity() != Diagnostic.OK) {
+ for (Diagnostic childDiagnostic : diagnostic.getChildren()) {
+ markerHelper.createMarkers(smooksResource, childDiagnostic);
}
-
- });
+ }
}
-
+ }catch(Exception e){
+ e.printStackTrace();
+ }
return null;
}
@@ -335,6 +320,6 @@
}
public void validate(IValidationContext helper, IReporter reporter) throws ValidationException {
-
+ System.out.println("validate helper");
}
}
15 years, 4 months
JBoss Tools SVN: r15339 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui: src/org/jboss/tools/smooks/configuration/editors/uitls and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-05-19 03:26:26 -0400 (Tue, 19 May 2009)
New Revision: 15339
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SearchComposite.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
Log:
JBIDE-4232
1.remove useless plugin dependence.
2.change the text SWT type when the tool runs on Linux.
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2009-05-19 05:47:39 UTC (rev 15338)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2009-05-19 07:26:26 UTC (rev 15339)
@@ -19,8 +19,7 @@
org.eclipse.emf.edit.ui,
org.eclipse.jdt.core,
org.eclipse.jdt.ui,
- org.eclipse.wst.validation,
- org.eclipse.wst.validation.ui;bundle-version="1.2.2"
+ org.eclipse.wst.validation
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SearchComposite.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SearchComposite.java 2009-05-19 05:47:39 UTC (rev 15338)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SearchComposite.java 2009-05-19 07:26:26 UTC (rev 15339)
@@ -41,8 +41,12 @@
gl.makeColumnsEqualWidth = false;
gl.marginHeight = 0;
this.setLayout(gl);
+ int textStyle = SWT.NONE;
+ if(SmooksUIUtils.isLinuxOS()){
+ textStyle = SWT.BORDER;
+ }
if (toolkit != null) {
- text = toolkit.createText(this, "");
+ text = toolkit.createText(this, "" , textStyle);
} else {
text = new Text(this, SWT.BORDER);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-05-19 05:47:39 UTC (rev 15338)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-05-19 07:26:26 UTC (rev 15339)
@@ -331,6 +331,14 @@
return createStringFieldEditor(label, parent, editingdomain, toolkit, itemPropertyDescriptor, model, false,
true, true, 0, listener, valueType, action);
}
+
+ public static boolean isLinuxOS(){
+ Object osName = System.getProperties().get("os.name");
+ if(osName != null && "linux".equalsIgnoreCase(osName.toString())){
+ return true;
+ }
+ return false;
+ }
public static AttributeFieldEditPart createStringFieldEditor(String label, final Composite parent,
EditingDomain editingdomain, FormToolkit toolkit, final IItemPropertyDescriptor itemPropertyDescriptor,
@@ -430,7 +438,11 @@
}
gd = new GridData(GridData.FILL_HORIZONTAL);
+
int textType = SWT.FLAT;
+ if(isLinuxOS()){
+ textType = SWT.BORDER;
+ }
if (multiText) {
textType = SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL;
}
15 years, 4 months
JBoss Tools SVN: r15338 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-05-19 01:47:39 -0400 (Tue, 19 May 2009)
New Revision: 15338
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
Log:
JBIDE-4280
Add "Bundle-Localization: plugin" in MANIFEST.MF to make plugin.properties works
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2009-05-19 02:48:33 UTC (rev 15337)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2009-05-19 05:47:39 UTC (rev 15338)
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Smooks Tools UI Plug-in
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.jboss.tools.smooks.ui;singleton:=true
Bundle-Version: 1.0.0
Bundle-Activator: org.jboss.tools.smooks.configuration.SmooksConfigurationActivator
@@ -22,7 +22,8 @@
org.eclipse.wst.validation,
org.eclipse.wst.validation.ui;bundle-version="1.2.2"
Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: JBoss, a division of Red Hat
+Bundle-Vendor: %providerName
Bundle-ClassPath: libs/dom4j-1.6.1.jar,
.
15 years, 4 months