JBoss Tools SVN: r19768 - in trunk/jsf/plugins/org.jboss.tools.jsf/resources: meta and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-15 08:16:57 -0500 (Fri, 15 Jan 2010)
New Revision: 19768
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5642
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties 2010-01-15 12:48:07 UTC (rev 19767)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties 2010-01-15 13:16:57 UTC (rev 19768)
@@ -649,6 +649,9 @@
FileFaceletTaglib20_AddFunction.WindowTitle=Add Function
FileFaceletTaglib20_AddFunction.Title=Facelet Function
+FileFaceletTaglib20_AddTaglibExtension.WindowTitle=New Taglib Extension
+FileFaceletTaglib20_AddTaglibExtension.Title=Facelet Taglib Extension
+
FaceletTaglibTag_AddHandler.WindowTitle=New Handler
FaceletTaglibTag_AddHandler.Title=Facelet Tag Handler
@@ -685,6 +688,18 @@
FaceletTaglibTag20_AddAttribute.WindowTitle=New Attribute
FaceletTaglibTag20_AddAttribute.Title=Facelet Attribute
+FaceletTaglibTag20_AddTagExtension.WindowTitle=New Tag Extension
+FaceletTaglibTag20_AddTagExtension.Title=Facelet Tag Extension
+
+FaceletTaglibComponent20_AddComponentExtension.WindowTitle=New Component Extension
+FaceletTaglibComponent20_AddComponentExtension.Title=Facelet Component Extension
+
+FaceletTaglibConverter20_AddConverterExtension.WindowTitle=New Converter Extension
+FaceletTaglibConverter20_AddConverterExtension.Title=Facelet Converter Extension
+
+FaceletTaglibValidator20_AddValidatorExtension.WindowTitle=New Validator Extension
+FaceletTaglibValidator20_AddValidatorExtension.Title=Facelet Validator Extension
+
FaceletTaglibTag_Properties.Title=Facelet Tag
FaceletTaglibTag20_Properties.Title=Facelet Tag
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta 2010-01-15 12:48:07 UTC (rev 19767)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta 2010-01-15 13:16:57 UTC (rev 19768)
@@ -371,6 +371,8 @@
ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
+ ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
</XActionItem>
<XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
<XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta 2010-01-15 12:48:07 UTC (rev 19767)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta 2010-01-15 13:16:57 UTC (rev 19768)
@@ -73,7 +73,7 @@
</XModelEntity>
<XModelEntity ImplementingClass="%FT_TagDecl%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
- XMLSUBPATH="converter" name="FaceletTaglibBehavior20">
+ XMLSUBPATH="behavior" name="FaceletTaglibBehavior20">
<XChildrenEntities>
<XChildEntity name="FaceletTaglibBehaviorExtension"/>
</XChildrenEntities>
@@ -106,11 +106,21 @@
<XActionItem HandlerClassName="%OpenJavaSource%" ICON="action.empty"
PROPERTIES="attribute=handler-class" displayName="Open Handler"
kind="action" name="OpenSource"/>
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" displayName="Extension..."
+ kind="action" name="AddBehaviorExtension">
+ <EntityData EntityName="FaceletTaglibBehaviorExtension"/>
+ </XActionItem>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Paste%"
+ ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
</XActionItem>
<XActionItemReference entity="FaceletTaglibConverter" name="DeleteActions"/>
<XActionItemReference entity="FaceletTaglibConverter" name="MoveActions"/>
@@ -180,11 +190,21 @@
<XActionItem HandlerClassName="%OpenJavaSource%" ICON="action.empty"
PROPERTIES="attribute=handler-class" displayName="Open Handler"
kind="action" name="OpenSource"/>
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" displayName="Extension..."
+ kind="action" name="AddComponentExtension">
+ <EntityData EntityName="FaceletTaglibComponentExtension"/>
+ </XActionItem>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
+ ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
</XActionItem>
<XActionItemReference entity="FaceletTaglibComponent" name="DeleteActions"/>
<XActionItemReference entity="FaceletTaglibComponent" name="MoveActions"/>
@@ -252,11 +272,21 @@
<XActionItem HandlerClassName="%OpenJavaSource%" ICON="action.empty"
PROPERTIES="attribute=handler-class" displayName="Open Handler"
kind="action" name="OpenSource"/>
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" displayName="Extension..."
+ kind="action" name="AddConverterExtension">
+ <EntityData EntityName="FaceletTaglibConverterExtension"/>
+ </XActionItem>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
+ ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
</XActionItem>
<XActionItemReference entity="FaceletTaglibConverter" name="DeleteActions"/>
<XActionItemReference entity="FaceletTaglibConverter" name="MoveActions"/>
@@ -541,11 +571,16 @@
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Handler..." kind="action" name="AddAttribute">
+ displayName="Attribute..." kind="action" name="AddAttribute">
<EntityData EntityName="FaceletTaglibAttribute20">
<AttributeData AttributeName="name"/>
</EntityData>
</XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" displayName="Extension..."
+ kind="action" name="AddTagExtension">
+ <EntityData EntityName="FaceletTaglibTagExtension"/>
+ </XActionItem>
</XActionItem>
<XActionItemReference entity="FaceletTaglibTag" name="CopyActions"/>
<XActionItemReference entity="FaceletTaglibTag" name="DeleteActions"/>
@@ -614,11 +649,21 @@
<XActionItem HandlerClassName="%OpenJavaSource%" ICON="action.empty"
PROPERTIES="attribute=handler-class" displayName="Open Handler"
kind="action" name="OpenSource"/>
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" displayName="Extension..."
+ kind="action" name="AddValidatorExtension">
+ <EntityData EntityName="FaceletTaglibValidatorExtension"/>
+ </XActionItem>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
+ ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
</XActionItem>
<XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
<XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
@@ -721,12 +766,13 @@
visibility="false" xmlname="version">
<Editor name="AccessibleJava"/>
</XModelAttribute>
- <XModelAttribute TRIM="no" name="description" xmlname="description.#text">
+ <XModelAttribute PROPERTIES="category=general" TRIM="no"
+ name="description" xmlname="description.#text">
<Editor name="Note"/>
</XModelAttribute>
- <XModelAttribute name="display-name" xmlname="display-name.#text"/>
- <XModelAttribute name="small-icon" xmlname="icon.small-icon.#text"/>
- <XModelAttribute name="large-icon" xmlname="icon.large-icon.#text"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="display-name" xmlname="display-name.#text"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="small-icon" xmlname="icon.small-icon.#text"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="large-icon" xmlname="icon.large-icon.#text"/>
<XModelAttribute PROPERTIES="category=general" name="library-class" xmlname="library-class.#text">
<Editor name="AccessibleJava"/>
</XModelAttribute>
@@ -790,6 +836,11 @@
<AttributeData AttributeName="function-signature"/>
</EntityData>
</XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" displayName="Extension..."
+ kind="action" name="AddTaglibExtension">
+ <EntityData EntityName="FaceletTaglibExtension"/>
+ </XActionItem>
</XActionItem>
<XActionItem HIDE="disabled"
HandlerClassName="org.jboss.tools.jst.web.tld.model.handlers.ExpandTLDHandler"
14 years, 5 months
JBoss Tools SVN: r19767 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-01-15 07:48:07 -0500 (Fri, 15 Jan 2010)
New Revision: 19767
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5683
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-01-15 12:43:52 UTC (rev 19766)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-01-15 12:48:07 UTC (rev 19767)
@@ -119,7 +119,7 @@
);
private static SectionDescription SECTION_SPECIALIZATION = new SectionDescription(
- CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_miscellaneous,
+ CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_specializing,
new String[][]{
{CDIPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalSpecializingManagedBean_label},
{CDIPreferences.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalSpecializingSessionBean_label},
14 years, 5 months
JBoss Tools SVN: r19766 - in trunk/jst/tests/org.jboss.tools.jst.web.kb.test: src/org/jboss/tools/jst/web/kb/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-15 07:43:52 -0500 (Fri, 15 Jan 2010)
New Revision: 19766
Added:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/facelet-taglib2.xml
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5642
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/facelet-taglib2.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/facelet-taglib2.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/facelet-taglib2.xml 2010-01-15 12:43:52 UTC (rev 19766)
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<facelet-taglib version="2.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd">
+ <namespace>facelets_taglib2</namespace>
+ <composite-library-name>ii</composite-library-name>
+ <tag>
+ <tag-name>tag1</tag-name>
+ <handler-class>k</handler-class>
+ <attribute>
+ <name>attr1</name>
+ <type>v</type>
+ </attribute>
+ <attribute>
+ <name>attr2</name>
+ </attribute>
+ <tag-extension>
+ <xx/>
+ <xx/>
+ </tag-extension>
+ <tag-extension>
+ <yy/>
+ </tag-extension>
+ </tag>
+ <tag>
+ <tag-name>tag2</tag-name>
+ <handler-class>k</handler-class>
+ <attribute>
+ <name>attr3</name>
+ <type>v</type>
+ </attribute>
+ <attribute>
+ <name>attr4</name>
+ </attribute>
+ <tag-extension>
+ <xx/>
+ <xx/>
+ </tag-extension>
+ <tag-extension>
+ <yy/>
+ </tag-extension>
+ </tag>
+</facelet-taglib>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/facelet-taglib2.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java 2010-01-15 11:22:39 UTC (rev 19765)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java 2010-01-15 12:43:52 UTC (rev 19766)
@@ -84,6 +84,18 @@
assertTrue(ls.get(0).getComponents().length > 0);
ls = null;
+ f = project.getFile("WebContent/facelet-taglib2.xml");
+ assertNotNull(f);
+ try {
+ LoadedDeclarations ds = scanner.parse(f, kbProject);
+ ls = ds.getLibraries();
+ } catch (ScannerException e) {
+ JUnitUtils.fail("Error in xml scanner",e);
+ }
+ assertEquals(1, ls.size());
+ assertTrue(ls.get(0).getComponents().length > 0);
+
+ ls = null;
f = project.getFile("WebContent/WEB-INF/taglib2.tld");
assertNotNull(f);
try {
14 years, 5 months
JBoss Tools SVN: r19765 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal: taglib and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-15 06:22:39 -0500 (Fri, 15 Jan 2010)
New Revision: 19765
Added:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FaceletAttribute.java
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5642
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java 2010-01-15 10:58:21 UTC (rev 19764)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java 2010-01-15 11:22:39 UTC (rev 19765)
@@ -25,6 +25,7 @@
import org.jboss.tools.jst.web.kb.internal.taglib.AbstractComponent;
import org.jboss.tools.jst.web.kb.internal.taglib.AbstractTagLib;
import org.jboss.tools.jst.web.kb.internal.taglib.ELFunction;
+import org.jboss.tools.jst.web.kb.internal.taglib.FaceletAttribute;
import org.jboss.tools.jst.web.kb.internal.taglib.FaceletTag;
import org.jboss.tools.jst.web.kb.internal.taglib.FaceletTagLibrary;
import org.jboss.tools.jst.web.kb.internal.taglib.FacesConfigAttribute;
@@ -198,6 +199,19 @@
tag.setComponentType(new XMLValueInfo(d, ATTR_COMPONENT_TYPE)); //$NON-NLS-1$
}
}
+ XModelObject[] as = t.getChildren();
+ for (XModelObject a: as) {
+ String entity2 = a.getModelEntity().getName();
+ if(entity2.startsWith("FaceletTaglibAttribute")) { //$NON-NLS-1$
+ FaceletAttribute attr = new FaceletAttribute();
+ attr.setId(a);
+ attr.setName(new XMLValueInfo(a, XMLStoreConstants.ATTR_NAME));
+ attr.setDescription(new XMLValueInfo(a, AbstractComponent.DESCRIPTION));
+ attr.setRequired(new XMLValueInfo(a, AbstractAttribute.REQUIRED));
+
+ tag.addAttribute(attr);
+ }
+ }
library.addComponent(tag);
} else if(entity.startsWith("FaceletTaglibFunction")) { //$NON-NLS-1$
ELFunction f = new ELFunction();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java 2010-01-15 10:58:21 UTC (rev 19764)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java 2010-01-15 11:22:39 UTC (rev 19765)
@@ -580,6 +580,8 @@
c = new FacesConfigAttribute();
} else if(KbXMLStoreConstants.CLS_COMPOSITE_LIBRARY.equals(cls)) {
c = new CompositeAttribute();
+ } else if(KbXMLStoreConstants.CLS_FACELET_LIBRARY.equals(cls)) {
+ c = new FaceletAttribute();
} else {
//consider other cases;
}
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FaceletAttribute.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FaceletAttribute.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FaceletAttribute.java 2010-01-15 11:22:39 UTC (rev 19765)
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * 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.jst.web.kb.internal.taglib;
+
+import org.jboss.tools.jst.web.kb.internal.KbXMLStoreConstants;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class FaceletAttribute extends AbstractAttribute {
+
+ public FaceletAttribute clone() throws CloneNotSupportedException {
+ return (FaceletAttribute)super.clone();
+ }
+
+ public String getXMLClass() {
+ return KbXMLStoreConstants.CLS_FACELET_LIBRARY;
+ }
+
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FaceletAttribute.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 5 months
JBoss Tools SVN: r19764 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-15 05:58:21 -0500 (Fri, 15 Jan 2010)
New Revision: 19764
Added:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/LibraryStorage.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5650
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2010-01-15 07:36:59 UTC (rev 19763)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2010-01-15 10:58:21 UTC (rev 19764)
@@ -93,7 +93,11 @@
* @see org.jboss.tools.jst.web.kb.IKbProject#getTagLibraries(java.lang.String)
*/
public ITagLibrary[] getTagLibraries(String uri) {
- return libraries.getLibrariesArray(uri);
+ ITagLibrary[] result = libraries.getLibrariesArray(uri);
+ if(result == null || result.length == 0) {
+ result = StaticLibraries.instance.getLibraries(uri);
+ }
+ return result;
}
/*
@@ -749,130 +753,6 @@
//TODO Implement if it will be needed events and listeners. and fire events to them.
}
- class LibraryStorage {
- private Set<ITagLibrary> allLibraries = new HashSet<ITagLibrary>();
- private ITagLibrary[] allLibrariesArray = null;
- Map<IPath, Set<ITagLibrary>> librariesBySource = new HashMap<IPath, Set<ITagLibrary>>();
- Map<String, Set<ITagLibrary>> librariesByUri = new HashMap<String, Set<ITagLibrary>>();
- private Map<String,ITagLibrary[]> librariesByUriArray = new HashMap<String, ITagLibrary[]>();
-
- public void clear() {
- synchronized(allLibraries) {
- allLibraries.clear();
- allLibrariesArray = null;
- }
- librariesBySource.clear();
- synchronized (librariesByUri) {
- librariesByUri.clear();
- librariesByUriArray.clear();
- }
- }
-
- public ITagLibrary[] getAllLibrariesArray() {
- if(allLibrariesArray == null) {
- synchronized(allLibraries) {
- allLibrariesArray = allLibraries.toArray(new ITagLibrary[0]);
- }
- }
- return allLibrariesArray;
- }
-
- public ITagLibrary[] getLibrariesArray(String uri) {
- ITagLibrary[] result = librariesByUriArray.get(uri);
- if(result == null) {
- synchronized(librariesByUri) {
- Set<ITagLibrary> libs = librariesByUri.get(uri);
- if(libs!=null) {
- result = libs.toArray(new ITagLibrary[0]);
- } else {
- result = new ITagLibrary[0];
- }
- librariesByUriArray.put(uri, result);
- }
- }
- return result;
- }
-
- public Set<ITagLibrary> getLibrariesBySource(IPath path) {
- return librariesBySource.get(path);
- }
-
- public void addLibrary(ITagLibrary f) {
- synchronized(allLibraries) {
- allLibraries.add(f);
- allLibrariesArray = null;
- }
- IPath path = f.getSourcePath();
- if(path != null) {
- Set<ITagLibrary> fs = librariesBySource.get(path);
- if(fs == null) {
- fs = new HashSet<ITagLibrary>();
- librariesBySource.put(path, fs);
- }
- fs.add(f);
- }
- String uri = f.getURI();
- synchronized (librariesByUri) {
- librariesByUriArray.remove(uri);
- Set<ITagLibrary> ul = librariesByUri.get(uri);
- if (ul == null) {
- ul = new HashSet<ITagLibrary>();
- librariesByUri.put(uri, ul);
- }
- ul.add(f);
- }
- }
-
- public void removeLibrary(ITagLibrary f) {
- synchronized(allLibraries) {
- allLibraries.remove(f);
- allLibrariesArray = null;
- }
- IPath path = f.getSourcePath();
- if(path != null) {
- Set<ITagLibrary> fs = librariesBySource.get(path);
- if(fs != null) {
- fs.remove(f);
- }
- if(fs.isEmpty()) {
- librariesBySource.remove(fs);
- }
- }
- String uri = f.getURI();
- synchronized (librariesByUri) {
- Set<ITagLibrary> ul = librariesByUri.get(uri);
- librariesByUriArray.remove(uri);
- if (ul != null) {
- ul.remove(f);
- if (ul.isEmpty()) {
- librariesByUri.remove(uri);
- }
- }
- }
- }
-
- public Set<ITagLibrary> removePath(IPath path) {
- Set<ITagLibrary> fs = librariesBySource.get(path);
- if(fs == null) return null;
- for (ITagLibrary f: fs) {
- synchronized(allLibraries) {
- allLibraries.remove(f);
- allLibrariesArray = null;
- }
- synchronized (librariesByUri) {
- Set<ITagLibrary> s = librariesByUri.get(f.getURI());
- if(s != null) s.remove(f);
- if(s != null && s.isEmpty()) {
- librariesByUri.remove(f.getURI());
- }
- librariesByUriArray.remove(f.getURI());
- }
- }
- librariesBySource.remove(path);
- return fs;
- }
- }
-
/**
* Check if KB builder is installed and add a warning with quick fix to the project if it is not.
* @param resource
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/LibraryStorage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/LibraryStorage.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/LibraryStorage.java 2010-01-15 10:58:21 UTC (rev 19764)
@@ -0,0 +1,149 @@
+/*******************************************************************************
+ * 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.jst.web.kb.internal;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IPath;
+import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class LibraryStorage {
+ private Set<ITagLibrary> allLibraries = new HashSet<ITagLibrary>();
+ private ITagLibrary[] allLibrariesArray = null;
+ Map<IPath, Set<ITagLibrary>> librariesBySource = new HashMap<IPath, Set<ITagLibrary>>();
+ Map<String, Set<ITagLibrary>> librariesByUri = new HashMap<String, Set<ITagLibrary>>();
+ private Map<String,ITagLibrary[]> librariesByUriArray = new HashMap<String, ITagLibrary[]>();
+
+ public void clear() {
+ synchronized(allLibraries) {
+ allLibraries.clear();
+ allLibrariesArray = null;
+ }
+ librariesBySource.clear();
+ synchronized (librariesByUri) {
+ librariesByUri.clear();
+ librariesByUriArray.clear();
+ }
+ }
+
+ public ITagLibrary[] getAllLibrariesArray() {
+ if(allLibrariesArray == null) {
+ synchronized(allLibraries) {
+ allLibrariesArray = allLibraries.toArray(new ITagLibrary[0]);
+ }
+ }
+ return allLibrariesArray;
+ }
+
+ public ITagLibrary[] getLibrariesArray(String uri) {
+ ITagLibrary[] result = librariesByUriArray.get(uri);
+ if(result == null) {
+ synchronized(librariesByUri) {
+ Set<ITagLibrary> libs = librariesByUri.get(uri);
+ if(libs!=null) {
+ result = libs.toArray(new ITagLibrary[0]);
+ } else {
+ result = new ITagLibrary[0];
+ }
+ librariesByUriArray.put(uri, result);
+ }
+ }
+ return result;
+ }
+
+ public Set<ITagLibrary> getLibrariesBySource(IPath path) {
+ return librariesBySource.get(path);
+ }
+
+ public void addLibrary(ITagLibrary f) {
+ synchronized(allLibraries) {
+ allLibraries.add(f);
+ allLibrariesArray = null;
+ }
+ IPath path = f.getSourcePath();
+ if(path != null) {
+ Set<ITagLibrary> fs = librariesBySource.get(path);
+ if(fs == null) {
+ fs = new HashSet<ITagLibrary>();
+ librariesBySource.put(path, fs);
+ }
+ fs.add(f);
+ }
+ String uri = f.getURI();
+ synchronized (librariesByUri) {
+ librariesByUriArray.remove(uri);
+ Set<ITagLibrary> ul = librariesByUri.get(uri);
+ if (ul == null) {
+ ul = new HashSet<ITagLibrary>();
+ librariesByUri.put(uri, ul);
+ }
+ ul.add(f);
+ }
+ }
+
+ public void removeLibrary(ITagLibrary f) {
+ synchronized(allLibraries) {
+ allLibraries.remove(f);
+ allLibrariesArray = null;
+ }
+ IPath path = f.getSourcePath();
+ if(path != null) {
+ Set<ITagLibrary> fs = librariesBySource.get(path);
+ if(fs != null) {
+ fs.remove(f);
+ }
+ if(fs.isEmpty()) {
+ librariesBySource.remove(fs);
+ }
+ }
+ String uri = f.getURI();
+ synchronized (librariesByUri) {
+ Set<ITagLibrary> ul = librariesByUri.get(uri);
+ librariesByUriArray.remove(uri);
+ if (ul != null) {
+ ul.remove(f);
+ if (ul.isEmpty()) {
+ librariesByUri.remove(uri);
+ }
+ }
+ }
+ }
+
+ public Set<ITagLibrary> removePath(IPath path) {
+ Set<ITagLibrary> fs = librariesBySource.get(path);
+ if(fs == null) return null;
+ for (ITagLibrary f: fs) {
+ synchronized(allLibraries) {
+ allLibraries.remove(f);
+ allLibrariesArray = null;
+ }
+ synchronized (librariesByUri) {
+ Set<ITagLibrary> s = librariesByUri.get(f.getURI());
+ if(s != null) s.remove(f);
+ if(s != null && s.isEmpty()) {
+ librariesByUri.remove(f.getURI());
+ }
+ librariesByUriArray.remove(f.getURI());
+ }
+ }
+ librariesBySource.remove(path);
+ return fs;
+ }
+
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/LibraryStorage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java 2010-01-15 10:58:21 UTC (rev 19764)
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * 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.jst.web.kb.internal;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+
+import org.eclipse.core.runtime.Path;
+import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.jst.web.kb.internal.scanner.LoadedDeclarations;
+import org.jboss.tools.jst.web.kb.internal.scanner.XMLScanner;
+import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
+import org.jboss.tools.jst.web.kb.taglib.TagLibraryManager;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class StaticLibraries {
+ static StaticLibraries instance = new StaticLibraries();
+
+ LibraryStorage libraries = new LibraryStorage();
+ HashMap<File, XModel> loaded = new HashMap<File, XModel>();
+
+ private StaticLibraries() {}
+
+ public ITagLibrary[] getLibraries(String uri) {
+ File file = TagLibraryManager.getStaticTLD(uri);
+ if(file == null) return new ITagLibrary[0];
+ File folder = file.getParentFile();
+ if(!loaded.containsKey(folder)) {
+ XModelObject o = EclipseResourceUtil.createObjectForLocation(file.getAbsolutePath());
+ if(o != null) {
+ loaded.put(folder, o.getModel());
+ XModelObject[] fs = o.getParent().getChildren();
+ XMLScanner scanner = new XMLScanner();
+ for (XModelObject fo: fs) {
+ LoadedDeclarations ds = scanner.parse(fo, new Path(folder.getAbsolutePath()), null);
+ List<ITagLibrary> ls = ds.getLibraries();
+ for (ITagLibrary l: ls) {
+ libraries.addLibrary(l);
+ }
+ }
+ }
+ }
+ return libraries.getLibrariesArray(uri);
+ }
+
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 5 months
JBoss Tools SVN: r19763 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-01-15 02:36:59 -0500 (Fri, 15 Jan 2010)
New Revision: 19763
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCorePlugin.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5688
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCorePlugin.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCorePlugin.java 2010-01-15 02:51:30 UTC (rev 19762)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCorePlugin.java 2010-01-15 07:36:59 UTC (rev 19763)
@@ -110,7 +110,7 @@
*/
public void stop(BundleContext context) throws Exception {
ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
- plugin = null;
+// plugin = null;
super.stop(context);
}
14 years, 5 months
JBoss Tools SVN: r19762 - in trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui: META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-14 21:51:30 -0500 (Thu, 14 Jan 2010)
New Revision: 19762
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/commands/
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/commands/FullPublishCommandHandler.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml
Log:
JBIDE-3767 - partially complete but definitely usable, no UI at all. (better than ugly UI)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF 2010-01-15 02:47:43 UTC (rev 19761)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF 2010-01-15 02:51:30 UTC (rev 19762)
@@ -25,7 +25,8 @@
org.eclipse.wst.server.core;bundle-version="1.1.101",
org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.1.300",
org.eclipse.emf.ecore;bundle-version="2.5.0",
- org.jboss.ide.eclipse.as.wtp.core;bundle-version="1.0.0"
+ org.jboss.ide.eclipse.as.wtp.core;bundle-version="1.0.0",
+ org.eclipse.debug.ui;bundle-version="3.5.1";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: JBoss by Red Hat
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2010-01-15 02:47:43 UTC (rev 19761)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2010-01-15 02:51:30 UTC (rev 19762)
@@ -96,4 +96,21 @@
weight="5">
</provider>
</extension>
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ defaultHandler="org.jboss.ide.eclipse.as.wtp.ui.commands.FullPublishCommandHandler"
+ id="org.jboss.ide.eclipse.as.wtp.ui.fullPublishCommand"
+ name="Full Publish">
+ </command>
+ </extension>
+ <extension
+ point="org.eclipse.ui.bindings">
+ <key
+ commandId="org.jboss.ide.eclipse.as.wtp.ui.fullPublishCommand"
+ contextId="org.eclipse.ui.contexts.window"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M1+M2+M">
+ </key>
+ </extension>
</plugin>
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/commands/FullPublishCommandHandler.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/commands/FullPublishCommandHandler.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/commands/FullPublishCommandHandler.java 2010-01-15 02:51:30 UTC (rev 19762)
@@ -0,0 +1,112 @@
+/*************************************************************************************
+ * Copyright (c) 2008-2009 JBoss by Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
+package org.jboss.ide.eclipse.as.wtp.ui.commands;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.debug.internal.ui.stringsubstitution.SelectedResourceManager;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IModuleArtifact;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerCore;
+import org.eclipse.wst.server.core.internal.PublishServerJob;
+import org.eclipse.wst.server.core.internal.Server;
+import org.eclipse.wst.server.core.internal.ServerPlugin;
+import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
+
+public class FullPublishCommandHandler implements IHandler {
+
+ public void addHandlerListener(IHandlerListener handlerListener) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void dispose() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ // go around in a circle to avoid plugin dependence on debug.ui
+ IResource resource = SelectedResourceManager.getDefault().getSelectedResource();
+ IModule module = getModule(resource);
+ Server server = (Server)getServer(module);
+ if( module != null && server != null ) {
+ IModule[] module2 = new IModule[]{module};
+ server.setModulePublishState(module2, IServer.PUBLISH_STATE_FULL);
+ ArrayList<IModule[]> allChildren = ServerModelUtilities.getDeepChildren(server, module2);
+ for( int j = 0; j < allChildren.size(); j++ ) {
+ server.setModulePublishState((IModule[])allChildren.get(j), IServer.PUBLISH_STATE_FULL);
+ }
+ }
+ new PublishServerJob(server, IServer.PUBLISH_INCREMENTAL, true).schedule();
+ return null;
+ }
+
+ public IServer getServer(IModule module) {
+ IServer toRepublish = null;
+ if( module != null ) {
+ IServer[] servers = ServerCore.getServers();
+ ArrayList<IServer> matched = new ArrayList<IServer>();
+ for( int i = 0; i < servers.length; i++ ) {
+ boolean found = false;
+ IModule[] deployed = servers[i].getModules();
+ for( int j = 0; j < deployed.length && !found; j++ )
+ if( deployed[j].getId().equals(module.getId()))
+ found = true;
+ if( found )
+ matched.add(servers[i]);
+ }
+
+ if( matched.size() == 0 || matched.size() > 1 ) {
+ // TODO show a dialog to choose the server
+ toRepublish = matched.get(0);
+ } else
+ toRepublish = matched.get(0);
+ }
+ return toRepublish;
+ }
+
+ protected IModule getModule(IResource resource) {
+ IModule module = null;
+ if (resource != null) {
+ IModuleArtifact[] moduleArtifacts = ServerPlugin.getModuleArtifacts(resource);
+ IModuleArtifact moduleArtifact = null;
+ if (moduleArtifacts != null && moduleArtifacts.length > 0)
+ moduleArtifact = moduleArtifacts[0];
+
+ if (moduleArtifact != null)
+ module = moduleArtifact.getModule();
+
+ }
+ return module;
+ }
+
+ public boolean isEnabled() {
+ IResource resource = SelectedResourceManager.getDefault().getSelectedResource();
+ IModule module = getModule(resource);
+ return module != null;
+ }
+
+ public boolean isHandled() {
+ return true;
+ }
+
+ public void removeHandlerListener(IHandlerListener handlerListener) {
+ // TODO Auto-generated method stub
+ }
+
+}
14 years, 5 months
JBoss Tools SVN: r19761 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-14 21:47:43 -0500 (Thu, 14 Jan 2010)
New Revision: 19761
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-5689
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2010-01-15 02:31:36 UTC (rev 19760)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2010-01-15 02:47:43 UTC (rev 19761)
@@ -146,7 +146,7 @@
class="org.jboss.ide.eclipse.as.ui.editor.ModuleDeploymentPage"
id="org.jboss.ide.eclipse.as.ui.editor.deploymentPage"
name="Deployment"
- typeIds="org.jboss.ide.eclipse.as.systemCopyServer, org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50">
+ typeIds="org.jboss.ide.eclipse.as.systemCopyServer, org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50">
</page>
</extension>
14 years, 5 months
JBoss Tools SVN: r19760 - in trunk/as/plugins: org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-14 21:31:36 -0500 (Thu, 14 Jan 2010)
New Revision: 19760
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/ServerModelUtilities.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java
Log:
Moving an API lower
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java 2010-01-14 22:24:32 UTC (rev 19759)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java 2010-01-15 02:31:36 UTC (rev 19760)
@@ -11,53 +11,26 @@
package org.jboss.ide.eclipse.as.core.util;
import java.util.ArrayList;
-import java.util.Arrays;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.server.core.IEnterpriseApplication;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule;
+import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
+@Deprecated
+/**
+ * Please use org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities
+ */
public class ModuleUtil {
+ @Deprecated
public static ArrayList<IModule[]> getShallowChildren(IServer server, IModule[] root) {
- ArrayList<IModule[]> list = new ArrayList<IModule[]>();
- IModule[] children = server.getChildModules(root, new NullProgressMonitor());
- // children is { aWar, bWar, cWar } projects
- int length = children == null ? 0 : children.length;
- for( int i = 0; i < length; i++ ) {
- ArrayList<IModule> inner = new ArrayList<IModule>();
- inner.addAll(Arrays.asList(root));
- inner.add(children[i]);
- IModule[] innerMods = inner.toArray(new IModule[inner.size()]);
- list.add(innerMods);
- }
- return list;
+ return ServerModelUtilities.getShallowChildren(server, root);
}
-
+ @Deprecated
public static ArrayList<IModule[]> getDeepChildren(IServer server, IModule[] mod) {
- ArrayList<IModule[]> deep = getShallowChildren(server, mod);
- IModule[] toBeSearched;
- for( int i = 0; i < deep.size(); i++ ) {
- toBeSearched = deep.get(i);
- deep.addAll(getShallowChildren(server, toBeSearched));
- }
- return deep;
+ return ServerModelUtilities.getDeepChildren(server, mod);
}
-
+ @Deprecated
public static IModule[] getChildModules(IModule[] module) {
- int last = module.length-1;
- if (module[last] != null && module[last].getModuleType() != null) {
- IEnterpriseApplication enterpriseApplication = (IEnterpriseApplication) module[last]
- .loadAdapter(IEnterpriseApplication.class, null);
- if( enterpriseApplication != null )
- return enterpriseApplication.getModules() == null ? new IModule[]{} : enterpriseApplication.getModules();
-
- IJBTModule jbtMod = (IJBTModule)module[last].loadAdapter(IJBTModule.class, null);
- if( jbtMod != null )
- return jbtMod.getModules();
- }
- return new IModule[0];
+ return ServerModelUtilities.getChildModules(module);
}
-
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/ServerModelUtilities.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/ServerModelUtilities.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/ServerModelUtilities.java 2010-01-15 02:31:36 UTC (rev 19760)
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.ide.eclipse.as.wtp.core.util;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jst.server.core.IEnterpriseApplication;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule;
+
+public class ServerModelUtilities {
+
+ public static ArrayList<IModule[]> getShallowChildren(IServer server, IModule[] root) {
+ ArrayList<IModule[]> list = new ArrayList<IModule[]>();
+ IModule[] children = server.getChildModules(root, new NullProgressMonitor());
+ // children is { aWar, bWar, cWar } projects
+ int length = children == null ? 0 : children.length;
+ for( int i = 0; i < length; i++ ) {
+ ArrayList<IModule> inner = new ArrayList<IModule>();
+ inner.addAll(Arrays.asList(root));
+ inner.add(children[i]);
+ IModule[] innerMods = inner.toArray(new IModule[inner.size()]);
+ list.add(innerMods);
+ }
+ return list;
+ }
+
+ public static ArrayList<IModule[]> getDeepChildren(IServer server, IModule[] mod) {
+ ArrayList<IModule[]> deep = getShallowChildren(server, mod);
+ IModule[] toBeSearched;
+ for( int i = 0; i < deep.size(); i++ ) {
+ toBeSearched = deep.get(i);
+ deep.addAll(getShallowChildren(server, toBeSearched));
+ }
+ return deep;
+ }
+
+ public static IModule[] getChildModules(IModule[] module) {
+ int last = module.length-1;
+ if (module[last] != null && module[last].getModuleType() != null) {
+ IEnterpriseApplication enterpriseApplication = (IEnterpriseApplication) module[last]
+ .loadAdapter(IEnterpriseApplication.class, null);
+ if( enterpriseApplication != null )
+ return enterpriseApplication.getModules() == null ? new IModule[]{} : enterpriseApplication.getModules();
+
+ IJBTModule jbtMod = (IJBTModule)module[last].loadAdapter(IJBTModule.class, null);
+ if( jbtMod != null )
+ return jbtMod.getModules();
+ }
+ return new IModule[0];
+ }
+}
14 years, 5 months
JBoss Tools SVN: r19759 - in trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2010-01-14 17:24:32 -0500 (Thu, 14 Jan 2010)
New Revision: 19759
Modified:
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/DeploymentForm.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/util/ProcessDeployer.java
Log:
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/DeploymentForm.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/DeploymentForm.java 2010-01-14 20:40:36 UTC (rev 19758)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/DeploymentForm.java 2010-01-14 22:24:32 UTC (rev 19759)
@@ -296,7 +296,7 @@
private void createUserNameField(Composite composite) {
Label usernameLabel = toolkit.createLabel(composite, "Username:");
usernameLabel.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
- usernameText = toolkit.createText(composite, "");
+ usernameText = toolkit.createText(composite, "", SWT.BORDER);
String usernameString = Plugin.getDefault().getPreferenceStore().getString("user name");
usernameText.setText(usernameString == null ? "" : usernameString);
usernameText.setEnabled(useCredentialsButton.getSelection());
@@ -306,7 +306,7 @@
private void createPasswordField(Composite composite) {
Label passwordLabel = toolkit.createLabel(composite, "Password:");
passwordLabel.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
- passwordText = toolkit.createText(composite, "", SWT.PASSWORD);
+ passwordText = toolkit.createText(composite, "", SWT.PASSWORD | SWT.BORDER);
String passwordString = Plugin.getDefault().getPreferenceStore().getString("password");
passwordText.setText(passwordString == null ? "" : passwordString);
passwordText.setEnabled(useCredentialsButton.getSelection());
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/util/ProcessDeployer.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/util/ProcessDeployer.java 2010-01-14 20:40:36 UTC (rev 19758)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/util/ProcessDeployer.java 2010-01-14 22:24:32 UTC (rev 19759)
@@ -241,7 +241,7 @@
if (useCredentials) {
String userPassword = username + ":" + password;
String encoding = Base64Converter.encode(userPassword);
- urlConnection.setRequestProperty ("Authorization", "Basic" + encoding);
+ urlConnection.setRequestProperty ("Authorization", "Basic " + encoding);
}
urlConnection.setDoInput(true);
urlConnection.setDoOutput(true);
14 years, 5 months