JBoss Tools SVN: r16704 - trunk/bpel/plugins/org.jboss.bpel.as.integration.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-07-21 14:09:13 -0400 (Tue, 21 Jul 2009)
New Revision: 16704
Modified:
trunk/bpel/plugins/org.jboss.bpel.as.integration/.classpath
Log:
plugins should all have the same .classpath jdt entry I believe. Led to errors when I import
Modified: trunk/bpel/plugins/org.jboss.bpel.as.integration/.classpath
===================================================================
--- trunk/bpel/plugins/org.jboss.bpel.as.integration/.classpath 2009-07-21 17:28:53 UTC (rev 16703)
+++ trunk/bpel/plugins/org.jboss.bpel.as.integration/.classpath 2009-07-21 18:09:13 UTC (rev 16704)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
16 years, 9 months
JBoss Tools SVN: r16703 - trunk/bpel/plugins/org.eclipse.bpel.xpath10.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-07-21 13:28:53 -0400 (Tue, 21 Jul 2009)
New Revision: 16703
Modified:
trunk/bpel/plugins/org.eclipse.bpel.xpath10/.classpath
trunk/bpel/plugins/org.eclipse.bpel.xpath10/build.properties
Log:
JBIDE-4502 - fix build properties and classpath
Modified: trunk/bpel/plugins/org.eclipse.bpel.xpath10/.classpath
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.xpath10/.classpath 2009-07-21 17:27:17 UTC (rev 16702)
+++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/.classpath 2009-07-21 17:28:53 UTC (rev 16703)
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="bin" sourcepath="bin"/>
- <classpathentry exported="true" kind="lib" path="lib/antlr-runtime-3.0.1.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="lib" path="bin" sourcepath="bin"/>
+ <classpathentry exported="true" kind="lib" path="lib/antlr-runtime-3.0.1.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: trunk/bpel/plugins/org.eclipse.bpel.xpath10/build.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.xpath10/build.properties 2009-07-21 17:27:17 UTC (rev 16702)
+++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/build.properties 2009-07-21 17:28:53 UTC (rev 16703)
@@ -1,10 +1,11 @@
bin.includes = META-INF/,\
- lib/antlr-runtime-3.0.1.jar,\
- bin/
-jars.compile.order =
+ lib/,\
+ bin/,\
+ .
src.includes = .classpath,\
.project,\
META-INF/,\
build.properties,\
lib/,\
src/
+source.. = src/
16 years, 9 months
JBoss Tools SVN: r16702 - trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-07-21 13:27:17 -0400 (Tue, 21 Jul 2009)
New Revision: 16702
Modified:
trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF
Log:
JBIDE-4502 - fix manifest
Modified: trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF 2009-07-21 16:30:25 UTC (rev 16701)
+++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF 2009-07-21 17:27:17 UTC (rev 16702)
@@ -2,8 +2,8 @@
Bundle-ManifestVersion: 2
Bundle-Name: XPath Parser 1.0 (Incubation)
Bundle-SymbolicName: org.eclipse.bpel.xpath10
-Bundle-Version: 0.4.0
-Bundle-ClassPath: bin/,
+Bundle-Version: 0.4.0.qualifier
+Bundle-ClassPath: ., bin/,
lib/antlr-runtime-3.0.1.jar
Export-Package: org.antlr.runtime;uses:="org.antlr.runtime.tree",
org.antlr.runtime.debug;uses:="org.antlr.runtime.tree,org.antlr.runtime",
16 years, 9 months
JBoss Tools SVN: r16701 - in trunk: as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-07-21 12:30:25 -0400 (Tue, 21 Jul 2009)
New Revision: 16701
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF
trunk/profiler/plugins/org.jboss.tools.profiler.ui/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/jira/browse/JBIDE-4571 Add missing provider name
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/META-INF/MANIFEST.MF
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/META-INF/MANIFEST.MF 2009-07-21 15:22:44 UTC (rev 16700)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/META-INF/MANIFEST.MF 2009-07-21 16:30:25 UTC (rev 16701)
@@ -16,3 +16,4 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.jboss.ide.eclipse.archives.jdt.integration.model,
org.jboss.ide.eclipse.archives.jdt.integration.ui
+Bundle-Vendor: JBoss by Red Hat
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/META-INF/MANIFEST.MF 2009-07-21 15:22:44 UTC (rev 16700)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/META-INF/MANIFEST.MF 2009-07-21 16:30:25 UTC (rev 16701)
@@ -19,3 +19,4 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.jboss.ide.eclipse.as.wtp.override.core.modules,
org.jboss.ide.eclipse.as.wtp.override.core.vcf
+Bundle-Vendor: JBoss by Red Hat
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF 2009-07-21 15:22:44 UTC (rev 16700)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF 2009-07-21 16:30:25 UTC (rev 16701)
@@ -27,3 +27,4 @@
org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.1.300"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: JBoss by Red Hat
Modified: trunk/profiler/plugins/org.jboss.tools.profiler.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/profiler/plugins/org.jboss.tools.profiler.ui/META-INF/MANIFEST.MF 2009-07-21 15:22:44 UTC (rev 16700)
+++ trunk/profiler/plugins/org.jboss.tools.profiler.ui/META-INF/MANIFEST.MF 2009-07-21 16:30:25 UTC (rev 16701)
@@ -19,3 +19,4 @@
org.jboss.tools.profiler.internal.ui.launch,
org.jboss.tools.profiler.internal.ui.launchtabs,
org.jboss.tools.profiler.internal.ui.util
+Bundle-Vendor: JBoss by Red Hat
16 years, 9 months
JBoss Tools SVN: r16700 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-21 11:22:44 -0400 (Tue, 21 Jul 2009)
New Revision: 16700
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1826
References to old kb from comments removed.
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java 2009-07-21 15:15:13 UTC (rev 16699)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java 2009-07-21 15:22:44 UTC (rev 16700)
@@ -31,7 +31,7 @@
/*
* (non-Javadoc)
- * @see org.jboss.tools.common.kb.text.PageContext#getElResolvers()
+ * @see org.jboss.tools.common.el.core.resolver.ELContext#getElResolvers()
*/
public ELResolver[] getElResolvers() {
return elResolvers;
@@ -43,7 +43,7 @@
/*
* (non-Javadoc)
- * @see org.jboss.tools.common.kb.text.PageContext#getResource()
+ * @see org.jboss.tools.common.el.core.resolver.ELContext#getResource()
*/
public IFile getResource() {
return resource;
@@ -63,7 +63,6 @@
/*
* (non-Javadoc)
- * @see org.jboss.tools.common.kb.text.PageContext#getVars(int)
*/
public Var[] getVars(int offset) {
Set<Var> result = new HashSet<Var>();
16 years, 9 months
JBoss Tools SVN: r16699 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-21 11:15:13 -0400 (Tue, 21 Jul 2009)
New Revision: 16699
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1826
TLDVersionHelper moved.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java 2009-07-21 15:12:41 UTC (rev 16698)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java 2009-07-21 15:15:13 UTC (rev 16699)
@@ -64,9 +64,9 @@
import org.jboss.tools.common.kb.KbProposal;
import org.jboss.tools.common.kb.KbTldResource;
import org.jboss.tools.common.kb.TagDescriptor;
-import org.jboss.tools.common.kb.wtp.TLDVersionHelper;
import org.jboss.tools.common.kb.wtp.WtpKbConnector;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
+import org.jboss.tools.jst.web.tld.TLDVersionHelper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2009-07-21 15:12:41 UTC (rev 16698)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2009-07-21 15:15:13 UTC (rev 16699)
@@ -60,7 +60,6 @@
import org.jboss.tools.common.kb.KbQuery;
import org.jboss.tools.common.kb.KbTldResource;
import org.jboss.tools.common.kb.wtp.JspWtpKbConnector;
-import org.jboss.tools.common.kb.wtp.TLDVersionHelper;
import org.jboss.tools.common.kb.wtp.WtpKbConnector;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.editor.TLDRegisterHelper;
@@ -71,6 +70,7 @@
import org.jboss.tools.jst.jsp.support.kb.WTPKbdBeanPropertyResource;
import org.jboss.tools.jst.jsp.support.kb.WTPKbdBundlePropertyResource;
import org.jboss.tools.jst.web.kb.IPageContext;
+import org.jboss.tools.jst.web.tld.TLDVersionHelper;
import org.jboss.tools.jst.web.tld.TaglibData;
import org.jboss.tools.jst.web.tld.VpeTaglibListener;
import org.jboss.tools.jst.web.tld.VpeTaglibManager;
16 years, 9 months
JBoss Tools SVN: r16698 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-21 11:12:41 -0400 (Tue, 21 Jul 2009)
New Revision: 16698
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1826
TLDVersionHelper moved.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java 2009-07-21 15:12:06 UTC (rev 16697)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java 2009-07-21 15:12:41 UTC (rev 16698)
@@ -15,11 +15,11 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
-import org.jboss.tools.common.kb.wtp.TLDVersionHelper;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jst.web.project.WebProject;
+import org.jboss.tools.jst.web.tld.TLDVersionHelper;
import org.jboss.tools.jst.web.tld.TaglibData;
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.context.VpePageContext;
16 years, 9 months
JBoss Tools SVN: r16697 - in trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web: tld and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-21 11:12:06 -0400 (Tue, 21 Jul 2009)
New Revision: 16697
Added:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TLDVersionHelper.java
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/WebProject.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1826
TLDVersionHelper moved.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/WebProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/WebProject.java 2009-07-21 15:09:14 UTC (rev 16696)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/WebProject.java 2009-07-21 15:12:06 UTC (rev 16697)
@@ -12,13 +12,13 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.jface.text.IDocument;
-import org.jboss.tools.common.kb.wtp.TLDVersionHelper;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
import org.jboss.tools.common.model.filesystems.impl.FileSystemImpl;
import org.jboss.tools.jst.web.tld.IWebProject;
+import org.jboss.tools.jst.web.tld.TLDVersionHelper;
import org.jboss.tools.jst.web.tld.TaglibMapping;
public class WebProject implements IWebProject {
Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TLDVersionHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TLDVersionHelper.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TLDVersionHelper.java 2009-07-21 15:12:06 UTC (rev 16697)
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jst.web.tld;
+
+import java.util.List;
+
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jst.jsp.core.internal.contentmodel.TaglibController;
+import org.eclipse.jst.jsp.core.internal.contentmodel.tld.CMDocumentImpl;
+import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TLDCMDocumentManager;
+import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TaglibTracker;
+import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
+
+public class TLDVersionHelper {
+ public static String getTldVersion(String uri, String prefix, IDocument document) {
+ if(uri==null & prefix==null && document==null) {
+ return null;
+ }
+ TLDCMDocumentManager manager = TaglibController.getTLDCMDocumentManager(document);
+ if (manager != null) {
+ List list = manager.getTaglibTrackers();
+ for(int i=0; i<list.size(); i++) {
+ TaglibTracker tracker = (TaglibTracker)list.get(i);
+ if(prefix.equals(tracker.getPrefix()) && uri.equals(tracker.getURI())) {
+ return getTldVersion(tracker);
+ }
+ }
+ }
+ return null;
+ }
+
+ public static String getTldVersion(TaglibTracker tracker) {
+ CMDocument cmd = tracker.getDocument();
+ if(cmd instanceof CMDocumentImpl) {
+ CMDocumentImpl doc = (CMDocumentImpl)cmd;
+ return doc.getTlibversion();
+ }
+ return null;
+ }
+
+}
16 years, 9 months
JBoss Tools SVN: r16696 - trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/wtp.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-21 11:09:14 -0400 (Tue, 21 Jul 2009)
New Revision: 16696
Removed:
trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/wtp/TLDVersionHelper.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1826
TLDVersionHelper moved.
Deleted: trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/wtp/TLDVersionHelper.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/wtp/TLDVersionHelper.java 2009-07-21 15:04:43 UTC (rev 16695)
+++ trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/wtp/TLDVersionHelper.java 2009-07-21 15:09:14 UTC (rev 16696)
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.common.kb.wtp;
-
-import java.util.List;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.jsp.core.internal.contentmodel.TaglibController;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.CMDocumentImpl;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TLDCMDocumentManager;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TaglibTracker;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-
-public class TLDVersionHelper {
- public static String getTldVersion(String uri, String prefix, IDocument document) {
- if(uri==null & prefix==null && document==null) {
- return null;
- }
- TLDCMDocumentManager manager = TaglibController.getTLDCMDocumentManager(document);
- if (manager != null) {
- List list = manager.getTaglibTrackers();
- for(int i=0; i<list.size(); i++) {
- TaglibTracker tracker = (TaglibTracker)list.get(i);
- if(prefix.equals(tracker.getPrefix()) && uri.equals(tracker.getURI())) {
- return getTldVersion(tracker);
- }
- }
- }
- return null;
- }
-
- public static String getTldVersion(TaglibTracker tracker) {
- CMDocument cmd = tracker.getDocument();
- if(cmd instanceof CMDocumentImpl) {
- CMDocumentImpl doc = (CMDocumentImpl)cmd;
- return doc.getTlibversion();
- }
- return null;
- }
-
-}
16 years, 9 months
JBoss Tools SVN: r16695 - in trunk/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor/context and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-21 11:04:43 -0400 (Tue, 21 Jul 2009)
New Revision: 16695
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1826
Dependency on old KbConnector removed from visual page editor.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2009-07-21 15:03:37 UTC (rev 16694)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2009-07-21 15:04:43 UTC (rev 16695)
@@ -76,6 +76,7 @@
org.jboss.tools.vpe.resref,
org.jboss.tools.common.el.core,
org.jboss.tools.common.el.ui,
+ org.jboss.tools.jst.web.kb,
org.eclipse.core.expressions;bundle-version="3.4.100",
org.eclipse.jdt.ui
Bundle-Version: 2.1.0
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2009-07-21 15:03:37 UTC (rev 16694)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2009-07-21 15:04:43 UTC (rev 16695)
@@ -24,10 +24,6 @@
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
import org.eclipse.wst.xml.core.internal.document.ElementImpl;
-import org.jboss.tools.common.kb.KbConnectorFactory;
-import org.jboss.tools.common.kb.KbConnectorType;
-import org.jboss.tools.common.kb.KbException;
-import org.jboss.tools.common.kb.wtp.WtpKbConnector;
import org.jboss.tools.common.resref.core.ResourceReference;
import org.jboss.tools.jst.jsp.editor.IVisualContext;
import org.jboss.tools.jst.jsp.preferences.VpePreference;
@@ -57,7 +53,6 @@
private VpeSourceDomBuilder sourceBuilder;
private VpeVisualDomBuilder visualBuilder;
private VpeEditorPart editPart;
- WtpKbConnector connector;
private nsIDOMNode currentVisualNode;
/**
* Created to store custom element attributes and use it in time of
@@ -103,12 +98,7 @@
}
public void refreshConnector() {
- IDocument document = sourceBuilder.getStructuredTextViewer().getDocument();
- try {
- connector = (WtpKbConnector)KbConnectorFactory.getIntstance().createConnector(KbConnectorType.JSP_WTP_KB_CONNECTOR, document);
- } catch (KbException e) {
- VpePlugin.getPluginLog().logError(e);
- }
+ //TODO we need to provide loading of kb here
}
public VpeVisualDomBuilder getVisualBuilder(){
@@ -131,14 +121,12 @@
public void dispose() {
for (Iterator iterator = connectorDocuments.iterator(); iterator.hasNext();) {
IDocument document = (IDocument) iterator.next();
- KbConnectorFactory.getIntstance().removeConnector(KbConnectorType.JSP_WTP_KB_CONNECTOR, document);
}
connectorDocuments.clear();
connectorDocuments = null;
bundle.dispose();
clearAll();
editPart=null;
- connector=null;
sourceBuilder=null;
visualBuilder=null;
}
@@ -261,13 +249,6 @@
return null;
}
-
- public WtpKbConnector getConnector() {
- return this.connector;
- }
-
-
-
public List<TaglibData> getTagLibs(Node sourceNode) {
return XmlUtil.getTaglibsForNode(sourceNode, this);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2009-07-21 15:03:37 UTC (rev 16694)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2009-07-21 15:04:43 UTC (rev 16695)
@@ -21,12 +21,18 @@
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.editors.text.ILocationProvider;
-import org.jboss.tools.common.kb.AttributeDescriptor;
-import org.jboss.tools.common.kb.AttributeValueDescriptor;
-import org.jboss.tools.common.kb.KbException;
-import org.jboss.tools.common.kb.ParamList;
-import org.jboss.tools.common.kb.wtp.WtpKbConnector;
+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.jboss.tools.common.resref.core.ResourceReference;
+import org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor;
+import org.jboss.tools.jst.jsp.outline.ValueHelper;
+import org.jboss.tools.jst.web.kb.IPageContext;
+import org.jboss.tools.jst.web.kb.KbQuery;
+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.taglib.CustomProposalType;
+import org.jboss.tools.jst.web.kb.internal.taglib.CustomTagLibAttribute;
+import org.jboss.tools.jst.web.kb.internal.taglib.CustomProposalType.Param;
+import org.jboss.tools.jst.web.kb.taglib.IAttribute;
import org.jboss.tools.jst.web.tld.IFilePathEncoder;
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.context.VpePageContext;
@@ -173,33 +179,67 @@
return tagValue;
}
- WtpKbConnector connector = pageContext.getConnector();
- try {
- AttributeDescriptor descriptor = connector.getAttributeInformation(query);
- if (descriptor == null) {
- return tagValue;
- }
-
- AttributeValueDescriptor[] ds = descriptor.getValueDesriptors();
+ ValueHelper valueHelper = new ValueHelper();
+ JspContentAssistProcessor processor = valueHelper.createContentAssistProcessor();
+ int offset = 0;
+ if(sourceNode instanceof IndexedRegion) {
+ offset = ((IndexedRegion)sourceNode).getStartOffset() + 1;
+ }
+ IPageContext pc = valueHelper.createPageContext(processor, offset);
+ KbQuery kbQuery = createKbQuery(processor, sourceNode, offset, attrName);
+ IAttribute[] as = PageProcessor.getInstance().getAttributes(kbQuery, pc);
+ CustomTagLibAttribute a = null;
+ for (IAttribute i: as) {
+ if(i instanceof CustomTagLibAttribute) {
+ a = (CustomTagLibAttribute)i;
+ break;
+ }
+ }
+ if(a != null) {
+ CustomProposalType[] ds = a.getProposals();
for (int i = 0; i < ds.length; i++) {
- if (!"file".equals(ds[i].getType())) {//$NON-NLS-1$
- continue;
- }
-
- ParamList params = ds[i].getParams();
- String[] vs = params.getParamsValues(IFilePathEncoder.PATH_ADDITION);
- if (vs == null || vs.length == 0) {
- continue;
- }
-
- if (tagValue.startsWith(vs[0])) {
- tagValue = tagValue.substring(vs[0].length());
- }
+ if (!"file".equals(ds[i].getType())) {//$NON-NLS-1$
+ continue;
+ }
+ Param[] ps = ds[i].getParams();
+ for (Param p: ps) {
+ if(IFilePathEncoder.PATH_ADDITION.equals(p.getName())) {
+ String v = p.getValue();
+ if(v != null && v.length() > 0 && tagValue.startsWith(v)) {
+ tagValue = tagValue.substring(v.length());
+ }
+ }
+ }
}
- } catch (KbException e) {
- VpePlugin.getPluginLog().logError(e);
}
+// WtpKbConnector connector = pageContext.getConnector();
+// try {
+// AttributeDescriptor descriptor = connector.getAttributeInformation(query);
+// if (descriptor == null) {
+// return tagValue;
+// }
+//
+// AttributeValueDescriptor[] ds = descriptor.getValueDesriptors();
+// for (int i = 0; i < ds.length; i++) {
+// if (!"file".equals(ds[i].getType())) {//$NON-NLS-1$
+// continue;
+// }
+//
+// ParamList params = ds[i].getParams();
+// String[] vs = params.getParamsValues(IFilePathEncoder.PATH_ADDITION);
+// if (vs == null || vs.length == 0) {
+// continue;
+// }
+//
+// if (tagValue.startsWith(vs[0])) {
+// tagValue = tagValue.substring(vs[0].length());
+// }
+// }
+// } catch (KbException e) {
+// VpePlugin.getPluginLog().logError(e);
+// }
+
return tagValue;
}
@@ -231,4 +271,34 @@
+ resourcePathInPlugin);
}
}
+
+ protected KbQuery createKbQuery(JspContentAssistProcessor processor, Node fNode, int offset, String attrName) {
+ KbQuery kbQuery = new KbQuery();
+
+ String[] parentTags = processor.getParentTags(false);
+ parentTags = add(parentTags, fNode.getNodeName());
+ kbQuery.setPrefix(getPrefix(fNode));
+ kbQuery.setUri(processor.getUri(getPrefix()));
+ kbQuery.setParentTags(parentTags);
+ kbQuery.setParent(fNode.getNodeName());
+ kbQuery.setMask(false);
+ kbQuery.setType(Type.ATTRIBUTE_NAME);
+ kbQuery.setOffset(offset);
+ kbQuery.setValue(attrName);
+ kbQuery.setStringQuery(attrName);
+
+ return kbQuery;
+ }
+
+ private String[] add(String[] result, String v) {
+ String[] result1 = new String[result.length + 1];
+ System.arraycopy(result, 0, result1, 0, result.length);
+ result1[result.length] = v;
+ return result1;
+ }
+ private String getPrefix(Node fNode) {
+ int i = fNode.getNodeName().indexOf(':');
+ return i < 0 ? null : fNode.getNodeName().substring(0, i);
+ }
+
}
\ No newline at end of file
16 years, 9 months