JBoss Tools SVN: r18290 - branches/jbosstools-3.1.0.M4/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-10-24 14:31:57 -0400 (Sat, 24 Oct 2009)
New Revision: 18290
Modified:
branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
JBIDE-5079: CA doesn't work in XHTML editor if there is <a:loadStyle src="..."/> on the page.
Issue is fixed for 3.1.0.M4
Modified: branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-10-24 18:28:21 UTC (rev 18289)
+++ branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-10-24 18:31:57 UTC (rev 18290)
@@ -935,7 +935,12 @@
/**
*/
public ICSSModel getModel() {
- ICSSModel model = super.getModel();
+ // Fix for JBIDE-5079 >>>
+ ICSSModel model = null;
+ if (super.isValidAttribute()) {
+ model = super.getModel();
+ }
+ // Fix for JBIDE-5079 <<<
if (model == null) {
model = retrieveModel();
setModel(model);
14 years, 8 months
JBoss Tools SVN: r18289 - 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-10-24 14:28:21 -0400 (Sat, 24 Oct 2009)
New Revision: 18289
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
JBIDE-5079: CA doesn't work in XHTML editor if there is <a:loadStyle src="..."/> on the page.
Issue is fixed for trunk
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-10-24 17:08:18 UTC (rev 18288)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-10-24 18:28:21 UTC (rev 18289)
@@ -935,7 +935,12 @@
/**
*/
public ICSSModel getModel() {
- ICSSModel model = super.getModel();
+ // Fix for JBIDE-5079 >>>
+ ICSSModel model = null;
+ if (super.isValidAttribute()) {
+ model = super.getModel();
+ }
+ // Fix for JBIDE-5079 <<<
if (model == null) {
model = retrieveModel();
setModel(model);
14 years, 8 months
JBoss Tools SVN: r18288 - branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-10-24 13:08:18 -0400 (Sat, 24 Oct 2009)
New Revision: 18288
Modified:
branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlinkPartitioner.java
Log:
JBIDE-5056: Fix CommonExtAllTests.testUseBeanClassOpenOn
The issue is fixed for 3.1.0.M4
Modified: branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlinkPartitioner.java
===================================================================
--- branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlinkPartitioner.java 2009-10-24 17:05:41 UTC (rev 18287)
+++ branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlinkPartitioner.java 2009-10-24 17:08:18 UTC (rev 18288)
@@ -32,6 +32,7 @@
public static final String CSS_CLASS_PARTITION = "org.jboss.tools.common.text.ext.CSS_CLASS"; //$NON-NLS-1$
private static final String CSS_CLASS_TOKEN = "class/"; //$NON-NLS-1$
+ private static final String EXCLUSION_TOKEN = "jsp:usebean/class/"; //$NON-NLS-1$
/**
* @see com.ibm.sse.editor.hyperlink.AbstractHyperlinkPartitioner#parse(org.eclipse.jface.text.IDocument,
@@ -74,9 +75,9 @@
}
public boolean recognize(IDocument document, IHyperlinkRegion region) {
-
if (region.getAxis() != null
- && region.getAxis().toLowerCase().endsWith(CSS_CLASS_TOKEN))
+ && region.getAxis().toLowerCase().endsWith(CSS_CLASS_TOKEN)
+ && !region.getAxis().toLowerCase().endsWith(EXCLUSION_TOKEN)) // Fix for JBIDE-5056
return true;
return false;
}
14 years, 8 months
JBoss Tools SVN: r18287 - trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-10-24 13:05:41 -0400 (Sat, 24 Oct 2009)
New Revision: 18287
Modified:
trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlinkPartitioner.java
Log:
JBIDE-5056: Fix CommonExtAllTests.testUseBeanClassOpenOn
The issue is fixed for trunk
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlinkPartitioner.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlinkPartitioner.java 2009-10-24 16:02:40 UTC (rev 18286)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlinkPartitioner.java 2009-10-24 17:05:41 UTC (rev 18287)
@@ -32,6 +32,8 @@
public static final String CSS_CLASS_PARTITION = "org.jboss.tools.common.text.ext.CSS_CLASS"; //$NON-NLS-1$
private static final String CSS_CLASS_TOKEN = "class/"; //$NON-NLS-1$
+ private static final String EXCLUSION_TOKEN = "jsp:usebean/class/"; //$NON-NLS-1$
+
/**
* @see com.ibm.sse.editor.hyperlink.AbstractHyperlinkPartitioner#parse(org.eclipse.jface.text.IDocument,
@@ -74,9 +76,9 @@
}
public boolean recognize(IDocument document, IHyperlinkRegion region) {
-
if (region.getAxis() != null
- && region.getAxis().toLowerCase().endsWith(CSS_CLASS_TOKEN))
+ && region.getAxis().toLowerCase().endsWith(CSS_CLASS_TOKEN)
+ && !region.getAxis().toLowerCase().endsWith(EXCLUSION_TOKEN)) // Fix for JBIDE-5056
return true;
return false;
}
14 years, 8 months
JBoss Tools SVN: r18286 - branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-10-24 12:02:40 -0400 (Sat, 24 Oct 2009)
New Revision: 18286
Modified:
branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java
branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java
Log:
JBIDE-5083: java.lang.StackOverflowError exception when DND the same file into page
The fix for 3.1.0.M4 is committed
Modified: branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java
===================================================================
--- branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java 2009-10-24 15:57:37 UTC (rev 18285)
+++ branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java 2009-10-24 16:02:40 UTC (rev 18286)
@@ -11,15 +11,11 @@
package org.jboss.tools.jst.web.kb.internal;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.jboss.tools.jst.web.kb.ICSSContainerSupport;
-import org.jboss.tools.jst.web.kb.IIncludedContextSupport;
import org.jboss.tools.jst.web.kb.IPageContext;
-import org.jboss.tools.jst.web.kb.IResourceBundle;
import org.jboss.tools.jst.web.kb.internal.taglib.NameSpace;
import org.jboss.tools.jst.web.kb.taglib.INameSpace;
import org.w3c.dom.css.CSSStyleSheet;
Modified: branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java
===================================================================
--- branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java 2009-10-24 15:57:37 UTC (rev 18285)
+++ branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java 2009-10-24 16:02:40 UTC (rev 18286)
@@ -9,7 +9,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
-import org.eclipse.ui.part.IPage;
import org.jboss.tools.common.el.core.resolver.ELContextImpl;
import org.jboss.tools.jst.web.kb.IIncludedContextSupport;
import org.jboss.tools.jst.web.kb.IPageContext;
14 years, 8 months
JBoss Tools SVN: r18285 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb: src/org/jboss/tools/jst/web/kb and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-10-24 11:57:37 -0400 (Sat, 24 Oct 2009)
New Revision: 18285
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IIncludedContextSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java
Log:
JBIDE-5083: java.lang.StackOverflowError exception when DND the same file into page
The fix for trunk is committed
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2009-10-24 15:34:15 UTC (rev 18284)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2009-10-24 15:57:37 UTC (rev 18285)
@@ -21,7 +21,7 @@
org.eclipse.wst.xml.ui,
org.eclipse.jdt.ui,
org.eclipse.wst.validation,
- org.eclipse.ui.editors,
+ org.eclipse.ui.editors;visibility:=reexport,
org.eclipse.ui.ide,
org.eclipse.wst.css.core;bundle-version="1.1.300",
org.eclipse.wst.html.core;bundle-version="1.1.300"
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IIncludedContextSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IIncludedContextSupport.java 2009-10-24 15:34:15 UTC (rev 18284)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IIncludedContextSupport.java 2009-10-24 15:57:37 UTC (rev 18285)
@@ -51,4 +51,26 @@
* @return
*/
Map<String, List<INameSpace>> getNameSpaces(int offset);
+
+ /**
+ * Checks if the context exists in parent contexts for the specified resource
+ *
+ * @param resource
+ * @return
+ */
+ boolean contextExistsInParents(IFile resource);
+
+ /**
+ * Set up parent context
+ *
+ * @param parent
+ */
+ void setParent(IIncludedContextSupport parent);
+
+ /**
+ * Returns parent context
+ *
+ * @return
+ */
+ IIncludedContextSupport getParent();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-10-24 15:34:15 UTC (rev 18284)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-10-24 15:57:37 UTC (rev 18285)
@@ -309,6 +309,11 @@
if (file == null)
return;
+ // Fix for JBIDE-5083 >>>
+ if (context.contextExistsInParents(file))
+ return;
+ // Fix for JBIDE-5083 <<<
+
IStructuredModel sModel = null;
try {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java 2009-10-24 15:34:15 UTC (rev 18284)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java 2009-10-24 15:57:37 UTC (rev 18285)
@@ -11,15 +11,11 @@
package org.jboss.tools.jst.web.kb.internal;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.jboss.tools.jst.web.kb.ICSSContainerSupport;
-import org.jboss.tools.jst.web.kb.IIncludedContextSupport;
import org.jboss.tools.jst.web.kb.IPageContext;
-import org.jboss.tools.jst.web.kb.IResourceBundle;
import org.jboss.tools.jst.web.kb.internal.taglib.NameSpace;
import org.jboss.tools.jst.web.kb.taglib.INameSpace;
import org.w3c.dom.css.CSSStyleSheet;
@@ -39,6 +35,9 @@
fIncludedContexts = new ArrayList<IPageContext>();
}
fIncludedContexts.add(includedContext);
+ // Fix for JBIDE-5083 >>>
+ includedContext.setParent(this);
+ // Fix for JBIDE-5083 <<<
}
@Override
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java 2009-10-24 15:34:15 UTC (rev 18284)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java 2009-10-24 15:57:37 UTC (rev 18285)
@@ -6,9 +6,9 @@
import java.util.Map;
import java.util.Set;
+import org.eclipse.core.resources.IFile;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
-import org.eclipse.ui.part.IPage;
import org.jboss.tools.common.el.core.resolver.ELContextImpl;
import org.jboss.tools.jst.web.kb.IIncludedContextSupport;
import org.jboss.tools.jst.web.kb.IPageContext;
@@ -21,7 +21,8 @@
protected ITagLibrary[] libs;
protected Map<IRegion, Map<String, INameSpace>> nameSpaces = new HashMap<IRegion, Map<String, INameSpace>>();
protected IResourceBundle[] bundles;
-
+ private IIncludedContextSupport parentContext = null;
+
/*
* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.IPageContext#getLibraries()
@@ -158,5 +159,31 @@
return null;
}
-
+ /**
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.IIncludedContextSupport#contextExistsInParents(org.eclipse.core.resources.IFile)
+ */
+ public boolean contextExistsInParents(IFile resource) {
+ // Assuming that the resource must not be null here
+ if (resource.equals(getResource()))
+ return true;
+
+ return getParent() == null ? false : getParent().contextExistsInParents(resource);
+ }
+
+ /**
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.IIncludedContextSupport#getParent()
+ */
+ public IIncludedContextSupport getParent() {
+ return parentContext;
+ }
+
+ /**
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.IIncludedContextSupport#setParent(org.jboss.tools.jst.web.kb.IIncludedContextSupport)
+ */
+ public void setParent(IIncludedContextSupport parent) {
+ parentContext = parent;
+ }
}
14 years, 8 months
JBoss Tools SVN: r18284 - in branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb: internal and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-10-24 11:34:15 -0400 (Sat, 24 Oct 2009)
New Revision: 18284
Modified:
branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IIncludedContextSupport.java
branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java
branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java
Log:
JBIDE-5083: java.lang.StackOverflowError exception when DND the same file into page
The fix for 3.1.0.M4 is committed
Modified: branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IIncludedContextSupport.java
===================================================================
--- branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IIncludedContextSupport.java 2009-10-24 14:41:01 UTC (rev 18283)
+++ branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IIncludedContextSupport.java 2009-10-24 15:34:15 UTC (rev 18284)
@@ -52,7 +52,6 @@
*/
Map<String, List<INameSpace>> getNameSpaces(int offset);
-
/**
* Checks if the context exists in parent contexts for the specified resource
*
Modified: branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java
===================================================================
--- branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java 2009-10-24 14:41:01 UTC (rev 18283)
+++ branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java 2009-10-24 15:34:15 UTC (rev 18284)
@@ -26,19 +26,22 @@
/**
* JSP page context
+ *
* @author Alexey Kazakov
*/
public class JspContextImpl extends XmlContextImpl implements ICSSContainerSupport {
protected List<IPageContext> fIncludedContexts = null;
protected List<CSSStyleSheet> fCSSStyleSheets = null;
-
@Override
public void addIncludedContext(IPageContext includedContext) {
if (fIncludedContexts == null) {
fIncludedContexts = new ArrayList<IPageContext>();
}
fIncludedContexts.add(includedContext);
+ // Fix for JBIDE-5083 >>>
+ includedContext.setParent(this);
+ // Fix for JBIDE-5083 <<<
}
@Override
Modified: branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java
===================================================================
--- branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java 2009-10-24 14:41:01 UTC (rev 18283)
+++ branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java 2009-10-24 15:34:15 UTC (rev 18284)
@@ -157,7 +157,6 @@
*/
public void addIncludedContext(IPageContext includedContext) {
throw new UnsupportedOperationException();
-
}
/**
14 years, 8 months
JBoss Tools SVN: r18283 - in branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb: internal and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-10-24 10:41:01 -0400 (Sat, 24 Oct 2009)
New Revision: 18283
Modified:
branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IIncludedContextSupport.java
branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java
Log:
JBIDE-5083: java.lang.StackOverflowError exception when DND the same file into page
The fix for 3.1.0.M4 is committed
Modified: branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IIncludedContextSupport.java
===================================================================
--- branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IIncludedContextSupport.java 2009-10-24 02:45:58 UTC (rev 18282)
+++ branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IIncludedContextSupport.java 2009-10-24 14:41:01 UTC (rev 18283)
@@ -51,4 +51,27 @@
* @return
*/
Map<String, List<INameSpace>> getNameSpaces(int offset);
+
+
+ /**
+ * Checks if the context exists in parent contexts for the specified resource
+ *
+ * @param resource
+ * @return
+ */
+ boolean contextExistsInParents(IFile resource);
+
+ /**
+ * Set up parent context
+ *
+ * @param parent
+ */
+ void setParent(IIncludedContextSupport parent);
+
+ /**
+ * Returns parent context
+ *
+ * @return
+ */
+ IIncludedContextSupport getParent();
}
Modified: branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-10-24 02:45:58 UTC (rev 18282)
+++ branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-10-24 14:41:01 UTC (rev 18283)
@@ -309,15 +309,20 @@
if (file == null)
return;
+ // Fix for JBIDE-5083 >>>
+ if (context.contextExistsInParents(file))
+ return;
+ // Fix for JBIDE-5083 <<<
+
IStructuredModel sModel = null;
try {
sModel = StructuredModelManager.getModelManager()
.getModelForRead(file);
} catch (IOException e) {
- // Ignore. The sModel will be set to null
+ WebKbPlugin.getDefault().logError(e);
} catch (CoreException e) {
- // Ignore. The sModel will be set to null
+ WebKbPlugin.getDefault().logError(e);
}
if (sModel == null)
@@ -400,9 +405,9 @@
sModel = StructuredModelManager.getModelManager()
.getModelForRead(file);
} catch (IOException e) {
- // Ignore. The sModel will be set to null
+ WebKbPlugin.getDefault().logError(e);
} catch (CoreException e) {
- // Ignore. The sModel will be set to null
+ WebKbPlugin.getDefault().logError(e);
}
if (sModel == null)
@@ -433,9 +438,9 @@
sModel = StructuredModelManager.getModelManager()
.getModelForRead(context.getResource());
} catch (IOException e) {
- // Ignore. The sModel will be set to null
+ WebKbPlugin.getDefault().logError(e);
} catch (CoreException e) {
- // Ignore. The sModel will be set to null
+ WebKbPlugin.getDefault().logError(e);
}
if (sModel == null)
@@ -538,9 +543,9 @@
sModel = StructuredModelManager.getModelManager()
.getModelForRead(context.getResource());
} catch (IOException e) {
- // Ignore. The sModel will be set to null
+ WebKbPlugin.getDefault().logError(e);
} catch (CoreException e) {
- // Ignore. The sModel will be set to null
+ WebKbPlugin.getDefault().logError(e);
}
if (sModel == null)
@@ -656,9 +661,9 @@
try {
sModel = StructuredModelManager.getModelManager().getModelForRead(context.getResource());
} catch (IOException e) {
- // Ignore. The sModel will be set to null
+ WebKbPlugin.getDefault().logError(e);
} catch (CoreException e) {
- // Ignore. The sModel will be set to null
+ WebKbPlugin.getDefault().logError(e);
}
if (sModel == null)
Modified: branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java
===================================================================
--- branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java 2009-10-24 02:45:58 UTC (rev 18282)
+++ branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java 2009-10-24 14:41:01 UTC (rev 18283)
@@ -6,6 +6,7 @@
import java.util.Map;
import java.util.Set;
+import org.eclipse.core.resources.IFile;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.ui.part.IPage;
@@ -21,6 +22,7 @@
protected ITagLibrary[] libs;
protected Map<IRegion, Map<String, INameSpace>> nameSpaces = new HashMap<IRegion, Map<String, INameSpace>>();
protected IResourceBundle[] bundles;
+ private IIncludedContextSupport parentContext = null;
/*
* (non-Javadoc)
@@ -149,14 +151,48 @@
nameSpaces.get(region).put(nameSpace.getURI(), nameSpace);
}
+ /**
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.IIncludedContextSupport#addIncludedContext(org.jboss.tools.jst.web.kb.IPageContext)
+ */
public void addIncludedContext(IPageContext includedContext) {
throw new UnsupportedOperationException();
}
+ /**
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.IIncludedContextSupport#getIncludedContexts()
+ */
public List<IPageContext> getIncludedContexts() {
return null;
}
-
-
+
+ /**
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.IIncludedContextSupport#contextExistsInParents(org.eclipse.core.resources.IFile)
+ */
+ public boolean contextExistsInParents(IFile resource) {
+ // Assuming that the resource must not be null here
+ if (resource.equals(getResource()))
+ return true;
+
+ return getParent() == null ? false : getParent().contextExistsInParents(resource);
+ }
+
+ /**
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.IIncludedContextSupport#getParent()
+ */
+ public IIncludedContextSupport getParent() {
+ return parentContext;
+ }
+
+ /**
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.IIncludedContextSupport#setParent(org.jboss.tools.jst.web.kb.IIncludedContextSupport)
+ */
+ public void setParent(IIncludedContextSupport parent) {
+ parentContext = parent;
+ }
}
14 years, 8 months
JBoss Tools SVN: r18282 - branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-10-23 22:45:58 -0400 (Fri, 23 Oct 2009)
New Revision: 18282
Modified:
branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.project
Log:
JBIDE-5059: Fix JstJspAllTests.testJsfJspJbide2016Test
JBIDE-5060: Fix JstJspAllTests.testCAForELinStyleTest
The test cases are fixed in 3.1.0.M4 branch
Modified: branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.project
===================================================================
--- branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.project 2009-10-24 02:43:02 UTC (rev 18281)
+++ branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.project 2009-10-24 02:45:58 UTC (rev 18282)
@@ -15,6 +15,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
@@ -22,5 +27,6 @@
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.jboss.tools.jsf.jsfnature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
</natures>
</projectDescription>
14 years, 8 months
JBoss Tools SVN: r18281 - branches/jbosstools-3.1.0.M4/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-10-23 22:43:02 -0400 (Fri, 23 Oct 2009)
New Revision: 18281
Modified:
branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java
Log:
JBIDE-5059: Fix JstJspAllTests.testJsfJspJbide2016Test
JBIDE-5060: Fix JstJspAllTests.testCAForELinStyleTest
The test cases are fixed in 3.1.0.M4 branch
Modified: branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java
===================================================================
--- branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2009-10-24 02:33:13 UTC (rev 18280)
+++ branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2009-10-24 02:43:02 UTC (rev 18281)
@@ -15,6 +15,7 @@
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
+import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor;
import org.jboss.tools.jst.jsp.test.TestUtil;
@@ -94,7 +95,12 @@
protected boolean compareProposal(String proposalName, ICompletionProposal[] proposals){
for (int i = 0; i < proposals.length; i++) {
- if(proposals[i].getDisplayString().toLowerCase().equals(proposalName.toLowerCase())) return true;
+ if (proposals[i] instanceof AutoContentAssistantProposal) {
+ AutoContentAssistantProposal ap = (AutoContentAssistantProposal)proposals[i];
+ if (ap.getReplacementString().toLowerCase().equals(proposalName.toLowerCase())) return true;
+ } else {
+ if(proposals[i].getDisplayString().toLowerCase().equals(proposalName.toLowerCase())) return true;
+ }
}
return false;
}
14 years, 8 months