JBoss Tools SVN: r28593 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test: src/org/jboss/tools/ws/ui/bot/test and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2011-01-25 08:18:53 -0500 (Tue, 25 Jan 2011)
New Revision: 28593
Added:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/WSAllBotTests.launch
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java
Log:
update tests to 3.2cr1
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/WSAllBotTests.launch
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/WSAllBotTests.launch (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/WSAllBotTests.launch 2011-01-25 13:18:53 UTC (rev 28593)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":1"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.ws.ui.bot.test.WSAllBotTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.ws.ui.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms256m -Xmx512m -Dswtbot.test.properties.file=${env_var:HOME}/swtbot.properties -Dusage_reporting_enabled=false"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2011-01-25 13:13:26 UTC (rev 28592)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2011-01-25 13:18:53 UTC (rev 28593)
@@ -18,6 +18,24 @@
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
+/**
+ * System properties:
+ * -Dswtbot.test.properties.file=$PATH
+ * -Dusage_reporting_enabled=$BOOLEAN
+ *
+ * Format of swtbot.properties file:
+ * SERVER=EAP|JBOSS_AS,<server version>,<jre version to run with>|default,<server home>
+ *
+ * Sample swtbot.properties file:
+ *
+ * SERVER=JBOSS_AS,6.0,default,/home/lukas/latest/jboss-6.0.0.Final
+ * JAVA=1.6,/space/java/sdk/jdk1.6.0_22
+ *
+ *
+ * Suite duration: aprox. 13min
+ *
+ * @author Lukas Jungmann
+ */
@SuiteClasses({
SampleWSTest.class,
BottomUpWSTest.class,
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-01-25 13:13:26 UTC (rev 28592)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-01-25 13:18:53 UTC (rev 28593)
@@ -98,7 +98,7 @@
private void createDD(String project) {
SWTBotTree tree = projectExplorer.tree();
SWTBotTreeItem ti = tree.expandNode(project);
- bot.sleep(500);
+ bot.sleep(1500);
ti = ti.getNode("Deployment Descriptor: " + project);
new TreeItemAction(ti, "Generate Deployment Descriptor Stub").run();
util.waitForNonIgnoredJobs();
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java 2011-01-25 13:13:26 UTC (rev 28592)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java 2011-01-25 13:18:53 UTC (rev 28593)
@@ -204,7 +204,7 @@
}
private SWTBotEditor createClass(String pkg, String cName) {
- new NewFileWizardAction().run().selectTemplate("Class").next();
+ new NewFileWizardAction().run().selectTemplate("Java", "Class").next();
Wizard w = new Wizard();
w.bot().textWithLabel("Package:").setText(pkg);
w.bot().textWithLabel("Name:").setText(cName);
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28592 - in trunk/struts/tests/org.jboss.tools.struts.ui.bot.test: src/org/jboss/tools/struts/ui/bot/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2011-01-25 08:13:26 -0500 (Tue, 25 Jan 2011)
New Revision: 28592
Modified:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname.jsp.gf
Log:
update tests to 3.2cr1
Property changes on: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test
___________________________________________________________________
Name: svn:ignore
- bin
target
build
d
screenshots
+ bin
target
build
d
screenshots
.settings
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java 2011-01-25 08:42:36 UTC (rev 28591)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java 2011-01-25 13:13:26 UTC (rev 28592)
@@ -29,6 +29,15 @@
* -Dswtbot.test.properties.file=$PATH
* -Dusage_reporting_enabled=$BOOLEAN
*
+ * Format of swtbot.properties file:
+ * SERVER=EAP|JBOSS_AS,<server version>,<jre version to run with>|default,<server home>
+ *
+ * Sample swtbot.properties file:
+ *
+ * SERVER=JBOSS_AS,6.0,default,/home/lukas/latest/jboss-6.0.0.Final
+ * JAVA=1.6,/space/java/sdk/jdk1.6.0_22
+ *
+ *
* Suite duration: aprox. 10min
*
* @author Vladimir Pakan
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname.jsp.gf
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname.jsp.gf 2011-01-25 08:42:36 UTC (rev 28591)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname.jsp.gf 2011-01-25 13:13:26 UTC (rev 28592)
@@ -18,8 +18,7 @@
<body>
<html:form action="/greeting.do">Input name:
<html:text property="name" />
- <html:submit value="Say Hello!">
- </html:submit>
+ <html:submit value="Say Hello!" />
</html:form>
</body>
</html:html>
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28591 - trunk/jst/plugins/org.jboss.tools.jst.jsp.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-01-25 03:42:36 -0500 (Tue, 25 Jan 2011)
New Revision: 28591
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-7077 , docbook content type was added.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2011-01-24 23:16:23 UTC (rev 28590)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2011-01-25 08:42:36 UTC (rev 28591)
@@ -209,14 +209,14 @@
<contentTypeBinding contentTypeId="org.eclipse.wst.html.core.htmlsource"/>
<contentTypeBinding contentTypeId="jsf.facelet"/>
</editor>
- <!--editor
+ <editor
class="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor"
contributorClass="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageContributor"
- extensions="xml"
icon="$nl$/images/xstudio/editors/xmldoc.gif"
id="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"
name="%editors.docbook.name">
- </editor -->
+ <contentTypeBinding contentTypeId="org.jboss.tools.jst.jsp.editor.docbookFile"/>
+ </editor>
</extension>
<extension point="org.eclipse.ui.editorActions">
@@ -536,14 +536,440 @@
editorId="org.jboss.tools.jst.jsp"
name="%defaultOccurrenceStructureProviderName" />
</extension>
- <extension
- point="org.eclipse.core.runtime.contentTypes">
+
+ <extension point="org.eclipse.core.runtime.contentTypes">
<file-association
content-type="org.eclipse.jst.jsp.core.jspsource"
file-extensions="inc"/>
<file-association
content-type="org.eclipse.wst.html.core.htmlsource"
file-extensions="jsf"/>
+ <content-type id="org.jboss.tools.jst.jsp.editor.docbookFile"
+ base-type="org.eclipse.core.runtime.xml"
+ file-extensions="dbk, xml"
+ priority="normal"
+ name="Docbook File">
+ <describer class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber2">
+ <parameter name="element" value="abbrev"/>
+ <parameter name="element" value="abstract"/>
+ <parameter name="element" value="accel"/>
+ <parameter name="element" value="ackno"/>
+ <parameter name="element" value="acronym"/>
+ <parameter name="element" value="action"/>
+ <parameter name="element" value="address"/>
+ <parameter name="element" value="affiliation"/>
+ <parameter name="element" value="alt"/>
+ <parameter name="element" value="anchor"/>
+ <parameter name="element" value="answer"/>
+ <parameter name="element" value="appendix"/>
+ <parameter name="element" value="appendixinfo"/>
+ <parameter name="element" value="application"/>
+ <parameter name="element" value="area"/>
+ <parameter name="element" value="areaset"/>
+ <parameter name="element" value="areaspec"/>
+ <parameter name="element" value="arg"/>
+ <parameter name="element" value="article"/>
+ <parameter name="element" value="articleinfo"/>
+ <parameter name="element" value="artpagenums"/>
+ <parameter name="element" value="attribution"/>
+ <parameter name="element" value="audiodata"/>
+ <parameter name="element" value="audioobject"/>
+ <parameter name="element" value="author"/>
+ <parameter name="element" value="authorblurb"/>
+ <parameter name="element" value="authorgroup"/>
+ <parameter name="element" value="authorinitials"/>
+ <parameter name="element" value="beginpage"/>
+ <parameter name="element" value="bibliocoverage"/>
+ <parameter name="element" value="bibliodiv"/>
+ <parameter name="element" value="biblioentry"/>
+ <parameter name="element" value="bibliography"/>
+ <parameter name="element" value="bibliographyinfo"/>
+ <parameter name="element" value="biblioid"/>
+ <parameter name="element" value="bibliolist"/>
+ <parameter name="element" value="bibliomisc"/>
+ <parameter name="element" value="bibliomixed"/>
+ <parameter name="element" value="bibliomset"/>
+ <parameter name="element" value="biblioref"/>
+ <parameter name="element" value="bibliorelation"/>
+ <parameter name="element" value="biblioset"/>
+ <parameter name="element" value="bibliosource"/>
+ <parameter name="element" value="blockinfo"/>
+ <parameter name="element" value="blockquote"/>
+ <parameter name="element" value="book"/>
+ <parameter name="element" value="bookinfo"/>
+ <parameter name="element" value="bridgehead"/>
+ <parameter name="element" value="callout"/>
+ <parameter name="element" value="calloutlist"/>
+ <parameter name="element" value="caption"/>
+ <parameter name="element" value="caution"/>
+ <parameter name="element" value="chapter"/>
+ <parameter name="element" value="chapterinfo"/>
+ <parameter name="element" value="citation"/>
+ <parameter name="element" value="citebiblioid"/>
+ <parameter name="element" value="citerefentry"/>
+ <parameter name="element" value="citetitle"/>
+ <parameter name="element" value="city"/>
+ <parameter name="element" value="classname"/>
+ <parameter name="element" value="classsynopsis"/>
+ <parameter name="element" value="classsynopsisinfo"/>
+ <parameter name="element" value="cmdsynopsis"/>
+ <parameter name="element" value="co"/>
+ <parameter name="element" value="code"/>
+ <parameter name="element" value="col"/>
+ <parameter name="element" value="colgroup"/>
+ <parameter name="element" value="collab"/>
+ <parameter name="element" value="collabname"/>
+ <parameter name="element" value="colophon"/>
+ <parameter name="element" value="colspec"/>
+ <parameter name="element" value="command"/>
+ <parameter name="element" value="computeroutput"/>
+ <parameter name="element" value="confdates"/>
+ <parameter name="element" value="confgroup"/>
+ <parameter name="element" value="confnum"/>
+ <parameter name="element" value="confsponsor"/>
+ <parameter name="element" value="conftitle"/>
+ <parameter name="element" value="constant"/>
+ <parameter name="element" value="constraint"/>
+ <parameter name="element" value="constraintdef"/>
+ <parameter name="element" value="constructorsynopsis"/>
+ <parameter name="element" value="contractnum"/>
+ <parameter name="element" value="contractsponsor"/>
+ <parameter name="element" value="contrib"/>
+ <parameter name="element" value="copyright"/>
+ <parameter name="element" value="coref"/>
+ <parameter name="element" value="corpauthor"/>
+ <parameter name="element" value="corpcredit"/>
+ <parameter name="element" value="corpname"/>
+ <parameter name="element" value="country"/>
+ <parameter name="element" value="database"/>
+ <parameter name="element" value="date"/>
+ <parameter name="element" value="dedication"/>
+ <parameter name="element" value="destructorsynopsis"/>
+ <parameter name="element" value="edition"/>
+ <parameter name="element" value="editor"/>
+ <parameter name="element" value="email"/>
+ <parameter name="element" value="emphasis"/>
+ <parameter name="element" value="entry"/>
+ <parameter name="element" value="entrytbl"/>
+ <parameter name="element" value="envar"/>
+ <parameter name="element" value="epigraph"/>
+ <parameter name="element" value="equation"/>
+ <parameter name="element" value="errorcode"/>
+ <parameter name="element" value="errorname"/>
+ <parameter name="element" value="errortext"/>
+ <parameter name="element" value="errortype"/>
+ <parameter name="element" value="example"/>
+ <parameter name="element" value="exceptionname"/>
+ <parameter name="element" value="fax"/>
+ <parameter name="element" value="fieldsynopsis"/>
+ <parameter name="element" value="figure"/>
+ <parameter name="element" value="filename"/>
+ <parameter name="element" value="firstname"/>
+ <parameter name="element" value="firstterm"/>
+ <parameter name="element" value="footnote"/>
+ <parameter name="element" value="footnoteref"/>
+ <parameter name="element" value="foreignphrase"/>
+ <parameter name="element" value="formalpara"/>
+ <parameter name="element" value="funcdef"/>
+ <parameter name="element" value="funcparams"/>
+ <parameter name="element" value="funcprototype"/>
+ <parameter name="element" value="funcsynopsis"/>
+ <parameter name="element" value="funcsynopsisinfo"/>
+ <parameter name="element" value="function"/>
+ <parameter name="element" value="glossary"/>
+ <parameter name="element" value="glossaryinfo"/>
+ <parameter name="element" value="glossdef"/>
+ <parameter name="element" value="glossdiv"/>
+ <parameter name="element" value="glossentry"/>
+ <parameter name="element" value="glosslist"/>
+ <parameter name="element" value="glosssee"/>
+ <parameter name="element" value="glossseealso"/>
+ <parameter name="element" value="glossterm"/>
+ <parameter name="element" value="graphic"/>
+ <parameter name="element" value="graphicco"/>
+ <parameter name="element" value="group"/>
+ <parameter name="element" value="guibutton"/>
+ <parameter name="element" value="guiicon"/>
+ <parameter name="element" value="guilabel"/>
+ <parameter name="element" value="guimenu"/>
+ <parameter name="element" value="guimenuitem"/>
+ <parameter name="element" value="guisubmenu"/>
+ <parameter name="element" value="hardware"/>
+ <parameter name="element" value="highlights"/>
+ <parameter name="element" value="holder"/>
+ <parameter name="element" value="honorific"/>
+ <parameter name="element" value="html:form"/>
+ <parameter name="element" value="imagedata"/>
+ <parameter name="element" value="imageobject"/>
+ <parameter name="element" value="imageobjectco"/>
+ <parameter name="element" value="important"/>
+ <parameter name="element" value="index"/>
+ <parameter name="element" value="indexdiv"/>
+ <parameter name="element" value="indexentry"/>
+ <parameter name="element" value="indexinfo"/>
+ <parameter name="element" value="indexterm"/>
+ <parameter name="element" value="informalequation"/>
+ <parameter name="element" value="informalexample"/>
+ <parameter name="element" value="informalfigure"/>
+ <parameter name="element" value="informaltable"/>
+ <parameter name="element" value="initializer"/>
+ <parameter name="element" value="inlineequation"/>
+ <parameter name="element" value="inlinegraphic"/>
+ <parameter name="element" value="inlinemediaobject"/>
+ <parameter name="element" value="interface"/>
+ <parameter name="element" value="interfacename"/>
+ <parameter name="element" value="invpartnumber"/>
+ <parameter name="element" value="isbn"/>
+ <parameter name="element" value="issn"/>
+ <parameter name="element" value="issuenum"/>
+ <parameter name="element" value="itemizedlist"/>
+ <parameter name="element" value="itermset"/>
+ <parameter name="element" value="jobtitle"/>
+ <parameter name="element" value="keycap"/>
+ <parameter name="element" value="keycode"/>
+ <parameter name="element" value="keycombo"/>
+ <parameter name="element" value="keysym"/>
+ <parameter name="element" value="keyword"/>
+ <parameter name="element" value="keywordset"/>
+ <parameter name="element" value="label"/>
+ <parameter name="element" value="legalnotice"/>
+ <parameter name="element" value="lhs"/>
+ <parameter name="element" value="lineage"/>
+ <parameter name="element" value="lineannotation"/>
+ <parameter name="element" value="link"/>
+ <parameter name="element" value="listitem"/>
+ <parameter name="element" value="literal"/>
+ <parameter name="element" value="literallayout"/>
+ <parameter name="element" value="lot"/>
+ <parameter name="element" value="lotentry"/>
+ <parameter name="element" value="manvolnum"/>
+ <parameter name="element" value="markup"/>
+ <parameter name="element" value="mathphrase"/>
+ <parameter name="element" value="medialabel"/>
+ <parameter name="element" value="mediaobject"/>
+ <parameter name="element" value="mediaobjectco"/>
+ <parameter name="element" value="member"/>
+ <parameter name="element" value="menuchoice"/>
+ <parameter name="element" value="methodname"/>
+ <parameter name="element" value="methodparam"/>
+ <parameter name="element" value="methodsynopsis"/>
+ <parameter name="element" value="mml:math"/>
+ <parameter name="element" value="modespec"/>
+ <parameter name="element" value="modifier"/>
+ <parameter name="element" value="mousebutton"/>
+ <parameter name="element" value="msg"/>
+ <parameter name="element" value="msgaud"/>
+ <parameter name="element" value="msgentry"/>
+ <parameter name="element" value="msgexplan"/>
+ <parameter name="element" value="msginfo"/>
+ <parameter name="element" value="msglevel"/>
+ <parameter name="element" value="msgmain"/>
+ <parameter name="element" value="msgorig"/>
+ <parameter name="element" value="msgrel"/>
+ <parameter name="element" value="msgset"/>
+ <parameter name="element" value="msgsub"/>
+ <parameter name="element" value="msgtext"/>
+ <parameter name="element" value="nonterminal"/>
+ <parameter name="element" value="note"/>
+ <parameter name="element" value="objectinfo"/>
+ <parameter name="element" value="olink"/>
+ <parameter name="element" value="ooclass"/>
+ <parameter name="element" value="ooexception"/>
+ <parameter name="element" value="oointerface"/>
+ <parameter name="element" value="option"/>
+ <parameter name="element" value="optional"/>
+ <parameter name="element" value="orderedlist"/>
+ <parameter name="element" value="orgdiv"/>
+ <parameter name="element" value="orgname"/>
+ <parameter name="element" value="otheraddr"/>
+ <parameter name="element" value="othercredit"/>
+ <parameter name="element" value="othername"/>
+ <parameter name="element" value="package"/>
+ <parameter name="element" value="pagenums"/>
+ <parameter name="element" value="para"/>
+ <parameter name="element" value="paramdef"/>
+ <parameter name="element" value="parameter"/>
+ <parameter name="element" value="part"/>
+ <parameter name="element" value="partinfo"/>
+ <parameter name="element" value="partintro"/>
+ <parameter name="element" value="personblurb"/>
+ <parameter name="element" value="personname"/>
+ <parameter name="element" value="phone"/>
+ <parameter name="element" value="phrase"/>
+ <parameter name="element" value="pob"/>
+ <parameter name="element" value="postcode"/>
+ <parameter name="element" value="preface"/>
+ <parameter name="element" value="prefaceinfo"/>
+ <parameter name="element" value="primary"/>
+ <parameter name="element" value="primaryie"/>
+ <parameter name="element" value="printhistory"/>
+ <parameter name="element" value="procedure"/>
+ <parameter name="element" value="production"/>
+ <parameter name="element" value="productionrecap"/>
+ <parameter name="element" value="productionset"/>
+ <parameter name="element" value="productname"/>
+ <parameter name="element" value="productnumber"/>
+ <parameter name="element" value="programlisting"/>
+ <parameter name="element" value="programlistingco"/>
+ <parameter name="element" value="prompt"/>
+ <parameter name="element" value="property"/>
+ <parameter name="element" value="pubdate"/>
+ <parameter name="element" value="publisher"/>
+ <parameter name="element" value="publishername"/>
+ <parameter name="element" value="pubsnumber"/>
+ <parameter name="element" value="qandadiv"/>
+ <parameter name="element" value="qandaentry"/>
+ <parameter name="element" value="qandaset"/>
+ <parameter name="element" value="question"/>
+ <parameter name="element" value="quote"/>
+ <parameter name="element" value="refclass"/>
+ <parameter name="element" value="refdescriptor"/>
+ <parameter name="element" value="refentry"/>
+ <parameter name="element" value="refentryinfo"/>
+ <parameter name="element" value="refentrytitle"/>
+ <parameter name="element" value="reference"/>
+ <parameter name="element" value="referenceinfo"/>
+ <parameter name="element" value="refmeta"/>
+ <parameter name="element" value="refmiscinfo"/>
+ <parameter name="element" value="refname"/>
+ <parameter name="element" value="refnamediv"/>
+ <parameter name="element" value="refpurpose"/>
+ <parameter name="element" value="refsect1"/>
+ <parameter name="element" value="refsect1info"/>
+ <parameter name="element" value="refsect2"/>
+ <parameter name="element" value="refsect2info"/>
+ <parameter name="element" value="refsect3"/>
+ <parameter name="element" value="refsect3info"/>
+ <parameter name="element" value="refsection"/>
+ <parameter name="element" value="refsectioninfo"/>
+ <parameter name="element" value="refsynopsisdiv"/>
+ <parameter name="element" value="refsynopsisdivinfo"/>
+ <parameter name="element" value="releaseinfo"/>
+ <parameter name="element" value="remark"/>
+ <parameter name="element" value="replaceable"/>
+ <parameter name="element" value="returnvalue"/>
+ <parameter name="element" value="revdescription"/>
+ <parameter name="element" value="revhistory"/>
+ <parameter name="element" value="revision"/>
+ <parameter name="element" value="revnumber"/>
+ <parameter name="element" value="revremark"/>
+ <parameter name="element" value="rhs"/>
+ <parameter name="element" value="row"/>
+ <parameter name="element" value="sbr"/>
+ <parameter name="element" value="screen"/>
+ <parameter name="element" value="screenco"/>
+ <parameter name="element" value="screeninfo"/>
+ <parameter name="element" value="screenshot"/>
+ <parameter name="element" value="secondary"/>
+ <parameter name="element" value="secondaryie"/>
+ <parameter name="element" value="sect1"/>
+ <parameter name="element" value="sect1info"/>
+ <parameter name="element" value="sect2"/>
+ <parameter name="element" value="sect2info"/>
+ <parameter name="element" value="sect3"/>
+ <parameter name="element" value="sect3info"/>
+ <parameter name="element" value="sect4"/>
+ <parameter name="element" value="sect4info"/>
+ <parameter name="element" value="sect5"/>
+ <parameter name="element" value="sect5info"/>
+ <parameter name="element" value="section"/>
+ <parameter name="element" value="sectioninfo"/>
+ <parameter name="element" value="see"/>
+ <parameter name="element" value="seealso"/>
+ <parameter name="element" value="seealsoie"/>
+ <parameter name="element" value="seeie"/>
+ <parameter name="element" value="seg"/>
+ <parameter name="element" value="seglistitem"/>
+ <parameter name="element" value="segmentedlist"/>
+ <parameter name="element" value="segtitle"/>
+ <parameter name="element" value="seriesvolnums"/>
+ <parameter name="element" value="set"/>
+ <parameter name="element" value="setindex"/>
+ <parameter name="element" value="setindexinfo"/>
+ <parameter name="element" value="setinfo"/>
+ <parameter name="element" value="sgmltag"/>
+ <parameter name="element" value="shortaffil"/>
+ <parameter name="element" value="shortcut"/>
+ <parameter name="element" value="sidebar"/>
+ <parameter name="element" value="sidebarinfo"/>
+ <parameter name="element" value="simpara"/>
+ <parameter name="element" value="simplelist"/>
+ <parameter name="element" value="simplemsgentry"/>
+ <parameter name="element" value="simplesect"/>
+ <parameter name="element" value="spanspec"/>
+ <parameter name="element" value="state"/>
+ <parameter name="element" value="step"/>
+ <parameter name="element" value="stepalternatives"/>
+ <parameter name="element" value="street"/>
+ <parameter name="element" value="structfield"/>
+ <parameter name="element" value="structname"/>
+ <parameter name="element" value="subject"/>
+ <parameter name="element" value="subjectset"/>
+ <parameter name="element" value="subjectterm"/>
+ <parameter name="element" value="subscript"/>
+ <parameter name="element" value="substeps"/>
+ <parameter name="element" value="subtitle"/>
+ <parameter name="element" value="superscript"/>
+ <parameter name="element" value="surname"/>
+ <parameter name="element" value="svg:svg"/>
+ <parameter name="element" value="symbol"/>
+ <parameter name="element" value="synopfragment"/>
+ <parameter name="element" value="synopfragmentref"/>
+ <parameter name="element" value="synopsis"/>
+ <parameter name="element" value="systemitem"/>
+ <parameter name="element" value="table"/>
+ <parameter name="element" value="task"/>
+ <parameter name="element" value="taskprerequisites"/>
+ <parameter name="element" value="taskrelated"/>
+ <parameter name="element" value="tasksummary"/>
+ <parameter name="element" value="tbody"/>
+ <parameter name="element" value="td"/>
+ <parameter name="element" value="term"/>
+ <parameter name="element" value="termdef"/>
+ <parameter name="element" value="tertiary"/>
+ <parameter name="element" value="tertiaryie"/>
+ <parameter name="element" value="textdata"/>
+ <parameter name="element" value="textobject"/>
+ <parameter name="element" value="tfoot"/>
+ <parameter name="element" value="tgroup"/>
+ <parameter name="element" value="th"/>
+ <parameter name="element" value="thead"/>
+ <parameter name="element" value="tip"/>
+ <parameter name="element" value="title"/>
+ <parameter name="element" value="titleabbrev"/>
+ <parameter name="element" value="toc"/>
+ <parameter name="element" value="tocback"/>
+ <parameter name="element" value="tocchap"/>
+ <parameter name="element" value="tocentry"/>
+ <parameter name="element" value="tocfront"/>
+ <parameter name="element" value="toclevel1"/>
+ <parameter name="element" value="toclevel2"/>
+ <parameter name="element" value="toclevel3"/>
+ <parameter name="element" value="toclevel4"/>
+ <parameter name="element" value="toclevel5"/>
+ <parameter name="element" value="tocpart"/>
+ <parameter name="element" value="token"/>
+ <parameter name="element" value="tr"/>
+ <parameter name="element" value="trademark"/>
+ <parameter name="element" value="type"/>
+ <parameter name="element" value="ulink"/>
+ <parameter name="element" value="uri"/>
+ <parameter name="element" value="userinput"/>
+ <parameter name="element" value="varargs"/>
+ <parameter name="element" value="variablelist"/>
+ <parameter name="element" value="varlistentry"/>
+ <parameter name="element" value="varname"/>
+ <parameter name="element" value="videodata"/>
+ <parameter name="element" value="videoobject"/>
+ <parameter name="element" value="void"/>
+ <parameter name="element" value="volumenum"/>
+ <parameter name="element" value="warning"/>
+ <parameter name="element" value="wordasword"/>
+ <parameter name="element" value="xref"/>
+ <parameter name="element" value="year"/>
+ </describer>
+ </content-type>
+
</extension>
<extension
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28590 - in trunk/documentation/whatsnew/as: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-01-24 18:16:23 -0500 (Mon, 24 Jan 2011)
New Revision: 28590
Added:
trunk/documentation/whatsnew/as/images/runtimeDetection.png
trunk/documentation/whatsnew/as/images/runtimeDetection1.png
Modified:
trunk/documentation/whatsnew/as/as-news-3.2.0.CR1.html
Log:
JBIDE-8164 CLONE - AS Component N&N
Modified: trunk/documentation/whatsnew/as/as-news-3.2.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/as/as-news-3.2.0.CR1.html 2011-01-24 23:15:06 UTC (rev 28589)
+++ trunk/documentation/whatsnew/as/as-news-3.2.0.CR1.html 2011-01-24 23:16:23 UTC (rev 28590)
@@ -93,6 +93,39 @@
<hr/>
</td>
</tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>JBoss Runtime detection</b></td>
+ <td valign="top" width="90%">
+ <p>
+ The JBoss Runtime Detection plugin simplifies creating Eclipse runtimes.
+ Currently the user can find JBoss AS, Seam, Drools and jBPM runtime. It is also possible to add other
+ runtime detectors using the org.jboss.tools.runtime.core.runtimeDetectors
+ extension point.
+ </p>
+ <p>The user can define runtime paths by selecting Window>Preferences>JBoss Tools>JBoss Tools Runtime Detection.
+ </p>
+ <p><img src="images/runtimeDetection.png"/></p>
+ <p>
+ The user can enable separate runtimes.
+ </br>
+ When starting JBoss Tools in a new workspace, runtime paths are scanned for enabled runtimes and can be created by the user.
+ Scanning can be done every time when starting Eclipse.
+ </p>
+ <p>It is performed using the Search button.</p>
+ <p><img src="images/runtimeDetection1.png"/></p>
+ <p>The user selects runtimes he wants to create and clicks the OK button to create them.</p>
+
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-7527">JBIDE-7527</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
</table>
Added: trunk/documentation/whatsnew/as/images/runtimeDetection.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/as/images/runtimeDetection.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/as/images/runtimeDetection1.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/as/images/runtimeDetection1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28589 - trunk/documentation/whatsnew/examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-01-24 18:15:06 -0500 (Mon, 24 Jan 2011)
New Revision: 28589
Added:
trunk/documentation/whatsnew/examples/examples-news-3.2.0.CR1.html
Log:
JBIDE-8211 Project Examples in N&N
Added: trunk/documentation/whatsnew/examples/examples-news-3.2.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/examples/examples-news-3.2.0.CR1.html (rev 0)
+++ trunk/documentation/whatsnew/examples/examples-news-3.2.0.CR1.html 2011-01-24 23:15:06 UTC (rev 28589)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>Examples 3.2.0.CR1 What's New</title>
+</head>
+<body>
+<h1>Examples 3.2.0.CR1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../hibernate/hibernate-news-3.4.0.CR1.html">Hibernate Tools ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Project Examples</h3>
+ <hr/>
+ </td>
+ </tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Maven Project Example</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>It is possible to create a Maven project example with no Eclipse metadata.</p>
+ <p>
+ The following is an example of the use of a pure Maven project example:
+<xmp>
+<project>
+ <category>Weld 1.0.1</category>
+ <name>weld-jsf-login</name>
+ <included-projects>
+ weld-examples-parent,weld-jsf-login
+ </included-projects>
+ <shortDescription>Weld JSF login example</shortDescription>
+ <description>
+ The example demonstrates user login/logout for an application that uses JSF.
+ It will create the weld-examples-parent and weld-jsf-login project in your workspace.
+ </description>
+ <size>17532</size>
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/weld-examples/...>
+ <importType>maven</importType>
+ <importTypeDescription>The project example requires the m2eclipse-core, m2eclipse-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
+</project>
+ </xmp>
+ </p>
+ <p><small>
+ For more details, see <a href="https://jira.jboss.org/jira/browse/JBIDE-6412">JBIDE-7944</a>
+ </small></p>
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28588 - trunk/documentation/whatsnew/maven.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-01-24 18:13:32 -0500 (Mon, 24 Jan 2011)
New Revision: 28588
Added:
trunk/documentation/whatsnew/maven/maven-news-3.2.0.CR1.html
Log:
JBIDE-8212 Maven Integration in N&N
Added: trunk/documentation/whatsnew/maven/maven-news-3.2.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/maven/maven-news-3.2.0.CR1.html (rev 0)
+++ trunk/documentation/whatsnew/maven/maven-news-3.2.0.CR1.html 2011-01-24 23:13:32 UTC (rev 28588)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css" />
+<title>What's New in Maven Tools</title>
+</head>
+<body>
+<h1>Maven Tools</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a
+ href="../drools/drools-news-5.1.0.Beta2.html">Drools Tools ></a></p>
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Maven Integration</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname1" id="itemname1"></a><b>JBoss CDI Maven Configurator</b></td>
+ <td valign="top">
+ <p>Now the CDI Maven configurator adds CDI support for non-wtp projects that have the "javax.enterprise:cdi-api" dependency.
+ <p><small>
+ See <a href="https://jira.jboss.org/jira/browse/JBIDE-6412">JBIDE-7944</a>
+ </small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+</table>
+
+</body>
+
+</html>
+
+
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28587 - in trunk/download.jboss.org/jbosstools/updates: requirements/helios_orbit and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-24 17:35:26 -0500 (Mon, 24 Jan 2011)
New Revision: 28587
Modified:
trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/requirements/helios_orbit/com...
trunk/download.jboss.org/jbosstools/updates/requirements/helios_orbit/com...
Log:
relabel sites and update timestamps
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-01-24 22:34:57 UTC (rev 28586)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-01-24 22:35:26 UTC (rev 28587)
@@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Staging Repository' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<repository name='JBoss Tools - Helios + Orbit Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
<!--
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1295563511000'/>
+<property name='p2.timestamp' value='1295908416000'/>
</properties>
<children size='2'>
<child location='http://download.jboss.org/jbosstools/updates/requirements/helios/20100623...'/>
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-01-24 22:34:57 UTC (rev 28586)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-01-24 22:35:26 UTC (rev 28587)
@@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Staging Repository' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<repository name='JBoss Tools - Helios + Orbit Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
<!--
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1295563511000'/>
+<property name='p2.timestamp' value='1295908416000'/>
</properties>
<children size='2'>
<child location='http://download.jboss.org/jbosstools/updates/requirements/helios/20100623...'/>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/helios_orbit/com...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/helios_orbit/com... 2011-01-24 22:34:57 UTC (rev 28586)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/helios_orbit/com... 2011-01-24 22:35:26 UTC (rev 28587)
@@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Staging Repository' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<repository name='JBoss Tools - Helios + Orbit Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
<!--
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1295563511000'/>
+<property name='p2.timestamp' value='1295908416000'/>
</properties>
<children size='2'>
<child location='http://download.jboss.org/jbosstools/updates/requirements/helios/20100623...'/>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/helios_orbit/com...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/helios_orbit/com... 2011-01-24 22:34:57 UTC (rev 28586)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/helios_orbit/com... 2011-01-24 22:35:26 UTC (rev 28587)
@@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Staging Repository' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<repository name='JBoss Tools - Helios + Orbit Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
<!--
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1295563511000'/>
+<property name='p2.timestamp' value='1295908416000'/>
</properties>
<children size='2'>
<child location='http://download.jboss.org/jbosstools/updates/requirements/helios/20100623...'/>
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28586 - in trunk/seam/plugins: org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-01-24 17:34:57 -0500 (Mon, 24 Jan 2011)
New Revision: 28586
Modified:
trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
Log:
https://issues.jboss.org/browse/JBIDE-8076 Fixed seam test project class path.
Modified: trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2011-01-24 22:28:56 UTC (rev 28585)
+++ trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2011-01-24 22:34:57 UTC (rev 28586)
@@ -26,6 +26,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
@@ -37,6 +38,7 @@
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
import org.jboss.tools.seam.core.project.facet.SeamVersion;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
+import org.jboss.tools.seam.internal.core.project.facet.SeamProjectCreator;
public class Seam2FacetInstallDelegateTest extends AbstractSeamFacetTest {
@@ -414,6 +416,27 @@
*/
}
+ /**
+ * See https://issues.jboss.org/browse/JBIDE-8076
+ *
+ * @throws CoreException
+ * @throws IOException
+ */
+ public void testTestProjectClassPath() throws CoreException, IOException {
+ SeamProjectsSet warPs = new SeamProjectsSet(warProject.getProject());
+
+ IProject testProject = warPs.getTestProject();
+ assertTrue(testProject.exists());
+
+ IClasspathEntry warCpe = SeamProjectCreator.getJreContainer(warProject.getProject());
+ assertNotNull(warCpe);
+
+ IClasspathEntry testCpe = SeamProjectCreator.getJreContainer(testProject);
+ assertNotNull(testCpe);
+
+ assertEquals(warCpe.getPath(), testCpe.getPath());
+ }
+
public void testSeamProperties() {
SeamProjectsSet warPs = new SeamProjectsSet(warProject.getProject());
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2011-01-24 22:28:56 UTC (rev 28585)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2011-01-24 22:34:57 UTC (rev 28586)
@@ -373,11 +373,15 @@
final IVMInstall vm = JavaRuntime.getDefaultVMInstall();
if (vm != null) {
- int jreIndex = getJreContainer(testProjectToBeImported);
- final IPath path = CPE_PREFIX_FOR_EXEC_ENV.append(getCorrespondingExecutionEnvironment(level));
- final IClasspathEntry cpe = JavaCore.newContainerEntry(path);
+ // See https://issues.jboss.org/browse/JBIDE-8076
+ IClasspathEntry cpe = getJreContainer(seamWebProject);
+ if (cpe == null) {
+ final IPath path = CPE_PREFIX_FOR_EXEC_ENV.append(getCorrespondingExecutionEnvironment(level));
+ cpe = JavaCore.newContainerEntry(path);
+ }
IJavaProject javaProject = JavaCore.create(testProjectToBeImported);
IClasspathEntry[] entries = javaProject.getRawClasspath();
+ int jreIndex = getJreContainerIndex(testProjectToBeImported);
if (jreIndex == -1) {
IClasspathEntry[] newEntries = new IClasspathEntry[entries.length+1];
System.arraycopy( entries, 0, newEntries, 1, entries.length );
@@ -413,7 +417,7 @@
return res;
}
- private static int getJreContainer(final IProject proj)
+ public static int getJreContainerIndex(final IProject proj)
throws CoreException {
final IJavaProject jproj = JavaCore.create(proj);
final IClasspathEntry[] cp = jproj.getRawClasspath();
@@ -425,7 +429,22 @@
}
return -1;
}
-
+
+ public static IClasspathEntry getJreContainer(final IProject proj)
+ throws CoreException {
+ final IJavaProject jproj = JavaCore.create(proj);
+ final IClasspathEntry[] cp = jproj.getRawClasspath();
+ for (int i = 0; i < cp.length; i++) {
+ final IClasspathEntry cpe = cp[i];
+ if (cpe.getEntryKind() == IClasspathEntry.CPE_CONTAINER
+ && cpe.getPath().segment(0)
+ .equals(JavaRuntime.JRE_CONTAINER)) {
+ return cpe;
+ }
+ }
+ return null;
+ }
+
/**
* Creates test project for given seam web project.
*/
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28585 - in trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui: util/composites and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-01-24 17:28:56 -0500 (Mon, 24 Jan 2011)
New Revision: 28585
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java
Log:
JBIDE-7788 - fileset wizard layout issues
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2011-01-24 21:43:26 UTC (rev 28584)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2011-01-24 22:28:56 UTC (rev 28585)
@@ -11,8 +11,8 @@
Workspace=Workspace...
Variables=Variables...
RelativeTo=Relative to
-Workspace2=workspace
-Filesystem2=file system
+Workspace2=workspace\nrelative
+Filesystem2=filesystem\nrelative
PathDoesNotExistInFilesystem={0} does not exist in the filesystem
ErrorConvertingPaths=Unable to convert workspace path into global path: {0}
ErrorStringSubstitution=Error during string substitution: {0}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2011-01-24 21:43:26 UTC (rev 28584)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2011-01-24 22:28:56 UTC (rev 28585)
@@ -19,7 +19,6 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.IStringVariable;
import org.eclipse.debug.ui.StringVariableSelectionDialog;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.window.Window;
@@ -29,8 +28,6 @@
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
@@ -103,14 +100,14 @@
variablesButton.setLayoutData(createFormData(text,5,null,0,null,0,workspaceButton,-5));
fsRadioButton.setLayoutData(createFormData(text,5,null,0,null,0,variablesButton,-5));
wsRadioButton.setLayoutData(createFormData(text,5,null,0,null,0,fsRadioButton,-5));
- relativeTo.setLayoutData(createFormData(text,8,null,0,null,0,wsRadioButton,-5));
+ relativeTo.setLayoutData(createFormData(text,8,null,0,0,5,0,5));
}
protected void setWidgetData() {
filesystemButton.setText(ArchivesUIMessages.Filesystem);
workspaceButton.setText(ArchivesUIMessages.Workspace);
variablesButton.setText(ArchivesUIMessages.Variables);
- wsRadioButton.setText(ArchivesUIMessages.Workspace2);
+ wsRadioButton.setText(ArchivesUIMessages.Workspace2 );
fsRadioButton.setText(ArchivesUIMessages.Filesystem2);
relativeTo.setText(ArchivesUIMessages.RelativeTo);
pathImage.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER));
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28584 - in trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge: action and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-01-24 16:43:26 -0500 (Mon, 24 Jan 2011)
New Revision: 28584
Added:
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ColorManager.java
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/InputReadJob.java
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/StreamListener.java
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsoleViewer.java
Removed:
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/action/ConsoleTerminateAction.java
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/Console.java
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsoleLineNotifier.java
Modified:
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/Activator.java
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/runtime/Manager.java
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsolePage.java
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsoleView.java
Log:
cleanup and refactorings
Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/Activator.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/Activator.java 2011-01-24 21:17:45 UTC (rev 28583)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/Activator.java 2011-01-24 21:43:26 UTC (rev 28584)
@@ -1,39 +1,22 @@
package org.jboss.tools.seam.forge;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.jboss.tools.seam.forge.runtime.Manager;
import org.osgi.framework.BundleContext;
-/**
- * The activator class controls the plug-in life cycle
- */
public class Activator extends AbstractUIPlugin {
- // The plug-in ID
public static final String PLUGIN_ID = "org.jboss.tools.seam.forge"; //$NON-NLS-1$
- // The shared instance
private static Activator plugin;
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
public void stop(BundleContext context) throws Exception {
if (Manager.INSTANCE.isForgeRunning()) {
Manager.INSTANCE.stopForge();
@@ -42,13 +25,16 @@
super.stop(context);
}
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
public static Activator getDefault() {
return plugin;
}
+ public static void log(Throwable t) {
+ getDefault().getLog().log(newErrorStatus("Error logged from Forge Plugin: ", t));
+ }
+
+ private static IStatus newErrorStatus(String message, Throwable exception) {
+ return new Status(IStatus.ERROR, PLUGIN_ID, IStatus.INFO, message, exception);
+ }
+
}
Deleted: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/action/ConsoleTerminateAction.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/action/ConsoleTerminateAction.java 2011-01-24 21:17:45 UTC (rev 28583)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/action/ConsoleTerminateAction.java 2011-01-24 21:43:26 UTC (rev 28584)
@@ -1,97 +0,0 @@
-package org.jboss.tools.seam.forge.action;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.commands.ITerminateHandler;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.internal.ui.DebugPluginImages;
-import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
-import org.eclipse.debug.internal.ui.commands.actions.DebugCommandService;
-import org.eclipse.debug.internal.ui.views.console.ConsoleMessages;
-import org.eclipse.jface.action.Action;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.IUpdate;
-import org.jboss.tools.seam.forge.view.Console;
-
-/**
- * ConsoleTerminateAction
- */
-public class ConsoleTerminateAction extends Action implements IUpdate {
-
- private Console fConsole;
- private IWorkbenchWindow fWindow;
-
- /**
- * Creates a terminate action for the console
- */
- public ConsoleTerminateAction(IWorkbenchWindow window, Console console) {
- super(ConsoleMessages.ConsoleTerminateAction_0);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.CONSOLE_TERMINATE_ACTION);
- fConsole = console;
- fWindow = window;
- setToolTipText(ConsoleMessages.ConsoleTerminateAction_1);
- setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_TERMINATE));
- setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE));
- setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_TERMINATE));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.CONSOLE_TERMINATE_ACTION);
- update();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.texteditor.IUpdate#update()
- */
- public void update() {
- IProcess process = fConsole.getProcess();
- setEnabled(process.canTerminate());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run() {
- IProcess process = fConsole.getProcess();
- List targets = collectTargets(process);
- targets.add(process);
- DebugCommandService service = DebugCommandService.getService(fWindow);
- service.executeCommand(ITerminateHandler.class, targets.toArray(), null);
- }
-
- /**
- * Collects targets associated with a process.
- *
- * @param process
- * @return associated targets
- */
- private List collectTargets(IProcess process) {
- ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
- ILaunch[] launches = launchManager.getLaunches();
- List targets = new ArrayList();
- for (int i = 0; i < launches.length; i++) {
- ILaunch launch = launches[i];
- IProcess[] processes = launch.getProcesses();
- for (int j = 0; j < processes.length; j++) {
- IProcess process2 = processes[j];
- if (process2.equals(process)) {
- IDebugTarget[] debugTargets = launch.getDebugTargets();
- for (int k = 0; k < debugTargets.length; k++) {
- targets.add(debugTargets[k]);
- }
- return targets; // all possible targets have been terminated for the launch.
- }
- }
- }
- return targets;
- }
-
- public void dispose() {
- fConsole = null;
- }
-
-}
Added: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ColorManager.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ColorManager.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ColorManager.java 2011-01-24 21:43:26 UTC (rev 28584)
@@ -0,0 +1,43 @@
+package org.jboss.tools.seam.forge.console;
+
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Display;
+
+class ColorManager {
+
+ private static ColorManager INSTANCE;
+
+ private ColorManager() {}
+
+ public static ColorManager getInstance() {
+ if (INSTANCE == null) {
+ INSTANCE= new ColorManager();
+ }
+ return INSTANCE;
+ }
+
+ protected Map<RGB, Color> fColorTable= new HashMap<RGB, Color>(10);
+
+ public Color getColor(RGB rgb) {
+ Color color= (Color) fColorTable.get(rgb);
+ if (color == null) {
+ color= new Color(Display.getCurrent(), rgb);
+ fColorTable.put(rgb, color);
+ }
+ return color;
+ }
+
+ public void dispose() {
+ Iterator<Color> e= fColorTable.values().iterator();
+ while (e.hasNext())
+ ((Color) e.next()).dispose();
+ }
+}
+
+
Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/ColorManager.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java (from rev 28554, trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/Console.java)
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java 2011-01-24 21:43:26 UTC (rev 28584)
@@ -0,0 +1,144 @@
+package org.jboss.tools.seam.forge.console;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.debug.core.DebugEvent;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.IDebugEventSetListener;
+import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.debug.core.model.IStreamMonitor;
+import org.eclipse.debug.core.model.IStreamsProxy;
+import org.eclipse.debug.ui.IDebugUIConstants;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.console.IOConsole;
+import org.eclipse.ui.console.IOConsoleInputStream;
+import org.eclipse.ui.console.IOConsoleOutputStream;
+
+public class Console extends IOConsole implements IDebugEventSetListener {
+
+ private static final RGB INPUT_STREAM_RGB = new RGB(25, 225, 25);
+ private static final RGB ERROR_STREAM_RGB = new RGB(225, 25, 25);
+ private static final RGB OUTPUT_STREAM_RGB = new RGB(0, 0, 0);
+ private static final RGB CONSOLE_BACKGROUND_RGB = new RGB(255, 255, 255);
+
+ private IProcess process = null;
+ private IOConsoleInputStream input;
+ private boolean streamsClosed = false;
+ private List<StreamListener> streamListeners = new ArrayList<StreamListener>();
+
+ public Console(IProcess process) {
+ super("Forge Console", null, null, null, true);
+ this.process = process;
+ input = getInputStream();
+ input.setColor(ColorManager.getInstance().getColor(INPUT_STREAM_RGB));
+ connect();
+ }
+
+ public IOConsoleOutputStream getStream(String streamIdentifier) {
+ for (StreamListener listener : streamListeners) {
+ if (listener.getStreamId().equals(streamIdentifier)) {
+ return listener.getStream();
+ }
+ }
+ return null;
+ }
+
+ public void dispose() {
+ super.dispose();
+ closeStreams();
+ disposeStreams();
+ DebugPlugin.getDefault().removeDebugEventListener(this);
+ }
+
+ private synchronized void closeStreams() {
+ if (streamsClosed) {
+ return;
+ }
+ for (StreamListener listener : streamListeners) {
+ listener.closeStream();
+ }
+ try {
+ input.close();
+ } catch (IOException e) {
+ }
+ streamsClosed = true;
+ }
+
+ private synchronized void disposeStreams() {
+ for (StreamListener listener : streamListeners) {
+ listener.dispose();
+ }
+ input = null;
+ }
+
+ protected void init() {
+ super.init();
+ if (process.isTerminated()) {
+ closeStreams();
+ } else {
+ DebugPlugin.getDefault().addDebugEventListener(this);
+ }
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ setFont(JFaceResources.getFont(IDebugUIConstants.PREF_CONSOLE_FONT));
+ setBackground(ColorManager.getInstance().getColor(CONSOLE_BACKGROUND_RGB));
+ }
+ });
+ }
+
+ public void handleDebugEvents(DebugEvent[] events) {
+ for (int i = 0; i < events.length; i++) {
+ DebugEvent event = events[i];
+ if (event.getSource().equals(process)) {
+ if (event.getKind() == DebugEvent.TERMINATE) {
+ closeStreams();
+ DebugPlugin.getDefault().removeDebugEventListener(this);
+ }
+ }
+ }
+ }
+
+ public void connect() {
+ IStreamsProxy streamsProxy = process.getStreamsProxy();
+ IStreamMonitor streamMonitor = streamsProxy.getErrorStreamMonitor();
+ if (streamMonitor != null) {
+ connect(streamMonitor, IDebugUIConstants.ID_STANDARD_ERROR_STREAM);
+ }
+ streamMonitor = streamsProxy.getOutputStreamMonitor();
+ if (streamMonitor != null) {
+ connect(streamMonitor, IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM);
+ }
+ InputReadJob inputReadJob = new InputReadJob(streamsProxy, input);
+ inputReadJob.setSystem(true);
+ inputReadJob.schedule();
+ }
+
+ private void connect(IStreamMonitor streamMonitor, String streamIdentifier) {
+ IOConsoleOutputStream stream = newOutputStream();
+ Color color = getColor(streamIdentifier);
+ stream.setColor(color);
+ synchronized (streamMonitor) {
+ StreamListener listener = new StreamListener(streamIdentifier, streamMonitor, stream, getEncoding());
+ streamListeners.add(listener);
+ }
+ }
+
+ public Color getColor(String streamIdentifer) {
+ if (IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM.equals(streamIdentifer)) {
+ return ColorManager.getInstance().getColor(OUTPUT_STREAM_RGB);
+ }
+ if (IDebugUIConstants.ID_STANDARD_ERROR_STREAM.equals(streamIdentifer)) {
+ return ColorManager.getInstance().getColor(ERROR_STREAM_RGB);
+ }
+ if (IDebugUIConstants.ID_STANDARD_INPUT_STREAM.equals(streamIdentifer)) {
+ return ColorManager.getInstance().getColor(INPUT_STREAM_RGB);
+ }
+ return null;
+ }
+
+}
Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/InputReadJob.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/InputReadJob.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/InputReadJob.java 2011-01-24 21:43:26 UTC (rev 28584)
@@ -0,0 +1,40 @@
+package org.jboss.tools.seam.forge.console;
+
+import java.io.IOException;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.debug.core.model.IStreamsProxy;
+import org.eclipse.ui.console.IOConsoleInputStream;
+import org.jboss.tools.seam.forge.Activator;
+
+class InputReadJob extends Job {
+
+ private IStreamsProxy streamsProxy;
+ private IOConsoleInputStream input;
+
+ InputReadJob(IStreamsProxy streamsProxy, IOConsoleInputStream input) {
+ super("Forge Console Input Job");
+ this.input = input;
+ this.streamsProxy = streamsProxy;
+ }
+
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ byte[] b = new byte[1024];
+ int read = 0;
+ while (input != null && read >= 0) {
+ read = input.read(b);
+ if (read > 0) {
+ String s = new String(b, 0, read);
+ streamsProxy.write(s);
+ }
+ }
+ } catch (IOException e) {
+ Activator.log(e);
+ }
+ return Status.OK_STATUS;
+ }
+}
Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/InputReadJob.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/StreamListener.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/StreamListener.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/StreamListener.java 2011-01-24 21:43:26 UTC (rev 28584)
@@ -0,0 +1,101 @@
+package org.jboss.tools.seam.forge.console;
+
+import java.io.IOException;
+
+import org.eclipse.debug.core.IStreamListener;
+import org.eclipse.debug.core.model.IFlushableStreamMonitor;
+import org.eclipse.debug.core.model.IStreamMonitor;
+import org.eclipse.ui.console.IOConsoleOutputStream;
+import org.jboss.tools.seam.forge.Activator;
+
+class StreamListener implements IStreamListener {
+
+ private IOConsoleOutputStream stream;
+ private IStreamMonitor streamMonitor;
+ private String streamId;
+ private boolean flushed = false;
+ private boolean listenerRemoved = false;
+ private String encoding;
+
+ StreamListener(String streamIdentifier, IStreamMonitor monitor, IOConsoleOutputStream stream, String encoding) {
+ this.streamId = streamIdentifier;
+ this.streamMonitor = monitor;
+ this.stream = stream;
+ this.encoding = encoding;
+ streamMonitor.addListener(this);
+ streamAppended(null, monitor);
+ }
+
+ String getStreamId() {
+ return streamId;
+ }
+
+ IOConsoleOutputStream getStream() {
+ return stream;
+ }
+
+ public void streamAppended(String text, IStreamMonitor monitor) {
+ if (flushed) {
+ try {
+ if (stream != null) {
+ if (encoding == null)
+ stream.write(text);
+ else
+ stream.write(text.getBytes(encoding));
+ }
+ } catch (IOException e) {
+ Activator.log(e);
+ }
+ } else {
+ String contents = null;
+ synchronized (streamMonitor) {
+ flushed = true;
+ contents = streamMonitor.getContents();
+ if (streamMonitor instanceof IFlushableStreamMonitor) {
+ IFlushableStreamMonitor m = (IFlushableStreamMonitor) streamMonitor;
+ m.flushContents();
+ m.setBuffered(false);
+ }
+ }
+ try {
+ if (contents != null && contents.length() > 0) {
+ if (stream != null) {
+ stream.write(contents);
+ }
+ }
+ } catch (IOException e) {
+ Activator.log(e);
+ }
+ }
+ }
+
+ void closeStream() {
+ if (streamMonitor == null) {
+ return;
+ }
+ synchronized (streamMonitor) {
+ streamMonitor.removeListener(this);
+ if (!flushed) {
+ String contents = streamMonitor.getContents();
+ streamAppended(contents, streamMonitor);
+ }
+ listenerRemoved = true;
+ try {
+ if (stream != null) {
+ stream.close();
+ }
+ } catch (IOException e) {
+ }
+ }
+ }
+
+ void dispose() {
+ if (!listenerRemoved) {
+ closeStream();
+ }
+ stream = null;
+ streamMonitor = null;
+ streamId = null;
+ }
+}
+
Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/StreamListener.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/runtime/Manager.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/runtime/Manager.java 2011-01-24 21:17:45 UTC (rev 28583)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/runtime/Manager.java 2011-01-24 21:43:26 UTC (rev 28584)
@@ -9,18 +9,14 @@
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.core.internal.jobs.JobManager;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.debug.core.DebugEvent;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.DebugPlugin;
@@ -34,8 +30,6 @@
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.swt.widgets.Display;
-import org.jboss.tools.seam.forge.Activator;
import org.osgi.framework.Bundle;
public class Manager implements IDebugEventSetListener {
@@ -78,7 +72,6 @@
try {
file = FileLocator.getBundleFile(bundle);
} catch (IOException e1) {
- // TODO Auto-generated catch block
e1.printStackTrace();
}
if (file == null) return;
@@ -109,10 +102,6 @@
classpath.add(systemLibsEntry.getMemento());
workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, classpath);
workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
-// workingCopy.setAttribute(
-// IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,
-// "-Dforge.home=/Users/koen/Downloads/forge-1.0.0.Alpha1 "); // +
-// "-Dseam.forge.shell.colorEnabled=true" );
IWorkspace workspace = ResourcesPlugin.getWorkspace();
IWorkspaceRoot root = workspace.getRoot();
IPath path = root.getLocation();
@@ -168,19 +157,6 @@
propertyChangeSupport.removePropertyChangeListener("runtimeState", listener);
}
- private IStatus createStatus(String message) {
- return new Status(
- IStatus.INFO,
- Activator.getDefault().getBundle().getSymbolicName(),
- IStatus.OK,
- message,
- null);
- }
-
- private void log(String message) {
- Activator.getDefault().getLog().log(createStatus(message));
- }
-
protected void finalize() throws Throwable {
if (forgeProcess != null) {
if (!forgeProcess.isTerminated()) {
Deleted: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/Console.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/Console.java 2011-01-24 21:17:45 UTC (rev 28583)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/Console.java 2011-01-24 21:43:26 UTC (rev 28584)
@@ -1,823 +0,0 @@
-package org.jboss.tools.seam.forge.view;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.internal.jobs.JobManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.variables.IStringVariableManager;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.IStreamListener;
-import org.eclipse.debug.core.model.IFlushableStreamMonitor;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.core.model.IStreamMonitor;
-import org.eclipse.debug.core.model.IStreamsProxy;
-import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
-import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
-import org.eclipse.debug.internal.ui.DebugPluginImages;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
-import org.eclipse.debug.internal.ui.preferences.IDebugPreferenceConstants;
-import org.eclipse.debug.internal.ui.views.console.ConsoleMessages;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.debug.ui.console.IConsole;
-import org.eclipse.debug.ui.console.IConsoleColorProvider;
-import org.eclipse.debug.ui.console.IConsoleHyperlink;
-import org.eclipse.debug.ui.console.IConsoleLineTracker;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IHyperlink;
-import org.eclipse.ui.console.IOConsole;
-import org.eclipse.ui.console.IOConsoleInputStream;
-import org.eclipse.ui.console.IOConsoleOutputStream;
-import org.eclipse.ui.console.IPatternMatchListener;
-import org.eclipse.ui.console.PatternMatchEvent;
-import org.eclipse.ui.console.TextConsole;
-import org.eclipse.ui.editors.text.EditorsUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.progress.UIJob;
-
-/**
- * A console for a system process with standard I/O streams.
- *
- * @since 3.0
- */
-public class Console extends IOConsole implements IConsole, IDebugEventSetListener, IPropertyChangeListener {
- private IProcess fProcess = null;
-
- private List fStreamListeners = new ArrayList();
-
- private IConsoleColorProvider fColorProvider;
-
- private IOConsoleInputStream fInput;
-
- private FileOutputStream fFileOutputStream;
-
- private boolean fAllocateConsole = true;
-
- private boolean fStreamsClosed = false;
-
- private InputReadJob inputReadJob;
-
- /**
- * Proxy to a console document
- */
- public Console(IProcess process, IConsoleColorProvider colorProvider) {
- this(process, colorProvider, null);
- }
-
- /**
- * Constructor
- * @param process the process to associate with this console
- * @param colorProvider the colour provider for this console
- * @param encoding the desired encoding for this console
- */
- public Console(IProcess process, IConsoleColorProvider colorProvider, String encoding) {
- super(IInternalDebugCoreConstants.EMPTY_STRING, IDebugUIConstants.ID_PROCESS_CONSOLE_TYPE, null, encoding, true);
- fProcess = process;
-
- ILaunchConfiguration configuration = process.getLaunch().getLaunchConfiguration();
- String file = null;
- boolean append = false;
- if (configuration != null) {
- try {
- file = configuration.getAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_FILE, (String) null);
- if (file != null) {
- IStringVariableManager stringVariableManager = VariablesPlugin.getDefault().getStringVariableManager();
- file = stringVariableManager.performStringSubstitution(file);
- append = configuration.getAttribute(IDebugUIConstants.ATTR_APPEND_TO_FILE, false);
- }
- } catch (CoreException e) {
- }
- }
-
- if (file != null && configuration != null) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- Path path = new Path(file);
- IFile ifile = root.getFileForLocation(path);
- String message = null;
-
- try {
- String fileLoc = null;
- if (ifile != null) {
- if (append && ifile.exists()) {
- ifile.appendContents(new ByteArrayInputStream(new byte[0]), true, true, new NullProgressMonitor());
- } else {
- if (ifile.exists()) {
- ifile.delete(true, new NullProgressMonitor());
- }
- ifile.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
- }
- }
-
- File outputFile = new File(file);
- fFileOutputStream = new FileOutputStream(outputFile, append);
- fileLoc = outputFile.getAbsolutePath();
-
- message = MessageFormat.format(ConsoleMessages.ProcessConsole_1, new String[] {fileLoc});
- addPatternMatchListener(new ConsoleLogFilePatternMatcher(fileLoc));
- } catch (FileNotFoundException e) {
- message = MessageFormat.format(ConsoleMessages.ProcessConsole_2, new String[] {file});
- } catch (CoreException e) {
- DebugUIPlugin.log(e);
- }
- if (message != null) {
- try {
- IOConsoleOutputStream stream = newOutputStream();
- stream.write(message);
- stream.close();
- } catch (IOException e) {
- DebugUIPlugin.log(e);
- }
- }
- try {
- fAllocateConsole = configuration.getAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_CONSOLE, true);
- } catch (CoreException e) {
- }
- }
-
- fColorProvider = colorProvider;
- fInput = getInputStream();
- colorProvider.connect(fProcess, this);
-
- setName(computeName());
-
- Color color = fColorProvider.getColor(IDebugUIConstants.ID_STANDARD_INPUT_STREAM);
- fInput.setColor(color);
-
- IConsoleLineTracker[] lineTrackers = DebugUIPlugin.getDefault().getProcessConsoleManager().getLineTrackers(process);
- if (lineTrackers.length > 0) {
- addPatternMatchListener(new ConsoleLineNotifier());
- }
- }
-
- /**
- * Computes and returns the image descriptor for this console.
- *
- * @return an image descriptor for this console or <code>null</code>
- */
- protected ImageDescriptor computeImageDescriptor() {
- ILaunchConfiguration configuration = getProcess().getLaunch().getLaunchConfiguration();
- if (configuration != null) {
- ILaunchConfigurationType type;
- try {
- type = configuration.getType();
- return DebugPluginImages.getImageDescriptor(type.getIdentifier());
- } catch (CoreException e) {
- DebugUIPlugin.log(e);
- }
- }
- return null;
- }
-
- /**
- * Computes and returns the current name of this console.
- *
- * @return a name for this console
- */
- protected String computeName() {
- String label = null;
- IProcess process = getProcess();
- ILaunchConfiguration config = process.getLaunch().getLaunchConfiguration();
-
- label = process.getAttribute(IProcess.ATTR_PROCESS_LABEL);
- if (label == null) {
- if (config == null) {
- label = process.getLabel();
- } else {
- // check if PRIVATE config
- if (DebugUITools.isPrivate(config)) {
- label = process.getLabel();
- } else {
- String type = null;
- try {
- type = config.getType().getName();
- } catch (CoreException e) {
- }
- StringBuffer buffer = new StringBuffer();
- buffer.append(config.getName());
- if (type != null) {
- buffer.append(" ["); //$NON-NLS-1$
- buffer.append(type);
- buffer.append("] "); //$NON-NLS-1$
- }
- buffer.append(process.getLabel());
- label = buffer.toString();
- }
- }
- }
-
- if (process.isTerminated()) {
- return MessageFormat.format(ConsoleMessages.ProcessConsole_0, new String[] { label });
- }
- return label;
- }
-
- /**
- * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
- */
- public void propertyChange(PropertyChangeEvent evt) {
- String property = evt.getProperty();
- IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore();
- if (property.equals(IDebugPreferenceConstants.CONSOLE_WRAP) || property.equals(IDebugPreferenceConstants.CONSOLE_WIDTH)) {
- boolean fixedWidth = store.getBoolean(IDebugPreferenceConstants.CONSOLE_WRAP);
- if (fixedWidth) {
- int width = store.getInt(IDebugPreferenceConstants.CONSOLE_WIDTH);
- setConsoleWidth(width);
- } else {
- setConsoleWidth(-1);
- }
- } else if (property.equals(IDebugPreferenceConstants.CONSOLE_LIMIT_CONSOLE_OUTPUT) || property.equals(IDebugPreferenceConstants.CONSOLE_HIGH_WATER_MARK) || property.equals(IDebugPreferenceConstants.CONSOLE_LOW_WATER_MARK)) {
- boolean limitBufferSize = store.getBoolean(IDebugPreferenceConstants.CONSOLE_LIMIT_CONSOLE_OUTPUT);
- if (limitBufferSize) {
- int highWater = store.getInt(IDebugPreferenceConstants.CONSOLE_HIGH_WATER_MARK);
- int lowWater = store.getInt(IDebugPreferenceConstants.CONSOLE_LOW_WATER_MARK);
- if (highWater > lowWater) {
- setWaterMarks(lowWater, highWater);
- }
- } else {
- setWaterMarks(-1, -1);
- }
- } else if (property.equals(IDebugPreferenceConstants.CONSOLE_TAB_WIDTH)) {
- int tabWidth = store.getInt(IDebugPreferenceConstants.CONSOLE_TAB_WIDTH);
- setTabWidth(tabWidth);
- } else if (property.equals(IDebugPreferenceConstants.CONSOLE_OPEN_ON_OUT)) {
- boolean activateOnOut = store.getBoolean(IDebugPreferenceConstants.CONSOLE_OPEN_ON_OUT);
- IOConsoleOutputStream stream = getStream(IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM);
- if (stream != null) {
-// stream.setActivateOnWrite(activateOnOut);
- }
- } else if (property.equals(IDebugPreferenceConstants.CONSOLE_OPEN_ON_ERR)) {
- boolean activateOnErr = store.getBoolean(IDebugPreferenceConstants.CONSOLE_OPEN_ON_ERR);
- IOConsoleOutputStream stream = getStream(IDebugUIConstants.ID_STANDARD_ERROR_STREAM);
- if (stream != null) {
-// stream.setActivateOnWrite(activateOnErr);
- }
- } else if (property.equals(IDebugPreferenceConstants.CONSOLE_SYS_OUT_COLOR)) {
- IOConsoleOutputStream stream = getStream(IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM);
- if (stream != null) {
- stream.setColor(fColorProvider.getColor(IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM));
- }
- } else if (property.equals(IDebugPreferenceConstants.CONSOLE_SYS_ERR_COLOR)) {
- IOConsoleOutputStream stream = getStream(IDebugUIConstants.ID_STANDARD_ERROR_STREAM);
- if (stream != null) {
- stream.setColor(fColorProvider.getColor(IDebugUIConstants.ID_STANDARD_ERROR_STREAM));
- }
- } else if (property.equals(IDebugPreferenceConstants.CONSOLE_SYS_IN_COLOR)) {
- if (fInput != null) {
- fInput.setColor(fColorProvider.getColor(IDebugUIConstants.ID_STANDARD_INPUT_STREAM));
- }
- } else if (property.equals(IDebugUIConstants.PREF_CONSOLE_FONT)) {
- setFont(JFaceResources.getFont(IDebugUIConstants.PREF_CONSOLE_FONT));
- } else if (property.equals(IDebugPreferenceConstants.CONSOLE_BAKGROUND_COLOR)) {
- setBackground(DebugUIPlugin.getPreferenceColor(IDebugPreferenceConstants.CONSOLE_BAKGROUND_COLOR));
- }
- }
-
- /**
- * @see org.eclipse.debug.ui.console.IConsole#getStream(java.lang.String)
- */
- public IOConsoleOutputStream getStream(String streamIdentifier) {
- for (Iterator i = fStreamListeners.iterator(); i.hasNext();) {
- StreamListener listener = (StreamListener) i.next();
- if (listener.fStreamId.equals(streamIdentifier)) {
- return listener.fStream;
- }
- }
- return null;
- }
-
- /**
- * @see org.eclipse.debug.ui.console.IConsole#getProcess()
- */
- public IProcess getProcess() {
- return fProcess;
- }
-
- /**
- * @see org.eclipse.ui.console.IOConsole#dispose()
- */
- protected void dispose() {
- super.dispose();
- fColorProvider.disconnect();
- closeStreams();
- disposeStreams();
- DebugPlugin.getDefault().removeDebugEventListener(this);
- DebugUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this);
- JFaceResources.getFontRegistry().removeListener(this);
- }
-
- /**
- * cleanup method to clsoe all of the open stream to this console
- */
- public synchronized void closeStreams() {
- if (fStreamsClosed) {
- return;
- }
- for (Iterator i = fStreamListeners.iterator(); i.hasNext();) {
- StreamListener listener = (StreamListener) i.next();
- listener.closeStream();
- }
- if (fFileOutputStream != null) {
- synchronized (fFileOutputStream) {
- try {
- fFileOutputStream.flush();
- fFileOutputStream.close();
- } catch (IOException e) {
- }
- }
- }
- try {
- fInput.close();
- } catch (IOException e) {
- }
- fStreamsClosed = true;
- }
-
- /**
- * disposes ofthe listeners for each of the stream associated with this console
- */
- private synchronized void disposeStreams() {
- for (Iterator i = fStreamListeners.iterator(); i.hasNext();) {
- StreamListener listener = (StreamListener) i.next();
- listener.dispose();
- }
- fFileOutputStream = null;
- fInput = null;
- }
-
- /**
- * @see org.eclipse.ui.console.AbstractConsole#init()
- */
- protected void init() {
- super.init();
- if (fProcess.isTerminated()) {
- closeStreams();
- resetName();
- } else {
- DebugPlugin.getDefault().addDebugEventListener(this);
- }
- IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore();
- store.addPropertyChangeListener(this);
- JFaceResources.getFontRegistry().addListener(this);
- if (store.getBoolean(IDebugPreferenceConstants.CONSOLE_WRAP)) {
- setConsoleWidth(store.getInt(IDebugPreferenceConstants.CONSOLE_WIDTH));
- }
- setTabWidth(store.getInt(IDebugPreferenceConstants.CONSOLE_TAB_WIDTH));
-
- if (store.getBoolean(IDebugPreferenceConstants.CONSOLE_LIMIT_CONSOLE_OUTPUT)) {
- int highWater = store.getInt(IDebugPreferenceConstants.CONSOLE_HIGH_WATER_MARK);
- int lowWater = store.getInt(IDebugPreferenceConstants.CONSOLE_LOW_WATER_MARK);
- setWaterMarks(lowWater, highWater);
- }
-
- DebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
- public void run() {
- setFont(JFaceResources.getFont(IDebugUIConstants.PREF_CONSOLE_FONT));
- setBackground(DebugUIPlugin.getPreferenceColor(IDebugPreferenceConstants.CONSOLE_BAKGROUND_COLOR));
- }
- });
- }
-
- /**
- * Notify listeners when name changes.
- *
- * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[])
- */
- public void handleDebugEvents(DebugEvent[] events) {
- for (int i = 0; i < events.length; i++) {
- DebugEvent event = events[i];
- if (event.getSource().equals(getProcess())) {
- if (event.getKind() == DebugEvent.TERMINATE) {
- closeStreams();
- DebugPlugin.getDefault().removeDebugEventListener(this);
- }
- resetName();
- }
- }
- }
-
- /**
- * resets the name of this console to the original computed name
- */
- private void resetName() {
- final String newName = computeName();
- String name = getName();
- if (!name.equals(newName)) {
- UIJob job = new UIJob("Update console title") { //$NON-NLS-1$
- public IStatus runInUIThread(IProgressMonitor monitor) {
- Console.this.setName(newName);
- warnOfContentChange();
- return Status.OK_STATUS;
- }
- };
- job.setSystem(true);
- job.schedule();
- }
- }
-
- /**
- * send notification of a change of content in this console
- */
- private void warnOfContentChange() {
- ConsolePlugin.getDefault().getConsoleManager().warnOfContentChange(DebugUITools.getConsole(fProcess));
- }
-
- /**
- * @see org.eclipse.debug.ui.console.IConsole#connect(org.eclipse.debug.core.model.IStreamsProxy)
- */
- public void connect(IStreamsProxy streamsProxy) {
- IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore();
- IStreamMonitor streamMonitor = streamsProxy.getErrorStreamMonitor();
- if (streamMonitor != null) {
- connect(streamMonitor, IDebugUIConstants.ID_STANDARD_ERROR_STREAM,
- store.getBoolean(IDebugPreferenceConstants.CONSOLE_OPEN_ON_ERR));
- }
- streamMonitor = streamsProxy.getOutputStreamMonitor();
- if (streamMonitor != null) {
- connect(streamMonitor, IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM,
- store.getBoolean(IDebugPreferenceConstants.CONSOLE_OPEN_ON_OUT));
- }
- if (inputReadJob == null) {
- inputReadJob = new InputReadJob(streamsProxy);
- }
- inputReadJob.setSystem(true);
- inputReadJob.schedule();
-// InputReadJob readJob = new InputReadJob(streamsProxy);
-// readJob.setSystem(true);
-// readJob.schedule();
- }
-
- public Job getInputReadJob() {
- return inputReadJob;
- }
-
- /**
- * @see org.eclipse.debug.ui.console.IConsole#connect(org.eclipse.debug.core.model.IStreamMonitor, java.lang.String)
- */
- public void connect(IStreamMonitor streamMonitor, String streamIdentifier) {
- connect(streamMonitor, streamIdentifier, false);
- }
-
- /**
- * Connects the given stream monitor to a new output stream with the given identifier.
- *
- * @param streamMonitor stream monitor
- * @param streamIdentifier stream identifier
- * @param activateOnWrite whether the stream should displayed when written to
- */
- private void connect(IStreamMonitor streamMonitor, String streamIdentifier, boolean activateOnWrite) {
- IOConsoleOutputStream stream = null;
- if (fAllocateConsole) {
- stream = newOutputStream();
- Color color = fColorProvider.getColor(streamIdentifier);
- stream.setColor(color);
-// stream.setActivateOnWrite(activateOnWrite);
- }
- synchronized (streamMonitor) {
- StreamListener listener = new StreamListener(streamIdentifier, streamMonitor, stream);
- fStreamListeners.add(listener);
- }
- }
-
- /**
- * @see org.eclipse.debug.ui.console.IConsole#addLink(org.eclipse.debug.ui.console.IConsoleHyperlink, int, int)
- */
- public void addLink(IConsoleHyperlink link, int offset, int length) {
- try {
- addHyperlink(link, offset, length);
- } catch (BadLocationException e) {
- DebugUIPlugin.log(e);
- }
- }
-
- /**
- * @see org.eclipse.debug.ui.console.IConsole#addLink(org.eclipse.ui.console.IHyperlink, int, int)
- */
- public void addLink(IHyperlink link, int offset, int length) {
- try {
- addHyperlink(link, offset, length);
- } catch (BadLocationException e) {
- DebugUIPlugin.log(e);
- }
- }
-
- /**
- * @see org.eclipse.debug.ui.console.IConsole#getRegion(org.eclipse.debug.ui.console.IConsoleHyperlink)
- */
- public IRegion getRegion(IConsoleHyperlink link) {
- return super.getRegion(link);
- }
-
- /**
- * This class listens to a specified IO stream
- */
- private class StreamListener implements IStreamListener {
-
- private IOConsoleOutputStream fStream;
-
- private IStreamMonitor fStreamMonitor;
-
- private String fStreamId;
-
- private boolean fFlushed = false;
-
- private boolean fListenerRemoved = false;
-
- public StreamListener(String streamIdentifier, IStreamMonitor monitor, IOConsoleOutputStream stream) {
- this.fStreamId = streamIdentifier;
- this.fStreamMonitor = monitor;
- this.fStream = stream;
- fStreamMonitor.addListener(this);
- //fix to bug 121454. Ensure that output to fast processes is processed.
- streamAppended(null, monitor);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.debug.core.IStreamListener#streamAppended(java.lang.String,
- * org.eclipse.debug.core.model.IStreamMonitor)
- */
- public void streamAppended(String text, IStreamMonitor monitor) {
- String encoding = getEncoding();
- if (fFlushed) {
- try {
- if (fStream != null) {
- if (encoding == null)
- fStream.write(text);
- else
- fStream.write(text.getBytes(encoding));
- }
- if (fFileOutputStream != null) {
- synchronized (fFileOutputStream) {
- if (encoding == null)
- fFileOutputStream.write(text.getBytes());
- else
- fFileOutputStream.write(text.getBytes(encoding));
- }
- }
- } catch (IOException e) {
- DebugUIPlugin.log(e);
- }
- } else {
- String contents = null;
- synchronized (fStreamMonitor) {
- fFlushed = true;
- contents = fStreamMonitor.getContents();
- if (fStreamMonitor instanceof IFlushableStreamMonitor) {
- IFlushableStreamMonitor m = (IFlushableStreamMonitor) fStreamMonitor;
- m.flushContents();
- m.setBuffered(false);
- }
- }
- try {
- if (contents != null && contents.length() > 0) {
- if (fStream != null) {
- fStream.write(contents);
- }
- if (fFileOutputStream != null) {
- synchronized (fFileOutputStream) {
- fFileOutputStream.write(contents.getBytes());
- }
- }
- }
- } catch (IOException e) {
- DebugUIPlugin.log(e);
- }
- }
- }
-
- public void closeStream() {
- if (fStreamMonitor == null) {
- return;
- }
- synchronized (fStreamMonitor) {
- fStreamMonitor.removeListener(this);
- if (!fFlushed) {
- String contents = fStreamMonitor.getContents();
- streamAppended(contents, fStreamMonitor);
- }
- fListenerRemoved = true;
- try {
- if (fStream != null) {
- fStream.close();
- }
- } catch (IOException e) {
- }
- }
- }
-
- public void dispose() {
- if (!fListenerRemoved) {
- closeStream();
- }
- fStream = null;
- fStreamMonitor = null;
- fStreamId = null;
- }
- }
-
- private class InputReadJob extends Job {
-
- private IStreamsProxy streamsProxy;
-
- InputReadJob(IStreamsProxy streamsProxy) {
- super("Forge Console Input Job"); //$NON-NLS-1$
- this.streamsProxy = streamsProxy;
- }
-
- protected IStatus run(IProgressMonitor monitor) {
- try {
- byte[] b = new byte[1024];
- int read = 0;
- while (fInput != null && read >= 0) {
- read = fInput.read(b);
- if (read > 0) {
- String s = new String(b, 0, read);
- streamsProxy.write(s);
- }
- }
- } catch (IOException e) {
- DebugUIPlugin.log(e);
- }
- return Status.OK_STATUS;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.console.IConsole#getImageDescriptor()
- */
- public ImageDescriptor getImageDescriptor() {
- if (super.getImageDescriptor() == null) {
- setImageDescriptor(computeImageDescriptor());
- }
- return super.getImageDescriptor();
- }
-
- private class ConsoleLogFilePatternMatcher implements IPatternMatchListener {
- String fFilePath;
-
- public ConsoleLogFilePatternMatcher(String filePath) {
- fFilePath = escape(filePath);
- }
-
- private String escape(String path) {
- StringBuffer buffer = new StringBuffer(path);
- int index = buffer.indexOf("\\"); //$NON-NLS-1$
- while (index >= 0) {
- buffer.insert(index, '\\');
- index = buffer.indexOf("\\", index+2); //$NON-NLS-1$
- }
- return buffer.toString();
- }
-
- public String getPattern() {
- return fFilePath;
- }
-
- public void matchFound(PatternMatchEvent event) {
- try {
- addHyperlink(new ConsoleLogFileHyperlink(fFilePath), event.getOffset(), event.getLength());
- removePatternMatchListener(this);
- } catch (BadLocationException e) {
- }
- }
-
- public int getCompilerFlags() {
- return 0;
- }
-
- public String getLineQualifier() {
- return null;
- }
-
- public void connect(TextConsole console) {
- }
-
- public void disconnect() {
- }
- }
-
- private class ConsoleLogFileHyperlink implements IHyperlink {
- String fFilePath;
- ConsoleLogFileHyperlink(String filePath) {
- fFilePath = filePath;
- }
-
- public void linkActivated() {
- IEditorInput input;
- Path path = new Path(fFilePath);
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IFile ifile = root.getFileForLocation(path);
- if (ifile == null) { // The file is not in the workspace
- File file = new File(fFilePath);
- LocalFileStorage lfs = new LocalFileStorage(file);
- input = new StorageEditorInput(lfs, file);
-
- } else {
- input = new FileEditorInput(ifile);
- }
-
- IWorkbenchPage activePage = DebugUIPlugin.getActiveWorkbenchWindow().getActivePage();
- try {
- activePage.openEditor(input, EditorsUI.DEFAULT_TEXT_EDITOR_ID, true);
- } catch (PartInitException e) {
- }
- }
- public void linkEntered() {
- }
- public void linkExited() {
- }
- }
-
- class StorageEditorInput extends PlatformObject implements IStorageEditorInput {
- private File fFile;
- private IStorage fStorage;
-
- public StorageEditorInput(IStorage storage, File file) {
- fStorage = storage;
- fFile = file;
- }
-
- public IStorage getStorage() {
- return fStorage;
- }
-
- public ImageDescriptor getImageDescriptor() {
- return null;
- }
-
- public String getName() {
- return getStorage().getName();
- }
-
- public IPersistableElement getPersistable() {
- return null;
- }
-
- public String getToolTipText() {
- return getStorage().getFullPath().toOSString();
- }
-
- public boolean equals(Object object) {
- return object instanceof StorageEditorInput &&
- getStorage().equals(((StorageEditorInput)object).getStorage());
- }
-
- public int hashCode() {
- return getStorage().hashCode();
- }
-
- public boolean exists() {
- return fFile.exists();
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.console.AbstractConsole#getHelpContextId()
- */
- public String getHelpContextId() {
- return IDebugHelpContextIds.PROCESS_CONSOLE;
- }
-}
Deleted: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsoleLineNotifier.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsoleLineNotifier.java 2011-01-24 21:17:45 UTC (rev 28583)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsoleLineNotifier.java 2011-01-24 21:43:26 UTC (rev 28584)
@@ -1,151 +0,0 @@
-package org.jboss.tools.seam.forge.view;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.ui.console.IConsoleLineTracker;
-import org.eclipse.debug.ui.console.IConsoleLineTrackerExtension;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.ui.console.IConsoleConstants;
-import org.eclipse.ui.console.IPatternMatchListener;
-import org.eclipse.ui.console.PatternMatchEvent;
-import org.eclipse.ui.console.TextConsole;
-
-/**
- * Tracks text appended to the console and notifies listeners in terms of whole
- * lines.
- */
-public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChangeListener {
- /**
- * Console listeners
- */
- private List fListeners = new ArrayList(2);
-
- /**
- * The console this notifier is tracking
- */
- private Console fConsole = null;
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.console.IPatternMatchListenerDelegate#connect(org.eclipse.ui.console.TextConsole)
- */
- public void connect(TextConsole console) {
- if (console instanceof Console) {
- fConsole = (Console)console;
-
- IConsoleLineTracker[] lineTrackers = DebugUIPlugin.getDefault().getProcessConsoleManager().getLineTrackers(fConsole.getProcess());
- for (int i = 0; i < lineTrackers.length; i++) {
- lineTrackers[i].init(fConsole);
- addConsoleListener(lineTrackers[i]);
- }
-
- fConsole.addPropertyChangeListener(this);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.console.IPatternMatchListener#disconnect()
- */
- public synchronized void disconnect() {
- try {
- IDocument document = fConsole.getDocument();
- if (document != null) {
- int lastLine = document.getNumberOfLines() - 1;
- if (document.getLineDelimiter(lastLine) == null) {
- IRegion lineInformation = document.getLineInformation(lastLine);
- lineAppended(lineInformation);
- }
- }
- } catch (BadLocationException e) {
- }
- }
-
- /**
- * Notification the console's streams have been closed
- */
- public synchronized void consoleClosed() {
- int size = fListeners.size();
- for (int i = 0; i < size; i++) {
- IConsoleLineTracker tracker = (IConsoleLineTracker) fListeners.get(i);
- if (tracker instanceof IConsoleLineTrackerExtension) {
- ((IConsoleLineTrackerExtension) tracker).consoleClosed();
- }
- tracker.dispose();
- }
-
- fConsole = null;
- fListeners = null;
- }
-
- /**
- * Adds the given listener to the list of listeners notified when a line of
- * text is appended to the console.
- *
- * @param listener
- */
- public void addConsoleListener(IConsoleLineTracker listener) {
- if (!fListeners.contains(listener))
- fListeners.add(listener);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.console.IPatternMatchListener#matchFound(org.eclipse.ui.console.PatternMatchEvent)
- */
- public void matchFound(PatternMatchEvent event) {
- try {
- IDocument document = fConsole.getDocument();
- int lineOfOffset = document.getLineOfOffset(event.getOffset());
- String delimiter = document.getLineDelimiter(lineOfOffset);
- int strip = delimiter==null ? 0 : delimiter.length();
- Region region = new Region(event.getOffset(), event.getLength()-strip);
- lineAppended(region);
- } catch (BadLocationException e) {}
- }
-
- public void lineAppended(IRegion region) {
- int size = fListeners.size();
- for (int i=0; i<size; i++) {
- IConsoleLineTracker tracker = (IConsoleLineTracker) fListeners.get(i);
- tracker.lineAppended(region);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
- */
- public void propertyChange(PropertyChangeEvent event) {
- if(event.getProperty().equals(IConsoleConstants.P_CONSOLE_OUTPUT_COMPLETE)) {
- fConsole.removePropertyChangeListener(this);
- consoleClosed();
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.console.IPatternMatchListener#getPattern()
- */
- public String getPattern() {
- return ".*\\r(\\n?)|.*\\n"; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.console.IPatternMatchListener#getCompilerFlags()
- */
- public int getCompilerFlags() {
- return 0;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.console.IPatternMatchListener#getLineQualifier()
- */
- public String getLineQualifier() {
- return "\\n|\\r"; //$NON-NLS-1$
- }
-
-}
Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsolePage.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsolePage.java 2011-01-24 21:17:45 UTC (rev 28583)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsolePage.java 2011-01-24 21:43:26 UTC (rev 28584)
@@ -1,11 +1,10 @@
package org.jboss.tools.seam.forge.view;
-import org.eclipse.debug.ui.console.ConsoleColorProvider;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.console.TextConsoleViewer;
-import org.eclipse.ui.internal.console.IOConsoleViewer;
import org.eclipse.ui.part.Page;
+import org.jboss.tools.seam.forge.console.Console;
import org.jboss.tools.seam.forge.runtime.Manager;
public class ConsolePage extends Page {
@@ -15,8 +14,8 @@
@Override
public void createControl(Composite parent) {
- console = new Console(Manager.INSTANCE.getProcess(), new ConsoleColorProvider());
- viewer = new IOConsoleViewer(parent, console);
+ console = new Console(Manager.INSTANCE.getProcess());
+ viewer = new ConsoleViewer(parent, console);
console.initialize();
}
Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsoleView.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsoleView.java 2011-01-24 21:17:45 UTC (rev 28583)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsoleView.java 2011-01-24 21:43:26 UTC (rev 28584)
@@ -3,18 +3,16 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.internal.ui.views.console.ProcessConsole;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.MessagePage;
import org.eclipse.ui.part.PageBook;
import org.eclipse.ui.part.PageSite;
import org.eclipse.ui.part.ViewPart;
+import org.jboss.tools.seam.forge.console.Console;
import org.jboss.tools.seam.forge.runtime.Manager;
public class ConsoleView extends ViewPart implements PropertyChangeListener {
Added: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsoleViewer.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsoleViewer.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsoleViewer.java 2011-01-24 21:43:26 UTC (rev 28584)
@@ -0,0 +1,113 @@
+package org.jboss.tools.seam.forge.view;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentListener;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.events.VerifyEvent;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.console.ConsolePlugin;
+import org.eclipse.ui.console.IConsoleDocumentPartitioner;
+import org.eclipse.ui.console.TextConsole;
+import org.eclipse.ui.console.TextConsoleViewer;
+
+public class ConsoleViewer extends TextConsoleViewer {
+
+ private boolean fAutoScroll = true;
+
+ private IDocumentListener fDocumentListener;
+
+ public ConsoleViewer(Composite parent, TextConsole console) {
+ super(parent, console);
+ }
+
+ public boolean isAutoScroll() {
+ return fAutoScroll;
+ }
+
+ public void setAutoScroll(boolean scroll) {
+ fAutoScroll = scroll;
+ }
+
+ protected void handleVerifyEvent(VerifyEvent e) {
+ IDocument doc = getDocument();
+ String[] legalLineDelimiters = doc.getLegalLineDelimiters();
+ String eventString = e.text;
+ try {
+ IConsoleDocumentPartitioner partitioner = (IConsoleDocumentPartitioner) doc.getDocumentPartitioner();
+ if (!partitioner.isReadOnly(e.start)) {
+ boolean isCarriageReturn = false;
+ for (int i = 0; i < legalLineDelimiters.length; i++) {
+ if (e.text.equals(legalLineDelimiters[i])) {
+ isCarriageReturn = true;
+ break;
+ }
+ }
+
+ if (!isCarriageReturn) {
+ super.handleVerifyEvent(e);
+ return;
+ }
+ }
+
+ int length = doc.getLength();
+ if (e.start == length) {
+ super.handleVerifyEvent(e);
+ } else {
+ try {
+ doc.replace(length, 0, eventString);
+ } catch (BadLocationException e1) {
+ }
+ e.doit = false;
+ }
+ } finally {
+ StyledText text = (StyledText) e.widget;
+ text.setCaretOffset(text.getCharCount());
+ }
+ }
+
+ public void setReadOnly() {
+ ConsolePlugin.getStandardDisplay().asyncExec(new Runnable() {
+ public void run() {
+ StyledText text = getTextWidget();
+ if (text != null && !text.isDisposed()) {
+ text.setEditable(false);
+ }
+ }
+ });
+ }
+
+ public boolean isReadOnly() {
+ return !getTextWidget().getEditable();
+ }
+
+ public void setDocument(IDocument document) {
+ IDocument oldDocument= getDocument();
+
+ super.setDocument(document);
+
+ if (oldDocument != null) {
+ oldDocument.removeDocumentListener(getDocumentListener());
+ }
+ if (document != null) {
+ document.addDocumentListener(getDocumentListener());
+ }
+ }
+
+ private IDocumentListener getDocumentListener() {
+ if (fDocumentListener == null) {
+ fDocumentListener= new IDocumentListener() {
+ public void documentAboutToBeChanged(DocumentEvent event) {
+ }
+
+ public void documentChanged(DocumentEvent event) {
+ if (fAutoScroll) {
+ revealEndOfDocument();
+ }
+ }
+ };
+ }
+ return fDocumentListener;
+ }
+}
Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsoleViewer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 5 months
- 1
- 0