JBoss Tools SVN: r17745 - in trunk/cdi/plugins/org.jboss.tools.cdi.core: src/org/jboss/tools/cdi/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-09-25 10:31:56 -0400 (Fri, 25 Sep 2009)
New Revision: 17745
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/INamed.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProduces.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifier.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScope.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotype.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/jira/browse/JBIDE-4943
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2009-09-25 14:08:32 UTC (rev 17744)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2009-09-25 14:31:56 UTC (rev 17745)
@@ -1,12 +1,14 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Context and Dependency Injection Core
-Bundle-SymbolicName: org.jboss.tools.cdi.core
+Bundle-SymbolicName: org.jboss.tools.cdi.core;singleton:=true
Bundle-Version: 1.0.0
Bundle-Activator: org.jboss.tools.cdi.core.CDICorePlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.jboss.tools.common
+ org.jboss.tools.common,
+ org.eclipse.jdt.core;bundle-version="3.5.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: JBoss by Red Hat
+Export-Package: org.jboss.tools.cdi.core
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2009-09-25 14:31:56 UTC (rev 17745)
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core;
+
+/**
+ * Represents a managed bean
+ * @author Alexey Kazakov
+ */
+public interface IBean {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2009-09-25 14:31:56 UTC (rev 17745)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core;
+
+import java.util.Set;
+
+import org.eclipse.jdt.core.IAnnotation;
+import org.eclipse.jdt.core.IType;
+
+/**
+ * @author Alexey Kazakov
+ */
+public interface IBeanManager {
+
+ /**
+ * Returns the set of beans which match the given EL name
+ *
+ * @param name the name used to restrict the beans matched
+ * @return the matched beans
+ */
+ public Set<IBean> getBeans(String name);
+
+ /**
+ * Returns the set of beans which match the given required type and bindings.
+ *
+ * @param beanType the type of the beans to be resolved
+ * @param bindings the bindings used to restrict the matched beans. If no
+ * bindings are passed to getBeans(), the default binding @Current
+ * is assumed.
+ * @return the matched beans
+ */
+ public Set<IBean> getBeans(IType beanType, IAnnotation... bindings);
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIProject.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIProject.java 2009-09-25 14:31:56 UTC (rev 17745)
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core;
+
+/**
+ * @author Alexey Kazakov
+ */
+public interface ICDIProject extends IBeanManager {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIProject.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInject.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInject.java 2009-09-25 14:31:56 UTC (rev 17745)
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core;
+
+/**
+ * @author Alexey Kazakov
+ */
+public interface IInject {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInject.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/INamed.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/INamed.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/INamed.java 2009-09-25 14:31:56 UTC (rev 17745)
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core;
+
+/**
+ * @author Alexey Kazakov
+ */
+public interface INamed {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/INamed.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProduces.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProduces.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProduces.java 2009-09-25 14:31:56 UTC (rev 17745)
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core;
+
+/**
+ * @author Alexey Kazakov
+ */
+public interface IProduces {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProduces.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifier.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifier.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifier.java 2009-09-25 14:31:56 UTC (rev 17745)
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core;
+
+/**
+ * @author Alexey Kazakov
+ */
+public interface IQualifier {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifier.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScope.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScope.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScope.java 2009-09-25 14:31:56 UTC (rev 17745)
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core;
+
+/**
+ * @author Alexey Kazakov
+ */
+public interface IScope {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScope.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotype.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotype.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotype.java 2009-09-25 14:31:56 UTC (rev 17745)
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core;
+
+/**
+ * @author Alexey Kazakov
+ */
+public interface IStereotype {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotype.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years
JBoss Tools SVN: r17744 - in trunk/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor/util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-25 10:08:32 -0400 (Fri, 25 Sep 2009)
New Revision: 17744
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/util/XmlUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4913
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2009-09-25 14:07:44 UTC (rev 17743)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2009-09-25 14:08:32 UTC (rev 17744)
@@ -50,7 +50,7 @@
org.jboss.tools.vpe.xulrunner,
org.mozilla.xpcom,
org.eclipse.draw2d,
- org.jboss.tools.jst.web,
+ org.jboss.tools.jst.web;visibility:=reexport,
org.jboss.tools.vpe.resref,
org.jboss.tools.common.el.core,
org.jboss.tools.common.el.ui,
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/XmlUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/XmlUtil.java 2009-09-25 14:07:44 UTC (rev 17743)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/XmlUtil.java 2009-09-25 14:08:32 UTC (rev 17744)
@@ -147,7 +147,28 @@
.getPrefix(), true);
}
return taglibData;
- }
+ }
+
+ //helper method
+ public static boolean hasTaglib(Node sourceNode,
+ VpePageContext pageContext, String sourcePrefix) {
+ List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(sourceNode,
+ pageContext);
+ TaglibData sourceNodeTaglib = XmlUtil.getTaglibForPrefix(
+ sourcePrefix, taglibs);
+ return sourceNodeTaglib != null;
+ }
+
+ //helper method
+ public static String getTaglibUri(Node sourceNode,
+ VpePageContext pageContext, String sourcePrefix) {
+ List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(sourceNode,
+ pageContext);
+ TaglibData sourceNodeTaglib = XmlUtil.getTaglibForPrefix(
+ sourcePrefix, taglibs);
+ return sourceNodeTaglib == null ? null : sourceNodeTaglib.getUri();
+ }
+
/**
* Processes taglib attribute
* @param taglibs
15 years
JBoss Tools SVN: r17743 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf: src/org/jboss/tools/jsf/vpe/jsf/template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-25 10:07:44 -0400 (Fri, 25 Sep 2009)
New Revision: 17743
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfFacet.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4913
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF 2009-09-25 14:07:01 UTC (rev 17742)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF 2009-09-25 14:07:44 UTC (rev 17743)
@@ -10,6 +10,7 @@
org.jboss.tools.common,
org.jboss.tools.vpe,
org.mozilla.xpcom,
+ org.jboss.tools.jst.web,
org.jboss.tools.jst.jsp,
org.eclipse.wst.sse.core,
org.eclipse.jst.jsp.core,
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfFacet.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfFacet.java 2009-09-25 14:07:01 UTC (rev 17742)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfFacet.java 2009-09-25 14:07:44 UTC (rev 17743)
@@ -12,7 +12,6 @@
import java.util.List;
-import org.jboss.tools.jst.web.tld.TaglibData;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
@@ -53,12 +52,8 @@
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
String sourcePrefix = child.getPrefix();
- List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(sourceNode,
- pageContext);
- TaglibData sourceNodeTaglib = XmlUtil.getTaglibForPrefix(
- sourcePrefix, taglibs);
- if (null != sourceNodeTaglib) {
- String sourceNodeUri = sourceNodeTaglib.getUri();
+ if (XmlUtil.hasTaglib(sourceNode, pageContext, sourcePrefix)) {
+ String sourceNodeUri = XmlUtil.getTaglibUri(sourceNode, pageContext, sourcePrefix);
if ((child.getNodeType() == Node.ELEMENT_NODE)
&& (VisualDomUtil.JSF_CORE_URI.equalsIgnoreCase(sourceNodeUri)
|| VisualDomUtil.JSF_HTML_URI.equalsIgnoreCase(sourceNodeUri)
15 years
JBoss Tools SVN: r17742 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-25 10:07:01 -0400 (Fri, 25 Sep 2009)
New Revision: 17742
Added:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibData.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4913
Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibData.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibData.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibData.java 2009-09-25 14:07:01 UTC (rev 17742)
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * 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.Iterator;
+import java.util.List;
+
+public class TaglibData {
+ private int id;
+ private String uri;
+ private String prefix;
+ private boolean ns;
+
+ public TaglibData(int id, String uri, String prefix, boolean ns) {
+ this.id = id;
+ this.uri = uri;
+ this.prefix = prefix;
+ this.ns = ns;
+ }
+
+ public TaglibData(int id, String uri, String prefix) {
+ this.id = id;
+ this.uri = uri;
+ this.prefix = prefix;
+ this.ns = true;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public String getUri() {
+ return uri;
+ }
+
+ public String getPrefix() {
+ return prefix;
+ }
+
+ public boolean isNs() {
+ return ns;
+ }
+
+ public boolean isEquals(TaglibData another) {
+ return this == another ||
+ uri.equals(another.getUri()) && prefix.equals(another.getPrefix());
+ }
+
+ public boolean inList(List taglibs) {
+ if (taglibs == null) {
+ return false;
+ }
+ Iterator iter = taglibs.iterator();
+ while (iter.hasNext()) {
+ if (isEquals((TaglibData)iter.next())) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
\ No newline at end of file
15 years
JBoss Tools SVN: r17741 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-25 10:06:00 -0400 (Fri, 25 Sep 2009)
New Revision: 17741
Removed:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/TaglibData.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4913
Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/TaglibData.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/TaglibData.java 2009-09-25 13:45:58 UTC (rev 17740)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/TaglibData.java 2009-09-25 14:06:00 UTC (rev 17741)
@@ -1,69 +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.jst.web.tld;
-
-import java.util.Iterator;
-import java.util.List;
-
-public class TaglibData {
- private int id;
- private String uri;
- private String prefix;
- private boolean ns;
-
- public TaglibData(int id, String uri, String prefix, boolean ns) {
- this.id = id;
- this.uri = uri;
- this.prefix = prefix;
- this.ns = ns;
- }
-
- public TaglibData(int id, String uri, String prefix) {
- this.id = id;
- this.uri = uri;
- this.prefix = prefix;
- this.ns = true;
- }
-
- public int getId() {
- return id;
- }
-
- public String getUri() {
- return uri;
- }
-
- public String getPrefix() {
- return prefix;
- }
-
- public boolean isNs() {
- return ns;
- }
-
- public boolean isEquals(TaglibData another) {
- return this == another ||
- uri.equals(another.getUri()) && prefix.equals(another.getPrefix());
- }
-
- public boolean inList(List taglibs) {
- if (taglibs == null) {
- return false;
- }
- Iterator iter = taglibs.iterator();
- while (iter.hasNext()) {
- if (isEquals((TaglibData)iter.next())) {
- return true;
- }
- }
- return false;
- }
-}
\ No newline at end of file
15 years
JBoss Tools SVN: r17740 - trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2009-09-25 09:45:58 -0400 (Fri, 25 Sep 2009)
New Revision: 17740
Modified:
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4849
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java 2009-09-25 13:19:10 UTC (rev 17739)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java 2009-09-25 13:45:58 UTC (rev 17740)
@@ -17,7 +17,9 @@
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.part.IContributedContentsView;
+import org.eclipse.ui.part.IPage;
import org.eclipse.ui.part.IPageBookViewPage;
+import org.eclipse.ui.part.PageBook;
import org.eclipse.ui.views.contentoutline.ContentOutline;
import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.eclipse.ui.views.properties.PropertySheet;
@@ -51,11 +53,23 @@
}
+ protected IPage createDefaultPage(PageBook book) {
+ return createCssPropertyPage();
+ }
+
@Override
protected PageRec doCreatePage(final IWorkbenchPart part) {
- // if (part instanceof PropertySheet) {
- // return null;
- // }
+ IPage page = createCssPropertyPage();
+
+ if (page != null) {
+ return new PageRec(part, page);
+ }
+
+ return null;
+ }
+
+ private IPage createCssPropertyPage() {
+
IPropertySheetPage page = new CSSPropertyPage(
new ITabbedPropertySheetPageContributor() {
@@ -68,10 +82,10 @@
initPage((IPageBookViewPage) page);
}
page.createControl(getPageBook());
- return new PageRec(part, page);
}
- return null;
+ return page;
+
}
@Override
@@ -100,6 +114,7 @@
((CSSPropertyPage) getCurrentPage()).update();
}
+
@Override
protected boolean isImportant(IWorkbenchPart part) {
if ((part instanceof IEditorPart) || (part instanceof ContentOutline))
15 years
JBoss Tools SVN: r17739 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-25 09:19:10 -0400 (Fri, 25 Sep 2009)
New Revision: 17739
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/jira/browse/JBIDE-4913
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFEST.MF 2009-09-25 13:17:28 UTC (rev 17738)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFEST.MF 2009-09-25 13:19:10 UTC (rev 17739)
@@ -12,6 +12,7 @@
org.eclipse.core.resources,
org.eclipse.ui.ide,
org.jboss.tools.common,
+ org.jboss.tools.jst.web,
org.jboss.tools.jst.jsp,
org.jboss.tools.common.text.ext,
org.jboss.tools.common.model,
15 years
JBoss Tools SVN: r17738 - trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-25 09:17:28 -0400 (Fri, 25 Sep 2009)
New Revision: 17738
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/jira/browse/JBIDE-4913
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF 2009-09-25 13:14:33 UTC (rev 17737)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF 2009-09-25 13:17:28 UTC (rev 17738)
@@ -11,6 +11,7 @@
org.eclipse.core.resources,
org.eclipse.ui.ide,
org.jboss.tools.common,
+ org.jboss.tools.jst.web,
org.jboss.tools.jst.jsp,
org.jboss.tools.common.text.ext,
org.jboss.tools.common.model,
15 years
JBoss Tools SVN: r17737 - trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-25 09:14:33 -0400 (Fri, 25 Sep 2009)
New Revision: 17737
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/jira/browse/JBIDE-4913
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2009-09-25 13:00:09 UTC (rev 17736)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2009-09-25 13:14:33 UTC (rev 17737)
@@ -11,6 +11,7 @@
org.eclipse.core.resources,
org.eclipse.ui.ide,
org.jboss.tools.common,
+ org.jboss.tools.jst.web,
org.jboss.tools.jst.jsp,
org.jboss.tools.common.text.ext,
org.jboss.tools.common.model,
15 years