JBoss Tools SVN: r3557 - in trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts: model/handlers and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-09-11 10:26:02 -0400 (Tue, 11 Sep 2007)
New Revision: 3557
Modified:
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsAdoptManager.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/MethodDescriptor.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsPromptingProvider.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectSupport.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-891 Clean out struts component
Code clean up is performed
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java 2007-09-11 14:25:41 UTC (rev 3556)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java 2007-09-11 14:26:02 UTC (rev 3557)
@@ -29,11 +29,6 @@
INSTANCE = this;
}
- public void stop(BundleContext context) throws Exception {
-// StrutsStudioVariableInitializer.save(getPreferenceStore());
- super.stop(context);
- }
-
protected void initializeDefaultPluginPreferences() {
super.initializeDefaultPluginPreferences();
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsAdoptManager.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsAdoptManager.java 2007-09-11 14:25:41 UTC (rev 3556)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsAdoptManager.java 2007-09-11 14:26:02 UTC (rev 3557)
@@ -121,7 +121,9 @@
((StrutsProcessImpl)target).getHelper().updateTiles();
// XModelObject tile =
CreatePageSupport.createPage(target, path, p);
- } catch (Exception e) {}
+ } catch (Exception e) {
+ StrutsModelPlugin.getPluginLog().logError(e);
+ }
}
protected boolean isAdoptableBundle(XModelObject object) {
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/MethodDescriptor.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/MethodDescriptor.java 2007-09-11 14:25:41 UTC (rev 3556)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/MethodDescriptor.java 2007-09-11 14:26:02 UTC (rev 3557)
@@ -14,6 +14,7 @@
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
+import org.jboss.tools.struts.StrutsModelPlugin;
public class MethodDescriptor {
private IMethod constructor;
@@ -79,7 +80,7 @@
try {
modifiers = constructor.getFlags();
} catch (JavaModelException e) {
- //ignore
+ StrutsModelPlugin.getPluginLog().logError(e);
}
if (Flags.isPublic(modifiers))
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsPromptingProvider.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsPromptingProvider.java 2007-09-11 14:25:41 UTC (rev 3556)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsPromptingProvider.java 2007-09-11 14:26:02 UTC (rev 3557)
@@ -16,6 +16,7 @@
import org.jboss.tools.common.model.java.handlers.OpenJavaSourceHandler;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.struts.StrutsModelPlugin;
import org.jboss.tools.struts.model.helpers.open.*;
import org.jboss.tools.jst.web.project.list.IWebPromptingProvider;
@@ -69,7 +70,9 @@
l.add(page);
return l;
}
- } catch (Exception e) {}
+ } catch (Exception e) {
+ StrutsModelPlugin.getPluginLog().logError(e);
+ }
IFile f = (IFile)properties.get(FILE);
OpenLinkPageHelper h = new OpenLinkPageHelper();
error = h.run(f, model, page);
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectSupport.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectSupport.java 2007-09-11 14:25:41 UTC (rev 3556)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectSupport.java 2007-09-11 14:26:02 UTC (rev 3557)
@@ -13,6 +13,7 @@
import java.util.Properties;
import org.jboss.tools.common.meta.action.impl.*;
+import org.jboss.tools.struts.StrutsModelPlugin;
public class AdoptProjectSupport extends SpecialWizardSupport {
protected AdoptProjectContext context = new AdoptProjectContext();
@@ -55,6 +56,7 @@
action(NEXT);
} catch (Exception e) {
//obsolete //ignore
+ StrutsModelPlugin.getPluginLog().logError(e);
return;
}
int i = presetLocation.lastIndexOf('/');
@@ -67,6 +69,7 @@
action(NEXT);
} catch (Exception e) {
//obsolete //ignore
+ StrutsModelPlugin.getPluginLog().logError(e);
return;
}
presetSuccess = true;
16 years, 9 months
JBoss Tools SVN: r3556 - trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-09-11 10:25:41 -0400 (Tue, 11 Sep 2007)
New Revision: 3556
Modified:
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsExtensionsPlugin.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-891 Clean out struts component
Code clean up is performed
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsExtensionsPlugin.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsExtensionsPlugin.java 2007-09-11 13:31:02 UTC (rev 3555)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsExtensionsPlugin.java 2007-09-11 14:25:41 UTC (rev 3556)
@@ -17,7 +17,6 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.jboss.tools.common.log.BaseUIPlugin;
import org.jboss.tools.common.log.IPluginLog;
-import org.jboss.tools.common.log.LogHelper;
import org.osgi.framework.BundleContext;
@@ -67,7 +66,7 @@
try {
return bundle.getString(key);
} catch (MissingResourceException e) {
- LogHelper.logError(PLUGIN_ID, e);
+ StrutsExtensionsPlugin.getPluginLog().logError(e);
return key;
}
}
16 years, 9 months
JBoss Tools SVN: r3555 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-11 09:31:02 -0400 (Tue, 11 Sep 2007)
New Revision: 3555
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
Log:
JBIDE-825 Added listener to runtime preference to update default runtime.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2007-09-11 12:53:17 UTC (rev 3554)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2007-09-11 13:31:02 UTC (rev 3555)
@@ -32,6 +32,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Preferences;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
import org.jboss.tools.common.xml.XMLUtilities;
@@ -51,6 +52,7 @@
import org.jboss.tools.seam.core.event.Change;
import org.jboss.tools.seam.core.event.ISeamProjectChangeListener;
import org.jboss.tools.seam.core.event.SeamProjectChangeEvent;
+import org.jboss.tools.seam.core.project.facet.SeamFacetPreference;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
import org.jboss.tools.seam.internal.core.scanner.LoadedDeclarations;
@@ -68,6 +70,8 @@
ClassPath classPath = new ClassPath(this);
+ boolean useDefaultRuntime = false;
+
SeamRuntime runtime = null;
Set<IPath> sourcePaths = new HashSet<IPath>();
@@ -134,12 +138,20 @@
*
*/
public SeamRuntime getRuntime() {
+ if(useDefaultRuntime) {
+ SeamRuntimeManager.getInstance().getDefaultRuntime();
+ }
return runtime;
}
public void setRuntime(SeamRuntime runtime) {
if(this.runtime == runtime) return;
- this.runtime = runtime;
+ useDefaultRuntime = runtime == SeamRuntimeManager.getInstance().getDefaultRuntime();
+ if(useDefaultRuntime) {
+ this.runtime = null;
+ } else {
+ this.runtime = runtime;
+ }
storeRuntime();
}
@@ -213,9 +225,19 @@
if(runtimeName != null) {
runtime = SeamRuntimeManager.getInstance().findRuntimeByName(runtimeName);
} else {
- runtime = SeamRuntimeManager.getInstance().getDefaultRuntime();
+ useDefaultRuntime = true;
+ runtime = null;
storeRuntime();
}
+ SeamCorePlugin.getDefault().getPluginPreferences().addPropertyChangeListener(new Preferences.IPropertyChangeListener() {
+ public void propertyChange(Preferences.PropertyChangeEvent event) {
+ if(SeamFacetPreference.RUNTIME_LIST.equals(event.getProperty()) && runtime != null && runtime.isDefault()) {
+ runtime = null;
+ useDefaultRuntime = true;
+ storeRuntime();
+ }
+ }
+ });
}
/**
16 years, 9 months
JBoss Tools SVN: r3554 - branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-09-11 08:53:17 -0400 (Tue, 11 Sep 2007)
New Revision: 3554
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-746 SWT.Browser has been decorated in XulRunnerBrowser instead of implementation of Browser on XulRunner by ourself
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2007-09-11 12:49:01 UTC (rev 3553)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2007-09-11 12:53:17 UTC (rev 3554)
@@ -37,6 +37,7 @@
import org.mozilla.interfaces.nsIWebBrowser;
import org.mozilla.interfaces.nsIWebBrowserChrome;
import org.mozilla.interfaces.nsIWebBrowserFocus;
+import org.mozilla.interfaces.nsIWebBrowserSetup;
import org.mozilla.interfaces.nsIWebNavigation;
import org.mozilla.interfaces.nsIWebProgress;
import org.mozilla.interfaces.nsIWebProgressListener;
@@ -102,6 +103,10 @@
webBrowser = (nsIWebBrowser) browser.getWebBrowser();
// webBrowser = (nsIWebBrowser) componentManager.createInstance(XPCOM.NS_IWEBBROWSER_CID, null, nsIWebBrowser.NS_IWEBBROWSER_IID); //$NON-NLS-1$
// webBrowser.setContainerWindow(this);
+
+ nsIWebBrowserSetup setup = (nsIWebBrowserSetup) webBrowser.queryInterface(nsIWebBrowserSetup.NS_IWEBBROWSERSETUP_IID);
+ setup.setProperty(nsIWebBrowserSetup.SETUP_IS_CHROME_WRAPPER, 1);
+
// nsIBaseWindow baseWindow = (nsIBaseWindow) webBrowser.queryInterface(nsIBaseWindow.NS_IBASEWINDOW_IID);
//
// Rectangle rect = getClientArea();
16 years, 9 months
JBoss Tools SVN: r3553 - in branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner: browser and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-09-11 08:49:01 -0400 (Tue, 11 Sep 2007)
New Revision: 3553
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/XPCOM.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-746 SWT.Browser has been decorated in XulRunnerBrowser instead of implementation of Browser on XulRunner by ourself
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/XPCOM.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/XPCOM.java 2007-09-11 11:54:58 UTC (rev 3552)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/XPCOM.java 2007-09-11 12:49:01 UTC (rev 3553)
@@ -23,6 +23,7 @@
public static final String NS_DRAGSERVICE_CONTRACTID = "@mozilla.org/widget/dragservice;1;"; //$NON-NLS-1$
public static final String NS_TRANSFERABLE_CONTRACTID = "@mozilla.org/widget/transferable;1"; //$NON-NLS-1$
public static final String NS_WINDOWWATCHER_CONTRACTID = "@mozilla.org/embedcomp/window-watcher;1"; //$NON-NLS-1$
+ public static final String NS_PREFSERVICE_CONTRACTID = "@mozilla.org/preferences-service;1"; //$NON-NLS-1$
public static final String NS_IWEBBROWSER_CID = "F1EAC761-87E9-11d3-AF80-00A024FFC08C"; // $NON-NLS-1$
public static final String NS_IAPPSHELL_CID = "2d96b3df-c051-11d1-a827-0040959a28c9"; // $NON-NLS-1$
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2007-09-11 11:54:58 UTC (rev 3552)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2007-09-11 12:49:01 UTC (rev 3553)
@@ -23,13 +23,12 @@
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.jboss.tools.vpe.xulrunner.XPCOM;
import org.jboss.tools.vpe.xulrunner.XulRunnerException;
-import org.mozilla.interfaces.nsIAppShell;
import org.mozilla.interfaces.nsIBaseWindow;
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;
@@ -41,7 +40,6 @@
import org.mozilla.interfaces.nsIWebNavigation;
import org.mozilla.interfaces.nsIWebProgress;
import org.mozilla.interfaces.nsIWebProgressListener;
-import org.mozilla.interfaces.nsIWindowWatcher;
import org.mozilla.xpcom.Mozilla;
import org.osgi.framework.Bundle;
@@ -60,6 +58,11 @@
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 Mozilla mozilla = null;
private Browser browser = null;
private nsIWebBrowser webBrowser = null;
@@ -80,7 +83,13 @@
}
browser = new Browser(parent, SWT.MOZILLA);
+
+ // TODO Sergey Vasilyelv insert observer here
+ // TODO Sergey Vasilyev add localization
+ setBoolRootPref(PREFERENCE_DISABLEOPENDURINGLOAD, true);
+ setBoolRootPref(PREFERENCE_DISABLEWINDOWSTATUSCHANGE, true);
+
// nsIComponentManager componentManager = mozilla.getComponentManager();
// nsIAppShell appShell = (nsIAppShell) componentManager.createInstance(XPCOM.NS_IAPPSHELL_CID, null, nsIAppShell.NS_IAPPSHELL_IID);
// appShell.create(null, null);
@@ -185,6 +194,9 @@
browser.setLayoutData(layoutData);
}
+ /**
+ * Decorate Widget.addListener(int eventType, Listener listener)
+ */
public void addListener(int eventType, Listener listener) {
browser.addListener(eventType, listener);
}
@@ -305,7 +317,46 @@
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
*
16 years, 9 months
JBoss Tools SVN: r3552 - branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-09-11 07:54:58 -0400 (Tue, 11 Sep 2007)
New Revision: 3552
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-746 SWT.Browser has been decorated in XulRunnerBrowser instead of implementation of Browser on XulRunner by ourself
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2007-09-11 11:54:52 UTC (rev 3551)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2007-09-11 11:54:58 UTC (rev 3552)
@@ -18,8 +18,11 @@
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.graphics.Rectangle;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.jboss.tools.vpe.xulrunner.XPCOM;
@@ -48,7 +51,7 @@
*
*/
-public class XulRunnerBrowser extends Composite implements nsIWebBrowserChrome,
+public class XulRunnerBrowser implements nsIWebBrowserChrome,
nsIWebProgressListener, nsITooltipListener {
private static String XULRUNNER_BUNDLE = "org.jboss.tools.vpe.mozilla.xulrunner"; //$NON-NLS-1$
private static String XULRUNNER_ENTRY = "/xulrunner";
@@ -58,14 +61,13 @@
static final String XULRUNNER_PATH = "org.eclipse.swt.browser.XULRunnerPath"; //$NON-NLS-1$
private Mozilla mozilla = null;
+ private Browser browser = null;
private nsIWebBrowser webBrowser = null;
private long chrome_flags = nsIWebBrowserChrome.CHROME_ALL;
- private boolean busyResizeFlag = false;
+// private boolean busyResizeFlag = false;
public XulRunnerBrowser(Composite parent) throws XulRunnerException {
- super(parent, SWT.NONE);
-
mozilla = Mozilla.getInstance();
String xulRunnerPath = getXulRunnerPath();
@@ -77,81 +79,124 @@
System.setProperty(XULRUNNER_INITIALIZED, "true");
}
- nsIComponentManager componentManager = mozilla.getComponentManager();
- nsIAppShell appShell = (nsIAppShell) componentManager.createInstance(XPCOM.NS_IAPPSHELL_CID, null, nsIAppShell.NS_IAPPSHELL_IID);
- appShell.create(null, null);
- appShell.spinup();
-
- nsIServiceManager serviceManager = mozilla.getServiceManager();
- nsIWindowWatcher windowWatcher = (nsIWindowWatcher) serviceManager.getServiceByContractID(XPCOM.NS_WINDOWWATCHER_CONTRACTID, nsIWindowWatcher.NS_IWINDOWWATCHER_IID);
- windowWatcher.setWindowCreator(new WindowCreator());
+ browser = new Browser(parent, SWT.MOZILLA);
- webBrowser = (nsIWebBrowser) componentManager.createInstance(XPCOM.NS_IWEBBROWSER_CID, null, nsIWebBrowser.NS_IWEBBROWSER_IID); //$NON-NLS-1$
- webBrowser.setContainerWindow(this);
- nsIBaseWindow baseWindow = (nsIBaseWindow) webBrowser.queryInterface(nsIBaseWindow.NS_IBASEWINDOW_IID);
+// nsIComponentManager componentManager = mozilla.getComponentManager();
+// nsIAppShell appShell = (nsIAppShell) componentManager.createInstance(XPCOM.NS_IAPPSHELL_CID, null, nsIAppShell.NS_IAPPSHELL_IID);
+// appShell.create(null, null);
+// appShell.spinup();
+//
+// nsIServiceManager serviceManager = mozilla.getServiceManager();
+// nsIWindowWatcher windowWatcher = (nsIWindowWatcher) serviceManager.getServiceByContractID(XPCOM.NS_WINDOWWATCHER_CONTRACTID, nsIWindowWatcher.NS_IWINDOWWATCHER_IID);
+// windowWatcher.setWindowCreator(new WindowCreator());
- Rectangle rect = getClientArea();
- if (rect.isEmpty()) {
- rect.height = 1;
- rect.width = 1;
- }
- baseWindow.initWindow(handle, 0, 0, 0, rect.height, rect.width);
- baseWindow.create();
- baseWindow.setVisibility(true);
+ webBrowser = (nsIWebBrowser) browser.getWebBrowser();
+// webBrowser = (nsIWebBrowser) componentManager.createInstance(XPCOM.NS_IWEBBROWSER_CID, null, nsIWebBrowser.NS_IWEBBROWSER_IID); //$NON-NLS-1$
+// webBrowser.setContainerWindow(this);
+// nsIBaseWindow baseWindow = (nsIBaseWindow) webBrowser.queryInterface(nsIBaseWindow.NS_IBASEWINDOW_IID);
+//
+// Rectangle rect = getClientArea();
+// if (rect.isEmpty()) {
+// rect.height = 1;
+// rect.width = 1;
+// }
+// baseWindow.initWindow(handle, 0, 0, 0, rect.height, rect.width);
+// baseWindow.create();
+// baseWindow.setVisibility(true);
- Listener listener = new Listener(){
- public void handleEvent (Event event) {
- switch(event.type) {
- case SWT.Dispose:
- onDispose();
- break;
- case SWT.Activate:
- case SWT.FocusIn:
- onFocusGained();
- break;
- case SWT.Deactivate:
- if (XulRunnerBrowser.this == event.display.getFocusControl()) {
- onFocusLost();
- }
- break;
- case SWT.Resize:
- case SWT.Show:
- /*
- * Feature on GTK Mozilla. Mozilla does not show up when
- * its container (a GTK fixed handle) is made visible
- * after having been hidden. The workaround is to reset
- * its size after the container has been made visible.
- */
- if (!busyResizeFlag) {
- busyResizeFlag = true;
- event.display.asyncExec(new Runnable() {
- public void run() {
- if (XulRunnerBrowser.this.isDisposed()) return;
- onResize();
- busyResizeFlag = false;
- }
- });
- }
- break;
- case SWT.KeyDown:
- onKeyDown();
- break;
- }
- }
- };
-
- addListener(SWT.Dispose, listener);
- addListener(SWT.Resize, listener);
- addListener(SWT.FocusIn, listener);
- addListener(SWT.KeyDown, listener);
- addListener(SWT.Activate, listener);
- addListener(SWT.Deactivate, listener);
- addListener(SWT.Show, listener);
+// Listener listener = new Listener(){
+// public void handleEvent (Event event) {
+// switch(event.type) {
+// case SWT.Dispose:
+// onDispose();
+// break;
+// case SWT.Activate:
+// case SWT.FocusIn:
+// onFocusGained();
+// break;
+// case SWT.Deactivate:
+// if (browser == event.display.getFocusControl()) {
+// onFocusLost();
+// }
+// break;
+// case SWT.Resize:
+// case SWT.Show:
+// /*
+// * Feature on GTK Mozilla. Mozilla does not show up when
+// * its container (a GTK fixed handle) is made visible
+// * after having been hidden. The workaround is to reset
+// * its size after the container has been made visible.
+// */
+// if (!busyResizeFlag) {
+// busyResizeFlag = true;
+// event.display.asyncExec(new Runnable() {
+// public void run() {
+// if (browser.isDisposed()) return;
+// onResize();
+// busyResizeFlag = false;
+// }
+// });
+// }
+// break;
+// case SWT.KeyDown:
+// onKeyDown();
+// break;
+// }
+// }
+// };
+//
+// browser.addListener(SWT.Dispose, listener);
+// browser.addListener(SWT.Resize, listener);
+// browser.addListener(SWT.FocusIn, listener);
+// browser.addListener(SWT.KeyDown, listener);
+// browser.addListener(SWT.Activate, listener);
+// browser.addListener(SWT.Deactivate, listener);
+// browser.addListener(SWT.Show, listener);
webBrowser.addWebBrowserListener(this, nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID);
webBrowser.addWebBrowserListener(this, nsITooltipListener.NS_ITOOLTIPLISTENER_IID);
}
+ /**
+ * 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);
+ }
+
+ public void addListener(int eventType, Listener listener) {
+ browser.addListener(eventType, listener);
+ }
+
+ /**
+ * Decorate Widget.dispose()
+ */
+ public void dispose() {
+ browser.dispose();
+
+ }
+
private void onDispose() {
nsIBaseWindow baseWindow = (nsIBaseWindow) webBrowser.queryInterface(nsIBaseWindow.NS_IBASEWINDOW_IID);
baseWindow.destroy();
@@ -171,7 +216,7 @@
private void onResize() {
nsIBaseWindow baseWindow = (nsIBaseWindow) webBrowser.queryInterface(nsIBaseWindow.NS_IBASEWINDOW_IID);
- Rectangle rect = getClientArea();
+ Rectangle rect = browser.getClientArea();
if (rect.isEmpty()) {
rect.height = 1;
rect.width = 1;
@@ -370,4 +415,11 @@
*/
public void onShowTooltip(int aXCoords, int aYCoords, String aTipText) {
}
+
+ /**
+ * @return the browser
+ */
+ public Browser getBrowser() {
+ return browser;
+ }
}
16 years, 9 months
JBoss Tools SVN: r3551 - branches/jbosstools_xulrunner/vpe/xul_spike/org.jboss.tools.vpe.xulrunner.view/src/org/jboss/tools/vpe/xulrunner/browser/view/views.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-09-11 07:54:52 -0400 (Tue, 11 Sep 2007)
New Revision: 3551
Modified:
branches/jbosstools_xulrunner/vpe/xul_spike/org.jboss.tools.vpe.xulrunner.view/src/org/jboss/tools/vpe/xulrunner/browser/view/views/XulRunnerBrowserView.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-746 SWT.Browser has been decorated in XulRunnerBrowser instead of implementation of Browser on XulRunner by ourself
Modified: branches/jbosstools_xulrunner/vpe/xul_spike/org.jboss.tools.vpe.xulrunner.view/src/org/jboss/tools/vpe/xulrunner/browser/view/views/XulRunnerBrowserView.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/xul_spike/org.jboss.tools.vpe.xulrunner.view/src/org/jboss/tools/vpe/xulrunner/browser/view/views/XulRunnerBrowserView.java 2007-09-11 11:54:48 UTC (rev 3550)
+++ branches/jbosstools_xulrunner/vpe/xul_spike/org.jboss.tools.vpe.xulrunner.view/src/org/jboss/tools/vpe/xulrunner/browser/view/views/XulRunnerBrowserView.java 2007-09-11 11:54:52 UTC (rev 3551)
@@ -229,7 +229,7 @@
private void showMessage(String message) {
MessageDialog.openInformation(
- browser.getShell(),
+ browser.getBrowser().getShell(),
"XulRunner Browser View",
message);
}
16 years, 9 months
JBoss Tools SVN: r3550 - in branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor/mozilla and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-09-11 07:54:48 -0400 (Tue, 11 Sep 2007)
New Revision: 3550
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/ve/init.html
Log:
http://jira.jboss.org/jira/browse/JBIDE-746 SWT.Browser has been decorated in XulRunnerBrowser instead of implementation of Browser on XulRunner by ourself
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2007-09-11 10:49:55 UTC (rev 3549)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2007-09-11 11:54:48 UTC (rev 3550)
@@ -228,7 +228,7 @@
templateManager.addTemplateListener(this);
- xulRunnerEditor = (XulRunnerEditor) visualEditor.getControl();
+ xulRunnerEditor = visualEditor.getXulRunnerEditor();
// TODO Sergey Vasilyev figure out with nsIPressShell
// presShell = browser.getPresShell();
visualSelectionController = new VpeSelectionController(xulRunnerEditor.getSelection());
@@ -878,7 +878,7 @@
//adding calls of core event handlers, for example 'CTR+H' or 'CTRL+M' event handler dialog
Event keyboardEvent = new Event ();
//widget where event occur
- keyboardEvent.widget = xulRunnerEditor;
+ keyboardEvent.widget = xulRunnerEditor.getBrowser();
keyboardEvent.stateMask = (keyEvent.getAltKey() ? SWT.ALT : 0) | (keyEvent.getCtrlKey() ? SWT.CTRL : 0) | (keyEvent.getShiftKey() ? SWT.SHIFT : 0) | (keyEvent.getMetaKey() ? SWT.MOD1 : 0);
keyboardEvent.x=0;
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java 2007-09-11 10:49:55 UTC (rev 3549)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java 2007-09-11 11:54:48 UTC (rev 3550)
@@ -86,7 +86,7 @@
public VpePreviewDomBuilder(VpeDomMapping domMapping, INodeAdapter sorceAdapter, VpeTemplateManager templateManager, MozillaEditor visualEditor, VpePageContext pageContext) {
super(domMapping, sorceAdapter, templateManager, visualEditor, pageContext);
this.visualEditor = visualEditor;
- browser = (XulRunnerEditor)visualEditor.getControl();
+ browser = visualEditor.getXulRunnerEditor();
this.visualDocument = visualEditor.getDomDocument();
this.visualContentArea = visualEditor.getContentArea();
this.pageContext = pageContext;
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2007-09-11 10:49:55 UTC (rev 3549)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2007-09-11 11:54:48 UTC (rev 3550)
@@ -143,7 +143,7 @@
public VpeVisualDomBuilder(VpeDomMapping domMapping, INodeAdapter sorceAdapter, VpeTemplateManager templateManager, MozillaEditor visualEditor, VpePageContext pageContext) {
super(domMapping, sorceAdapter, templateManager);
this.visualEditor = visualEditor;
- xulRunnerEditor = (XulRunnerEditor)visualEditor.getControl();
+ xulRunnerEditor = visualEditor.getXulRunnerEditor();
this.visualDocument = visualEditor.getDomDocument();
this.visualContentArea = visualEditor.getContentArea();
// TODO Max Areshkau figure out
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2007-09-11 10:49:55 UTC (rev 3549)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2007-09-11 11:54:48 UTC (rev 3550)
@@ -304,7 +304,7 @@
// removeClipboardDragDropHooks();
if (xulRunnerEditor != null) {
- xulRunnerEditor.dispose();
+ xulRunnerEditor.getBrowser().dispose();
xulRunnerEditor = null;
}
@@ -342,11 +342,11 @@
}
public Menu getMenu() {
- return xulRunnerEditor.getMenu();
+ return xulRunnerEditor.getBrowser().getMenu();
}
public Control getControl() {
- return xulRunnerEditor;
+ return xulRunnerEditor.getBrowser();
}
// TODO Max Areshkau add DnD support
@@ -563,5 +563,12 @@
hookList.removeClipboardDragDropHooks(baseEventListener);
}
}
+
+ /**
+ * @return the xulRunnerEditor
+ */
+ public XulRunnerEditor getXulRunnerEditor() {
+ return xulRunnerEditor;
+ }
}
\ No newline at end of file
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/ve/init.html
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/ve/init.html 2007-09-11 10:49:55 UTC (rev 3549)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/ve/init.html 2007-09-11 11:54:48 UTC (rev 3550)
@@ -62,36 +62,7 @@
</style>
</head>
-<script language="JavaScript">
-<!--
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
- var prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefService).getBranch(null);
- if(!prefs.getBoolPref('accessibility.browsewithcaret'))
- prefs.setBoolPref('accessibility.browsewithcaret', true);
-
- if(prefs.getBoolPref('browser.cache.enable'))
- prefs.setBoolPref('browser.cache.enable', false);
-
- if(prefs.getBoolPref('browser.cache.disk.enable'))
- prefs.setBoolPref('browser.cache.disk.enable', false);
-
- prefs.setIntPref('browser.cache.disk.capacity', 0);
-
- if(prefs.getBoolPref('browser.cache.memory.enable'))
- prefs.setBoolPref('browser.cache.memory.enable', false);
-
- // -1 = determine dynamically, 0 = none, n = memory capacity in kilobytes
- prefs.setIntPref('browser.cache.memory.capacity', 0);
-
- // 0 = once-per-session, 1 = each-time, 2 = never, 3 = when-appropriate/automatically
- prefs.setIntPref('browser.cache.check_doc_frequency', 2);
-
- if(prefs.getBoolPref('network.http.use-cache'))
- prefs.setBoolPref('network.http.use-cache', false);
-//-->
-</script>
-
<body id="__content__area__"></body>
</html>
16 years, 9 months
JBoss Tools SVN: r3549 - branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates.
by jbosstools-commits＠lists.jboss.org
Author: ezheleznyakov
Date: 2007-09-11 06:49:55 -0400 (Tue, 11 Sep 2007)
New Revision: 3549
Modified:
branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-847
Create < rich:changeExpandListener >, < rich:nodeSelectListener > templates
Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml
===================================================================
--- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2007-09-11 10:02:42 UTC (rev 3548)
+++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2007-09-11 10:49:55 UTC (rev 3549)
@@ -573,15 +573,25 @@
<vpe:tag name="rich:insert" case-sensetive="yes">
<vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesInsertTemplate">
- <vpe:resize>
- <vpe:width width-attr="style.width" />
- <vpe:height height-attr="style.height" />
- </vpe:resize>
<vpe:dnd>
<vpe:drag start-enable="yes" />
<vpe:drop container="yes"/>
</vpe:dnd>
</vpe:template>
</vpe:tag>
+
+ <vpe:tag name="rich:changeExpandListener" case-sensitive="yes">
+ <vpe:template children="no" modify="yes">
+ <span style="display:none">
+ </span>
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="rich:nodeSelectListener" case-sensitive="yes">
+ <vpe:template children="no" modify="yes">
+ <span style="display:none">
+ </span>
+ </vpe:template>
+ </vpe:tag>
</vpe:templates>
\ No newline at end of file
16 years, 9 months
JBoss Tools SVN: r3548 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-09-11 06:02:42 -0400 (Tue, 11 Sep 2007)
New Revision: 3548
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
Log:
fix build problems
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-09-11 05:42:31 UTC (rev 3547)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-09-11 10:02:42 UTC (rev 3548)
@@ -12,7 +12,6 @@
import java.io.File;
import java.io.IOException;
-import java.util.Iterator;
import org.apache.tools.ant.types.FilterSet;
import org.apache.tools.ant.types.FilterSetCollection;
@@ -42,8 +41,8 @@
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
-import org.jboss.ide.eclipse.as.core.server.stripped.DeployableServerBehavior;
-import org.jboss.ide.eclipse.as.core.singledeployable.SingleDeployableFactory;
+import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
+import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -111,6 +110,19 @@
.include("stringtemplate.*\\.jar")
.include("testng-.*\\.jar");
+ public static AntCopyUtils.FileSet JBOSS_TEST_LIB_FILESET = new AntCopyUtils.FileSet()
+ .include("testng-.*-jdk15\\.jar")
+ .include("myfaces-api-.*\\.jar")
+ .include("myfaces-impl-.*\\.jar")
+ .include("servlet-api\\.jar")
+ .include("hibernate-all\\.jar")
+ .include("jboss-ejb3-all\\.jar")
+ .include("thirdparty-all\\.jar")
+ .include("el-api\\.jar")
+ .include("el-ri\\.jar")
+ .exclude(".*/CVS")
+ .exclude(".*/\\.svn");
+
public static AntCopyUtils.FileSet JBOSS_WAR_LIB_FILESET_EAR_CONFIG = new AntCopyUtils.FileSet()
.include("ajax4jsf.*\\.jar")
.include("commons-beanutils.*\\.jar")
@@ -500,6 +512,7 @@
return Status.OK_STATUS;
}
};
+ create.setUser(true);
create.setRule(ResourcesPlugin.getWorkspace().getRoot());
create.schedule();
}
@@ -513,4 +526,55 @@
public static boolean isWarConfiguration(IDataModel model) {
return "war".equals(model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS));
}
+
+ public class CreateTestProject extends Job {
+
+ IDataModel model = null;
+ IProject seamWebProject = null;
+ SeamRuntime seamRuntime = null;
+
+ /**
+ * @param name
+ */
+ public CreateTestProject(IDataModel model, IProject seamWebProject, SeamRuntime seamRuntime) {
+ super("Create Test project");
+ this.model = model;
+ this.seamWebProject = seamWebProject;
+ this.seamRuntime = seamRuntime;
+ }
+
+ /**
+ * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+ */
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ String projectName = model.getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME).toString();
+ IProject test = WtpUtils.createEclipseProject(projectName+"-test", monitor);
+ File testProjectDir = seamWebProject.getLocation().toFile();
+ File testLibDir = new File(testProjectDir,"lib");
+ File embededEjbDir = new File(testProjectDir,"embedded-ejb");
+ FilterSet filterSet = new FilterSet();
+ filterSet.addFilter("projectName", projectName);
+ filterSet.addFilter("runtimeName", WtpUtils.getServerRuntimeName(seamWebProject));
+ File testTemplateDir = null;
+ try {
+ testTemplateDir = new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(),"test");
+ } catch (IOException e) {
+ SeamCorePlugin.getPluginLog().logError(e);
+ return new Status(IStatus.ERROR,SeamCorePlugin.PLUGIN_ID,e.getMessage()+"");
+ }
+ AntCopyUtils.FileSet excludeCvsSvn = new AntCopyUtils.FileSet(CVS_SVN).dir(testTemplateDir);
+
+ AntCopyUtils.copyFilesAndFolders(
+ testTemplateDir,
+ testProjectDir,
+ new AntCopyUtils.FileSetFileFilter(excludeCvsSvn),
+ new FilterSetCollection(filterSet), true);
+
+ AntCopyUtils.FileSet includeLibs = new AntCopyUtils.FileSet(CVS_SVN).dir(testTemplateDir);
+
+ return Status.OK_STATUS;
+ }
+
+ }
}
16 years, 9 months