JBoss Tools SVN: r16908 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-30 12:12:55 -0400 (Thu, 30 Jul 2009)
New Revision: 16908
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4683
Improved handling processors and page contexts.
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java 2009-07-30 15:58:47 UTC (rev 16907)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java 2009-07-30 16:12:55 UTC (rev 16908)
@@ -54,7 +54,7 @@
*
*/
-public class TagAttributesComposite extends Composite implements PropertyChangeListener, SelectionListener{
+public class TagAttributesComposite extends Composite implements PropertyChangeListener, SelectionListener {
private IDropWizardModel fWizardModel;
private TableViewer tableViewer = null;
private boolean fFiltered = false;
@@ -376,6 +376,10 @@
if(tableViewer.isCellEditorActive()) return;
if(IDropWizardModel.TAG_PROPOSAL.equals(evt.getPropertyName())) {
tableViewer.setInput(new Object());
+ AttributeDescriptorValueProvider valueProvider = fWizardModel.getDropData().getValueProvider();
+ if(valueProvider != null) {
+ valueProvider.initContext(context);
+ }
} else {
tableViewer.refresh();
}
15 years, 5 months
JBoss Tools SVN: r16907 - workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2009-07-30 11:58:47 -0400 (Thu, 30 Jul 2009)
New Revision: 16907
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
Log:
Some correction.
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-07-30 15:57:14 UTC (rev 16906)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-07-30 15:58:47 UTC (rev 16907)
@@ -3,7 +3,6 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import org.eclipse.core.runtime.FileLocator;
@@ -22,11 +21,9 @@
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
-import org.mozilla.interfaces.nsIDOMNodeList;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
public abstract class VPEAutoTestCase extends JBTSWTBotTestCase{
15 years, 5 months
JBoss Tools SVN: r16906 - in workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test: src/org/jboss/tools/vpe/ui/bot/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2009-07-30 11:57:14 -0400 (Thu, 30 Jul 2009)
New Revision: 16906
Added:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/VerificationOfNameSpaces.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpaces.java
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/editor/BlockCommentTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java
Log:
I wrote a method that checked all VPE content. Test for namespace's verification was added.
Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/VerificationOfNameSpaces.xml
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/VerificationOfNameSpaces.xml (rev 0)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/VerificationOfNameSpaces.xml 2009-07-30 15:57:14 UTC (rev 16906)
@@ -0,0 +1,6 @@
+<BODY ID="__content__area__">
+<SPAN CLASS="vpe-text">
+...
+</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
+
+</BODY>
\ No newline at end of file
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-07-30 15:53:13 UTC (rev 16905)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-07-30 15:57:14 UTC (rev 16906)
@@ -3,6 +3,7 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import org.eclipse.core.runtime.FileLocator;
@@ -16,10 +17,16 @@
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.VpeEditorPart;
import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
+import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
+import org.mozilla.interfaces.nsIDOMNodeList;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public abstract class VPEAutoTestCase extends JBTSWTBotTestCase{
@@ -99,15 +106,14 @@
waitForJobs();
}
- protected void performContentTest(String expectedVPEContent, SWTBotMultiPageEditor editor) throws Throwable{
+ protected void performContentTestByIDs(String expectedVPEContentFile, SWTBotMultiPageEditor editor) throws Throwable{
JSPMultiPageEditor multiPageEditor = editor.getJSPMultiPageEditor();
assertNotNull(multiPageEditor);
VpeController controller = TestUtil.getVpeController(multiPageEditor);
- String expectedVPEContentFilePath = getPathToResources(expectedVPEContent);
-// expectedVPEContentFilePath = expectedVPEContentFilePath.substring(16);
+ String expectedVPEContentFilePath = getPathToResources(expectedVPEContentFile);
File xmlTestFile = new File (expectedVPEContentFilePath);
@@ -212,6 +218,29 @@
}
}
+ protected void performContentTestByDocument(String expectedVPEContentFile, SWTBotMultiPageEditor editor) throws Throwable{
+ JSPMultiPageEditor multiPageEditor = editor.getJSPMultiPageEditor();
+ assertNotNull(multiPageEditor);
+
+ nsIDOMDocument visualDocument = ((VpeEditorPart)multiPageEditor.getVisualEditor()).getVisualEditor().getDomDocument();
+
+ String expectedVPEContentFilePath = getPathToResources(expectedVPEContentFile);
+
+ File xmlTestFile = new File (expectedVPEContentFilePath);
+
+ Document xmlTestDocument = TestDomUtil.getDocument(xmlTestFile);
+ assertNotNull("Can't get test file, possibly file not exists "+xmlTestFile,xmlTestDocument); //$NON-NLS-1$
+
+ compareDocuments(visualDocument, xmlTestDocument);
+
+ }
+
+ private void compareDocuments (nsIDOMDocument visualDocument, Document xmlTestDocument) throws ComparisonException{
+ nsIDOMNode visualBodyNode = visualDocument.getElementsByTagName("BODY").item(0);
+ Node testBodyNode = xmlTestDocument.getElementsByTagName("BODY").item(0);
+ TestDomUtil.compareNodes(visualBodyNode, testBodyNode);
+ }
+
protected abstract void closeUnuseDialogs();
protected abstract boolean isUnuseDialogOpened();
Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java 2009-07-30 15:53:13 UTC (rev 16905)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java 2009-07-30 15:57:14 UTC (rev 16906)
@@ -1,11 +1,9 @@
package org.jboss.tools.vpe.ui.bot.test.editor;
-import java.util.List;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
-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.bot.test.WidgetVariables;
@@ -23,14 +21,6 @@
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
SWTBotTree tree = innerBot.tree();
try {
- List<? extends SWTBotEditor> editors = bot.editors();
- for (int i = 0; i < editors.size(); i++) {
- editors.get(i).close();
- }
-
- } catch (Exception e) {
- }
- try {
tree.expandNode(projectProperties.getProperty("JSFProjectName"))
.expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick();
} catch (Exception e) {
@@ -115,7 +105,7 @@
}
editor.save();
waitForJobs();
- performContentTest(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
+ performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
}
private void pressBlockCommentHotKeys(){
Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-07-30 15:53:13 UTC (rev 16905)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-07-30 15:57:14 UTC (rev 16906)
@@ -1,11 +1,9 @@
package org.jboss.tools.vpe.ui.bot.test.editor;
-import java.util.List;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
-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.bot.test.WidgetVariables;
@@ -23,14 +21,6 @@
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
SWTBotTree tree = innerBot.tree();
try {
- List<? extends SWTBotEditor> editors = bot.editors();
- for (int i = 0; i < editors.size(); i++) {
- editors.get(i).close();
- }
-
- } catch (Exception e) {
- }
- try {
tree.expandNode(projectProperties.getProperty("JSFProjectName"))
.expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick();
} catch (Exception e) {
@@ -81,7 +71,7 @@
}
editor.save();
waitForJobs();
- performContentTest(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
+ performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
}
private void pressToggleCommentHotKeys(){
Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpaces.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpaces.java (rev 0)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpaces.java 2009-07-30 15:57:14 UTC (rev 16906)
@@ -0,0 +1,76 @@
+package org.jboss.tools.vpe.ui.bot.test.editor;
+
+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.ui.bot.test.WidgetVariables;
+import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
+
+public class VerificationOfNameSpaces extends VPEAutoTestCase{
+
+ private static String textEditor;
+ private static String testText = "<jsp:root\n" +
+ "xmlns:jsp=\"http://java.sun.com/JSP/Page\n" +
+ "xmlns:public=\"http://www.jspcentral.com/tags\"\n" +
+ "version=\"1.2\">\n" +
+ "...\n" +
+ "</jsp:root>";
+ private static SWTBotEclipseEditor editor;
+
+ public void testVerificationOfNameSpaces() throws Throwable{
+
+ //Test open page
+
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
+ SWTBotTree tree = innerBot.tree();
+ try {
+ tree.expandNode(projectProperties.getProperty("JSFProjectName"))
+ .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick();
+ } catch (Exception e) {
+ }
+
+ editor = bot.editorByTitle(TEST_PAGE).toTextEditor();
+ textEditor = editor.getText();
+
+ //Test clear source
+
+ editor.setFocus();
+ bot.menu("Edit").menu("Select All").click();
+ waitForJobs();
+ bot.menu("Edit").menu("Delete").click();
+
+ //Test insert test text
+
+ editor.setText(testText);
+ editor.save();
+ waitForJobs();
+ performContentTestByDocument("VerificationOfNameSpaces.xml", bot.multiPageEditorByTitle(TEST_PAGE));
+
+ }
+
+ @Override
+ protected void closeUnuseDialogs() {
+
+ }
+
+ @Override
+ protected boolean isUnuseDialogOpened() {
+ return false;
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+
+ //Restore page state before tests
+
+ editor.setFocus();
+ bot.menu("Edit").menu("Select All").click();
+ bot.menu("Edit").menu("Delete").click();
+ editor.setText(textEditor);
+ editor.save();
+ waitForJobs();
+ editor.close();
+ super.tearDown();
+ }
+
+}
15 years, 5 months
JBoss Tools SVN: r16905 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-07-30 11:53:13 -0400 (Thu, 30 Jul 2009)
New Revision: 16905
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java
Log:
JBIDE-4660: Update and correct the CA-related JUnit tests after the new-style CA is applied.
JsfJspJbide1704Test Test suite is updated
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2009-07-30 15:17:42 UTC (rev 16904)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2009-07-30 15:53:13 UTC (rev 16905)
@@ -44,6 +44,8 @@
doTestJsfJspJbide1704(PAGE_NAME + ".xhtml");
}
+ private static final String THE_ONLY_ALLOWED_TEMPLATE = "New JSF EL Expression - Create a new attribute value with #{}".toLowerCase();
+
private void doTestJsfJspJbide1704(String pageName) {
openEditor(pageName);
@@ -61,6 +63,13 @@
}
for (int k = 0; result != null && k < result.length; k++) {
// There should not be a proposal of type Red.Proposal in the result
+
+ if ((result[k] instanceof AutoContentAssistantProposal) &&
+ result[k].getDisplayString().toLowerCase().equals(THE_ONLY_ALLOWED_TEMPLATE)) {
+ // The only new EL template proposal is allowed to be shown here
+ continue;
+ }
+
assertFalse("Content Assistant peturned proposals of type (" + result[k].getClass().getName() + ").", (result[k] instanceof AutoContentAssistantProposal));
}
15 years, 5 months
JBoss Tools SVN: r16904 - trunk/seam/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-07-30 11:17:42 -0400 (Thu, 30 Jul 2009)
New Revision: 16904
Modified:
trunk/seam/docs/reference/en/modules/seam_preferences.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-773 - Seam EL validator updated
Modified: trunk/seam/docs/reference/en/modules/seam_preferences.xml
===================================================================
--- trunk/seam/docs/reference/en/modules/seam_preferences.xml 2009-07-30 15:16:17 UTC (rev 16903)
+++ trunk/seam/docs/reference/en/modules/seam_preferences.xml 2009-07-30 15:17:42 UTC (rev 16904)
@@ -81,7 +81,9 @@
</emphasis> section there is now a preference for setting severity of EL Syntax. You
can select whether the Seam validator displays an error, a warning or just ignore
the EL Syntax error.</para>
-
+ <note><para>There are references made between each EL and variable name, so you can revalidate a particular EL if a context variable was changed. This makes parsing of each resource with referenced ELs much faster.</para></note>
+
+
<figure>
<title>Severity Preference for EL Syntax</title>
<mediaobject>
15 years, 5 months
JBoss Tools SVN: r16903 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb: taglibs and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-30 11:16:17 -0400 (Thu, 30 Jul 2009)
New Revision: 16903
Added:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Jsp.xml
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4683
http://java/sun.com/JSP/Page custom library added.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2009-07-30 15:09:08 UTC (rev 16902)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2009-07-30 15:16:17 UTC (rev 16903)
@@ -57,6 +57,10 @@
location="taglibs/JBossSeam.xml"
name="JBoss Seam"
uri="http://jboss.com/products/seam/taglib"/>
+ <tag-lib
+ location="taglibs/Jsp.xml"
+ name="JSP"
+ uri="http://java.sun.com/JSP/Page"/>
<component-extension
location="taglibs/componentExtension.xml"/>
</extension>
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Jsp.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Jsp.xml (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Jsp.xml 2009-07-30 15:16:17 UTC (rev 16903)
@@ -0,0 +1,48 @@
+<?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="jsp">
+ <component closeTag="true" name="forward" extended="false">
+ <attribute name="page" required="true"/>
+ </component>
+ <component closeTag="true" name="getProperty" extended="false">
+ <attribute name="name" required="true"/>
+ <attribute name="property" required="true"/>
+ </component>
+ <component closeTag="true" name="include" extended="false">
+ <attribute name="page" required="true"/>
+ </component>
+ <component name="plugin" extended="false">
+ <attribute name="type" required="true"/>
+ <attribute name="code" required="true"/>
+ <attribute name="codebase" required="true"/>
+ <attribute name="name" required="false"/>
+ <attribute name="archive" required="false"/>
+ <attribute name="align" required="false"/>
+ <attribute name="height" required="false"/>
+ <attribute name="width" required="false"/>
+ <attribute name="hspace" required="false"/>
+ <attribute name="vspace" required="false"/>
+ <attribute name="jreversion" required="false"/>
+ <attribute name="nspluginurl" required="false"/>
+ <attribute name="iepluginurl" required="false"/>
+ </component>
+ <component closeTag="true" name="setProperty" extended="false">
+ <attribute name="name" required="true"/>
+ <attribute name="property" required="true"/>
+ <attribute name="param" required="false"/>
+ <attribute name="value" required="false"/>
+ </component>
+ <component closeTag="true" name="useBean" extended="false">
+ <attribute name="id" required="true"/>
+ <attribute name="scope" required="true"/>
+ <attribute name="class" required="false"/>
+ <attribute name="type" required="false"/>
+ <attribute name="beanName" required="false"/>
+ </component>
+ <component name="params" extended="false"/>
+ <component closeTag="true" name="param" extended="false">
+ <attribute name="name" required="true"/>
+ <attribute name="value" required="true"/>
+ </component>
+ <component name="fallback"/>
+</tag-lib>
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Jsp.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 5 months
JBoss Tools SVN: r16902 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp: jspeditor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-30 11:09:08 -0400 (Thu, 30 Jul 2009)
New Revision: 16902
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
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/jspeditor/JSPTextEditor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4683
Improved handling processors and page contexts.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2009-07-30 14:49:22 UTC (rev 16901)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2009-07-30 15:09:08 UTC (rev 16902)
@@ -80,6 +80,7 @@
processor = (JspContentAssistProcessor)context.get("processor"); //$NON-NLS-1$
if(processor == null) {
processor = valueHelper.createContentAssistProcessor();
+ context.put("processor", processor); //$NON-NLS-1$
}
if(pageContext == null) {
pageContext = valueHelper.createPageContext(processor, offset);
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-07-30 14:49:22 UTC (rev 16901)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2009-07-30 15:09:08 UTC (rev 16902)
@@ -145,7 +145,7 @@
* @param context The context object instance
* @return
*/
- protected ITagLibrary[] getTagLibraries(IPageContext context) {
+ public ITagLibrary[] getTagLibraries(IPageContext context) {
Map<String, INameSpace> nameSpaces = context.getNameSpaces(getOffset());
if (nameSpaces == null || nameSpaces.isEmpty())
return EMPTY_LIBRARIES;
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2009-07-30 14:49:22 UTC (rev 16901)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2009-07-30 15:09:08 UTC (rev 16902)
@@ -783,11 +783,12 @@
return query.getPrefix();
}
});
+ ((JspContextImpl)pageContext).setLibraries(processor.getTagLibraries(pageContext));
}
}
public void initContext(Properties context) {
- if(context != null) {
+ if(context != null && processor != null) {
context.put("processor", processor); //$NON-NLS-1$
context.put("pageContext", pageContext); //$NON-NLS-1$
}
15 years, 5 months
JBoss Tools SVN: r16899 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-07-30 09:56:05 -0400 (Thu, 30 Jul 2009)
New Revision: 16899
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateDiscriminatorColumnComposite.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4665
fixed source-to-composite updates
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateDiscriminatorColumnComposite.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateDiscriminatorColumnComposite.java 2009-07-30 13:31:41 UTC (rev 16898)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateDiscriminatorColumnComposite.java 2009-07-30 13:56:05 UTC (rev 16899)
@@ -75,6 +75,8 @@
* @since 2.0
*/
public class HibernateDiscriminatorColumnComposite <T extends HibernateEntity> extends FormPane<T> {
+
+ private WritablePropertyValueModel<DiscriminatorFormula> discriminatorFormulaHolder;
/**
* Creates a new <code>InheritanceComposite</code>.
@@ -87,6 +89,12 @@
super(parentPane, parent, false);
}
+
+ @Override
+ protected void initialize() {
+ super.initialize();
+ discriminatorFormulaHolder = new SimplePropertyValueModel<DiscriminatorFormula>();
+ }
@Override
protected void initializeLayout(Composite container) {
@@ -128,13 +136,12 @@
JptUiMappingsMessages.InheritanceComposite_detailsGroupBox,
new SimplePropertyValueModel<Boolean>(Boolean.FALSE)
);
-
+
new DetailsComposite(this, discriminatorColumnHolder, addSubPane(container, 0, 16));
-
+
new PaneEnabler(buildDiscriminatorColumnEnabledHolder(), this);
}
-
private ColumnCombo<DiscriminatorColumn> addDiscriminatorColumnCombo(
Composite container,
PropertyValueModel<DiscriminatorColumn> discriminatorColumnHolder) {
@@ -171,14 +178,13 @@
protected String getValue() {
return getSubject().getSpecifiedName();
}
-
+
@Override
protected String buildNullDefaultValueEntry() {
return JptUiMappingsMessages.NoneSelected;
}
};
- }
-
+ }
private PropertyValueModel<DiscriminatorColumn> buildDiscriminatorColumnHolder() {
return new PropertyAspectAdapter<Entity, DiscriminatorColumn>(getSubjectHolder()) {
@@ -189,30 +195,39 @@
};
}
-
private WritablePropertyValueModel<String> buildDiscriminatorFormulaHolder() {
- return new PropertyAspectAdapter<HibernateEntity, String>(getSubjectHolder(), DiscriminatorFormula.VALUE_PROPERTY) {
+ return new PropertyAspectAdapter<DiscriminatorFormula, String>(discriminatorFormulaHolder, DiscriminatorFormula.VALUE_PROPERTY) {
@Override
protected String buildValue_() {
- DiscriminatorFormula df = this.subject.getDiscriminatorFormula();
- return df == null ? null : df.getValue();
+ return subject == null ? null : subject.getValue();
}
@Override
+ public void setValue(String value) {
+ if (value != null && !"".equals(value)) { //$NON-NLS-1$
+ DiscriminatorFormula discriminatorFormula = (getSubject().getDiscriminatorFormula() != null
+ ? getSubject().getDiscriminatorFormula()
+ : getSubject().addDiscriminatorFormula());
+ discriminatorFormula.setValue(value);
+ discriminatorFormulaHolder.setValue(discriminatorFormula);
+ }
+ setValue_(value);
+ }
+
+ @Override
protected void setValue_(String value) {
- if ("".equals(value)) value = null; //$NON-NLS-1$
- DiscriminatorFormula df = this.subject.getDiscriminatorFormula();
- if (value == null && df != null){
- this.subject.removeDiscriminatorFormula();
+ if ("".equals(value)) {//$NON-NLS-1$
+ value = null;
+ }
+ if (value == null && subject != null){
+ getSubject().removeDiscriminatorFormula();
+ return;
} else {
- if (df == null){
- df = this.subject.addDiscriminatorFormula();
- }
- df.setValue(value);
+ subject.setValue(value);
}
}
};
- }
+ }
private EnumFormComboViewer<DiscriminatorColumn, DiscriminatorType> addDiscriminatorTypeCombo(
Composite container,
15 years, 5 months