JBoss Tools SVN: r19637 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.
by jbosstools-commits@lists.jboss.org
Author: vrubezhny
Date: 2009-12-31 07:27:52 -0500 (Thu, 31 Dec 2009)
New Revision: 19637
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
JBIDE-5483: ConcurrentModificationException throws when open xhtml page
Getting and modifying the StyleSheet adapter is surrounded with synchronized block.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
=======================…
[View More]============================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-12-31 11:43:08 UTC (rev 19636)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-12-31 12:27:52 UTC (rev 19637)
@@ -713,25 +713,25 @@
* @return
*/
private CSSStyleSheetDescriptor getSheetForTagAttribute(final Node stylesContainer, String attribute) {
-
INodeNotifier notifier = (INodeNotifier) stylesContainer;
-
- IStyleSheetAdapter adapter = (IStyleSheetAdapter) notifier
- .getAdapterFor(IStyleSheetAdapter.class);
-
- if (!(adapter instanceof ExtendedLinkElementAdapter)) {
- notifier.removeAdapter(adapter);
- adapter = new ExtendedLinkElementAdapter(
- (Element) stylesContainer, attribute);
- notifier.addAdapter(adapter);
- }
-
CSSStyleSheet sheet = null;
String source = null;
- if (adapter != null) {
- sheet = (CSSStyleSheet) adapter.getSheet();
- source = ((ExtendedLinkElementAdapter)adapter).getSource();
+ synchronized (notifier) {
+ IStyleSheetAdapter adapter = (IStyleSheetAdapter) notifier.getAdapterFor(IStyleSheetAdapter.class);
+
+ if (!(adapter instanceof ExtendedLinkElementAdapter)) {
+ notifier.removeAdapter(adapter);
+ adapter = new ExtendedLinkElementAdapter(
+ (Element) stylesContainer, attribute);
+ notifier.addAdapter(adapter);
+ }
+
+ if (adapter != null) {
+ sheet = (CSSStyleSheet) adapter.getSheet();
+ source = ((ExtendedLinkElementAdapter)adapter).getSource();
+ }
+
}
return sheet == null || source == null ? null : new CSSStyleSheetDescriptor(source, sheet);
@@ -743,16 +743,15 @@
* @return
*/
private CSSStyleSheet getSheetForTag(final Node stylesContainer) {
-
INodeNotifier notifier = (INodeNotifier) stylesContainer;
-
- IStyleSheetAdapter adapter = (IStyleSheetAdapter) notifier
- .getAdapterFor(IStyleSheetAdapter.class);
-
CSSStyleSheet sheet = null;
- if (adapter != null) {
- sheet = (CSSStyleSheet) adapter.getSheet();
+ synchronized (notifier) {
+ IStyleSheetAdapter adapter = (IStyleSheetAdapter) notifier.getAdapterFor(IStyleSheetAdapter.class);
+
+ if (adapter != null) {
+ sheet = (CSSStyleSheet) adapter.getSheet();
+ }
}
return sheet;
[View Less]
15 years, 1 month
JBoss Tools SVN: r19636 - workspace/mareshkau/xulrunner-1.9.1.2.
by jbosstools-commits@lists.jboss.org
Author: mareshkau
Date: 2009-12-31 06:43:08 -0500 (Thu, 31 Dec 2009)
New Revision: 19636
Added:
workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.gtk.linux.x86_64/
Removed:
workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.gtk.linux.x86_64_rhel5/
Log:
https://jira.jboss.org/jira/browse/JBIDE-5033
Copied: workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.gtk.linux.x86_64 (from rev 19615, workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.gtk.linux.x86_64_rhel5)
15 years, 1 month
JBoss Tools SVN: r19634 - trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2009-12-31 06:36:52 -0500 (Thu, 31 Dec 2009)
New Revision: 19634
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5577, JUnit test for JSF Model was fixed.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java
===================================================================
--- …
[View More]trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java 2009-12-31 05:33:50 UTC (rev 19633)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java 2009-12-31 11:36:52 UTC (rev 19634)
@@ -127,9 +127,15 @@
public void testGetPath() {
List<Object> list = provider.getList(model, IWebPromptingProvider.JSF_GET_PATH, "/a.jsf", new Properties());
- assertEquals(1, list.size());
+ /*
+ * After fixing https://jira.jboss.org/jira/browse/JBIDE-5577
+ * there are two files in the list: .jsp and .xhtml.
+ */
+ assertEquals(2, list.size());
String s = (String)list.get(0);
assertEquals("/a.jsp", s);
+ s = (String)list.get(1);
+ assertEquals("/a.xhtml", s);
}
public void testGetTaglibs() {
[View Less]
15 years, 1 month
JBoss Tools SVN: r19633 - in trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui: util and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: Grid.Qian
Date: 2009-12-31 00:33:50 -0500 (Thu, 31 Dec 2009)
New Revision: 19633
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditPropertyAliasDialog.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/WSDLImportHelper.java
Log:
JBIDE-5463: BPEL Editor gives validation errors after creating correlation variables
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditPropertyAliasDialog.java
===…
[View More]================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditPropertyAliasDialog.java 2009-12-30 20:38:34 UTC (rev 19632)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditPropertyAliasDialog.java 2009-12-31 05:33:50 UTC (rev 19633)
@@ -202,14 +202,19 @@
String query = ""; //$NON-NLS-1$
ITreeNode result = (ITreeNode)((IStructuredSelection) messagePartViewer.getSelection()).getFirstElement();
while (result != null) {
+ String qname = "";
+ if (result.getModelObject() instanceof XSDElementDeclaration) {
+ XSDElementDeclaration xsd = (XSDElementDeclaration)result.getModelObject();
+ qname = xsd.getQName();
+ }
if (result instanceof PartTreeNode) {
part = result.getLabel();
break;
}
if (!query.equals("")) { //$NON-NLS-1$
- query = result.getLabel() + "/" + query; //$NON-NLS-1$
+ query = qname + "/" + query; //$NON-NLS-1$
} else {
- query = result.getLabel();
+ query = qname;
}
result = (ITreeNode)tcp.getParent(result);
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/WSDLImportHelper.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/WSDLImportHelper.java 2009-12-30 20:38:34 UTC (rev 19632)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/WSDLImportHelper.java 2009-12-31 05:33:50 UTC (rev 19633)
@@ -12,7 +12,9 @@
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import org.eclipse.bpel.model.messageproperties.MessagepropertiesPackage;
import org.eclipse.bpel.model.messageproperties.Property;
@@ -32,6 +34,7 @@
import org.eclipse.wst.wsdl.Import;
import org.eclipse.wst.wsdl.Message;
import org.eclipse.wst.wsdl.PortType;
+import org.eclipse.wst.wsdl.Types;
import org.eclipse.wst.wsdl.WSDLFactory;
import org.eclipse.wst.wsdl.WSDLPackage;
import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
@@ -81,6 +84,40 @@
Message msg = (Message)((PropertyAlias)ee).getMessageType();
if (msg != null && msg.getQName() != null) {
addImportAndNamespace(definition, msg.getEnclosingDefinition());
+ // add the namespaces of the propertyalias, message, part, type definition
+ // for maybe the query of the propertyalias will use the elements in the namespaces
+ if (((PropertyAlias) ee).getQuery() != null
+ && !"".equals(((PropertyAlias) ee).getQuery().getValue())) {
+ String query = ((PropertyAlias) ee).getQuery().getValue();
+ String[] queryArr = query.split("/");
+ List<String> prefixList = new LinkedList<String>();
+ for (String qname : queryArr) {
+ String[] strs = qname.split(":");
+ if (strs.length > 1) {
+ prefixList.add(strs[0]);
+ }
+ }
+ if (prefixList.size() > 0) {
+ Types types = (Types) msg.getEnclosingDefinition().getTypes();
+ if (types != null && types.getSchemas() != null) {
+ XSDSchema xsd = null;
+ for (int i = 0; i < types.getSchemas().size(); i++) {
+ xsd = (XSDSchema) types.getSchemas().get(i);
+ Map<String, String> map = xsd
+ .getQNamePrefixToNamespaceMap();
+ if (map != null) {
+ for (Object obj : map.keySet().toArray()) {
+ if (prefixList.contains((String) obj)) {
+ definition.addNamespace((String) obj,
+ (String) map.get((String) obj));
+ }
+
+ }
+ }
+ }
+ }
+ }
+ }
}
}
if (ee instanceof Property) {
[View Less]
15 years, 1 month
JBoss Tools SVN: r19632 - trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util.
by jbosstools-commits@lists.jboss.org
Author: vrubezhny
Date: 2009-12-30 15:38:34 -0500 (Wed, 30 Dec 2009)
New Revision: 19632
Modified:
trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
Log:
JBIDE-5586: Fix JstJspAllTests CA-related issue
Modified: trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/…
[View More]ResourcesUtils.java 2009-12-30 20:31:07 UTC (rev 19631)
+++ trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2009-12-30 20:38:34 UTC (rev 19632)
@@ -237,8 +237,10 @@
} catch (InvocationTargetException ite) {
// TePlugin.getDefault().logError(ite.getCause());
+ ite.printStackTrace();
} catch (InterruptedException ie) {
// VPETestPlugin.getDefault().logError(ie);
+ ie.printStackTrace();
} catch (CoreException e) {
// TODO Auto-generated catch block
e.printStackTrace();
[View Less]
15 years, 1 month
JBoss Tools SVN: r19631 - 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-12-30 15:31:07 -0500 (Wed, 30 Dec 2009)
New Revision: 19631
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForIDTest.java
Log:
JBIDE-5586: Fix JstJspAllTests CA-related issue
CAForIDTest is fixed
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForIDTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.…
[View More]test/src/org/jboss/tools/jst/jsp/test/ca/CAForIDTest.java 2009-12-30 20:24:47 UTC (rev 19630)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForIDTest.java 2009-12-30 20:31:07 UTC (rev 19631)
@@ -4,7 +4,7 @@
public class CAForIDTest extends ContentAssistantTestCase{
TestProjectProvider provider = null;
- boolean makeCopy = false;
+ boolean makeCopy = true;
private static final String PROJECT_NAME = "CAForIDTest";
private static final String PAGE_NAME = "/WebContent/pages/inputUserName.jsp";
[View Less]
15 years, 1 month
JBoss Tools SVN: r19630 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest.
by jbosstools-commits@lists.jboss.org
Author: vrubezhny
Date: 2009-12-30 15:24:47 -0500 (Wed, 30 Dec 2009)
New Revision: 19630
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.classpath
Log:
JBIDE-5586: Fix JstJspAllTests CA-related issue
CAForIDTest is fixed
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.classpath 2009-12-…
[View More]30 19:48:19 UTC (rev 19629)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/.classpath 2009-12-30 20:24:47 UTC (rev 19630)
@@ -3,15 +3,6 @@
<classpathentry kind="src" path="JavaSource"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime">
- <attributes>
- <attribute name="owner.project.facets" value="jst.web"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.6.0_04">
- <attributes>
- <attribute name="owner.project.facets" value="jst.java"/>
- </attributes>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
</classpath>
[View Less]
15 years, 1 month