JBoss Tools SVN: r16304 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-06-30 19:43:25 -0400 (Tue, 30 Jun 2009)
New Revision: 16304
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4387
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2009-06-30 19:49:45 UTC (rev 16303)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2009-06-30 23:43:25 UTC (rev 16304)
@@ -15,7 +15,6 @@
import org.jboss.tools.seam.core.test.project.facet.SeamRuntimeListConverterTest;
import org.jboss.tools.seam.core.test.project.facet.SeamRuntimeManagerTest;
-import org.jboss.tools.seam.core.test.refactoring.SeamRefactoringAllTests;
/**
* @author V.Kabanovich
@@ -33,8 +32,6 @@
suite.addTestSuite(SeamEARTest.class);
suite.addTestSuite(SeamRuntimeListConverterTest.class);
suite.addTestSuite(SeamRuntimeManagerTest.class);
- suite.addTest(SeamValidatorsAllTests.suite());
- suite.addTest(SeamRefactoringAllTests.suite());
return suite;
}
}
\ No newline at end of file
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r16303 - in trunk: tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-06-30 15:49:45 -0400 (Tue, 30 Jun 2009)
New Revision: 16303
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4387
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2009-06-30 19:05:04 UTC (rev 16302)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2009-06-30 19:49:45 UTC (rev 16303)
@@ -28,13 +28,13 @@
TestSuite suite = new TestSuite();
suite.setName("All tests for " + PLUGIN_ID);
suite.addTestSuite(ScannerTest.class);
-// suite.addTestSuite(SerializationTest.class);
-// suite.addTestSuite(SeamBigProjectTest.class);
-// suite.addTestSuite(SeamEARTest.class);
-// suite.addTestSuite(SeamRuntimeListConverterTest.class);
-// suite.addTestSuite(SeamRuntimeManagerTest.class);
-// suite.addTest(SeamValidatorsAllTests.suite());
-// suite.addTest(SeamRefactoringAllTests.suite());
+ suite.addTestSuite(SerializationTest.class);
+ suite.addTestSuite(SeamBigProjectTest.class);
+ suite.addTestSuite(SeamEARTest.class);
+ suite.addTestSuite(SeamRuntimeListConverterTest.class);
+ suite.addTestSuite(SeamRuntimeManagerTest.class);
+ suite.addTest(SeamValidatorsAllTests.suite());
+ suite.addTest(SeamRefactoringAllTests.suite());
return suite;
}
}
\ No newline at end of file
Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java 2009-06-30 19:05:04 UTC (rev 16302)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java 2009-06-30 19:49:45 UTC (rev 16303)
@@ -20,7 +20,7 @@
*/
public class JobUtils {
- private static final long MAX_IDLE = 30*60*1000L;
+ private static final long MAX_IDLE = 15*60*1000L;
private static final long DEFAULT_DELAY = 500;
public static void waitForIdle() {
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r16302 - in trunk/jst/plugins: org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-06-30 15:05:04 -0400 (Tue, 30 Jun 2009)
New Revision: 16302
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/EnumerationProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Facelets.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-06-30 18:20:02 UTC (rev 16301)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-06-30 19:05:04 UTC (rev 16302)
@@ -100,7 +100,7 @@
String matchString = super.getMatchString(parent, aRegion, offset);
String regionType = aRegion.getType();
if(regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE && matchString.startsWith("\"")) {
- matchString = matchString.substring(1); //$NON-NLS-1$
+ matchString = matchString.substring(1);
}
return matchString;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2009-06-30 18:20:02 UTC (rev 16301)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2009-06-30 19:05:04 UTC (rev 16302)
@@ -30,6 +30,7 @@
import org.jboss.tools.jst.web.kb.PageProcessor;
import org.jboss.tools.jst.web.kb.KbQuery.Type;
import org.jboss.tools.jst.web.kb.internal.FaceletPageContextImpl;
+import org.jboss.tools.jst.web.kb.taglib.CustomTagLibManager;
import org.jboss.tools.jst.web.kb.taglib.INameSpace;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -43,8 +44,6 @@
*
*/
public class FaceletPageContectAssistProcessor extends JspContentAssistProcessor {
- private static final String UI_URI_JSF_FACELETS = "http://java.sun.com/jsf/facelets"; //$NON-NLS-1$
- private static final String UI_URI_XHTML_FACELETS = "http://www.w3.org/1999/xhtml/facelets"; //$NON-NLS-1$
private static final String JSFC_ATTRIBUTE_NAME = "jsfc"; //$NON-NLS-1$
private boolean replaceJsfcTags;
@@ -139,10 +138,10 @@
}
};
context.addNameSpace(region, nameSpace);
- if (UI_URI_JSF_FACELETS.equals(uri)) {
+ if (CustomTagLibManager.FACELETS_UI_TAG_LIB_URI.equals(uri)) {
nameSpace = new INameSpace(){
public String getURI() {
- return UI_URI_XHTML_FACELETS;
+ return CustomTagLibManager.FACELETS_HTML_TAG_LIB_URI;
}
public String getPrefix() {
return "";
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/EnumerationProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/EnumerationProposalType.java 2009-06-30 18:20:02 UTC (rev 16301)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/EnumerationProposalType.java 2009-06-30 19:05:04 UTC (rev 16302)
@@ -39,14 +39,16 @@
List<TextProposal> proposals = new ArrayList<TextProposal>();
for (int i = 0; i < params.length; i++) {
String text = params[i].getValue();
- TextProposal proposal = new TextProposal();
- proposal.setLabel(text);
- proposal.setReplacementString(text);
- proposal.setPosition(text.length());
- if(ICON==null) {
- ICON = ImageDescriptor.createFromFile(WebKbPlugin.class, IMAGE_NAME).createImage();
+ if(text.startsWith(query.getValue())) {
+ TextProposal proposal = new TextProposal();
+ proposal.setLabel(text);
+ proposal.setReplacementString(text);
+ proposal.setPosition(text.length());
+ if(ICON==null) {
+ ICON = ImageDescriptor.createFromFile(WebKbPlugin.class, IMAGE_NAME).createImage();
+ }
+ proposals.add(proposal);
}
- proposals.add(proposal);
}
return proposals.toArray(new TextProposal[0]);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java 2009-06-30 18:20:02 UTC (rev 16301)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java 2009-06-30 19:05:04 UTC (rev 16302)
@@ -37,8 +37,8 @@
*/
public class CustomTagLibManager {
- public static final String FACELETS_UI_TAG_LIB_URI = "http://java.sun.com/jsf/facelets";
- public static final String FACELETS_HTML_TAG_LIB_URI = "http://www.w3.org/1999/xhtml/facelets";
+ public static final String FACELETS_UI_TAG_LIB_URI = "http://java.sun.com/jsf/facelets"; //$NON-NLS-1$
+ public static final String FACELETS_HTML_TAG_LIB_URI = "http://www.w3.org/1999/xhtml/facelets"; //$NON-NLS-1$
private static final CustomTagLibManager INSTANCE = new CustomTagLibManager();
@@ -90,7 +90,7 @@
IConfigurationElement[] elements = extension.getConfigurationElements();
for(int j=0; j<elements.length; j++) {
String elementName = elements[j].getName();
- if("tag-lib".equals(elementName)) {
+ if("tag-lib".equals(elementName)) { //$NON-NLS-1$
String uri = elements[j].getAttribute("uri"); //$NON-NLS-1$
String location = elements[j].getAttribute("location"); //$NON-NLS-1$
String version = elements[j].getAttribute("version"); //$NON-NLS-1$
@@ -98,7 +98,7 @@
Bundle sourcePlugin = Platform.getBundle(elements[j].getNamespaceIdentifier());
File schemaLocation = null;
try {
- String pluginPath = FileLocator.resolve(sourcePlugin.getEntry("/")).getPath();
+ String pluginPath = FileLocator.resolve(sourcePlugin.getEntry("/")).getPath(); //$NON-NLS-1$
if(uri==null || uri.length()==0 || location==null || location.length()==0) {
WebKbPlugin.getDefault().logWarning("Incorrect org.jboss.tools.jst.web.kb.KbTagLib extension in " + pluginPath + " plugin. URI or location can't be empty."); //$NON-NLS-1$ $NON-NLS-2$
continue;
@@ -114,7 +114,7 @@
} else {
WebKbPlugin.getDefault().logWarning("Can't load KB schema: " + schemaLocation); //$NON-NLS-1$
}
- } else if("component-extension".equals(elementName)) {
+ } else if("component-extension".equals(elementName)) { //$NON-NLS-1$
String location = elements[j].getAttribute("location"); //$NON-NLS-1$
Bundle sourcePlugin = Platform.getBundle(elements[j].getNamespaceIdentifier());
File schemaLocation = null;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Facelets.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Facelets.xml 2009-06-30 18:20:02 UTC (rev 16301)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Facelets.xml 2009-06-30 19:05:04 UTC (rev 16302)
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE tag-lib PUBLIC "-//Red Hat, Inc//DTD Knowledge Base 2.0//EN" "http://anonsvn.jboss.org/repos/jbosstools/trunk/jst/plugins/org.jboss.too...">
<tag-lib defaultPrefix="ui">
- <component name="component" extended="true">
+ <component name="component" extended="false">
<description>The component tag and the composition tag behave exactly
the same, except the component tag will insert a new UIComponent
instance into the tree as the root of all the child
components/fragments it has.</description>
- <attribute extended="true" name="id">
+ <attribute extended="false" name="id">
<description>A unique id may be provided, otherwise Facelets will
automatically assign one under the same logic it uses for all
UIComponents.</description>
</attribute>
- <attribute extended="true" name="binding">
+ <attribute extended="false" name="binding">
<description>This binding attribute is used the same as with any
other UIComponent such that it allows you to reference them as a
property of a JavaBean. If that target property did not have a
@@ -19,15 +19,15 @@
create an instance for you and set it on your JavaBean before
continuing with building the tree.</description>
</attribute>
- <attribute extended="true" name="xmlns">
+ <attribute extended="false" name="xmlns">
<proposal type="taglib" />
</attribute>
- <attribute extended="true" name="xmlns:*">
+ <attribute extended="false" name="xmlns:*">
<proposal type="taglib" />
</attribute>
</component>
- <component name="composition" extended="true">
- <attribute extended="true" name="template">
+ <component name="composition" extended="false">
+ <attribute extended="false" name="template">
<description>The resolvable URI of the template to use. The content
within the composition tag will be used in populating the template
specified.</description>
@@ -35,14 +35,14 @@
<param name="extensions" value="%page%" />
</proposal>
</attribute>
- <attribute extended="true" name="xmlns">
+ <attribute extended="false" name="xmlns">
<proposal type="taglib" />
</attribute>
- <attribute extended="true" name="xmlns:*">
+ <attribute extended="false" name="xmlns:*">
<proposal type="taglib" />
</attribute>
</component>
- <component closeTag="true" name="debug" extended="true">
+ <component closeTag="true" name="debug" extended="false">
<description>The debug tag will capture the component tree and
variables when it is encoded, storing the data for retrieval later.
You may launch the debug window at any time from your browser by
@@ -52,13 +52,13 @@
enabled/disabled across your whole application. If your application
uses multiple windows, you might want to assign different hot keys to
each one.</description>
- <attribute extended="true" name="hotkey">
+ <attribute extended="false" name="hotkey">
<description>The hot key to use in combination with 'CTRL' + 'SHIFT'
to launch the debug window. By default, when the debug tag is used,
you may launch the debug window with 'CTRL' + 'SHIFT' + 'D'. This
value cannot be an EL expression.</description>
</attribute>
- <attribute extended="true" name="rendered">
+ <attribute extended="false" name="rendered">
<description>Creating debug output on every request adds some
overhead, so you can use the UIComponent rendered property to turn
debugging on or off based on some expression.</description>
@@ -68,14 +68,14 @@
</proposal>
</attribute>
</component>
- <component name="decorate" extended="true">
+ <component name="decorate" extended="false">
<description>The decorate tag acts the same as a composition tag, but
it will not trim everything outside of it. This is useful in cases
where you have a list of items in a document, which you would like to
be decorated or framed. The sum of it all is that you can take any
element in the document and decorate it with some external logic as
provided by the template.</description>
- <attribute extended="true" name="template" required="true">
+ <attribute extended="false" name="template" required="true">
<description>The resolvable URI of the template to use. The content
within the decorate tag will be used in populating the template
specified.</description>
@@ -83,22 +83,22 @@
<param name="extensions" value="%page%" />
</proposal>
</attribute>
- <attribute extended="true" name="xmlns">
+ <attribute extended="false" name="xmlns">
<proposal type="taglib" />
</attribute>
- <attribute extended="true" name="xmlns:*">
+ <attribute extended="false" name="xmlns:*">
<proposal type="taglib" />
</attribute>
</component>
- <component name="define" extended="true">
+ <component name="define" extended="false">
<description>The define tag can be used within tags that allow
templating. This includes composition and decorate tags.</description>
- <attribute extended="true" name="name" required="true">
+ <attribute extended="false" name="name" required="true">
<description>The literal name for this definition. This name will
match up with a <ui:insert/> tag in a target template.</description>
</attribute>
</component>
- <component name="fragment" extended="true">
+ <component name="fragment" extended="false">
<description>Just like composition has decorate as a non-trimming
version of the same behavior, component has fragment. This allows you
to logically insert a UIComponent into the tree and possibly bind
@@ -109,12 +109,12 @@
children, you may want more control over the building process that
Facelets does and using a fragment tag will help guarantee
parent/child relationships for you.</description>
- <attribute extended="true" name="id">
+ <attribute extended="false" name="id">
<description>A unique id may be provided, otherwise Facelets will
automatically assign one under the same logic it uses for all
UIComponents.</description>
</attribute>
- <attribute extended="true" name="binding">
+ <attribute extended="false" name="binding">
<description>This binding attribute is used the same as with any
other UIComponent such that it allows you to reference them as a
property of a JavaBean. If that target property did not have a
@@ -122,14 +122,14 @@
create an instance for you and set it on your JavaBean before
continuing with building the tree.</description>
</attribute>
- <attribute extended="true" name="xmlns">
+ <attribute extended="false" name="xmlns">
<proposal type="taglib" />
</attribute>
- <attribute extended="true" name="xmlns:*">
+ <attribute extended="false" name="xmlns:*">
<proposal type="taglib" />
</attribute>
</component>
- <component closeTag="true" name="include" extended="true">
+ <component closeTag="true" name="include" extended="false">
<description>The include tag can point at any Facelet which might use
the composition tag, component tag, or simply be straight XHTML/XML.
It should be noted that the src path does allow relative path names,
@@ -137,7 +137,7 @@
requested. The include tag can be used in conjunction with multiple
<ui:param/> tags to pass EL expressions/values to the target
page.</description>
- <attribute extended="true" name="src" required="true">
+ <attribute extended="false" name="src" required="true">
<description>A literal or EL expression that specifies the target
Facelet that you would like to include into your document.</description>
<proposal type="file">
@@ -145,46 +145,46 @@
</proposal>
</attribute>
</component>
- <component name="insert" extended="true">
+ <component name="insert" extended="false">
<description>The insert tag is used within your templates to declare
spots of replacable data.</description>
- <attribute extended="true" name="name">
+ <attribute extended="false" name="name">
<description>The optional name attribute matches the associated
<ui:define/> tag in this template's client. If no name is
specified, it's expected that the whole template client will be
inserted.</description>
</attribute>
</component>
- <component closeTag="true" name="param" extended="true">
+ <component closeTag="true" name="param" extended="false">
<description />
- <attribute extended="true" name="name" required="true">
+ <attribute extended="false" name="name" required="true">
<description>The name of the variable to pass to the included
Facelet.</description>
</attribute>
- <attribute extended="true" name="value" required="true">
+ <attribute extended="false" name="value" required="true">
<description>The literal or EL expression value to assign to the
named variable.</description>
</attribute>
</component>
- <component name="remove" extended="true">
+ <component name="remove" extended="false">
<description>The remove tag does not have any attributes and is used
to remove chunks of XML content from a Facelet at compilation time.
The remove tag is often used in conjunction with the jsfc feature.</description>
</component>
- <component name="repeat" extended="true">
- <attribute extended="true" name="value" required="true">
+ <component name="repeat" extended="false">
+ <attribute name="value" required="true">
<description>Expression for the list of items</description>
</attribute>
- <attribute extended="true" name="var" required="true">
+ <attribute name="var" required="true">
<description>The name of the variable to put the current item.</description>
</attribute>
- <attribute extended="true" name="offset">
+ <attribute extended="false" name="offset">
<description>The offset index.</description>
</attribute>
- <attribute extended="true" name="size">
+ <attribute extended="false" name="size">
<description>Number of items to produce.</description>
</attribute>
- <attribute extended="true" name="varStatus">
+ <attribute extended="false" name="varStatus">
<description>Index object.</description>
</attribute>
</component>
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r16301 - in trunk/jst/plugins: org.jboss.tools.jst.web.kb/taglibs and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-06-30 14:20:02 -0400 (Tue, 30 Jun 2009)
New Revision: 16301
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfCore.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-06-30 16:47:13 UTC (rev 16300)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-06-30 18:20:02 UTC (rev 16301)
@@ -99,8 +99,8 @@
protected String getMatchString(IStructuredDocumentRegion parent, ITextRegion aRegion, int offset) {
String matchString = super.getMatchString(parent, aRegion, offset);
String regionType = aRegion.getType();
- if(regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE && matchString.equals("\"")) {
- matchString = ""; //$NON-NLS-1$
+ if(regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE && matchString.startsWith("\"")) {
+ matchString = matchString.substring(1); //$NON-NLS-1$
}
return matchString;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml 2009-06-30 16:47:13 UTC (rev 16300)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml 2009-06-30 18:20:02 UTC (rev 16301)
@@ -40,6 +40,12 @@
</attribute>
</customExtension>
+ <component closeTag="true" name="loadBundle">
+ <attribute name="basename">
+ <proposal type="bundleName"/>
+ </attribute>
+ </component>
+
<component name="actionparam">
<attribute name="noEscape">
<proposal type="enumeration">
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfCore.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfCore.xml 2009-06-30 16:47:13 UTC (rev 16300)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfCore.xml 2009-06-30 18:20:02 UTC (rev 16301)
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE tag-lib PUBLIC "-//Red Hat, Inc//DTD Knowledge Base 2.0//EN" "http://anonsvn.jboss.org/repos/jbosstools/trunk/jst/plugins/org.jboss.too...">
<tag-lib defaultPrefix="f">
+
+ <component closeTag="true" name="loadBundle">
+ <attribute name="basename">
+ <proposal type="bundleName"/>
+ </attribute>
+ </component>
+
<component closeTag="true" name="convertDateTime">
<attribute name="dateStyle">
<proposal type="enumeration">
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r16300 - trunk/jst/plugins/org.jboss.tools.jst.css/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2009-06-30 12:47:13 -0400 (Tue, 30 Jun 2009)
New Revision: 16300
Modified:
trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/jira/browse/JBIDE-3445
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF 2009-06-30 16:25:50 UTC (rev 16299)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF 2009-06-30 16:47:13 UTC (rev 16300)
@@ -10,9 +10,7 @@
org.eclipse.core.runtime,
org.jboss.tools.jst.jsp;bundle-version="2.0.0",
org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.0",
- org.eclipse.ui.views.log;bundle-version="1.0.100",
org.eclipse.core.databinding;bundle-version="1.2.0",
- org.eclipse.wst.css.core;bundle-version="1.1.300",
- org.eclipse.core.resources;bundle-version="3.5.0"
+ org.eclipse.wst.css.core;bundle-version="1.1.300"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-LazyStart: true
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r16299 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-06-30 12:25:50 -0400 (Tue, 30 Jun 2009)
New Revision: 16299
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringTest.java
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringAllTests.java
Log:
Tests for Rename Seam Context Variable https://jira.jboss.org/jira/browse/JBIDE-1077
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2009-06-30 15:56:39 UTC (rev 16298)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2009-06-30 16:25:50 UTC (rev 16299)
@@ -3,67 +3,27 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.text.edits.MultiTextEdit;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamProject;
-import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.internal.core.refactoring.RenameComponentProcessor;
import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.ProjectImportTestSetup;
-public class SeamComponentRefactoringTest extends TestCase {
- static String warProjectName = "Test1";
- static String earProjectName = "Test1-ear";
- static String ejbProjectName = "Test1-ejb";
- static IProject warProject;
- static IProject earProject;
- static IProject ejbProject;
- static ISeamProject seamWarProject;
- static ISeamProject seamEjbProject;
+public class SeamComponentRefactoringTest extends SeamRefactoringTest {
+
public SeamComponentRefactoringTest(){
super("Seam Component Refactoring Test");
}
- protected void setUp() throws Exception {
- loadProjects();
- List<IProject> projectList = new ArrayList<IProject>();
- projectList.add(ejbProject);
- projectList.add(warProject);
- J2EEComponentClasspathUpdater.getInstance().forceUpdate(projectList);
- loadProjects();
- }
+
- private void loadProjects() throws Exception {
- earProject = ProjectImportTestSetup.loadProject(earProjectName);
- earProject.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- ejbProject = ProjectImportTestSetup.loadProject(ejbProjectName);
- warProject = ProjectImportTestSetup.loadProject(warProjectName);
- seamEjbProject = loadSeamProject(ejbProject);
- seamWarProject = loadSeamProject(warProject);
- }
-
- private ISeamProject loadSeamProject(IProject project) throws CoreException {
- JobUtils.waitForIdle();
-
- //System.out.println("Project - "+project);
- ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
- assertNotNull("Seam project for " + project.getName() + " is null", seamProject);
-
- return seamProject;
- }
-
public void testSeamComponentRename() throws CoreException {
ArrayList<TestChangeStructure> list = new ArrayList<TestChangeStructure>();
@@ -189,68 +149,7 @@
}
}
- private TestChangeStructure findChange(List<TestChangeStructure> changeList, IFile file){
- for(TestChangeStructure tcs : changeList){
- if(tcs.getFileName().equals("/"+file.getFullPath().removeFirstSegments(1).toString()))
- return tcs;
- }
- return null;
- }
-
- class TestChangeStructure{
- private IProject project;
- private String fileName;
- ArrayList<TestTextChange> textChanges = new ArrayList<TestTextChange>();
-
-
- public TestChangeStructure(IProject project, String fileName){
- this.project = project;
- this.fileName = fileName;
- }
-
- public IProject getProject(){
- return project;
- }
-
- public String getFileName(){
- return fileName;
- }
-
- public ArrayList<TestTextChange> getTextChanges(){
- return textChanges;
- }
-
- public void addTextChange(TestTextChange change){
- textChanges.add(change);
- }
-
- public int size(){
- return textChanges.size();
- }
-
- }
- class TestTextChange{
- private int offset;
- private int length;
- private String text;
-
- public TestTextChange(int offset, int length, String text){
- this.offset = offset;
- this.length = length;
- this.text = text;
- }
-
- public int getOffset(){
- return offset;
- }
- public int getLength(){
- return length;
- }
-
- public String getText(){
- return text;
- }
- }
+
}
\ No newline at end of file
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java 2009-06-30 16:25:50 UTC (rev 16299)
@@ -0,0 +1,140 @@
+package org.jboss.tools.seam.core.test.refactoring;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.ltk.core.refactoring.CompositeChange;
+import org.eclipse.ltk.core.refactoring.TextFileChange;
+import org.eclipse.text.edits.MultiTextEdit;
+import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.seam.core.ISeamComponent;
+import org.jboss.tools.seam.core.ISeamProject;
+import org.jboss.tools.seam.core.test.refactoring.SeamRefactoringTest.TestChangeStructure;
+import org.jboss.tools.seam.core.test.refactoring.SeamRefactoringTest.TestTextChange;
+import org.jboss.tools.seam.internal.core.refactoring.RenameSeamContextVariableProcessor;
+import org.jboss.tools.test.util.JobUtils;
+
+public class SeamContextVariableRefactoringTest extends SeamRefactoringTest {
+ public SeamContextVariableRefactoringTest(){
+ super("Seam Context Variable Refactoring Test");
+ }
+
+ private void renameContextVariable(ISeamProject seamProject, String fileName, String variableName, String newName, List<TestChangeStructure> changeList, boolean fromJar) throws CoreException{
+ JobUtils.waitForIdle(2000);
+
+ // Test before renaming
+ ISeamComponent component = seamProject.getComponent(variableName);
+ assertNotNull("Can't load component " + variableName, component);
+ assertNull("There is unexpected component in seam project: " + newName, seamProject.getComponent(newName));
+ for(TestChangeStructure changeStructure : changeList){
+ IFile file = changeStructure.getProject().getFile(changeStructure.getFileName());
+ String content = null;
+ content = FileUtil.readStream(file.getContents());
+ for(TestTextChange change : changeStructure.getTextChanges()){
+ assertNotSame(change.getText(), content.substring(change.getOffset(), change.getOffset()+change.getLength()));
+ }
+ }
+
+ assertNotNull("Component " + component.getName() + " does not have java declaration.", component.getJavaDeclaration());
+
+ IFile sourceFile = seamProject.getProject().getFile(fileName);
+
+ // Rename Seam Component
+ RenameSeamContextVariableProcessor processor = new RenameSeamContextVariableProcessor(sourceFile, variableName);
+ processor.setNewName(newName);
+ processor.checkInitialConditions(new NullProgressMonitor());
+ processor.checkFinalConditions(new NullProgressMonitor(), null);
+ CompositeChange rootChange = (CompositeChange)processor.createChange(new NullProgressMonitor());
+
+ assertEquals("There is unexpected number of changes",changeList.size(), rootChange.getChildren().length);
+
+ for(int i = 0; i < rootChange.getChildren().length;i++){
+ TextFileChange fileChange = (TextFileChange)rootChange.getChildren()[i];
+
+ MultiTextEdit edit = (MultiTextEdit)fileChange.getEdit();
+
+ TestChangeStructure change = findChange(changeList, fileChange.getFile());
+ if(change != null){
+ assertEquals(change.size(), edit.getChildrenSize());
+ }
+ }
+
+ rootChange.perform(new NullProgressMonitor());
+ JobUtils.waitForIdle(2000);
+
+
+ // Test results
+ if(!fromJar)
+ assertNull("There is unexpected component in seam project: " + variableName, seamProject.getComponent(variableName));
+ assertNotNull("Can't load component " + newName, seamProject.getComponent(newName));
+ for(TestChangeStructure changeStructure : changeList){
+ IFile file = changeStructure.getProject().getFile(changeStructure.getFileName());
+ String content = null;
+ content = FileUtil.readStream(file.getContents());
+ //System.out.println("File - "+file.getName()+" offset - "+changeStructure.getOffset()+" expected - ["+changeStructure.getText()+"] actual - ["+content.substring(changeStructure.getOffset(), changeStructure.getOffset()+changeStructure.getLength())+"]");
+ for(TestTextChange change : changeStructure.getTextChanges()){
+ assertEquals("There is unexpected change in resource - "+file.getName(),change.getText(), content.substring(change.getOffset(), change.getOffset()+change.getLength()));
+ }
+ }
+ }
+
+ public void testSeamContextVariable_Component_Rename() throws CoreException {
+ ArrayList<TestChangeStructure> list = new ArrayList<TestChangeStructure>();
+
+ TestChangeStructure structure = new TestChangeStructure(ejbProject.getProject(), "/ejbModule/org/domain/"+warProjectName+"/session/TestComponent.java");
+ TestTextChange change = new TestTextChange(89, 6, "\"best\"");
+ structure.addTextChange(change);
+ list.add(structure);
+
+ structure = new TestChangeStructure(warProject, "/WebContent/WEB-INF/components.xml");
+ change = new TestTextChange(1106, 4, "best");
+ structure.addTextChange(change);
+
+ change = new TestTextChange(1934, 4, "best");
+ structure.addTextChange(change);
+ list.add(structure);
+
+ structure = new TestChangeStructure(ejbProject, "/ejbModule/org/domain/"+warProjectName+"/session/TestSeamComponent.java");
+ change = new TestTextChange(420, 11, "@In(\"best\")");
+ structure.addTextChange(change);
+
+ change = new TestTextChange(389, 8, "(\"best\")");
+ structure.addTextChange(change);
+
+ change = new TestTextChange(455, 16, "@Factory(\"best\")");
+ structure.addTextChange(change);
+
+ change = new TestTextChange(529, 8, "(\"best\")");
+ structure.addTextChange(change);
+
+ change = new TestTextChange(589, 4, "best");
+ structure.addTextChange(change);
+
+ list.add(structure);
+
+ structure = new TestChangeStructure(ejbProject, "/ejbModule/seam.properties");
+ change = new TestTextChange(0, 4, "best");
+ structure.addTextChange(change);
+ list.add(structure);
+
+ structure = new TestChangeStructure(warProject, "/WebContent/test.xhtml");
+ change = new TestTextChange(1088, 4, "best");
+ structure.addTextChange(change);
+ list.add(structure);
+
+ structure = new TestChangeStructure(warProject, "/WebContent/test.jsp");
+ change = new TestTextChange(227, 4, "best");
+ structure.addTextChange(change);
+ list.add(structure);
+
+ structure = new TestChangeStructure(warProject, "/src/test.properties");
+ change = new TestTextChange(29, 4, "best");
+ structure.addTextChange(change);
+ list.add(structure);
+
+ renameContextVariable(seamEjbProject, "/WebContent/test.jsp", "test", "best", list, false);
+ }
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringAllTests.java 2009-06-30 15:56:39 UTC (rev 16298)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringAllTests.java 2009-06-30 16:25:50 UTC (rev 16299)
@@ -26,10 +26,16 @@
"org.jboss.tools.seam.core.test",
new String[]{"projects/RefactoringTestProject-war", "projects/RefactoringTestProject-ejb", "projects/RefactoringTestProject-test"},
new String[]{"RefactoringTestProject-war", "RefactoringTestProject-ejb", "RefactoringTestProject-test"}));
+
suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamComponentRefactoringTest.class),
"org.jboss.tools.seam.core.test",
new String[]{"projects/Test1-ear","projects/Test1-ejb","projects/Test1"},
new String[]{"Test1-ear","Test1-ejb","Test1"}));
+
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamContextVariableRefactoringTest.class),
+ "org.jboss.tools.seam.core.test",
+ new String[]{"projects/Test1-ear","projects/Test1-ejb","projects/Test1"},
+ new String[]{"Test1-ear","Test1-ejb","Test1"}));
return suite;
}
}
\ No newline at end of file
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringTest.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringTest.java 2009-06-30 16:25:50 UTC (rev 16299)
@@ -0,0 +1,124 @@
+package org.jboss.tools.seam.core.test.refactoring;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
+import org.jboss.tools.seam.core.ISeamProject;
+import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
+import junit.framework.TestCase;
+
+public class SeamRefactoringTest extends TestCase {
+ static String warProjectName = "Test1";
+ static String earProjectName = "Test1-ear";
+ static String ejbProjectName = "Test1-ejb";
+ static IProject warProject;
+ static IProject earProject;
+ static IProject ejbProject;
+ static ISeamProject seamWarProject;
+ static ISeamProject seamEjbProject;
+ public SeamRefactoringTest(String name){
+ super(name);
+ }
+
+ protected void setUp() throws Exception {
+ loadProjects();
+ List<IProject> projectList = new ArrayList<IProject>();
+ projectList.add(ejbProject);
+ projectList.add(warProject);
+ J2EEComponentClasspathUpdater.getInstance().forceUpdate(projectList);
+ loadProjects();
+ }
+
+ private void loadProjects() throws Exception {
+ earProject = ProjectImportTestSetup.loadProject(earProjectName);
+ earProject.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ ejbProject = ProjectImportTestSetup.loadProject(ejbProjectName);
+ warProject = ProjectImportTestSetup.loadProject(warProjectName);
+ seamEjbProject = loadSeamProject(ejbProject);
+ seamWarProject = loadSeamProject(warProject);
+ }
+
+ private ISeamProject loadSeamProject(IProject project) throws CoreException {
+ JobUtils.waitForIdle();
+
+ //System.out.println("Project - "+project);
+ ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
+ assertNotNull("Seam project for " + project.getName() + " is null", seamProject);
+
+ return seamProject;
+ }
+
+ protected TestChangeStructure findChange(List<TestChangeStructure> changeList, IFile file){
+ for(TestChangeStructure tcs : changeList){
+ if(tcs.getFileName().equals("/"+file.getFullPath().removeFirstSegments(1).toString()))
+ return tcs;
+ }
+ return null;
+ }
+
+ class TestChangeStructure{
+ private IProject project;
+ private String fileName;
+ ArrayList<TestTextChange> textChanges = new ArrayList<TestTextChange>();
+
+
+ public TestChangeStructure(IProject project, String fileName){
+ this.project = project;
+ this.fileName = fileName;
+ }
+
+ public IProject getProject(){
+ return project;
+ }
+
+ public String getFileName(){
+ return fileName;
+ }
+
+ public ArrayList<TestTextChange> getTextChanges(){
+ return textChanges;
+ }
+
+ public void addTextChange(TestTextChange change){
+ textChanges.add(change);
+ }
+
+ public int size(){
+ return textChanges.size();
+ }
+
+ }
+
+ class TestTextChange{
+ private int offset;
+ private int length;
+ private String text;
+
+ public TestTextChange(int offset, int length, String text){
+ this.offset = offset;
+ this.length = length;
+ this.text = text;
+ }
+
+ public int getOffset(){
+ return offset;
+ }
+
+ public int getLength(){
+ return length;
+ }
+
+ public String getText(){
+ return text;
+ }
+ }
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r16298 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-06-30 11:56:39 -0400 (Tue, 30 Jun 2009)
New Revision: 16298
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-06-30 15:34:05 UTC (rev 16297)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-06-30 15:56:39 UTC (rev 16298)
@@ -470,8 +470,8 @@
}
// Store all the parents
- while (n != null) {
- String tagName = n.getNodeName();
+ while (n != null && n instanceof Element) {
+ String tagName = getTagName(n);
parentTags.add(0, tagName);
n = n.getParentNode();
}
@@ -483,7 +483,11 @@
}
}
}
-
+
+ protected String getTagName(Node tag) {
+ return tag.getNodeName();
+ }
+
/**
* Returns name of the parent attribute/tag name
*
@@ -524,8 +528,8 @@
}
if (n == null)
return null;
-
- String parentTagName = n.getNodeName();
+
+ String parentTagName = getTagName(n);
return parentTagName;
} finally {
if (sModel != null) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2009-06-30 15:34:05 UTC (rev 16297)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2009-06-30 15:56:39 UTC (rev 16298)
@@ -43,8 +43,12 @@
*
*/
public class FaceletPageContectAssistProcessor extends JspContentAssistProcessor {
- private static final String UI_URI_JSF_FACELETS = "http://java.sun.com/jsf/facelets";
- private static final String UI_URI_XHTML_FACELETS = "http://www.w3.org/1999/xhtml/facelets";
+ private static final String UI_URI_JSF_FACELETS = "http://java.sun.com/jsf/facelets"; //$NON-NLS-1$
+ private static final String UI_URI_XHTML_FACELETS = "http://www.w3.org/1999/xhtml/facelets"; //$NON-NLS-1$
+ private static final String JSFC_ATTRIBUTE_NAME = "jsfc"; //$NON-NLS-1$
+
+ private boolean replaceJsfcTags;
+
/*
* (non-Javadoc)
* @see org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor#createContext()
@@ -52,8 +56,7 @@
@Override
protected IPageContext createContext() {
IPageContext superContext = super.createContext();
-
-
+
FaceletPageContextImpl context = new FaceletPageContextImpl();
context.setResource(superContext.getResource());
context.setElResolvers(superContext.getElResolvers());
@@ -63,7 +66,7 @@
context.setDocument(getDocument());
setNameSpaces(superContext, context);
context.setLibraries(getTagLibraries(context));
-
+
// IFaceletPageContext getParentContext();
// Map<String, String> getParams();
@@ -81,7 +84,7 @@
context.addNameSpace(region, nameSpaces.get(prefix));
}
}
-
+
try {
if (sModel == null)
return;
@@ -161,70 +164,115 @@
}
}
}
-
-
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor#getContext()
+ */
@Override
protected IFaceletPageContext getContext() {
return (IFaceletPageContext)super.getContext();
}
-
-
/**
* Calculates and adds the EL proposals to the Content Assist Request object
*/
@Override
protected void addTextELProposals(ContentAssistRequest contentAssistRequest) {
- // TODO Auto-generated method stub
- System.out.println("FaceletPageContectAssistProcessor: addTextELProposals() invoked");
- try {
- TextRegion prefix = getELPrefix();
- if (prefix == null || !prefix.isELStarted()) {
- CustomCompletionProposal proposal = new CustomCompletionProposal("#{}", contentAssistRequest.getReplacementBeginPosition(),
- 0, 2, null, "#{}", null, "New EL Expression", 10000);
- contentAssistRequest.addProposal(proposal);
- return;
+ TextRegion prefix = getELPrefix();
+ if (prefix == null || !prefix.isELStarted()) {
+ CustomCompletionProposal proposal = new CustomCompletionProposal("#{}", contentAssistRequest.getReplacementBeginPosition(),
+ 0, 2, null, "#{}", null, "New EL Expression", 10000);
+ contentAssistRequest.addProposal(proposal);
+ return;
+ }
+ String matchString = "#{" + prefix.getText();
+ String query = matchString;
+ if (query == null)
+ query = "";
+ String stringQuery = matchString;
+
+ int beginChangeOffset = prefix.getStartOffset() + prefix.getOffset();
+
+ KbQuery kbQuery = createKbQuery(Type.TEXT, query, stringQuery);
+ TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, getContext());
+
+ for (int i = 0; proposals != null && i < proposals.length; i++) {
+ TextProposal textProposal = proposals[i];
+
+ int replacementOffset = beginChangeOffset;
+ int replacementLength = prefix.getLength();
+ String replacementString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString();
+ int cursorPosition = replacementString.length();
+ Image image = textProposal.getImage();
+
+ String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString();
+ IContextInformation contextInformation = null;
+ String additionalProposalInfo = textProposal.getContextInfo();
+ int relevance = textProposal.getRelevance() + 10000;
+
+ CustomCompletionProposal proposal = new CustomCompletionProposal(replacementString, replacementOffset, replacementLength, cursorPosition, image, displayString, contextInformation, additionalProposalInfo, relevance);
+ contentAssistRequest.addProposal(proposal);
+ }
+
+ if (prefix.isELStarted() && !prefix.isELClosed()) {
+ CustomCompletionProposal proposal = new CustomCompletionProposal("}", getOffset(),
+ 0, 1, null, "}", null, "Close EL Expression", 10001);
+ contentAssistRequest.addProposal(proposal);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor#addAttributeNameProposals(org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest)
+ */
+ @Override
+ protected void addAttributeNameProposals(
+ ContentAssistRequest contentAssistRequest) {
+ super.addAttributeNameProposals(contentAssistRequest);
+ this.replaceJsfcTags = true;
+ super.addAttributeNameProposals(contentAssistRequest);
+ this.replaceJsfcTags = false;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor#addAttributeValueProposals(org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest)
+ */
+ @Override
+ protected void addAttributeValueProposals(ContentAssistRequest contentAssistRequest) {
+ super.addAttributeValueProposals(contentAssistRequest);
+ this.replaceJsfcTags = true;
+ super.addAttributeValueProposals(contentAssistRequest);
+ this.replaceJsfcTags = false;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.jsp.contentassist.AbstractXMLContentAssistProcessor#getTagName(org.w3c.dom.Node)
+ */
+ @Override
+ protected String getTagName(Node tag) {
+ String tagName = tag.getNodeName();
+ if(replaceJsfcTags) {
+ Element element = (Element)tag;
+
+ // Only HTML tags
+ if(tagName.indexOf(':')>0) {
+ return tagName;
}
- String matchString = "#{" + prefix.getText();
- String query = matchString;
- if (query == null)
- query = "";
- String stringQuery = matchString;
-
- int beginChangeOffset = prefix.getStartOffset() + prefix.getOffset();
-
- KbQuery kbQuery = createKbQuery(Type.TEXT, query, stringQuery);
- TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, getContext());
-
- for (int i = 0; proposals != null && i < proposals.length; i++) {
- TextProposal textProposal = proposals[i];
-
- System.out.println("Tag Text EL proposal [" + (i + 1) + "/" + proposals.length + "]: " + textProposal.getReplacementString());
-
- int replacementOffset = beginChangeOffset;
- int replacementLength = prefix.getLength();
- String replacementString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString();
- int cursorPosition = replacementString.length();
- Image image = textProposal.getImage();
-
- String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString();
- IContextInformation contextInformation = null;
- String additionalProposalInfo = textProposal.getContextInfo();
- int relevance = textProposal.getRelevance() + 10000;
-
- CustomCompletionProposal proposal = new CustomCompletionProposal(replacementString, replacementOffset, replacementLength, cursorPosition, image, displayString, contextInformation, additionalProposalInfo, relevance);
- contentAssistRequest.addProposal(proposal);
+ NamedNodeMap attributes = element.getAttributes();
+ Node jsfC = attributes.getNamedItem(JSFC_ATTRIBUTE_NAME);
+ if(jsfC==null || (!(jsfC instanceof Attr))) {
+ return tagName;
}
-
- if (prefix.isELStarted() && !prefix.isELClosed()) {
- CustomCompletionProposal proposal = new CustomCompletionProposal("}", getOffset(),
- 0, 1, null, "}", null, "Close EL Expression", 10001);
- contentAssistRequest.addProposal(proposal);
+ Attr jsfCAttribute = (Attr)jsfC;
+ String jsfTagName = jsfCAttribute.getValue();
+ if(jsfTagName==null || jsfTagName.indexOf(':')<1) {
+ return tagName;
}
- } finally {
- System.out.println("FaceletPageContectAssistProcessor: addTextELProposals() exited");
+ tagName = jsfTagName;
}
+ return tagName;
}
-
-}
+}
\ No newline at end of file
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r16297 - in trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css: properties and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2009-06-30 11:34:05 -0400 (Tue, 30 Jun 2009)
New Revision: 16297
Modified:
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/messages/CSSUIMessages.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/messages/messages.properties
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/AbstractCssSection.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/BackgroundSection.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/BoxesSection.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/PropertiesSection.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/QuickEditSection.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/TextSection.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSPreview.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3445
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/messages/CSSUIMessages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/messages/CSSUIMessages.java 2009-06-30 14:11:39 UTC (rev 16296)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/messages/CSSUIMessages.java 2009-06-30 15:34:05 UTC (rev 16297)
@@ -4,7 +4,7 @@
public class CSSUIMessages extends NLS {
private static final String BUNDLE_NAME = "org.jboss.tools.jst.css.messages.messages"; //$NON-NLS-1$
- public static String CSSViewDefaultPreviewText;
+ public static String CSSPreview_DefaultBrowserText;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, CSSUIMessages.class);
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/messages/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/messages/messages.properties 2009-06-30 14:11:39 UTC (rev 16296)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/messages/messages.properties 2009-06-30 15:34:05 UTC (rev 16297)
@@ -1 +1 @@
-CSSViewDefaultPreviewText=Double click to edit preview. To save changes press Enter button.
+CSSPreview_DefaultBrowserText=Double click to edit preview. To save changes press Enter button.
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/AbstractCssSection.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/AbstractCssSection.java 2009-06-30 14:11:39 UTC (rev 16296)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/AbstractCssSection.java 2009-06-30 15:34:05 UTC (rev 16297)
@@ -11,20 +11,12 @@
package org.jboss.tools.jst.css.properties;
-import java.util.HashMap;
-import java.util.Map;
-
import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
import org.jboss.tools.jst.jsp.outline.cssdialog.common.StyleAttributes;
-import org.w3c.dom.css.CSSStyleDeclaration;
+import org.jboss.tools.jst.jsp.outline.cssdialog.tabs.BaseTabControl;
/**
* @author Sergey Dzmitrovich
@@ -33,6 +25,7 @@
public abstract class AbstractCssSection extends AbstractPropertySection {
private DataBindingContext bindingContext;
private StyleAttributes styleAttributes;
+ protected BaseTabControl control;
@Override
public void createControls(Composite parent,
@@ -44,10 +37,10 @@
styleAttributes = ((CSSPropertyPage) aTabbedPropertySheetPage)
.getStyleAttributes();
}
- createTabControl(parent);
+ control = createTabControl(parent);
}
- abstract public void createTabControl(Composite parent);
+ abstract public BaseTabControl createTabControl(Composite parent);
public DataBindingContext getBindingContext() {
return bindingContext;
@@ -57,9 +50,7 @@
return styleAttributes;
}
- @Override
- public void setInput(IWorkbenchPart part, ISelection selection) {
- super.setInput(part, selection);
-
+ public BaseTabControl getTabControl() {
+ return control;
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/BackgroundSection.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/BackgroundSection.java 2009-06-30 14:11:39 UTC (rev 16296)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/BackgroundSection.java 2009-06-30 15:34:05 UTC (rev 16297)
@@ -12,6 +12,7 @@
package org.jboss.tools.jst.css.properties;
import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.jst.jsp.outline.cssdialog.tabs.BaseTabControl;
import org.jboss.tools.jst.jsp.outline.cssdialog.tabs.TabBackgroundControl;
/**
@@ -21,8 +22,8 @@
public class BackgroundSection extends AbstractCssSection {
@Override
- public void createTabControl(Composite parent) {
- new TabBackgroundControl(parent, getStyleAttributes(),
+ public BaseTabControl createTabControl(Composite parent) {
+ return new TabBackgroundControl(parent, getStyleAttributes(),
getBindingContext());
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/BoxesSection.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/BoxesSection.java 2009-06-30 14:11:39 UTC (rev 16296)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/BoxesSection.java 2009-06-30 15:34:05 UTC (rev 16297)
@@ -12,6 +12,7 @@
package org.jboss.tools.jst.css.properties;
import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.jst.jsp.outline.cssdialog.tabs.BaseTabControl;
import org.jboss.tools.jst.jsp.outline.cssdialog.tabs.TabBoxesControl;
/**
@@ -21,9 +22,9 @@
public class BoxesSection extends AbstractCssSection {
@Override
- public void createTabControl(Composite parent) {
+ public BaseTabControl createTabControl(Composite parent) {
- new TabBoxesControl(parent, getStyleAttributes(),
+ return new TabBoxesControl(parent, getStyleAttributes(),
getBindingContext());
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java 2009-06-30 14:11:39 UTC (rev 16296)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java 2009-06-30 15:34:05 UTC (rev 16297)
@@ -89,21 +89,19 @@
.getFirstElement());
if (styleRule != null) {
- // if (styleRule != selectedObject) {
((IObservable) styleAttributes.getAttributeMap())
.removeChangeListener(this);
updateStyleAttributes(styleRule);
((IObservable) styleAttributes.getAttributeMap())
.addChangeListener(this);
- // }
newSelectedObject = styleRule;
}
}
- // if (newSelectedObject != selectedObject) {
- super.selectionChanged(part, selection);
+
+ if (selectedObject != newSelectedObject)
+ super.selectionChanged(part, selection);
selectedObject = newSelectedObject;
- // }
}
@@ -141,11 +139,13 @@
}
}
- StructuredSelection selection = new StructuredSelection(
- new Object[] { selectedObject });
+ notifySelectionChanged(new StructuredSelection(selectedObject));
+
+ }
+
+ protected void notifySelectionChanged(StructuredSelection selection) {
part.postSelectionChanged(new SelectionChangedEvent(part
.getSelectionProvider(), selection));
-
}
/**
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/PropertiesSection.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/PropertiesSection.java 2009-06-30 14:11:39 UTC (rev 16296)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/PropertiesSection.java 2009-06-30 15:34:05 UTC (rev 16297)
@@ -12,6 +12,7 @@
package org.jboss.tools.jst.css.properties;
import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.jst.jsp.outline.cssdialog.tabs.BaseTabControl;
import org.jboss.tools.jst.jsp.outline.cssdialog.tabs.TabPropertySheetControl;
/**
@@ -21,9 +22,9 @@
public class PropertiesSection extends AbstractCssSection {
@Override
- public void createTabControl(Composite parent) {
+ public BaseTabControl createTabControl(Composite parent) {
- new TabPropertySheetControl(parent, getStyleAttributes(),
+ return new TabPropertySheetControl(parent, getStyleAttributes(),
getBindingContext());
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/QuickEditSection.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/QuickEditSection.java 2009-06-30 14:11:39 UTC (rev 16296)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/QuickEditSection.java 2009-06-30 15:34:05 UTC (rev 16297)
@@ -11,7 +11,10 @@
package org.jboss.tools.jst.css.properties;
+import org.eclipse.jface.viewers.ISelection;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IWorkbenchPart;
+import org.jboss.tools.jst.jsp.outline.cssdialog.tabs.BaseTabControl;
import org.jboss.tools.jst.jsp.outline.cssdialog.tabs.TabQuickEditControl;
/**
@@ -21,9 +24,21 @@
public class QuickEditSection extends AbstractCssSection {
@Override
- public void createTabControl(Composite parent) {
- new TabQuickEditControl(parent, getStyleAttributes(),
+ public BaseTabControl createTabControl(Composite parent) {
+ return new TabQuickEditControl(parent, getStyleAttributes(),
getBindingContext());
}
+ @Override
+ public void setInput(IWorkbenchPart part, ISelection selection) {
+ getTabControl().update();
+ // TODO find better way
+ getTabControl().getParent().getParent().layout(true);
+ super.setInput(part, selection);
+ }
+
+ @Override
+ public void aboutToBeShown() {
+ super.aboutToBeShown();
+ }
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/TextSection.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/TextSection.java 2009-06-30 14:11:39 UTC (rev 16296)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/TextSection.java 2009-06-30 15:34:05 UTC (rev 16297)
@@ -12,6 +12,7 @@
package org.jboss.tools.jst.css.properties;
import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.jst.jsp.outline.cssdialog.tabs.BaseTabControl;
import org.jboss.tools.jst.jsp.outline.cssdialog.tabs.TabTextControl;
/**
@@ -21,8 +22,8 @@
public class TextSection extends AbstractCssSection {
@Override
- public void createTabControl(Composite parent) {
- new TabTextControl(parent, getStyleAttributes(),
+ public BaseTabControl createTabControl(Composite parent) {
+ return new TabTextControl(parent, getStyleAttributes(),
getBindingContext());
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java 2009-06-30 14:11:39 UTC (rev 16296)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java 2009-06-30 15:34:05 UTC (rev 16297)
@@ -47,13 +47,11 @@
return new PageRec(part, page);
}
- // Use the default page
return null;
}
@Override
public SelectionProvider getSelectionProvider() {
- // TODO Auto-generated method stub
return super.getSelectionProvider();
}
public void postSelectionChanged(SelectionChangedEvent event){
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSPreview.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSPreview.java 2009-06-30 14:11:39 UTC (rev 16296)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSPreview.java 2009-06-30 15:34:05 UTC (rev 16297)
@@ -14,7 +14,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.SWT;
@@ -48,12 +47,12 @@
private Text previewText;
- private String previewContent = CSSUIMessages.CSSViewDefaultPreviewText;
+ private String previewContent = CSSUIMessages.CSSPreview_DefaultBrowserText;
private Map<String, String> styleAttributes = new HashMap<String, String>();
-// private String location;
-// private String selectorName;
+ // private String location;
+ // private String selectorName;
@Override
public void init(IViewSite site) throws PartInitException {
@@ -105,7 +104,7 @@
if (e.widget == previewText) {
String text = previewText.getText();
if (text == null || text.equals(Constants.EMPTY)) {
- setPreviewContent(CSSUIMessages.CSSViewDefaultPreviewText);
+ setPreviewContent(CSSUIMessages.CSSPreview_DefaultBrowserText);
} else {
setPreviewContent(text);
}
@@ -137,24 +136,16 @@
*/
public String generateBrowserPage() {
- StringBuffer html = new StringBuffer(Constants.OPEN_DIV_TAG);
-
- for (Map.Entry<String, String> styleItem :
- styleAttributes.entrySet()) {
-
- html.append(styleItem.getKey() + Constants.COLON
- + styleItem.getValue() + Constants.SEMICOLON);
- }
-
- html.append("\">" + getPreviewContent() + Constants.CLOSE_DIV_TAG); //$NON-NLS-1$
+ StringBuffer html = new StringBuffer(Constants.OPEN_DIV_TAG);
-// String html = "<html><head><link type=\"text/css\" rel=\"stylesheet\" href=\""
-// + location
-// + "\" /></head><body > <span class=\""
-// + selectorName
-// + "\" >"
-// + getPreviewContent() + "</span></body></html>";
+ for (Map.Entry<String, String> styleItem : styleAttributes.entrySet()) {
+ html.append(styleItem.getKey() + Constants.COLON
+ + styleItem.getValue() + Constants.SEMICOLON);
+ }
+
+ html.append("\">" + getPreviewContent() + Constants.CLOSE_DIV_TAG); //$NON-NLS-1$
+
return html.toString();
}
@@ -177,23 +168,16 @@
.getFirstElement());
if (styleRule != null) {
-// selectorName = styleRule.getSelectorText();
-// location = ResourcesPlugin.getWorkspace().getRoot()
-// .getLocation().toString()
-// + styleRule.getParentStyleSheet().getHref();
styleAttributes = CSSViewUtil.getStyleAttributes(styleRule);
} else {
-// selectorName = null;
-// location = null;
styleAttributes.clear();
}
- updateBrowser();
-
}
-
+ updateBrowser();
}
+
}
public void updateBrowser() {
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r16296 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-06-30 10:11:39 -0400 (Tue, 30 Jun 2009)
New Revision: 16296
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2009-06-30 13:24:56 UTC (rev 16295)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2009-06-30 14:11:39 UTC (rev 16296)
@@ -483,44 +483,34 @@
* Calculates and adds the attribute value proposals to the Content Assist Request object
*/
protected void addAttributeValueProposals(ContentAssistRequest contentAssistRequest) {
-
// Need to check if an EL Expression is opened here.
// If it is true we don't need to start any new tag proposals
TextRegion prefix = getELPrefix();
if (prefix != null && prefix.isELStarted()) {
return;
}
-
- System.out.println("JspContentAssistProcessor: addAttributeValueProposals() invoked");
try {
String matchString = contentAssistRequest.getMatchString();
String query = matchString;
if (query == null)
query = "";
String stringQuery = matchString;
-
+
KbQuery kbQuery = createKbQuery(Type.ATTRIBUTE_VALUE, query, stringQuery);
TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, getContext());
-
+
for (int i = 0; proposals != null && i < proposals.length; i++) {
TextProposal textProposal = proposals[i];
-
- System.out.println("Tag Attribute Value proposal [" + (i + 1) + "/" + proposals.length + "]: " + textProposal.getReplacementString());
-
- if (isExistingAttribute(textProposal.getLabel()))
- continue;
-
- String replacementString = textProposal.getReplacementString() + "=\"\"";
-
int replacementOffset = contentAssistRequest.getReplacementBeginPosition();
int replacementLength = contentAssistRequest.getReplacementLength();
+ String replacementString = "\"" + textProposal.getReplacementString() + "\"";
int cursorPosition = getCursorPositionForProposedText(replacementString);
Image image = textProposal.getImage();
String displayString = textProposal.getLabel();
IContextInformation contextInformation = null;
String additionalProposalInfo = textProposal.getContextInfo();
int relevance = textProposal.getRelevance() + 10000;
-
+
CustomCompletionProposal proposal = new CustomCompletionProposal(replacementString, replacementOffset, replacementLength, cursorPosition, image, displayString, contextInformation, additionalProposalInfo, relevance);
contentAssistRequest.addProposal(proposal);
}
@@ -534,13 +524,6 @@
*/
@Override
protected void addTextELProposals(ContentAssistRequest contentAssistRequest) {
- // TODO Auto-generated method stub
- System.out.println("JspContentAssistProcessor: addTextELProposals() invoked");
- try {
- System.out.println("JspContentAssistProcessor: No EL allowed in TEXT");
- } finally {
- System.out.println("JspContentAssistProcessor: addTextELProposals() exited");
- }
}
/**
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r16295 - in workspace/yzhishko: org.jboss.tools.jsf.ui.bot.test/META-INF and 17 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2009-06-30 09:24:56 -0400 (Tue, 30 Jun 2009)
New Revision: 16295
Modified:
workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/.project
workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF
workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/Activator.java
workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/CSSDialogJBIDETests.java
workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java
workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java
workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java
workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java
workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3890Test.java
workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java
workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.project
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/META-INF/MANIFEST.MF
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/Activator.java
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/SeamTestLauncher.java
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateActions.java
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateConversations.java
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateEntities.java
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateForms.java
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateProjectWizard.java
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamRuntimes.java
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateServerRuntimes.java
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/DeleteSeamProjects.java
workspace/yzhishko/org.jboss.tools.ui.bot.test/.project
workspace/yzhishko/org.jboss.tools.ui.bot.test/META-INF/MANIFEST.MF
workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/Activator.java
workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/SWTBotMultiPageEditor.java
workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/SWTJBTBot.java
workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/WidgetVariables.java
workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/.project
workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/META-INF/MANIFEST.MF
workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/plugin.xml
workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/Activator.java
workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/JBossRuntimeStartup.java
workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/Messages.java
workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/preferences/JBossRuntimePreferencesInitializer.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/.project
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/META-INF/MANIFEST.MF
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/Activator.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/ComparisonException.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestUtil.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE3197Test.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java
Log:
Plug-ins were renamed
Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/.project
===================================================================
--- workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/.project 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/.project 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.jsf.ui.auto.test</name>
+ <name>org.jboss.tools.jsf.ui.bot.test</name>
<comment></comment>
<projects>
</projects>
Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Auto
-Bundle-SymbolicName: org.jboss.tools.jsf.ui.auto.test
+Bundle-SymbolicName: org.jboss.tools.jsf.ui.bot.test
Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.jboss.tools.jsf.ui.auto.test.Activator
+Bundle-Activator: org.jboss.tools.jsf.ui.bot.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0",
@@ -16,6 +16,6 @@
org.apache.log4j;bundle-version="1.2.13"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.jboss.tools.ui.auto.test,
- org.jboss.tools.vpe.ui.auto.test
-Export-Package: org.jboss.tools.jsf.ui.auto.test
+Import-Package: org.jboss.tools.ui.bot.test,
+ org.jboss.tools.vpe.ui.bot.test
+Export-Package: org.jboss.tools.jsf.ui.bot.test
Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/Activator.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/Activator.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/Activator.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,4 +1,4 @@
-package org.jboss.tools.jsf.ui.auto.test;
+package org.jboss.tools.jsf.ui.bot.test;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -9,7 +9,7 @@
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.jsf.ui.auto.test";
+ public static final String PLUGIN_ID = "org.jboss.tools.jsf.ui.bot.test";
// The shared instance
private static Activator plugin;
Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/CSSDialogJBIDETests.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/CSSDialogJBIDETests.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/CSSDialogJBIDETests.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,12 +1,12 @@
-package org.jboss.tools.jsf.ui.auto.test;
+package org.jboss.tools.jsf.ui.bot.test;
import org.eclipse.swtbot.swt.finder.SWTBotTestCase;
-import org.jboss.tools.jsf.ui.auto.test.cssdialog.jbide.JBIDE3148and4441Test;
-import org.jboss.tools.jsf.ui.auto.test.cssdialog.jbide.JBIDE3577Test;
-import org.jboss.tools.jsf.ui.auto.test.cssdialog.jbide.JBIDE3579Test;
-import org.jboss.tools.jsf.ui.auto.test.cssdialog.jbide.JBIDE3890Test;
-import org.jboss.tools.jsf.ui.auto.test.cssdialog.jbide.JBIDE3920Test;
-import org.jboss.tools.jsf.ui.auto.test.cssdialog.jbide.JBIDE4391Test;
+import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3148and4441Test;
+import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3577Test;
+import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3579Test;
+import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3890Test;
+import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3920Test;
+import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE4391Test;
import junit.extensions.TestSetup;
import junit.framework.Test;
@@ -27,6 +27,7 @@
suite.addTestSuite(JBIDE3577Test.class);
suite.addTestSuite(JBIDE3579Test.class);
suite.addTestSuite(JBIDE3920Test.class);
+ suite.addTestSuite(JBIDE3890Test.class);
return new TestSetup(suite);
}
}
\ No newline at end of file
Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,9 +1,9 @@
-package org.jboss.tools.jsf.ui.auto.test;
+package org.jboss.tools.jsf.ui.bot.test;
import java.io.IOException;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
-import org.jboss.tools.vpe.ui.auto.test.VPEAutoTestCase;
+import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
public class JSFAutoTestCase extends VPEAutoTestCase{
Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,11 +1,11 @@
-package org.jboss.tools.jsf.ui.auto.test.cssdialog.jbide;
+package org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.jboss.tools.jsf.ui.auto.test.JSFAutoTestCase;
-import org.jboss.tools.ui.auto.test.WidgetVariables;
+import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
public class JBIDE3148and4441Test extends JSFAutoTestCase{
Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,11 +1,11 @@
-package org.jboss.tools.jsf.ui.auto.test.cssdialog.jbide;
+package org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.jboss.tools.jsf.ui.auto.test.JSFAutoTestCase;
-import org.jboss.tools.ui.auto.test.WidgetVariables;
+import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
public class JBIDE3577Test extends JSFAutoTestCase{
Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,11 +1,11 @@
-package org.jboss.tools.jsf.ui.auto.test.cssdialog.jbide;
+package org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.jboss.tools.jsf.ui.auto.test.JSFAutoTestCase;
-import org.jboss.tools.ui.auto.test.WidgetVariables;
+import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
public class JBIDE3579Test extends JSFAutoTestCase{
Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3890Test.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3890Test.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3890Test.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,11 +1,11 @@
-package org.jboss.tools.jsf.ui.auto.test.cssdialog.jbide;
+package org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.jboss.tools.jsf.ui.auto.test.JSFAutoTestCase;
-import org.jboss.tools.ui.auto.test.SWTBotMultiPageEditor;
-import org.jboss.tools.ui.auto.test.WidgetVariables;
+import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
+import org.jboss.tools.ui.bot.test.SWTBotMultiPageEditor;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
public class JBIDE3890Test extends JSFAutoTestCase{
Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,11 +1,11 @@
-package org.jboss.tools.jsf.ui.auto.test.cssdialog.jbide;
+package org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.jboss.tools.jsf.ui.auto.test.JSFAutoTestCase;
-import org.jboss.tools.ui.auto.test.WidgetVariables;
+import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
public class JBIDE3920Test extends JSFAutoTestCase{
Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,11 +1,11 @@
-package org.jboss.tools.jsf.ui.auto.test.cssdialog.jbide;
+package org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.jboss.tools.jsf.ui.auto.test.JSFAutoTestCase;
-import org.jboss.tools.ui.auto.test.WidgetVariables;
+import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
public class JBIDE4391Test extends JSFAutoTestCase{
Modified: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.project
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.project 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.project 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.seam.ui.auto.test</name>
+ <name>org.jboss.tools.seam.ui.bot.test</name>
<comment></comment>
<projects>
</projects>
Modified: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/META-INF/MANIFEST.MF 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/META-INF/MANIFEST.MF 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,12 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: SWTBotTests
-Bundle-SymbolicName: org.jboss.tools.seam.ui.auto.test
+Bundle-SymbolicName: org.jboss.tools.seam.ui.bot.test
Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.jboss.tools.seam.ui.auto.test.Activator
+Bundle-Activator: org.jboss.tools.seam.ui.bot.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.jboss.tools.ui.auto.test;bundle-version="1.0.0",
+ org.jboss.tools.ui.bot.test;bundle-version="1.0.0",
org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0",
org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0",
org.eclipse.swtbot.eclipse.spy;bundle-version="2.0.0",
Modified: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/Activator.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/Activator.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/Activator.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,4 +1,4 @@
-package org.jboss.tools.seam.ui.auto.test;
+package org.jboss.tools.seam.ui.bot.test;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -9,7 +9,7 @@
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.seam.ui.auto.test";
+ public static final String PLUGIN_ID = "org.jboss.tools.seam.ui.bot.test";
// The shared instance
private static Activator plugin;
Modified: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/SeamTestLauncher.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/SeamTestLauncher.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/SeamTestLauncher.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,13 +1,13 @@
-package org.jboss.tools.seam.ui.auto.test;
+package org.jboss.tools.seam.ui.bot.test;
import org.eclipse.swtbot.swt.finder.SWTBotTestCase;
-import org.jboss.tools.seam.ui.auto.test.create.CreateSeamRuntimes;
-import org.jboss.tools.seam.ui.auto.test.create.CreateSeamProjects;
-import org.jboss.tools.seam.ui.auto.test.create.CreateForms;
-import org.jboss.tools.seam.ui.auto.test.create.CreateActions;
-import org.jboss.tools.seam.ui.auto.test.create.CreateConversations;
-import org.jboss.tools.seam.ui.auto.test.create.CreateEntities;
-import org.jboss.tools.seam.ui.auto.test.create.DeleteSeamProjects;
+import org.jboss.tools.seam.ui.bot.test.create.CreateSeamRuntimes;
+import org.jboss.tools.seam.ui.bot.test.create.CreateSeamProjects;
+import org.jboss.tools.seam.ui.bot.test.create.CreateForms;
+import org.jboss.tools.seam.ui.bot.test.create.CreateActions;
+import org.jboss.tools.seam.ui.bot.test.create.CreateConversations;
+import org.jboss.tools.seam.ui.bot.test.create.CreateEntities;
+import org.jboss.tools.seam.ui.bot.test.create.DeleteSeamProjects;
import junit.extensions.TestSetup;
import junit.framework.Test;
Modified: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,4 +1,4 @@
-package org.jboss.tools.seam.ui.auto.test;
+package org.jboss.tools.seam.ui.bot.test;
import java.io.IOException;
import java.io.InputStream;
@@ -7,8 +7,8 @@
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.jboss.tools.ui.auto.test.JBTSWTBotTestCase;
-import org.jboss.tools.ui.auto.test.WidgetVariables;
+import org.jboss.tools.ui.bot.test.JBTSWTBotTestCase;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
public abstract class TestControl extends JBTSWTBotTestCase{
Modified: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateActions.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateActions.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateActions.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,6 +1,6 @@
-package org.jboss.tools.seam.ui.auto.test.create;
+package org.jboss.tools.seam.ui.bot.test.create;
-import org.jboss.tools.seam.ui.auto.test.TestControl;
+import org.jboss.tools.seam.ui.bot.test.TestControl;
public class CreateActions extends TestControl{
Modified: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateConversations.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateConversations.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateConversations.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,6 +1,6 @@
-package org.jboss.tools.seam.ui.auto.test.create;
+package org.jboss.tools.seam.ui.bot.test.create;
-import org.jboss.tools.seam.ui.auto.test.TestControl;
+import org.jboss.tools.seam.ui.bot.test.TestControl;
public class CreateConversations extends TestControl{
Modified: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateEntities.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateEntities.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateEntities.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,6 +1,6 @@
-package org.jboss.tools.seam.ui.auto.test.create;
+package org.jboss.tools.seam.ui.bot.test.create;
-import org.jboss.tools.seam.ui.auto.test.TestControl;
+import org.jboss.tools.seam.ui.bot.test.TestControl;
public class CreateEntities extends TestControl{
Modified: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateForms.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateForms.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateForms.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,6 +1,6 @@
-package org.jboss.tools.seam.ui.auto.test.create;
+package org.jboss.tools.seam.ui.bot.test.create;
-import org.jboss.tools.seam.ui.auto.test.TestControl;
+import org.jboss.tools.seam.ui.bot.test.TestControl;
public class CreateForms extends TestControl{
Modified: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateProjectWizard.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateProjectWizard.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateProjectWizard.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,4 +1,4 @@
-package org.jboss.tools.seam.ui.auto.test.create;
+package org.jboss.tools.seam.ui.bot.test.create;
public class CreateProjectWizard {
Modified: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,6 +1,6 @@
-package org.jboss.tools.seam.ui.auto.test.create;
+package org.jboss.tools.seam.ui.bot.test.create;
-import org.jboss.tools.seam.ui.auto.test.TestControl;
+import org.jboss.tools.seam.ui.bot.test.TestControl;
public class CreateSeamProjects extends TestControl{
Modified: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamRuntimes.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamRuntimes.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamRuntimes.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,6 +1,6 @@
-package org.jboss.tools.seam.ui.auto.test.create;
+package org.jboss.tools.seam.ui.bot.test.create;
-import org.jboss.tools.seam.ui.auto.test.TestControl;
+import org.jboss.tools.seam.ui.bot.test.TestControl;
public class CreateSeamRuntimes extends TestControl{
Modified: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateServerRuntimes.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateServerRuntimes.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateServerRuntimes.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,6 +1,6 @@
-package org.jboss.tools.seam.ui.auto.test.create;
+package org.jboss.tools.seam.ui.bot.test.create;
-import org.jboss.tools.seam.ui.auto.test.TestControl;
+import org.jboss.tools.seam.ui.bot.test.TestControl;
public class CreateServerRuntimes extends TestControl{
Modified: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/DeleteSeamProjects.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/DeleteSeamProjects.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/DeleteSeamProjects.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,6 +1,6 @@
-package org.jboss.tools.seam.ui.auto.test.create;
+package org.jboss.tools.seam.ui.bot.test.create;
-import org.jboss.tools.seam.ui.auto.test.TestControl;
+import org.jboss.tools.seam.ui.bot.test.TestControl;
public class DeleteSeamProjects extends TestControl{
Modified: workspace/yzhishko/org.jboss.tools.ui.bot.test/.project
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.bot.test/.project 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.ui.bot.test/.project 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.ui.auto.test</name>
+ <name>org.jboss.tools.ui.bot.test</name>
<comment></comment>
<projects>
</projects>
Modified: workspace/yzhishko/org.jboss.tools.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.bot.test/META-INF/MANIFEST.MF 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.ui.bot.test/META-INF/MANIFEST.MF 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Test
-Bundle-SymbolicName: org.jboss.tools.ui.auto.test;singleton:=true
+Bundle-SymbolicName: org.jboss.tools.ui.bot.test;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.jboss.tools.ui.auto.test.Activator
+Bundle-Activator: org.jboss.tools.ui.bot.test.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0",
org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0",
@@ -21,4 +21,4 @@
org.eclipse.ui.ide;bundle-version="3.5.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.jboss.tools.ui.auto.test
+Export-Package: org.jboss.tools.ui.bot.test
Modified: workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/Activator.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/Activator.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/Activator.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,4 +1,4 @@
-package org.jboss.tools.ui.auto.test;
+package org.jboss.tools.ui.bot.test;
import org.eclipse.core.runtime.ILog;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -10,7 +10,7 @@
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.ui.auto.test";
+ public static final String PLUGIN_ID = "org.jboss.tools.ui.bot.test";
// The shared instance
private static Activator plugin;
Modified: workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,4 +1,4 @@
-package org.jboss.tools.ui.auto.test;
+package org.jboss.tools.ui.bot.test;
import java.io.IOException;
import java.io.InputStream;
Modified: workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/SWTBotMultiPageEditor.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/SWTBotMultiPageEditor.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/SWTBotMultiPageEditor.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,4 +1,4 @@
-package org.jboss.tools.ui.auto.test;
+package org.jboss.tools.ui.bot.test;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
Modified: workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/SWTJBTBot.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/SWTJBTBot.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/SWTJBTBot.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,4 +1,4 @@
-package org.jboss.tools.ui.auto.test;
+package org.jboss.tools.ui.bot.test;
import static org.eclipse.swtbot.eclipse.finder.matchers.WidgetMatcherFactory.withPartId;
import static org.eclipse.swtbot.eclipse.finder.matchers.WidgetMatcherFactory.withPartName;
Modified: workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/WidgetVariables.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/WidgetVariables.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/WidgetVariables.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,4 +1,4 @@
-package org.jboss.tools.ui.auto.test;
+package org.jboss.tools.ui.bot.test;
public class WidgetVariables {
Modified: workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/.project
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/.project 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/.project 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.ui.runtime.auto.test</name>
+ <name>org.jboss.tools.ui.runtime.bot.test</name>
<comment></comment>
<projects>
</projects>
Modified: workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/META-INF/MANIFEST.MF
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/META-INF/MANIFEST.MF 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/META-INF/MANIFEST.MF 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %BundleName
-Bundle-SymbolicName: org.jboss.tools.ui.runtime.auto.test;singleton:=true
+Bundle-SymbolicName: org.jboss.tools.ui.runtime.bot.test;singleton:=true
Bundle-Version: 1.0.0
-Bundle-Activator: org.jboss.tools.ui.runtime.auto.test.Activator
+Bundle-Activator: org.jboss.tools.ui.runtime.bot.test.Activator
Bundle-Vendor: %BundleVendor
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
@@ -15,7 +15,7 @@
org.eclipse.datatools.connectivity;visibility:=reexport,
org.eclipse.datatools.connectivity.db.generic,
org.jboss.tools.common,
- org.jboss.tools.ui.auto.test;bundle-version="1.0.0"
+ org.jboss.tools.ui.bot.test;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Modified: workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/plugin.xml
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/plugin.xml 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/plugin.xml 2009-06-30 13:24:56 UTC (rev 16295)
@@ -5,13 +5,13 @@
<extension
point="org.eclipse.ui.startup">
<startup
- class="org.jboss.tools.ui.runtime.auto.test.JBossRuntimeStartup">
+ class="org.jboss.tools.ui.runtime.bot.test.JBossRuntimeStartup">
</startup>
</extension>
<extension
point="org.eclipse.core.runtime.preferences">
- <initializer class="org.jboss.tools.ui.runtime.auto.test.preferences.JBossRuntimePreferencesInitializer"/>
+ <initializer class="org.jboss.tools.ui.runtime.bot.test.preferences.JBossRuntimePreferencesInitializer"/>
</extension>
</plugin>
Modified: workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/Activator.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/Activator.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/Activator.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,4 +1,4 @@
-package org.jboss.tools.ui.runtime.auto.test;
+package org.jboss.tools.ui.runtime.bot.test;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -9,7 +9,7 @@
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.ui.runtime.auto.test"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.jboss.tools.ui.runtime.bot.test"; //$NON-NLS-1$
public static final String FIRST_START = "firstStart"; //$NON-NLS-1$
Modified: workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/JBossRuntimeStartup.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/JBossRuntimeStartup.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/JBossRuntimeStartup.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,4 +1,4 @@
-package org.jboss.tools.ui.runtime.auto.test;
+package org.jboss.tools.ui.runtime.bot.test;
import java.io.File;
import java.io.IOException;
Modified: workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/Messages.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/Messages.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/Messages.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,9 +1,9 @@
-package org.jboss.tools.ui.runtime.auto.test;
+package org.jboss.tools.ui.runtime.bot.test;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.jboss.tools.ui.runtime.auto.test.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.jboss.tools.ui.runtime.bot.test.messages"; //$NON-NLS-1$
public static String JBossRuntimeStartup_Cannot_create_new_JBoss_Server;
public static String JBossRuntimeStartup_Cannot_create_new_DTP_Connection_Profile;
public static String JBossRuntimeStartup_Cannot_create_new_HSQL_DB_Driver;
Modified: workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/preferences/JBossRuntimePreferencesInitializer.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/preferences/JBossRuntimePreferencesInitializer.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/preferences/JBossRuntimePreferencesInitializer.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,8 +1,8 @@
-package org.jboss.tools.ui.runtime.auto.test.preferences;
+package org.jboss.tools.ui.runtime.bot.test.preferences;
import org.eclipse.core.runtime.Preferences;
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.jboss.tools.ui.runtime.auto.test.Activator;
+import org.jboss.tools.ui.runtime.bot.test.Activator;
@SuppressWarnings("deprecation")
public class JBossRuntimePreferencesInitializer extends
Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/.project
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/.project 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/.project 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.vpe.ui.auto.test</name>
+ <name>org.jboss.tools.vpe.ui.bot.test</name>
<comment></comment>
<projects>
</projects>
Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/META-INF/MANIFEST.MF 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/META-INF/MANIFEST.MF 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,12 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: SWTBotTests
-Bundle-SymbolicName: org.jboss.tools.vpe.ui.auto.test
+Bundle-SymbolicName: org.jboss.tools.vpe.ui.bot.test
Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.jboss.tools.vpe.ui.auto.test.Activator
+Bundle-Activator: org.jboss.tools.vpe.ui.bot.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.jboss.tools.ui.auto.test;bundle-version="1.0.0",
+ org.jboss.tools.ui.bot.test;bundle-version="1.0.0",
org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0",
org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0",
org.eclipse.swtbot.eclipse.spy;bundle-version="2.0.0",
@@ -29,6 +29,6 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: junit.framework
-Export-Package: org.jboss.tools.vpe.ui.auto.test,
- org.jboss.tools.vpe.ui.auto.test.jbide
+Export-Package: org.jboss.tools.vpe.ui.bot.test,
+ org.jboss.tools.vpe.ui.bot.test.jbide
Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/Activator.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/Activator.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/Activator.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,4 +1,4 @@
-package org.jboss.tools.vpe.ui.auto.test;
+package org.jboss.tools.vpe.ui.bot.test;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -9,7 +9,7 @@
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.vpe.ui.auto.test";
+ public static final String PLUGIN_ID = "org.jboss.tools.vpe.ui.bot.test";
// The shared instance
private static Activator plugin;
Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/ComparisonException.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/ComparisonException.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/ComparisonException.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.vpe.ui.auto.test;
+package org.jboss.tools.vpe.ui.bot.test;
/**
* @author Sergey Dzmitrovich
Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.vpe.ui.auto.test;
+package org.jboss.tools.vpe.ui.bot.test;
import java.io.File;
import java.io.FileNotFoundException;
Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestUtil.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestUtil.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestUtil.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.vpe.ui.auto.test;
+package org.jboss.tools.vpe.ui.bot.test;
import junit.framework.Assert;
import org.eclipse.swt.widgets.Display;
Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,4 +1,4 @@
-package org.jboss.tools.vpe.ui.auto.test;
+package org.jboss.tools.vpe.ui.bot.test;
import java.io.File;
import java.io.IOException;
@@ -11,9 +11,9 @@
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
-import org.jboss.tools.ui.auto.test.JBTSWTBotTestCase;
-import org.jboss.tools.ui.auto.test.SWTBotMultiPageEditor;
-import org.jboss.tools.ui.auto.test.WidgetVariables;
+import org.jboss.tools.ui.bot.test.JBTSWTBotTestCase;
+import org.jboss.tools.ui.bot.test.SWTBotMultiPageEditor;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
import org.mozilla.interfaces.nsIDOMElement;
Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE3197Test.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE3197Test.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE3197Test.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,12 +1,12 @@
-package org.jboss.tools.vpe.ui.auto.test.jbide;
+package org.jboss.tools.vpe.ui.bot.test.jbide;
import java.util.List;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.jboss.tools.ui.auto.test.WidgetVariables;
-import org.jboss.tools.vpe.ui.auto.test.VPEAutoTestCase;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
+import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
public class JBIDE3197Test extends VPEAutoTestCase {
Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java 2009-06-30 12:54:47 UTC (rev 16294)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java 2009-06-30 13:24:56 UTC (rev 16295)
@@ -1,10 +1,10 @@
-package org.jboss.tools.vpe.ui.auto.test.jbide;
+package org.jboss.tools.vpe.ui.bot.test.jbide;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.jboss.tools.ui.auto.test.WidgetVariables;
-import org.jboss.tools.vpe.ui.auto.test.VPEAutoTestCase;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
+import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
public class JBIDE4306Test extends VPEAutoTestCase{
15 years, 5 months
- 1
- 0